From a14bc96f3aa07d6726e5715d63f8017a05bb31d1 Mon Sep 17 00:00:00 2001 From: Laury GvR Date: Wed, 1 Aug 2018 17:06:30 -0400 Subject: [PATCH] Responsiveness, styles, permissions fixes. Account settings hidden iwthout proper perms --- css/admin.css | 71 ++++++++++++++++++----------- models/admin/contacts/index.php | 2 +- views/admin/contacts/edit.html | 80 ++++++--------------------------- 3 files changed, 61 insertions(+), 92 deletions(-) diff --git a/css/admin.css b/css/admin.css index 8202984..88e6d85 100644 --- a/css/admin.css +++ b/css/admin.css @@ -6,6 +6,11 @@ background: #f8f8fb; max-width: 1000px; } +@media only screen and (max-width: 639px) { + #glm-admin-content-container.glm-admin-contact-content-container { + max-width: 100%; + } +} #glm-admin-content-container.glm-admin-contact-content-container .nav-tab-wrapper { border-bottom: 0; } @@ -62,11 +67,11 @@ } #glm-contact-fullprofile-toggle { background: white; + border: 1px solid lightgrey; + border-radius: 3px; text-align: center; padding: 3px 6px; margin: 10px; - border: 1px solid lightgrey; - border-radius: 3px; float: right; width: 85px; } @@ -79,8 +84,8 @@ .glm-contact-content-toggle.selected { border-top-right-radius: 3px; border-top-left-radius: 3px; - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; + border-bottom-left-radius: 0px; + border-bottom-right-radius: 0px; box-shadow: 1px 1px 4px lightgrey inset; } .glm-contact-content-data:not(#glm-contact-account-profile-container) { @@ -88,12 +93,12 @@ display: none; } #glm-contact-fullprofile-toggle { - text-align: center; - padding: 3px 6px; - margin: 10px; border: 1px solid lightgrey; border-radius: 3px; float: right; + margin: 10px; + padding: 3px 6px; + text-align: center; width: 85px; } #glm-table-profile .glm-contact-sub-data-links { @@ -106,15 +111,13 @@ padding: 8px; } #glm-table-profile .glm-contact-sub-data-links > a { - text-transform: uppercase; font-size: 12px; font-weight: bold; margin: 0; + text-transform: uppercase; } #glm-table-profile .glm-contact-sub-data-links > .glm-contact-content-toggle { - -} -#glm-table-profile .glm-contact-sub-data-links .glm-contact-content-toggle { + background: transparent; border: 0; } #glm-table-profile .glm-contact-sub-data-links .glm-contact-link-to-top { @@ -132,13 +135,14 @@ input::placeholder { font-size: 10px; } #glm-table-profile input[type=text] { - border-bottom: 1px solid #ddd; - box-shadow: inset 0 -1px 3px 0px rgba(0,0,0,.07); background-color: #fff; + border-bottom: 1px solid #ddd; + border-width: 0 0 1px 0; + box-shadow: inset 0px 0px 4px 1px rgba(0,0,0,.07); color: #32373c; outline: 0; transition: 50ms border-color ease-in-out; - border-width: 0 0 1px 0; + padding: 4px 7px; } #glm-table-profile.glm-admin-table [name="notes"] { width: 100%; @@ -161,21 +165,27 @@ input::placeholder { #glm-table-profile.glm-admin-table td.glm-contact-citybox { max-width: 320px; } +@media only screen and (max-width: 639px) { + #glm-table-profile.glm-admin-table td.glm-contact-citybox { + max-width: 100%; + } +} #glm-table-profile.glm-admin-table td > .glm-admin-noinput { background: #f3f3f9; border: 1px solid #e1e1e1; color: #575757; + font-size: 15px; display: inline-block; margin: 1px; - padding: 4px 6px; + padding: 4px 7px; min-width: 200px; } #glm-table-profile #glm-members-custom-fields-glm-member-db-contacts { + background-color: #f8ffff; border: 1px solid lightgrey; border-radius: 3px; width: 100%; padding: 10px; - background-color: #f8ffff; } #glm-table-profile .glm-admin-table.glm-admin-table-inner { border-top-left-radius: 0; @@ -184,10 +194,15 @@ input::placeholder { #glm-table-profile.glm-admin-table > tbody > tr > td { display: block; } -.glm-contact-citybox { +#glm-table-profile.glm-admin-table .glm-contact-citybox { display: block; max-width: 400px; } +@media only screen and (max-width: 639px) { + #glm-table-profile.glm-admin-table .glm-contact-citybox { + max-width: 100%; + } +} #glm-table-profile fieldset { background: white; border: 1px solid lightgrey; @@ -210,9 +225,9 @@ input::placeholder { #glm-table-profile.glm-admin-table th { clear: both; display: block; + max-width: 100%; padding-bottom: 7px; width: 100%; - max-width: 100%; } #glm-table-profile.glm-admin-table tr { display: block; @@ -225,10 +240,16 @@ input::placeholder { 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%; + } + } } /* Tooltip CSS */ -.gf_tooltip:hover p{ +.glm_tooltip:hover p{ display:block; transform-origin: 100% 0%; @@ -237,7 +258,7 @@ input::placeholder { } -.gf_tooltip p{ /* The tooltip */ +.glm_tooltip p{ /* The tooltip */ display: none; text-align: left; background-color: #1E2021; @@ -252,7 +273,7 @@ input::placeholder { line-height: 1.4; } -.gf_tooltip p:before{ /* The pointer of the tooltip */ +.glm_tooltip p:before{ /* The pointer of the tooltip */ position: absolute; content: ''; width:0; @@ -263,13 +284,13 @@ input::placeholder { top:-12px; } -.gf_tooltip p:after{ /* Prevents the tooltip from being hidden */ - width:100%; - height:40px; +.glm_tooltip p:after{ /* Prevents the tooltip from being hidden */ content:''; + height:40px; + left:0; position: absolute; top:-40px; - left:0; + width:100%; } /* CSS animation */ diff --git a/models/admin/contacts/index.php b/models/admin/contacts/index.php index 8fb1d0b..9ffb3ba 100644 --- a/models/admin/contacts/index.php +++ b/models/admin/contacts/index.php @@ -802,7 +802,7 @@ class GlmMembersAdmin_contacts_index extends GlmDataContacts 'contactUpdateError' => $contactUpdateError, 'errorMessage' => false, 'billingFieldResults' => $billingFieldResults, - 'contactRoleShort' => $this->config['contact_role_short'], + 'contactRoleShort' => $this->config['contact_role_short'] ); // Return status, any suggested view, and any data to controller diff --git a/views/admin/contacts/edit.html b/views/admin/contacts/edit.html index db207ce..9787c46 100644 --- a/views/admin/contacts/edit.html +++ b/views/admin/contacts/edit.html @@ -141,15 +141,15 @@
Expand All
-
Account Settings
-
+
Account Settings
+
@@ -239,7 +239,7 @@ @@ -820,58 +820,6 @@ - -
-

Removed Items

- Publish on front end - Use for Billing -
-
-
-
Permissions - +

{foreach from=$contactInfo.fieldData.contact_role.list item=v} {$v.name}
@@ -162,11 +162,11 @@

{if $contactInfo.fieldFail.contact_role}

{$contactInfo.fieldFail.contact_role}

{/if}
Primary Contact - +

(Only one contact at a time may be the primary contact. If there is another primary contact, it will be deselected.)

@@ -288,7 +288,7 @@
Login password - +

The password must be at least 8 characters and include at least one number, one letter, and at least one special character. (# . - _ , $ % & !)

@@ -324,7 +324,7 @@
Update Email Address - +

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.

@@ -333,24 +333,24 @@
- {if $newEmailError == 'BAD_CHARACTERS'} + {if $newEmailError == 'BAD_CHARACTERS'}
The E-Mail address you submitted contained invalid characters. {$new_email} Please check the address and submit again. - {/if} - {if $newEmailError == 'BAD_FORMAT'} + {/if} + {if $newEmailError == 'BAD_FORMAT'}
The E-Mail address you submitted is formatted incorrectly. An example of a correctly formatted E-Mail address is "name@domain.com". Please check the address and submit again. - {/if} - {if $newEmailError == 'IN_USE'} + {/if} + {if $newEmailError == 'IN_USE'}
The E-Mail address you submitted is already in use for this site. You may only change your address to one that is not currently in use. - {/if} + {/if}
- - - - - - - - - - - - -
Contact Type - - {if $contactInfo.fieldFail.contact_type}

{$contactInfo.fieldFail.contact_type}

{/if} -
County - - {if $contactInfo.fieldFail.county}

{$contactInfo.fieldFail.county}

{/if} -
Position/Responsibilities - {php} - wp_editor('{$contactInfo.fieldData.descr|escape:quotes}', 'glm_descr', array( - 'quicktags' => false, - 'media_buttons' => false, - 'wpautop' => false, - 'textarea_name' => 'descr', - 'editor_height' => 100, // Height in px, overrides editor_rows - // 'textarea_rows' => 4, - )); - {/php} - {if $contactInfo.fieldFail.descr}

{$contactInfo.fieldFail.descr}

{/if} -
- -
-

* Required

-- 2.17.1