mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-05-29 21:17:22 +00:00
check if extraheader[favicon] is set
This commit is contained in:
parent
42907bcb44
commit
277cc52025
|
@ -31,7 +31,7 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
|
||||||
|
|
||||||
function __construct($params, $theme='bootstrap') {
|
function __construct($params, $theme='bootstrap') {
|
||||||
parent::__construct($params, $theme);
|
parent::__construct($params, $theme);
|
||||||
$this->extraheader = array('js'=>'', 'css'=>'');
|
$this->extraheader = array('js'=>'', 'css'=>'', 'favicon'=>'');
|
||||||
$this->footerjs = array();
|
$this->footerjs = array();
|
||||||
$this->nonces = array();
|
$this->nonces = array();
|
||||||
}
|
}
|
||||||
|
@ -120,7 +120,12 @@ class SeedDMS_Bootstrap_Style extends SeedDMS_View_Common {
|
||||||
echo '<script type="text/javascript" src="../views/'.$this->theme.'/vendors/noty/themes/default.js"></script>'."\n";
|
echo '<script type="text/javascript" src="../views/'.$this->theme.'/vendors/noty/themes/default.js"></script>'."\n";
|
||||||
echo '<script type="text/javascript" src="../styles/'.$this->theme.'/jqtree/tree.jquery.js"></script>'."\n";
|
echo '<script type="text/javascript" src="../styles/'.$this->theme.'/jqtree/tree.jquery.js"></script>'."\n";
|
||||||
// echo '<script type="text/javascript" src="../styles/'.$this->theme.'/jquery-cookie/jquery.cookie.js"></script>'."\n";
|
// echo '<script type="text/javascript" src="../styles/'.$this->theme.'/jquery-cookie/jquery.cookie.js"></script>'."\n";
|
||||||
echo '<link rel="shortcut icon" href="../styles/'.$this->theme.'/favicon.ico" type="image/x-icon"/>'."\n";
|
if($this->extraheader['favicon'])
|
||||||
|
echo $this->extraheader['favicon'];
|
||||||
|
else {
|
||||||
|
echo '<link rel="icon" href="../views/'.$this->theme.'/images/favicon.svg" type="image/svg+xml"/>'."\n";
|
||||||
|
echo '<link rel="apple-touch-icon" sizes="180x180" href="../views/'.$this->theme.'/images/apple-touch-icon.png">'."\n";
|
||||||
|
}
|
||||||
if($this->params['session'] && $this->params['session']->getSu()) {
|
if($this->params['session'] && $this->params['session']->getSu()) {
|
||||||
?>
|
?>
|
||||||
<style type="text/css">
|
<style type="text/css">
|
||||||
|
|
Loading…
Reference in New Issue
Block a user