From b48279b3d840201ccfadd1be9a20c705d42d8067 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 14 Feb 2012 08:20:58 +0000 Subject: [PATCH] use an icon for edit link in grids git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1243819 13f79535-47bb-0310-9956-ffa450edef68 --- .../webapp/js/archiva/repository-groups.js | 60 +++++++++++++-- .../js/archiva/templates/network-proxies.html | 4 +- .../archiva/templates/proxy-connectors.html | 4 +- .../js/archiva/templates/repositories.html | 14 +++- .../archiva/templates/repository-groups.html | 76 ++++++++++++++----- .../js/redback/templates/roles-tmpl.html | 4 +- .../js/redback/templates/user-grids.html | 6 +- 7 files changed, 134 insertions(+), 34 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js index fb2bd9f41..8d1b9195b 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js @@ -33,24 +33,51 @@ $(function() { this.modified=ko.observable(false); } - RepositoryGroupViewModel=function(){ + RepositoryGroupViewModel=function(repositoryGroup,update,repositoryGroupsViewModel){ + this.repositoryGroup=repositoryGroup; + this.update=update; + this.repositoryGroupsViewModel=null; + } + + RepositoryGroupsViewModel=function(){ + var self=this; this.repositoryGroups=ko.observableArray([]); this.managedRepositories=ko.observableArray([]); - findManagedRepository=function(id){ + this.findManagedRepository=function(id){ return findManagedRepository(id,self.managedRepositories()); } + + this.deleteRepositoryGroup=function(repositoryGroup){ + $.log("deleteRepositoryGroup:"+repositoryGroup.id()); + } + + this.editRepositoryGroup=function(repositoryGroup){ + $.log("editRepositoryGroup:"+repositoryGroup.id()); + var repositoryGroupViewModel=new RepositoryGroupViewModel(repositoryGroup,true,self); + activateRepositoryGroupEditTab(); + ko.applyBindings(repositoryGroupViewModel,$("#main-content #repository-groups-edit" ).get(0)); + } + + repositoryMoved=function(){ + $.log("repositoryMoved"); + } + + getManagedRepository=function(id){ + $.log("getManagedRepository:"+id); + return findManagedRepository(self.managedRepositories()); + } } displayRepositoryGroups=function(){ screenChange(); var mainContent = $("#main-content"); mainContent.html(mediumSpinnerImg()); - this.repositoryGroupViewModel=new RepositoryGroupViewModel(); + this.repositoryGroupsViewModel=new RepositoryGroupsViewModel(); var self=this; loadManagedRepositories(function(data) { - self.repositoryGroupViewModel.managedRepositories(mapManagedRepositories(data)); + self.repositoryGroupsViewModel.managedRepositories(mapManagedRepositories(data)); $.ajax("restServices/archivaServices/repositoryGroupService/getRepositoriesGroups", { type: "GET", @@ -58,9 +85,9 @@ $(function() { success: function(data) { var mappedRepositoryGroups=mapRepositoryGroups(data); mainContent.html($("#repositoryGroupsMain").tmpl()); - self.repositoryGroupViewModel.repositoryGroups(mappedRepositoryGroups); + self.repositoryGroupsViewModel.repositoryGroups(mappedRepositoryGroups); //ko.applyBindings(repositoryGroupViewModel,mainContent.find("#repository-groups-table" ).get(0)); - ko.applyBindings(repositoryGroupViewModel,mainContent.get(0)); + ko.applyBindings(repositoryGroupsViewModel,mainContent.find("#repository-groups-view" ).get(0)); } } @@ -71,6 +98,27 @@ $(function() { } + activateRepositoryGroupsGridTab=function(){ + var mainContent = $("#main-content"); + mainContent.find("#repository-groups-view-tabs-content div[class*='tab-pane']").removeClass("active"); + mainContent.find("#repository-groups-view-tabs li").removeClass("active"); + + mainContent.find("#repository-groups-view").addClass("active"); + mainContent.find("#repository-groups-view-tabs-li-grid").addClass("active"); + mainContent.find("#repository-groups-view-tabs-li-edit a").html($.i18n.prop("add")); + + } + + activateRepositoryGroupEditTab=function(){ + var mainContent = $("#main-content"); + + mainContent.find("#repository-groups-view-tabs-content div[class*='tab-pane']").removeClass("active"); + mainContent.find("#repository-groups-view-tabs li").removeClass("active"); + + mainContent.find("#repository-groups-edit").addClass("active"); + mainContent.find("#repository-groups-view-tabs-li-edit").addClass("active"); + } + mapRepositoryGroups=function(data){ if (data == null){ return new Array(); diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html index 45fb7eb53..66ade3647 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html @@ -71,7 +71,9 @@ {{/if}} ${row.useNtlm()} - ${$.i18n.prop('edit')} + + + diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html index 089490485..b0877f79f 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html @@ -81,7 +81,7 @@ - ${$.i18n.prop('edit')} + @@ -98,7 +98,7 @@ {{if orderChangeAware(row)}} - + ${$.i18n.prop('proxy-connectors.order.edit')} {{/if}} diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html index 461b83e4c..8e0d3b9cb 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html @@ -120,7 +120,11 @@ - ${$.i18n.prop('edit')} + + + + + @@ -317,12 +321,14 @@ {{each(i, row) itemsOnCurrentPage()}} - + {{each(j, columnDefinition) columns}} ${ typeof columnDefinition.rowText == 'function' ? columnDefinition.rowText(row) : row[columnDefinition.rowText] } {{/each}} - ${$.i18n.prop('edit')} + + + @@ -352,7 +358,7 @@
- +
{{if update}} ${$data.remoteRepository.id} diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repository-groups.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repository-groups.html index 03390f482..7b6288fbd 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repository-groups.html +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repository-groups.html @@ -20,32 +20,36 @@

${$.i18n.prop('repository.groups.list')}

- -

- - - - - - -
-
- - + +
+
+
+
+
+
+
+
-
-
grouprepos
- -
+
+ + + + + \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html index 243d573d2..ca3ba4737 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html @@ -204,7 +204,9 @@ {{/each}} - ${$.i18n.prop('edit')} + + + {{if row.modified()}} diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html index 03f119f11..e1a057ca2 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html @@ -34,7 +34,11 @@ {{each(j, columnDefinition) columns}} ${ typeof columnDefinition.rowText == 'function' ? columnDefinition.rowText(row) : row[columnDefinition.rowText] } {{/each}} - Edit + + + + + {{if row.username()=="admin" || row.username()=="guest"}} {{else}} -- 2.39.5