[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8604]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [8604] |
|
Date: |
Wed, 18 Jan 2012 12:34:11 +0000 |
Revision: 8604
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8604
Author: vator
Date: 2012-01-18 12:34:11 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/templates/base/calendar/view_calendar_month.xsl
trunk/controller/templates/base/calendar/view_calendar_year.xsl
trunk/controller/templates/base/check_list/view_open_cases.xsl
trunk/controller/templates/base/css/base.css
Modified: trunk/controller/templates/base/calendar/view_calendar_month.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-01-18 12:31:12 UTC (rev 8603)
+++ trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-01-18 12:34:11 UTC (rev 8604)
@@ -9,17 +9,25 @@
<h1><xsl:value-of
select="location_array/loc1_name"/></h1>
<h3 style="margin:0;font-size:19px;">Kalenderoversikt
for <xsl:value-of select="period"/></h3>
</div>
-
+
+ <div style="float:right;width:300px;margin-top:55px;">
+ <select id="my_location_id">
+ <xsl:for-each select="my_locations">
+ <option value="{location_code}"
selected="selected">
+ <xsl:value-of
disable-output-escaping="yes" select="loc1_name"/>
+ </option>
+ </xsl:for-each>
+ </select>
+ <ul id="icon_color_map">
+ <li><img height="15"
src="controller/images/status_icon_yellow_ring.png" /><span>Kontroll satt
opp</span></li>
+ <li><img height="15"
src="controller/images/status_icon_yellow.png" /><span>Kontroll har planlagt
dato</span></li>
+ <li><img height="15"
src="controller/images/status_icon_dark_green.png" /><span>Kontroll gjennomført
uten feil før frist</span></li>
+ <li><img height="15"
src="controller/images/status_icon_light_green.png" /><span>Kontroll
gjennomført uten feil etter frist</span></li>
+ <li><img height="15"
src="controller/images/status_icon_red_empty.png" /><span>Kontroll gjennomført
med rapporterte feil</span></li>
+ <li><img height="15"
src="controller/images/status_icon_red_cross.png" /><span>Kontroll ikke
gjennomført</span></li>
+ </ul>
+ </div>
- <ul id="icon_color_map">
- <li><img height="15"
src="controller/images/status_icon_yellow_ring.png" /><span>Kontroll satt
opp</span></li>
- <li><img height="15"
src="controller/images/status_icon_yellow.png" /><span>Kontroll har planlagt
dato</span></li>
- <li><img height="15"
src="controller/images/status_icon_dark_green.png" /><span>Kontroll gjennomført
uten feil før frist</span></li>
- <li><img height="15"
src="controller/images/status_icon_light_green.png" /><span>Kontroll
gjennomført uten feil etter frist</span></li>
- <li><img height="15"
src="controller/images/status_icon_red_empty.png" /><span>Kontroll gjennomført
med rapporterte feil</span></li>
- <li><img height="15"
src="controller/images/status_icon_red_cross.png" /><span>Kontroll ikke
gjennomført</span></li>
- </ul>
-
<div style="float: left;margin-bottom: 10px;margin-left:
735px;margin-top: 30px;"><a class="move_cal_right" href="#"><img
src="controller/images/arrow_left.png" width="16"/></a></div>
<div style="float:left;margin-top: 30px;margin-left: 374px;"><a
class="move_cal_left" href="#"><img src="controller/images/arrow_right.png"
width="16"/></a></div>
Modified: trunk/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-01-18 12:31:12 UTC (rev 8603)
+++ trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-01-18 12:34:11 UTC (rev 8604)
@@ -10,16 +10,25 @@
<h1><xsl:value-of
select="location_array/loc1_name"/></h1>
<h3 style="margin:0;font-size:19px;">Kalenderoversikt
for <xsl:value-of select="period"/></h3>
</div>
+
+ <div style="float:right;width:300px;margin-top:55px;">
+ <select id="my_location_id">
+ <xsl:for-each select="my_locations">
+ <option value="{location_code}"
selected="selected">
+ <xsl:value-of
disable-output-escaping="yes" select="loc1_name"/>
+ </option>
+ </xsl:for-each>
+ </select>
+ <ul id="icon_color_map">
+ <li><img height="15"
src="controller/images/status_icon_yellow_ring.png" /><span>Kontroll satt
opp</span></li>
+ <li><img height="15"
src="controller/images/status_icon_yellow.png" /><span>Kontroll har planlagt
dato</span></li>
+ <li><img height="15"
src="controller/images/status_icon_dark_green.png" /><span>Kontroll gjennomført
uten feil før frist</span></li>
+ <li><img height="15"
src="controller/images/status_icon_light_green.png" /><span>Kontroll
gjennomført uten feil etter frist</span></li>
+ <li><img height="15"
src="controller/images/status_icon_red_empty.png" /><span>Kontroll gjennomført
med rapporterte feil</span></li>
+ <li><img height="15"
src="controller/images/status_icon_red_cross.png" /><span>Kontroll ikke
gjennomført</span></li>
+ </ul>
+ </div>
- <ul id="icon_color_map">
- <li><img height="15"
src="controller/images/status_icon_yellow_ring.png" /><span>Kontroll satt
opp</span></li>
- <li><img height="15"
src="controller/images/status_icon_yellow.png" /><span>Kontroll har planlagt
dato</span></li>
- <li><img height="15"
src="controller/images/status_icon_dark_green.png" /><span>Kontroll gjennomført
uten feil før frist</span></li>
- <li><img height="15"
src="controller/images/status_icon_light_green.png" /><span>Kontroll
gjennomført uten feil etter frist</span></li>
- <li><img height="15"
src="controller/images/status_icon_red_empty.png" /><span>Kontroll gjennomført
med rapporterte feil</span></li>
- <li><img height="15"
src="controller/images/status_icon_red_cross.png" /><span>Kontroll ikke
gjennomført</span></li>
- </ul>
-
<ul class="calendar">
<xsl:choose>
<xsl:when
test="controls_calendar_array/child::node()">
@@ -79,7 +88,7 @@
</div>
<div class="months">
<xsl:for-each
select="calendar_array">
- <xsl:choose>
+ <xsl:choose>
<xsl:when test="status = 'control_registered'">
<div>
<a>
@@ -183,8 +192,7 @@
<xsl:otherwise>
<div></div>
</xsl:otherwise>
- </xsl:choose>
-
+ </xsl:choose>
</xsl:for-each>
</div>
</li>
Modified: trunk/controller/templates/base/check_list/view_open_cases.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_open_cases.xsl
2012-01-18 12:31:12 UTC (rev 8603)
+++ trunk/controller/templates/base/check_list/view_open_cases.xsl
2012-01-18 12:34:11 UTC (rev 8604)
@@ -21,24 +21,25 @@
<ul>
<xsl:for-each select="cases_array">
<xsl:variable name="cases_id"><xsl:value-of select="id"/></xsl:variable>
-
<li><xsl:value-of select="descr"/>
+
<li><xsl:number />. <xsl:value-of select="descr"/>
<xsl:choose>
<xsl:when test="location_item_id > 0">
<div style="float:right;">
-
<a target="_blank">
-
<xsl:attribute name="href">
-
<xsl:text>index.php?menuaction=property.uitts.view</xsl:text>
-
<xsl:text>&id=</xsl:text>
-
<xsl:value-of
select="location_item_id"/>
-
</xsl:attribute>
-
Vis melding
-
</a>
+
<a target="_blank">
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=property.uitts.view</xsl:text>
+
<xsl:text>&id=</xsl:text>
+
<xsl:value-of
select="location_item_id"/>
+
</xsl:attribute>
+
Vis melding
+
</a>
</div>
</xsl:when>
<xsl:otherwise>
<div style="float:right;"><span style="color:red">Ingen
melding registrert</span></div>
</xsl:otherwise>
</xsl:choose>
+
<div class="quick_menu"><a href="">endre</a><a href="">slette</a></div>
</li>
</xsl:for-each>
</ul>
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2012-01-18 12:31:12 UTC
(rev 8603)
+++ trunk/controller/templates/base/css/base.css 2012-01-18 12:34:11 UTC
(rev 8604)
@@ -1087,11 +1087,8 @@
}
ul#icon_color_map {
border: 1px solid #DDDDDD;
- float: right;
- margin-left: 500px;
- margin-right: 10px;
padding: 5px;
- margin-top: 55px;
+ margin-top: 40px;
}
ul#icon_color_map li {
font-size: 12px;
@@ -1233,8 +1230,7 @@
margin:10px;
}
li.check_item_cases ul li {
- list-style: disc outside none;
- margin: 5px 0 0 20px;
+ margin: 5px 0 0 0;
}
a.view_check_list{
color: #FFFFFF;
@@ -1251,4 +1247,13 @@
.cal_info_msg{
font-size: 16px;
padding: 40px 20px;
+}
+.quick_menu {
+ font-size: 12px;
+ margin-left: 10px;
+ padding: 2px;
+ text-decoration: underline;
+}
+.quick_menu a{
+ margin: 0 5px;
}
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8604],
Torstein <=