- Timestamp:
- 04/07/10 08:17:49 (14 years ago)
- Location:
- trunk
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/calendar/inc/class.uicalendar.inc.php
r2419 r2439 3054 3054 } 3055 3055 } 3056 if( $GLOBALS['phpgw_info']['flags']['currentapp'] == 'home' ||3056 if( !$GLOBALS['phpgw_info']['flags']['currentapp'] || $GLOBALS['phpgw_info']['flags']['currentapp'] == 'home' || 3057 3057 strstr($GLOBALS['phpgw_info']['flags']['currentapp'],'mail')) // email, felamimail, ... 3058 3058 { … … 4916 4916 if ($param['plain'] != "True"){ 4917 4917 // $GLOBALS['phpgw']->common->phpgw_header(); 4918 echo $GLOBALS['phpgw']->common->get_java_script( ); 4918 4919 } 4919 4920 else{ -
trunk/calendar/inc/class.uiholiday.inc.php
r2419 r2439 76 76 'rule' => '', 77 77 'header_rule' => '', 78 'back_button' => '' 78 'back_button' => '', 79 'info' => '' 79 80 ); 80 81 … … 171 172 'header_rule' => '<td>'.$GLOBALS['phpgw']->nextmatchs->show_sort_order($this->bo->sort,'month_num,mday',$this->bo->order,'/index.php',lang('Rule'),'&menuaction=calendar.uiholiday.edit_locale&locale='.$this->bo->locales[0].'&year='.$this->bo->year).'</td>', 172 173 'header_extra' => lang('Copy'), 173 'extra_width' => 'width="5%"' 174 'extra_width' => 'width="5%"', 175 'info' => '' 174 176 ); 175 177 … … 185 187 $maxmatchs = $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']; 186 188 $end = min($total,$this->bo->start+$maxmatchs); 187 $p->set_var(' rows',lang('showing %1 - %2 of %3',1+$this->bo->start,$end,$total));189 $p->set_var('info',lang('showing %1 - %2 of %3',1+$this->bo->start,$end,$total)); 188 190 for($i=$this->bo->start; $i < $end; $i++) 189 191 { … … 254 256 255 257 $t = &$GLOBALS['phpgw']->template; 256 $t->set_file(Array('holiday'=>'holiday.tpl','form_button'=>'form_button_ script.tpl'));258 $t->set_file(Array('holiday'=>'holiday.tpl','form_button'=>'form_button_change_form_action.tpl')); 257 259 $t->set_block('holiday','form','form'); 258 260 $t->set_block('holiday','list','list'); … … 344 346 'action_url_button' => $GLOBALS['phpgw']->link($this->base_url,$link_params), 345 347 'action_text_button' => lang('Cancel'), 346 'action_confirm_button' => '',347 'action_extra_field' => ''348 348 )); 349 349 $t->parse('cancel_button','form_button'); … … 359 359 $t->set_var(Array( 360 360 'action_url_button' => $GLOBALS['phpgw']->link($this->base_url,$link_params), 361 'action_text_button' => lang('Delete'), 362 'action_confirm_button' => '', 363 'action_extra_field' => '' 361 'action_text_button' => lang('Delete') 364 362 )); 365 363 $t->parse('delete_button','form_button'); -
trunk/calendar/templates/default/form_button_dropdown.tpl
r663 r2439 1 <td width="{form_width}%" align="center" valign="top" style="padding-top:16px"> 1 2 <form action="{form_link}" method="post" name="{form_name}form"> 2 <td width="{form_width}%" align="center" valign="top" style="padding-top:16px">3 3 <span style="font-size:10px"><b>{title}:</b> 4 4 {hidden_vars} … … 10 10 </noscript> 11 11 </span> 12 </form> 12 13 </td> 13 </form> -
trunk/calendar/templates/default/holiday.tpl
r2 r2439 2 2 <center> 3 3 {message}<br> 4 <form name="form" action="{actionurl}" method="POST"> 4 5 <table border="0" width="80%" cellspacing="2" cellpadding="2"> 5 <form name="form" action="{actionurl}" method="POST">6 6 {hidden_vars} 7 7 {rows} … … 11 11 <tr> 12 12 <td> 13 <input type="submit" name="submit" value="{lang_add}"></form> 13 <div style="padding-top:15px; padding-right: 2px"> 14 <input type="submit" name="submit" value="{lang_add}"> 15 </div> 14 16 </td> 15 17 <td> … … 24 26 </tr> 25 27 </table> 28 </form> 26 29 </center> 27 30 <!-- END form --> -
trunk/calendar/templates/default/locales.tpl
r2 r2439 8 8 </tr> 9 9 </table> 10 11 <p>{info}</p> 10 12 11 13 <table border="0" width="70%" align="center"> -
trunk/emailadmin/inc/class.ui.inc.php
r2419 r2439 132 132 case 'emailadmin.ui.editProfile': 133 133 $GLOBALS['phpgw']->js->validate_file('jscode','editProfile','emailadmin'); 134 $GLOBALS['phpgw']->js->set_onload('javascript:initAll();');134 //$GLOBALS['phpgw']->js->set_onload('javascript:initAll();'); 135 135 echo $GLOBALS['phpgw']->js->get_script_links(); 136 136 $GLOBALS['phpgw']->js->unset_script_link('emailadmin','jscode'); … … 223 223 224 224 $this->t->parse("out","main"); 225 print $this->t->get('out','main');225 echo "<style>{$this -> css( )}</style>{$this->t->get('out','main')}<script>initAll( );</script>"; 226 226 } 227 227 -
trunk/phpgwapi/inc/class.common.inc.php
r2420 r2439 1232 1232 echo "<script type='text/javascript'>var URL_SERVER = '".$GLOBALS['phpgw_info']['server']['webserver_url']."';</script>"; 1233 1233 echo $GLOBALS['phpgw']->js->get_script_links(); 1234 1235 $GLOBALS['phpgw']->js->unset_script_link( 'phpgwapi','tools' ); 1234 1236 1235 1237 $GLOBALS['phpgw']->js->unset_script_link('phpgwapi','expressoAjax'); -
trunk/phpgwapi/inc/class.jscalendar.inc.php
r771 r2439 83 83 return 84 84 '<input type="text" id="'.$name.'" name="'.$name.'" size="10" value="'.$date.'"'.$options.'/> 85 <img id="'.$name.'-trigger" src="'.$GLOBALS['phpgw']->common->find_image('phpgwpai','datepopup').'" title="'.lang('Select date').'" style="cursor:pointer; cursor:hand;"/> 85 86 <script type="text/javascript"> 86 document.writeln(\'<img id="'.$name.'-trigger" src="'.$GLOBALS['phpgw']->common->find_image('phpgwpai','datepopup').'" title="'.lang('Select date').'" style="cursor:pointer; cursor:hand;"/>\');87 87 Calendar.setup( 88 88 { -
trunk/phpgwapi/inc/class.phpgw.inc.php
r2419 r2439 151 151 if ( strpos( $url, '?' ) === false ) 152 152 $url .= '?'; 153 else 154 $url .= '&'; 153 155 $url .= 'BackgroundRequest=requested'; 154 156 } -
trunk/phpgwapi/js/tools/xlink.js
r2420 r2439 11 11 */ 12 12 var a = ( action.indexOf( 'admin/' ) > 0 || action.indexOf( '=admin.' ) > 0 ); 13 a = ( a || action.indexOf( 'calendar/' ) > 0 || action.indexOf( '=calendar.' ) > 0 ); 13 14 a = ! ( a && ! ( action.indexOf( '#' ) === 0 || action.indexOf( window.location + '#' ) === 0 || action.indexOf( 'javascript:' ) === 0 ) ); 14 15 -
trunk/phpgwapi/js/wz_dragdrop/wz_dragdrop.js
r2 r2439 1315 1315 } 1316 1316 } 1317 if (dd.n4 || dd.n6 || dd.ie || dd.op || dd.w3c) document.write(1318 (dd.n4? '<div style="position:absolute;"><\/div>\n'1319 : (dd.op && !dd.op6)? '<div id="OpBlUr" style="position:absolute;visibility:hidden;width:0px;height:0px;"><form><input type="text" style="width:0px;height:0px;"><\/form><\/div>'1320 : '') + d_htm1321 );1317 //if (dd.n4 || dd.n6 || dd.ie || dd.op || dd.w3c) document.write( 1318 // (dd.n4? '<div style="position:absolute;"><\/div>\n' 1319 // : (dd.op && !dd.op6)? '<div id="OpBlUr" style="position:absolute;visibility:hidden;width:0px;height:0px;"><form><input type="text" style="width:0px;height:0px;"><\/form><\/div>' 1320 // : '') + d_htm 1321 //); 1322 1322 dd.z = 0x33; 1323 1323 d_i = dd.elements.length; while (d_i--)
Note: See TracChangeset
for help on using the changeset viewer.