[Fmsystem-commits] [10323] Controller: changed setting of date format and action url from ui-class to xsl-file

[Torstein]

Revision: 10323
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10323
Author:   vator
Date:     2012-10-24 07:40:11 +0000 (Wed, 24 Oct 2012)
Log Message:
-----------
Controller: changed setting of date format and action url from ui-class to 
xsl-file

Modified Paths:
--------------
    trunk/controller/inc/class.uicase.inc.php
    trunk/controller/templates/base/case/create_case_message.xsl

Modified: trunk/controller/inc/class.uicase.inc.php
===================================================================
--- trunk/controller/inc/class.uicase.inc.php   2012-10-24 07:36:45 UTC (rev 
10322)
+++ trunk/controller/inc/class.uicase.inc.php   2012-10-24 07:40:11 UTC (rev 
10323)
@@ -232,8 +232,6 @@
                //              'current_month_nr'                      => 
$month,
                                'type'                                          
=> $type,
                                'location_level'                        => 
$level,
-                               'dateformat'                            => 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
-                               'action'                                        
=>      $GLOBALS['phpgw']->link('/index.php', array('menuaction'        => 
'controller.uicase.send_case_message')),
                                'url_calendar_for_year'         =>      
$GLOBALS['phpgw']->link('/index.php', array
                                                                                
                                                                                
(
                                                                                
                                                                                
        'menuaction'    => 'controller.uicalendar.view_calendar_for_year', 
@@ -262,13 +260,9 @@
                                                
                        phpgwapi_jquery::load_widget('core');
 
-//                     self::add_javascript('controller', 'controller', 
'jquery.js');
-//                     self::add_javascript('controller', 'controller', 
'jquery-ui.custom.min.js');
                        self::add_javascript('controller', 'controller', 
'custom_ui.js');
                        self::add_javascript('controller', 'controller', 
'ajax.js');
                        
-//                     
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
-                       
                        
self::render_template_xsl(array('check_list/check_list_tab_menu', 
'case/create_case_message'), $data);
                }
                
@@ -465,13 +459,9 @@
                        
                        phpgwapi_jquery::load_widget('core');
 
-//                     self::add_javascript('controller', 'controller', 
'jquery.js');
-//                     self::add_javascript('controller', 'controller', 
'jquery-ui.custom.min.js');
                        self::add_javascript('controller', 'controller', 
'custom_ui.js');
                        self::add_javascript('controller', 'controller', 
'ajax.js');
                        
-//                     
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
-                       
                        
self::render_template_xsl(array('check_list/check_list_tab_menu', 
'case/view_case_message'), $data);
                }
                

Modified: trunk/controller/templates/base/case/create_case_message.xsl
===================================================================
--- trunk/controller/templates/base/case/create_case_message.xsl        
2012-10-24 07:36:45 UTC (rev 10322)
+++ trunk/controller/templates/base/case/create_case_message.xsl        
2012-10-24 07:40:11 UTC (rev 10323)
@@ -1,6 +1,6 @@
 <!-- $Id: edit_check_list.xsl 8374 2011-12-20 07:45:04Z vator $ -->
 <xsl:template match="data" name="view_check_list" 
xmlns:php="http://php.net/xsl";>
-<xsl:variable name="date_format"><xsl:value-of 
select="dateformat"/></xsl:variable>
+<xsl:variable name="date_format"><xsl:value-of 
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')" 
/></xsl:variable>
 
 <div id="main_content" class="medium">
        
@@ -42,7 +42,11 @@
                        <xsl:choose>
                                <xsl:when 
test="check_items_and_cases/child::node()">
                                
-                               <form ENCTYPE="multipart/form-data" 
id="frmRegCaseMessage" action="{action}" method="post">
+                               <xsl:variable name="action_url">
+                                       <xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', 
'menuaction:controller.uicase.send_case_message')" />
+                               </xsl:variable>
+               
+                               <form ENCTYPE="multipart/form-data" 
id="frmRegCaseMessage" action="{$action_url}" method="post">
                                        <input>
                                                <xsl:attribute 
name="name">check_list_id</xsl:attribute>
                                            <xsl:attribute 
name="type">hidden</xsl:attribute>