Changeset 485 for trunk/phpbms/common

Timestamp:

04/07/09 11:44:18 (3 years ago)

Author:

nate

Message:

• Merged Nathan branch back into trunk.

Location:

trunk/phpbms/common

Files:

• javascript/fields.js (modified) (8 diffs)
• stylesheet/mozilla/menu.css (modified) (1 diff)
• stylesheet/mozilla/pages/base/snapshot.css (copied) (copied from branches/nathan/common/stylesheet/mozilla/pages/base/snapshot.css)
• stylesheet/mozilla/pages/bms/incoming_cashflow.css (copied) (copied from branches/nathan/common/stylesheet/mozilla/pages/bms/incoming_cashflow.css)
• stylesheet/mozilla/pages/info.css (modified) (1 diff)
• stylesheet/mozilla/pages/login.css (modified) (1 diff)
• stylesheet/mozilla/pages/requirements.css (modified) (1 diff)
• stylesheet/mozilla/pages/snapshot.css (deleted)

trunk/phpbms/common/javascript/fields.js

@@ -41 +41 @@
         var thereturn=true;
         var errorMessage="";
-                        
+
         //skip validation if cancel
         if (theform["cancelclick"]){
@@ -56 +56 @@
                         break;
                 }
-        }       
-                
+        }
+
         //validate required fields first
         for(i=0;i<requiredArray.length;i++){
@@ -101 +101 @@
                 }
         }
-        
+
         //next phone numbers
         for(i=0;i<phoneArray.length;i++){
@@ -133 +133 @@
         }
         return thereturn;
-        
+
 }
 
@@ -209 +209 @@
 function validateCurrency(theitem){
         theitem.value=numberToCurrency(currencyToNumber(theitem.value));
-        
+
         //in case the field has an additional onchange code to be run
         if (theitem.thechange) theitem.thechange();
@@ -227 +227 @@
                 if (thenumber.charAt(i)!="%" && thenumber.charAt(i)!="+" && thenumber.charAt(i)!=",") markupnumber+=thenumber.charAt(i);
         }
-        
+
         //get rid of trailing zeros and possibly "."
         while(markupnumber.charAt(markupnumber.length-1)=="0" && markupnumber.indexOf(".")!=-1) markupnumber=markupnumber.substring(0,markupnumber.length-1);
@@ -238 +238 @@
 
 function checkUnique(tabledefid,column,checkvalue,excludeid){
-        
+
         var theurl=APP_PATH+"checkunique.php?tdid="+parseInt(tabledefid);
         theurl=theurl+"&c="+encodeURIComponent(column);
@@ -246 +246 @@
 
         loadXMLDoc(theurl,null,false);
-        
+
         response = req.responseXML.documentElement;
         thevalue = response.getElementsByTagName('isunique')[0].firstChild.data;
-        
+
         if(thevalue==1) return true; else return false;
 }

trunk/phpbms/common/stylesheet/mozilla/menu.css

@@ -124 +124 @@
 
 /* ------ Help Page  ---- */
-#helpBox{height:420px; overflow:auto; background:white}
-#helpBox h1{margin-top:20px;}
-#helpClose{width:70px}
+#helpBox{background:white}
+#helpClose{
+        padding-left: 15px;
+        padding-right: 15px;
+}

trunk/phpbms/common/stylesheet/mozilla/pages/info.css

@@ -1 +1 @@
 /* $Rev$ | $LastChangedBy$ */
 /* $LastChangedDate$ */
-#container{width:740px; margin:10px auto}
+#container{
+        width:740px; margin:10px auto
+}
+
 #phpBMSLogo{
-        float:right;
-        background:white url(../../../image/logo-large.png) 10px 10px no-repeat;
-        padding:77px 10px 10px 10px;
-        margin-right:20px;
-        width:250px;
-        text-align:right;
+        float: right;
+        background: white url("../../../image/logo-large.png") 10px 10px no-repeat;
+        padding: 77px 10px 10px 10px;
+        width: 250px;
+        text-align: right;
 }
-#companyInfo{margin-right:190px;}
-#loginButton{width:100px;}
+
+#companyInfo{
+        margin-right:260px;
+}
+
+#loginButton{
+        padding-right: 15px;
+        padding-left: 15px;
+}

trunk/phpbms/common/stylesheet/mozilla/pages/login.css

@@ -2 +2 @@
 /* $LastChangedDate$ */
 
-.bodyline{display:block;padding:5px;width:300px; margin: 0 auto;}
+.bodyline{
+        display: block;
+        padding: 5px;
+        width: 22em;
+        margin: 0 auto;
+}
+
+label{
+        line-height: 1.5em;
+}
+
 #loginbox{
         margin:100px auto 50px;
 }
 
-#loginbox h1{font-size:21px;font-weight:bold;background-position:6px 6px;padding-left:28px;color:#455372;}
+        #loginbox h1{
+                font-size: 21px;
+                font-weight: bold;
+                background-position: 6px 6px;
+                padding-left: 28px;
+                color:#455372;
+        }
 
-#moreinfoButtonP{text-align:left;padding-bottom:5px;}
+        #loginbox .box{
+                margin:10px 8px 10px;
+                border-style: none;
+                background-color: white;
+                text-align: center;
+        }
 
-#moreinfo{padding:0;}
-#moreingo p{padding:2px;}
-#moreinfo h2{margin:0;padding:5px;background:none;height:22px;}
-#moreinfo h2 a{display:block;width:85px;height:22px;background:url(../../../image/logo.png);}
-#moreinfo h3{text-align:left;padding:2px 5px 10px;margin:0;border:0;font-weight:normal;font-size:9px; border:0;}
+        #loginbox form{
+                padding:10px 5px 0;
+                margin:0;
+        }
 
-#buttonP{padding-right:18px;text-align:right;}
-#buttonP button{padding-left:15px;padding-right:15px;}
-
-#loginbox .box{
-        margin:10px 8px 10px;
-        border-style:none;
-        background-color:white;
-        text-align:center;
+#moreinfoButtonP{
+        float: left;
+        text-align:left;
+        padding-top: 6px;
 }
 
-#loginbox form{padding:10px 5px 0;margin:0;}
+#moreinfo{
+        padding:0;
+}
 
-#username,#password{width:98%;}
-#command{width:75px;}
+        #moreinfo p{
+                padding:2px;
+        }
 
-#failed{text-align:center;margin-top:5px;}
+        #moreinfo h2{
+                margin: 0;
+                padding: 5px;
+                background: none;
+                height: 22px;
+        }
+
+                #moreinfo h2 a{
+                        display: block;
+                        width: 85px;
+                        height: 22px;
+                        background: url("../../../image/logo.png");
+                }
+
+        #moreinfo h3{
+                text-align: left;
+                padding: 2px 5px 10px;
+                margin: 0;
+                border: 0;
+                font-weight: normal;
+                font-size: 9px;
+                border: 0;
+        }
+
+#buttonP{
+        text-align:right;
+}
+
+        #buttonP button{
+                padding-left: 15px;
+                padding-right: 15px;
+                font-size: 13px;
+        }
 
 
 
-#demobox{ margin:0 auto;}
-#demobox h2{margin-top:0;}
-#demobox dt{font-weight:bold; padding:2px 10px;}
-#demobox dd{padding-bottom:10px;}
+#username, #password{
+        width:99%;
+        font-size: 15px;
+}
+
+#command{
+        width:75px;
+}
+
+#failed{
+        text-align: center;
+        margin-top: 5px;
+}
+
+
+#demobox{
+        margin: 0 auto;
+}
+
+        #demobox h2{
+                margin-top:0;
+        }
+
+        #demobox dt{
+                font-weight:bold;
+                padding:2px 10px;
+        }
+
+        #demobox dd{
+                padding-bottom: 10px;
+        }

trunk/phpbms/common/stylesheet/mozilla/pages/requirements.css

@@ -1 +1 @@
 /* $Rev$ | $LastChangedBy$ */
 /* $LastChangedDate$ */
-#container{width:740px; margin:10px auto;}
-#cba{margin-top:45px;}
-#logo{
-        float:right;background:white url(../../../image/logo-large.png) 8px 12px no-repeat;
-        width:260px;height:67px;
+#container{
+        width:740px;
+        margin:10px auto;
 }
-#logo span{display:none;}
-#browserTable{margin:20px;}
-#loginButton{width:100px;}
+
+#browserTable{
+        width: 100%
+}
+
+#loginButton{
+        padding-left: 10px;
+        padding-right: 10px;
+}