From 4d492401df76d0f2372dd33a6ed350cd5318e35c Mon Sep 17 00:00:00 2001 From: Chuck Scott Date: Mon, 15 Jul 2019 13:02:43 -0400 Subject: [PATCH] Continuing improvements to initial UI elements. --- views/adminServerStatsConfig.html | 39 ++++++++++++++----- views/ui/f6/LayoutNotes.txt | 8 ++-- views/ui/f6/checkbox.html | 14 +++---- views/ui/f6/editor.html | 11 ++---- views/ui/f6/grid-start.html | 55 +++++++++++++++++++++------ views/ui/f6/number.html | 11 +++--- views/ui/f6/section-start.html | 10 ++--- views/ui/f6/text-line.html | 6 +-- views/ui/f6/text.html | 12 +++--- views/uiOLD/f6/checkbox.html | 30 --------------- views/uiOLD/f6/editor.html | 53 -------------------------- views/uiOLD/f6/f6-image.html | 31 --------------- views/uiOLD/f6/f6-select.html | 18 --------- views/uiOLD/f6/grid-end.html | 4 -- views/uiOLD/f6/grid-start.html | 10 ----- views/uiOLD/f6/number.html | 49 ------------------------ views/uiOLD/f6/section-end.html | 5 --- views/uiOLD/f6/section-start.html | 22 ----------- views/uiOLD/f6/sub-section-end.html | 14 ------- views/uiOLD/f6/sub-section-start.html | 22 ----------- views/uiOLD/f6/text.html | 45 ---------------------- views/uiOLD/multiSelectSearch.html | 18 --------- views/uiOLD/std/deleteDialog.html | 49 ------------------------ 23 files changed, 108 insertions(+), 428 deletions(-) delete mode 100644 views/uiOLD/f6/checkbox.html delete mode 100644 views/uiOLD/f6/editor.html delete mode 100644 views/uiOLD/f6/f6-image.html delete mode 100644 views/uiOLD/f6/f6-select.html delete mode 100644 views/uiOLD/f6/grid-end.html delete mode 100644 views/uiOLD/f6/grid-start.html delete mode 100644 views/uiOLD/f6/number.html delete mode 100644 views/uiOLD/f6/section-end.html delete mode 100644 views/uiOLD/f6/section-start.html delete mode 100644 views/uiOLD/f6/sub-section-end.html delete mode 100644 views/uiOLD/f6/sub-section-start.html delete mode 100644 views/uiOLD/f6/text.html delete mode 100644 views/uiOLD/multiSelectSearch.html delete mode 100644 views/uiOLD/std/deleteDialog.html diff --git a/views/adminServerStatsConfig.html b/views/adminServerStatsConfig.html index 3b46844..fe77327 100755 --- a/views/adminServerStatsConfig.html +++ b/views/adminServerStatsConfig.html @@ -17,17 +17,27 @@ - {include file="ui/f6/grid-start.html"} + {* Grid Start *} + {$ui = [ + 'sectionColor' => '#ffE' + ]} + {include file="ui/f6/grid-start.html"} {* Section Start *} {$ui = [ - 'title' => 'Database Connection', - 'tip' => " - If you need help with these settings, please contact the Gaslight Media network engineering department. + 'title' => 'Database Connection', + 'tip' => " + If you need help with these settings, please contact the Gaslight Media network engineering department. " ]} {include file="ui/f6/section-start.html"} + {* Text Line *} + {$ui = [ + 'text' => 'Please ask Gaslight Media Engineering if you need assistance with these settings.' + ]} + {include file="ui/f6/text-line.html"} + {* db_name *} {$ui = [ 'field' => 'db_name', @@ -85,7 +95,7 @@ {* Section Start *} {$ui = [ - 'title' => 'Usage and Notifications' + 'title' => 'Usage and Notifications for This Site' ]} {include file="ui/f6/section-start.html"} @@ -126,7 +136,7 @@ {$ui = [ 'field' => 'show_notifications', 'value' => {$show_notifications}, - 'label' => 'Customer Notiifications for This Site' + 'label' => 'Customer Notiifications' ]} {include file="ui/f6/checkbox.html"} @@ -142,8 +152,7 @@ {$ui = [ 'field' => 'show_cookie_popup', 'value' => {$show_cookie_popup}, - 'label' => 'Show Cookie Pop-Up', - 'helpText' => 'This is my help text' + 'label' => 'Show Cookie Pop-Up' ]} {include file="ui/f6/checkbox.html"} @@ -170,7 +179,10 @@ 'height' => 10, 'rows' => 5, 'maxWidth' => '900px', - 'helpText' => 'My Help Text', + 'helpText' => ' + This is the main text of the Cookie Pop-Up. + The selected "Additional Notices" texts will show below this when the "Show more" button is clicked. + ', 'errorText' => 'Im a fool.' ]} {include file="ui/f6/editor.html"} @@ -192,6 +204,7 @@ {* cookie_opt_gdpr *} {$ui = [ 'field' => 'cookie_opt_gdpr', + 'value' => {$cookie_opt_gdpr}, 'label' => 'GDPR' ]} {include file="ui/f6/checkbox.html"} @@ -199,6 +212,7 @@ {* cookie_opt_access_logs *} {$ui = [ 'field' => 'cookie_opt_access_logs', + 'value' => {$cookie_opt_access_logs}, 'label' => 'Access Logs' ]} {include file="ui/f6/checkbox.html"} @@ -206,6 +220,7 @@ {* cookie_opt_permanent *} {$ui = [ 'field' => 'cookie_opt_permanent', + 'value' => {$cookie_opt_permanent}, 'label' => 'Permanent Cookies' ]} {include file="ui/f6/checkbox.html"} @@ -213,6 +228,7 @@ {* cookie_opt_tracking *} {$ui = [ 'field' => 'cookie_opt_tracking', + 'value' => {$cookie_opt_tracking}, 'label' => 'Tracking Cookies' ]} {include file="ui/f6/checkbox.html"} @@ -220,6 +236,7 @@ {* cookie_opt_shared_tracking *} {$ui = [ 'field' => 'cookie_opt_shared_tracking', + 'value' => {$cookie_opt_shared_tracking}, 'label' => 'Shared Tracking Cookies' ]} {include file="ui/f6/checkbox.html"} @@ -227,6 +244,7 @@ {* cookie_opt_https *} {$ui = [ 'field' => 'cookie_opt_https', + 'value' => {$cookie_opt_https}, 'label' => 'HTTPS' ]} {include file="ui/f6/checkbox.html"} @@ -234,6 +252,7 @@ {* cookie_opt_logged_in *} {$ui = [ 'field' => 'cookie_opt_logged_in', + 'value' => {$cookie_opt_logged_in}, 'label' => 'Logged-In Users' ]} {include file="ui/f6/checkbox.html"} @@ -241,6 +260,7 @@ {* cookie_opt_forms *} {$ui = [ 'field' => 'cookie_opt_forms', + 'value' => {$cookie_opt_forms}, 'label' => 'Submission Forms' ]} {include file="ui/f6/checkbox.html"} @@ -248,6 +268,7 @@ {* cookie_opt_payment *} {$ui = [ 'field' => 'cookie_opt_payment', + 'value' => {$cookie_opt_payment}, 'label' => 'Payment Forms' ]} {include file="ui/f6/checkbox.html"} diff --git a/views/ui/f6/LayoutNotes.txt b/views/ui/f6/LayoutNotes.txt index 036f273..c7de52e 100644 --- a/views/ui/f6/LayoutNotes.txt +++ b/views/ui/f6/LayoutNotes.txt @@ -10,14 +10,14 @@ something.html
.
section-start.html
- .
- .
+ .
+ .
.

title

.
- .
+ .
.
-field-something.html
+field-something.html
. (some field label, input, ...) .
diff --git a/views/ui/f6/checkbox.html b/views/ui/f6/checkbox.html index 1b0f73d..be8c402 100644 --- a/views/ui/f6/checkbox.html +++ b/views/ui/f6/checkbox.html @@ -15,22 +15,22 @@ ]} *} -
+
-
-
- +
+
+
-
- +
+
- {if isset($ui.helpText)}

{$ui.helpText}

{/if} + {if isset($ui.helpText)}{$ui.helpText}{/if}
diff --git a/views/ui/f6/editor.html b/views/ui/f6/editor.html index c604261..7dcda5e 100644 --- a/views/ui/f6/editor.html +++ b/views/ui/f6/editor.html @@ -21,8 +21,7 @@ ]} *} -
-
+
{if isset($ui.value) && $ui.value} {$textAreaContent = $ui.value} @@ -39,14 +38,12 @@ 'media_buttons' => $media_buttons, 'quicktags' => $quicktags ]} + {if $ui.dataError}{$ui.dataError}{/if} + {if isset($ui.helpText)}{$ui.helpText}{/if} + {if isset($ui.errorText)}{$ui.errorText}{/if} {wp_editor( $textAreaContent, $textAreaName, $settings )} -
- {if $ui.dataError}{$ui.dataError}{/if} - {if isset($ui.helpText)}

{$ui.helpText}

{/if} - {if isset($ui.errorText)}{$ui.errorText}{/if} -
diff --git a/views/ui/f6/grid-start.html b/views/ui/f6/grid-start.html index 4abe48a..692626e 100644 --- a/views/ui/f6/grid-start.html +++ b/views/ui/f6/grid-start.html @@ -1,33 +1,66 @@ {* Foundation 6 - Grid Start + + {$ui = [ + 'nowrap' => string True if no sections should wrap to the right, + 'backgroundColor' => string Background color of overall grid area, + 'sectionColor' => string background color of sections + ]} + *} +{$glm_f6_ui_wrapsize = 6 scope="global"} +{if isset($ui.nowrap) && $ui.nowrap} + {$glm_f6_ui_wrapsize = 12 scope="global"} +{/if} +{$glm_f6_ui_background_color = 'white' scope="global"} +{if isset($ui.backgroundColor)} + {$glm_f6_ui_background_color = $ui.backgroundColor scope="global"} +{/if} +{$glm_f6_ui_section_color = 'white' scope="global"} +{if isset($ui.sectionColor)} + {$glm_f6_ui_section_color = $ui.sectionColor scope="global"} +{/if} +
diff --git a/views/ui/f6/number.html b/views/ui/f6/number.html index c381e05..8a4e4fe 100644 --- a/views/ui/f6/number.html +++ b/views/ui/f6/number.html @@ -23,13 +23,14 @@ {$ui.width = $ui.width * .55 + 2.5} {/if} -
+
{if (!isset($ui.value) && !isset($ui.field)) || !isset($ui.label)} Field Error: Required field information not supplied! {else}
-
- +
+
- {if isset($ui.helpText)}

{$ui.helpText}

{/if} - {if isset($ui.errorText)}{$ui.errorText}{/if} + {if isset($ui.helpText)}{$ui.helpText}{/if} + {if true || isset($ui.errorText)}{$ui.errorText}{/if}
{/if} diff --git a/views/ui/f6/section-start.html b/views/ui/f6/section-start.html index 6f846d5..ea15d8e 100644 --- a/views/ui/f6/section-start.html +++ b/views/ui/f6/section-start.html @@ -7,12 +7,12 @@ 'tip' => String to display when hover over question mark on right ]} *} -
-
+
+
{if !isset($ui.title)} Field Error: Required field information not supplied! {else} -
+
{if isset($ui.tip)} ? {/if} @@ -20,7 +20,5 @@ {if isset($ui.helpText)}

{$ui.helpText}

{/if}
{/if} -
+
- - diff --git a/views/ui/f6/text-line.html b/views/ui/f6/text-line.html index 6f53f69..f8bb358 100644 --- a/views/ui/f6/text-line.html +++ b/views/ui/f6/text-line.html @@ -7,9 +7,9 @@ ]} *} -
- +
+ {$ui.text} -

+
diff --git a/views/ui/f6/text.html b/views/ui/f6/text.html index e8d309a..71f8675 100644 --- a/views/ui/f6/text.html +++ b/views/ui/f6/text.html @@ -18,7 +18,7 @@ 'tip' => string String to display when hover over question mark on right ]} *} -
+
{if (!isset($ui.value) && !isset($ui.field)) || !isset($ui.label)} Field Error: Required field information not supplied! {else} @@ -27,11 +27,11 @@ {if isset($ui.tip)} ? {/if} - +
- {if isset($ui.dataError) && $ui.dataError}{$ui.dataError}{/if} - {if isset($ui.helpText)}

{$ui.helpText}

{/if} - {if isset($ui.errorText)}{$ui.errorText}{/if} + {if isset($ui.dataError) && $ui.dataError}{$ui.dataError}{/if} + {if isset($ui.helpText)}{$ui.helpText}{/if} + {if isset($ui.errorText)}{$ui.errorText}{/if}
{/if} diff --git a/views/uiOLD/f6/checkbox.html b/views/uiOLD/f6/checkbox.html deleted file mode 100644 index 9d55981..0000000 --- a/views/uiOLD/f6/checkbox.html +++ /dev/null @@ -1,30 +0,0 @@ -{* - Foundation 6 Checkbox Input Field - Do not list fields if they're false. (We're not checking for false) - - {$ui = [ - 'field' => string Name of the data parameter, - 'label' => string Label text for this field, - 'helpText' => string Help text for this input, - ]} -*} - -{if (!isset($ui.data) && !isset($ui.field)) || !isset($ui.label)} -
- Field Error: Required field information not supplied! -
-{else} -
- -
-{/if} diff --git a/views/uiOLD/f6/editor.html b/views/uiOLD/f6/editor.html deleted file mode 100644 index d516f3d..0000000 --- a/views/uiOLD/f6/editor.html +++ /dev/null @@ -1,53 +0,0 @@ -{* - Foundation 6 Text Area Input Field - Do not list parameters if they're false. (We're not checking for false) - - {$ui = [ - 'field' => string Name of the data parameter - 'label' => string Label text for this field, - 'placeholder' => string Placeholder string, - 'required' => boolean True if required, - 'maxWidth' => string Size of input field using standard style notation ('900px', '15rem', ...), - 'helpText' => string Help text for this input, - 'errortext' => string Error text that appears when the field doesn't validate - ]} -*} - -{if (!isset($ui.data) && !isset($ui.field)) || !isset($ui.label)} -
-
- Field Error: Required field information not supplied! -
-
-{else} -
-
- -
-
-{/if} diff --git a/views/uiOLD/f6/f6-image.html b/views/uiOLD/f6/f6-image.html deleted file mode 100644 index b7b28fa..0000000 --- a/views/uiOLD/f6/f6-image.html +++ /dev/null @@ -1,31 +0,0 @@ -{* Foundation 6 Image *} -{* setup $data *} -{* setup $field *} -{* setup $fieldLabel *} -
-
- -
-
-
- {if $data.fieldData.$field} -
-
-
- -
-
-
-
- Delete {$fieldLabel}
- {$data.fieldData.$field} -
-
-
- {/if} -
New {$fieldLabel}
-
- {if $data.fieldFail.$field}

{$data.fieldFail.$field}

{/if} -
-
-
diff --git a/views/uiOLD/f6/f6-select.html b/views/uiOLD/f6/f6-select.html deleted file mode 100644 index 288e233..0000000 --- a/views/uiOLD/f6/f6-select.html +++ /dev/null @@ -1,18 +0,0 @@ -{* Foundation 6 Select *} -{* setup $data *} -{* setup $field *} -{* setup $fieldLabel *} -
-
- -
-
- - {if $data.fieldFail.$field}{$data.fieldFail.$field}{/if} -
-
diff --git a/views/uiOLD/f6/grid-end.html b/views/uiOLD/f6/grid-end.html deleted file mode 100644 index 9090f0e..0000000 --- a/views/uiOLD/f6/grid-end.html +++ /dev/null @@ -1,4 +0,0 @@ -{* - Foundation 6 - Grid End -*} -
diff --git a/views/uiOLD/f6/grid-start.html b/views/uiOLD/f6/grid-start.html deleted file mode 100644 index b39e68d..0000000 --- a/views/uiOLD/f6/grid-start.html +++ /dev/null @@ -1,10 +0,0 @@ -{* - Foundation 6 - Grid Start -*} - -
diff --git a/views/uiOLD/f6/number.html b/views/uiOLD/f6/number.html deleted file mode 100644 index 1722de8..0000000 --- a/views/uiOLD/f6/number.html +++ /dev/null @@ -1,49 +0,0 @@ -{* - Foundation 6 Number Input Field - DO NOT include fields if they're false. (We're not checking for false) - - {$ui = [ - 'field' => string Name of the data parameter, - 'label' => string Label text for this field, - 'placeholder' => string Placeholder string, - 'suffix' => string Suffix text to add after input field, - 'min' => integer Minimum numeric value - 'max' => integer Maximum numeric value - 'maxWidth' => integer Size of input field in characters, - 'message' => string Message string to display between label and input, - 'helpText' => string Help text for this input, - 'errortext' => string Error text that appears when the field doesn't validate - ]} -*} - -{if (!isset($ui.data) && !isset($ui.field)) || !isset($ui.label)} -
-
- Field Error: Required field information not supplied! -
-
-{else} -
-
- -
-
-{/if} diff --git a/views/uiOLD/f6/section-end.html b/views/uiOLD/f6/section-end.html deleted file mode 100644 index ddbd889..0000000 --- a/views/uiOLD/f6/section-end.html +++ /dev/null @@ -1,5 +0,0 @@ -{* - Foundation 6 - Form Section End - No parameters are needed for Section-End -*} -
diff --git a/views/uiOLD/f6/section-start.html b/views/uiOLD/f6/section-start.html deleted file mode 100644 index c632570..0000000 --- a/views/uiOLD/f6/section-start.html +++ /dev/null @@ -1,22 +0,0 @@ -{* - Foundation 6 - Form Section Start - All parameters are required. - - {$ui = [ - 'title' => string Section title text, - 'helpText' => string Additional text to describe this section - ]} -*} -{if !isset($ui.title)} -
- Field Error: Required field information not supplied! -
-{else} -
-
-

{$ui.title}

- {if isset($ui.helpText)}

{$ui.helpText}

{/if} -
- - -{/if} \ No newline at end of file diff --git a/views/uiOLD/f6/sub-section-end.html b/views/uiOLD/f6/sub-section-end.html deleted file mode 100644 index 8c677b0..0000000 --- a/views/uiOLD/f6/sub-section-end.html +++ /dev/null @@ -1,14 +0,0 @@ -{* - Foundation 6 - Form Section End - No parameters are needed for Section-End - - {$fieldData = [ - ]} -*} -{if !isset($fieldData.title)} -
-
-{else} -
-
-{/if} \ No newline at end of file diff --git a/views/uiOLD/f6/sub-section-start.html b/views/uiOLD/f6/sub-section-start.html deleted file mode 100644 index 0697b00..0000000 --- a/views/uiOLD/f6/sub-section-start.html +++ /dev/null @@ -1,22 +0,0 @@ -{* - Foundation 6 - Form Section Start - All parameters are required. - - {$fieldData = [ - 'title' => string Section title text, - 'helpText' => string Additional text to describe this section - ]} -*} -{if !isset($fieldData.title)} -
-
- Field Error: Required field information not supplied! -
-{else} -
 
-
-
-

{$fieldData.title}

- {if isset($fieldData.helpText)}

{$fieldData.helpText}

{/if} -
-{/if} \ No newline at end of file diff --git a/views/uiOLD/f6/text.html b/views/uiOLD/f6/text.html deleted file mode 100644 index b689670..0000000 --- a/views/uiOLD/f6/text.html +++ /dev/null @@ -1,45 +0,0 @@ -{* - Foundation 6 Text Input Field - Do not list parameters if they're false. (We're not checking for false) - - {$ui = [ - 'field' => string Name of the data parameter, - 'label' => string Label text for this field, - 'placeholder' => string Placeholder string, - 'required' => boolean True if required, - 'maxWidth' => string Size of input field using standard style notation ('900px', '15rem', ...), - 'maxlength' => integer Maximum number of characters that may be entered, - 'helpText' => string Help text for this input, - 'errortext' => string Error text that appears when the field doesn't validate - ]} -*} - -{if (!isset($ui.data) && !isset($ui.field)) || !isset($ui.label)} -
-
- Field Error: Required field information not supplied! -
-
-{else} -
-
- -
-
- {if isset($ui.helpText)}

{$ui.helpText}

{/if} - {if isset($ui.errorText)}{$ui.errorText}{/if} -
-
-{/if} diff --git a/views/uiOLD/multiSelectSearch.html b/views/uiOLD/multiSelectSearch.html deleted file mode 100644 index 90e9af0..0000000 --- a/views/uiOLD/multiSelectSearch.html +++ /dev/null @@ -1,18 +0,0 @@ - -
- {$multiSelectFilterSearchTerm}: - -
- \ No newline at end of file diff --git a/views/uiOLD/std/deleteDialog.html b/views/uiOLD/std/deleteDialog.html deleted file mode 100644 index e3ea787..0000000 --- a/views/uiOLD/std/deleteDialog.html +++ /dev/null @@ -1,49 +0,0 @@ -{* Delete Dialog *} -{* Set these variables to use the Dialog in your project *} -{* $itemName = Name of item *} -{* $deleteUrl = Url to delete item *} -Delete this {$itemName} - -
-
-

Cancel

-

-
-
-

WARNING:

-

- Clicking the "Delete this {$itemName}" button above will - delete all of the data and images associated with this event. - -

-

- - Once deleted, this information will no longer be available and cannot be retrieved! - If you are unsure that you want to completely remove this data, consider changing the status - of this event to "Archived" instead. - -

-
-
- - -- 2.17.1