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/02 14:59:46 UTC
svn commit: r1226421 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js:
./ archiva/ archiva/templates/ redback/templates/
Author: olamy
Date: Mon Jan 2 13:59:46 2012
New Revision: 1226421
URL: http://svn.apache.org/viewvc?rev=1226421&view=rev
Log:
move grid pager template to a generic place and use only this one
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/grids-generics.html (with props)
Modified:
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/knockout.simpleGrid.js
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/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=1226421&r1=1226420&r2=1226421&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 Mon Jan 2 13:59:46 2012
@@ -17,14 +17,15 @@
* under the License.
*/
require(["text!archiva/templates/menu.html","text!archiva/templates/topbar.html","text!archiva/templates/message.html",
- "text!archiva/templates/modal.html"],
- function(menu,topbar,message,modal) {
+ "text!archiva/templates/modal.html","text!archiva/templates/grids-generics.html"],
+ function(menu,topbar,message,modal,grids_generics) {
// template loading
$.tmpl( menu, $.i18n.map ).appendTo("#html-fragments");
$.tmpl( topbar, $.i18n.map ).appendTo("#html-fragments");
$.tmpl( modal, $.i18n.map ).appendTo("#html-fragments");
$("#html-fragments").append(message);
+ $("#html-fragments").append(grids_generics);
$.log("main-tmpl.js menu loaded");
}
);
\ No newline at end of file
Added: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/grids-generics.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/grids-generics.html?rev=1226421&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/grids-generics.html (added)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/grids-generics.html Mon Jan 2 13:59:46 2012
@@ -0,0 +1,13 @@
+<script id="ko_simpleGrid_pageLinks" type="text/x-jquery-tmpl">
+ <div class="pagination">
+ <ul>
+ {{each(i) ko.utils.range(1, maxPageIndex)}}
+ <li data-bind="css: { active: i == currentPageIndex() }">
+ <a href="#" data-bind="click: function() { currentPageIndex(i) }">
+ ${ i + 1 }
+ </a>
+ </li>
+ {{/each}}
+ </ul>
+ </div>
+</script>
\ No newline at end of file
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/grids-generics.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/grids-generics.html
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout.simpleGrid.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout.simpleGrid.js?rev=1226421&r1=1226420&r2=1226421&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout.simpleGrid.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/knockout.simpleGrid.js Mon Jan 2 13:59:46 2012
@@ -50,7 +50,7 @@
// Allow the default templates to be overridden
var gridTemplateName = allBindings.simpleGridTemplate || "ko_usersGrid_grid",
- pageLinksTemplateName = allBindings.simpleGridPagerTemplate || "ko_usersGrid_pageLinks";
+ pageLinksTemplateName = allBindings.simpleGridPagerTemplate || "ko_simpleGrid_pageLinks";
// Render the main grid
var gridContainer = element.appendChild(document.createElement("DIV"));
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=1226421&r1=1226420&r2=1226421&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 Mon Jan 2 13:59:46 2012
@@ -14,7 +14,7 @@
<div id="roles-view-tabs-content" class="tab-content">
<div id="roles-view">
<table class="bordered-table zebra-striped" id="usersTable"
- data-bind="simpleGrid: gridViewModel,simpleGridTemplate:'ko_rolesGrid',simpleGridPagerTemplate:'ko_rolesGrid_pageLinks',pageLinksId:'rolesPagination'">
+ data-bind="simpleGrid: gridViewModel,simpleGridTemplate:'ko_rolesGrid',pageLinksId:'rolesPagination'">
</table>
<div id="rolesPagination"></div>
</div>
@@ -156,16 +156,4 @@
</script>
-<script id="ko_rolesGrid_pageLinks" type="text/x-jquery-tmpl">
- <div class="pagination">
- <ul>
- {{each(i) ko.utils.range(1, maxPageIndex)}}
- <li data-bind="css: { active: i == currentPageIndex() }">
- <a href="#" data-bind="click: function() { currentPageIndex(i) }">
- ${ i + 1 }
- </a>
- </li>
- {{/each}}
- </ul>
- </div>
-</script>
+
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=1226421&r1=1226420&r2=1226421&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 Mon Jan 2 13:59:46 2012
@@ -71,21 +71,6 @@
</script>
-<script id="ko_usersGrid_pageLinks" type="text/x-jquery-tmpl">
- <div class="pagination">
- <ul>
- {{each(i) ko.utils.range(1, maxPageIndex)}}
- <li data-bind="css: { active: i == currentPageIndex() }">
- <a href="#" data-bind="click: function() { currentPageIndex(i) }">
- ${ i + 1 }
- </a>
- </li>
- {{/each}}
- </ul>
- </div>
-</script>
-
-
<script id="usersGrid" type="text/x-jquery-tmpl">
<div class="page-header">
<h2>${$.i18n.prop('users.list')}</h2>
@@ -104,7 +89,7 @@
${$.i18n.prop('users.sort.byname')}
</button>
<table class="bordered-table zebra-striped" id="usersTable"
- data-bind="simpleGrid: gridViewModel,simpleGridTemplate:'ko_usersGrid_grid',simpleGridPagerTemplate:'ko_usersGrid_pageLinks',pageLinksId:'usersPagination'">
+ data-bind="simpleGrid: gridViewModel,simpleGridTemplate:'ko_usersGrid_grid',pageLinksId:'usersPagination'">
</table>
<div id="usersPagination"></div>
</div>