Skip to content

Commit

Permalink
dev/user-interface#51 Remove top buttons on admin forms
Browse files Browse the repository at this point in the history
  • Loading branch information
@mlutfy
mlutfy committed Jul 20, 2023
1 parent f3b6710 commit d3e28be
Show file tree
Hide file tree
Showing 120 changed files with 293 additions and 739 deletions.
3 changes: 1 addition & 2 deletions templates/CRM/ACL/Form/ACL.tpl
View file
Expand Up @@ -12,10 +12,9 @@
{if $action eq 8}
<div class="messages status no-popup">
{icon icon="fa-info-circle"}{/icon}
{ts}WARNING: Delete will remove this permission from the specified ACL Role.{/ts} {ts}Do you want to continue?{/ts}
{ts}WARNING: Delete will remove this permission from the specified ACL Role.{/ts} {ts}Do you want to continue?{/ts}
</div>
{else}
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
<table class="form-layout-compressed">
<tr class="crm-acl-form-block-name">
<td class="label">{$form.name.label}</td>
Expand Down
5 changes: 2 additions & 3 deletions templates/CRM/ACL/Form/EntityRole.tpl
View file
Expand Up @@ -10,11 +10,10 @@
{* this template is used for adding/editing ACL EntityRole objects *}
<div class="crm-block crm-form-block crm-acl-entityrole-form-block">
<fieldset><legend>{if $action eq 1}{ts}Assign ACL Role{/ts}{elseif $action eq 2}{ts}Assign ACL Role{/ts}{else}{ts}Delete ACL Role Assignment{/ts}{/if}</legend>
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
{if $action eq 8}
<div class="messages status no-popup">
{icon icon="fa-info-circle"}{/icon}
{ts}WARNING: Deleting this option will remove this ACL Role Assignment.{/ts} {ts}Do you want to continue?{/ts}
{icon icon="fa-info-circle"}{/icon}
{ts}WARNING: Deleting this option will remove this ACL Role Assignment.{/ts} {ts}Do you want to continue?{/ts}
</div>
{else}
<table class="form-layout-compressed">
Expand Down
11 changes: 1 addition & 10 deletions templates/CRM/ACL/Form/WordPress/Permissions.tpl
View file
Expand Up @@ -12,13 +12,8 @@
<p>{ts}Use this form to Grant access to CiviCRM components and other CiviCRM permissions to WordPress roles.{/ts}</p>
<p>{ts}<strong>NOTE: Super Admin</strong> and <strong>Administrator</strong> roles will have all permissions in CiviCRM.{/ts}</p>
</div>

<div class="crm-block crm-form-block crm-export-form-block">

<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>

<table>

<tr>
<td class="label">&nbsp;</td>
{assign var="num" value=0}
Expand Down Expand Up @@ -54,9 +49,5 @@
{/foreach}

</table>

<div class="crm-submit-buttons">
{include file="CRM/common/formButtons.tpl" location="bottom"}
</div>

<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
</div>
4 changes: 3 additions & 1 deletion templates/CRM/ACL/Page/EntityRole.tpl
View file
Expand Up @@ -7,7 +7,9 @@
| and copyright information, see https://civicrm.org/licensing |
+--------------------------------------------------------------------+
*}
{include file="CRM/ACL/Header.tpl" step=2}
{if $action neq 8}
{include file="CRM/ACL/Header.tpl" step=2}
{/if}

{if $action eq 1 or $action eq 2 or $action eq 8}
{include file="CRM/ACL/Form/EntityRole.tpl"}
Expand Down
4 changes: 0 additions & 4 deletions templates/CRM/Activity/Form/Activity.tpl
View file
Expand Up @@ -16,10 +16,6 @@
{/if}
<div class="crm-block crm-form-block crm-activity-form-block">
{/if}
{if !$action or ( $action eq 1 ) or ( $action eq 2 ) }
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
{/if}

{if $action eq 8} {* Delete action. *}
<table class="form-layout">
<tr>
Expand Down
1 change: 0 additions & 1 deletion templates/CRM/Activity/Form/Task/AddToTag.tpl
View file
Expand Up @@ -11,7 +11,6 @@
<h3>
{ts}Tag Activities{/ts}
</h3>
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
<table class="form-layout-compressed">
<tr class="crm-activity-task-addtotag-form-block-tag">
<td>
Expand Down
14 changes: 6 additions & 8 deletions templates/CRM/Activity/Form/Task/Delete.tpl
View file
Expand Up @@ -9,12 +9,10 @@
*}
{* Confirmation of Activity deletes *}
<div class="crm-block crm-form-block crm-activity_delete-form-block">
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
<div class="messages status no-popup">
{icon icon="fa-info-circle"}{/icon}
<p>{ts}Are you sure you want to delete the selected Activities?{/ts}</p>
<p>{include file="CRM/Activity/Form/Task.tpl"}</p>
</div>
<p>
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
<div class="messages status no-popup">
{icon icon="fa-info-circle"}{/icon}
<p>{ts}Are you sure you want to delete the selected Activities?{/ts}</p>
<p>{include file="CRM/Activity/Form/Task.tpl"}</p>
</div>
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
</div>
28 changes: 10 additions & 18 deletions templates/CRM/Activity/Form/Task/FileOnCase.tpl
View file
Expand Up @@ -8,22 +8,14 @@
+--------------------------------------------------------------------+
*}
<div class="crm-form crm-form-block crm-file-on-case-form-block">
<div class="help">
{ts}File on Case{/ts}
</div>
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
<table class="form-layout-compressed">
<tr class="crm-file-on-case-form-block-unclosed_cases">
<td class="label">
{$form.unclosed_case_id.label}
</td>
<td>
{$form.unclosed_case_id.html}<br />
</td>
</tr>
<tr>
{include file="CRM/Activity/Form/Task.tpl"}
</tr>
</table>
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
<table class="form-layout-compressed">
<tr class="crm-file-on-case-form-block-unclosed_cases">
<td class="label">{$form.unclosed_case_id.label}</td>
<td>{$form.unclosed_case_id.html}</td>
</tr>
<tr>
{include file="CRM/Activity/Form/Task.tpl"}
</tr>
</table>
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
</div>
41 changes: 19 additions & 22 deletions templates/CRM/Activity/Form/Task/PickOption.tpl
View file
Expand Up @@ -8,26 +8,23 @@
+--------------------------------------------------------------------+
*}
<div class="crm-form crm-form-block crm-pick-option-form-block">
<div class="help">
{ts}Select Group of Contacts{/ts}
</div>
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
<table class="form-layout-compressed">
<tr class="crm-pick-option-form-block-with_contact">
<td class="label">{$form.with_contact.label}</td>
<td>{$form.with_contact.html}</td>
</tr>
<tr class="crm-pick-option-form-block-assigned_to">
<td class="label">{$form.assigned_to.label}</td>
<td>{$form.assigned_to.html}</td>
</tr>
<tr class="crm-pick-option-form-block-created_by">
<td class="label">{$form.created_by.label}</td>
<td>{$form.created_by.html}</td>
</tr>
<tr>
{include file="CRM/Activity/Form/Task.tpl"}
</tr>
</table>
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
<div class="help">{ts}Select Group of Contacts{/ts}</div>
<table class="form-layout-compressed">
<tr class="crm-pick-option-form-block-with_contact">
<td class="label">{$form.with_contact.label}</td>
<td>{$form.with_contact.html}</td>
</tr>
<tr class="crm-pick-option-form-block-assigned_to">
<td class="label">{$form.assigned_to.label}</td>
<td>{$form.assigned_to.html}</td>
</tr>
<tr class="crm-pick-option-form-block-created_by">
<td class="label">{$form.created_by.label}</td>
<td>{$form.created_by.html}</td>
</tr>
<tr>
{include file="CRM/Activity/Form/Task.tpl"}
</tr>
</table>
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
</div>
26 changes: 11 additions & 15 deletions templates/CRM/Activity/Form/Task/PickProfile.tpl
View file
Expand Up @@ -8,19 +8,15 @@
+--------------------------------------------------------------------+
*}
<div class="crm-block crm-form-block crm-activityPickProfile-form-block">
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
<table class="form-layout-compressed">
<tr class="crm-activityPickProfile-form-block-uf_group_id">
<td>{$form.uf_group_id.label}</td>
<td>{$form.uf_group_id.html}</td>
</tr>
<tr>
<td class="label"></td>
<td>
{include file="CRM/Activity/Form/Task.tpl"}
</td>
</tr>
<table class="form-layout-compressed">
<tr class="crm-activityPickProfile-form-block-uf_group_id">
<td>{$form.uf_group_id.label}</td>
<td>{$form.uf_group_id.html}</td>
</tr>
<tr>
<td class="label"></td>
<td>{include file="CRM/Activity/Form/Task.tpl"}</td>
</tr>
</table>
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
</div>

<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
</div>
6 changes: 1 addition & 5 deletions templates/CRM/Activity/Form/Task/RemoveFromTag.tpl
View file
Expand Up @@ -9,10 +9,7 @@
*}
{* template to remove tags from activity *}
<div class="crm-form-block crm-block crm-activity-task-removefromtag-form-block">
<h3>
{ts}Tag Activities (Remove){/ts}
</h3>
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
<h3>{ts}Tag Activities (Remove){/ts}</h3>
<table class="form-layout-compressed">
<tr class="crm-activity-task-removefromtag-form-block-tag">
<td>
Expand All @@ -29,7 +26,6 @@
{include file="CRM/common/Tagset.tpl"}
</td>
</tr>

<tr><td>{include file="CRM/Activity/Form/Task.tpl"}</td></tr>
</table>
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
Expand Down
9 changes: 2 additions & 7 deletions templates/CRM/Activity/Form/Task/SearchTaskHookSample.tpl
View file
Expand Up @@ -8,10 +8,6 @@
+--------------------------------------------------------------------+
*}
{if $rows}
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>

<div class="spacer"></div>

<div>
<br />
<table>
Expand All @@ -21,7 +17,6 @@
<td>{ts}Activity Type{/ts}</td>
<td>{ts}Activity Date{/ts}</td>
</tr>

{foreach from=$rows item=row}
<tr class="{cycle values="odd-row,even-row"}">
<td>{$row.display_name}</td>
Expand All @@ -37,7 +32,7 @@

{else}
<div class="messages status no-popup">
{icon icon="fa-info-circle"}{/icon}
{ts}There are no records selected.{/ts}
{icon icon="fa-info-circle"}{/icon}
{ts}There are no records selected.{/ts}
</div>
{/if}
1 change: 0 additions & 1 deletion templates/CRM/Activity/Import/Form/Preview.tpl
View file
Expand Up @@ -27,7 +27,6 @@

<p>{ts}Click 'Import Now' if you are ready to proceed.{/ts}</p>
</div>
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>

{* Summary Preview (record counts) *}
<table id="preview-counts" class="report">
Expand Down
1 change: 0 additions & 1 deletion templates/CRM/Admin/Form/CMSUser.tpl
View file
Expand Up @@ -12,7 +12,6 @@
<div class="help">
<p>{ts}Synchronize Users{/ts}</p>
</div>
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
<div class="messages status no-popup">
<img src="{$config->resourceBase}i/Inform.gif" alt="{ts}status{/ts}"/>
<span class="label">{ts}Synchronize Users to Contacts:{/ts}</span> {ts}CiviCRM will check each user record for a contact record. A new contact record will be created for each user where one does not already exist.{/ts} {ts}Do you want to continue?{/ts}
Expand Down
4 changes: 0 additions & 4 deletions templates/CRM/Admin/Form/ContactType.tpl
View file
Expand Up @@ -8,23 +8,20 @@
+--------------------------------------------------------------------+
*}
{* this template is used for adding/editing Contact Type *}

<div class="crm-block crm-form-block crm-contact-type-form-block">
{if $action eq 8}
<div class="messages status no-popup">
{icon icon="fa-info-circle"}{/icon}
{ts}WARNING: {ts}This action cannot be undone.{/ts} {ts}Do you want to continue?{/ts}{/ts}
</div>
{else}
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
<table class="form-layout-compressed">
<tr class="crm-contact-type-form-block-label">
<td class="label">{$form.label.label}
{if $action eq 2}
{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_contact_type' field='label' id= $cid }
{/if}
</td>

<td>{$form.label.html}</td>
</tr>
<tr class="crm-contact-type-form-block-parent_id">
Expand Down Expand Up @@ -54,7 +51,6 @@
{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_contact_type' field='description' id= $cid}
{/if}
</td>

<td>{$form.description.html}</td>
</tr>
<tr class="crm-contact-type-form-block-is_active">
Expand Down
1 change: 0 additions & 1 deletion templates/CRM/Admin/Form/LabelFormats.tpl
View file
Expand Up @@ -37,7 +37,6 @@
{ts 1=$formatName}Are you sure you would like to make a copy of the Label Format titled <strong>%1</strong>?{/ts}
</div>
{else}
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
<table class="form-layout-compressed">
<tr class="crm-labelFormat-form-block-name">
<td class="right">{$form.label.label}</td>
Expand Down
1 change: 0 additions & 1 deletion templates/CRM/Admin/Form/LocationType.tpl
View file
Expand Up @@ -9,7 +9,6 @@
*}
{* this template is used for adding/editing location type *}
<div class="crm-block crm-form-block crm-location-type-form-block">
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
{if $action eq 8}
<div class="messages status no-popup">
{icon icon="fa-info-circle"}{/icon}
Expand Down
3 changes: 1 addition & 2 deletions templates/CRM/Admin/Form/MailSettings.tpl
View file
Expand Up @@ -9,13 +9,12 @@
*}
{* this template is used for adding/editing email settings. *}
<div class="crm-block crm-form-block crm-mail-settings-form-block">
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
{if $action eq 8}
<div class="messages status no-popup">
{icon icon="fa-info-circle"}{/icon}
{ts}WARNING: Deleting this option will result in the loss of mail settings data.{/ts} {ts}Do you want to continue?{/ts}
</div>
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
{else}
<table class="form-layout-compressed">

Expand Down
4 changes: 1 addition & 3 deletions templates/CRM/Admin/Form/Mapping.tpl
View file
Expand Up @@ -10,7 +10,6 @@
{* this template is used for adding/editing a saved mapping *}
<div class="crm-block crm-form-block crm-mapping-form-block">
{if $action eq 1 or $action eq 2 }
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
<table class="form-layout-compressed">
<tr class="crm-mapping-form-block-name">
<td class="label">{$form.name.label}</td>
Expand All @@ -32,6 +31,5 @@
</div>
<br />
{/if}
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" loaction="bottom"}</div>
<div class="spacer"></div>
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" loaction="bottom"}</div>
</div>
1 change: 0 additions & 1 deletion templates/CRM/Admin/Form/MessageTemplates.tpl
View file
Expand Up @@ -24,7 +24,6 @@
{ts 1=$msg_title|escape}Do you want to delete the message template '%1'?{/ts}
</div>
{else}
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
<table class="form-layout-compressed">
<tr>
<td class="label-left">{$form.msg_title.label}</td>
Expand Down
1 change: 0 additions & 1 deletion templates/CRM/Admin/Form/Navigation.tpl
View file
Expand Up @@ -9,7 +9,6 @@
*}
{* Template for adding/editing a CiviCRM Navigation Menu Item *}
<div class="crm-block crm-form-block crm-navigation-form-block">
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
<table class="form-layout-compressed">
<tr class="crm-navigation-form-block-label">
<td class="label">{$form.label.label}</td><td>{$form.label.html}</td>
Expand Down
1 change: 0 additions & 1 deletion templates/CRM/Admin/Form/OptionGroup.tpl
View file
Expand Up @@ -9,7 +9,6 @@
*}
<h3>{if $action eq 1}{ts}New Option Group{/ts}{elseif $action eq 2}{ts}Edit Option Group{/ts}{else}{ts}Delete Option Group{/ts}{/if}</h3>
<div class="crm-block crm-form-block crm-admin-optiongroup-form-block">
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
{if $action eq 8}
<div class="messages status no-popup">
{icon icon="fa-info-circle"}{/icon}
Expand Down

0 comments on commit d3e28be

Please sign in to comment.