[Fmsystem-commits] [9683]

[Torstein]

Revision: 9683
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9683
Author:   vator
Date:     2012-06-27 13:02:14 +0000 (Wed, 27 Jun 2012)
Log Message:
-----------


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

Modified: 
trunk/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
===================================================================
--- 
trunk/controller/templates/base/calendar/view_calendar_year_for_locations.xsl   
    2012-06-27 12:48:47 UTC (rev 9682)
+++ 
trunk/controller/templates/base/calendar/view_calendar_year_for_locations.xsl   
    2012-06-27 13:02:14 UTC (rev 9683)
@@ -9,9 +9,6 @@
                        <h1>Kontrollplan for <xsl:value-of 
select="control/title"/></h1>
                        <h3>Periode: <xsl:value-of select="current_year"/></h3>
                        
-                       <!-- =====================  SELECT MY LOCATIONS  
================= -->
-                       <xsl:call-template name="select_my_locations" />
-                       
                </div>
                <div class="middle">
                
@@ -20,12 +17,13 @@
                        
                </div>
                <div id="cal_wrp">
+               <h2>Bygg/Eiendom</h2>
                        <table id="calendar" class="year">
                                <tr>
-                                       <th>
+                                       <th class="title">
                                                <span 
class="location_code">Lokasjonskode</span>
                                        </th>
-                                       <th>
+                                       <th class="title">
                                                <span 
class="location_name">Lokasjonsnavn</span>
                                        </th>
                                        <xsl:for-each select="heading_array">
@@ -62,7 +60,7 @@
                                                </xsl:otherwise>
                                            </xsl:choose>
                                    
-                                               <td>
+                                               <td class="title">
                                                        <xsl:value-of 
select="location/location_code"/>
                                                </td>
                                                <td class="location_name">
@@ -86,11 +84,11 @@
                <div id="cal_wrp">
                        <table id="calendar" class="year">
                                <tr>
-                                       <th>
-                                               <span 
class="location_code">Lokasjon</span>
+                                       <th class="location_name">
+                                               <span>Lokasjon</span>
                                        </th>
-                                       <th>
-                                               <span 
class="location_name">Komponenttype</span>
+                                       <th class="component_type">
+                                               <span>Komponenttype</span>
                                        </th>
                                        <xsl:for-each select="heading_array">
                                                <th>
@@ -111,6 +109,8 @@
                                                </th>
                                        </xsl:for-each>
                                </tr>
+                               
+                       <h2 class="components">Komponenter</h2>
                        
                        <xsl:choose>
                                <xsl:when 
test="components_with_calendar_array/child::node()">
@@ -126,7 +126,7 @@
                                                </xsl:otherwise>
                                            </xsl:choose>
                                    
-                                               <td>
+                                               <td class="title">
                                                        <xsl:value-of 
select="component/component_location"/>
                                                </td>
                                                <td class="location_name">

Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css        2012-06-27 12:48:47 UTC 
(rev 9682)
+++ trunk/controller/templates/base/css/base.css        2012-06-27 13:02:14 UTC 
(rev 9683)
@@ -1260,6 +1260,10 @@
        width: 150px;
 }
 
+#calendar .location_name, #calendar .component_type {
+       width: 150px;
+}
+
 #calendar .frequency {
     margin-right: 10px;
     width: 100px;