- Timestamp:
- 07/14/10 17:19:29 (14 years ago)
- Location:
- branches/2.2
- Files:
-
- 6 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.2/admin/templates/default/config.tpl
r1517 r3052 7 7 <!-- END header --> 8 8 <!-- BEGIN body --> 9 <tr class="row_o n">9 <tr class="row_off"> 10 10 <td>{lang_Time_for_expire_inatives_accounts(0 for never expires)}:</td> 11 11 <td><input size="8" name="newsettings[time_to_account_expires]" value="{value_time_to_account_expires}"></td> 12 12 </tr> 13 <tr class="row_o ff">13 <tr class="row_on"> 14 14 <td>{lang_Timeout_for_sessions_in_seconds_(default_14400_=_4_hours)}:</td> 15 15 <td><input size="8" name="newsettings[sessions_timeout]" value="{value_sessions_timeout}"></td> 16 16 </tr> 17 17 18 <tr class="row_o n">18 <tr class="row_off"> 19 19 <td>{lang_Timeout_for_application_session_data_in_seconds_(default_86400_=_1_day)}:</td> 20 20 <td><input size="8" name="newsettings[sessions_app_timeout]" value="{value_sessions_app_timeout}"></td> 21 21 </tr> 22 22 23 <tr class="row_o ff">23 <tr class="row_on"> 24 24 <td>{lang_Would_you_like_to_show_each_application's_upgrade_status_?}:</td><td> 25 25 <select name="newsettings[checkappversions]"> … … 30 30 </td> 31 31 </tr> 32 <tr class="row_o n">32 <tr class="row_off"> 33 33 <td>{lang_Would_you_like_to_automaticaly_load_new_langfiles_(at_login-time)_?}:</td> 34 34 <td> … … 39 39 </td> 40 40 </tr> 41 41 <tr class="row_on"> 42 <td>{lang_enable_stylesheet_packer_?}:</td><td> 43 <select name="newsettings[csspacker]"> 44 <option value="False"{selected_csspacker_False}>{lang_No}</option> 45 <option value="True"{selected_csspacker_True}>{lang_Yes}</option> 46 </select> 47 </td> 48 </tr> 42 49 <tr class="row_off"> 43 50 <td>{lang_Should_the_login_page_include_a_language_selectbox_(useful_for_demo-sites)_?}:</td> -
branches/2.2/expressoMail1_2/index.php
r3018 r3052 12 12 $update_version = $GLOBALS['phpgw_info']['flags']['update_version']; 13 13 $_SESSION['phpgw_info']['expressomail']['user'] = $GLOBALS['phpgw_info']['user']; 14 echo '<link rel="stylesheet" type="text/css" href="templates/'.$_SESSION['phpgw_info']['expressoMail1_2']['user']['preferences']['common']['template_set'].'/main.css">'; 15 echo '<link rel="stylesheet" type="text/css" href="../phpgwapi/js/dftree/dftree.css">'; 14 $GLOBALS['phpgw']->css->validate_file('expressoMail1_2/templates/' . $GLOBALS['phpgw_info']['server']['template_set'] . '/main.css'); 15 $GLOBALS['phpgw']->css->validate_file('phpgwapi/js/dftree/dftree.css'); 16 echo $GLOBALS['phpgw']->css->get_css(); 16 17 echo "<script type='text/javascript'>var template = '".$_SESSION['phpgw_info']['expressoMail1_2']['user']['preferences']['common']['template_set']."';</script>"; 17 18 echo "<script src='js/modal/modal.js'></script>"; -
branches/2.2/phpgwapi/inc/class.common.inc.php
r3018 r3052 1267 1267 if ( @ isset( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ] ) ) 1268 1268 { 1269 $css = "/%s/templates/%s/%s.css"; 1270 1271 global $path, $link, $template; 1272 1273 $path = PHPGW_SERVER_ROOT . str_replace( '/', SEP, $css ); 1274 1275 $link = '<LINK href="%s" type="text/css" rel="StyleSheet">'; 1276 $link = sprintf( $link, 1277 "{$GLOBALS[ 'phpgw_info' ][ 'server' ][ 'webserver_url' ]}{$css}" 1278 ); 1279 1280 $template = $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'template_set' ]; 1281 1282 function _css( $module, $css ) 1283 { 1284 global $link, $path, $template; 1285 1286 if ( file_exists( sprintf( $path, $module, $template, str_replace( '/', SEP, $css ) ) ) ) 1287 return sprintf( $link, $module, $template, $css ); 1288 1289 if ( file_exists( sprintf( $path, $module, 'default', str_replace( '/', SEP, $css ) ) ) ) 1290 return sprintf( $link, $module, 'default', $css ); 1291 1292 return ''; 1293 } 1294 1295 $css = _css( 'phpgwapi', 'css/base' ); 1296 $css .= _css( 'phpgwapi', "css/{$GLOBALS[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'common' ][ 'theme' ]}" ); 1297 $css .= _css( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ], "css/{$GLOBALS[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'common' ][ 'theme' ]}" ); 1298 $css .= _css( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ], 'app' ); 1299 1300 if ( $css ) 1301 $tpl -> set_var( 'css_file', $css ); 1269 $template = $GLOBALS['phpgw_info']['server']['template_set']; 1270 $GLOBALS['phpgw']->css->validate_file( "phpgwapi/templates/".$template."/css/base.css"); 1271 $GLOBALS['phpgw']->css->validate_file( "phpgwapi/templates/".$template."/css/".$GLOBALS[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'common' ][ 'theme' ].".css"); 1272 $GLOBALS['phpgw']->css->validate_file( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ]."/templates/".$template."/css/".$GLOBALS[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'common' ][ 'theme' ].".css"); 1273 $GLOBALS['phpgw']->css->validate_file( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ]."/templates/".$template."/css/app.css"); 1274 1275 $tpl -> set_var( 'css_file', $GLOBALS['phpgw']->css->get_css() ); 1276 1302 1277 } 1303 1278 -
branches/2.2/phpgwapi/inc/functions.inc.php
r3018 r3052 251 251 $GLOBALS['phpgw']->preferences = CreateObject('phpgwapi.preferences'); 252 252 $GLOBALS['phpgw']->applications = CreateObject('phpgwapi.applications'); 253 $GLOBALS['phpgw']->css = CreateObject('phpgwapi.css'); 253 254 print_debug('main class loaded', 'messageonly','api'); 254 255 if (! isset($GLOBALS['phpgw_info']['flags']['included_classes']['error']) ||
Note: See TracChangeset
for help on using the changeset viewer.