You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2013/10/10 00:18:36 UTC
svn commit: r1530811 - in /archiva/trunk/archiva-modules/archiva-web:
archiva-web-common/src/main/resources/org/apache/archiva/i18n/
archiva-webapp/src/main/webapp/js/archiva/admin/repository/maven2/
archiva-webapp/src/main/webapp/js/templates/archiva/
Author: olamy
Date: Wed Oct 9 22:18:36 2013
New Revision: 1530811
URL: http://svn.apache.org/r1530811
Log:
[MRM-1783] The words "choosen" and "availables" used within the Users Runtime Configuration
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/maven2/proxy-connectors-rules.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/maven2/repository-groups.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/repositories.html
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties?rev=1530811&r1=1530810&r2=1530811&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties Wed Oct 9 22:18:36 2013
@@ -654,7 +654,7 @@ ldap.bind.authenticator.enabled.help.con
ldap.bind.authenticator.allowEmptyPasswords.help.content=Allow to use empty password with Ldap authenticator.
redback.runtime.properties.key.label=Key
redback.runtime.properties.value.label=Value
-redback.runtime.user-managers.impls.choosed=UserManager(s) choosen
+redback.runtime.user-managers.impls.chose=UserManager(s) chosen
redback.runtime.user-managers.impls.available=UserManager(s) availables
redback.runtime.ldap.verified=Ldap connection verified.
redback.runtime.ldap.checkModification=Verify LDAP changes.
@@ -665,7 +665,7 @@ redback.runtime.users.cache.title=Users
archiva.redback.rbacmanager.ldap=LDAP RBac Manager
archiva.redback.rbacmanager.jdo=Database RBac Manager
archiva.redback.rbacmanager.cached=Cached RBac Manager
-redback.runtime.rbac-managers.impls.choosed=RbacManager(s) choosen
+redback.runtime.rbac-managers.impls.chose=RbacManager(s) chosen
redback.runtime.rbac-managers.impls.available=RbacManager(s) availables
redback.runtime.ldap.writable.label=Writable LDAP
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/maven2/proxy-connectors-rules.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/maven2/proxy-connectors-rules.js?rev=1530811&r1=1530810&r2=1530811&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/maven2/proxy-connectors-rules.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/maven2/proxy-connectors-rules.js Wed Oct 9 22:18:36 2013
@@ -173,7 +173,7 @@ define("archiva/admin/repository/maven2/
var proxyConnectorRuleViewModel=new ProxyConnectorRuleViewModel(proxyConnectorRule,self,true);
ko.applyBindings(proxyConnectorRuleViewModel,$("#main-content").find("#proxy-connector-rules-edit" ).get(0));
activateProxyConnectorRulesEditTab();
- proxyConnectorRuleViewModel.activateRemoveChoosen(self);
+ proxyConnectorRuleViewModel.activateRemoveChosen(self);
proxyConnectorRuleViewModel.activateRemoveAvailable(self);
}
@@ -208,7 +208,7 @@ define("archiva/admin/repository/maven2/
proxyConnectorMoved=function(arg){
$.log("repositoryMoved:"+arg.sourceIndex+" to " + arg.targetIndex);
self.proxyConnectorRule.modified(true);
- self.activateRemoveChoosen(self.proxyConnectorRulesViewModel);
+ self.activateRemoveChosen(self.proxyConnectorRulesViewModel);
self.activateRemoveAvailable(self.proxyConnectorRulesViewModel);
}
@@ -216,8 +216,8 @@ define("archiva/admin/repository/maven2/
self.proxyConnectorRulesViewModel.saveProxyConnectorRule(self.proxyConnectorRule)
}
- this.removeChoosen=function(proxyConnectorRulesViewModel,sourceRepoId,targetRepoId){
- $.log("removeChoosen:"+sourceRepoId+":"+targetRepoId);
+ this.removeChosen=function(proxyConnectorRulesViewModel,sourceRepoId,targetRepoId){
+ $.log("removeChosen:"+sourceRepoId+":"+targetRepoId);
$.log("size before:"+self.proxyConnectorRule.proxyConnectors().length);
var proxyConnectorToRemove=null;
@@ -237,9 +237,9 @@ define("archiva/admin/repository/maven2/
mainContent.find("#proxy-connectors-rules-edit-order-div" ).find("[data-source-repoId="+sourceRepoId+"][data-target-repoId="+targetRepoId+"]" ).off("click");
}
- this.activateRemoveChoosen=function(proxyConnectorRulesViewModel){
+ this.activateRemoveChosen=function(proxyConnectorRulesViewModel){
$("#main-content" ).find("#proxy-connectors-rules-edit-order-div" ).find(".icon-minus-sign" ).on("click", function(){
- self.removeChoosen(proxyConnectorRulesViewModel,$(this).attr("data-source-repoId"),$(this).attr("data-target-repoId"));
+ self.removeChosen(proxyConnectorRulesViewModel,$(this).attr("data-source-repoId"),$(this).attr("data-target-repoId"));
});
}
@@ -260,7 +260,7 @@ define("archiva/admin/repository/maven2/
$.log("size after:"+self.availableProxyConnectors().length);
var mainContent=$("#main-content");
mainContent.find("#proxy-connectors-rules-edit-order-div" ).find("[data-source-repoId="+sourceRepoId+"][data-target-repoId="+targetRepoId+"]" ).on("click", function(){
- self.removeChoosen(proxyConnectorRulesViewModel,$(this).attr("data-source-repoId"),$(this).attr("data-target-repoId"));
+ self.removeChosen(proxyConnectorRulesViewModel,$(this).attr("data-source-repoId"),$(this).attr("data-target-repoId"));
});
mainContent.find("#proxy-connectors-rules-available-proxy-connectors" ).find("[data-source-repoId="+sourceRepoId+"][data-target-repoId="+targetRepoId+"]" ).off("click");
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/maven2/repository-groups.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/maven2/repository-groups.js?rev=1530811&r1=1530810&r2=1530811&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/maven2/repository-groups.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/maven2/repository-groups.js Wed Oct 9 22:18:36 2013
@@ -73,7 +73,7 @@ function(jquery,i18n,jqueryTmpl,bootstra
mainContent.find("#repository-groups-edit-available-repositories").find(".icon-plus-sign" ).off("click");
mainContent.find("#repository-groups-edit-order-div").find(".icon-minus-sign" ).off("click");
self.renderSortableAvailables(self.repositoryGroupsViewModel);
- self.renderSortableChoosed(self.repositoryGroupsViewModel);
+ self.renderSortableChosed(self.repositoryGroupsViewModel);
}
this.saveRepositoryGroup=function(repositoryGroup){
@@ -105,7 +105,7 @@ function(jquery,i18n,jqueryTmpl,bootstra
$("#main-content").find("#repository-groups-edit-order-div").find("#minus-"+idVal ).on("click",function(){
var idVal = $(this).attr("id");
idVal=idVal.substringAfterFirst("minus-");
- self.removeChoosed(idVal);
+ self.removeChosed(idVal);
});
}
@@ -117,7 +117,7 @@ function(jquery,i18n,jqueryTmpl,bootstra
});
}
- this.removeChoosed=function(idVal){
+ this.removeChosed=function(idVal){
for (var i=0;i<self.repositoryGroupsViewModel.managedRepositories().length;i++){
if(self.repositoryGroupsViewModel.managedRepositories()[i].id()==idVal){
self.availableRepositories.push(repositoryGroupsViewModel.managedRepositories()[i]);
@@ -137,11 +137,11 @@ function(jquery,i18n,jqueryTmpl,bootstra
});
}
- this.renderSortableChoosed=function(repositoryGroupsViewModel){
+ this.renderSortableChosed=function(repositoryGroupsViewModel){
$("#main-content").find("#repository-groups-edit-order-div").find(".icon-minus-sign" ).on("click",function(){
var idVal = $(this).attr("id");
idVal=idVal.substringAfterFirst("minus-");
- self.removeChoosed(idVal);
+ self.removeChosed(idVal);
});
}
}
@@ -197,7 +197,7 @@ function(jquery,i18n,jqueryTmpl,bootstra
repositoryGroupViewModel.applicationUrl=applicationUrl;
activateRepositoryGroupEditTab();
ko.applyBindings(repositoryGroupViewModel,mainContent.find("#repository-groups-edit" ).get(0));
- repositoryGroupViewModel.renderSortableChoosed(self);
+ repositoryGroupViewModel.renderSortableChosed(self);
repositoryGroupViewModel.renderSortableAvailables(self);
mainContent.find("#repository-groups-view-tabs-li-edit" ).find("a").html($.i18n.prop("edit"));
repositoryGroupValidator();
@@ -324,7 +324,7 @@ function(jquery,i18n,jqueryTmpl,bootstra
activateRepositoryGroupEditTab();
ko.applyBindings(repositoryGroupViewModel,mainContent.find("#repository-groups-edit" ).get(0));
- repositoryGroupViewModel.renderSortableChoosed(self.repositoryGroupsViewModel);
+ repositoryGroupViewModel.renderSortableChosed(self.repositoryGroupsViewModel);
repositoryGroupViewModel.renderSortableAvailables(self.repositoryGroupsViewModel);
}
if ($(e.target).attr("href")=="#repository-groups-view") {
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html?rev=1530811&r1=1530810&r2=1530811&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/general-admin.html Wed Oct 9 22:18:36 2013
@@ -986,8 +986,8 @@
<div class="well">
<div class="row-fluid">
<div class="span4 dotted">
- <h5>${$.i18n.prop('redback.runtime.user-managers.impls.choosed')}</h5>
- <div style="min-height: 40px" id="user-mananagers-sortables-choosed"
+ <h5>${$.i18n.prop('redback.runtime.user-managers.impls.chose')}</h5>
+ <div style="min-height: 40px" id="user-mananagers-sortables-chose"
data-bind="sortable: { template: 'redback-runtime-general-content-impl-informations', data:usedUserManagerImpls,afterMove: userManagerImplMoved}">
</div>
</div>
@@ -1003,8 +1003,8 @@
<div class="well">
<div class="row-fluid">
<div class="span4 dotted">
- <h5>${$.i18n.prop('redback.runtime.rbac-managers.impls.choosed')}</h5>
- <div style="min-height: 40px" id="rbac-mananagers-sortables-choosed"
+ <h5>${$.i18n.prop('redback.runtime.rbac-managers.impls.chose')}</h5>
+ <div style="min-height: 40px" id="rbac-mananagers-sortables-chose"
data-bind="sortable: { template: 'redback-runtime-general-content-impl-informations', data:usedRbacManagerImpls,afterMove: rbacManagerImplMoved}">
</div>
</div>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/repositories.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/repositories.html?rev=1530811&r1=1530810&r2=1530811&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/repositories.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/repositories.html Wed Oct 9 22:18:36 2013
@@ -1318,7 +1318,7 @@
<div class="span6 dotted">
<div id="repository-groups-edit-div" data-bind='template:{name:"repository-group-edit-tmpl"}'></div>
<div id="repository-groups-edit-order-div" style="min-height: 80px"
- data-bind="sortable: { template: 'repository-group-edit-order-tmpl-choosed',data:repositoryGroup.managedRepositories,afterMove:repositoryMoved}">
+ data-bind="sortable: { template: 'repository-group-edit-order-tmpl-chose',data:repositoryGroup.managedRepositories,afterMove:repositoryMoved}">
</div>
</div>
@@ -1339,7 +1339,7 @@
</div>
</script>
-<script id="repository-group-edit-order-tmpl-choosed" type="text/html">
+<script id="repository-group-edit-order-tmpl-chose" type="text/html">
<div class="well draggable-item">
<span class="pull-right">
<i class="icon-minus-sign cursor-hand" id="minus-${$data.id()}"/>
@@ -1540,7 +1540,7 @@
<div id="proxy-connectors-rules-edit-div"
data-bind='template:{name:"proxy-connectors-rules-edit-tmpl"}'></div>
<div id="proxy-connectors-rules-edit-order-div" style="min-height: 80px"
- data-bind="sortable: { template: 'proxy-connectors-rules-edit-proxy-connectors-tmpl-choosen',data:proxyConnectorRule.proxyConnectors,afterMove:proxyConnectorMoved}">
+ data-bind="sortable: { template: 'proxy-connectors-rules-edit-proxy-connectors-tmpl-chosen',data:proxyConnectorRule.proxyConnectors,afterMove:proxyConnectorMoved}">
</div>
</div>
@@ -1670,7 +1670,7 @@
</div>
</script>
-<script id="proxy-connectors-rules-edit-proxy-connectors-tmpl-choosen" type="text/html">
+<script id="proxy-connectors-rules-edit-proxy-connectors-tmpl-chosen" type="text/html">
<div class="well draggable-item">
<i class="icon-minus-sign cursor-hand pull-right" data-source-repoId="${$data.sourceRepoId()}"
data-target-repoId="${$data.targetRepoId()}"/>