Updating forms
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 12 Jul 2019 19:57:57 +0000 (15:57 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 12 Jul 2019 19:57:57 +0000 (15:57 -0400)
Updates for foundation 6 ui elements

14 files changed:
views/admin/billing/accountSearchForm.html
views/admin/billing/accounts.html
views/admin/billing/editAccountAjax.html
views/admin/billing/editInvoice.html
views/admin/billing/editNotificationType.html
views/admin/billing/editPayment.html
views/admin/billing/index.html
views/admin/billing/invoiceTypes.html
views/admin/billing/invoices.html
views/admin/billing/invoicing.html
views/admin/billing/notifications.html
views/admin/billing/payments.html
views/admin/billing/reports.html
views/admin/billing/settings.html

index 2023884..9721511 100644 (file)
@@ -83,40 +83,42 @@ jQuery(document).ready(function($) {
     <input type="hidden" name="nextStart" value="{$nextStart}">
     <input type="hidden" name="limit" value="{$limit}">
 
-    <fieldset class="fieldset">
+    <fieldset class="fieldset cell small-12">
         <legend>Search Accounts</legend>
-        <div class="grid-container full">
-            <div class="grid-x grid-padding-x">
+            <div class="grid-x grid-margin-x">
+
                 <div class="cell small-12 medium-3">
                     <label>Member Account:</label>
                     <input id="member-account" type="hidden" name="filterAccounts" value="{$filterAccounts}">
                     <input id="account_name" type="text" name="searchName" value="{if $searchName}{$searchName}{/if}" />
                 </div>
+
                 <div class="cell small-12 medium-3">
                     <label>From Date: </label>
-                    <input type="text" name="fromDate" value="{$fromDate}" class="glm-form-text-input-short glm-date-input">
+                    <input type="text" name="fromDate" value="{$fromDate}" class="glm-date-input">
                 </div>
+
                 <div class="cell small-12 medium-3">
                     <label>To Date: </label>
-                    <input type="text" name="toDate" value="{$toDate}" class="glm-form-text-input-short glm-date-input">
+                    <input type="text" name="toDate" value="{$toDate}" class="glm-date-input">
                 </div>
+
                 <div class="cell small-12 medium-3">
-                    <label class="billing-search-form-checkbox">
-                        <input class="glm-filter" id="filterActive" name="filterActive" value="1" {if $filterActive}checked{/if} type="checkbox" /> Show Active
+                    <label>
+                        <input id="filterActive" name="filterActive" value="1" {if $filterActive}checked{/if} type="checkbox" /> Show Active
                     </label>
-                    <label class="billing-search-form-checkbox">
-                        <input class="glm-filter" id="filterPending" name="filterPending" value="1" {if $filterPending}checked{/if} type="checkbox" /> Show Pending
+                    <label>
+                        <input id="filterPending" name="filterPending" value="1" {if $filterPending}checked{/if} type="checkbox" /> Show Pending
                     </label>
-                    <label class="billing-search-form-checkbox">
-                        <input class="glm-filter" id="filterOverdue" name="filterOverdue" value="1" {if $filterOverdue}checked{/if} type="checkbox" /> Show Overdue
+                    <label>
+                        <input id="filterOverdue" name="filterOverdue" value="1" {if $filterOverdue}checked{/if} type="checkbox" /> Show Overdue
                     </label>
-                    <label class="billing-search-form-checkbox">
-                        <input class="glm-filter" id="filterExpired" name="filterExpired" value="1" {if $filterExpired}checked{/if} type="checkbox" /> Show Expired
+                    <label>
+                        <input id="filterExpired" name="filterExpired" value="1" {if $filterExpired}checked{/if} type="checkbox" /> Show Expired
                     </label>
                 </div>
             </div>
             <div class="billing-search-form-submit">
-                <input class="button" type="submit" value="Submit">
+                <input class="button primary" type="submit" value="Submit">
             </div>
-        </div>
     </fieldset>
index 75021ff..08f9017 100644 (file)
@@ -1,13 +1,12 @@
 {include file='admin/billing/header.html'}
 
-<div class="callout">
+<div class="callout grid-container">
 
     <h3 class="subheader">Accounts</h3>
 
     <div id="exportAccountsButton" class="button secondary">Accounts Export</div>
 
     {include file='admin/billing/accountSearchForm.html'}
-    <br clear="all">
 
     <p>Total found: <span class="label">{$totalAccounts}</span></p>
 
index 25f2e82..597ccb1 100644 (file)
@@ -35,7 +35,7 @@
 
         {include file='ui/f6/errorCallout.html'}
 
-        <fieldset class="fieldset">
+        <fieldset class="fieldset cell small-12">
             <legend>Account Information</legend>
 
             {* Name *}
 
         </fieldset>
 
-        <fieldset class="fieldset">
+        <fieldset class="fieldset cell small-12">
             <legend>Billing Information</legend>
 
             {* Billing Email *}
index 1b33ba0..2318aa4 100644 (file)
@@ -1,6 +1,6 @@
 {include file='admin/billing/header.html'}
 
-<div class="callout">
+<div class="callout grid-container">
 
     {if $invoiceUpdated}<span class="glm-notice glm-flash-updated">Invoice Updated</span>{/if}
     {if $invoiceUpdateError}<span class="glm-notice glm-flash-updated">Invoice Update Error</span>{/if}
index e516eea..0801ae1 100644 (file)
@@ -6,7 +6,7 @@
 
 {include file='admin/billing/header.html'}
 
-<div class="callout">
+<div class="callout grid-container">
 
     {* Set $data to $notification *}
     {* This is for using the UI elements *}
             <input type="hidden" name="option" value="insert">
         {/if}
 
-        <fieldset class="fieldset">
-            <legend>Notification</legend>
-
-            <div class="grid-container">
-
-                {* Name *}
-                {$ui = [
-                    'value'       => $data.fieldData.name,
-                    'field'       => 'name',
-                    'label'       => 'Name',
-                    'required'    => $data.fieldRequired.name,
-                    'errorText'   => 'Name is Required',
-                    'dataError'   => $data.fieldFail.name
-                ]}
-                {include file='ui/f6/text.html'}
-
-                <div class="grid-x grid-margin-x">
-                    <div class="cell small-12">
-                        <span class="label">Send Notification based on</span>
-                    </div>
-                </div>
-
-                <div class="grid-x grid-margin-x">
-                    <div class="cell small-12">
+        <div class="grid-container">
+            <div class="grid-x grid-margin-x">
+
+                <fieldset class="fieldset cell small-12 medium-6">
+                    <legend>Notification</legend>
+
+                        {* Name *}
+                        {$ui = [
+                            'value'       => $data.fieldData.name,
+                            'field'       => 'name',
+                            'label'       => 'Name',
+                            'required'    => $data.fieldRequired.name,
+                            'errorText'   => 'Name is Required',
+                            'dataError'   => $data.fieldFail.name
+                        ]}
+                        {include file='ui/f6/text.html'}
+
                         <div class="grid-x grid-margin-x">
-                            <div class="cell small-12 medium-3">
-                                <label>Renewal Date</label>
-                                <div class="switch">
-                                    <input class="switch-input" type="radio" id="send_by1" name="send_by" value="date" required{if $notification.fieldData.send_by_date.value} checked{/if}>
-                                    <label class="switch-paddle" for="send_by1"><span class="show-for-sr">Date</span></label>
-                                </div>
-                            </div>
-                            <div class="cell small-12 medium-3">
-                                {* Number *}
-                                {$ui = [
-                                    'value'       => $data.fieldData.send_date_number,
-                                    'field'       => 'send_date_number',
-                                    'label'       => 'Number',
-                                    'pattern'     => 'number',
-                                    'required'    => $data.fieldRequired.send_date_number,
-                                    'errorText'   => 'Number is Required to be numeric',
-                                    'dataError'   => $data.fieldFail.send_date_number
-                                ]}
-                                {include file='ui/f6/text.html'}
-                            </div>
-                            <div class="cell small-12 medium-2">
-                                {* Period *}
-                                {$ui = [
-                                    'value'     => $data.fieldData.send_date_period,
-                                    'field'     => 'send_date_period',
-                                    'label'     => 'Period',
-                                    'list'      => $send_date_period,
-                                    'l_blank'   => false,
-                                    'required'  => $data.fieldRequired.send_date_period,
-                                    'errorText' => 'Period is Required',
-                                    'dataError' => $data.fieldFail.send_date_period
-                                ]}
-                                {include file='ui/f6/select.html'}
-                            </div>
-                            <div class="cell small-12 medium-2">
-                                {* When *}
-                                {$ui = [
-                                    'value'     => $data.fieldData.send_date_when,
-                                    'field'     => 'send_date_when',
-                                    'label'     => 'When',
-                                    'list'      => $send_date_when,
-                                    'l_blank'   => false,
-                                    'required'  => $data.fieldRequired.send_date_when,
-                                    'errorText' => 'When is Required',
-                                    'dataError' => $data.fieldFail.send_date_when
-                                ]}
-                                {include file='ui/f6/select.html'}
+                            <div class="cell small-12">
+                                <span class="label">Send Notification based on</span>
                             </div>
                         </div>
-                    </div>
-                    <div class="cell small-12">
+
                         <div class="grid-x grid-margin-x">
-                            <div class="cell small-12 medium-3">
-                                <label>Immediate Action</label>
-                                <div class="switch">
-                                    <input class="switch-input" type="radio" id="send_by2" name="send_by" value="action" required{if $notification.fieldData.send_by_action.value} checked{/if}>
-                                    <label class="switch-paddle" for="send_by2"><span class="show-for-sr">Action</span></label>
+                            <div class="cell small-12">
+                                <div class="grid-x grid-margin-x">
+                                    <div class="cell small-12 medium-shrink">
+                                        <label>Renewal Date</label>
+                                        <div class="switch">
+                                            <input class="switch-input" type="radio" id="send_by1" name="send_by" value="date" required{if $notification.fieldData.send_by_date.value} checked{/if}>
+                                            <label class="switch-paddle" for="send_by1"><span class="show-for-sr">Date</span></label>
+                                        </div>
+                                    </div>
+                                    <div class="cell small-12 medium-auto">
+                                        {* Number *}
+                                        {$ui = [
+                                            'value'       => $data.fieldData.send_date_number,
+                                            'field'       => 'send_date_number',
+                                            'label'       => 'Number',
+                                            'pattern'     => 'number',
+                                            'required'    => $data.fieldRequired.send_date_number,
+                                            'errorText'   => 'Number is Required to be numeric',
+                                            'dataError'   => $data.fieldFail.send_date_number
+                                        ]}
+                                        {include file='ui/f6/text.html'}
+                                    </div>
+                                    <div class="cell small-12 medium-auto">
+                                        {* Period *}
+                                        {$ui = [
+                                            'value'     => $data.fieldData.send_date_period,
+                                            'field'     => 'send_date_period',
+                                            'label'     => 'Period',
+                                            'list'      => $send_date_period,
+                                            'l_blank'   => false,
+                                            'required'  => $data.fieldRequired.send_date_period,
+                                            'errorText' => 'Period is Required',
+                                            'dataError' => $data.fieldFail.send_date_period
+                                        ]}
+                                        {include file='ui/f6/select.html'}
+                                    </div>
+                                    <div class="cell small-12 medium-auto">
+                                        {* When *}
+                                        {$ui = [
+                                            'value'     => $data.fieldData.send_date_when,
+                                            'field'     => 'send_date_when',
+                                            'label'     => 'When',
+                                            'list'      => $send_date_when,
+                                            'l_blank'   => false,
+                                            'required'  => $data.fieldRequired.send_date_when,
+                                            'errorText' => 'When is Required',
+                                            'dataError' => $data.fieldFail.send_date_when
+                                        ]}
+                                        {include file='ui/f6/select.html'}
+                                    </div>
                                 </div>
                             </div>
-                            <div class="cell small-12 medium-4">
-
-                                {* Send Action *}
-                                {$ui = [
-                                    'value'     => $data.fieldData.send_action,
-                                    'field'     => 'send_action',
-                                    'label'     => 'Send Action',
-                                    'list'      => $send_action,
-                                    'l_blank'   => false,
-                                    'required'  => $data.fieldRequired.send_action,
-                                    'errorText' => 'Send Action is Required',
-                                    'dataError' => $data.fieldFail.send_action
-                                ]}
-                                {include file='ui/f6/select.html'}
-
+                            <div class="cell small-12">
+                                <div class="grid-x grid-margin-x">
+                                    <div class="cell small-12 medium-shrink">
+                                        <label>Immediate Action</label>
+                                        <div class="switch">
+                                            <input class="switch-input" type="radio" id="send_by2" name="send_by" value="action" required{if $notification.fieldData.send_by_action.value} checked{/if}>
+                                            <label class="switch-paddle" for="send_by2"><span class="show-for-sr">Action</span></label>
+                                        </div>
+                                    </div>
+                                    <div class="cell small-12 medium-auto">
+
+                                        {* Send Action *}
+                                        {$ui = [
+                                            'value'     => $data.fieldData.send_action,
+                                            'field'     => 'send_action',
+                                            'label'     => 'Send Action',
+                                            'list'      => $send_action,
+                                            'l_blank'   => false,
+                                            'required'  => $data.fieldRequired.send_action,
+                                            'errorText' => 'Send Action is Required',
+                                            'dataError' => $data.fieldFail.send_action
+                                        ]}
+                                        {include file='ui/f6/select.html'}
+
+                                    </div>
+                                </div>
                             </div>
                         </div>
-                    </div>
-                </div>
-
-                {* To Email *}
-                {$ui = [
-                    'value'       => $data.fieldData.to_email,
-                    'field'       => 'to_email',
-                    'label'       => 'To Email',
-                    'pattern'     => 'email',
-                    'required'    => $data.fieldRequired.to_email,
-                    'errorText'   => 'To Email is Required to be valid email',
-                    'helpText'    => '<span class="label">Leave this field blank to send notice to proper {$account.email} address</span>',
-                    'dataError'   => $data.fieldFail.to_email
-                ]}
-                {include file='ui/f6/text.html'}
-
-                {* Subject *}
-                {$ui = [
-                    'value'       => $data.fieldData.subject,
-                    'field'       => 'subject',
-                    'label'       => 'Subject',
-                    'required'    => $data.fieldRequired.subject,
-                    'errorText'   => 'Subject is Required',
-                    'dataError'   => $data.fieldFail.subject
-                ]}
-                {include file='ui/f6/text.html'}
-
-                {* From *}
-                {$ui = [
-                    'value'       => $data.fieldData.from_header,
-                    'field'       => 'from_header',
-                    'label'       => 'From',
-                    'pattern'     => 'email',
-                    'required'    => $data.fieldRequired.from_header,
-                    'errorText'   => 'From is Required to be valid email',
-                    'dataError'   => $data.fieldFail.from_header
-                ]}
-                {include file='ui/f6/text.html'}
-
-                {* Reply To *}
-                {$ui = [
-                    'value'       => $data.fieldData.replyto,
-                    'field'       => 'replyto',
-                    'label'       => 'Reply To',
-                    'required'    => $data.fieldRequired.replyto,
-                    'errorText'   => 'Reply To is Required',
-                    'dataError'   => $data.fieldFail.replyto
-                ]}
-                {include file='ui/f6/text.html'}
-
-                {* Message *}
-                {$ui = [
-                    'value'     => $data.fieldData.message,
-                    'field'     => 'message',
-                    'label'     => 'Message',
-                    'height'    => '250',
-                    'required'  => $data.fieldRequired.message,
-                    'errortext' => 'Message is Required',
-                    'dataError' => $data.fieldFail.message
-                ]}
-                {include file='ui/f6/editor.html'}
-
-                <div class="grid-x grid-margin-x">
-                    <div class="cell small-12 medium-7">
-
-                        <h4>Merge Tags</h4>
-                        <p>The "merge tags" listed below may be used in the E-Mail message content
-                        to include certain information about the Account or Invoice. Be sure to
-                        include the "{literal}{{/literal}" and "{literal}}{/literal}" and "$" characters exactly as show.</p>
-
-                        {html_table loop=$mergeTagsBilling cols=2 table_attr='border=0 width=400' caption='Billing Examples'}
-
-                        {html_table loop=$mergeTagsContact cols=2 table_attr='border=0 width=400' caption='Contact Examples'}
-
-                        {html_table loop=$mergeTagsInvoice cols=2 table_attr='border=0 width=400' caption='Only available using Immediate Action - Create Invoice'}
-
-                        {html_table loop=$mergeTagsPayment cols=2 table_attr='border=0 width=400' caption='Only available using Immediate Action - Received Payment'}
-
-                    </div>
-                </div>
-
-                <input class="button primary" type="submit" value="{if $notification_id}Update{else}Add{/if} Notification Type">
 
-            </div>
+                        {* To Email *}
+                        {$ui = [
+                            'value'       => $data.fieldData.to_email,
+                            'field'       => 'to_email',
+                            'label'       => 'To Email',
+                            'pattern'     => 'email',
+                            'required'    => $data.fieldRequired.to_email,
+                            'errorText'   => 'To Email is Required to be valid email',
+                            'helpText'    => 'Leave this field blank to send notice to proper {$account.email} address',
+                            'dataError'   => $data.fieldFail.to_email
+                        ]}
+                        {include file='ui/f6/text.html'}
+
+                        {* Subject *}
+                        {$ui = [
+                            'value'       => $data.fieldData.subject,
+                            'field'       => 'subject',
+                            'label'       => 'Subject',
+                            'required'    => $data.fieldRequired.subject,
+                            'errorText'   => 'Subject is Required',
+                            'dataError'   => $data.fieldFail.subject
+                        ]}
+                        {include file='ui/f6/text.html'}
+
+                        {* From *}
+                        {$ui = [
+                            'value'       => $data.fieldData.from_header,
+                            'field'       => 'from_header',
+                            'label'       => 'From',
+                            'pattern'     => 'email',
+                            'required'    => $data.fieldRequired.from_header,
+                            'errorText'   => 'From is Required to be valid email',
+                            'dataError'   => $data.fieldFail.from_header
+                        ]}
+                        {include file='ui/f6/text.html'}
+
+                        {* Reply To *}
+                        {$ui = [
+                            'value'       => $data.fieldData.replyto,
+                            'field'       => 'replyto',
+                            'label'       => 'Reply To',
+                            'required'    => $data.fieldRequired.replyto,
+                            'errorText'   => 'Reply To is Required',
+                            'dataError'   => $data.fieldFail.replyto
+                        ]}
+                        {include file='ui/f6/text.html'}
+
+                        {* Message *}
+                        {$ui = [
+                            'value'     => $data.fieldData.message,
+                            'field'     => 'message',
+                            'label'     => 'Message',
+                            'height'    => '250',
+                            'required'  => $data.fieldRequired.message,
+                            'errortext' => 'Message is Required',
+                            'dataError' => $data.fieldFail.message
+                        ]}
+                        {include file='ui/f6/editor.html'}
+
+
+
+                        <input class="button primary" type="submit" value="{if $notification_id}Update{else}Add{/if} Notification Type">
+
+                    </fieldset>
+
+
+                    <fieldset class="fieldset small-12 medium-6">
+
+                        <legend>Merge Tag Description</legend>
+
+                            <h4>Merge Tags</h4>
+                            <p>The "merge tags" listed below may be used in the E-Mail message content
+                            to include certain information about the Account or Invoice. Be sure to
+                            include the "{literal}{{/literal}" and "{literal}}{/literal}" and "$" characters exactly as show.</p>
+
+                            {html_table loop=$mergeTagsBilling cols=2 table_attr='border=0 width=400' caption='Billing Examples'}
+
+                            {html_table loop=$mergeTagsContact cols=2 table_attr='border=0 width=400' caption='Contact Examples'}
+
+                            {html_table loop=$mergeTagsInvoice cols=2 table_attr='border=0 width=400' caption='Only available using Immediate Action - Create Invoice'}
+
+                            {html_table loop=$mergeTagsPayment cols=2 table_attr='border=0 width=400' caption='Only available using Immediate Action - Received Payment'}
+
+                    </fieldset>
 
-        </fieldset>
+            </div>
+        </div>
 
     </form>
 
index ce94881..ac5727c 100644 (file)
@@ -1,6 +1,6 @@
 {include file='admin/billing/header.html'}
 
-<div class="callout">
+<div class="callout grid-container">
 
     {if $paymentUpdated}<span class="glm-notice glm-flash-updated">Payment Updated</span>{/if}
     {if $paymentUpdateError}<span class="glm-notice glm-flash-updated">Payment Update Error</span>{/if}
index a5b26f3..b023573 100644 (file)
@@ -5,12 +5,12 @@
     {include file='admin/billing/header.html'}
 {/if}
 
-<div class="callout">
+<div class="callout grid-container">
 
     <h3 class="subheader">Accounts</h3>
 
-    <div class="button-group">
-        <div id="exportAccountsButton" class="button secondary">Accounts Export</div>
+    <div>
+        <a class="button secondary" href="#" id="exportAccountsButton">Accounts Export</a>
         <a class="button primary" href="{$thisUrl}?page=glm-members-admin-menu-billing&glm_action=invoices&option=add">Create Invoice</a>
         <a class="button success" href="{$thisUrl}?page=glm-members-admin-menu-billing&glm_action=payments&option=add">Make Payment</a>
     </div>
index 711f333..85f715d 100644 (file)
@@ -1,6 +1,6 @@
 {include file='admin/billing/header.html'}
 
-<div class="callout">
+<div class="callout grid-container">
 
     <h3 class="subheader">InvoiceTypes</h3>
 
index 762bbde..055437c 100644 (file)
@@ -1,6 +1,6 @@
 {include file='admin/billing/header.html'}
 
-<div class="callout">
+<div class="callout grid-container">
 
     <h3 class="subheader">Invoices</h3>
 
@@ -16,7 +16,7 @@
         <input type="hidden" name="nextStart" value="{$nextStart}">
         <input type="hidden" name="limit" value="{$limit}">
 
-        <fieldset class="fieldset">
+        <fieldset class="fieldset cell small-12">
             <legend>Search Invoices</legend>
             <div class="grid-container full">
                 <div class="grid-x grid-padding-x">
@@ -43,7 +43,7 @@
                         </label>
                     </div>
                     <div class="billing-search-form-submit">
-                        <input type="submit" class="button" value="Submit">
+                        <input type="submit" class="button primary" value="Submit">
                     </div>
 
                 </div>
index 45ffa0c..106c43a 100644 (file)
@@ -1,6 +1,6 @@
 {include file='admin/billing/header.html'}
 
-<div class="callout">
+<div class="callout grid-container">
 
     <h3 class="subheader">Invoicing</h3>
     {include file='admin/billing/invoicingSubHeader.html'}
@@ -13,7 +13,7 @@
         <input type="hidden" name="nextStart" value="{$nextStart}">
         <input type="hidden" name="limit" value="{$limit}">
 
-        <fieldset class="fieldset">
+        <fieldset class="fieldset cell small-12">
             <legend>Filter</legend>
             <div class="grid-container full">
                 <div class="grid-x grid-padding-x">
                             {/if}
                         </div>
                     {/if}
-                    <div class="cell small-12 medium-2">
-                        <input class="button" type="submit" value="Filter">
+                    <div class="cell small-12 medium-auto">
+                        <input class="button primary" type="submit" value="Filter">
                         {if $option == 'createInvoices'}
-                            <input class="button" type="submit" name="submitType" value="Create Invoices" onClick="return( confirm( 'Are you Sure?' ) );">
+                            <input class="button primary" type="submit" name="submitType" value="Create Invoices" onClick="return( confirm( 'Are you Sure?' ) );">
                         {elseif $option == 'printInvoices'}
-                            <input class="button" id="print-invoices" type="submit" name="submitType" value="Print Invoices">
+                            <input class="button primary" id="print-invoices" type="submit" name="submitType" value="Print Invoices">
                         {elseif $option == 'createLabels'}
-                            <input class="button" id="create-labels" type="submit" name="submitType" value="Create Labels">
+                            <input class="button primary" id="create-labels" type="submit" name="submitType" value="Create Labels">
                         {elseif $option == 'sendEmails'}
-                            <input class="button" type="submit" name="submitType" value="Send Emails">
+                            <input class="button primary" type="submit" name="submitType" value="Send Emails">
                         {/if}
                     </div>
                 </div>
index 2eab5c7..1de25e5 100644 (file)
@@ -1,6 +1,6 @@
 {include file='admin/billing/header.html'}
 
-<div class="callout">
+<div class="callout grid-container">
 
     <h3 class="subheader">NotificationTypes</h3>
 
index 0fa2326..1973e3c 100644 (file)
@@ -1,6 +1,6 @@
 {include file='admin/billing/header.html'}
 
-<div class="callout large">
+<div class="callout grid-container">
 
     <h3 class="subheader">Payments</h3>
 
@@ -18,7 +18,7 @@
         <input type="hidden" name="nextStart" value="{$nextStart}">
         <input type="hidden" name="limit" value="{$limit}">
 
-        <fieldset class="fieldset">
+        <fieldset class="fieldset cell small-12">
             <legend>Search Payments</legend>
             <div class="grid-container full">
                 <div class="grid-x grid-padding-x">
@@ -34,7 +34,7 @@
                         <input id="account_name" type="text" name="searchName" value="{if $searchName}{$searchName}{/if}" />
                     </div>
                     <div class="cell small-12">
-                        <input class="button" type="submit" value="Submit">
+                        <input class="button primary" type="submit" value="Submit">
                     </div>
                 </div>
             </div>
index a9c1b5d..afb81c0 100644 (file)
@@ -1,11 +1,11 @@
 {include file='admin/billing/header.html'}
-<div class="callout">
+<div class="callout grid-container">
 
     <h3 class="subheader">Reports</h3>
     {include file='admin/billing/reportsSubHeader.html'}
 
     {if $option == 'reportGenerator'}
-        <div id="exportReportsButton" class="button secondary glm-admin-export-button">Report Export</div>
+        <div id="exportReportsButton" class="button secondary">Report Export</div>
     {/if}
 
     <form id="reports-form" action="{$thisUrl}?page={$thisPage}" method="get">
@@ -16,7 +16,7 @@
         <input type="hidden" name="nextStart" value="{$nextStart}">
         <input type="hidden" name="limit" value="{$limit}">
         {if $option == 'reportGenerator'}
-            <fieldset class="fieldset">
+            <fieldset class="fieldset cell small-12">
                 <legend>Filter Reports</legend>
 
                 <div class="grid-container">
                     <div class="grid-x grid-padding-x">
 
                         {if $paymentTypes}
-                            <div class="cell small-12 medium-3">
+                            <div class="cell small-12 medium-auto">
 
                                 {* Payment Types *}
                                 {$ui = [
                                     'value'     => $smarty.request.invoice_types,
-                                    'field'     => 'invoice_type',
+                                    'field'     => 'invoice_types',
                                     'label'     => 'Payment Types',
                                     'list'      => $paymentTypes,
                                     'l_label'   => 'name',
@@ -46,7 +46,7 @@
                         {/if}
 
                         {if $counties}
-                            <div class="cell small-12 medium-3">
+                            <div class="cell small-12 medium-auto">
 
                                 {* Counties *}
                                 {$ui = [
@@ -66,7 +66,7 @@
 
                             </div>
                         {/if}
-                        <div class="cell small-12 medium-3">
+                        <div class="cell small-12 medium-auto">
 
                             {* Member Name *}
                             {$ui = [
                                 {include file='ui/f6/text.html'}
                             {/if}
 
+                            {* From *}
+                            {$ui = [
+                                'value'       => $smarty.request.from_date,
+                                'field'       => 'from_date',
+                                'label'       => 'From',
+                                'required'    => false,
+                                'errorText'   => 'From is Required',
+                                'dataError'   => ''
+                            ]}
+                            {include file='ui/f6/text.html'}
+
+                            {* To *}
+                            {$ui = [
+                                'value'       => $smarty.request.to_date,
+                                'field'       => 'to_date',
+                                'label'       => 'To',
+                                'required'    => false,
+                                'errorText'   => 'To is Required',
+                                'dataError'   => ''
+                            ]}
+                            {include file='ui/f6/text.html'}
+
+                        </div>
+                        <div class="cell small-12 medium-auto">
+                            {* Transaction Types *}
+                            {$ui = [
+                                'value'     => $smarty.request.transactionTypes,
+                                'field'     => 'transactionTypes',
+                                'label'     => 'Transaction Types',
+                                'list'      => $actionTypeSel,
+                                'l_blank'   => false,
+                                'l_size'    => 10,
+                                'required'  => false,
+                                'errorText' => 'Transaction Types is Required',
+                                'dataError' => ''
+                            ]}
+                            {include file='ui/f6/multiselect.html'}
+
+                        </div>
+                        <div class="small-12">
+                            <input class="button primary" id="report_search" type="submit" value="Search">
                         </div>
 
                     </div>
 
                 </div>
 
-                <div class="glm-admin-table-inner">
-                    <div class="billing-search-form-container">
-                        <label>From:</label>
-                        <input id="from_date" class="reportForm glm-date-input" name="from_date" value="{if isset($smarty.request.from_date)}{$smarty.request.from_date}{/if}" />
-                        <label>To:</label>
-                        <input id="to_date" class="reportForm glm-date-input" name="to_date" value="{if isset($smarty.request.to_date)}{$smarty.request.to_date}{/if}" />
-                    </div>
-                    <div class="billing-search-form-container">
-                        <label for="transactionTypes">Transaction Types:</label>
-                        <select multiple size="4" id="transactionTypes" name="transactionTypes[]">
-                            {foreach $actionTypeSel as $typeId => $typeLabel}
-                                <option value="{$typeId}"{if isset($smarty.request.transactionTypes) && in_array( $typeId, $smarty.request.transactionTypes )} selected{/if}>{$typeLabel}</option>
-                            {/foreach}
-                        </select>
-                        {if isset( $settings.quickbooks_enabled ) && $settings.quickbooks_enabled}
-                            <br />
-                            <label>
-                                <input type="checkbox" id="qif" name="qif" /> Export QIF File
-                            </label>
-                        {/if}
-                    </div>
-                    <div class="billing-search-form-submit">
-                        <input id="report_search" type="submit" value="Search">
-                    </div>
-                </div>
             </fieldset>
         {/if}
         {if $option == 'accountsByAge'}
index bc78afb..caa0539 100644 (file)
@@ -4,7 +4,7 @@
 {* Here we are setting $data so it can be used for the Foundation 6 UI Elements *}
 {$data = $billingSettings}
 
-<div class="callout">
+<div class="callout grid-container">
 
     <h3 class="subheader">Settings</h3>
 
@@ -43,7 +43,7 @@
                     <div class="grid-x grid-margin-x">
                         <div class="cell small-12 large-6">
 
-                            <fieldset class="fieldset">
+                            <fieldset class="fieldset cell small-12">
                                 <legend>Invoice Information</legend>
 
                                 {* Company Logo *}
                                     'value'       => $data.fieldData.company_logo,
                                     'field'       => 'company_logo',
                                     'label'       => 'Company Logo',
+                                    'button'      => 'Upload File',
                                     'required'    => $data.fieldRequired.company_logo,
                                     'errorText'   => 'Company Logo is Required',
-                                    'helpText'    => '<br><span class="label">Best logo size: 400x200px. Must be jpeg or png.</span>',
+                                    'helpText'    => '<br>Best logo size: 400x200px. Must be jpeg or png.',
                                     'dataError'   => $data.fieldFail.company_logo
                                 ]}
                                 {include file='ui/f6/image.html'}
                         </div>
 
                         <div class="cell small-12 large-6">
-                            <fieldset class="fieldset">
+                            <fieldset class="fieldset cell small-12">
                                 <legend>Membership Renewal Settings</legend>
 
                                 {* All Members Renew same day each year *}
                                     'label'     => 'All Members Renew same day each year',
                                     'required'  => $data.fieldRequired.renewal_day_static,
                                     'errortext' => 'All Members Renew same day each year is Required',
+                                    'helpText'  => 'All Member renewal on the same day each billing period (yearly)',
                                     'dataError' => $data.fieldFail.renewal_day_static
                                 ]}
                                 {include file='ui/f6/checkbox.html'}
                                     'pattern'     => 'number',
                                     'required'    => $data.fieldRequired.days_before_renewal,
                                     'errorText'   => 'Days Before Renewal Date is Required to be a number',
-                                    'helpText'    => '<span class="label">Days before Renewal Date to Allow Membership Renewal. Based on 1 year after renewal date.</span>',
+                                    'helpText'    => 'Days before Renewal Date to Allow Membership Renewal. Based on 1 year after renewal date.',
                                     'dataError'   => $data.fieldFail.days_before_renewal
                                 ]}
                                 {include file='ui/f6/text.html'}
                                     'pattern'     => 'number',
                                     'required'    => $data.fieldRequired.days_after_expired,
                                     'errorText'   => 'Days After Renewal Date is Required to be a number',
-                                    'helpText'    => '<span class="label">Days after Renewal Date to Expire Membership. Based on 1 year after renewal date.</span>',
+                                    'helpText'    => 'Days after Renewal Date to Expire Membership. Based on 1 year after renewal date.',
                                     'dataError'   => $data.fieldFail.days_after_expired
                                 ]}
                                 {include file='ui/f6/text.html'}
                                     'value'     => $data.fieldData.receipt_text,
                                     'field'     => 'receipt_text',
                                     'label'     => 'Receipt Text',
-                                    'height'    => 100,
+                                    'height'    => 250,
                                     'media'     => false,
                                     'quicktags' => false,
                                     'required'  => $data.fieldRequired.receipt_text,
                 <div class="accordion-content" data-tab-content>
                     <div class="grid-x grid-margin-x">
                         <div class="cell small-12 large-6">
-                            <fieldset class*="fieldset">
+                            <fieldset class*="fieldset cell small-12">
                                 <legend>Advanced Settings</legend>
 
                                 {* Company Logo Width *}