Author: olamy
Date: Thu Dec 13 20:05:14 2012
New Revision: 1421475
URL: http://svn.apache.org/viewvc?rev=1421475&view=rev
Log:
format html templates: it looks I found how to do that in idea :-)
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/docs.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/generics.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/menu.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/modal.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/login.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/user-edit.html
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/docs.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/docs.html?rev=1421475&r1=1421474&r2=1421475&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/docs.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/docs.html
Thu Dec 13 20:05:14 2012
@@ -18,20 +18,20 @@
-->
<script id="rest_docs" type="text/html">
- <div id="rest-doc-header">
- <div class="page-header">
- <h3><b>${$.i18n.prop('docs.rest.header')}</b></h3>
- </div>
- <div id="docs_rest_choice">
- <ul>
- <li><a class="cursor-hand"
onclick="displayArchivaRestDocs();">Archiva Rest Api Docs</a></li>
- <li><a class="cursor-hand"
onclick="displayArchivaRestUIDocs();">Archiva Rest Api UI Docs</a></li>
- <li><a class="cursor-hand"
onclick="displayRedbackRestDocs();">Redback Rest Api UI Docs</a></li>
- </ul>
- </div>
+ <div id="rest-doc-header">
+ <div class="page-header">
+ <h3><b>${$.i18n.prop('docs.rest.header')}</b></h3>
</div>
- <div id="rest_docs_content">
+ <div id="docs_rest_choice">
+ <ul>
+ <li><a class="cursor-hand" onclick="displayArchivaRestDocs();">Archiva
Rest Api Docs</a></li>
+ <li><a class="cursor-hand"
onclick="displayArchivaRestUIDocs();">Archiva Rest Api UI Docs</a></li>
+ <li><a class="cursor-hand" onclick="displayRedbackRestDocs();">Redback
Rest Api UI Docs</a></li>
+ </ul>
</div>
+ </div>
+ <div id="rest_docs_content">
+ </div>
</script>
<script id="users_docs" type="text/html">
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html?rev=1421475&r1=1421474&r2=1421475&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
Thu Dec 13 20:05:14 2012
@@ -925,7 +925,7 @@
<div class="tab-pane" id="redback-runtime-ldap-content">
<div class="well">
<form class="form-horizontal" id="redback-runtime-ldap-form-id">
- <fieldset id="redback-runtime-ldap-form">
+
<div class="control-group">
<label for="ldap-host" class="control-label">
${$.i18n.prop('redback.runtime.ldap.host.label')}
@@ -990,7 +990,7 @@
</div>
</div>
<!-- TODO extraPropertiesEntries -->
- </fieldset>
+
</form>
<button data-bind="click: checkChangedLdapConfiguration,css:{
'btn-warning': archivaRuntimeConfiguration().ldapConfiguration().modified() },
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/generics.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/generics.html?rev=1421475&r1=1421474&r2=1421475&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/generics.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/generics.html
Thu Dec 13 20:05:14 2012
@@ -46,21 +46,22 @@
<a target="_blank" href="http://archiva.apache.org/";>Apache
Archiva - ${version}</a>
</div>
<div class="pull-right">
- Copyright © ${copyrightRange} <a target="_blank"
href="http://www.apache.org/";>The Apache Software Foundation</a>
+ Copyright © ${copyrightRange} <a target="_blank"
href="http://www.apache.org/";>The Apache Software
+ Foundation</a>
</div>
</script>
<script id="ko_simpleGrid_pageLinks" type="text/html">
<div class="pagination">
- <ul>
+ <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>
+ <li data-bind="css: { active: i == currentPageIndex() }">
+ <a href="#" data-bind="click: function() { currentPageIndex(i) }">
+ ${ i + 1 }
+ </a>
+ </li>
{{/each}}
- </ul>
+ </ul>
</div>
</script>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/menu.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/menu.html?rev=1421475&r1=1421474&r2=1421475&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/menu.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/menu.html
Thu Dec 13 20:05:14 2012
@@ -20,17 +20,18 @@
<div id="main-menu">
<ul class="nav nav-list" data-bind="foreach: artifactMenuItems">
- <!-- ko ifnot: id -->
- <li class="nav-header archiva-nav-header" data-bind="text: text"></li>
- <!-- /ko -->
- <!-- ko if: id -->
- <li data-bind='redbackP: $data.redback, css: { active: $data.href ==
"#"+$root.activeMenuId() }'>
- <a data-bind="text: text, attr: { id: id, href: href}"></a>
- </li>
- <!-- /ko -->
+ <!-- ko ifnot: id -->
+ <li class="nav-header archiva-nav-header" data-bind="text: text"></li>
+ <!-- /ko -->
+ <!-- ko if: id -->
+ <li data-bind='redbackP: $data.redback, css: { active: $data.href ==
"#"+$root.activeMenuId() }'>
+ <a data-bind="text: text, attr: { id: id, href: href}"></a>
+ </li>
+ <!-- /ko -->
</ul>
- <ul class="nav nav-list" redback-permissions="{permissions:
['archiva-manage-configuration']}" data-bind="foreach: administrationMenuItems">
+ <ul class="nav nav-list" redback-permissions="{permissions:
['archiva-manage-configuration']}"
+ data-bind="foreach: administrationMenuItems">
<!-- ko ifnot: id -->
<li class="nav-header archiva-nav-header" data-bind="text: text"></li>
<!-- /ko -->
@@ -41,7 +42,8 @@
<!-- /ko -->
</ul>
- <ul class="nav nav-list" redback-permissions="{permissions:
['archiva-manage-users']}" data-bind="foreach: usersMenuItems">
+ <ul class="nav nav-list" redback-permissions="{permissions:
['archiva-manage-users']}"
+ data-bind="foreach: usersMenuItems">
<!-- ko ifnot: id -->
<li class="nav-header archiva-nav-header" data-bind="text: text"></li>
<!-- /ko -->
@@ -67,7 +69,7 @@
</script>
<script id="topbar_menu_tmpl" type="text/html">
- <div id="topbar-menu">
+ <div id="topbar-menu">
<div class="navbar navbar-fixed-top"><!-- navbar-inverse for black topbar
olamy: prefer non black :-) -->
<div style="max-height: 40px" class="navbar-inner">
@@ -102,7 +104,7 @@
<li>
<div class="ui-widget navbar-search">
<input type="text" class="ui-autocomplete-input search-query"
id="quick-search-autocomplete"
-
placeholder="${$.i18n.prop('menu.topbar.quicksearch')}" />
+
placeholder="${$.i18n.prop('menu.topbar.quicksearch')}"/>
</div>
</li>
</ul>
@@ -110,5 +112,5 @@
</div>
</div>
- </div>
+ </div>
</script>
\ No newline at end of file
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/modal.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/modal.html?rev=1421475&r1=1421474&r2=1421475&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/modal.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/modal.html
Thu Dec 13 20:05:14 2012
@@ -19,10 +19,11 @@
<div id="dialog-confirm-modal" class="modal hide fade" style="display: block;">
<div class="modal-header">
<a class="close" href="#" data-dismiss="modal">×</a>
+
<h3 id="dialog-confirm-modal-header-title"></h3>
</div>
<div class="modal-body">
- <p id="dialog-confirm-modal-body-text"></p>
+ <p id="dialog-confirm-modal-body-text"></p>
</div>
<div class="modal-footer">
<a class="btn btn-secondary" id="dialog-confirm-modal-cancel"
data-loading-text="${$.i18n.prop('common.loading')}">${$.i18n.prop('cancel')}</a>
@@ -31,10 +32,11 @@
</div>
<div id="dialog-modal-merge-repo" class="modal hide fade" style="display:
block;">
- <div class="modal-header">
- <a class="close" href="#" data-dismiss="modal">×</a>
- <h3
id="dialog-modal-merge-repo-header-title">${$.i18n.prop('managedrepository.repomerge.dialog.header')}</h3>
- </div>
- <div class="modal-body" id="dialog-modal-merge-repo-body-text">>
- </div>
+ <div class="modal-header">
+ <a class="close" href="#" data-dismiss="modal">×</a>
+
+ <h3
id="dialog-modal-merge-repo-header-title">${$.i18n.prop('managedrepository.repomerge.dialog.header')}</h3>
+ </div>
+ <div class="modal-body" id="dialog-modal-merge-repo-body-text">>
+ </div>
</div>
