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/09/12 22:45:39 UTC
svn commit: r1384118 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js:
archiva/repositories.js templates/archiva/repositories.html
Author: olamy
Date: Wed Sep 12 20:45:39 2012
New Revision: 1384118
URL: http://svn.apache.org/viewvc?rev=1384118&view=rev
Log:
[MRM-648] Add description field to the different types of repositories and proxies
implements UI for remote repositories.
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js?rev=1384118&r1=1384117&r2=1384118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js Wed Sep 12 20:45:39 2012
@@ -552,7 +552,8 @@ define("archiva.repositories",["jquery",
RemoteRepository=function(id,name,layout,indexDirectory,url,userName,password,timeout,downloadRemoteIndex,remoteIndexUrl,
- remoteDownloadNetworkProxyId,cronExpression,remoteDownloadTimeout,downloadRemoteIndexOnStartup){
+ remoteDownloadNetworkProxyId,cronExpression,remoteDownloadTimeout,downloadRemoteIndexOnStartup,
+ description){
var self=this;
@@ -589,7 +590,7 @@ define("archiva.repositories",["jquery",
this.timeout.subscribe(function(newValue){self.modified(true)});
//private boolean downloadRemoteIndex = false;
- this.downloadRemoteIndex=ko.observable(downloadRemoteIndex);
+ this.downloadRemoteIndex=ko.observable(downloadRemoteIndex?false:downloadRemoteIndex);
this.downloadRemoteIndex.subscribe(function(newValue){self.modified(true)});
//private String remoteIndexUrl = ".index";
@@ -609,9 +610,12 @@ define("archiva.repositories",["jquery",
this.remoteDownloadTimeout.subscribe(function(newValue){self.modified(true)});
//private boolean downloadRemoteIndexOnStartup = false;
- this.downloadRemoteIndexOnStartup=ko.observable(downloadRemoteIndexOnStartup);
+ this.downloadRemoteIndexOnStartup=ko.observable(downloadRemoteIndexOnStartup?false:downloadRemoteIndexOnStartup);
this.downloadRemoteIndexOnStartup.subscribe(function(newValue){self.modified(true)});
+ this.description=ko.observable(description);
+ this.description.subscribe(function(newValue){self.modified(true)});
+
this.getTypeLabel=function(){
for(var i=0;i<window.managedRepositoryTypes.length;i++){
if (window.managedRepositoryTypes[i].type==self.layout()){
@@ -630,7 +634,7 @@ define("archiva.repositories",["jquery",
}
return new RemoteRepository(data.id,data.name,data.layout,data.indexDirectory,data.url,data.userName,data.password,
data.timeout,data.downloadRemoteIndex,data.remoteIndexUrl,data.remoteDownloadNetworkProxyId,
- data.cronExpression,data.remoteDownloadTimeout,data.downloadRemoteIndexOnStartup);
+ data.cronExpression,data.remoteDownloadTimeout,data.downloadRemoteIndexOnStartup,data.description);
}
mapRemoteRepositories=function(data){
@@ -941,6 +945,7 @@ define("archiva.repositories",["jquery",
ko.applyBindings(remoteRepositoriesViewModel,mainContent.find("#remote-repositories-view").get(0));
mainContent.find("#remote-repositories-pills #remote-repositories-view-a").tab('show')
removeMediumSpinnerImg("#main-content #remote-repositories-content");
+ activatePopoverDoc();
});
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html?rev=1384118&r1=1384117&r2=1384118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html Wed Sep 12 20:45:39 2012
@@ -235,14 +235,12 @@
<input type="text" id="retentionCount" name="retentionCount" size="5" data-bind="value: managedRepository.retentionCount"/>
</div>
</div>
-
<div class="control-group">
<label class="control-label" for="daysOlder">${$.i18n.prop('description')}</label>
<div class="controls">
<textarea rows="3" id="description" name="description" data-bind="value: managedRepository.description"></textarea>
</div>
</div>
-
<div class="control-group">
<label class="control-label" for="releases">${$.i18n.prop('releases')}</label>
<div class="controls">
@@ -380,6 +378,14 @@
<td></td>
{{/if}}
<td>
+ {{if row.description()}}
+ <a class="btn btn-warning btn-mini popover-doc" id="remoterepo-description-help"
+ data-content="${row.description()}" data-title="${$.i18n.prop('description')}">
+ <i class="icon-question-sign icon-white"></i>
+ </a>
+ {{/if}}
+ </td>
+ <td>
<a href="#" data-bind="click: function(){ scheduleDownloadRemoteIndex(row) }">
<span class="btn btn-success">
<i class="icon-refresh icon-white"/>
@@ -485,7 +491,6 @@
</div>
</div>
-
<div class="control-group">
<label class="control-label" for="downloadRemoteIndexOnStartup">${$.i18n.prop('downloadRemoteIndexOnStartup')}</label>
<div class="controls">
@@ -494,6 +499,13 @@
</div>
</div>
+ <div class="control-group">
+ <label class="control-label" for="daysOlder">${$.i18n.prop('description')}</label>
+ <div class="controls">
+ <textarea rows="3" id="description" name="description" data-bind="value: remoteRepository.description"></textarea>
+ </div>
+ </div>
+
</fieldset>
<button data-bind="click: save" class="btn">${$.i18n.prop('save')}</button>
<button data-bind="click: displayGrid" class="btn">${$.i18n.prop('cancel')}</button>