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

[MRM-1579] rewrite repositories scanning admin page 

templates for consumers.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1298320 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-03-08 09:31:09 +00:00
parent 844b9c5ee7
commit 45273b5e2b
2 changed files with 62 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/general-admin.js
View File

@ -351,6 +351,8 @@ $(function() {
RepositoryScanningViewModel=function(){ RepositoryScanningViewModel=function(){
var self=this; var self=this;
this.fileTypes=ko.observableArray([]); this.fileTypes=ko.observableArray([]);
this.knownAdminRepositoryConsumers=ko.observableArray([]);
this.invalidAdminRepositoryConsumers=ko.observableArray([]);
this.findFileType=function(id){ this.findFileType=function(id){
var fileType=null; var fileType=null;
@ -404,6 +406,8 @@ $(function() {
mainContent.html($("#repository-scanning-main").tmpl()); mainContent.html($("#repository-scanning-main").tmpl());
mainContent.find("#file-types-content").html(mediumSpinnerImg()); 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(); var repositoryScanningViewModel=new RepositoryScanningViewModel();
@ -421,7 +425,9 @@ $(function() {
type: "GET", type: "GET",
dataType: 'json', dataType: 'json',
success: function(data){ 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", type: "GET",
dataType: 'json', dataType: 'json',
success: function(data){ success: function(data){
var adminRepositoryConsumers=mapAdminRepositoryConsumers(data); var invalidAdminRepositoryConsumers=mapAdminRepositoryConsumers(data);
repositoryScanningViewModel.invalidAdminRepositoryConsumers(invalidAdminRepositoryConsumers);
ko.applyBindings(repositoryScanningViewModel,mainContent.find("#consumers-invalid-content").get(0));
} }
}); });

54
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/general-admin.html
View File

@ -155,10 +155,10 @@
<div class="tab-content"> <div class="tab-content">
<div id="file-types-content" class="tab-pane active" data-bind='template: {name:"file-types-tmpl"}'> <div id="file-types-content" class="tab-pane active" data-bind='template: {name:"file-types-tmpl"}'>
file types
</div> </div>
<div id="consumers-content" class="tab-pane"> <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>
</div> </div>
@ -201,3 +201,53 @@
</div> </div>
</script> </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>