[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9471]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [9471] |
|
Date: |
Thu, 31 May 2012 11:14:27 +0000 |
Revision: 9471
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9471
Author: vator
Date: 2012-05-31 11:14:16 +0000 (Thu, 31 May 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/templates/base/calendar/select_my_locations.xsl
trunk/controller/templates/base/calendar/view_calendar_year.xsl
Added Paths:
-----------
trunk/controller/templates/base/calendar/select_buildings_on_property.xsl
Added: trunk/controller/templates/base/calendar/select_buildings_on_property.xsl
===================================================================
--- trunk/controller/templates/base/calendar/select_buildings_on_property.xsl
(rev 0)
+++ trunk/controller/templates/base/calendar/select_buildings_on_property.xsl
2012-05-31 11:14:16 UTC (rev 9471)
@@ -0,0 +1,27 @@
+<!-- $Id: view_calendar_month.xsl 9200 2012-04-21 20:05:34Z vator $ -->
+<xsl:template name="select_buildings_on_property"
xmlns:php="http://php.net/xsl";>
+<xsl:variable name="loc_code"><xsl:value-of
select="current_location/location_code"/></xsl:variable>
+
+<form action="#">
+ <input type="hidden" name="period_type" value="view_year" />
+ <input type="hidden" name="year">
+ <xsl:attribute name="value">
+ <xsl:value-of select="current_year"/>
+ </xsl:attribute>
+ </input>
+
+
+ <select id="choose_building_on_property" class="selectLocation">
+ <xsl:for-each select="buildings_on_property">
+ <option>
+ <xsl:if test="id = $loc_code">
+ <xsl:attribute
name="selected">"selected"</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute
name="value"><xsl:value-of select="id"/></xsl:attribute>
+ <xsl:value-of select="name" />
+ </option>
+ </xsl:for-each>
+ </select>
+</form>
+
+</xsl:template>
Property changes on:
trunk/controller/templates/base/calendar/select_buildings_on_property.xsl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/controller/templates/base/calendar/select_my_locations.xsl
===================================================================
--- trunk/controller/templates/base/calendar/select_my_locations.xsl
2012-05-31 11:10:20 UTC (rev 9470)
+++ trunk/controller/templates/base/calendar/select_my_locations.xsl
2012-05-31 11:14:16 UTC (rev 9471)
@@ -1,5 +1,6 @@
<!-- $Id: view_calendar_month.xsl 9200 2012-04-21 20:05:34Z vator $ -->
<xsl:template name="select_my_locations" xmlns:php="http://php.net/xsl";>
+<xsl:variable name="loc_code"><xsl:value-of
select="../current_location/location_code"/></xsl:variable>
<form action="#">
<input type="hidden" name="period_type" value="view_year" />
@@ -8,24 +9,16 @@
<xsl:value-of select="current_year"/>
</xsl:attribute>
</input>
-
- <select id="choose_my_location">
+
+ <select id="choose_my_location" class="selectLocation">
<xsl:for-each select="my_locations">
- <xsl:variable name="loc_code"><xsl:value-of
select="../current_location/location_code"/></xsl:variable>
- <xsl:choose>
- <xsl:when test="location_code = loc_code">
- <option selected="selected">
- <xsl:attribute
name="value"><xsl:value-of disable-output-escaping="yes"
select="location_code"/></xsl:attribute>
- <xsl:value-of
disable-output-escaping="yes" select="loc1_name"/>
- </option>
- </xsl:when>
- <xsl:otherwise>
- <option>
- <xsl:attribute
name="value"><xsl:value-of disable-output-escaping="yes"
select="location_code"/></xsl:attribute>
- <xsl:value-of
disable-output-escaping="yes" select="loc1_name"/>
- </option>
- </xsl:otherwise>
- </xsl:choose>
+ <option>
+ <xsl:if test="location_code = loc_code">
+ <xsl:attribute
name="selected">selected</xsl:attribute>
+ </xsl:if>
+ <xsl:attribute name="value"><xsl:value-of
disable-output-escaping="yes" select="location_code"/></xsl:attribute>
+ <xsl:value-of disable-output-escaping="yes"
select="loc1_name"/>
+ </option>
</xsl:for-each>
</select>
</form>
Modified: trunk/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-05-31 11:10:20 UTC (rev 9470)
+++ trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-05-31 11:14:16 UTC (rev 9471)
@@ -63,7 +63,7 @@
},
minLength: 1,
select: function( event, ui ) {
- chooseLocation( ui.item.label, ui.item.value);
+ chooseLocation( ui.item.label, ui.item.value);
}
});
@@ -89,11 +89,19 @@
<div id="control_plan">
<div class="top">
- <h1>Kontrollplan for bygg/eiendom: <xsl:value-of
select="current_location/loc1_name"/></h1>
+ <xsl:choose>
+ <xsl:when test="location_level = 1">
+ <h1>Kontrollplan for eiendom:
<xsl:value-of select="current_location/loc1_name"/></h1>
+ </xsl:when>
+ <xsl:otherwise>
+ <h1>Kontrollplan for bygg:
<xsl:value-of select="current_location/loc2_name"/></h1>
+ </xsl:otherwise>
+ </xsl:choose>
+
<h3>Kalenderoversikt for <span
class="year"><xsl:value-of select="current_year"/></span></h3>
<!-- ===================== SEARCH FOR LOCATION
================= -->
- <div id="searchLocation">
+ <div id="searchLocation" class="selectBox">
<label>Søk etter andre bygg/eiendommer</label>
<input type="hidden" id="currentYear">
<xsl:attribute name="value">
@@ -102,15 +110,40 @@
</input>
<input type="text" value=""
id="searchLocationName" />
</div>
+
+ <!-- ===================== SELECT LIST FOR MY
LOCATIONS ================= -->
+ <div id="chooseMyLocation" class="selectBox">
+ <label>Velg et annet bygg du har ansvar
for</label>
+ <xsl:call-template name="select_my_locations" />
+ </div>
</div>
<div class="middle">
- <!-- ===================== SELECT LIST FOR MY
LOCATIONS ================= -->
- <div id="chooseBuilding">
+ <div id="chooseBuilding" class="selectBox">
<label>Velg et annet bygg på eiendommen</label>
- <xsl:call-template name="select_my_locations" />
+ <xsl:call-template
name="select_buildings_on_property" />
</div>
+ <!--
+ <select id="loc_1" class="choose_loc">
+ <xsl:for-each select="property_array">
+ <xsl:variable
name="loc_code"><xsl:value-of select="location_code"/></xsl:variable>
+ <xsl:choose>
+ <xsl:when
test="location_code = current_location/location_code">
+ <option
value="{$loc_code}" selected="selected">
+
<xsl:value-of disable-output-escaping="yes" select="loc1_name"/>
+ </option>
+ </xsl:when>
+ <xsl:otherwise>
+ <option
value="{$loc_code}">
+
<xsl:value-of disable-output-escaping="yes" select="loc1_name"/>
+ </option>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ </select>
+ -->
+
<!-- ===================== COLOR ICON MAP
================= -->
<xsl:call-template name="icon_color_map" />
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9471],
Torstein <=