[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9153]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [9153] |
|
Date: |
Mon, 16 Apr 2012 12:17:10 +0000 |
Revision: 9153
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9153
Author: vator
Date: 2012-04-16 12:17:10 +0000 (Mon, 16 Apr 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/add_check_list.xsl
trunk/controller/templates/base/check_list/edit_check_list.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-04-15 20:22:54 UTC (rev 9152)
+++ trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-04-16 12:17:10 UTC (rev 9153)
@@ -150,7 +150,7 @@
<li>
<xsl:for-each
select="calendar_array">
<xsl:choose>
-
<xsl:when test="status = 'control_registered'">
+
<xsl:when test="status = 'CONTROL_REGISTERED'">
<div class="cell">
<a>
<xsl:attribute name="href">
@@ -166,7 +166,7 @@
</a>
</div>
</xsl:when>
-
<xsl:when test="status = 'control_planned'">
+
<xsl:when test="status = 'CONTROL_PLANNED'">
<div class="cell">
<a>
<xsl:attribute name="href">
@@ -178,8 +178,20 @@
</a>
</div>
</xsl:when>
-
<xsl:when test="status = 'control_accomplished_in_time_without_errors'">
+
<xsl:when test="status = 'CONTROL_NOT_DONE_WITH_PLANNED_DATE'">
<div class="cell">
+
<a>
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
+
<xsl:text>&check_list_id=</xsl:text>
+
<xsl:value-of select="info/check_list_id"/>
+
</xsl:attribute>
+
<img height="15" src="controller/images/status_red_cross.png" />
+
</a>
+
</div>
+
</xsl:when>
+
<xsl:when test="status = 'CONTROL_DONE_IN_TIME_WITHOUT_ERRORS'">
+
<div class="cell">
<a>
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
@@ -191,7 +203,7 @@
</a>
</div>
</xsl:when>
-
<xsl:when test="status = 'control_accomplished_over_time_without_errors'">
+
<xsl:when test="status = 'CONTROL_DONE_OVER_TIME_WITHOUT_ERRORS'">
<div class="cell" style="position:relative;">
<div id="info_box"></div>
<a>
Modified: trunk/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-04-15 20:22:54 UTC (rev 9152)
+++ trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-04-16 12:17:10 UTC (rev 9153)
@@ -81,7 +81,7 @@
<xsl:text>&year=</xsl:text>
<xsl:value-of select="$year"/>
<xsl:text>&location_code=</xsl:text>
-
<xsl:value-of select="//location_code"/>
+
<xsl:value-of select="$view_location_code"/>
<xsl:text>&month=</xsl:text>
<xsl:number/>
</xsl:attribute>
@@ -128,7 +128,7 @@
<div class="months">
<xsl:for-each
select="calendar_array">
<xsl:choose>
-
<xsl:when test="status = 'control_registered'">
+
<xsl:when test="status = 'CONTROL_REGISTERED'">
<div>
<a>
<xsl:attribute name="href">
@@ -144,7 +144,7 @@
</a>
</div>
</xsl:when>
-
<xsl:when test="status = 'control_planned'">
+
<xsl:when test="status = 'CONTROL_PLANNED'">
<div>
<a>
<xsl:attribute name="href">
@@ -156,7 +156,19 @@
</a>
</div>
</xsl:when>
-
<xsl:when test="status = 'control_accomplished_in_time_without_errors'">
+
<xsl:when test="status = 'CONTROL_NOT_DONE_WITH_PLANNED_DATE'">
+
<div class="cell">
+
<a>
+
<xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
+
<xsl:text>&check_list_id=</xsl:text>
+
<xsl:value-of select="info/check_list_id"/>
+
</xsl:attribute>
+
<img height="15" src="controller/images/status_red_cross.png" />
+
</a>
+
</div>
+
</xsl:when>
+
<xsl:when test="status = 'CONTROL_DONE_IN_TIME_WITHOUT_ERRORS'">
<div>
<a>
<xsl:attribute name="href">
@@ -169,7 +181,7 @@
</a>
</div>
</xsl:when>
-
<xsl:when test="status = 'control_accomplished_over_time_without_errors'">
+
<xsl:when test="status = 'CONTROL_DONE_OVER_TIME_WITHOUT_ERRORS'">
<div style="position:relative;">
<div id="info_box" style="position:absolute;display:none;"></div>
<a>
Modified: trunk/controller/templates/base/check_list/add_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/add_check_list.xsl
2012-04-15 20:22:54 UTC (rev 9152)
+++ trunk/controller/templates/base/check_list/add_check_list.xsl
2012-04-16 12:17:10 UTC (rev 9153)
@@ -21,12 +21,14 @@
});
});
</script>
-
+<!-- ================== ADD CHECKLIST ========================= -->
+
<div id="main_content" class="medium">
- <h1>Registrere sjekkliste for <xsl:value-of
select="location_array/loc1_name"/></h1>
-
+ <h1>Kontroll: <xsl:value-of select="control/title"/></h1>
+ <h2>Bygg: <xsl:value-of select="location_array/loc1_name"/></h2>
+
<div id="check_list_menu">
<a href="#" class="active">
Vis detaljer for sjekkliste
@@ -39,11 +41,17 @@
</a>
</div>
-
- <h3 class="box_header">Sjekklistedetaljer</h3>
- <fieldset class="check_list_details">
+ <!-- ================== CHECKLIST DETAILS ===================== -->
+ <div id="check_list_details">
+ <h3 class="box_header">Sjekklistedetaljer</h3>
<form id="frm_add_check_list"
action="index.php?menuaction=controller.uicheck_list.save_check_list"
method="post">
-
+ <xsl:variable name="location_code"><xsl:value-of
select="location_array/location_code"/></xsl:variable>
+ <xsl:variable name="control_id"><xsl:value-of
select="control/id"/></xsl:variable>
+
+ <input type="hidden" name="control_id"
value="{$control_id}" />
+ <input type="hidden" name="location_code"
value="{$location_code}" />
+
+ <!-- Shows dates that can be picked for setting a
deadline date
<div id="calendar_dates">
<xsl:for-each select="calendar_array">
<xsl:variable
name="cal_date"><xsl:value-of select="."/></xsl:variable>
@@ -51,45 +59,29 @@
<span><xsl:value-of
select="php:function('date', $date_format, number( $cal_date ) )"/></span>
</xsl:for-each>
</div>
-
- <xsl:variable name="location_code"><xsl:value-of
select="location_array/location_code"/></xsl:variable>
- <xsl:variable name="control_id"><xsl:value-of
select="control/id"/></xsl:variable>
-
- <input type="hidden" name="control_id"
value="{$control_id}" />
- <input type="hidden" name="location_code"
value="{$location_code}" />
-
- <fieldset class="add_check_list">
- <div>
+ -->
+
+ <fieldset>
+ <div class="row">
<label>Status</label>
- <select name="status">
+ <select id="status" name="status">
<option value="0"
SELECTED="SELECTED">Ikke utført</option>
<option value="1"
>Utført</option>
</select>
</div>
- <div>
+ <div class="row">
<label>Fristdato</label>
- <input class="date">
- <xsl:attribute
name="id">deadline_date</xsl:attribute>
- <xsl:attribute
name="name">deadline_date</xsl:attribute>
- <xsl:attribute
name="type">text</xsl:attribute>
+ <input type="text" id="deadline_date"
name="deadline_date" class="date">
<xsl:attribute name="value"><xsl:value-of
select="php:function('date', $date_format, number(deadline))"/></xsl:attribute>
</input>
</div>
- <div>
+ <div class="row">
<label>Planlagt dato</label>
- <input class="date">
- <xsl:attribute
name="id">planned_date</xsl:attribute>
- <xsl:attribute
name="name">planned_date</xsl:attribute>
- <xsl:attribute
name="type">text</xsl:attribute>
- <xsl:attribute
name="value"></xsl:attribute>
- </input>
+ <input type="text" id="planned_date"
name="planned_date" class="date" value="" />
</div>
- <div>
+ <div class="row">
<label>Utført dato</label>
- <input class="date">
- <xsl:attribute
name="id">completed_date</xsl:attribute>
- <xsl:attribute
name="name">completed_date</xsl:attribute>
- <xsl:attribute
name="type">text</xsl:attribute>
+ <input type="text" id="completed_date"
name="completed_date" class="date">
<xsl:if
test="check_list/completed_date != ''">
<xsl:attribute
name="value"><xsl:value-of select="php:function('date', $date_format,
number(check_list/completed_date))"/></xsl:attribute>
</xsl:if>
@@ -98,20 +90,20 @@
<!--
div><label>Utstyr</label><input
name="equipment_id" /></div>
-->
- <div>
- <label class="comment">Kommentar</label>
- <textarea>
- <xsl:attribute
name="name">comment</xsl:attribute>
- <xsl:value-of
select="check_list/comment"/>
- </textarea>
- </div>
</fieldset>
+ <div class="comment">
+ <label>Kommentar</label>
+ <textarea>
+ <xsl:attribute
name="name">comment</xsl:attribute>
+ <xsl:value-of select="check_list/comment"/>
+ </textarea>
+ </div>
+
<div class="form-buttons">
<xsl:variable name="lang_save"><xsl:value-of
select="php:function('lang', 'save_check_list')" /></xsl:variable>
- <input style="width: 170px;" class="btn
not_active" type="submit" name="save_control" value="Lagre detaljer" />
+ <input class="btn not_active" type="submit"
value="Lagre detaljer" />
</div>
- </form>
- </fieldset>
-
+ </form>
</div>
+</div>
</xsl:template>
Modified: trunk/controller/templates/base/check_list/edit_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/edit_check_list.xsl
2012-04-15 20:22:54 UTC (rev 9152)
+++ trunk/controller/templates/base/check_list/edit_check_list.xsl
2012-04-16 12:17:10 UTC (rev 9153)
@@ -53,16 +53,9 @@
<fieldset class="col_1">
<div class="row">
- <label>ID</label>
- <input class="id" disabled="disabled">
- <xsl:attribute
name="name">check_list_id</xsl:attribute>
- <xsl:attribute name="value"><xsl:value-of
select="check_list/id"/></xsl:attribute>
- </input>
- </div>
- <div class="row">
<label>Status</label>
<xsl:variable name="status"><xsl:value-of
select="check_list/status"/></xsl:variable>
- <select name="status">
+ <select id="status" name="status">
<xsl:choose>
<xsl:when
test="check_list/status = 0">
<option
value="1">Utført</option>
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2012-04-15 20:22:54 UTC
(rev 9152)
+++ trunk/controller/templates/base/css/base.css 2012-04-16 12:17:10 UTC
(rev 9153)
@@ -401,14 +401,13 @@
padding: 3px 6px;
}
input[type="submit"] {
- background: none repeat scroll 0 0 #4F9AEA;
- border: 1px solid #428AD7;
+ background: none repeat scroll 0 0 #4F9AEA;
+ border: 0 none;
border-radius: 4px 4px 4px 4px;
color: #FFFFFF;
cursor: pointer;
- padding: 3px 20px;
- border: 0;
margin-top: 20px;
+ padding: 5px 20px;
}
select{
padding: 3px 1px 3px 4px;
@@ -834,13 +833,11 @@
height:100px;
}
-/* ======================================= FORM UPDATE CHECK LIST
========================================= */
-
-#frm_update_check_list .col_1, #frm_update_check_list .col_2 {
+#check_list_details .col_1, #check_list_details .col_2 {
float: left;
vertical-align: top;
}
-#frm_update_check_list .col_2 {
+#check_list_details .col_2 {
margin-left: 15%;
width: 19%;
}
@@ -997,7 +994,7 @@
text-align: left;
}
ul.calendar div.id, ul.calendar.info div.id {
- width: 50px;
+ width: 20px;
}
ul.calendar div.title{
text-align: left;
@@ -1477,15 +1474,15 @@
ul#groups h4{
margin: 4px 0;
}
-.input_error_msg{
- background:#FBE3E4;
- border-bottom-right-radius: 4px;
- color: #D12F19;
- display: block;
- padding: 4px 5px;
- width: 150px;
+.input_error_msg {
+ background: none repeat scroll 0 0 #FBE3E4;
+ border-bottom-right-radius: 4px;
+ color: #D12F19;
+ display: inline-block;
+ margin-bottom: 5px;
+ margin-top: 5px;
+ padding: 4px 5px;
}
-
input.focus, select.focus{
border: 2px solid #dae6f4;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9153],
Torstein <=