tpl fixes

client/res/templates/admin/dynamic-logic/conditions-string/group-base.tpl

@@ -5,9 +5,9 @@
     {{#each viewDataList}}
         <div data-view-key="{{key}}" style="margin-left: 15px;">{{{var key ../this}}}</div>
         {{#unless isEnd}}
-            <div style="margin-left: 15px;">
-                {{translate ../../operator category='logicalOperators' scope='Admin'}}
-            </div>
+        <div style="margin-left: 15px;">
+            {{translate ../operator category='logicalOperators' scope='Admin'}}
+        </div>
         {{/unless}}
     {{/each}}
     )</div>

client/res/templates/admin/field-manager/edit.tpl

@@ -29,8 +29,8 @@
                 </div>
                 {{#each paramList}}
                     {{#unless hidden}}
-                    <div class="cell form-group" data-name="{{../name}}">
-                        <label class="control-label" data-name="{{../name}}">
+                    <div class="cell form-group" data-name="{{name}}">
+                        <label class="control-label" data-name="{{name}}">
                             {{translate name scope='Admin' category='fields'}}
                         </label>
                         <div class="field" data-name="{{name}}">{{{var name ../this}}}</div>

client/res/templates/admin/field-manager/list.tpl

@@ -14,7 +14,14 @@
     <tbody>
     {{#each fieldDefsArray}}
     <tr data-name="{{name}}">
-        <td><a href="#Admin/fieldManager/scope={{../scope}}&field={{name}}" class="field-link" data-scope="{{../scope}}" data-field="{{name}}">{{name}}</td>
+        <td>
+            <a
+                href="#Admin/fieldManager/scope={{../scope}}&field={{name}}"
+                class="field-link"
+                data-scope="{{../scope}}"
+                data-field="{{name}}"
+            >{{name}}</a>
+        </td>
         <td>{{translate name scope=../scope category='fields'}}</td>
         <td>{{translate type category='fieldTypes' scope='Admin'}}</td>
         <td align="right">{{#if isCustom}}<a href="javascript:" data-action="removeField" data-name="{{name}}">remove</a>{{/if}}</td>

client/res/templates/admin/integrations/edit.tpl

@@ -23,7 +23,7 @@
     <div class="col-sm-6">
         {{#if helpText}}
         <div class="well">
-            {{complexText ../helpText}}
+            {{complexText helpText}}
         </div>
         {{/if}}
     </div>

client/res/templates/admin/integrations/index.tpl

@@ -18,7 +18,3 @@
         </div>
     </div>
 </div>
-
-
-
-

client/res/templates/admin/integrations/oauth2.tpl

@@ -29,7 +29,7 @@
     <div class="col-sm-6">
         {{#if helpText}}
         <div class="well">
-            {{{../helpText}}}
+            {{{helpText}}}
         </div>
         {{/if}}
     </div>

client/res/templates/admin/label-manager/index.tpl

@@ -35,4 +35,4 @@
             {{{record}}}
         </div>
     </div>
-</div>
+</div>

client/res/templates/dashlet.tpl

@@ -1,18 +1,49 @@
-<div id="dashlet-{{id}}" class="panel panel-default dashlet{{#if isDoubleHeight}} double-height{{/if}}" data-name="{{name}}" data-id="{{id}}">
+<div
+  id="dashlet-{{id}}"
+  class="panel panel-default dashlet{{#if isDoubleHeight}} double-height{{/if}}"
+  data-name="{{name}}"
+  data-id="{{id}}"
+>
     <div class="panel-heading">
         <div class="btn-group pull-right">
             {{#each buttonList}}
-            <button type="button" class="btn btn-{{#if ../../style}}{{../../style}}{{else}}link{{/if}} btn-sm action{{#if hidden}} hidden{{/if}}" data-action="{{name}}" title="{{#if title}}{{translate title}}{{/if}}">{{#if html}}{{{html}}}{{else}}{{translate label}}{{/if}}</button>
+            <button
+              type="button"
+              class="btn btn-{{#if ../style}}{{../style}}{{else}}link{{/if}} btn-sm action{{#if hidden}} hidden{{/if}}"
+              data-action="{{name}}"
+              title="{{#if title}}{{translate title}}{{/if}}"
+            >{{#if html}}{{{html}}}{{else}}{{translate label}}{{/if}}</button>
             {{/each}}
-            <button class="dropdown-toggle btn btn-link btn-sm menu-button" data-toggle="dropdown"><span class="fas fa-ellipsis-h"></span></button>
+            <button
+              class="dropdown-toggle btn btn-link btn-sm menu-button"
+              data-toggle="dropdown"
+            ><span class="fas fa-ellipsis-h"></span></button>
             <ul class="dropdown-menu dropdown-menu-with-icons" role="menu">
               {{#each actionList}}
-                <li><a data-action="{{name}}" class="action" href="{{#if url}}{{url}}{{else}}javascript:{{/if}}"{{#each data}} data-{{hyphen @key}}="{{./this}}"{{/each}}>{{#if iconHtml}}{{{iconHtml}}}{{else}}<span class="empty-icon">&nbsp;</span>{{/if}}<span class="item-text">{{#if html}}{{{html}}}{{else}}{{translate label}}{{/if}}</span></a></li>
+                <li>
+                    <a
+                      data-action="{{name}}"
+                      class="action"
+                      href="{{#if url}}{{url}}{{else}}javascript:{{/if}}"
+                      {{#each data}} data-{{hyphen @key}}="{{./this}}"{{/each}}
+                    >
+                        {{#if iconHtml}}{{{iconHtml}}}
+                        {{else}}
+                        <span class="empty-icon">&nbsp;</span>
+                        {{/if}}
+                        <span class="item-text">{{#if html}}{{{html}}}{{else}}{{translate label}}{{/if}}</span>
+                    </a>
+                </li>
               {{/each}}
               </ul>
           </div>
         <h4 class="panel-title">
-          <span data-action="refresh" class="action" title="{{translate 'Refresh'}}" style="cursor: pointer;">{{#if title}}{{title}}{{else}}&nbsp;{{/if}}</span>
+            <span
+                data-action="refresh"
+                class="action"
+                title="{{translate 'Refresh'}}"
+                style="cursor: pointer;"
+            >{{#if title}}{{title}}{{else}}&nbsp;{{/if}}</span>
         </h4>
     </div>
     <div class="dashlet-body panel-body{{#if noPadding}} no-padding{{/if}}">{{{body}}}</div>

client/res/templates/email-folder/list-side.tpl

@@ -1,12 +1,30 @@
 
 <ul class="list-group list-group-side list-group-no-border">
     <li data-id="all" class="list-group-item{{#ifEqual 'all' selectedFolderId}} selected{{/ifEqual}}">
-        <a href="#Email/list/folder=all" data-action="selectFolder" data-id="all" class="side-link">{{translate 'all' category='presetFilters' scope='Email'}}</a>
+        <a
+            href="#Email/list/folder=all"
+            data-action="selectFolder"
+            data-id="all"
+            class="side-link"
+        >{{translate 'all' category='presetFilters' scope='Email'}}</a>
     </li>
     {{#each collection.models}}
-    <li data-id="{{get this 'id'}}" class="list-group-item{{#ifAttrEquals this 'id' ../selectedFolderId}} selected{{/ifAttrEquals}}">
-        <a href="#Email/list/folder={{get this 'id'}}" data-action="selectFolder" data-id="{{get this 'id'}}" class="side-link pull-right count"></a>
-        <a href="#Email/list/folder={{get this 'id'}}" data-action="selectFolder" data-id="{{get this 'id'}}" class="side-link">{{get this 'name'}}</a>
+    <li
+        data-id="{{get this 'id'}}"
+        class="list-group-item{{#ifAttrEquals this 'id' ../selectedFolderId}} selected{{/ifAttrEquals}}"
+    >
+        <a
+            href="#Email/list/folder={{get this 'id'}}"
+            data-action="selectFolder"
+            data-id="{{get this 'id'}}"
+            class="side-link pull-right count"
+        ></a>
+        <a
+            href="#Email/list/folder={{get this 'id'}}"
+            data-action="selectFolder"
+            data-id="{{get this 'id'}}"
+            class="side-link"
+        >{{get this 'name'}}</a>
     </li>
     {{/each}}
 </ul>

client/res/templates/external-account/oauth2.tpl

@@ -12,14 +12,18 @@
             </div>
         </div>
         <div class="data-panel">
-            <button type="button" class="btn btn-danger {{#if isConnected}}hidden{{/if}}" data-action="connect">{{translate 'Connect' scope='ExternalAccount'}}</button>
+            <button
+                type="button"
+                class="btn btn-danger {{#if isConnected}}hidden{{/if}}"
+                data-action="connect"
+            >{{translate 'Connect' scope='ExternalAccount'}}</button>
             <span class="connected-label label label-success {{#unless isConnected}}hidden{{/unless}}">{{translate 'Connected' scope='ExternalAccount'}}</span>
         </div>
     </div>
     <div class="col-sm-6">
         {{#if helpText}}
         <div class="well">
-            {{{../helpText}}}
+            {{{helpText}}}
         </div>
         {{/if}}
     </div>

client/res/templates/fields/phone/detail.tpl

@@ -19,7 +19,7 @@
     {{/each}}
 {{else}}
     {{#if value}}
-    {{#if lineThrough}}<s>{{/if}}<a href="tel:{{valueForLink}}" data-phone-number="{{valueForLink}}" data-action="dial">{{value}}</a>{{#if ../lineThrough}}</s>{{/if}}
+    {{#if lineThrough}}<s>{{/if}}<a href="tel:{{valueForLink}}" data-phone-number="{{valueForLink}}" data-action="dial">{{value}}</a>{{#if lineThrough}}</s>{{/if}}
     {{else}}
         {{#if valueIsSet}}{{{translate 'None'}}}{{else}}...{{/if}}
     {{/if}}

client/res/templates/fields/phone/list.tpl

@@ -1 +1,11 @@
-{{#if lineThrough}}<s>{{/if}}{{#unless isErased}}<a href="tel:{{valueForLink}}" data-phone-number="{{valueForLink}}" data-action="dial" title="{{value}}">{{/unless}}{{value}}{{#unless isErased}}</a>{{/unless}}{{#if lineThrough}}</s>{{/if}}
+{{#if lineThrough}}<s>{{/if}}
+{{#unless isErased}}
+<a
+    href="tel:{{valueForLink}}"
+    data-phone-number="{{valueForLink}}"
+    data-action="dial"
+    title="{{value}}"
+>
+{{/unless}}{{value}}
+{{#unless isErased}}</a>{{/unless}}
+{{#if lineThrough}}</s>{{/if}}

client/res/templates/header.tpl

@@ -5,10 +5,17 @@
     <div class="page-header-column-2">
         <div class="header-buttons btn-group pull-right">
             {{#each items.buttons}}
-                    <a {{#if link}}href="{{link}}"{{else}}href="javascript:"{{/if}} class="btn btn-{{#if style}}{{style}}{{else}}default{{/if}} action{{#if hidden}} hidden{{/if}}" data-name="{{name}}" data-action="{{action}}"{{#each data}} data-{{@key}}="{{./this}}"{{/each}}{{#if title}} title="{{title}}"{{/if}}>
-                    {{#if iconHtml}}{{{iconHtml}}}{{/if}}
-                    {{#if html}}{{{html}}}{{else}}{{translate label scope=../../scope}}{{/if}}
-                    </a>
+                <a
+                    {{#if link}}href="{{link}}"{{else}}href="javascript:"{{/if}}
+                    class="btn btn-{{#if style}}{{style}}{{else}}default{{/if}} action{{#if hidden}} hidden{{/if}}"
+                    data-name="{{name}}"
+                    data-action="{{action}}"
+                    {{#each data}} data-{{@key}}="{{./this}}"{{/each}}{{#if title}}
+                    title="{{title}}"{{/if}}
+                >
+                {{#if iconHtml}}{{{iconHtml}}}{{/if}}
+                {{#if html}}{{{html}}}{{else}}{{translate label scope=../scope}}{{/if}}
+                </a>
             {{/each}}
 
             {{#if items.actions}}
@@ -18,28 +25,44 @@
                 </button>
                 <ul class="dropdown-menu pull-right">
                     {{#each items.actions}}
-                    <li class="{{#if hidden}}hidden{{/if}}"><a {{#if link}}href="{{link}}"{{else}}href="javascript:"{{/if}} class="action" data-name="{{name}}" data-action="{{action}}"{{#each data}} data-{{@key}}="{{./this}}"{{/each}}>{{#if html}}{{{html}}}{{else}}{{translate label scope=../../../scope}}{{/if}}</a></li>
+                    <li class="{{#if hidden}}hidden{{/if}}">
+                        <a
+                            {{#if link}}href="{{link}}"{{else}}href="javascript:"{{/if}}
+                            class="action"
+                            data-name="{{name}}"
+                            data-action="{{action}}"
+                            {{#each data}} data-{{@key}}="{{./this}}"{{/each}}
+                        >{{#if html}}{{{html}}}{{else}}{{translate label scope=../scope}}{{/if}}</a></li>
                     {{/each}}
                 </ul>
                 </div>
             {{/if}}
 
             {{#if items.dropdown}}
-                <div class="btn-group dropdown-group{{#unless ../hasVisibleDropdownItems}} hidden{{/unless}}" role="group">
+                <div class="btn-group dropdown-group{{#unless hasVisibleDropdownItems}} hidden{{/unless}}" role="group">
                 <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
                     <span class="fas fa-ellipsis-h"></span>
                 </button>
                 <ul class="dropdown-menu pull-right">
                     {{#each items.dropdown}}
-                    {{#if this}}
-                    <li class="{{#if hidden}}hidden{{/if}}"><a {{#if link}}href="{{link}}"{{else}}href="javascript:"{{/if}} class="action" data-name="{{name}}" data-action="{{action}}"{{#each data}} data-{{@key}}="{{./this}}"{{/each}}>{{#if iconHtml}}{{{iconHtml}}} {{/if}}{{#if html}}{{{html}}}{{else}}{{translate label scope=../../../scope}}{{/if}}</a></li>
-                    {{else}}
-                        {{#unless @first}}
-                        {{#unless @last}}
-                        <li class="divider"></li>
-                        {{/unless}}
-                        {{/unless}}
-                    {{/if}}
+                        {{#if this}}
+                        <li class="{{#if hidden}}hidden{{/if}}">
+                            <a
+                                {{#if link}}href="{{link}}"{{else}}href="javascript:"{{/if}}
+                                class="action"
+                                data-name="{{name}}"
+                                data-action="{{action}}"
+                                {{#each data}} data-{{@key}}="{{./this}}"{{/each}}
+                            >
+                            {{#if iconHtml}}{{{iconHtml}}} {{/if}}
+                            {{#if html}}{{{html}}}{{else}}{{translate label scope=../scope}}{{/if}}</a></li>
+                        {{else}}
+                            {{#unless @first}}
+                            {{#unless @last}}
+                            <li class="divider"></li>
+                            {{/unless}}
+                            {{/unless}}
+                        {{/if}}
                     {{/each}}
                 </ul>
                 </div>

client/res/templates/import/step-2.tpl

@@ -19,7 +19,12 @@
                     </button>
                     <ul class="dropdown-menu pull-left">
                     {{#each fieldList}}
-                        <li><a href="javascript:" data-action="addField" data-name="{{./this}}">{{translate this scope=../scope category='fields'}}</a></li>
+                        <li>
+                            <a
+                                href="javascript:"
+                                data-action="addField"
+                                data-name="{{./this}}"
+                            >{{translate this scope=../scope category='fields'}}</a></li>
                     {{/each}}
                     </ul>
                 </div>

client/res/templates/modals/array-field-add.tpl

@@ -6,7 +6,7 @@
     <li class="list-group-item clearfix">
         <input class="cell" type="checkbox" data-value="{{./this}}">
         <a href="javascript:" class="add text-bold" data-value="{{./this}}">
-            {{#if ../translatedOptions}}{{prop ../../translatedOptions this}}{{else}}{{./this}}{{/if}}
+            {{#if ../translatedOptions}}{{prop ../translatedOptions this}}{{else}}{{./this}}{{/if}}
         </a>
     </li>
 {{/each}}

client/res/templates/modals/duplicate.tpl

@@ -5,7 +5,10 @@
     {{#each duplicates}}
         <tr>
             <td>
-                <a href="#{{#if _entityType}}{{_entityType}}{{else}}{{../../scope}}{{/if}}/view/{{id}}" target="_BLANK">{{name}}</a>
+                <a
+                    href="#{{#if _entityType}}{{_entityType}}{{else}}{{../scope}}{{/if}}/view/{{id}}"
+                    target="_BLANK"
+                >{{name}}</a>
                 {{#if _entityType}}({{translate _entityType category='scopeNames'}}){{/if}}
             </td>
         </tr>

client/res/templates/modals/mass-update.tpl

@@ -10,14 +10,14 @@
             tabindex="-1"
         >{{translate 'Add Field'}} <span class="caret"></span></button>
         <ul class="dropdown-menu pull-left filter-list">
-        {{#each ../fieldList}}
+        {{#each fieldList}}
             <li
                 data-name="{{./this}}"
             ><a
                 href="javascript:"
                 data-name="{{./this}}"
                 data-action="add-field"
-            >{{translate this scope=../../entityType category='fields'}}</a></li>
+            >{{translate this scope=../entityType category='fields'}}</a></li>
         {{/each}}
         </ul>
     </div>

client/res/templates/role/table-edit.tpl

@@ -22,13 +22,13 @@
                     </td>
 
                     {{#ifNotEqual type 'boolean'}}
-                        {{#each ../list}}
+                        {{#each list}}
                             <td>
                                 {{#if levelList}}
                                 <select name="{{name}}"
-                                    class="form-control scope-action{{#ifNotEqual ../../../access 'enabled'}} hidden{{/ifNotEqual}}"
-                                    data-scope="{{../../name}}"
-                                    {{#ifNotEqual ../../access 'enabled'}} disabled{{/ifNotEqual}}
+                                    class="form-control scope-action{{#ifNotEqual ../access 'enabled'}} hidden{{/ifNotEqual}}"
+                                    data-scope="{{../name}}"
+                                    {{#ifNotEqual ../access 'enabled'}} disabled{{/ifNotEqual}}
                                     title="{{translate action scope='Role' category='actions'}}"
                                     data-role-action="{{action}}">
                                 {{options levelList level field='levelList' scope='Role'}}
@@ -90,7 +90,8 @@
                                 data-field="{{../name}}"
                                 data-scope="{{../../name}}"
                                 data-action="{{name}}"
-                                title="{{translate name scope='Role' category='actions'}}">{{options ../../../fieldLevelList value scope='Role' field='accessList'}}</select>
+                                title="{{translate name scope='Role' category='actions'}}"
+                            >{{options ../../../fieldLevelList value scope='Role' field='accessList'}}</select>
                         </td>
                         {{/each}}
                         <td colspan="2">

client/res/templates/role/table.tpl

@@ -22,11 +22,11 @@
                     </td>
 
                     {{#ifNotEqual type 'boolean'}}
-                        {{#each ../list}}
+                        {{#each list}}
                             <td>
-                                {{#ifNotEqual ../../access 'not-set'}}
+                                {{#ifNotEqual access 'not-set'}}
                                     <span
-                                        style="color: {{prop ../../../../colors level}};"
+                                        style="color: {{prop ../../colors level}};"
                                         title="{{translate action scope='Role' category='actions'}}"
                                     >{{translateOption level field='levelList' scope='Role'}}</span>
                                 {{/ifNotEqual}}