[Fmsystem-commits] [8316]

[Torstein]

Revision: 8316
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8316
Author:   vator
Date:     2011-12-15 09:46:55 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.uicheck_list_for_location.inc.php
    trunk/controller/inc/class.uicontrol.inc.php
    trunk/controller/templates/base/control.xsl

Modified: trunk/controller/inc/class.uicheck_list_for_location.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list_for_location.inc.php        
2011-12-15 09:38:03 UTC (rev 8315)
+++ trunk/controller/inc/class.uicheck_list_for_location.inc.php        
2011-12-15 09:46:55 UTC (rev 8316)
@@ -341,7 +341,8 @@
                        (
                                'location_array'        => $location_array,
                                'control_array'         => $control->toArray(),
-                               'calendar_array'        => $calendar_array,     
                        
+                               'calendar_array'        => $calendar_array
+                               'date_format'           => $date_format         
        
                        );
                        
                        self::add_javascript('controller', 'controller', 
'jquery.js');

Modified: trunk/controller/inc/class.uicontrol.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol.inc.php        2011-12-15 09:38:03 UTC 
(rev 8315)
+++ trunk/controller/inc/class.uicontrol.inc.php        2011-12-15 09:46:55 UTC 
(rev 8316)
@@ -211,14 +211,16 @@
                                'control'                                       
=> (isset($control)) ? $control->toArray(): null,
                                'control_areas_array'           => 
$control_areas_array,
                                'procedures_array'                      => 
$procedures_array,
-                               'role_array'                            => 
$role_array,
-                               'start_date'                            => 
$GLOBALS['phpgw']->yuical->add_listener('start_date',date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
 time())),
-                               'end_date'                                      
=> 
$GLOBALS['phpgw']->yuical->add_listener('end_date',date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
 ''))
+                               'role_array'                            => 
$role_array
                        );
                        
                        self::add_javascript('controller', 'yahoo', 
'control_tabs.js');
                        self::add_javascript('controller', 'controller', 
'jquery.js');
                        self::add_javascript('controller', 'controller', 
'ajax.js');
+                       self::add_javascript('controller', 'controller', 
'jquery-ui.custom.min.js');
+                       
+                       
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
+                       
                        self::render_template_xsl(array('control_tabs', 
'control'), $data);
                        
                        $this->use_yui_editor(array('description'));

Modified: trunk/controller/templates/base/control.xsl
===================================================================
--- trunk/controller/templates/base/control.xsl 2011-12-15 09:38:03 UTC (rev 
8315)
+++ trunk/controller/templates/base/control.xsl 2011-12-15 09:46:55 UTC (rev 
8316)
@@ -4,7 +4,23 @@
 <xsl:variable name="control_id"><xsl:value-of 
select="control/id"/></xsl:variable>
 <xsl:variable name="control_area_id"><xsl:value-of 
select="control/control_area_id"/></xsl:variable>
 <xsl:variable name="control_procedure_id"><xsl:value-of 
select="control/procedure_id"/></xsl:variable>
+<xsl:variable name="date_format">d/m-Y</xsl:variable>
 
+<script>
+               $(function() {
+                       $( "#start_date" ).datepicker({ 
+                               monthNames: 
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
+                               dayNamesMin: ['Sø', 'Ma', 'Ti', 'On', 'To', 
'Fr', 'Lø'],
+                               dateFormat: 'd/m-yy' 
+                       });
+                       $( "#end_date" ).datepicker({ 
+                               monthNames: 
['Januar','Februar','Mars','April','Mai','Juni','Juli','August','September','Oktober','November','Desember'],
+                               dayNamesMin: ['Sø', 'Ma', 'Ti', 'On', 'To', 
'Fr', 'Lø'],
+                               dateFormat: 'd/m-yy' 
+                       });     
+               });
+       </script>
+
 <div class="yui-content">
        <div id="control_details">
                <form 
action="index.php?menuaction=controller.uicontrol.save_control_details" 
method="post">
@@ -87,13 +103,27 @@
                                        <label 
for="start_date">Startdato</label>
                                </dt>
                                <dd>
-                                       <xsl:value-of 
disable-output-escaping="yes" select="start_date"/>
+                                       <input>
+                                     <xsl:attribute 
name="id">start_date</xsl:attribute>
+                                     <xsl:attribute 
name="name">start_date</xsl:attribute>
+                                     <xsl:attribute 
name="type">text</xsl:attribute>
+                                     <xsl:if test="control/start_date != ''">
+                                       <xsl:attribute 
name="value"><xsl:value-of select="php:function('date', $date_format, 
number(control/start_date))"/></xsl:attribute>
+                                     </xsl:if>
+                                   </input>
                                </dd>
                                <dt>
                                        <label for="end_date">Sluttdato</label>
                                </dt>
                                <dd>
-                                       <xsl:value-of 
disable-output-escaping="yes" select="end_date"/>
+                                       <input>
+                                     <xsl:attribute 
name="id">end_date</xsl:attribute>
+                                     <xsl:attribute 
name="name">end_date</xsl:attribute>
+                                     <xsl:attribute 
name="type">text</xsl:attribute>
+                                     <xsl:if test="control/end_date != 0">
+                                       <xsl:attribute 
name="value"><xsl:value-of select="php:function('date', $date_format, 
number(control/end_date))"/></xsl:attribute>
+                                     </xsl:if>
+                                   </input>
                                </dd>
                                <dt>
                                        <label>Frekvenstype</label>