[Fmsystem-commits] [9486]

[Torstein]

Revision: 9486
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9486
Author:   vator
Date:     2012-06-04 10:38:21 +0000 (Mon, 04 Jun 2012)
Log Message:
-----------


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

Modified: trunk/controller/js/yahoo/register_control_to_location.js
===================================================================
--- trunk/controller/js/yahoo/register_control_to_location.js   2012-06-04 
08:39:52 UTC (rev 9485)
+++ trunk/controller/js/yahoo/register_control_to_location.js   2012-06-04 
10:38:21 UTC (rev 9486)
@@ -1,67 +1,4 @@
 
-       function saveLocationToControl_old()
-       {
-               var control_id_value = 
document.getElementById('control_id').value;
-               
-               if( !(control_id_value > 0) ){
-                       var choose_control_elem = 
document.getElementById('choose_control');
-                       var error_elem = 
YAHOO.util.Dom.getElementsByClassName('error_msg')[0];
-                                               
-                       error_elem.style.display = 'block';
-                       
-                       return false;
-               }else{
-                       var error_elem = 
YAHOO.util.Dom.getElementsByClassName('error_msg')[0];
-                       error_elem.style.display = 'none';
-               }
-                               
-               var divs = 
YAHOO.util.Dom.getElementsByClassName('location_submit');
-               var mydiv = divs[divs.length-1];
-
-               // styles for dont show
-               
-
-               valuesForPHP = 
YAHOO.util.Dom.getElementsByClassName('mychecks');
-               var values_return = ""; //new Array(); 
-                       
-               for(i=0;i<valuesForPHP.length;i++)
-               {
-                       if(valuesForPHP[i].children[0].children[0].checked)
-                       {
-                               if(values_return != "")
-                                       values_return 
+="|"+valuesForPHP[i].parentNode.firstChild.firstChild.firstChild.firstChild.nodeValue+';'+valuesForPHP[i].children[0].children[0].value;
-                               else
-                                       values_return += 
valuesForPHP[i].parentNode.firstChild.firstChild.firstChild.firstChild.nodeValue+';'+valuesForPHP[i].children[0].children[0].value;
-                       }
-               }
-               
-               if( !(values_return.length > 0) ){
-                       var datatable_container_elem = 
document.getElementById('datatable-container');
-                       var error_elem = 
YAHOO.util.Dom.getElementsByClassName('error_msg')[1];
-                                               
-                       error_elem.style.display = 'block';
-                       
-                       return false;
-               }else{
-                       var error_elem = 
YAHOO.util.Dom.getElementsByClassName('error_msg')[1];
-                       error_elem.style.display = 'none';
-               }
-
-               mydiv.style.display = "none";
-
-               var returnfield = document.createElement('input');
-               returnfield.setAttribute('name', 'values_assign');
-               returnfield.setAttribute('type', 'text');
-               returnfield.setAttribute('value', values_return);
-               mydiv.appendChild(returnfield);
-               
-               var control_id_field = document.createElement('input');
-               control_id_field.setAttribute('name', 'control_id');
-               control_id_field.setAttribute('type', 'text');
-               control_id_field.setAttribute('value', control_id_value);
-               mydiv.appendChild(control_id_field);
-       }
-
 //----------
        var oArgs_edit = {menuaction:'registration.uipending.edit'};
        var edit_Url = phpGWLink('index.php', oArgs_edit);

Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css        2012-06-04 08:39:52 UTC 
(rev 9485)
+++ trunk/controller/templates/base/css/base.css        2012-06-04 10:38:21 UTC 
(rev 9486)
@@ -215,7 +215,6 @@
        padding: .3em;
 }
 
-
 #controller_user_error {
     width: 100%;
     background-color: #eee;
@@ -395,14 +394,23 @@
        vertical-align: middle;
 }
 /* Set up common form styles.  TODO: needs refinement. */
+
+/* 
======================================================================================================================
+                                                                               
                                                                                
                                                                CONTROLLER 
MODULE CSS
+ 
========================================================================================================================
 */
+
+/* ==========================================   SELECTORS, IDS AND CLASSES    
=========================================== */
+
 input{
     margin: 0 13px 0 0;
     padding: 3px 6px;
 }
+
 input[type="radio"] {
     margin: 0 5px 0 2px;
     padding: 3px 6px;
 }
+
 input[type="submit"] {
     background: none repeat scroll 0 0 #4F9AEA;
     border: 1px solid #4685C8;
@@ -412,9 +420,11 @@
     margin-top: 20px;
     padding: 5px 20px;
 }
+
 .row input[type="submit"] {
     padding: 2px 10px;
 }
+
 select{
        padding: 3px 1px 3px 4px;
 }
@@ -422,31 +432,38 @@
 fieldset {
        border-bottom:0px solid #ccc;
 }
+
 textarea{
        padding: 4px;   
 }
+
 h1 em {
        font-style:italic;
 }
+
 a {
     color: #0066CC;
     text-decoration: none;
 }
-div.info, div.error, div.warning {
+
+.info, .error, .warning {
        font-weight: normal;
        margin:20px;
        padding:5px;
        font-size:1.1em;
        text-align: left;
 }
-p.message {
+
+.message {
        margin: 5px;
 }
+
 .info {
        background-color:#CCFFCC;
        border:1px solid #00FF00;
        color:black;
 }
+
 .warning {
        background-color: #FEEFB3;
        border:1px solid #9F6000;
@@ -455,9 +472,11 @@
 .yui-calendar td.calcell {
        border:0px !important;
 }
+
 .yui-skin-sam .yui-dt TABLE TH{
        border: none !important;
 }
+
 .yui-skin-sam .yui-dt TABLE TD{
        border: none !important;
 }
@@ -493,7 +512,6 @@
     margin:0 0 10px;
 }
 
-
 /* =======================================  CONTROL ITEM  
========================================= */
 
 #control_item_details{
@@ -512,7 +530,7 @@
 }
 #control_item_details label.top {
     display: block;
-    margin-bottom: 3px;
+    margin-bottom: 5px;
 }
 #control_item_details .styleWrp {
     background: none repeat scroll 0 0 #F2F8FF;
@@ -730,7 +748,6 @@
 }
 
 #innertoolbar-button{
-       /*background: none repeat scroll 0 0 #CCCCCC;*/
     color: #111111;
 }
 
@@ -986,8 +1003,6 @@
        margin-bottom:0;        
 }
 
-
-
 /* =======================================  CHECK ITEM  
========================================= */
 
 .check_item div{
@@ -1033,7 +1048,7 @@
        width: 925px;   
 }
 
-/* ======================  CALENDAR ========================== */
+/* ====================================  CALENDAR  
========================================= */
 #control_plan .top h3 {
     float: left;
     font-size: 19px;
@@ -1055,6 +1070,59 @@
     padding: 1em 1em 0;
 }
 
+/* =============================  SEARCH LOCATION BOX  ======================= 
*/
+#search-location {
+    float: right;
+    margin-bottom: 10px;
+}
+
+#search-location-name { 
+       width: 16em; 
+}
+
+#choose-my-location {
+    float: right;
+    margin-right: 10px;
+}
+
+#choose-building {
+    float: left;
+}
+
+.month_view #choose-building {
+    clear:left;
+    margin-top: 1em;
+}
+
+.select-box { 
+               background: none repeat scroll 0 0 #FEFBF4;
+    border: 1px solid #DDDDDD;
+    border-radius: 5px 5px 5px 5px;
+    padding: 1em;      
+}
+
+.select-box label{
+       margin-bottom:5px;
+       display: block; 
+}
+
+.select-box a{
+       display: block;
+  font-weight: bold;
+  padding: 0 0 10px;
+  text-align: justify; 
+}
+
+#choose_loc .btn {
+    display: inline-block;
+    font-size: 0.9em;
+    padding: 2px 8px;
+}
+
+#choose_loc .btn.active{
+       background: #3F7EC1;    
+}
+
 /* ==================  COLOR MAP ============================= */
 
 ul#icon_color_map {
@@ -1189,7 +1257,7 @@
     font-size: 21px;
     padding-left: 500px;
 }
-/* ======================  CALENDAR INFO BOX ========================== */
+/* ===============================  CALENDAR INFO BOX 
========================== */
 
 a.view_info_box {
     color: #FFFFFF;
@@ -1755,76 +1823,6 @@
        vertical-align: middle;
 }
 
-/* =============================  SUGGEST LIST  ======================= */
-ul#suggestList {
-    background: #fff;
-    left: 1px;
-    position: absolute;
-    top: 1px;
-    z-index: 2;
-    border: 1px solid #DBE5EF;
-}
-
-ul#suggestList li{
-    padding: 0.5em;
-}
-
-ul#suggestList li.even {
-    background: none repeat scroll 0 0 #EAEFF5;
-}
-
-#search-location {
-    float: right;
-    margin-bottom: 10px;
-}
-
-#search-location-name { 
-       width: 16em; 
-}
-
-#choose-my-location {
-    float: right;
-    margin-right: 10px;
-}
-
-#choose-building {
-    float: left;
-}
-
-.month_view #choose-building {
-    clear:left;
-    margin-top: 1em;
-}
-
-.select-box { 
-               background: none repeat scroll 0 0 #FEFBF4;
-    border: 1px solid #DDDDDD;
-    border-radius: 5px 5px 5px 5px;
-    padding: 1em;      
-}
-
-.select-box label{
-       margin-bottom:5px;
-       display: block; 
-}
-
-.select-box a{
-       display: block;
-  font-weight: bold;
-  padding: 0 0 10px;
-  text-align: justify; 
-}
-
-#choose_loc .btn {
-    display: inline-block;
-    font-size: 0.9em;
-    padding: 2px 8px;
-}
-
-#choose_loc .btn.active{
-       background: #3F7EC1;    
-}
-
 #print_control_items{
        margin-top:20px;
 }