From 0dcf21723daf12934f4977fcf24a0e1b1bff8021 Mon Sep 17 00:00:00 2001 From: Nik Okuntseff Date: Mon, 21 Mar 2016 11:37:20 -0700 Subject: [PATCH] Refactoring white space --- WEB-INF/templates/admin_teams.tpl | 10 ++++---- WEB-INF/templates/cf_custom_field_add.tpl | 4 ++-- WEB-INF/templates/cf_custom_field_delete.tpl | 4 ++-- WEB-INF/templates/cf_custom_field_edit.tpl | 4 ++-- WEB-INF/templates/cf_custom_fields.tpl | 24 +++++++++---------- WEB-INF/templates/cf_dropdown_option_add.tpl | 4 ++-- .../templates/cf_dropdown_option_delete.tpl | 4 ++-- WEB-INF/templates/cf_dropdown_option_edit.tpl | 4 ++-- WEB-INF/templates/cf_dropdown_options.tpl | 14 +++++------ WEB-INF/templates/clients.tpl | 6 ++--- WEB-INF/templates/expense_delete.tpl | 2 +- WEB-INF/templates/expense_edit.tpl | 4 ++-- 12 files changed, 42 insertions(+), 42 deletions(-) diff --git a/WEB-INF/templates/admin_teams.tpl b/WEB-INF/templates/admin_teams.tpl index c4184667..51113783 100644 --- a/WEB-INF/templates/admin_teams.tpl +++ b/WEB-INF/templates/admin_teams.tpl @@ -15,8 +15,8 @@ {$i18n.label.edit} {$i18n.label.delete} - {if $teams} - {foreach $teams as $team} +{if $teams} + {foreach $teams as $team} {$team.id} {$team.name|escape:'html'} @@ -25,10 +25,10 @@ {$i18n.label.edit} {$i18n.label.delete} - {/foreach} - {/if} + {/foreach} +{/if} - +
diff --git a/WEB-INF/templates/cf_custom_field_add.tpl b/WEB-INF/templates/cf_custom_field_add.tpl index f1fffc2d..82c6d835 100644 --- a/WEB-INF/templates/cf_custom_field_add.tpl +++ b/WEB-INF/templates/cf_custom_field_add.tpl @@ -2,7 +2,7 @@
- {if $user->canManageTeam()} +{if $user->canManageTeam()} @@ -24,7 +24,7 @@
{$i18n.label.thing_name} (*):{$forms.fieldForm.btn_add.control}
- {/if} +{/if}
diff --git a/WEB-INF/templates/cf_custom_field_delete.tpl b/WEB-INF/templates/cf_custom_field_delete.tpl index 80fb155c..18fa457a 100644 --- a/WEB-INF/templates/cf_custom_field_delete.tpl +++ b/WEB-INF/templates/cf_custom_field_delete.tpl @@ -2,7 +2,7 @@
- {if $user->canManageTeam()} +{if $user->canManageTeam()} @@ -15,7 +15,7 @@
{$field|escape:'html'} {$forms.fieldDeleteForm.btn_cancel.control}
- {/if} +{/if}
diff --git a/WEB-INF/templates/cf_custom_field_edit.tpl b/WEB-INF/templates/cf_custom_field_edit.tpl index 4c312ed3..44669a17 100644 --- a/WEB-INF/templates/cf_custom_field_edit.tpl +++ b/WEB-INF/templates/cf_custom_field_edit.tpl @@ -2,7 +2,7 @@
- {if $user->canManageTeam()} +{if $user->canManageTeam()} @@ -24,7 +24,7 @@
{$i18n.label.thing_name} (*):{$forms.fieldForm.btn_save.control}
- {/if} +{/if}
diff --git a/WEB-INF/templates/cf_custom_fields.tpl b/WEB-INF/templates/cf_custom_fields.tpl index 601c4fc7..94be51f8 100644 --- a/WEB-INF/templates/cf_custom_fields.tpl +++ b/WEB-INF/templates/cf_custom_fields.tpl @@ -2,8 +2,8 @@
- {if $user->canManageTeam()} - +{if $user->canManageTeam()} +
@@ -11,28 +11,28 @@ - {if $custom_fields} - {foreach $custom_fields as $field} + {if $custom_fields} + {foreach $custom_fields as $field} - {if CustomFields::TYPE_TEXT == $field['type']} + {if CustomFields::TYPE_TEXT == $field['type']} - {else if CustomFields::TYPE_DROPDOWN == $field['type']} + {else if CustomFields::TYPE_DROPDOWN == $field['type']} - {/if} + {/if} - {/foreach} - {/if} + {/foreach} + {/if}
{$i18n.label.thing_name} {$i18n.label.type}{$i18n.label.edit} {$i18n.label.delete}
{$field['label']|escape:'html'}{$i18n.label.type_text} {$i18n.label.type_dropdown} {$i18n.label.configure}{$i18n.label.edit} {$i18n.label.delete}
- + -

{$forms.customFieldsForm.btn_add.control}
- {/if} +
+{/if}
diff --git a/WEB-INF/templates/cf_dropdown_option_add.tpl b/WEB-INF/templates/cf_dropdown_option_add.tpl index b1deae92..8ef52861 100644 --- a/WEB-INF/templates/cf_dropdown_option_add.tpl +++ b/WEB-INF/templates/cf_dropdown_option_add.tpl @@ -2,7 +2,7 @@
- {if $user->canManageTeam()} +{if $user->canManageTeam()} @@ -20,7 +20,7 @@
{$i18n.label.thing_name} (*):{$forms.optionAddForm.btn_add.control}
- {/if} +{/if}
diff --git a/WEB-INF/templates/cf_dropdown_option_delete.tpl b/WEB-INF/templates/cf_dropdown_option_delete.tpl index 0e60c96a..214306aa 100644 --- a/WEB-INF/templates/cf_dropdown_option_delete.tpl +++ b/WEB-INF/templates/cf_dropdown_option_delete.tpl @@ -2,7 +2,7 @@
- {if $user->canManageTeam()} +{if $user->canManageTeam()} @@ -15,7 +15,7 @@
{$option|escape:'html'} {$forms.optionDeleteForm.btn_cancel.control}
- {/if} +{/if}
diff --git a/WEB-INF/templates/cf_dropdown_option_edit.tpl b/WEB-INF/templates/cf_dropdown_option_edit.tpl index f0e57f96..d56b0542 100644 --- a/WEB-INF/templates/cf_dropdown_option_edit.tpl +++ b/WEB-INF/templates/cf_dropdown_option_edit.tpl @@ -2,7 +2,7 @@
- {if $user->canManageTeam()} +{if $user->canManageTeam()} @@ -20,7 +20,7 @@
{$i18n.label.thing_name} (*):{$forms.optionEditForm.btn_save.control}
- {/if} +{/if}
diff --git a/WEB-INF/templates/cf_dropdown_options.tpl b/WEB-INF/templates/cf_dropdown_options.tpl index 32d1aab7..833cd7c1 100644 --- a/WEB-INF/templates/cf_dropdown_options.tpl +++ b/WEB-INF/templates/cf_dropdown_options.tpl @@ -6,24 +6,24 @@
- {if $user->canManageTeam()} +{if $user->canManageTeam()} - {if $options} - {foreach $options as $key=>$val} + {if $options} + {foreach $options as $key=>$val} - {/foreach} - {/if} + {/foreach} + {/if}
{$i18n.label.thing_name} {$i18n.label.edit} {$i18n.label.delete}
{$val|escape:'html'} {$i18n.label.edit} {$i18n.label.delete}
- +
@@ -34,7 +34,7 @@
- {/if} +{/if}
diff --git a/WEB-INF/templates/clients.tpl b/WEB-INF/templates/clients.tpl index 95e59d50..eb46259f 100644 --- a/WEB-INF/templates/clients.tpl +++ b/WEB-INF/templates/clients.tpl @@ -29,7 +29,7 @@

- + {if $inactive_clients} @@ -48,11 +48,11 @@ {/foreach}
{$i18n.form.clients.inactive_clients}
- +

- {/if} + {/if} {/if} diff --git a/WEB-INF/templates/expense_delete.tpl b/WEB-INF/templates/expense_delete.tpl index 3a3172b7..fd5dc4eb 100644 --- a/WEB-INF/templates/expense_delete.tpl +++ b/WEB-INF/templates/expense_delete.tpl @@ -11,7 +11,7 @@ {if ($smarty.const.MODE_PROJECTS == $user->tracking_mode || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->tracking_mode)} {$i18n.label.project} {/if} - {$i18n.label.item} + {$i18n.label.item} {$i18n.label.cost} diff --git a/WEB-INF/templates/expense_edit.tpl b/WEB-INF/templates/expense_edit.tpl index ddf0d283..79be8185 100644 --- a/WEB-INF/templates/expense_edit.tpl +++ b/WEB-INF/templates/expense_edit.tpl @@ -42,7 +42,7 @@ function fillProjectDropdown(id) { // Populate project dropdown. if (!id) { // If we are here, client is not selected. - var len = projects.length; + var len = projects.length; for (var i = 0; i < len; i++) { dropdown.options[i+1] = new Option(projects[i][1], projects[i][0]); if (dropdown.options[i+1].value == selected_item) @@ -74,7 +74,7 @@ function get_date() { -
+ {if in_array('cl', explode(',', $user->plugins))} -- 2.20.1