Author: olamy
Date: Wed Oct 3 06:38:23 2012
New Revision: 1393310
URL: http://svn.apache.org/viewvc?rev=1393310&view=rev
Log:
use images for black/white list
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors-rules.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors-rules.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors-rules.js?rev=1393310&r1=1393309&r2=1393310&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors-rules.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors-rules.js
Wed Oct 3 06:38:23 2012
@@ -19,20 +19,32 @@
define("archiva.proxy-connectors-rules",["jquery","i18n","jquery.tmpl","bootstrap","jquery.ui","knockout"
,"knockout.simpleGrid","knockout.sortable","archiva.proxy-connectors"],
function() {
-
-
ProxyConnectorRulesViewModel=function(proxyConnectorRules,proxyConnectors){
var self=this;
- this.proxyConnectorRules=ko.observableArray(proxyConnectorRules);
+
this.proxyConnectorRules=ko.observableArray(proxyConnectorRules?proxyConnectorRules:[]);
this.proxyConnectors=proxyConnectors;
// FIXME get that from a REST service
// FIXME i18n
- this.ruleTypes=[new RuleType("WHITE_LIST"," white list"),new
RuleType("BLACK_LIST"," black list")];
+ this.ruleTypes=[new RuleType("BLACK_LIST","Black
list","images/red-22-22.png"),new RuleType("WHITE_LIST","White
list","images/green-22-22.png")];
+
+ this.findRuleType=function(proxyConnectorRule){
+ var ruleType;
+ $.each(self.ruleTypes, function(index, value) {
+ if(value.type==proxyConnectorRule.proxyConnectorRuleType()){
+ ruleType=value;
+ }
+ });
+ return ruleType;
+ }
this.displayGrid=function(){
var mainContent = $("#main-content");
+ $.each(self.proxyConnectorRules(), function(index, value) {
+ value.ruleType=self.findRuleType(value);
+ });
+
this.gridViewModel = new ko.simpleGrid.viewModel({
data: self.proxyConnectorRules,
pageSize: 5,
@@ -78,6 +90,8 @@ define("archiva.proxy-connectors-rules",
displaySuccessMessage(message);
proxyConnectorRule.modified(false);
if(add){
+ // add rule type for image
+
proxyConnectorRule.ruleType=self.findRuleType(proxyConnectorRule);
self.proxyConnectorRules.push(proxyConnectorRule);
}
activateProxyConnectorRulesGridTab();
@@ -108,7 +122,7 @@ define("archiva.proxy-connectors-rules",
}
this.deleteProxyConnectorRule=function(proxyConnectorRule){
- //$("#proxy-connector-rule-delete-btn" ).button("loading");
+ $("#main-content"
).find("proxy-connectors-rules-view-tabsTable").find(".btn").button("loading");
$("#user-messages" ).html(mediumSpinnerImg());
$.ajax("restServices/archivaServices/proxyConnectorRuleService/deleteProxyConnectorRule",
{
@@ -127,7 +141,7 @@ define("archiva.proxy-connectors-rules",
},
complete:function(data){
removeMediumSpinnerImg("#user-messages");
- //$("#proxy-connector-rule-delete-btn" ).button("reset");
+ $("#main-content"
).find("proxy-connectors-rules-view-tabsTable").find(".btn").button("reset");
}
}
);
@@ -211,6 +225,7 @@ define("archiva.proxy-connectors-rules",
self.modified(true);
});
+ this.ruleType=null;
//private ProxyConnectorRuleType proxyConnectorRuleType;
this.proxyConnectorRuleType=ko.observable(proxyConnectorRuleType);
@@ -223,6 +238,8 @@ define("archiva.proxy-connectors-rules",
this.proxyConnectors.subscribe(function(newValue){
self.modified(true);
});
+
+ this.ruleType=null;
}
mapProxyConnectorRule=function(data){
@@ -261,9 +278,10 @@ define("archiva.proxy-connectors-rules",
mainContent.find("#proxy-connectors-rules-view-tabs-edit").addClass("active");
}
- RuleType=function(type,label){
+ RuleType=function(type,label,image){
this.type=type;
this.label=label;
+ this.image=image;
}
});
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html?rev=1393310&r1=1393309&r2=1393310&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
Wed Oct 3 06:38:23 2012
@@ -1287,7 +1287,7 @@
{{each(i, row) itemsOnCurrentPage()}}
<tr data-bind="css:{ 'modified': row.modified()}">
<td>${row.pattern()}</td>
- <td>${row.proxyConnectorRuleType()}</td>
+ <td><img src="${row.ruleType.image}"
title="${row.ruleType.label}"></img></td>
<td>
<ul>
{{each(j,proxyConnector) row.proxyConnectors()}}
@@ -1297,14 +1297,14 @@
</td>
<td>
<a href="#" data-bind="click: function(){
editProxyConnectorRule(row) }">
- <span class="btn btn-primary">
+ <span class="btn btn-primary"
data-loading-text="${$.i18n.prop('common.loading')}">
<i class="icon-pencil icon-white"/>
</span>
</a>
</td>
<td>
<a data-bind="click: function(){ removeProxyConnectorRule(row)
}" data-loading-text="${$.i18n.prop('common.loading')}">
- <span class="btn btn-danger">
+ <span class="btn btn-danger"
data-loading-text="${$.i18n.prop('common.loading')}">
<i class="icon-trash icon-white"/>
</span>
</a>
