Return-Path: X-Original-To: apmail-archiva-commits-archive@www.apache.org Delivered-To: apmail-archiva-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 29DB89AF1 for ; Tue, 14 Feb 2012 11:50:55 +0000 (UTC) Received: (qmail 649 invoked by uid 500); 14 Feb 2012 08:21:40 -0000 Delivered-To: apmail-archiva-commits-archive@archiva.apache.org Received: (qmail 606 invoked by uid 500); 14 Feb 2012 08:21:29 -0000 Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@archiva.apache.org Delivered-To: mailing list commits@archiva.apache.org Received: (qmail 564 invoked by uid 99); 14 Feb 2012 08:21:21 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Feb 2012 08:21:21 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Feb 2012 08:21:18 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id EB2DE23888FD for ; Tue, 14 Feb 2012 08:20:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1243819 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js: archiva/ archiva/templates/ redback/templates/ Date: Tue, 14 Feb 2012 08:20:58 -0000 To: commits@archiva.apache.org From: olamy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120214082058.EB2DE23888FD@eris.apache.org> Author: olamy Date: Tue Feb 14 08:20:58 2012 New Revision: 1243819 URL: http://svn.apache.org/viewvc?rev=1243819&view=rev Log: use an icon for edit link in grids Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repository-groups.html archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js?rev=1243819&r1=1243818&r2=1243819&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js Tue Feb 14 08:20:58 2012 @@ -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(); Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html?rev=1243819&r1=1243818&r2=1243819&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html Tue Feb 14 08:20:58 2012 @@ -71,7 +71,9 @@ {{/if}} ${row.useNtlm()} - ${$.i18n.prop('edit')} + + + Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html?rev=1243819&r1=1243818&r2=1243819&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html Tue Feb 14 08:20:58 2012 @@ -81,7 +81,7 @@ - ${$.i18n.prop('edit')} + @@ -98,7 +98,7 @@ {{if orderChangeAware(row)}} - + ${$.i18n.prop('proxy-connectors.order.edit')} {{/if}} Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html?rev=1243819&r1=1243818&r2=1243819&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html Tue Feb 14 08:20:58 2012 @@ -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} Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repository-groups.html URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repository-groups.html?rev=1243819&r1=1243818&r2=1243819&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repository-groups.html (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repository-groups.html Tue Feb 14 08:20:58 2012 @@ -20,32 +20,36 @@

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

- -

- - - - - - -
-
- - + +
+
+
+
+
+
+
+
-
-
grouprepos
- -
+
+ + + + + \ No newline at end of file Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html?rev=1243819&r1=1243818&r2=1243819&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html Tue Feb 14 08:20:58 2012 @@ -204,7 +204,9 @@ {{/each}} - ${$.i18n.prop('edit')} + + + {{if row.modified()}} Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html?rev=1243819&r1=1243818&r2=1243819&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html Tue Feb 14 08:20:58 2012 @@ -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}}