Added fullprofile toggle, moved notes, fixed collapse links

diff --git a/css/admin.css b/css/admin.css
index 0d2bf4a..91eed44 100644 (file)
--- a/css/admin.css
+++ b/css/admin.css
@@ -43,6 +43,23 @@
     margin-bottom: 5px;
     margin-top: 0;
 }
+#glm-contact-fullprofile-toggle.selected {
+    box-shadow: 1px 1px 2px lightgrey inset;
+    cursor: pointer;
+}
+#glm-contact-fullprofile-toggle:hover {
+    box-shadow: 1px 1px 4px lightgrey inset;
+    cursor: pointer;
+}
+#glm-contact-fullprofile-toggle {
+    text-align: center;
+    padding: 3px 6px;
+    margin: 10px;
+    border: 1px solid lightgrey;
+    border-radius: 3px;
+    float: right;
+    width: 85px;
+}
 .glm-contact-content-toggle span {
     font-size: 11px;
     font-weight: normal;
@@ -75,7 +92,10 @@
 .glm-contact-sub-data-links .glm-contact-content-toggle {
     border: 0;
 }
-#glm-contact-account-profile .glm-contact-sub-data-links {
+.glm-contact-sub-data-links .glm-contact-link-to-top {
+    text-align: right;
+}
+#glm-table-profile .glm-contact-sub-data-links {
     border-width: 0 1px 1px 1px;
     border-color: lightgrey;
     border-style: solid;

diff --git a/views/admin/contacts/edit.html b/views/admin/contacts/edit.html
index 3f1642a..61d29b1 100644 (file)
--- a/views/admin/contacts/edit.html
+++ b/views/admin/contacts/edit.html
@@ -201,7 +201,7 @@
                     </tr>
 
                     <tr>
-                        <th {if $contactInfo.fieldRequired.access}class="glm-required"{/if}>Display/Moderate/Archive:</th>
+                        <th {if $contactInfo.fieldRequired.access}class="glm-required"{/if}>Display/Moderate/Archive</th>
                         <td {if $contactInfo.fieldFail.access}class="glm-form-bad-input"{/if}>
                             <select name="access">
                 {foreach from=$contactInfo.fieldData.access.list item=v}
@@ -245,34 +245,34 @@
                         </td>
                     </tr>
                     <tr>
-                        <th {if $contactInfo.fieldRequired.fname}class="glm-required"{/if}>First Name:</th>
+                        <th {if $contactInfo.fieldRequired.fname}class="glm-required"{/if}>First Name</th>
                         <td {if $contactInfo.fieldFail.fname}class="glm-form-bad-input"{/if}>
                             <input type="text" name="fname" value="{$contactInfo.fieldData.fname}" class="glm-form-text-input-short">
                             {if $contactInfo.fieldFail.fname}<p>{$contactInfo.fieldFail.fname}</p>{/if}
                         </td>
                     </tr>
                     <tr>
-                        <th {if $contactInfo.fieldRequired.lname}class="glm-required"{/if}>Last Name:</th>
+                        <th {if $contactInfo.fieldRequired.lname}class="glm-required"{/if}>Last Name</th>
                         <td {if $contactInfo.fieldFail.lname}class="glm-form-bad-input"{/if}>
                             <input type="text" name="lname" value="{$contactInfo.fieldData.lname}" class="glm-form-text-input-short">
                             {if $contactInfo.fieldFail.lname}<p>{$contactInfo.fieldFail.lname}</p>{/if}
                         </td>
                     </tr>
                     {if $option == 'create'}
-                    <th {if $contactInfo.fieldRequired.username}class="glm-required"{/if}>Login Username:</th>
+                    <th {if $contactInfo.fieldRequired.username}class="glm-required"{/if}>Login Username</th>
                         <td {if $contactInfo.fieldFail.username}class="glm-form-bad-input"{/if}>
                             <input type="text" name="username" value="{$contactInfo.fieldData.username}" class="glm-form-text-input-medium" placeholder="(no spaces permitted)">
                             <br><span class="glm-notice">NOTE:</span> The username cannot be changed once the contact is created.
                             {if $contactInfo.fieldFail.username}<p>{$contactInfo.fieldFail.username}</p>{/if}
                         </td>
                 {else}
-                        <th>Login Username:</th>
+                        <th>Login Username</th>
                         <td>{$contactInfo.fieldData.username}</td>
                 {/if}
                     </tr>
                     <tr>
                         <th {if $contactInfo.fieldRequired.password}class="glm-required"{/if}>
-                            Login password:
+                            Login password
                             <a href="#" onclick="return false;" onkeypress="return false;" class="gf_tooltip tooltip">
                                 <p>The password must be at least 8 characters and include at least one number, one letter, and at least one special character. (# . - _ , $ % & !)</p>
                                 <i class="fa fa-question-circle">
@@ -296,7 +296,7 @@
 
                     {if $option == 'create'}
                     <tr>
-                        <th id="emailRequiredForLoginContacts" class="glm-required">Email Address:</th>
+                        <th id="emailRequiredForLoginContacts" class="glm-required">Email Address</th>
                         <td {if $contactInfo.fieldFail.email}class="glm-form-bad-input"{/if}>
                             <input type="text" name="email" value="{$contactInfo.fieldData.email}" class="glm-form-text-input-medium" placeholder="(ex: name@domain.com)">
                             <br><span class="glm-notice">NOTE:</span> This field is only required for users who will have login privileges.
@@ -305,10 +305,10 @@
                     </tr>
                 {else}
 
-                    <tr><th>Email Address:</th><td>{$contactInfo.fieldData.email}</td></tr>
+                    <tr><th>Email Address</th><td>{$contactInfo.fieldData.email}</td></tr>
                     <tr>
                         <th>
-                            New Email Address:
+                            New Email Address
                             <a href="#" onclick="return false;" onkeypress="return false;" class="gf_tooltip tooltip">
                                 <p>To change your E-Mail address, enter your new address here. This address must not be used by any other contact or user in this site.</p>
                                 <i class="fa fa-question-circle">
@@ -342,7 +342,7 @@
                 {/if}
 
                     <tr>
-                        <th {if $contactInfo.fieldRequired.image}class="glm-required"{/if}>Profile Image:</th>
+                        <th {if $contactInfo.fieldRequired.image}class="glm-required"{/if}>Profile Image</th>
                         <td {if $contactInfo.fieldFail.image}class="glm-form-bad-input"{/if}>
                 {if $contactInfo.fieldData.image}
                             <div id="largeImageDialog" class="glm-dialog-box" title="Large sized image">
@@ -366,7 +366,7 @@
                         </td>
                     </tr>                        
                     <tr>
-                        <th>Access to Members</th>
+                        <th>Management/Access to</th>
                         <td id="accessToMemberSelection" class="glm-item-container">
                     {if $membersList && apply_filters('glm_members_menu_members',true)}
                             <!-- Other Member Selection -->
@@ -412,7 +412,6 @@
                     </tr>
 
                 </table>
-
                 <div class="glm-contact-sub-data-links glmgrid-row">
                     <a class="glm-contact-content-toggle glmgrid-columns glmgrid-small-6">Collapse</a>
                     <a class="glm-contact-link-to-top glmgrid-columns glmgrid-small-6">Back to top</a>
@@ -425,16 +424,19 @@
                 <div id="glm-contact-account-contact">
 
                     <table class="glm-admin-table glm-admin-table-inner">
+
                         <tr>
-                            <th>Publish on Front End</th>
-                            <td>
-                                <input type="checkbox" name="active" {if $contactInfo.fieldData.contact_publish.value} checked{/if}>
+                            <th {if $contactInfo.fieldRequired.mailing_address_type}class="glm-required"{/if}>Mailing Address Type</th>
+                            <td {if $contactInfo.fieldFail.mailing_address_type}class="glm-form-bad-input"{/if}>
+                                <input type="text" id="mailing_address_type" name="mailing_address_type" value="{$contactInfo.fieldData.mailing_address_type}" class="glm-form-text-input-short">
+                                {if $contactInfo.fieldFail.mailing_address_type}<p>{$contactInfo.fieldFail.mailing_address_type}</p>{/if}
                             </td>
                         </tr>
                         <tr>
-                            <th>Use for Billing Information</th>
-                            <td>
-                                <input type="checkbox" name="active" {if $contactInfo.fieldData.contact_use_billing.value} checked{/if}>
+                            <th {if $contactInfo.fieldRequired.mailto_label}class="glm-required"{/if}>'Mail To' Label</th>
+                            <td {if $contactInfo.fieldFail.mailto_label}class="glm-form-bad-input"{/if}>
+                                <input type="text" id="mailto_label" name="mailto_label" value="{$contactInfo.fieldData.mailto_label}" class="glm-form-text-input-short">
+                                {if $contactInfo.fieldFail.mailto_label}<p>{$contactInfo.fieldFail.mailto_label}</p>{/if}
                             </td>
                         </tr>
                         <tr>
@@ -536,7 +538,23 @@
                                 {if $contactInfo.fieldFail.alt_email}<p>{$contactInfo.fieldFail.alt_email}</p>{/if}
                             </td>
                         </tr>
+                        <tr>
+                            <th>Publish on Front End</th>
+                            <td>
+                                <input type="checkbox" name="contact_publish" {if $contactInfo.fieldData.contact_publish.value} checked{/if}>
+                            </td>
+                        </tr>
+                        <tr>
+                            <th>Use for Billing Information</th>
+                            <td>
+                                <input type="checkbox" name="contact_use_billing" {if $contactInfo.fieldData.contact_use_billing.value} checked{/if}>
+                            </td>
+                        </tr>
                     </table>
+                    <div class="glm-contact-sub-data-links glmgrid-row">
+                        <a class="glm-contact-content-toggle glmgrid-columns glmgrid-small-6">Collapse</a>
+                        <a class="glm-contact-link-to-top glmgrid-columns glmgrid-small-6">Back to top</a>
+                    </div>
                 </div>
             </div>
             <div id="glm-contact-company-info-toggle" class="glm-contact-content-toggle">
@@ -548,22 +566,22 @@
                         <tr>
                             <th>Publish on Front End</th>
                             <td>
-                                <input type="checkbox" name="active" {if $contactInfo.fieldData.business_publish.value} checked{/if}>
+                                <input type="checkbox" name="business_publish" {if $contactInfo.fieldData.business_publish.value} checked{/if}>
                             </td>
                         </tr>
                         <tr>
                             <th>Use for Billing Information</th>
                             <td>
-                                <input type="checkbox" name="active" {if $contactInfo.fieldData.business_use_billing.value} checked{/if}>
+                                <input type="checkbox" name="business_use_billing" {if $contactInfo.fieldData.business_use_billing.value} checked{/if}>
                             </td>
                         </tr>
                         <tr>
                             <td colspan="2">
-                                <h4 class="glm-table-section-title">Organization/Company Information</h4>
+                                <h4 class="glm-table-section-title">Organization/Company Mailing Address</h4>
                             </td>
                         </tr>
                         <tr>
-                            <th {if $contactInfo.fieldRequired.org}class="glm-required"{/if}>Organization</th>
+                            <th {if $contactInfo.fieldRequired.org}class="glm-required"{/if}>Organization/Company Name</th>
                             <td {if $contactInfo.fieldFail.org}class="glm-form-bad-input"{/if}>
                                 <input type="text" name="org" value="{$contactInfo.fieldData.org}" class="glm-form-text-input-medium">
                                 {if $contactInfo.fieldFail.org}<p>{$contactInfo.fieldFail.org}</p>{/if}
@@ -627,7 +645,7 @@
                                 </div>
                                 <!-- City Selection -->
                                 <input id="businessCityName" type="hidden" name="newBusinessCityName" value=""><!-- this field is only used if adding a new city to pass the new name -->
-                                <select name="businessCity" id="businessCcity" class="glm-geocodeAction">
+                                <select name="business_city" id="businessCity" class="glm-geocodeAction">
                                     <option value="0"><option>
                     {foreach from=$contactInfo.fieldData.city.list item=v}
                                     <option value="{$v.value}"{if $v.default} selected="selected"{/if}>
@@ -672,7 +690,7 @@
                         </tr>
 
                         <tr>
-                            <th {if $contactInfo.fieldRequired.business_email}class="glm-required"{/if}>Email Address:</th>
+                            <th {if $contactInfo.fieldRequired.business_email}class="glm-required"{/if}>Organization/Company Email</th>
                             <td {if $contactInfo.fieldFail.business_email}class="glm-form-bad-input"{/if}>
                                 <input type="text" name="business_email" value="{$contactInfo.fieldData.business_email}" class="glm-form-text-input-short" placeholder="ex: name@domain.com">
                                 {if $contactInfo.fieldFail.business_email}<p>{$contactInfo.fieldFail.business_email}</p>{/if}
@@ -681,7 +699,7 @@
 
                     <!-- NOT DOING LAT/LON FOR NOW -->
                         <tr>
-                            <th {if $contactInfo.fieldRequired.url}class="glm-required"{/if}>Web Address (URL):</th>
+                            <th {if $contactInfo.fieldRequired.url}class="glm-required"{/if}>Web Address (URL)</th>
                             <td {if $contactInfo.fieldFail.url}class="glm-form-bad-input"{/if}>
                     {if $contactInfo.fieldData.url}
                                 <a class="button button-secondary glm-right" href="http//{$contactInfo.fieldData.url}" target="urlTarget">Test Link</a>
@@ -712,23 +730,11 @@
                                 {if $contactInfo.fieldFail.fax}<p>{$contactInfo.fieldFail.fax}</p>{/if}
                             </td>
                         </tr>
-                        <tr>
-                            <th {if $contactInfo.fieldRequired.notes}class="glm-required"{/if}>Notes</th>
-                            <td {if $contactInfo.fieldFail.notes}class="glm-form-bad-input"{/if}>
-                                {php}
-                                    wp_editor('{$contactInfo.fieldData.notes|escape:quotes}', 'glm_notes', array(
-                                        'quicktags' => false,
-                                        'media_buttons' => false,
-                                        'wpautop' => false,
-                                        'textarea_name' => 'notes',
-                                        'editor_height' => 100,     // Height in px, overrides editor_rows
-                                            // 'textarea_rows' => 4,
-                                    ));
-                                {/php}
-                                {if $contactInfo.fieldFail.notes}<p>{$contactInfo.fieldFail.notes}</p>{/if}
-                            </td>
-                        </tr>
                     </table>
+                    <div class="glm-contact-sub-data-links glmgrid-row">
+                        <a class="glm-contact-content-toggle glmgrid-columns glmgrid-small-6">Collapse</a>
+                        <a class="glm-contact-link-to-top glmgrid-columns glmgrid-small-6">Back to top</a>
+                    </div>
                 </div>
             </div>
 
@@ -747,6 +753,24 @@
                     {/if}
                 </div>
             </div>
+            <div id="glm-contact-notes-toggle" class="glm-contact-content-toggle">
+                <h3>Notes</h3>                
+            </div>
+            <div id="glm-contact-notes-container" class="glm-admin-form-section glm-contact-content-data">
+                <div id="glm-contact-notes">
+                    <table class="glm-admin-table glm-admin-table-inner">
+
+                        <tr>
+                            <th {if $contactInfo.fieldRequired.notes}class="glm-required"{/if}>Notes</th>
+                            <td {if $contactInfo.fieldFail.notes}class="glm-form-bad-input"{/if}>
+                                <input type="textarea" name="notes" value="{$contactInfo.fieldData.notes}" class="" placeholder="Enter notes about this profile">
+                                
+                                {if $contactInfo.fieldFail.notes}<p>{$contactInfo.fieldFail.notes}</p>{/if}
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
 
 
             <div id="glm-contact-removed-items-toggle" class="glm-contact-content-toggle">
@@ -794,6 +818,10 @@
                             </td>
                         </tr>
                     </table>
+                    <div class="glm-contact-sub-data-links glmgrid-row">
+                        <a class="glm-contact-content-toggle glmgrid-columns glmgrid-small-6">Collapse</a>
+                        <a class="glm-contact-link-to-top glmgrid-columns glmgrid-small-6">Back to top</a>
+                    </div>
                 </div>
             </div>
         </div>
@@ -813,7 +841,7 @@
             <tr><th>First Name:</th><td>{$contactInfo.fieldData.fname}</td></tr>
             <tr><th>Last Name:</th><td>{$contactInfo.fieldData.lname}</td></tr>
             <tr><th>Contact Type:</th><td>{$contactInfo.fieldData.contact_type.name}</td></tr>
-            <tr><th>Email Address::</th><td>{$contactInfo.fieldData.email}</td></tr>
+            <tr><th>Email Address:</th><td>{$contactInfo.fieldData.email}</td></tr>
             <tr><th>Alternate Email Address:</th><td>{$contactInfo.fieldData.alt_email}</td></tr>
             <tr><th>Organization:</th><td>{$contactInfo.fieldData.org}</td></tr>
             <tr><th>Title/Position:</th><td>{$contactInfo.fieldData.title}</td></tr>
@@ -1140,7 +1168,8 @@
             }
         }
         checkContactRoleSelect();
-
+        // once again, I am faced with a justification that seems to forget that I am most familiar with Hunger myself. If you wish to say that
+        // whatever political degradation our House my suffer is well as long as it leads to personal Transformation
         // Set masking for phone number fields - see http://digitalbush.com/projects/masked-input-plugin/
         $.mask.definitions['e'] = "[A-Za-z0-9: ]";
         $(".glm-phone-input").mask("(999) 999-9999? eeeeeeeeeee");