rsanchez
2014-10-30 e2aa9b0177cdfeb9e3f26c511f541c37a03134aa
securis/src/main/resources/static/licenses.html
....@@ -294,8 +294,29 @@
294294 title="Total: {{p.num_licenses}}, available: {{p.num_available}}">{{p.num_licenses}}
295295 ({{p.num_available}})</td>
296296 <td>
297
- <span ng-click="editPack(p)" class="glyphicon glyphicon-pencil"></span>
298
- <span ng-if="Packs.isActionAvailable('delete', p)" ng-click="execute('delete', p)" class="glyphicon glyphicon-remove"></span>
297
+ <div class="dropdown">
298
+ <a class="dropdown-toggle" data-toggle="dropdown"> <span
299
+ class="glyphicon glyphicon-align-justify" style="color: {{Packs.getStatusColor(p.status)}}"></span>
300
+ <span style="color: {{Packs.getStatusColor(p.status)}}" class="caret"></span>
301
+ </a>
302
+ <ul class="dropdown-menu">
303
+ <li ng-if="Packs.isActionAvailable('edit', p)"><a
304
+ ng-click="editPack(p)"><span
305
+ class="glyphicon glyphicon-pencil"></span> <span i18n>Edit</span></a></li>
306
+ <li ng-if="Packs.isActionAvailable('activate', p)"><a
307
+ ng-click="execute('activate', p)"><span
308
+ class="glyphicon glyphicon-check"></span> <span i18n>Activate</span></a></li>
309
+ <li ng-if="Packs.isActionAvailable('putonhold', p)"><a
310
+ ng-click="execute('putonhold', p)"><span
311
+ class="glyphicon glyphicon-pause"></span> <span i18n>Put on hold</span></a></li>
312
+ <li ng-if="Packs.isActionAvailable('cancel', p)"><a
313
+ ng-click="execute('cancel', p)"><span
314
+ class="glyphicon glyphicon-ban-circle"></span> <span i18n>Cancel</span></a></li>
315
+ <li ng-if="Packs.isActionAvailable('delete', p)"><a
316
+ ng-click="execute('delete', p)"><span
317
+ class="glyphicon glyphicon-trash"></span> <span i18n>Delete</span></a></li>
318
+ </ul>
319
+ </div>
299320 </td>
300321 </tr>
301322 </tbody>
....@@ -566,11 +587,11 @@
566587 <span class="caret"></span>
567588 </button>
568589 <ul class="dropdown-menu" role="menu">
569
- <li ng-if="Licenses.isActionAvailable('activate', license)"><a ng-click="activateLicense(license)" href="#">Activate</a></li>
570
- <li ng-if="Licenses.isActionAvailable('download', license)"><a ng-click="downloadLicense(license)" href="#">Download</a></li>
571
- <li ng-if="Licenses.isActionAvailable('send', license)"><a ng-click="sendLicense(license)" href="#">Send by email</a></li>
572
- <li ng-if="Licenses.isActionAvailable('cancel', license)"><a ng-click="cancelLicense(license)" href="#">Invalidate</a></li>
573
- <li ng-if="Licenses.isActionAvailable('delete', license)"><a ng-click="removeLicense(license)" href="#">Delete</a></li>
590
+ <li ng-if="Licenses.isActionAvailable('activate', license)"><a ng-click="execute('activate', license)" href="#">Activate</a></li>
591
+ <li ng-if="Licenses.isActionAvailable('download', license)"><a ng-click="execute('download', license)" href="#">Download</a></li>
592
+ <li ng-if="Licenses.isActionAvailable('send', license)"><a ng-click="execute('send', license)" href="#">Send by email</a></li>
593
+ <li ng-if="Licenses.isActionAvailable('cancel', license)"><a ng-click="execute('cancel', license)" href="#">Cancel</a></li>
594
+ <li ng-if="Licenses.isActionAvailable('delete', license)"><a ng-click="execute('delete', license)" href="#">Delete</a></li>
574595 </ul>
575596
576597 </div>
....@@ -608,28 +629,33 @@
608629 <td>
609630 <div class="dropdown">
610631 <a class="dropdown-toggle" data-toggle="dropdown"> <span
611
- class="glyphicon glyphicon-align-justify"></span> <span
612
- class="caret"></span>
632
+ class="glyphicon glyphicon-align-justify" style="color: {{Licenses.getStatusColor(lic.status)}}"></span>
633
+ <span style="color: {{Licenses.getStatusColor(lic.status)}}" class="caret"></span>
613634 </a>
614635 <ul class="dropdown-menu">
615636 <li ng-if="Licenses.isActionAvailable('download', lic)"><a
616
- ng-click="downloadLicense(lic)"><span
637
+ ng-click="execute('download', lic)"><span
617638 class="glyphicon glyphicon-download"></span> <span i18n>Download</span></a></li>
618639 <li ng-if="Licenses.isActionAvailable('edit', lic)"><a
619640 ng-click="editLicense(lic)"><span
620641 class="glyphicon glyphicon-pencil"></span> <span i18n>Edit</span></a></li>
621642 <li ng-if="Licenses.isActionAvailable('activate', lic)"><a
622
- ng-click="activateLicense(lic)"><span
643
+ ng-click="execute('activate', lic)"><span
623644 class="glyphicon glyphicon-check"></span> <span i18n>Activate</span></a></li>
624645 <li ng-if="Licenses.isActionAvailable('send', lic)"><a
625
- ng-click="sendEmail(lic)"><span
626
- class="glyphicon glyphicon-send"></span> <span i18n>Send
627
- email</span></a></li>
646
+ ng-click="execute('send', lic)"><span
647
+ class="glyphicon glyphicon-send"></span> <span i18n>Send email</span></a></li>
648
+ <li ng-if="Licenses.isActionAvailable('block', lic)"><a
649
+ ng-click="execute('block', lic)"><span
650
+ class="glyphicon glyphicon-exclamation-sign"></span> <span i18n>Block</span></a></li>
651
+ <li ng-if="Licenses.isActionAvailable('unblock', lic)"><a
652
+ ng-click="execute('unblock', lic)"><span
653
+ class="glyphicon glyphicon-ok-sign"></span> <span i18n>Unblock</span></a></li>
628654 <li ng-if="Licenses.isActionAvailable('cancel', lic)"><a
629
- ng-click="deleteLicense(lic)"><span
655
+ ng-click="execute('cancel', lic)"><span
630656 class="glyphicon glyphicon-ban-circle"></span> <span i18n>Cancel</span></a></li>
631657 <li ng-if="Licenses.isActionAvailable('delete', lic)"><a
632
- ng-click="deleteLicense(lic)"><span
658
+ ng-click="execute('delete', lic)"><span
633659 class="glyphicon glyphicon-trash"></span> <span i18n>Delete</span></a></li>
634660 </ul>
635661 </div>