Changeset 2495
- Timestamp:
- 04/13/10 11:43:13 (14 years ago)
- Location:
- trunk
- Files:
-
- 10 edited
-
expressoMail1_2/inc/hook_settings.inc.php (modified) (3 diffs)
-
mobile/inc/class.ui_preferences.inc.php (modified) (2 diffs)
-
phpgwapi/js/tools/xlink.js (modified) (1 diff)
-
phpgwapi/templates/classic/navbar.tpl (modified) (1 diff)
-
phpgwapi/templates/default/navbar.tpl (modified) (1 diff)
-
preferences/changepassword.php (modified) (2 diffs)
-
preferences/changepersonaldata.php (modified) (3 diffs)
-
preferences/inc/class.uiaclprefs.inc.php (modified) (1 diff)
-
preferences/inc/class.uicategories.inc.php (modified) (4 diffs)
-
preferences/preferences.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/inc/hook_settings.inc.php
r2027 r2495 236 236 //document.getElementById('user_signature').value = '".$vars['signature']."'; 237 237 function changeType(value){ 238 if( typeof FCKeditorAPI == 'undefined' ) 239 return false; 238 240 var html_signature = FCKeditorAPI.GetInstance(\"html_signature\"); 239 241 value=value.replace('d',''); … … 402 404 var elementoSelects = document.getElementsByTagName('select'); 403 405 404 if ( elementoSelects [18].name == \"user[type_signature]\" ) {406 if ( elementoSelects.length && elementoSelects[18].name == \"user[type_signature]\" ) { 405 407 return elementoSelects[18]; 406 408 } … … 416 418 function config_form(pObj,pHandler) 417 419 { 420 if ( typeof pObj != 'undefined' ) 418 421 pObj.onclick=function () { 419 if (getTypeSignature().value == \"html\" || getTypeSignature().value == \"htmld\") { 422 var signature = getTypeSignature( ); 423 if ( signature && signature.value == \"html\" || signature.value == \"htmld\") { 420 424 return pHandler(\"text\"); 421 425 } -
trunk/mobile/inc/class.ui_preferences.inc.php
r691 r2495 24 24 { 25 25 $GLOBALS['phpgw_info']['flags']['app_header'] = lang('Preferences').' - '.lang('Mobile'); 26 $GLOBALS['phpgw']->common->phpgw_header();27 echo parse_navbar();26 //$GLOBALS['phpgw']->common->phpgw_header(); 27 //echo parse_navbar(); 28 28 29 29 $GLOBALS['phpgw']->template->set_file(array('pref' => 'preferences.tpl')); … … 84 84 } 85 85 86 header('Location: '.$GLOBALS['phpgw']->link('/preferences/index.php'));86 $GLOBALS['phpgw']->redirect_link( '/preferences/index.php' ); 87 87 } 88 88 -
trunk/phpgwapi/js/tools/xlink.js
r2483 r2495 14 14 a = ( a || ( action.indexOf( window.location + '#' ) === 0 ) ); 15 15 */ 16 var a = ( action.indexOf( 'admin /' ) > 0 || action.indexOf( 'admin.' ) > 0 );16 var a = ( action.indexOf( 'admin' ) > 0 ); 17 17 a = ( a || action.indexOf( 'home' ) > 0 ); 18 18 a = ( a || action.indexOf( 'contactcenter' ) > 0 ); 19 19 a = ( a || action.indexOf( 'expressoAdmin1_2' ) > 0 ); 20 20 a = ( a || action.indexOf( 'filemanager' ) > 0 ); 21 a = ( a || action.indexOf( 'abberit_messenger' ) > 0 ); 22 a = ( a || action.indexOf( 'calendar/' ) > 0 || action.indexOf( '=calendar.' ) > 0 ); 21 a = ( a || action.indexOf( 'jabberit_messenger' ) > 0 ); 22 a = ( a || action.indexOf( 'preferences' ) > 0 ); 23 a = ( a || action.indexOf( 'calendar' ) > 0 ); 23 24 a = ! ( a && ! ( action.indexOf( '#' ) === 0 || action.indexOf( window.location + '#' ) === 0 || action.indexOf( 'javascript:' ) === 0 ) ); 24 25 -
trunk/phpgwapi/templates/classic/navbar.tpl
r1151 r2495 73 73 <td width="30%" id="admin_info" nowrap>{current_users}</td> 74 74 <td style="padding-right:10px" width="*" align="right" valign="center" nowrap="true"> 75 <a href="{dir_root}/preferences " title="{title_my_preferences}" alt="{title_my_preferences}" onmouseover="javascript:self.status='{title_my_preferences}'" onmouseout="javascript:self.status=''"><img height="15px" src="{dir_root}/phpgwapi/templates/celepar/images/preferences.png"><font size="-1">{my_preferences}</font></a>75 <a href="{dir_root}/preferences/" title="{title_my_preferences}" alt="{title_my_preferences}" onmouseover="javascript:self.status='{title_my_preferences}'" onmouseout="javascript:self.status=''"><img height="15px" src="{dir_root}/phpgwapi/templates/celepar/images/preferences.png"><font size="-1">{my_preferences}</font></a> 76 76 77 77 <a href="#" title="{title_suggestions}" alt="{title_suggestions}" onmouseover="javascript:self.status='{title_suggestions}'" onmouseout="javascript:self.status=''" onclick="javascript:openWindow(400,550,'{dir_root}/help/enviasugestao.php')"><img src="{dir_root}/phpgwapi/templates/celepar/images/criticas.jpg"><font size="-1">{suggestions}</font></a> -
trunk/phpgwapi/templates/default/navbar.tpl
r1860 r2495 99 99 <td width="30%" id="admin_info" nowrap>{current_users}</td> 100 100 <td style="padding-right:10px" width="*" align="right" valign="center" nowrap="true"> 101 <a href="{dir_root}/preferences " title="{title_my_preferences}" alt="{title_my_preferences}" onmouseover="javascript:self.status='{title_my_preferences}'" onmouseout="javascript:self.status=''"><img height="15px" src="{dir_root}/phpgwapi/templates/{template}/images/preferences.png"><font id="links_bar">{my_preferences}</font></a>101 <a href="{dir_root}/preferences/" title="{title_my_preferences}" alt="{title_my_preferences}" onmouseover="javascript:self.status='{title_my_preferences}'" onmouseout="javascript:self.status=''"><img height="15px" src="{dir_root}/phpgwapi/templates/{template}/images/preferences.png"><font id="links_bar">{my_preferences}</font></a> 102 102 103 103 <a href="#" title="{title_suggestions}" alt="{title_suggestions}" onmouseover="javascript:self.status='{title_suggestions}'" onmouseout="javascript:self.status=''" onclick="javascript:openWindow(400,550,'{dir_root}/help/enviasugestao.php')"><img src="{dir_root}/phpgwapi/templates/{template}/images/critic.png"><font id="links_bar">{suggestions}</font></a> -
trunk/preferences/changepassword.php
r1681 r2495 13 13 14 14 $GLOBALS['phpgw_info']['flags'] = array( 15 'noheader' => True,16 'nonavbar' => True,15 //'noheader' => True, 16 //'nonavbar' => True, 17 17 'currentapp' => 'preferences' 18 18 ); … … 94 94 95 95 if ($GLOBALS['phpgw_info']['server']['use_https'] == 1) 96 Header('Location: http://' . $_SERVER['HTTP_HOST'] . $GLOBALS['phpgw_info']['server']['webserver_url'] . '/preferences/index.php');96 $GLOBALS[ 'phpgw' ] -> redirect_link( '/preferences/index.php' ); 97 97 else 98 $GLOBALS[ 'phpgw']->redirect_link('/preferences/index.php');98 $GLOBALS[ 'phpgw' ] -> redirect_link( '/preferences/index.php' ); 99 99 100 100 $GLOBALS['phpgw']->common->phpgw_exit(); -
trunk/preferences/changepersonaldata.php
r1225 r2495 15 15 16 16 $GLOBALS['phpgw_info']['flags'] = array( 17 'noheader' => True,18 'nonavbar' => True,17 //'noheader' => True, 18 //'nonavbar' => True, 19 19 'currentapp' => 'preferences' 20 20 ); … … 104 104 if(is_array($errors)) 105 105 { 106 $GLOBALS['phpgw']->common->phpgw_header();107 echo parse_navbar();106 //$GLOBALS['phpgw']->common->phpgw_header(); 107 //echo parse_navbar(); 108 108 $GLOBALS['phpgw']->template->set_var('messages',$GLOBALS['phpgw']->common->error_list($errors)); 109 109 $GLOBALS['phpgw']->template->pfp('out','form'); … … 116 116 { 117 117 $GLOBALS['phpgw_info']['flags']['app_header'] = lang('Change your Personal Data'); 118 $GLOBALS['phpgw']->common->phpgw_header();119 echo parse_navbar();118 //$GLOBALS['phpgw']->common->phpgw_header(); 119 //echo parse_navbar(); 120 120 121 121 $GLOBALS['phpgw']->template->pfp('out','form'); -
trunk/preferences/inc/class.uiaclprefs.inc.php
r1496 r2495 177 177 } 178 178 179 $GLOBALS['phpgw']->common->phpgw_header();180 echo parse_navbar();179 //$GLOBALS['phpgw']->common->phpgw_header(); 180 //echo parse_navbar(); 181 181 182 182 $this->template = CreateObject('phpgwapi.Template',$GLOBALS['phpgw']->common->get_tpl_dir('preferences')); -
trunk/preferences/inc/class.uicategories.inc.php
r1623 r2495 112 112 $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps'][$cats_app]['title']. 113 113 ' '.lang('categories for').': '.$this->user; 114 $GLOBALS['phpgw']->common->phpgw_header();115 echo parse_navbar();114 //$GLOBALS['phpgw']->common->phpgw_header(); 115 //echo parse_navbar(); 116 116 117 117 $GLOBALS['phpgw']->template->set_file(array( … … 341 341 $GLOBALS['phpgw_info']['flags']['app_header'] = lang('Add %1 category for', 342 342 $GLOBALS['phpgw_info']['apps'][$cats_app]['title']).': '.$this->user; 343 $GLOBALS['phpgw']->common->phpgw_header();344 echo parse_navbar();343 //$GLOBALS['phpgw']->common->phpgw_header(); 344 //echo parse_navbar(); 345 345 346 346 $GLOBALS['phpgw']->template->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php',$link_data)); … … 461 461 $GLOBALS['phpgw_info']['flags']['app_header'] = lang('Edit %1 category for', 462 462 $GLOBALS['phpgw_info']['apps'][$cats_app]['title']).': '.$this->user; 463 $GLOBALS['phpgw']->common->phpgw_header();464 echo parse_navbar();463 //$GLOBALS['phpgw']->common->phpgw_header(); 464 //echo parse_navbar(); 465 465 466 466 $cats = $this->bo->cats->return_single($cat_id); … … 561 561 562 562 $GLOBALS['phpgw_info']['flags']['app_header'] = lang('Delete Categories'); 563 $GLOBALS['phpgw']->common->phpgw_header();564 echo parse_navbar();563 //$GLOBALS['phpgw']->common->phpgw_header(); 564 //echo parse_navbar(); 565 565 566 566 $GLOBALS['phpgw']->template->set_var('deleteheader',lang('Are you sure you want to delete this category ?')); -
trunk/preferences/preferences.php
r2031 r2495 12 12 13 13 $GLOBALS['phpgw_info']['flags'] = array( 14 'noheader' => True,14 //'noheader' => True, 15 15 'noappheader' => True, 16 'nonavbar' => True,16 //'nonavbar' => True, 17 17 'currentapp' => @addslashes($_GET['appname']) ? addslashes($_GET['appname']) : 'preferences', 18 18 'enable_nextmatchs_class' => True … … 508 508 $GLOBALS['phpgw_info']['flags']['app_header'] = $_GET['appname'] == 'preferences' ? 509 509 lang('Preferences') : lang('%1 - Preferences',$GLOBALS['phpgw_info']['apps'][$_GET['appname']]['title']); 510 $GLOBALS['phpgw']->common->phpgw_header();511 echo parse_navbar();510 //$GLOBALS['phpgw']->common->phpgw_header(); 511 //echo parse_navbar(); 512 512 513 513 $t->set_var('messages',$error);
Note: See TracChangeset
for help on using the changeset viewer.
