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/01/13 18:00:52 UTC
svn commit: r1231182 - in /archiva/trunk/archiva-modules:
archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/
archiva-web/archiva-webapp-js/src/main/webapp/
archiva-web/archiva-webapp-j...
Author: olamy
Date: Fri Jan 13 17:00:51 2012
New Revision: 1231182
URL: http://svn.apache.org/viewvc?rev=1231182&view=rev
Log:
start adding various files for repositories management: html templates js
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/AbstractRepository.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/AbstractRepository.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/AbstractRepository.java?rev=1231182&r1=1231181&r2=1231182&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/AbstractRepository.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/AbstractRepository.java Fri Jan 13 17:00:51 2012
@@ -34,8 +34,6 @@ public class AbstractRepository
private String layout = "default";
-
-
private String indexDirectory;
public AbstractRepository()
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html?rev=1231182&r1=1231181&r2=1231182&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html Fri Jan 13 17:00:51 2012
@@ -55,6 +55,7 @@
.script("jquery.validate.js").wait()
.script("jquery.json-2.3.min.js").wait()
.script("archiva/main-tmpl.js").wait()
+ .script("archiva/repositories.js").wait()
.script("redback/operation.js").wait()
.script("redback/redback-tmpl.js").wait()
.script("bootstrap-tabs.js").wait()
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js?rev=1231182&r1=1231181&r2=1231182&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js Fri Jan 13 17:00:51 2012
@@ -17,8 +17,8 @@
* under the License.
*/
require(["text!archiva/templates/menu.html","text!archiva/templates/topbar.html","text!archiva/templates/message.html",
- "text!archiva/templates/modal.html","text!archiva/templates/grids-generics.html"],
- function(menu,topbar,message,modal,grids_generics) {
+ "text!archiva/templates/modal.html","text!archiva/templates/grids-generics.html","text!archiva/templates/repositories.html"],
+ function(menu,topbar,message,modal,grids_generics,repositories) {
// template loading
$.tmpl( menu, $.i18n.map ).appendTo("#html-fragments");
@@ -26,6 +26,7 @@ require(["text!archiva/templates/menu.ht
$.tmpl( modal, $.i18n.map ).appendTo("#html-fragments");
$("#html-fragments").append(message);
$("#html-fragments").append(grids_generics);
+ $("#html-fragments").append(repositories);
$.log("main-tmpl.js menu loaded");
}
);
\ No newline at end of file
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js?rev=1231182&r1=1231181&r2=1231182&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js Fri Jan 13 17:00:51 2012
@@ -21,9 +21,11 @@ function($) {
$(function() {
+ // no cache for ajax queries
+ jQuery.ajaxSetup( {
+ cache: false
+ } );
-
- $.log("main karma");
customShowError=function(validator, errorMap, errorList) {
$( "div.clearfix" ).removeClass( "error" );
$( "span.help-inline" ).remove();
@@ -153,7 +155,6 @@ $(function() {
}
});
- $.log("main.js dom ready");
$('#topbar-menu-container').html($("#topbar-menu"));
$('#sidebar-content').html($("#main-menu"));
checkCreateAdminLink();
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html?rev=1231182&r1=1231181&r2=1231182&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html Fri Jan 13 17:00:51 2012
@@ -7,5 +7,8 @@
<li style="display: none" redback-permissions="{permissions: ['archiva-manage-users']}">
<a href="#" id="menu-roles-list-a" onclick="displayRolesGrid()">${$.i18n.prop('roles.list')}</a>
</li>
+ <li style="display: none" redback-permissions="{permissions: ['archiva-manage-configuration']}">
+ <a href="#" id="menu-repositories-list-a" onclick="displayRepositoriesGrid()">${$.i18n.prop('repositories.list')}</a>
+ </li>
</ul>
</div>