Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HW-381: Added container block to wrap elements #11096

Merged
merged 2 commits into from
Oct 11, 2017
Merged

HW-381: Added container block to wrap elements #11096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fdf0906
HW-381: Added container block to wrap elements
mukeshcompucorp Oct 10, 2017
d52c94b
HW:381/HW-382: Removed extra buttons from UI
mukeshcompucorp Oct 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions ang/crmCaseType/edit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,6 @@ <h1 crm-page-title>{{caseType.title || ts('New Case Type')}}</h1>
<div class="help">
{{ts('Use this screen to define or update the Case Roles, Activity Types, and Timelines for a case type.')}} <a href="https://docs.civicrm.org/user/en/stable/case-management/set-up/" target="_blank">{{ts('Learn more...')}}</a>
</div>
<div class="crm-submit-buttons">
<button crm-icon="fa-check" ng-click="editCaseTypeForm.$setPristine(); save()" ng-disabled="editCaseTypeForm.$invalid">
{{ts('Save')}}
</button>
<button crm-icon="fa-times" ng-click="editCaseTypeForm.$setPristine(); goto('caseType')">
{{ts('Cancel')}}
</button>
</div>

<div ng-include="'~/crmCaseType/caseTypeDetails.html'"></div>

Expand Down
130 changes: 66 additions & 64 deletions ang/crmCaseType/list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,72 +4,74 @@
-->
<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>
1 change: 0 additions & 1 deletion templates/CRM/Admin/Form/Setting/Case.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>