[Fmsystem-commits] [8940]

[Torstein]

Revision: 8940
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8940
Author:   vator
Date:     2012-02-21 11:15:54 +0000 (Tue, 21 Feb 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/model/class.control.inc.php
    trunk/controller/js/controller/custom_ui.js
    trunk/controller/templates/base/control_item/choose_control_items.xsl
    trunk/controller/templates/base/css/base.css

Modified: trunk/controller/inc/model/class.control.inc.php
===================================================================
--- trunk/controller/inc/model/class.control.inc.php    2012-02-21 09:30:04 UTC 
(rev 8939)
+++ trunk/controller/inc/model/class.control.inc.php    2012-02-21 11:15:54 UTC 
(rev 8940)
@@ -268,13 +268,19 @@
                                
$this->set_title(phpgw::get_var('title','string'));
                                
$this->set_description(phpgw::get_var('description','html'));
                                
-                               $start_date_ts = 
date_helper::get_timestamp_from_date( phpgw::get_var('start_date','string'), 
"d/m-Y" );
-                               $this->set_start_date($start_date_ts);
-                               
-                               if( phpgw::get_var('end_date','string') != ""){
+                               if(phpgw::get_var('start_date','string') != '')
+                               {
+                                       $start_date_ts = 
date_helper::get_timestamp_from_date( phpgw::get_var('start_date','string'), 
"d/m-Y" );
+                                       $this->set_start_date($start_date_ts);
+                               }else
+                                       $this->set_start_date(0);
+                                                               
+                               if( phpgw::get_var('end_date','string') != '')
+                               {
                                        $end_date_ts = 
date_helper::get_timestamp_from_date( phpgw::get_var('end_date','string'), 
"d/m-Y" );
                                        $this->set_end_date( $end_date_ts );
-                               }else{
+                               }else
+                               {
                                        $this->set_end_date( 0 );
                                }
                                
@@ -299,8 +305,7 @@
                                'control_area_name' => 
$this->get_control_area_name(),
                                'repeat_type' => $this->get_repeat_type(),
                                'repeat_interval' => 
$this->get_repeat_interval(),
-                               'responsibility_name' => 
$this->get_responsibility_name(),
-                       
-                               );
+                               'responsibility_name' => 
$this->get_responsibility_name()
+                       );
                }
        }

Modified: trunk/controller/js/controller/custom_ui.js
===================================================================
--- trunk/controller/js/controller/custom_ui.js 2012-02-21 09:30:04 UTC (rev 
8939)
+++ trunk/controller/js/controller/custom_ui.js 2012-02-21 11:15:54 UTC (rev 
8940)
@@ -18,6 +18,9 @@
                }
        });
        
+       
+       /* ==========================  EXPANDING/COLLAPSING ALL LISTS 
====================== */
+       
        $(".expand_all").live("click", function(){
                $(this).addClass("focus");
                $(".collapse_all").removeClass("focus");

Modified: trunk/controller/templates/base/control_item/choose_control_items.xsl
===================================================================
--- trunk/controller/templates/base/control_item/choose_control_items.xsl       
2012-02-21 09:30:04 UTC (rev 8939)
+++ trunk/controller/templates/base/control_item/choose_control_items.xsl       
2012-02-21 11:15:54 UTC (rev 8940)
@@ -18,7 +18,7 @@
                        
                        <ul class="control_items">
                                <xsl:for-each 
select="groups_with_control_items">
-                                       <ul class="itemlist expand_list">
+                                       <ul class="expand_list">
                                        <li>
                                                <xsl:choose>
                                                        <xsl:when 
test="group_control_items/child::node()">
@@ -29,10 +29,10 @@
                                                                                
<xsl:variable name="control_item_id"><xsl:value-of 
select="control_item/id"/></xsl:variable>
                                                                                
<xsl:choose>
                                                                                
        <xsl:when test="checked = 1">
-                                                                               
                <li><xsl:number/>.  <input type="checkbox"  checked="checked" 
id="ch_{$control_group_id}:{$control_item_id}" 
value="{$control_group_id}:{$control_item_id}" /><xsl:value-of 
select="control_item/title"/></li>
+                                                                               
                <li><span><xsl:number/>.</span><input type="checkbox"  
checked="checked" id="ch_{$control_group_id}:{$control_item_id}" 
value="{$control_group_id}:{$control_item_id}" /><xsl:value-of 
select="control_item/title"/></li>
                                                                                
        </xsl:when>
                                                                                
        <xsl:otherwise>
-                                                                               
                <li><xsl:number/>.  <input type="checkbox"  
id="ch_{$control_group_id}:{$control_item_id}" 
value="{$control_group_id}:{$control_item_id}" /><xsl:value-of 
select="control_item/title"/></li>
+                                                                               
                <li><span><xsl:number/>.</span><input type="checkbox"  
id="ch_{$control_group_id}:{$control_item_id}" 
value="{$control_group_id}:{$control_item_id}" /><xsl:value-of 
select="control_item/title"/></li>
                                                                                
        </xsl:otherwise>
                                                                                
</xsl:choose>
                                                                        
</xsl:for-each>

Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css        2012-02-21 09:30:04 UTC 
(rev 8939)
+++ trunk/controller/templates/base/css/base.css        2012-02-21 11:15:54 UTC 
(rev 8940)
@@ -471,6 +471,47 @@
        list-style-position: inside;
 }
 
+
+/* =======================================  ITEM LIST  
========================================= */
+
+ul.itemlist {
+    position: relative;
+}
+ul.itemlist li {
+    padding: 3px 0;
+}
+
+ul.itemlist li.odd{
+    background: none repeat scroll 0 0 #DBE7F5;
+}
+
+ul.itemlist h3 {
+    font-size: 18px;
+    margin: 0 0 5px;
+}
+
+ul.groups {
+    position: relative;
+}
+ul.groups li {
+    padding: 3px 0;
+}
+
+ul.groups li.odd{
+    background: none repeat scroll 0 0 #DBE7F5;
+}
+
+ul.groups h3 {
+    font-size: 18px;
+    margin: 0 0 5px;
+}
+
+.drag_group {
+       width: 650px;
+}
+
+/* =======================================  EXPAND LIST  
========================================= */
+
 ul.expand_list h4 {
     cursor: pointer;
     font-size: 17px;
@@ -483,10 +524,15 @@
     margin-left:21px;
 }
 
-ul.expand_list li ul li{
+ul.expand_list li ul li {
     margin-bottom: 3px;
+    padding: 3px;
 }
 
+ul.expand_list input {
+    margin: 0 8px 0 5px;
+}
+
 ul.expand_list h4 span {
     padding-left: 5px;
     vertical-align: middle;
@@ -512,42 +558,6 @@
        padding:20px;
 }
 
-ul.itemlist {
-    position: relative;
-}
-ul.itemlist li {
-    padding: 3px 0;
-}
-
-ul.itemlist li.odd{
-    background: none repeat scroll 0 0 #DBE7F5;
-}
-
-ul.itemlist h3 {
-    font-size: 18px;
-    margin: 0 0 5px;
-}
-
-ul.groups {
-    position: relative;
-}
-ul.groups li {
-    padding: 3px 0;
-}
-
-ul.groups li.odd{
-    background: none repeat scroll 0 0 #DBE7F5;
-}
-
-ul.groups h3 {
-    font-size: 18px;
-    margin: 0 0 5px;
-}
-
-.drag_group {
-       width: 650px;
-}
-
 .yui-content h2{
     margin:0 0 10px;
 }
@@ -1004,6 +1014,9 @@
 textarea{
        padding: 4px;   
 }
+
+/*==================================  EXPAND MENU  
======================================== */
+
 .expand_menu div.focus{
        background: url('../../../images/bg_expand_active.png') no-repeat;
        color: #FFF;