From e2aa9b0177cdfeb9e3f26c511f541c37a03134aa Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Thu, 30 Oct 2014 11:52:50 +0000
Subject: [PATCH] #2021 feature - Added menu color based on element status in packs and licenses listings
---
securis/src/main/resources/static/licenses.html | 58 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 42 insertions(+), 16 deletions(-)
diff --git a/securis/src/main/resources/static/licenses.html b/securis/src/main/resources/static/licenses.html
index a51263c..425a85e 100644
--- a/securis/src/main/resources/static/licenses.html
+++ b/securis/src/main/resources/static/licenses.html
@@ -294,8 +294,29 @@
title="Total: {{p.num_licenses}}, available: {{p.num_available}}">{{p.num_licenses}}
({{p.num_available}})</td>
<td>
- <span ng-click="editPack(p)" class="glyphicon glyphicon-pencil"></span>
- <span ng-if="Packs.isActionAvailable('delete', p)" ng-click="execute('delete', p)" class="glyphicon glyphicon-remove"></span>
+ <div class="dropdown">
+ <a class="dropdown-toggle" data-toggle="dropdown"> <span
+ class="glyphicon glyphicon-align-justify" style="color: {{Packs.getStatusColor(p.status)}}"></span>
+ <span style="color: {{Packs.getStatusColor(p.status)}}" class="caret"></span>
+ </a>
+ <ul class="dropdown-menu">
+ <li ng-if="Packs.isActionAvailable('edit', p)"><a
+ ng-click="editPack(p)"><span
+ class="glyphicon glyphicon-pencil"></span> <span i18n>Edit</span></a></li>
+ <li ng-if="Packs.isActionAvailable('activate', p)"><a
+ ng-click="execute('activate', p)"><span
+ class="glyphicon glyphicon-check"></span> <span i18n>Activate</span></a></li>
+ <li ng-if="Packs.isActionAvailable('putonhold', p)"><a
+ ng-click="execute('putonhold', p)"><span
+ class="glyphicon glyphicon-pause"></span> <span i18n>Put on hold</span></a></li>
+ <li ng-if="Packs.isActionAvailable('cancel', p)"><a
+ ng-click="execute('cancel', p)"><span
+ class="glyphicon glyphicon-ban-circle"></span> <span i18n>Cancel</span></a></li>
+ <li ng-if="Packs.isActionAvailable('delete', p)"><a
+ ng-click="execute('delete', p)"><span
+ class="glyphicon glyphicon-trash"></span> <span i18n>Delete</span></a></li>
+ </ul>
+ </div>
</td>
</tr>
</tbody>
@@ -566,11 +587,11 @@
<span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
- <li ng-if="Licenses.isActionAvailable('activate', license)"><a ng-click="activateLicense(license)" href="#">Activate</a></li>
- <li ng-if="Licenses.isActionAvailable('download', license)"><a ng-click="downloadLicense(license)" href="#">Download</a></li>
- <li ng-if="Licenses.isActionAvailable('send', license)"><a ng-click="sendLicense(license)" href="#">Send by email</a></li>
- <li ng-if="Licenses.isActionAvailable('cancel', license)"><a ng-click="cancelLicense(license)" href="#">Invalidate</a></li>
- <li ng-if="Licenses.isActionAvailable('delete', license)"><a ng-click="removeLicense(license)" href="#">Delete</a></li>
+ <li ng-if="Licenses.isActionAvailable('activate', license)"><a ng-click="execute('activate', license)" href="#">Activate</a></li>
+ <li ng-if="Licenses.isActionAvailable('download', license)"><a ng-click="execute('download', license)" href="#">Download</a></li>
+ <li ng-if="Licenses.isActionAvailable('send', license)"><a ng-click="execute('send', license)" href="#">Send by email</a></li>
+ <li ng-if="Licenses.isActionAvailable('cancel', license)"><a ng-click="execute('cancel', license)" href="#">Cancel</a></li>
+ <li ng-if="Licenses.isActionAvailable('delete', license)"><a ng-click="execute('delete', license)" href="#">Delete</a></li>
</ul>
</div>
@@ -608,28 +629,33 @@
<td>
<div class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown"> <span
- class="glyphicon glyphicon-align-justify"></span> <span
- class="caret"></span>
+ class="glyphicon glyphicon-align-justify" style="color: {{Licenses.getStatusColor(lic.status)}}"></span>
+ <span style="color: {{Licenses.getStatusColor(lic.status)}}" class="caret"></span>
</a>
<ul class="dropdown-menu">
<li ng-if="Licenses.isActionAvailable('download', lic)"><a
- ng-click="downloadLicense(lic)"><span
+ ng-click="execute('download', lic)"><span
class="glyphicon glyphicon-download"></span> <span i18n>Download</span></a></li>
<li ng-if="Licenses.isActionAvailable('edit', lic)"><a
ng-click="editLicense(lic)"><span
class="glyphicon glyphicon-pencil"></span> <span i18n>Edit</span></a></li>
<li ng-if="Licenses.isActionAvailable('activate', lic)"><a
- ng-click="activateLicense(lic)"><span
+ ng-click="execute('activate', lic)"><span
class="glyphicon glyphicon-check"></span> <span i18n>Activate</span></a></li>
<li ng-if="Licenses.isActionAvailable('send', lic)"><a
- ng-click="sendEmail(lic)"><span
- class="glyphicon glyphicon-send"></span> <span i18n>Send
- email</span></a></li>
+ ng-click="execute('send', lic)"><span
+ class="glyphicon glyphicon-send"></span> <span i18n>Send email</span></a></li>
+ <li ng-if="Licenses.isActionAvailable('block', lic)"><a
+ ng-click="execute('block', lic)"><span
+ class="glyphicon glyphicon-exclamation-sign"></span> <span i18n>Block</span></a></li>
+ <li ng-if="Licenses.isActionAvailable('unblock', lic)"><a
+ ng-click="execute('unblock', lic)"><span
+ class="glyphicon glyphicon-ok-sign"></span> <span i18n>Unblock</span></a></li>
<li ng-if="Licenses.isActionAvailable('cancel', lic)"><a
- ng-click="deleteLicense(lic)"><span
+ ng-click="execute('cancel', lic)"><span
class="glyphicon glyphicon-ban-circle"></span> <span i18n>Cancel</span></a></li>
<li ng-if="Licenses.isActionAvailable('delete', lic)"><a
- ng-click="deleteLicense(lic)"><span
+ ng-click="execute('delete', lic)"><span
class="glyphicon glyphicon-trash"></span> <span i18n>Delete</span></a></li>
</ul>
</div>
--
Gitblit v1.3.2