HW-381: Added container block to wrap elements

diff --git a/ang/crmCaseType/list.html b/ang/crmCaseType/list.html
index 832a4d40739bd18d194ecb24bf01ff8276d71275..58c6fe1d40290eac54ed5844eb3e3848090dadea 100644 (file)
--- a/ang/crmCaseType/list.html
+++ b/ang/crmCaseType/list.html
@@ -4,72 +4,74 @@ Required vars: caseTypes
 -->
 <h1 crm-page-title>{{ts('Case Types')}}</h1>
 
-<div class="help">
-  {{ts('A Case Type describes a group of related tasks, interactions, or processes.')}}
-</div>
+<div class="crm-content-block crm-block">
+  <div class="help">
+    {{ts('A Case Type describes a group of related tasks, interactions, or processes.')}}
+  </div>
 
-<table class="display">
-  <thead>
-  <tr>
-    <th>{{ts('Title')}}</th>
-    <th>{{ts('Name')}}</th>
-    <th>{{ts('Description')}}</th>
-    <th>{{ts('Enabled?')}}</th>
-    <th></th>
-  </tr>
-  </thead>
-  <tbody>
-  <tr ng-repeat="caseType in caseTypes"
-      class="crm-entity"
-      ng-class-even="'even-row even'"
-      ng-class-odd="'odd-row odd'"
-      ng-class="{disabled: 0==caseType.is_active, forked: 1==caseType.is_forked}">
-    <td>{{caseType.title}}</td>
-    <td>{{caseType.name}}</td>
-    <td>{{caseType.description}}</td>
-    <td>{{caseType.is_active == 1 ? ts('Yes') : ts('No')}}</td>
-    <!-- FIXME: Can't figure out how styling in other tables gets the nowrap effect... in absence of a consistent fix, KISS -->
-    <td style="white-space: nowrap">
-      <span>
-        <a class="action-item crm-hover-button" ng-href="#/caseType/{{caseType.id}}">{{ts('Edit')}}</a>
+  <table class="display">
+    <thead>
+    <tr>
+      <th>{{ts('Title')}}</th>
+      <th>{{ts('Name')}}</th>
+      <th>{{ts('Description')}}</th>
+      <th>{{ts('Enabled?')}}</th>
+      <th></th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr ng-repeat="caseType in caseTypes"
+        class="crm-entity"
+        ng-class-even="'even-row even'"
+        ng-class-odd="'odd-row odd'"
+        ng-class="{disabled: 0==caseType.is_active, forked: 1==caseType.is_forked}">
+      <td>{{caseType.title}}</td>
+      <td>{{caseType.name}}</td>
+      <td>{{caseType.description}}</td>
+      <td>{{caseType.is_active == 1 ? ts('Yes') : ts('No')}}</td>
+      <!-- FIXME: Can't figure out how styling in other tables gets the nowrap effect... in absence of a consistent fix, KISS -->
+      <td style="white-space: nowrap">
+        <span>
+          <a class="action-item crm-hover-button" ng-href="#/caseType/{{caseType.id}}">{{ts('Edit')}}</a>
 
-        <span class="btn-slide crm-hover-button">
-          {{ts('more')}}
-          <ul class="panel" style="display: none;">
-            <li ng-hide="caseType.is_active">
-              <a class="action-item crm-hover-button" ng-click="toggleCaseType(caseType)">
-                {{ts('Enable')}}
-              </a>
-            </li>
-            <li ng-show="caseType.is_active">
-              <a class="action-item crm-hover-button"
-                 crm-confirm="{type: 'disable', obj: caseType}"
-                 on-yes="toggleCaseType(caseType)">
-                {{ts('Disable')}}
-              </a>
-            </li>
-            <li ng-show="caseType.is_forked">
-              <a class="action-item crm-hover-button"
-                 crm-confirm="{type: 'revert', obj: caseType}"
-                 on-yes="revertCaseType(caseType)">
-                {{ts('Revert')}}
-              </a>
-            </li>
-            <li>
-              <a class="action-item crm-hover-button"
-                 crm-confirm="{type: 'delete', obj: caseType}"
-                 on-yes="deleteCaseType(caseType)">
-                {{ts('Delete')}}
-              </a>
-            </li>
-          </ul>
+          <span class="btn-slide crm-hover-button">
+            {{ts('more')}}
+            <ul class="panel" style="display: none;">
+              <li ng-hide="caseType.is_active">
+                <a class="action-item crm-hover-button" ng-click="toggleCaseType(caseType)">
+                  {{ts('Enable')}}
+                </a>
+              </li>
+              <li ng-show="caseType.is_active">
+                <a class="action-item crm-hover-button"
+                   crm-confirm="{type: 'disable', obj: caseType}"
+                   on-yes="toggleCaseType(caseType)">
+                  {{ts('Disable')}}
+                </a>
+              </li>
+              <li ng-show="caseType.is_forked">
+                <a class="action-item crm-hover-button"
+                   crm-confirm="{type: 'revert', obj: caseType}"
+                   on-yes="revertCaseType(caseType)">
+                  {{ts('Revert')}}
+                </a>
+              </li>
+              <li>
+                <a class="action-item crm-hover-button"
+                   crm-confirm="{type: 'delete', obj: caseType}"
+                   on-yes="deleteCaseType(caseType)">
+                  {{ts('Delete')}}
+                </a>
+              </li>
+            </ul>
+          </span>
         </span>
-      </span>
-    </td>
-  </tr>
-  </tbody>
-</table>
+      </td>
+    </tr>
+    </tbody>
+  </table>
 
-<div class="crm-submit-buttons">
-  <a ng-href="#/caseType/new" class="button"><span><i class="crm-i fa-plus-circle"></i> {{ts('New Case Type')}}</span></a>
+  <div class="crm-submit-buttons">
+    <a ng-href="#/caseType/new" class="button"><span><i class="crm-i fa-plus-circle"></i> {{ts('New Case Type')}}</span></a>
+  </div>
 </div>

diff --git a/templates/CRM/Admin/Form/Setting/Case.tpl b/templates/CRM/Admin/Form/Setting/Case.tpl
index e18cf987b1299b1b3bc5d5c335b33b7bab1d4270..820f2607d54cb9229212c924e2fcfbf262f840ac 100644 (file)
--- a/templates/CRM/Admin/Form/Setting/Case.tpl
+++ b/templates/CRM/Admin/Form/Setting/Case.tpl
@@ -55,5 +55,4 @@
     </tr>
   </table>
   <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
-  <div class="spacer"></div>
 </div>