Expand all button fixed - update button green

diff --git a/css/admin.css b/css/admin.css
index 03b5ec3..a85e54d 100644 (file)
--- a/css/admin.css
+++ b/css/admin.css
@@ -47,15 +47,15 @@
 }
 @media only screen and (max-width: 639px) {
     .glm-contact-content-toggle {
-        margin-top: 50px;
+        margin-top: 10px;
     }
 }
 #glm-admin-content-container .glm-contact-content-toggle h3 {
     color: #32373c;
     font-size: 13px;
     line-height: 1.6;
-    margin-bottom: 5px;
-    margin-top: 0;
+    margin-bottom: 2px;
+    margin-top: 2px;
 }
 #glm-contact-fullprofile-toggle.selected {
     box-shadow: 1px 1px 2px lightgrey inset;
@@ -129,6 +129,12 @@
 #glm-table-profile .glm-contact-sub-data-links .glm-contact-link-to-top {
     float: right;
 }
+#glm-table-profile #updateContact {
+    background: lightgreen;
+    padding: 7px 14px;
+    border-radius: 3px;
+    border: 1px solid darkseagreen;
+}
 
 /* Input Fields CSS */
 input::placeholder {
@@ -164,13 +170,6 @@ input::placeholder {
     display: block;
     overflow: hidden;
 }
-#glm-table-profile.glm-admin-table th {
-    color: #515151;
-    font-size: 12px;
-    padding-bottom: 14px;
-    padding-top: 14px;
-    line-height: 1.6px;
-}
 #glm-table-profile.glm-admin-table td.glm-contact-citybox {
     max-width: 320px;
 }
@@ -200,9 +199,29 @@ input::placeholder {
     padding: 10px;
     margin-bottom: 5px;
 }
+#glm-table-profile #glm-members-custom-fields-glm-member-db-contacts .glm-custom-field-label {
+    font-weight: normal;
+}
+#glm-table-profile #glm-members-custom-fields-glm-member-db-contacts fieldset {
+    background: #f8ffff;
+    padding: 10px;
+}
+#glm-table-profile fieldset {
+    background: white;
+    border: 1px solid lightgrey;
+    margin-bottom: 10px;
+}
+#glm-table-profile fieldset legend {
+    text-decoration: underline;
+    font-size: 15px;
+    margin-left: 5px;
+    margin-bottom: 10px;
+}
 #glm-table-profile .glm-admin-table.glm-admin-table-inner {
     border-top-left-radius: 0;
     border-top-right-radius: 0;
+    max-width: 100%;
+    display: block;
 }
 #glm-table-profile.glm-admin-table > tbody > tr > td {
     display: block;
@@ -219,52 +238,45 @@ input::placeholder {
 #glm-table-profile .glm-item-container {
     float: left;
 }
-#glm-table-profile fieldset {
-    background: white;
-    border: 1px solid lightgrey;
-    margin-bottom: 10px;
-}
-#glm-table-profile #glm-members-custom-fields-glm-member-db-contacts fieldset {
-    background: #f8ffff;
-    padding: 10px;
+
+#glm-table-profile.glm-admin-table th {
+    color: #515151;
+    font-size: 13px;
+    padding-bottom: 14px;
+    padding-top: 14px;
+    line-height: 1.6px;
 }
-#glm-table-profile fieldset legend {
-    text-decoration: underline;
+#glm-table-profile input[type=text] {
     font-size: 15px;
-    margin-left: 5px;
-    margin-bottom: 10px;
 }
-@media only screen and (max-width: 9999px) {
-    #glm-table-profile input[type=text] {
-        font-size: 15px;
-    }
-    #glm-table-profile.glm-admin-table {
-        table-layout: fixed;
-    }
-    #glm-table-profile.glm-admin-table .glm-custom-field-label,
-    #glm-table-profile.glm-admin-table th {
-        clear: both;
-        display: block;
-        max-width: 100%;
-        padding-bottom: 7px;
-        width: 100%;
-    }
-    #glm-table-profile.glm-admin-table tr {
-        display: block;
-        margin-bottom: 10px;
-    }
+#glm-table-profile.glm-admin-table {
+    table-layout: fixed;
+}
+#glm-table-profile.glm-admin-table .glm-custom-field-label,
+#glm-table-profile.glm-admin-table th {
+    clear: both;
+    display: block;
+    max-width: 100%;
+    padding-bottom: 7px;
+    width: 100%;
+}
+#glm-table-profile.glm-admin-table tr {
+    display: block;
+    margin-bottom: 5px;
+}
+#glm-table-profile.glm-admin-table .glm-custom-field,
+#glm-table-profile.glm-admin-table td {
+    clear: both;
+    display: block;
+    width: 100%;
+    max-width: 640px;
+}
+@media only screen and (max-width: 639px) {
+    .glm-form-text-input-short,
+    .glm-form-text-input-medium,
     #glm-table-profile.glm-admin-table .glm-custom-field,
     #glm-table-profile.glm-admin-table td {
-        clear: both;
-        display: block;
-        width: 100%;
-        max-width: 640px;
-    }
-    @media only screen and (max-width: 639px) {
-        #glm-table-profile.glm-admin-table .glm-custom-field,
-        #glm-table-profile.glm-admin-table td {
-            max-width: 100%;
-        }
+        max-width: 240px;
     }
 }
 

diff --git a/views/admin/contacts/edit.html b/views/admin/contacts/edit.html
index dc2362c..32ab7d1 100644 (file)
--- a/views/admin/contacts/edit.html
+++ b/views/admin/contacts/edit.html
@@ -141,7 +141,9 @@
 
             <div id="glm-contact-fullprofile-toggle" class="">Expand All</div>
             <div id="glm-table-profile" class="glm-admin-table-outer glm-contact-info-table glm-admin-table">
-                <div id="glm-contact-account-settings-toggle" class="glm-contact-content-toggle {if $contactEditOwnRecord}glm-hidden{/if}">Account Settings</div>
+                <div id="glm-contact-account-settings-toggle" class="glm-contact-content-toggle {if $contactEditOwnRecord}glm-hidden{/if}">
+                    <h3 class="section-title">Account Settings</h3>
+                </div>
                 <div id="glm-contact-account-settings-container" class="glm-admin-form-section glm-contact-content-data {if $contactEditOwnRecord}glm-hidden{/if}">
                     <div id="glm-contact-account-settings">
 
@@ -200,7 +202,9 @@
                     </div>
                 </div>
 
-                <div id="glm-contact-account-profile-toggle" class="glm-contact-content-toggle selected">Account Profile</div>
+                <div id="glm-contact-account-profile-toggle" class="glm-contact-content-toggle selected">
+                    <h3 class="section-title">Account Profile</h3>
+                </div>
                 <div id="glm-contact-account-profile-container" class="glm-admin-form-section glm-contact-content-data">
                     <div id="glm-contact-account-profile">
 
@@ -434,7 +438,7 @@
                     </div>
                 </div>
                 <div id="glm-contact-account-contact-toggle" class="glm-contact-content-toggle">
-                    <h3>Account Contact Info</h3>
+                    <h3 class="section-title">Account Contact Info</h3>
                 </div>
                 <div id="glm-contact-account-contact-container" class="glm-admin-form-section glm-contact-content-data">
                     <div id="glm-contact-account-contact">
@@ -578,7 +582,7 @@
                     </div>
                 </div>
                 <div id="glm-contact-company-info-toggle" class="glm-contact-content-toggle">
-                    <h3>Organization/Company Information</h3>
+                    <h3 class="section-title">Organization/Company Information</h3>
                 </div>
                 <div id="glm-contact-company-info-container" class="glm-admin-form-section glm-contact-content-data">
                     <div id="glm-contact-company-info">
@@ -759,7 +763,7 @@
 
             {if apply_filters( 'glm-members-billing-enabled', false )}
                 <div id="glm-contact-billing-fields-toggle" class="glm-contact-content-toggle">
-                    <h3>Billing Info</h3>
+                    <h3 class="section-title">Billing Info</h3>
                 </div>
                 <div id="glm-contact-billing-fields-container" class="glm-admin-form-section glm-contact-content-data">
                     <div id="glm-contact-billing-fields">
@@ -773,7 +777,7 @@
             {/if}
 
                 <div id="glm-contact-custom-fields-toggle" class="glm-contact-content-toggle">
-                    <h3>
+                    <h3 class="section-title">
                     {if apply_filters( 'glm-members-billing-contact-tab-name', '' )}
                         {apply_filters( 'glm-members-billing-contact-tab-name', '' )}
                     {else}
@@ -799,7 +803,7 @@
                     </div>
                 </div>
                 <div id="glm-contact-notes-toggle" class="glm-contact-content-toggle">
-                    <h3>Notes</h3>
+                    <h3 class="section-title">Notes</h3>
                 </div>
                 <div id="glm-contact-notes-container" class="glm-admin-form-section glm-contact-content-data">
                     <div id="glm-contact-notes">
@@ -873,7 +877,7 @@
 
             </div>
             <p><span class="glm-required">*</span> Required</p>
-            <input id="updateContact" type="submit" value="{if $contactID && $contactInfo}Update contact{else}Add new contact{/if}">
+            <input id="updateContact" class="glm-button" type="submit" value="{if $contactID && $contactInfo}Update contact{else}Add new contact{/if}">
         </form>
 
     {/if}
@@ -1013,16 +1017,23 @@
                 var target = $(this).attr("id").slice(0, -7);
             }
             $("#"+target+"-container").slideToggle("fast", "swing",  function() {});
-            $("#"+target+"-toggle").toggleClass("selected");
-            fullProfileCheck(target);
+            if ($("#"+target+"-toggle").hasClass("selected")) {
+                $("#"+target+"-toggle").removeClass("selected");
+                $("#glm-contact-fullprofile-toggle").removeClass("selected");
+            } else {
+                $("#"+target+"-toggle").addClass("selected");
+            }
         });
 
         // Change the toggle button based on whether all the content sections are expanded
         function fullProfileCheck(target) {
             if ($("#glm-contact-info-profile > .glm-contact-content-toggle.selected").length == $("#glm-contact-info-profile > .glm-contact-content-toggle").length) {
                 $("#glm-contact-fullprofile-toggle").addClass("selected");
+                console.log("Select!");
             } else {
                 $("#glm-contact-fullprofile-toggle").removeClass("selected");
+                console.log("UNSelect!");
+                
             }
         }
 
@@ -1064,6 +1075,7 @@
 
             // Get new city name
             var newCityName = $('#newCityName').val();
+            newCityName = $('#newCityName').replace(/"/g, '');
 
             // If no name is supplied, notify used it's required
             if (newCityName == '') {
@@ -1124,6 +1136,7 @@
 
             // Get new city name
             var newBusinessCityName = $('#newBusinessCityName').val();
+            newBusinessCityName = $('#newBusinessCityName').replace(/"/g, '');
 
             // If no name is supplied, notify used it's required
             if (newBusinessCityName == '') {