[Fmsystem-commits] [9253]

[Torstein]

Revision: 9253
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9253
Author:   vator
Date:     2012-05-02 06:26:45 +0000 (Wed, 02 May 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/js/controller/ajax.js
    trunk/controller/templates/base/css/base.css

Modified: trunk/controller/js/controller/ajax.js
===================================================================
--- trunk/controller/js/controller/ajax.js      2012-05-01 22:02:35 UTC (rev 
9252)
+++ trunk/controller/js/controller/ajax.js      2012-05-02 06:26:45 UTC (rev 
9253)
@@ -454,19 +454,17 @@
                                  var infoBox = $(divWrp).find("#info_box");
                                  $(infoBox).show();
                                  
-                                 var htmlStr = "<h5>Åpne saker</h5><ul>";
+                                 var htmlStr = "<h3>Åpne saker</h3>";
                                
                                  $.each(obj, function(i) {
-                                         htmlStr += "<li><label>" + 
(parseInt(i) + 1) + ": Tittel</label><span>" + obj[i].control_item.title + 
"</span>";
-                                         htmlStr += "<ul>";
-                                         
+                                         htmlStr += "<div 
class='check_item'><h5>" + (parseInt(i) + 1) + ". " + obj[i].control_item.title 
+ "</h5>";
+                                                                               
  
                                          
$(obj[i].cases_array).each(function(j) {
-                                                 htmlStr += "<li>" + "Sak " + 
(parseInt(j) + 1) + ":  " + obj[i].cases_array[j].descr + "</li>";
+                                                 htmlStr += "<p class='case'>" 
+ "<label>Sak " + (parseInt(j) + 1) + ": </label>" + 
obj[i].cases_array[j].descr + "</p>";
                                          });
-                                         htmlStr += "</ul></li>";
                                        });
                                  
-                                 htmlStr += "</ul>"; 
+                                 htmlStr += "</div>"; 
                                
                                  $(infoBox).html( htmlStr );  
                          }

Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css        2012-05-01 22:02:35 UTC 
(rev 9252)
+++ trunk/controller/templates/base/css/base.css        2012-05-02 06:26:45 UTC 
(rev 9253)
@@ -920,7 +920,7 @@
 }
 #control_plan .middle {
     background: none repeat scroll 0 0 #EDF5FF;
-    border-color: #DBE5EF #DBE5EF -moz-use-text-color;
+    border-color: #DBE5EF;
     border-style: solid solid none;
     border-width: 1px 1px 0;
     clear: both;
@@ -1043,10 +1043,9 @@
 .days_wrp a.view_info_box {
     left: 8px;
 }
-
 #info_box {
     background: none repeat scroll 0 0 #EDF5FF;
-    border: 1px solid #243356;
+    border: 1px solid #98B4D6;
     display: none;
     float: none;
     font-size: 12px;
@@ -1059,29 +1058,28 @@
     width: 400px;
     z-index: 1;
 }
-
-#info_box label{
-       font-weight:bold;
-       margin-right:2px;
-       font-size:12px;
-       display: inline-block;
-       width: 70px;
+#info_box h3 {
+       background: none repeat scroll 0 0 #D1E3F8;
+    margin: 0 0 10px;
+    padding: 5px 0;
+    text-align: center;
 }
-
-#info_box ul li ul label{
-       display: inline;
-}
-
-#info_box ul li ul {
-    margin: 5px 0;
-    padding-left: 5px;
-}
 #info_box h5 {
-       font-size: 15px;
+    font-size: 13px;
     font-weight: bold;
-    padding: 0 0 8px;
-    text-align: center;
+    margin: 0 0 4px;
+    text-align: left;
 }
+#info_box .check_item {
+       width: 100%     
+}
+#info_box .check_item label{
+       display:inline;
+       margin-left:20px;       
+}
+#info_box .case {
+       text-align:left;        
+}
 .empty_list{
        font-size: 16px;
     font-weight: bold;