Changeset 10963

Show
Ignore:
Timestamp:
01/15/11 03:23:10 (2 years ago)
Author:
p_lindheimer
Message:

some fixes and tweaks re #4742

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/trunk/amp_conf/htdocs/admin/views/freepbx.php

    r10960 r10963  
    6767// BRANDABLE COMPONENTS 
    6868// 
    69 if (isset($amp_conf['BRAND_IMAGE_HIDE_NAV_BACKGROUND']) && $amp_conf['BRAND_IMAGE_HIDE_NAV_BACKGROUND']) { 
     69if ($amp_conf['BRAND_IMAGE_HIDE_NAV_BACKGROUND']) { 
    7070  $use_nav_background = false; 
    7171} else { 
    72   $shadow_side_background = isset($amp_conf['BRAND_IMAGE_SHADOW_SIDE_BACKGROUND']) ? $amp_conf['BRAND_IMAGE_SHADOW_SIDE_BACKGROUND'] : 'images/shadow-side-background.png'; 
     72  $shadow_side_background = $amp_conf['BRAND_IMAGE_SHADOW_SIDE_BACKGROUND']; //'images/shadow-side-background.png'; 
    7373} 
    7474// $freepbx_logo_r 
    7575// AMPADMINLOGO takes precedence for backwards compatibility 
    76 if (isset($amp_conf["AMPADMINLOGO"]) && is_file($amp_conf["AMPWEBROOT"]."images/".$amp_conf["AMPADMINLOGO"])) { 
     76if ($amp_conf["AMPADMINLOGO"] && is_file($amp_conf["AMPWEBROOT"]."/admin/images/".$amp_conf["AMPADMINLOGO"])) { 
    7777  $freepbx_logo_r = $amp_conf["AMPADMINLOGO"];  
    7878} else { 
    79   $freepbx_logo_r = isset($amp_conf['BRAND_IMAGE_FREEPBX_LEFT']) ? $amp_conf['BRAND_IMAGE_FREEPBX_LEFT'] : 'images/logo.png'; 
    80 } 
    81 $freepbx_alt_l      = isset($amp_conf['BRAND_FREEPBX_ALT_LEFT']) ? $amp_conf['BRAND_FREEPBX_ALT_LEFT'] : _("FreePBX"); 
    82 $freepbx_alt_r      = isset($amp_conf['BRAND_FREEPBX_ALT_RIGHT']) ? $amp_conf['BRAND_FREEPBX_ALT_RIGHT'] : _("FreePBX"); 
    83 $freepbx_logo_l     = isset($amp_conf['BRAND_IMAGE_FREEPBX_LEFT']) ? $amp_conf['BRAND_IMAGE_FREEPBX_LEFT'] : 'images/freepbx_large.png'; 
    84 $freepbx_link_l     = isset($amp_conf['BRAND_IMAGE_FREEPBX_LINK_LEFT']) ? $amp_conf['BRAND_IMAGE_FREEPBX_LINK_LEFT'] : 'http://www.freepbx.org'; 
    85 $freepbx_link_r     = isset($amp_conf['BRAND_IMAGE_FREEPBX_LINK_RIGHT']) ? $amp_conf['BRAND_IMAGE_FREEPBX_LINK_RIGHT'] : 'http://www.freepbx.org'; 
    86 $use_freepbx_logo_r = isset($amp_conf['BRAND_HIDE_LOGO_RIGHT']) ? $amp_conf['BRAND_HIDE_LOGO_RIGHT'] : false; 
    87 $hide_version       = isset($amp_conf['BRAND_HIDE_HEADER_VERSION']) ? $amp_conf['BRAND_HIDE_HEADER_VERSION'] : false; 
    88 $hide_toolbar       = isset($amp_conf['BRAND_HIDE_HEADER_MENUS']) ? $amp_conf['BRAND_HIDE_HEADER_MENUS'] : false; 
    89  
    90 $mainstyle_css      = isset($amp_conf['BRAND_CSS_ALT_MAINSTYLE']) ? $amp_conf['BRAND_CSS_ALT_MAINSTYLE'] : 'common/mainstyle.css';  
    91 $custom_css         = isset($amp_conf['BRAND_CSS_CUSTOM']) ? $amp_conf['BRAND_CSS_CUSTOM'] : false; 
    92  
    93 //TODO: create DISABLE_CSS_AUTOGEN default false 
    94 // 
    95 $amp_conf['DISABLE_CSS_AUTOGEN'] = false; 
    96 if (!$amp_conf['DEVEL'] && !$amp_conf['DISABLE_CSS_AUTOGEN']) { 
     79  $freepbx_logo_r =  $amp_conf['BRAND_IMAGE_FREEPBX_RIGHT']; //'images/logo.png' 
     80} 
     81$freepbx_alt_l      = $amp_conf['BRAND_FREEPBX_ALT_LEFT'] ? $amp_conf['BRAND_FREEPBX_ALT_LEFT'] : _("FreePBX"); 
     82$freepbx_alt_r      = $amp_conf['BRAND_FREEPBX_ALT_RIGHT'] ? $amp_conf['BRAND_FREEPBX_ALT_RIGHT'] : _("FreePBX"); 
     83$freepbx_logo_l     = $amp_conf['BRAND_IMAGE_FREEPBX_LEFT'] ? $amp_conf['BRAND_IMAGE_FREEPBX_LEFT'] : 'images/freepbx_large.png'; 
     84$freepbx_link_l     = $amp_conf['BRAND_IMAGE_FREEPBX_LINK_LEFT'] ? $amp_conf['BRAND_IMAGE_FREEPBX_LINK_LEFT'] : 'http://www.freepbx.org'; 
     85$freepbx_link_r     = $amp_conf['BRAND_IMAGE_FREEPBX_LINK_RIGHT'] ? $amp_conf['BRAND_IMAGE_FREEPBX_LINK_RIGHT'] : 'http://www.freepbx.org'; 
     86$use_freepbx_logo_r = ! $amp_conf['BRAND_HIDE_LOGO_RIGHT']; 
     87$hide_version       = $amp_conf['BRAND_HIDE_HEADER_VERSION']; 
     88$hide_toolbar       = $amp_conf['BRAND_HIDE_HEADER_MENUS']; 
     89 
     90$mainstyle_css      = $amp_conf['BRAND_CSS_ALT_MAINSTYLE'] ? $amp_conf['BRAND_CSS_ALT_MAINSTYLE'] : 'common/mainstyle.css';  
     91$custom_css         = $amp_conf['BRAND_CSS_CUSTOM']; 
     92 
     93if (!$amp_conf['DISABLE_CSS_AUTOGEN']) { 
    9794  $wwwroot = $amp_conf['AMPWEBROOT']."/admin"; 
    9895 

  • freepbx/trunk/amp_conf/htdocs/admin/views/freepbx_admin.php

    r10960 r10963  
    244244  // Brandable logos in footer 
    245245  // 
    246   $freepbx_alt_f = isset($amp_conf['BRAND_FREEPBX_ALT_FOOT']) ? $amp_conf['BRAND_FREEPBX_ALT_FOOT'] : _("FreePBX®"); 
    247   $freepbx_logo_f = isset($amp_conf['BRAND_IMAGE_FREEPBX_FOOT']) ? $amp_conf['BRAND_IMAGE_FREEPBX_FOOT'] : 'images/freepbx_small.png'; 
    248   $freepbx_link_f = isset($amp_conf['BRAND_IMAGE_FREEPBX_LINK_FOOT']) ? $amp_conf['BRAND_IMAGE_FREEPBX_LINK_FOOT'] : 'http://www.freepbx.org'; 
     246  $freepbx_alt_f = $amp_conf['BRAND_FREEPBX_ALT_FOOT'] ? $amp_conf['BRAND_FREEPBX_ALT_FOOT'] : _("FreePBX®"); 
     247  $freepbx_logo_f = $amp_conf['BRAND_IMAGE_FREEPBX_FOOT']; //'images/freepbx_small.png' 
     248  $freepbx_link_f = $amp_conf['BRAND_IMAGE_FREEPBX_LINK_FOOT'] ? $amp_conf['BRAND_IMAGE_FREEPBX_LINK_FOOT'] : 'http://www.freepbx.org'; 
    249249 
    250250  echo '<a target="_blank" href="'.$freepbx_link_f.'"><img id="footer_logo" src="'.$freepbx_logo_f.'" alt="'.$freepbx_alt_f.'"/></a>'; 

  • freepbx/trunk/amp_conf/htdocs/admin/views/freepbx_reload.php

    r10960 r10963  
    6969<?php 
    7070  global $amp_conf; 
    71   $loading_img = isset($amp_conf['BRAND_IMAGE_RELOAD_LOADING']) ? $amp_conf['BRAND_IMAGE_RELOAD_LOADING'] : 'images/loading.gif'; 
     71  $loading_img = $amp_conf['BRAND_IMAGE_RELOAD_LOADING']; //'images/loading.gif'; 
    7272  if (!$amp_conf['DEVELRELOAD']) { 
    7373?>