Changeset 308 for trunk/phpbms/common

Timestamp:

09/17/07 12:30:10 (5 years ago)

Author:

brieb

Message:

Implements #180 - ical format for event list.
Fixes #181 - repeating notes/task/events completely rewritten. All repeatable items will need to be recreated.
Fixes #182 - Cross platform menu problems
Reformatted CSS to be compliant
Re formatted list screen columns and groupings. 0.9 Will completely reenter these. Any administrtive changes will need to be reimplemented.
Implemented mochikit like javascript. This will be an ongoing conversion to make the system more stable and standards compliant.
Fixed minor bugs in recurring invoices.
Recoded help screen.

Location:

trunk/phpbms/common

Files:

• javascript/common.js (modified) (10 diffs)
• javascript/login.js (modified) (2 diffs)
• javascript/menu.js (modified) (1 diff)
• javascript/moo/prototype.lite.js (modified) (1 diff)
• javascript/queryfunctions.js (modified) (1 diff)
• stylesheet/mozilla/base.css (modified) (1 diff)
• stylesheet/mozilla/basics.css (modified) (1 diff)
• stylesheet/mozilla/boxes.css (modified) (2 diffs)
• stylesheet/mozilla/forms.css (modified) (1 diff)
• stylesheet/mozilla/image/button-help.png (added)
• stylesheet/mozilla/image/button-ical.png (added)
• stylesheet/mozilla/image/button-info.png (added)
• stylesheet/mozilla/image/menubar.png (deleted)
• stylesheet/mozilla/image/menulinks.png (deleted)
• stylesheet/mozilla/image/section-down.png (added)
• stylesheet/mozilla/menu.css (modified) (1 diff)
• stylesheet/mozilla/pages/notes.css (modified) (1 diff)
• stylesheet/mozilla/pages/snapshot.css (modified) (2 diffs)
• stylesheet/mozilla/queryresults.css (modified) (2 diffs)
• stylesheet/mozilla/sizes.css (modified) (5 diffs)
• stylesheet/mozilla/tabs.css (modified) (1 diff)

trunk/phpbms/common/javascript/common.js

@@ -36 +36 @@
  +-------------------------------------------------------------------------+
 */
-
-document.getElementsByClassName = function(clsName){
-    var retVal = new Array();
-    var elements = document.getElementsByTagName("*");
-    for(var i = 0;i < elements.length;i++){
-        if(elements[i].className.indexOf(" ") >= 0){
-            var classes = elements[i].className.split(" ");
-            for(var j = 0;j < classes.length;j++){
-                if(classes[j] == clsName)
-                    retVal.push(elements[i]);
+if (typeof(phpBMS) == 'undefined') {
+    phpBMS = {};
+}
+
+
+
+/* BASE OBJECT FUNCTION -------------------------------------------------------- */
+/* ----------------------------------------------------------------------------- */
+if (typeof(phpBMS.base) == 'undefined') {
+    phpBMS.base = {};
+}
+
+phpBMS.base.update = function (self, obj/*, ... */) {
+    if (self === null) {
+        self = {};
+    }
+    for (var i = 1; i < arguments.length; i++) {
+        var o = arguments[i];
+        if (typeof(o) != 'undefined' && o !== null) {
+            for (var k in o) {
+                self[k] = o[k];
             }
         }
-        else if(elements[i].className == clsName)
-            retVal.push(elements[i]);
     }
-    return retVal;
-}
+    return self;
+};
+
+phpBMS.base.update(phpBMS.base, {
+
+        loadXMLDoc: function(url,readyStateFunction,async) {
+        
+                if(!readyStateFunction)
+                        readyStateFunction= null;
+        
+                if(!async)
+                        async = false;
+                
+                // branch for native XMLHttpRequest object
+                if (window.XMLHttpRequest) {
+                        req = new XMLHttpRequest();
+                        if(req.onreadystatechange && readyStateFunction)
+                                req.onreadystatechange = readyStateFunction;
+                        req.open("GET", url, async);
+                        req.send(null);
+                // branch for IE/Windows ActiveX version
+                } else if (window.ActiveXObject) {
+                        req = new ActiveXObject("Microsoft.XMLHTTP");
+                        if (req) {
+                                if(readyStateFunction) req.onreadystatechange = readyStateFunction;
+                                req.open("GET", url, async);
+                                req.send();
+                        }
+                }
+        },//end function loadXMLDoc
+        
+    nameFunctions: function (namespace) {
+        var base = namespace.NAME;
+        if (typeof(base) == 'undefined') {
+            base = '';
+        } else {
+            base = base + '.';
+        }
+        for (var name in namespace) {
+            var o = namespace[name];
+            if (typeof(o) == 'function' && typeof(o.NAME) == 'undefined') {
+                try {
+                    o.NAME = base + name;
+                } catch (e) {
+                    // pass
+                }
+            }
+        }
+    }//endfunction      
+        
+});//end update
+
+phpBMS.base.EXPORT = [
+        "update",
+        "nameFunctions",
+        "loadXMLDoc"
+];
+
+phpBMS.base._exportFunctions = function (globals, module) {
+
+        var all = module.EXPORT;
+        
+    for (var i = 0; i < all.length; i++) {
+        globals[all[i]] = module[all[i]];
+    }
+};
+
+phpBMS.base.__new__ = function () {
+        var m = this;
+        
+        m.nameFunctions(this);
+}
+
+phpBMS.base.__new__();
+phpBMS.base._exportFunctions(this,phpBMS.base);
+
+/* DOM HANDLEING --------------------------------------------------------------- */
+/* ----------------------------------------------------------------------------- */
+if (typeof(phpBMS.dom) == 'undefined') {
+    phpBMS.dom = {};
+}
+
+phpBMS.base.update(phpBMS.dom, {
+        
+        getObjectFromID: function(id){
+                var theObject;
+                
+                if(document.getElementById)
+                        theObject=document.getElementById(id);
+                else
+                        theObject=document.all[id];
+                return theObject;
+        },//end method
+        
+        
+        getElementsByClassName: function(clsName){
+                var retVal = new Array();
+                var elements = document.getElementsByTagName("*");
+                for(var i = 0;i < elements.length;i++){
+                        if(elements[i].className.indexOf(" ") >= 0){
+                                var classes = elements[i].className.split(" ");
+                                for(var j = 0;j < classes.length;j++){
+                                        if(classes[j] == clsName)
+                                                retVal.push(elements[i]);
+                                }
+                        }
+                        else if(elements[i].className == clsName)
+                                retVal.push(elements[i]);
+                }
+                return retVal;
+        }//endMethod    
+
+})//end update
+
+phpBMS.dom.EXPORT = [
+        "getObjectFromID",
+        "getElementsByClassName"
+];
+phpBMS.dom.__new__ = function (win) {
+        var m = phpBMS.base;
+    this._document = document;
+    this._window = win;
+        
+        m.nameFunctions(this);
+}
+
+phpBMS.dom.__new__(this);
+phpBMS.base._exportFunctions(this,phpBMS.dom);
+
+
+/* EVENT SIGNALING ------------------------------------------------------------- */
+/* ----------------------------------------------------------------------------- */
+if (typeof(phpBMS.signal) == 'undefined') {
+    phpBMS.signal = {};
+}
+
+phpBMS.signal._observers = [];
+
+phpBMS.signal.e = function (src, e) {
+    this._event = e || window.event;
+    this._src = src;
+};
+
+phpBMS.base.update(phpBMS.signal.e.prototype,{
+        
+            src: function () {
+        return this._src;
+    },
+
+    event: function () {
+        return this._event;
+    },
+
+    type: function () {
+        return this._event.type || undefined;
+    },
+
+    target: function () {
+        return this._event.target || this._event.srcElement;
+    },
+
+    relatedTarget: function () {
+        if (this.type() == 'mouseover') {
+            return (this._event.relatedTarget ||
+                this._event.fromElement);
+        } else if (this.type() == 'mouseout') {
+            return (this._event.relatedTarget ||
+                this._event.toElement);
+        }
+        return undefined;
+    },
+        
+    stop: function () {
+        this.stopPropagation();
+        this.preventDefault();
+    },
+
+    stopPropagation: function () {
+        if (this._event.stopPropagation) {
+            this._event.stopPropagation();
+        } else {
+            this._event.cancelBubble = true;
+        }
+    },
+
+    preventDefault: function () {
+        if (this._event.preventDefault) {
+            this._event.preventDefault();
+        } else {
+            this._event.returnValue = false;
+        }
+    }
+        
+})//end subclass
+
+phpBMS.base.update(phpBMS.signal, {
+                                   
+        _unloadCache: function(){
+
+                var self = phpBMS.signal;
+        var observers = self._observers;
+        
+        for (var i = 0; i < observers.length; i++) {
+            self._disconnect(observers[i]);
+        }
+        
+        delete self._observers;
+        
+        try {
+            window.onload = undefined;
+        } catch(e) {
+            // pass
+        }
+
+        try {
+            window.onunload = undefined;
+        } catch(e) {
+            // pass
+        }
+                
+        },//end method
+
+
+        _listener: function(srcObj, func){
+        var E = phpBMS.signal.e;
+                return function (nativeEvent) {
+                        func.apply(srcObj, [new E(srcObj, nativeEvent)]);
+                };
+        },//end method
+
+
+        connect: function(srcObj, eventName, func){
+        var self = phpBMS.signal;
+                
+                var listener = self._listener(srcObj, func);
+                
+                if (srcObj.addEventListener) {
+                        srcObj.addEventListener(eventName.substr(2), listener, false);
+                }else if (srcObj.attachEvent) {
+                        srcObj.attachEvent(eventName, listener); // useCapture unsupported
+                }//end if
+                
+        var ident = [srcObj, eventName, listener];
+        self._observers.push(ident);
+               
+        return ident;
+                
+        },
+
+
+        _disconnect: function(ident){
+
+                var src = ident[0];
+        var sig = ident[1];
+        var listener = ident[2];
+
+                if (src.removeEventListener) {
+            src.removeEventListener(sig.substr(2), listener, false);
+        } else if (src.detachEvent) {
+            src.detachEvent(sig, listener); // useCapture unsupported
+        }       
+        },
+
+
+        disconnect: function(ident){
+        var self = phpBMS.signal;
+        var observers = self._observers;
+
+                self._disconnect(ident);
+                observers.splice(ident, 1);
+                
+                return true;
+        }
+        
+})//end class
+
+phpBMS.signal.EXPORT = [
+        "connect",
+        "disconnect"
+]
+
+phpBMS.signal.__new__ = function (win) {
+        var m = phpBMS.base;
+    this._document = document;
+    this._window = win;
+
+    try {
+        this.connect(window, 'onunload', this._unloadCache);
+    } catch (e) {
+        // pass: might not be a browser
+    }
+
+
+        m.nameFunctions(this);
+}
+
+phpBMS.signal.__new__(this);
+
+
+
+phpBMS.base._exportFunctions(this,phpBMS.signal);
+
+
+
+
+
+
+
+
 
 // php equivilant to htmlEntitties
@@ -78 +394 @@
 }
 
-//Returns an object given an id
-function getObjectFromID(id){
-        var theObject;
-        if(document.getElementById)
-                theObject=document.getElementById(id);
-        else
-                theObject=document.all[id];
-        return theObject;
-}
-
 
 // This Function returns the Top position of an object
@@ -115 +421 @@
 }
 
-function loadXMLDoc(url,readyStateFunction,async) {
-        
-        if(!readyStateFunction)
-                readyStateFunction= null;
-
-        if(!async)
-                async = false;
-        
-        // branch for native XMLHttpRequest object
-        if (window.XMLHttpRequest) {
-                req = new XMLHttpRequest();
-                if(req.onreadystatechange && readyStateFunction)
-                        req.onreadystatechange = readyStateFunction;
-                req.open("GET", url, async);
-                req.send(null);
-        // branch for IE/Windows ActiveX version
-        } else if (window.ActiveXObject) {
-                req = new ActiveXObject("Microsoft.XMLHTTP");
-                if (req) {
-                        if(readyStateFunction) req.onreadystatechange = readyStateFunction;
-                        req.open("GET", url, async);
-                        req.send();
-                }
-        }
-}
-
-function addEvent(obj, evType, fn){
- if (obj.addEventListener){
-    obj.addEventListener(evType, fn, true);
-    return true;
- } else if (obj.attachEvent){
-    var r = obj.attachEvent("on"+evType, fn);
-    return r;
- } else {
-    return false;
- }
-}
-function removeEvent(obj, evType, fn, useCapture){
-  if (obj.removeEventListener){
-    obj.removeEventListener(evType, fn, useCapture);
-    return true;
-  } else if (obj.detachEvent){
-    var r = obj.detachEvent("on"+evType, fn);
-    return r;
-  } else {
-    window.status=("Handler could not be removed");
-  }
-}
 
 function getChildHeights(theObj){
@@ -194 +452 @@
 }
 
+
 function disableSave(){
         var tempButton=getObjectFromID("saveButton1");
@@ -203 +462 @@
 }
 
+
 function setLoginRefresh(){     
-        window.setInterval(loadXMLDoc,(LOGIN_REFRESH*60*1000),(APP_PATH+"include/session.php"),null,false)
-}
-
-
+        window.setInterval(doRefresh,(LOGIN_REFRESH*60*1000));
+}
+
+function doRefresh(){
+        loadXMLDoc((APP_PATH+"include/session.php"),null,false)
+        if(req.responseText != "")
+                alert("The session has timed out due to inactivity.  You will need to reload the page, and log back in.");
+}
+
+
+function initialiseGetData(){
+  window.location.get = new Object();
+  if (window.location.search && window.location.search.length > 1){
+    var getDataArray =
+        window.location.search.substr(1).replace('+', ' ').split(/[&;]/g);
+    for (var i = 0; i < getDataArray.length; i++){
+      var keyValuePair = getDataArray[i].split('=');
+      window.location.get[unescape(keyValuePair[0])]
+           = keyValuePair.length == 1
+           ? ''
+           : unescape(keyValuePair[1]);
+    }
+  }
+}
 
 /* DATE AND TIME --------------------------------------------------------------- */
@@ -466 +746 @@
         centerModal();
         
-        addEvent(window, "resize", centerModal);
-        window.onscroll=centerModal;
+        showModal.listeners =[
+                connect(window,"onresize",centerModal),
+                connect(window,"onscroll",centerModal)            
+        ]
 }
 
@@ -476 +758 @@
 
 function cleanupModal(){
-        removeEvent(window,"resize",centerModal,true);
-        window.onscroll=null;
-
+
+        for(var i=0; i<showModal.listeners.length; i++)
+                disconnect(showModal.listeners[i])
+                
         document.body.removeChild(showModal.mask);
         document.body.removeChild(showModal.box);
+
         displaySelectBoxes();
 
-        showModal.mask=null;
-        showModal.box=null;
+        delete showModal.mask;
+        delete showModal.box;   
 }
 
@@ -513 +797 @@
 }
 
-function hideSelectBoxes() {
-        var brsVersion = parseInt(window.navigator.appVersion.charAt(0), 10);
-        if (brsVersion <= 6 && window.navigator.userAgent.indexOf("MSIE") > -1) {               
+function hideSelectBoxes() {    
+        if (typeof document.body.style.maxHeight == "undefined") {
                 for(var i = 0; i < document.all.length; i++) {
                         if(document.all[i].tagName)
@@ -521 +804 @@
                                         document.all[i].style.visibility="hidden";
                 }
-        }
+        }       
 }
 function displaySelectBoxes() {
-        var brsVersion = parseInt(window.navigator.appVersion.charAt(0), 10);
-        if (brsVersion <= 6 && window.navigator.userAgent.indexOf("MSIE") > -1) {               
+        if (typeof document.body.style.maxHeight == "undefined") {
         for(var i = 0; i < document.all.length; i++) {
                 if(document.all[i].tagName)
@@ -541 +823 @@
 }
 window.alert = function(txt) {modalAlert(txt);}
+
+/* OnLoad Listener --------------------------------------- */
+/* ------------------------------------------------------- */
+connect(window,"onload",function() {
+
+        spinner = new Image;
+        spinner.src = APP_PATH+"common/image/spinner.gif";              
+
+        
+        
+        
+})//end listner

trunk/phpbms/common/javascript/login.js

@@ -1 @@
-window.onload=function(){
+connect(window,"onload", function(){
 
         var username=getObjectFromID("username");
@@ -19 +19 @@
                 sqlLinks[sqlLinks.length]=sqlbttn;
         
-                var sqlAccordion = new fx.Accordion(sqlLinks, sqlDivs, {opacity: true, duration:250, onComplete:function(){switchSqlButtons()}});
+                var sqlAccordion = new fx.Accordion(sqlLinks, sqlDivs, {opacity: true, duration:250});
         }
 
         username.focus();               
-}
-
-function switchSqlButtons(){
-        var sqlbutton=getObjectFromID("moreinfoButton");
-        if (sqlbutton.className=="graphicButtons buttonUp")
-                sqlbutton.className="graphicButtons buttonDown"
-        else
-                sqlbutton.className="graphicButtons buttonUp";
-}
+})

trunk/phpbms/common/javascript/menu.js

@@ -37 +37 @@
 */
 
-function showHelp(){
-        var theURL=APP_PATH+"help/index.php";
-        loadXMLDoc(theURL,null,false);
-        showModal(req.responseText,"phpBMS Help Resources",550);
+menu = {
+        
+        subMenuArray: Array(),
+        
+        showHelp: function(){
+                var theURL = APP_PATH + "help/index.php";
 
-        var helpToggles = document.getElementsByClassName("helpLinks");
-        var helpStuff = document.getElementsByClassName("helpDivs");
+                loadXMLDoc(theURL,null,false);
+                showModal(req.responseText,"phpBMS Help Resources",550);
+        },//endmethod
         
-        var helpFX = new fx.Accordion(helpToggles, helpStuff, {height:true, opacity:false, duration:400});
-                helpFX.showThisHideOpen(helpStuff[0]);
+        
+        checkExpand: function(e){
+                srcObj = e.src();
+                                
+                var i,tempDiv;
+                
+                var showid = srcObj.id.substring(4);
+                
+                var doswitch = false;
+                
+                for(i=0;i<menu.subMenuArray.length;i++){
+                        tempdiv=getObjectFromID("submenu"+menu.subMenuArray[i]);
+                        if(tempdiv.style.display=="block" && menu.subMenuArray[i]!=showid)
+                                doswitch=true;
+                }
+                if(doswitch)
+                        menu.expandMenu(e);
 
-}
+        },//end method
+        
+        
+        expandMenu: function(e){
+                srcObj = e.src();
+                                
+                var i;
+                var tempdiv;
+                var tempMenu;
+                var showid = srcObj.id.substring(4);
+                
+                var specificdiv = getObjectFromID("submenu"+showid);
 
-function checkExpand(theitem){
-        var i,tempDiv;
-        var showid=theitem.id.substring(4);
-        var doswitch=false;
-        for(i=0;i<subMenuArray.length;i++){
-                tempdiv=getObjectFromID("submenu"+subMenuArray[i]);
-                if(tempdiv.style.display=="block" && subMenuArray[i]!=showid)
-                        doswitch=true;
-        }
-        if(doswitch)
-                expandMenu(theitem);
+                if(specificdiv.style.display)
+                        if(specificdiv.style.display=="block"){
+                                specificdiv.style.display="none";
+                                srcObj.className = "topMenus";
+                                displaySelectBoxes();
+                                e.stop();                               
+                                return false;
+                        }//endif
         
-}
+                for(i=0;i<menu.subMenuArray.length;i++){
+                        if(menu.subMenuArray[i]!=showid){
+                                tempdiv=getObjectFromID("submenu"+menu.subMenuArray[i]);
+                                tempdiv.style.display="none";
+                                
+                                tempMenu = getObjectFromID("menu"+menu.subMenuArray[i]);
+                                tempMenu.className = "topMenus";
+                        }//endif
+                }//endfor
+                
+                var theMenuUL = getObjectFromID("menuBar")
+                for(i=0;i<theMenuUL.childNodes.length;i++){
+                        if(theMenuUL.childNodes[i].tagName)
+                                if(theMenuUL.childNodes[i].tagName == "LI"){
+                                        if(theMenuUL.childNodes[i].childNodes.length)
+                                                if(theMenuUL.childNodes[i].childNodes[0].className == "hovered")
+                                                        theMenuUL.childNodes[i].childNodes[0].className = "";
+                                }
+                                
+                }
+                srcObj.className = "topMenus hovered";
+                
+                var thetop=getTop(srcObj);
+                var theleft=getLeft(srcObj);
+                specificdiv.style.top=(thetop+srcObj.offsetHeight)+"px";
+                specificdiv.style.left=(theleft-6)+"px";
+                specificdiv.style.display="block";
+                hideSelectBoxes();
 
-function expandMenu(theitem){
-        var i;
-        var tempdiv;
-        var showid=theitem.id.substring(4);
-        var specificdiv=getObjectFromID("submenu"+showid);
-        if(specificdiv.style.display)
-                if(specificdiv.style.display=="block"){
-                        specificdiv.style.display="none";
-                        displaySelectBoxes();
-                        return false;
-                }
+                e.stop();
+        }//end method                   
+        
+}//end class
 
-        for(i=0;i<subMenuArray.length;i++){
-                if(subMenuArray[i]!=showid){
-                        tempdiv=getObjectFromID("submenu"+subMenuArray[i]);
-                        tempdiv.style.display="none";
-                }
-        }
-        var thetop=getTop(theitem);
-        var theleft=getLeft(theitem);
-        specificdiv.style.top=(thetop+theitem.offsetHeight)+"px";
-        specificdiv.style.left=(theleft-6)+"px";
-        specificdiv.style.display="block";
-        hideSelectBoxes()
-}
+
+
+/* OnLoad Listener --------------------------------------- */
+/* ------------------------------------------------------- */
+connect(window,"onload",function() {
+        var topMenus = getElementsByClassName('topMenus');
+        
+        var subMenus = getElementsByClassName('submenuitems');
+        for(var i=0; i<subMenus.length; i++)
+                menu.subMenuArray[menu.subMenuArray.length] = subMenus[i].id.substr(7);
+        
+        for(var i=0; i<topMenus.length; i++){
+                
+                connect(topMenus[i],"onmouseover",menu.checkExpand);
+                connect(topMenus[i],"onclick",menu.expandMenu);
+                
+        }//endfor
+})//end listner

trunk/phpbms/common/javascript/moo/prototype.lite.js

@@ -111 +111 @@
 };
 
-document.getElementsByClassName = function(className) {
+getElementsByClassName = function(className) {
         var children = document.getElementsByTagName('*') || document.all;
         var elements = [];

trunk/phpbms/common/javascript/queryfunctions.js

@@ -279 +279 @@
         selIDs= new Array();
         
-        theTable=getObjectFromID("queryresults").firstChild;
-        for(var i=0;i<theTable.childNodes.length;i++){
-                if(theTable.childNodes[i].className){
-                        if(theTable.childNodes[i].className != "queryGroup"){
-                                theTable.childNodes[i].className=newClass+theTable.childNodes[i].className.charAt(theTable.childNodes[i].className.length-1);
+        var tbody = getObjectFromID("resultTbody");
+        for(var i=0;i<tbody.childNodes.length;i++){
+                if(tbody.childNodes[i].className){
+                        if(tbody.childNodes[i].className != "queryGroup"){
+                                tbody.childNodes[i].className=newClass+tbody.childNodes[i].className.charAt(tbody.childNodes[i].className.length-1);
                                 if(!allornone)
-                                        selIDs[selIDs.length] = theTable.childNodes[i].id.substring(2);
+                                        selIDs[selIDs.length] = tbody.childNodes[i].id.substring(2);
                         }
                 }

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

@@ -19 +19 @@
         padding-right:6px;
         padding-top:0px;
+        margin:0 15px;
 }
 #footer p{padding:0px;margin:0px; font-size:9px;}

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

@@ -2 +2 @@
 /* $LastChangedDate$ */
 
-BODY { background: white url("image/back.png"); 
-        margin:0 15px;
+BODY { 
+        background: white url("image/back.png"); 
+        margin:0;
 }
+
 BODY, P, TABLE, TD, FORM, INPUT, SELECT, TEXTAREA, OL, UL, LI, BUTTON { 
         font-size : 12px;
         font-family : Arial,Helvitica,sans-serif;
-        color : black; }
+        color : black; 
+}
         
-P,.fauxP{margin:0;padding:0 5px 10px;}
+P,.fauxP{
+        margin:0;
+        padding:0 5px 10px;
+}
+
 .alt{display:none;}
 
-UL,OL{margin:5px;padding-left:20px; margin-bottom:0px;}
+UL,OL{
+        margin:5px;
+        padding-left:20px;
+        margin-bottom:0px;
+}
+
 LI{margin-bottom:5px;}
 
-A {     color : #455372; 
+A {     
+        color : #455372; 
         font-weight:bold; 
         text-decoration:none;
 }
+
 A:Hover { text-decoration:underline;}

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

@@ -3 +3 @@
 
 fieldset,.bodyline,.box{ 
-        border: 1px #E4ECEC outset; 
-        padding:0px;
+        border: 1px solid #ACB7C4; 
+        padding:5px;            
         margin-bottom:5px;
 }
 .bodyline,#modalBox{
         background:#E4ECEC url("image/bodyline.png") bottom left repeat-x;
+        margin-left:15px;
+        margin-right:15px;
 }
 
@@ -14 +16 @@
         clear:both;
         border-color:#CAD1D1;
-        border-style:solid;
-        padding:10px;margin-top:0px;
+        padding:10px;
 }
 
-fieldset,.box{
-        border-color:#ACB7C4;
-        border-width:1px;
-        border-style:solid;
+fieldset,.box{  
         margin:3px 3px 7px 3px;
-        padding:5px;            
 }
-fieldset{padding:8px;overflow:hidden;}
+
+fieldset{
+        padding:8px;
+        overflow:hidden;
+}
+
 .box{
         background-color:#EFF9F9;
-        border:1px solid #CCCCCC;       
+        border-color:#CCCCCC;   
 }

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

@@ -65 +65 @@
 .graphicButtons span{display:none}
 
+.buttonInfo{background:url(image/button-info.png) 0 0 no-repeat;}
+.buttonIcal{background:url(image/button-ical.png) 0 0 no-repeat; width:27px;}
 .buttonRew{background:url(image/button-rew.png) 0 0 no-repeat;}
 .buttonCheck{background:url(image/button-check.png) 0 0 no-repeat;}

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

@@ -2 +2 @@
 /* $LastChangedDate$ */
 
-        #menu{
-                clear:both;
-                padding:0px;
-                margin:0 -15px 20px;
-                background:url(image/menu.png);
-                color:white;
-                height:75px;
-        }
-        #menu a, #topMenu a:hover{color:white;}
-        #menu a{text-decoration:none;}
-        #menu a:hover{text-decoration:underline;}
+#menu{
+        clear:both;
+        padding:0px;
+        background:url("image/menu.png") repeat-x;
+        color:white;
+        margin:0 0 20px;
+}
 
-        #menu h1{
-                background:none;
-                float:left;
-                margin:0;
-                padding:10px;
-                padding-left:15px;
-                font-weight:bold;
-                font-size:20px;
-                border:0;
-        }
-        
-        #menuRighthand{
-                float:right;
-                padding:14px 15px 0 0;
-        }
+#menu a, #topMenu a:hover{
+        color:white;
+        text-decoration:none;
+}
 
-        #menuBar {
-                display:block;
-                margin:0;
-                clear:both;
-                background:#697388 url("image/menubar.png") repeat-x;
-                border-top:1px solid #8693ae;
-                border-bottom:2px solid #444a58;
-                text-transform:lowercase;
-                padding:0 0 0 15px;
-                height:27px;
-        }
-        #menuBar li{float:left;list-style-type:none;margin:0;padding:0;}
-        #menuBar a{
-                display:block;
-                background-image: url("image/menulinks.png");
-                background-position:0px 0px;
-                border-right:1px solid #5a6375;
-                font-size:12px;
-                color:white;
-                padding:6px 15px;
-        }
-        #menuBar a:hover{ 
-                background-position:0px 27px;
-                text-decoration:none; 
-                background-color:#747F96;
-        }
-        #menuBar .submenuitems li{float:none;}
-        .submenusli{padding:0;margin:0;}
-        .submenuitems{
-                clear:left;
-                display:none;
-                margin-top:1px;
-                padding:2px 2px 4px 2px;
-                position:absolute;
-                background-color:white;
-                border:1px solid #999999;
-        }
-        #menuBar .submenuitems a{
-                border:0;
-                background-image:none;
-                margin:0px;
-                display:block; 
-                padding:3px 25px 3px 10px;
-                font-size:11px;
-                color:#663366;
-                white-space:nowrap;
-                font-weight:normal;
-        }
-        #menuBar .submenuitems .menuSep {border-top:1px solid #CCCCCC; padding-top:3px;margin-top:3px;}
-        
-        #menuBar .submenuitems a:hover{
-                text-decoration:none; 
-                background-color:#663366;
-                color:white;
-        }
-        
-        #statusmessage{
-                background:#0B63A2 url(image/statusm-right.png) bottom right no-repeat;
-                margin:15px;
-                margin-top:-20px;
-                padding:0 5px 0 0;
-                display:none;
-        }
-        #SMLeft{background:url(image/statusm-left.png) bottom left no-repeat;padding-bottom:5px;}
-        #SMText{
-                background:url("image/statusmessage.png") 7px 5px no-repeat;
-                color:white; 
-                font-weight:bold; 
-                font-size:15px;
-                padding: 5px 5px 0px 30px;
-        }
+#menu a:hover{
+        text-decoration:underline;
+}
 
-/* ------ Help Page  ---- */    
-.helpLinks{
+
+#menu h1{
+        background:none;
+        float:left;
         margin:0;
-        cursor:pointer;font-size:13px;background:#EEEEEE url(image/button-moveupdn.png) 99% no-repeat;
-        padding:4px;
-        border-bottom:1px solid #BBBBBB;        
+        padding:9px 10px 11px;
+        padding-left:15px;
+        font-weight:bold;
+        font-size:22px;
+        border:0;
 }
-.helpLinks:hover{background-color:#DDDDDD}
-.helpDivs {background:white; margin:0 5px; border:1px solid #EEEEEE; border-top-width:0; border-bottom-width:0;}
-.helpSectionDivs{height:280px; overflow:auto;padding:10px;}
 
+#menuRighthand{
+        float:right;
+        padding:14px 15px 0 0;
+}
+
+#menuBar {
+        background:#E4ECEC url("image/bodyline.png") bottom left repeat-x;
+        display:block;
+        clear:both;
+        text-transform:lowercase;
+        border-bottom:1px solid #ACB7C4;
+        margin:0;
+        padding:0 0 0 5px;      
+        height:26px;
+}
+#menuBar li{
+        display:block;
+        float:left;
+        list-style-type:none;
+        margin:0;
+        padding:0;
+}
+#menuBar a{
+        display:block;
+        font-size:12px;
+        font-weight:normal;
+        color:black;
+        padding:6px 10px;
+        height:15px;
+        outline:none;
+}
+#menuBar a:hover, #menuBar .hovered{ 
+        text-decoration:none; 
+        background-color:#663366;
+        color:white;
+}
+
+#menuBar .submenuitems li{float:none;}
+.submenusli{padding:0;margin:0;}
+.submenuitems{
+        clear:left;
+        display:none;
+        padding:2px 2px 4px 2px;
+        margin-top:-1px;
+        position:absolute;
+        background-color:white;
+        border:1px solid #999999;
+}
+#menuBar .submenuitems a{
+        border:0;
+        background-image:none;
+        margin:0px;
+        display:block; 
+        padding:3px 25px 3px 15px;
+        font-size:11px;
+        color:black;
+        white-space:nowrap;
+        font-weight:normal;
+}
+#menuBar .submenuitems .menuSep {border-top:1px solid #AAAAAA; padding-top:3px;margin-top:3px;}
+
+#menuBar .submenuitems a:hover{
+        text-decoration:none; 
+        background-color:#663366;
+        color:white;
+}
+
+#statusmessage{
+        background:#0B63A2 url(image/statusm-right.png) bottom right no-repeat;
+        margin:15px;
+        margin-top:-20px;
+        padding:0 5px 0 0;
+        display:none;
+}
+#SMLeft{background:url(image/statusm-left.png) bottom left no-repeat;padding-bottom:5px;}
+#SMText{
+        background:url("image/statusmessage.png") 7px 5px no-repeat;
+        color:white; 
+        font-weight:bold; 
+        font-size:15px;
+        padding: 5px 5px 0px 30px;
+}
+
+/* ------ Help Page  ---- */
+#helpBox{height:420px; overflow:auto; background:white}
+#helpBox h1{margin-top:20px;}
+#helpClose{width:70px}

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

@@ -25 +25 @@
 #category{width:95%}
 
-#repeatoptions{display:inline}
-.repeatWeekChecks{margin-right:10px;}
-#rpmobdt{margin-bottom:5px;}
 #content{width:99%}
 
+#repeatDiv{clear:both;}
+.monthDays{width:30px;}
+.yearlyMonths{width:40px;}
+
+

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

@@ -2 +2 @@
 /* $LastChangedDate$ */
 #systemMessageContainer{padding:10px;}
-#systemMessageContainer h2{margin:0 0 5px 0;padding:0 0 0px 0;}
 .systemMessageLinks{font-size:12px; border-bottom:1px solid #DDDDDD; cursor:pointer; margin:5px 5px 0px; padding:3px;}
 .systemMessageLinks:hover{background-color:#DDDDDD}
@@ -8 +7 @@
 .systemMessages p{padding:8px;margin:0 5px 5px;background:white;}
 
+#tasksBox{vertical-align:top;padding:10px;}
 
+h2{
+        margin:3px 0 5px; 
+        padding:0 0 4px; 
+        border:0;
+        font-size:15px
+}
+
+#tasksBox h3, #invoiceBox h3, #clientBox h3{
+        margin:0;
+        cursor:pointer;font-size:13px;background:#EEEEEE url("../image/section-down.png") 99% 3px no-repeat;
+        padding:4px;
+        border-bottom:1px solid #BBBBBB;        
+}
+#invoiceBox h3, #clientBox h3{
+        margin-bottom:10px;
+}
+
+#tasksBox h3:hover, #invoiceBox h3:hover, #clientBox h3:hover{background-color:#DDDDDD}
+
+.tasksDivs div{padding:5px 0 0;background:white;border-top:0;margin:0 5px;}
+.tasksDivs p{margin:0; padding:4px 4px 4px 8px; border-bottom:1px solid #EEEEEE; font-size:11px;}
+
+
+.tasksDivs a{font-weight:normal}
+
+.tasksDivs .private a{font-weight:bold}
+
+.tasksDivs .complete, .tasksDivs .complete a {
+        text-decoration:line-through;
+        color:#CCCCCC;
+}
+
+.tasksDivs .pastDue a{color:#FF0000;}
+
+#eventsBox #eventButtons{float:right; margin:0;padding:0;}
 #eventsBox{vertical-align:top;padding:10px;}
-#eventsBox h2{margin:0; padding:0}
-#todaysDate{float:right;padding:2px 0 0 0;margin:0;}
-
-#tasksBox{vertical-align:top;padding:10px;}
-#tasksBox h2{margin:0 0 5px; padding:0}
-#tasksBox h3{
-        margin:0;
-        cursor:pointer;font-size:13px;background:#EEEEEE url(../image/button-moveupdn.png) 99% no-repeat;
+#eventsBox h2{margin:0; padding:4px 0 4px;}
+#eventsBox table{border-collapse:collapse;}
+#eventsBox td{padding:10px 5px; border-bottom:1px solid #DDDDDD; font-size:11px;}
+#eventsBox .eventDayName td{font-size:13px;background:#EEEEEE;
+        font-weight:bold;
         padding:4px;
-        border-bottom:1px solid #BBBBBB;
-        
-}
-#tasksBox h3:hover{background-color:#DDDDDD}
-
-.tasksDivs div{padding:5px 0;background:white;border-top:0;margin:0 5px;}
-.tasksDivs p{margin:0; padding:4px 4px 4px 8px; border-bottom:1px dotted #EEEEEE;}
-
-.task a,.taskCompleted a,.taskPastDue a,.taskPrivate a{ font-weight:normal;}
-.taskPrivate a{ font-weight:bold;}
-
-.taskCompleted { text-decoration:line-through; color:#CCCCCC;}
-.taskCompleted a{color:#CCCCCC;}
-
-.taskPastDue a{color:#FF0000;}
-
-.eventDayName{font-weight:bold;font-size:13px; border-bottom:1px solid #BBBBBB; padding:3px;}
-.event{padding:4px;padding-bottom:6px;}
+        border-bottom:1px solid #BBBBBB;}
+#eventsBox #today td{background:#DDDDDD}
 
 #bmsBox {padding:10px;}
-#bmsBox button{display:block;float:right;margin:2px 2px 0 0;}
+#bmsBox .rightButtons{float:right;margin:2px 2px 0 0;}
 #bmsBox h2{margin:0 0 4px;}

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

@@ -5 +5 @@
 .row2{background-color:#D9DBE1;}
 
-.dottedline { border-bottom: 2px #AAAAAA dotted;}
-
 .buttonSectionTitles,.buttonSection{border: 1px #666666 solid; border-bottom: 0; 
         font-size:11px; padding:1px; padding-bottom:0px; 
@@ -12 +10 @@
 .buttonSection{border-top:0;  padding-top:0; padding-bottom:1px;}
 
-.norecords {background-color:#DDDDDD; font-size:16px; padding:50px; font-weight:bold; border-bottom:1px solid #999999;}
+#queryTableContainer{
+        margin:0 0 5px;
+        padding:0;
+        clear:both;
+        overflow:auto;
+}
+
 
 .querytable{ 
-        border-collapse:collapse;
-        margin:0 0 5px;
         clear:both;
+        border:1px solid #BBBBBB;
+        border-right-width:0;
 }
 
-.querytable td, .queryrow1 td, .queryrow2 td{ 
-                                border:1px solid #BBBBBB;
-                                border-bottom-width:0;
-                                border-top-width:0;
-                                font-size: 11px;
-                                padding:4px;
-                                padding-bottom:2px;
-                        }
+.querytable td, .querytable th{ 
+        font-size: 11px;
+        padding:6px;
+        border-right:1px solid #BBBBBB;
+}
+.norecords td {
+        font-size:16px; 
+        padding:20px; 
+        font-weight:bold; 
+        text-align:center;
+}
+
 .querytable th{
+        border-bottom:1px solid #BBBBBB;
         background:#7B8DA1;
-        border:1px solid #BBBBBB;
-        padding:3px 5px;
+        font-size:12px;
         color:white;
 }
-
 .querytable th A{color: white;}
 .querytable th A:hover{color: white;}
 
 .queryGroup td{
-        border:1px solid #BBBBBB;
+        background:#97A7BA;
         font-size: 14px;        
         font-weight:bold;
+        border-bottom:1px solid #BBBBBB;        
 }
 
-.querytable td.queryfooter, .queryfooter{
+.querytable .queryfooter td{
+        border-top:1px solid #BBBBBB;
         white-space:nowrap;
         background:#DDDDDD;
-        border:1px solid #BBBBBB;
-        padding:5px;
 }
 
-.qr1,.qr2{background-color:white;
+.qr1 td,.qr2 td{background-color:white;
                         cursor: pointer; 
 }
-.qr2{background-color:#EAEDF1}
+.qr2 td{background-color:#F5F6F8}
 
-.qr1:hover, .qr2:Hover {background-color:#97A7BA}
-.qr1:hover td, .qr2:Hover td {color:white}
+.qr1:hover td, .qr2:hover td{background-color:#EAEDF1;}
 
-.qh1, .qh2{background-color:black; cursor: pointer; }
-.qh1 td, .qh2 td{color:white;}
-.qh1, .qh2{background-color:black; cursor: pointer; }
+.qh1 td, .qh2 td{background-color:black; cursor: pointer; color:white;}
 .qh1 a, .qh2 a{color:white;}
+
+
 
 #sqlstatement{display:none}

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

@@ -3 +3 @@
 
 /* ============================================================================== */
-/* Font size/standouts headers                                                    */
+/* Font size/standouts/headers                                                    */
 /* ============================================================================== */
 
@@ -12 +12 @@
 .mono {font-family:'Courier New', Courier, mono;}
 
-.standout{ background-color:#0B63A2; color:white; font-weight:bold; font-size:15px; padding:4px;}
+.standout{ 
+        background-color:#0B63A2; 
+        color:white; 
+        font-weight:bold; 
+        font-size:15px;
+        padding:4px;
+}
 
 .notes {color:#DF0005}
@@ -27 +33 @@
         background: url("image/h1graphic.png") 4px 4px no-repeat;;
 }
+
 LEGEND,H2{      
         font-weight:bold;
         font-size:15px; 
         color:#455372;
-        text-transform:capitalize;
-        font-family: Arial, Helvitica, sans-serif;
+        text-transform:capitalize;
+        font-family: Arial, Helvitica, sans-serif;
 }
+
 LEGEND {margin-top:0px; font-size:14px;}
+
 H2{
         border-bottom: 1px solid #ccc;
@@ -44 +53 @@
         margin-bottom:5px;
 }
+
 H3{
         font-size:14px;
@@ -51 +61 @@
     font-family: Arial, Helvitica, sans-serif;
 }
+
 H4{
         font-size:12px;

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

@@ -2 +2 @@
 /* $LastChangedDate$ */
 
-.tabs{margin:0;padding:0 0 0 10px;height:20px;}
-.tabs LI{display:block;float:left;list-style-type:none;margin:0 2px 0 0;padding:0 5px 0 0; 
-                                background:url("image/tab.gif") no-repeat;
-                                background-position:100% -600px;
-                                font-size:11px;
-                                }
-.tabs LI A, .tabs LI div{ display:block; padding:4px 4px 4px 9px;
-                                background:url("image/tab.gif") no-repeat;
-                                background-position:0% -600px;
-                                color:white;font-weight:normal;
+.tabs{
+        margin:0 15px;
+        padding:0 0 0 10px;
+        height:20px;
 }
+
+.bodyline .tabs{
+        margin:0
+}
+
+.tabs LI{
+        display:block;
+        float:left;
+        list-style-type:none;
+        margin:0 2px 0 0;
+        padding:0 5px 0 0; 
+        background:url("image/tab.gif") no-repeat;
+        background-position:100% -600px;
+        font-size:11px;
+}
+
+.tabs LI A, .tabs LI div{ 
+        display:block; 
+        padding:4px 4px 4px 9px;
+        background:url("image/tab.gif") no-repeat;
+        background-position:0% -600px;
+        color:white;
+        font-weight:normal;
+}
+
 .tabs LI div{color:#BBBBBB}
+
 .tabs LI:Hover{background-position:100% -400px;}
+
 .tabs LI:Hover A, .tabs LI:Hover div{background-position:0% -400px;}
 
 .tabs .tabsSel{ background-position:100% -200px;}
-.tabs .tabsSel A,.tabs .tabsSel div{color:#5F697E;background-position:0% -200px;}
+
+.tabs .tabsSel A,.tabs .tabsSel div{
+        color:#5F697E;
+        background-position:0% -200px;
+}
 
 .tabs .tabsSel:Hover{ background-position:100% 0px;}
-.tabs .tabsSel:Hover A, .tabs .tabsSel:Hover div{ color:#5F697E;background-position:0% 0px;}
+
+.tabs .tabsSel:Hover A, .tabs .tabsSel:Hover div{ 
+        color:#5F697E;
+        background-position:0% 0px;
+}
 
 .tabs LI div span,.tabs LI a span{