[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9158]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [9158] |
|
Date: |
Mon, 16 Apr 2012 13:33:03 +0000 |
Revision: 9158
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9158
Author: vator
Date: 2012-04-16 13:32:55 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/js/controller/ajax.js
trunk/controller/templates/base/check_list/view_open_cases.xsl
trunk/controller/templates/base/css/base.css
Modified: trunk/controller/js/controller/ajax.js
===================================================================
--- trunk/controller/js/controller/ajax.js 2012-04-16 12:47:17 UTC (rev
9157)
+++ trunk/controller/js/controller/ajax.js 2012-04-16 13:32:55 UTC (rev
9158)
@@ -551,7 +551,11 @@
var submitBnt = $(thisForm).find("input[type='submit']");
$(submitBnt).removeClass("not_active");
});
+
+ //============================= CASE ===========================
+
+ // REGISTER CASE
$(".frm_register_case").live("submit", function(e){
e.preventDefault();
@@ -582,7 +586,8 @@
}
});
});
-
+
+ // UPDATE CASE
$(".frm_update_case").live("submit", function(e){
e.preventDefault();
@@ -604,6 +609,10 @@
if(type == "control_item_type_1"){
}else if(type == "control_item_type_2"){
+ var case_status =
$(thisForm).find("select[name='case_status'] option:selected").text();
+
+ $(clickRow).find(".case_info
.case_status").empty().text( case_status );
+
var measurement_text =
$(thisForm).find("input[name='measurement']").val();
$(clickRow).find(".case_info
.measurement").text(measurement_text);
}
Modified: trunk/controller/templates/base/check_list/view_open_cases.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_open_cases.xsl
2012-04-16 12:47:17 UTC (rev 9157)
+++ trunk/controller/templates/base/check_list/view_open_cases.xsl
2012-04-16 13:32:55 UTC (rev 9158)
@@ -37,12 +37,14 @@
<div class="case_info">
<!-- STATUS -->
<div class="row first">
-
<label>Status:</label>
-
<xsl:choose>
-
<xsl:when test="status = 0">Åpen</xsl:when>
-
<xsl:when test="status = 1">Lukket</xsl:when>
-
<xsl:when test="status = 2">Venter på
tilbakemelding</xsl:when>
-
</xsl:choose>
+
<label>Status:</label>
+
<span class="case_status">
+
<xsl:choose>
+
<xsl:when test="status = 0">Åpen</xsl:when>
+
<xsl:when test="status = 1">Lukket</xsl:when>
+
<xsl:when test="status = 2">Venter på
tilbakemelding</xsl:when>
+
</xsl:choose>
+
</span>
</div>
<!-- MEASUREMENT -->
<div class="row">
@@ -102,7 +104,7 @@
<!-- STATUS -->
<div class="row first">
<label>Status:</label>
-
<select name="status">
+
<select name="case_status">
<xsl:choose>
<xsl:when test="status = 0">
<option value="0"
SELECTED="SELECTED">Åpen</option>
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2012-04-16 12:47:17 UTC
(rev 9157)
+++ trunk/controller/templates/base/css/base.css 2012-04-16 13:32:55 UTC
(rev 9158)
@@ -1249,7 +1249,7 @@
padding: 4px 0;
}
-/* ======================== TAB ITEM ========================== */
+/* =================================== TAB ITEM
================================= */
.tab_item {
background: none repeat scroll 0 0 #F7FAFF;
@@ -1294,14 +1294,14 @@
z-index: 1;
}
-/* ====================== CHECK LIST ========================== */
+/* ================================== CHECK LIST
================================== */
#main_content.medium {
overflow: hidden;
width: 900px;
}
-/* ====================== CASE DETAILS ========================== */
+/* ==================================== CASE DETAILS
============================== */
#error_message_menu {
float: left;
margin-top: 50px;
@@ -1317,7 +1317,7 @@
margin-top: 20px;
}
-/* ======================== VIEW CASES ============================= */
+/* ===================================== VIEW CASES
================================ */
li.check_item_case h4 {
margin: 5px 0;
@@ -1380,7 +1380,7 @@
padding: 5px;
}
-/* ======================== FORM UPDATE CASE ============================= */
+/* ================================ FORM UPDATE CASE
============================= */
.frm_update_case label {
display: block;
@@ -1406,7 +1406,7 @@
margin-right: 5px;
}
-/* ======================== FORM REGISTER CASE ============================= */
+/* =============================== FORM REGISTER CASE
============================= */
.frm_register_case {
margin-bottom: 1em;
}
@@ -1435,7 +1435,7 @@
width: 24px;
}
-/* ======================== CASE MESSAGE ============================= */
+/* ================================ CASE MESSAGE =============================
*/
#frmRegCaseMessage label {
width: 13%;
}
@@ -1456,7 +1456,7 @@
padding: 0 0 1em 1em;
}
-/* ======================== QUICK MENU ============================= */
+/* ============================== QUICK MENU ============================= */
.quick_menu {
font-size: 12px;
@@ -1492,7 +1492,7 @@
border: 1px solid #ABABAB;
}
-/* ======================== REGISTER CONTROL FOR LOCATION
============================== */
+/* ======================== REGISTER CONTROL FOR LOCATION
===================== */
#choose_control{
margin: 10px;
padding: 10px;
@@ -1505,7 +1505,7 @@
padding: 7px 0;
}
-/* ======================== CONTROL DETAILS ============================== */
+/* ======================== CONTROL DETAILS
=================================== */
#control_details label {
display: inline-block;
@@ -1528,7 +1528,7 @@
display: none;
}
-/* ======================================= CONTROL GROUP AND ITEMS
========================================= */
+/* ============================= CONTROL GROUP AND ITEMS
======================= */
ul.control_groups li ul {
margin-left: 1em;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9158],
Torstein <=