Changeset 2439 for trunk/calendar

Timestamp:

04/07/10 08:17:49 (14 years ago)

Author:

rodsouza

Message:

Ticket #1009 - Permitindo que o ExpressoCalendar? não realize reload de página.

Location:

trunk/calendar

Files:

• inc/class.uicalendar.inc.php (modified) (2 diffs)
• inc/class.uiholiday.inc.php (modified) (6 diffs)
• templates/default/form_button_dropdown.tpl (modified) (2 diffs)
• templates/default/holiday.tpl (modified) (3 diffs)
• templates/default/locales.tpl (modified) (1 diff)

trunk/calendar/inc/class.uicalendar.inc.php

@@ -3054 +3054 @@
                                 }
                         }
-                        if($GLOBALS['phpgw_info']['flags']['currentapp'] == 'home' ||
+                        if( !$GLOBALS['phpgw_info']['flags']['currentapp'] || $GLOBALS['phpgw_info']['flags']['currentapp'] == 'home' || 
                                 strstr($GLOBALS['phpgw_info']['flags']['currentapp'],'mail'))   // email, felamimail, ...
                         {
@@ -4916 +4916 @@
                         if ($param['plain'] != "True"){
                         //      $GLOBALS['phpgw']->common->phpgw_header();
+                                echo $GLOBALS['phpgw']->common->get_java_script( );
                         }
                         else{

trunk/calendar/inc/class.uiholiday.inc.php

@@ -76 +76 @@
                                 'rule'         => '',
                                 'header_rule'  => '',
-                                'back_button'   => ''
+                                'back_button'   => '',
+                                'info' => ''
                         );
 
@@ -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>',
                                 'header_extra'          => lang('Copy'),
-                                'extra_width'           => 'width="5%"'
+                                'extra_width'           => 'width="5%"',
+                                'info'                          => ''
                         );
 
@@ -185 +187 @@
                                 $maxmatchs = $GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
                                 $end = min($total,$this->bo->start+$maxmatchs);
-                                $p->set_var('rows',lang('showing %1 - %2 of %3',1+$this->bo->start,$end,$total));
+                                $p->set_var('info',lang('showing %1 - %2 of %3',1+$this->bo->start,$end,$total));
                                 for($i=$this->bo->start; $i < $end; $i++)
                                 {
@@ -254 +256 @@
 
                         $t = &$GLOBALS['phpgw']->template;
-                        $t->set_file(Array('holiday'=>'holiday.tpl','form_button'=>'form_button_script.tpl'));
+                        $t->set_file(Array('holiday'=>'holiday.tpl','form_button'=>'form_button_change_form_action.tpl'));
                         $t->set_block('holiday','form','form');
                         $t->set_block('holiday','list','list');
@@ -344 +346 @@
                                 'action_url_button'     => $GLOBALS['phpgw']->link($this->base_url,$link_params),
                                 'action_text_button'    => lang('Cancel'),
-                                'action_confirm_button' => '',
-                                'action_extra_field'    => ''
                         ));
                         $t->parse('cancel_button','form_button');
@@ -359 +359 @@
                                 $t->set_var(Array(
                                         'action_url_button'     => $GLOBALS['phpgw']->link($this->base_url,$link_params),
-                                        'action_text_button'    => lang('Delete'),
-                                        'action_confirm_button' => '',
-                                        'action_extra_field'    => ''
+                                        'action_text_button'    => lang('Delete')
                                 ));
                                 $t->parse('delete_button','form_button');

trunk/calendar/templates/default/form_button_dropdown.tpl

@@ +1 @@
+<td width="{form_width}%" align="center" valign="top" style="padding-top:16px">
 <form action="{form_link}" method="post" name="{form_name}form">
-<td width="{form_width}%" align="center" valign="top" style="padding-top:16px">
         <span style="font-size:10px"><b>{title}:</b>
     {hidden_vars}    
@@ -10 +10 @@
     </noscript>
         </span>
+</form>
 </td>
-</form>

trunk/calendar/templates/default/holiday.tpl

@@ -2 +2 @@
 <center>
 {message}<br>
+ <form name="form" action="{actionurl}" method="POST">
 <table border="0" width="80%" cellspacing="2" cellpadding="2"> 
- <form name="form" action="{actionurl}" method="POST">
   {hidden_vars}
 {rows}
@@ -11 +11 @@
     <tr>
      <td>
-      <input type="submit" name="submit" value="{lang_add}"></form>
+          <div style="padding-top:15px; padding-right: 2px">
+       <input type="submit" name="submit" value="{lang_add}">
+          </div>
      </td>
      <td>
@@ -24 +26 @@
  </tr>
 </table>
+</form>
 </center>
 <!-- END form -->

trunk/calendar/templates/default/locales.tpl

@@ -8 +8 @@
   </tr>
  </table>
+
+ <p>{info}</p>
 
  <table border="0" width="70%" align="center">