Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use images for black/white list 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1393310 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-10-03 06:38:23 +00:00
parent ac900f8e4b
commit 5e282f9cbb
2 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors-rules.js
View File

@ -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",["jquery","i18n","jquery.tmpl","bootstra
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",["jquery","i18n","jquery.tmpl","bootstra
}
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",["jquery","i18n","jquery.tmpl","bootstra
},
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",["jquery","i18n","jquery.tmpl","bootstra
self.modified(true);
});
this.ruleType=null;
//private ProxyConnectorRuleType proxyConnectorRuleType;
this.proxyConnectorRuleType=ko.observable(proxyConnectorRuleType);
@ -223,6 +238,8 @@ define("archiva.proxy-connectors-rules",["jquery","i18n","jquery.tmpl","bootstra
this.proxyConnectors.subscribe(function(newValue){
self.modified(true);
});
this.ruleType=null;
}
mapProxyConnectorRule=function(data){
@ -261,9 +278,10 @@ define("archiva.proxy-connectors-rules",["jquery","i18n","jquery.tmpl","bootstra
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;
}
});

6
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
View File

@ -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>