[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8972]
From: |
Torstein |
Subject: |
[Fmsystem-commits] [8972] |
Date: |
Sat, 10 Mar 2012 10:50:49 +0000 |
Revision: 8972
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8972
Author: vator
Date: 2012-03-10 10:50:48 +0000 (Sat, 10 Mar 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/model/class.check_list.inc.php
trunk/controller/inc/model/class.control_item.inc.php
trunk/controller/js/controller/ajax.js
trunk/controller/templates/base/css/base.css
Modified: trunk/controller/inc/model/class.check_list.inc.php
===================================================================
--- trunk/controller/inc/model/class.check_list.inc.php 2012-03-07 13:41:35 UTC
(rev 8971)
+++ trunk/controller/inc/model/class.check_list.inc.php 2012-03-10 10:50:48 UTC
(rev 8972)
@@ -33,7 +33,11 @@
class controller_check_list extends controller_model
{
public static $so;
-
+ /*
+ const STATUS_OPEN = 0;
+ const STATUS_CLOSED = 1;
+ const STATUS_PENDING = 2;
+ */
protected $id;
protected $control_id;
protected $status;
Modified: trunk/controller/inc/model/class.control_item.inc.php
===================================================================
--- trunk/controller/inc/model/class.control_item.inc.php 2012-03-07
13:41:35 UTC (rev 8971)
+++ trunk/controller/inc/model/class.control_item.inc.php 2012-03-10
10:50:48 UTC (rev 8972)
@@ -33,7 +33,10 @@
class controller_control_item extends controller_model
{
public static $so;
-
+ /*
+ const CONTROL_ITEM_TYPE_MAALING = "control_item_type_1";
+ const CONTROL_ITEM_TYPE_MAALING = "control_item_type_1";
+ */
protected $id;
protected $title;
protected $required;
Modified: trunk/controller/js/controller/ajax.js
===================================================================
--- trunk/controller/js/controller/ajax.js 2012-03-07 13:41:35 UTC (rev
8971)
+++ trunk/controller/js/controller/ajax.js 2012-03-10 10:50:48 UTC (rev
8972)
@@ -617,7 +617,7 @@
$(clickRow).attr("id", "case_" + case_id);
- var quickEditRowTagStr = "<li class='quick_edit
check_item_case'><h3>Hurtigendring</h3><fieldset><form class='frm_update_case'
action='" + requestUrl + "'>";
+ var quickEditRowTagStr = "<li class='quick_edit
check_item_case'><fieldset><h3>Hurtigendring</h3><hr><form
class='frm_update_case' action='" + requestUrl + "'>";
if(case_type == "control_item_type_2")
quickEditRowTagStr += "<label>MÃ¥leverdi</label><input
type='text' name='case_measurement'>" + case_measurement + "</input>";
Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css 2012-03-07 13:41:35 UTC
(rev 8971)
+++ trunk/controller/templates/base/css/base.css 2012-03-10 10:50:48 UTC
(rev 8972)
@@ -1293,11 +1293,29 @@
li.check_item_case ul{
margin-bottom: 20px;
}
-li.check_item_case ul li, li.quick_edit fieldset {
- border: 1px solid #AAAAAA;
+li.check_item_case ul li {
+ border: 1px solid #DDDDDD;
margin: 5px 0 0;
padding: 5px;
}
+
+#main_content .quick_edit fieldset {
+ padding: 10px;
+ border: 1px solid #DDDDDD;
+}
+.frm_update_case label {
+ display: block;
+}
+.frm_update_case textarea {
+ width: 500px;
+ display: block;
+}
+.quick_edit hr {
+ color:#fafafa;
+}
+.frm_update_case input[type=submit]{
+ float:right;
+}
a.view_check_list{
color: #FFFFFF;
display: block;
@@ -1307,11 +1325,14 @@
text-decoration: none;
width: 24px;
}
-li.quick_edit label{
+.quick_edit label{
font-weight:bold;
vertical-align:top;
}
-li.quick_edit textarea, li.quick_edit select{
+.quick_edit h3{
+ margin:0;
+}
+.quick_edit select{
display: inline-block;
vertical-align:top;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8972],
Torstein <=