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 2012/03/08 10:31:10 UTC
svn commit: r1298320 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva:
general-admin.js templates/general-admin.html
Author: olamy
Date: Thu Mar 8 09:31:09 2012
New Revision: 1298320
URL: http://svn.apache.org/viewvc?rev=1298320&view=rev
Log:
[MRM-1579] rewrite repositories scanning admin page
templates for consumers.
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/general-admin.html
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js?rev=1298320&r1=1298319&r2=1298320&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js Thu Mar 8 09:31:09 2012
@@ -351,6 +351,8 @@ $(function() {
RepositoryScanningViewModel=function(){
var self=this;
this.fileTypes=ko.observableArray([]);
+ this.knownAdminRepositoryConsumers=ko.observableArray([]);
+ this.invalidAdminRepositoryConsumers=ko.observableArray([]);
this.findFileType=function(id){
var fileType=null;
@@ -404,6 +406,8 @@ $(function() {
mainContent.html($("#repository-scanning-main").tmpl());
mainContent.find("#file-types-content").html(mediumSpinnerImg());
+ mainContent.find("#consumers-known-content").html(mediumSpinnerImg());
+ mainContent.find("#consumers-invalid-content").html(mediumSpinnerImg());
var repositoryScanningViewModel=new RepositoryScanningViewModel();
@@ -421,7 +425,9 @@ $(function() {
type: "GET",
dataType: 'json',
success: function(data){
- var adminRepositoryConsumers=mapAdminRepositoryConsumers(data);
+ var knownAdminRepositoryConsumers=mapAdminRepositoryConsumers(data);
+ repositoryScanningViewModel.knownAdminRepositoryConsumers(knownAdminRepositoryConsumers);
+ ko.applyBindings(repositoryScanningViewModel,mainContent.find("#consumers-known-content").get(0));
}
});
@@ -429,7 +435,9 @@ $(function() {
type: "GET",
dataType: 'json',
success: function(data){
- var adminRepositoryConsumers=mapAdminRepositoryConsumers(data);
+ var invalidAdminRepositoryConsumers=mapAdminRepositoryConsumers(data);
+ repositoryScanningViewModel.invalidAdminRepositoryConsumers(invalidAdminRepositoryConsumers);
+ ko.applyBindings(repositoryScanningViewModel,mainContent.find("#consumers-invalid-content").get(0));
}
});
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/general-admin.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/general-admin.html?rev=1298320&r1=1298319&r2=1298320&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/general-admin.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/general-admin.html Thu Mar 8 09:31:09 2012
@@ -155,10 +155,10 @@
<div class="tab-content">
<div id="file-types-content" class="tab-pane active" data-bind='template: {name:"file-types-tmpl"}'>
- file types
</div>
<div id="consumers-content" class="tab-pane">
- consumers
+ <div id="consumers-known-content" data-bind='template: {name:"consumers-known-content-tmpl"}'></div>
+ <div id="consumers-invalid-content" data-bind='template: {name:"consumers-invalid-content-tmpl"}'></div>
</div>
</div>
@@ -201,3 +201,53 @@
</div>
</script>
+<script id="consumers-known-content-tmpl" type="text/html">
+ <div class="page-header">
+ <h4>${$.i18n.prop('repository-scanning.consumers.know-content.head')}</h4>
+ </div>
+ <table class="table table-condensed">
+ <thead>
+ <tr>
+ <th>${$.i18n.prop('repository-scanning.consumers.grid.enabled')}</th>
+ <th>${$.i18n.prop('repository-scanning.consumers.grid.id')}</th>
+ <th>${$.i18n.prop('repository-scanning.consumers.grid.description')}</th>
+ </tr>
+ </thead>
+ <tbody>
+ {{each(i,knownAdminRepositoryConsumer) knownAdminRepositoryConsumers}}
+ <tr>
+ <td>${knownAdminRepositoryConsumer.enabled}</td>
+ <td>${knownAdminRepositoryConsumer.id}</td>
+ <td>${knownAdminRepositoryConsumer.description}</td>
+ </tr>
+ {{/each}}
+ </tbody>
+ </table>
+</script>
+
+<script id="consumers-invalid-content-tmpl" type="text/html">
+ <div class="page-header">
+ <h4>${$.i18n.prop('repository-scanning.consumers.invalid-content.head')}</h4>
+ </div>
+ <table class="table table-condensed">
+ <thead>
+ <tr>
+ <th>${$.i18n.prop('repository-scanning.consumers.grid.enabled')}</th>
+ <th>${$.i18n.prop('repository-scanning.consumers.grid.id')}</th>
+ <th>${$.i18n.prop('repository-scanning.consumers.grid.description')}</th>
+ </tr>
+ </thead>
+ <tbody>
+ {{each(i,invalidAdminRepositoryConsumer) invalidAdminRepositoryConsumers}}
+ <tr>
+ <td>${invalidAdminRepositoryConsumer.enabled}</td>
+ <td>${invalidAdminRepositoryConsumer.id}</td>
+ <td>${invalidAdminRepositoryConsumer.description}</td>
+ </tr>
+ {{/each}}
+ </tbody>
+ </table>
+</script>
+
+
+