Skip to content
This repository has been archived by the owner on Jan 21, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/141'
Browse files Browse the repository at this point in the history
Close #141
  • Loading branch information
weierophinney committed Sep 10, 2018
2 parents 6b73192 + b1dd357 commit 0517232
Show file tree
Hide file tree
Showing 7 changed files with 44 additions and 9 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,17 @@

All notable changes to this project will be documented in this file, in reverse chronological order by release.

## 1.3.10 - TBD
## 1.3.10 - 2018-09-10

### Added

- Nothing.

### Changed

- [#141](https://github.com/zfcampus/zf-apigility-admin-ui/pull/141) makes the "Delete all files..." text of modal dialogs clickable,
making it easier to select the checkbox.

### Deprecated

- Nothing.
Expand Down

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

<script src="apigility-ui/477598fe.vendor.js" charset="utf-8"></script>

<script src="apigility-ui/9f1d69a2.apigility.js" charset="utf-8"></script>
<script src="apigility-ui/96aca930.apigility.js" charset="utf-8"></script>

<script>
$(document).ready(function () {
Expand Down
7 changes: 6 additions & 1 deletion src/apigility-ui/modal/delete-api.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@ <h4 class="modal-title" id="myModalDeleteService"><span class="glyphicon glyphic
<p>By default, deleting the API only removes the API module from the application configuration.
You can re-enable it by re-adding the module to your application configuration at a later date.</p>

<p><input type="checkbox" ng-model="vm.recursive" ng-disabled="vm.loading"> Delete all files associated with this API?</p>
<p>
<label>
<input type="checkbox" ng-model="vm.recursive" ng-disabled="vm.loading">
Delete all files associated with this API?
</label>
</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" ng-click="vm.cancel()" ng-disabled="vm.loading">No</button>
Expand Down
7 changes: 6 additions & 1 deletion src/apigility-ui/modal/delete-rest.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@ <h4 class="modal-title" id="myModalDeleteService"><span class="glyphicon glyphic
</div>
<div class="modal-body">
<p class="modal_msg">Are you sure to delete the REST service <strong>{{vm.restName}}</strong>?</p>
<p><input type="checkbox" ng-model="vm.recursive" ng-disabled="vm.loading"> Delete all files and directories for this service</p>
<p>
<label>
<input type="checkbox" ng-model="vm.recursive" ng-disabled="vm.loading">
Delete all files and directories for this service
</label>
</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" ng-click="vm.cancel()">No</button>
Expand Down
7 changes: 6 additions & 1 deletion src/apigility-ui/modal/delete-rpc.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@ <h4 class="modal-title" id="myModalDeleteService"><span class="glyphicon glyphic
</div>
<div class="modal-body">
<p class="modal_msg">Are you sure to delete the RPC service <strong>{{vm.rpcName}}</strong>?</p>
<p><input type="checkbox" ng-model="vm.recursive" ng-disabled="vm.loading"> Delete all files and directories for this service</p>
<p>
<label>
<input type="checkbox" ng-model="vm.recursive" ng-disabled="vm.loading">
Delete all files and directories for this service
</label>
</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" ng-click="vm.cancel()">No</button>
Expand Down
21 changes: 18 additions & 3 deletions src/apigility-ui/templates.js
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,12 @@ angular.module("apigility-ui/modal/delete-api.html", []).run(["$templateCache",
" <p>By default, deleting the API only removes the API module from the application configuration.\n" +
" You can re-enable it by re-adding the module to your application configuration at a later date.</p>\n" +
"\n" +
" <p><input type=\"checkbox\" ng-model=\"vm.recursive\" ng-disabled=\"vm.loading\"> Delete all files associated with this API?</p>\n" +
" <p>\n" +
" <label>\n" +
" <input type=\"checkbox\" ng-model=\"vm.recursive\" ng-disabled=\"vm.loading\">\n" +
" Delete all files associated with this API?\n" +
" </label>\n" +
" </p>\n" +
"</div>\n" +
"<div class=\"modal-footer\">\n" +
" <button type=\"button\" class=\"btn btn-default\" ng-click=\"vm.cancel()\" ng-disabled=\"vm.loading\">No</button>\n" +
Expand Down Expand Up @@ -840,7 +845,12 @@ angular.module("apigility-ui/modal/delete-rest.html", []).run(["$templateCache",
"</div>\n" +
"<div class=\"modal-body\">\n" +
" <p class=\"modal_msg\">Are you sure to delete the REST service <strong>{{vm.restName}}</strong>?</p>\n" +
" <p><input type=\"checkbox\" ng-model=\"vm.recursive\" ng-disabled=\"vm.loading\"> Delete all files and directories for this service</p>\n" +
" <p>\n" +
" <label>\n" +
" <input type=\"checkbox\" ng-model=\"vm.recursive\" ng-disabled=\"vm.loading\">\n" +
" Delete all files and directories for this service\n" +
" </label>\n" +
" </p>\n" +
"</div>\n" +
"<div class=\"modal-footer\">\n" +
" <button type=\"button\" class=\"btn btn-default\" ng-click=\"vm.cancel()\">No</button>\n" +
Expand All @@ -856,7 +866,12 @@ angular.module("apigility-ui/modal/delete-rpc.html", []).run(["$templateCache",
"</div>\n" +
"<div class=\"modal-body\">\n" +
" <p class=\"modal_msg\">Are you sure to delete the RPC service <strong>{{vm.rpcName}}</strong>?</p>\n" +
" <p><input type=\"checkbox\" ng-model=\"vm.recursive\" ng-disabled=\"vm.loading\"> Delete all files and directories for this service</p>\n" +
" <p>\n" +
" <label>\n" +
" <input type=\"checkbox\" ng-model=\"vm.recursive\" ng-disabled=\"vm.loading\">\n" +
" Delete all files and directories for this service\n" +
" </label>\n" +
" </p>\n" +
"</div>\n" +
"<div class=\"modal-footer\">\n" +
" <button type=\"button\" class=\"btn btn-default\" ng-click=\"vm.cancel()\">No</button>\n" +
Expand Down

0 comments on commit 0517232

Please sign in to comment.