Fixed: FS#2159 - Custom logo

tbrehm

2012-04-05 aad3f0eb1e40aff62e888bff45d193ce0838f90c

Fixed: FS#2159 - Custom logo

 install/tpl/config.inc.php.master

@@ -146,7 +146,7 @@
//** Themes
$conf['theme'] = 'default';
$conf['html_content_encoding'] = 'utf-8'; // example: utf-8, iso-8859-1, ...
$conf['logo'] = 'themes/default/images/ispc_logo.png';
$conf['logo'] = 'themes/default/images/header_logo.png';

//** Default Language and Timezone
$conf['language'] = '{language}';

 interface/lib/app.inc.php

@@ -217,11 +217,14 @@
            $this->tpl->setVar('app_version', '');
        }
        $this->tpl->setVar('app_link', $this->_conf['app_link']);
        /*
        if(isset($this->_conf['app_logo']) && $this->_conf['app_logo'] != '' && @is_file($this->_conf['app_logo'])) {
            $this->tpl->setVar('app_logo', '<img src="'.$this->_conf['app_logo'].'">');
        } else {
            $this->tpl->setVar('app_logo', '&nbsp;');
        }
        */
        $this->tpl->setVar('app_logo', $this->_conf['logo']);

        $this->tpl->setVar('phpsessid', session_id());


 interface/lib/config.inc.php

@@ -131,7 +131,7 @@
//** Themes
$conf['theme'] = 'default';
$conf['html_content_encoding'] = 'utf-8'; // example: utf-8, iso-8859-1, ...
$conf['logo'] = 'themes/default/images/ispc_logo.png';
$conf['logo'] = 'themes/default/images/header_logo.png';

//** Templates
$conf['templates'] = '/usr/local/ispconfig/server/conf';

 interface/web/themes/default/templates/main.tpl.htm

@@ -108,7 +108,7 @@
                    <span><a href="#logout" onclick="loadContent('login/logout.php');"><tmpl_var name="logout_txt"> <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
                    </tmpl_if>
                </div>
                <h1 id="ir-HeaderLogo" class="swap"><span>ISPConfig 3</span></h1>
                <h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>
                <span>hosting control panel</span>
            </div>
            <!-- begin: main navigation #nav -->

 interface/web/themes/default_64_navimg/templates/main.tpl.htm

@@ -107,7 +107,7 @@
                    <span><a href="#logout" onclick="loadContent('login/logout.php');">LOGOUT <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
                    </tmpl_if>
                </div>
                <h1 id="ir-HeaderLogo" class="swap"><span>ISPConfig 3</span></h1>
                <h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>
                <span>hosting control panel</span>
            </div>
            <!-- begin: main navigation #nav -->

 interface/web/themes/default_combobox/templates/main.tpl.htm

@@ -240,7 +240,7 @@
                    <span><a href="#logout" onclick="loadContent('login/logout.php');">LOGOUT <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
                    </tmpl_if>
                </div>
                <h1 id="ir-HeaderLogo" class="swap"><span>ISPConfig 3</span></h1>
                <h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>
                <span>hosting control panel</span>
            </div>
            <!-- begin: main navigation #nav -->

 interface/web/themes/default_no_navimg/templates/main.tpl.htm

@@ -108,7 +108,7 @@
                    <span><a href="#logout" onclick="loadContent('login/logout.php');">LOGOUT <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
                    </tmpl_if>
                </div>
                <h1 id="ir-HeaderLogo" class="swap"><span>ISPConfig 3</span></h1>
                <h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>
                <span>hosting control panel</span>
            </div>
            <!-- begin: main navigation #nav -->