[Fmsystem-commits] [8024]

[Torstein]

Revision: 8024
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8024
Author:   vator
Date:     2011-11-04 19:02:31 +0000 (Fri, 04 Nov 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/templates/base/css/base.css
    trunk/controller/templates/base/view_check_list.xsl

Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css        2011-11-04 16:36:25 UTC 
(rev 8023)
+++ trunk/controller/templates/base/css/base.css        2011-11-04 19:02:31 UTC 
(rev 8024)
@@ -694,19 +694,36 @@
        padding:0;
        margin:0;       
 }
+
+#main_content h1{
+       margin-top:0;
+}
+
 .check_list li div{
-       margin:2px;
+       margin:3px;
        width:200px;
        float:left;
+       padding:2px;
+       text-align:center;      
 }
 .check_list li.heading{
        font-weight:bold;
-       padding-left:18px;
+       padding-left:25px;
     background: 
url("../../../../phpgwapi/js/yahoo/assets/skins/sam/sprite.png") repeat-x 
scroll 0 -100px #D8D8DA;
 }
+.check_list li.heading div{
+       padding:1px;
+}
 .check_list li div.order_nr{
        width:15px;
 }
+.check_list li div.status {
+    padding-left: 10px;
+    width: 50px;
+}
 .check_list li{
        overflow:hidden;
+}
+fieldset.control_details label{
+       font-weight:bold;
 }
\ No newline at end of file

Modified: trunk/controller/templates/base/view_check_list.xsl
===================================================================
--- trunk/controller/templates/base/view_check_list.xsl 2011-11-04 16:36:25 UTC 
(rev 8023)
+++ trunk/controller/templates/base/view_check_list.xsl 2011-11-04 19:02:31 UTC 
(rev 8024)
@@ -18,8 +18,8 @@
                <h2>Sjekklister</h2>
                <ul class="check_list">
                        <li class="heading">
+                               <div class="status">Status</div>
                                <div>Kommentar</div>
-                               <div>Status</div>
                                <div>Skal utføres innen dato</div>
                                <div>Planlagt utført dato</div>
                                <div>Ble utført dato</div>
@@ -28,10 +28,19 @@
                                <xsl:when test="check_list_array/child::node()">
                                        <xsl:for-each select="check_list_array">
                                                <li>
-                                              <div class="icon"><img 
height="15" src="controller/images/status_icon_light_green.png" /></div>
                                               <div 
class="order_nr"><xsl:number/>.</div> 
+                                              <div class="status">
+                                                <xsl:variable 
name="status"><xsl:value-of select="status"/></xsl:variable>     
+                                                <xsl:choose>
+                                                               <xsl:when 
test="status = 1">
+                                                                       <img 
height="15" src="controller/images/status_icon_light_green.png" /> 
+                                                               </xsl:when>
+                                                               <xsl:otherwise>
+                                                                       Ingen 
sjekklister for denne kontrollen
+                                                               </xsl:otherwise>
+                                                       </xsl:choose>
+                                              </div>
                                               <div><xsl:value-of 
select="comment"/></div>
-                                              <div><xsl:value-of 
select="status"/></div>
                                               <div><xsl:value-of 
select="deadline"/></div>
                                               <div><xsl:value-of 
select="planned_date"/></div>
                                               <div><xsl:value-of 
select="completed_date"/></div>