Changeset 700 for trunk/phpbms

Timestamp:

01/01/10 13:45:44 (2 years ago)

Author:

brieb

Message:

• updated references to FPDI and mailchimp on info page
• Added notes to ChangeLog?
• Fixed broken js linking in quickview
• reformatted old quickview button styles for consistency

Location:

trunk/phpbms

Files:

• ChangeLog (modified) (1 diff)
• common/stylesheet/mozilla/pages/quickview.css (modified) (1 diff)
• common/stylesheet/mozilla/sizes.css (modified) (1 diff)
• info.php (modified) (2 diffs)
• modules/bms/javascript/quickview.js (modified) (5 diffs)
• modules/bms/quickview.php (modified) (2 diffs)
• modules/bms/quickview_ajax.php (modified) (2 diffs)

trunk/phpbms/ChangeLog

@@ -6 +6 @@
  * Snapshot is customizable based on user's preference
  * Centralized posting for receipts and invoices
- * Menu system now uses a uuid instead of an id, making module development easier.
+ * System now uses UUIDs in addition to the mysql id, making module and API development easier.
+ * Formal API system that utilizes JSON to interact with other applications
+ * Push technology allows phpBMS to push data to other systems.
+ * True payment encryption/obfuscation for credit cards
+ * Reports now administratively configurable allowing for flexible report creation/modification without need for customization
+ * MailChimp module allows synchronization of clients with MailChimp e-mail marketing and e-mail list manager
+ * Easier to use configuration screen
+ * Automatically check for updates
+ * Increased security and security logging
 
 The complete list of closed tickets can be found here: http://phpbms.org/query?status=closed&milestone=0.98

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

@@ -3 +3 @@
 
 .SBResults A.client{
-        padding-left:30px;
-        background-image:url("../image/client.png");
+    padding-left:30px;
+    background-image:url("../image/client.png");
 }
 
 .SBResults A.prospect{
-        padding-left:30px;
-        background-image:url("../image/prospect.png");
+    padding-left:30px;
+    background-image:url("../image/prospect.png");
 }
 
 #viewButton, #addButton{
-        width:70px
+    width:70px
 }
 
 #clientIDDiv{
-        width:100%;
-        margin-right:200px;
-        margin-left: 170px;
-        background:red;
-}
+    width:100%;
+    margin-right:200px;
+    margin-left: 170px;
+    background:red;
+}
+
 #ds-clientid{
-        width:55%;
-}
-
-
-
+    width:55%;
+}
 
 #crTile.fsclient{
-        background-image:url("../image/client.png");
+    background-image:url("../image/client.png");
 }
 
 #crTile.fsprospect{
-        background-image:url("../image/prospect.png");
+    background-image:url("../image/prospect.png");
 }
 
 #crTile{
-        background:white no-repeat 13px 13px;
+    background:white no-repeat 13px 13px;
 }
 
 #crTile H1 {
-        background:none;
-        padding-left:26px;
-        font-weight:bold;
+    background:none;
+    padding-left:26px;
+    font-weight:bold;
 }
 
 #crTile P{
-        margin: 5px 0 5px 42px;
-        padding: 0;
+    margin: 5px 0 5px 42px;
+    padding: 0;
 }
 
 #crName{
-        font-size:14px;
-        font-weight:bold;
-        margin-top:0;
+    font-size:14px;
+    font-weight:bold;
+    margin-top:0;
 }
 
 #crLocation{
-        font-size:10px;
+    font-size:10px;
 }
 
 .RDNames{
+    float:left;
+    width:100px;
+    text-align:right;
+    font-weight:bold;
+}
+
+.RDData{
+    margin-left:120px;
+}
+
+.RDData UL {
+    margin:0;
+    padding:0;
+    padding-left:15px;
+}
+
+.RDData LI {
+    margin:0;
+    padding:0px 0px 5px 0;
+}
+
+#theclear{
+    clear:both;
+}
+
+
+.disabledP{
+    display:none;
+}
+
+#theDetails{
+    margin-top:15px;
+}
+
+#rightSideDiv{
+    float:right;
+    width:300px;
+    margin-top:0;
+}
+
+#leftSideDiv{
+    margin-right:308px;
+    padding-top:1px;
+}
+
+H2{
+    margin-top:5px;
+}
+
+.RDNames{
+    float:left;
+    width:100px;
+    text-align:right;
+}
+
+.RDData{
+    margin-left:120px;
+}
+
+#editClient{
+    display:block;
+    width:75px;
+    float:right;
+}
+
+#endClient{
+    clear:both;
+}
+
+.salesNotesButtons{
+    float:right;
+    margin-top:4px;
+    width:46px;
+    text-align:left;
+}
+
+#salesTable{
+    height:140px;
+    overflow:auto;
+}
+
+#notesTable{
+    height:140px;
+    overflow:auto;
+}
+
+.recordContainers{
+    clear:both;
+}
+
+.recordCommands{
+        background:url("../image/search-toolbar-back.png") repeat-x;
+        height:32px;
         float:left;
-        width:100px;
-        text-align:right;
-        font-weight:bold;
-}
-
-.RDData{
-        margin-left:120px;
-}
-
-.RDData UL {
-        margin:0;
-        padding:0;
-        padding-left:15px;
-}
-
-.RDData LI {
-        margin:0;
-        padding:0px 0px 5px 0;
-}
-
-#theclear{
-        clear:both;
-}
-
-
-.disabledP{display:none;}
-
-#theDetails{margin-top:15px;}
-#rightSideDiv{float:right;width:300px;margin-top:0;}
-#leftSideDiv{margin-right:308px;padding-top:1px;}
-
-H2{margin-top:5px;}
-
-.RDNames{float:left; width:100px;text-align:right;}
-.RDData{margin-left:120px;}
-
-#editClient{display:block;width:75px;float:right;}
-
-#endClient{clear:both;}
-
-.salesNotesButtons{
-        float:right;
-        margin-top:4px;
-        width:46px;
-        text-align:left;
-}
-
-#salesTable{height:140px;overflow:auto;}
-#notesTable{height:140px;overflow:auto;}
+        margin:0;padding:0;
+}
+
+    .recordCommands li{
+        float:left;
+        list-style-type:none;
+        padding:0;
+        margin:0;
+        background:url("../image/search-toolbar-itemback.png") no-repeat;
+        width:32px;
+    }
+
+        .recordCommands li a{
+            display:block;
+            margin:2px 0 0 2px;
+            width:26px;
+            height:26px;
+            background-repeat:no-repeat;
+        }
+
+        .recordCommands a span{
+            display:none;
+        }
+
+    .recordCommands .firstToolbarItem{
+        background-image:url("../image/search-toolbar-firstback.png")
+    }
+
+.newRecord{
+    background-image: url("../image/search-toolbar-new.png")
+}
+
+.editRecord{
+    background-image: url("../image/search-toolbar-edit.png")
+}
+
+.editRecordDisabled{
+    background-image: url("../image/search-toolbar-edit-db.png")
+}
+
+.deleteRecord{
+    background-image: url("../image/search-toolbar-delete.png")
+}
+
+.deleteRecordDisabled{
+    background-image: url("../image/search-toolbar-delete-db.png")
+}
+

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

@@ -74 +74 @@
 }
 
-.big input, .big button{
+.big input, .big button, .big select{
     font-size: 15px;
 }

trunk/phpbms/info.php

@@ -151 +151 @@
 
                 <li>
-                        <h3>fpdf (<a href="http://www.fpdf.org">www.fpdf.org</a>)</h3>
+                        <h3>fpdf (<a href="http://www.setasign.de/products/pdf-php-solutions/fpdi/">www.setasign.de</a>)</h3>
                         <p>A PHP class which allows to generate PDF files with pure PHP</p>
+                </li>
+
+                <li>
+                        <h3>FPDI (<a href="http://www.fpdf.org">www.fpdf.org</a>)</h3>
+                        <p>Extends FPDF to read pages from an existing PDF document and use them as templates in FPDF</p>
                 </li>
 
@@ -169 +174 @@
                         <p>An easy to use PHP class to read and write CSV data properly.</p>
                 </li>
+
+                <li>
+                        <h3>MailChimp API(<a href="http://mailchip.com/">MailChimp.com</a>)</h3>
+                        <p>Email Marketing and Email List Manager</p>
+                </li>
         </ul>
 

trunk/phpbms/modules/bms/javascript/quickview.js

@@ -46 +46 @@
 
     var clientid = getObjectFromID("theuuid");
+    var clientrealid = getObjectFromID("theid");
     var theURL = addeditfile;
 
@@ -65 +66 @@
 
         case "client":
-            theid = clientid.value;
+            theid = clientrealid.value;
             break;
 
@@ -72 +73 @@
     theURL += "?backurl=" + encodeURIComponent(currentURL + "?cid=" + clientid.value)
 
-    if(newedit == "edit")
-        theURL += "&id="  + encodeURIComponent(theid);
-    else
+    if(newedit == "edit"){
+
+        if(!theid)
+            return false;
+        else
+            theURL += "&id="  + encodeURIComponent(theid);
+
+    } else
         theURL += "&cid=" + encodeURIComponent(clientid.value);
 
-//console.log(theURL);
-//return false;
     document.location = theURL;
 
+    return false;
+
 }//end function addEditRecord
 
+
 function selectEdit(thetr,id,noteinvoice){
+
         var theeditbutton=getObjectFromID(noteinvoice+"edit");
         var theSelected;
+
         if(noteinvoice=="note")
                 theSelected=selectedNote;
@@ -91 +100 @@
                 theSelected=selectedInvoice;
 
-
         if(theSelected==id){
-                theeditbutton.className="graphicButtons buttonEditDisabled";
-                theeditbutton.disabled = true;
+
+                theeditbutton.className="editRecordDisabled";
                 theSelected="";
                 thetr.className=""
+
         } else {
                 for(var i=0; i<thetr.parentNode.childNodes.length;i++){
@@ -105 +114 @@
                 thetr.className="smallQueryTableSelected";
                 theSelected=id;
-                theeditbutton.className="graphicButtons buttonEdit";
-                theeditbutton.disabled = false;
+                theeditbutton.className="editRecord";
         }
         if(noteinvoice=="note")

trunk/phpbms/modules/bms/quickview.php

@@ -40 +40 @@
         require_once("include/fields.php");
 
-        $pagetitle="Quick View";
+        $pagetitle="Search Clients and Prospects";
 
         $phpbms->cssIncludes[] = "pages/quickview.css";
@@ -75 +75 @@
         <h1><?php echo $pagetitle?></h1>
 
-        <div class="fauxDiv">
-
-                <label for="lookupby">search by</label><br />
+        <div class="fauxDiv big">
 
                 <select id="lookupby">

trunk/phpbms/modules/bms/quickview_ajax.php

@@ -141 +141 @@
                             <fieldset>
                                     <legend>sales</legend>
-                                    <p>
-                                            <button type="button" class="graphicButtons buttonNew" onclick="addEditRecord('new','invoice','<?php echo getAddEditFile($this->db, "tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883","add")?>')"><span>new</span></button>
-                                            <button id="invoiceedit" type="button" disabled="disabled" class="graphicButtons buttonEditDisabled" onclick="addEditRecord('edit','invoice','<?php echo $invoiceEditFile?>')"><span>edit</span></button>
-                                    </p>
-                                    <div class="fauxP">
+                                    <ul class="recordCommands">
+                                        <li class="firstToolbarItem"><a href="#" class="newRecord" onclick="addEditRecord('new','invoice','<?php echo getAddEditFile($this->db, "tbld:62fe599d-c18f-3674-9e54-b62c2d6b1883","add")?>')" title="new sales order"><span>new</span></a></li>
+                                        <li><a href="#" id="invoiceedit" class="editRecordDisabled" onclick="addEditRecord('edit','invoice','<?php echo $invoiceEditFile?>')" title="edit"><span>edit</span></a></li>
+                                    </ul>
+                                    <div class="recordContainers">
                                     <div id="salesTable" class="smallQueryTableHolder">
                                             <?php if(!count($clientInfo["invoices"])) {?>
@@ -175 +175 @@
                                     <legend>notes</legend>
 
-                                    <div class="fauxP">
-                                    <p>
-                                            <button type="button" class="graphicButtons buttonNew" onclick="addEditRecord('new','note','<?php echo getAddEditFile($this->db, "tbld:a4cdd991-cf0a-916f-1240-49428ea1bdd1","add")?>')"><span>new</span></button>
-                                            <button id="noteedit" type="button" class="graphicButtons buttonEditDisabled" disabled="disabled" onclick="addEditRecord('edit','note','<?php echo $noteEditFile?>')"><span>edit</span></button>
-                                    </p>
+
+                                    <ul class="recordCommands">
+                                        <li class="firstToolbarItem"><a href="#" title="new note" class="newRecord" onclick="addEditRecord('new','note','<?php echo getAddEditFile($this->db, "tbld:a4cdd991-cf0a-916f-1240-49428ea1bdd1","add")?>')"><span>new</span></a></li>
+                                        <li><a href="#" title="edit" id="noteedit" class="editRecordDisabled" onclick="addEditRecord('edit','note','<?php echo $noteEditFile?>')"><span>edit</span></a></li>
+                                    </ul>
+                                    <div class="recordContainers">
+
                                     <div id="notesTable"  class="smallQueryTableHolder">
                                             <?php if(!count($clientInfo["notes"])) {?>