Author: olamy
Date: Mon Apr 2 10:06:52 2012
New Revision: 1308279
URL: http://svn.apache.org/viewvc?rev=1308279&view=rev
Log:
merge template files together
Removed:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/network-proxies.html
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/templates/archiva/repositories.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=1308279&r1=1308278&r2=1308279&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 Apr 2 10:06:52 2012
@@ -21,14 +21,13 @@ define("archiva.templates",["text!templa
"text!templates/archiva/modal.html",
"text!templates/archiva/grids-generics.html",
"text!templates/archiva/repositories.html",
- "text!templates/archiva/network-proxies.html",
"text!templates/archiva/proxy-connectors.html",
"text!templates/archiva/repository-groups.html",
"text!templates/archiva/search.html",
"text!templates/archiva/general-admin.html",
"text!templates/archiva/artifacts-management.html",
"jquery.tmpl","utils"],
-
function(menu,message,modal,grids_generics,repositories,network_proxies,proxies_connectors,
+ function(menu,message,modal,grids_generics,repositories,proxies_connectors,
repository_groups,search,general_admin,artifacts_management) {
var htmlFragment=$("#html-fragments");
@@ -38,7 +37,6 @@ define("archiva.templates",["text!templa
$.tmpl( modal ).appendTo(htmlFragment);
htmlFragment.append(grids_generics);
htmlFragment.append(repositories);
- htmlFragment.append(network_proxies);
htmlFragment.append(proxies_connectors);
htmlFragment.append(repository_groups);
htmlFragment.append(search);
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=1308279&r1=1308278&r2=1308279&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
Mon Apr 2 10:06:52 2012
@@ -497,4 +497,162 @@
{{if bulkSave()}}
<a data-bind="click: updateModifiedRemoteRepositories" class="btn
btn-danger" href="#">${$.i18n.prop('save.all')}</a>
{{/if}}
+</script>
+
+<script id="networkProxiesMain" type="text/html">
+ <div class="page-header">
+ <h2><img
src="images/internet-web-browser-32-32.png"/>${$.i18n.prop('network-proxies.list')}</h2>
+ </div>
+
+ <ul id="network-proxies-view-tabs" class="nav nav-tabs">
+ <li id="network-proxies-view-tabs-li-grid">
+ <a data-toggle="tab" href="#network-proxies-view"
id="network-proxies-view-tabs-a-network-proxies-grid">${$.i18n.prop('network-proxies.grid.tab.title')}</a>
+ </li>
+ <li id="network-proxies-view-tabs-li-edit">
+ <a data-toggle="tab"
href="#network-proxies-edit">${$.i18n.prop('add')}</a>
+ </li>
+ </ul>
+ <div id="network-proxies-view-tabs-content" class="tab-content">
+ <div id="network-proxies-view" class="tab-pane">
+ <div id="network-proxies-bulk-save-btn"
data-bind='template:{name:"network-proxies-bulk-save-tmpl"}'></div>
+ <table class="table table-striped table-bordered"
id="networkProxiesTable"
+ data-bind="simpleGrid:
gridViewModel,simpleGridTemplate:'ko-network-proxies-grid',pageLinksId:'network-proxiesPagination'">
+ </table>
+ <div id="network-proxiesPagination"></div>
+ </div>
+ <div id="network-proxies-edit" class="tab-pane" data-bind='template:
{name:"network-proxy-edit-tmpl"}'></div>
+ </div>
+
+</script>
+
+<script id='ko-network-proxies-grid' type='text/html'>
+ <thead>
+ <tr>
+ {{each(i, columnDefinition) columns}}
+ <th>${ columnDefinition.headerText }</th>
+ {{/each}}
+ <th>${$.i18n.prop('password')}</th>
+ <th>${$.i18n.prop('network.proxy.useNtlm')}</th>
+ <th>${$.i18n.prop('edit')}</th>
+ <th>${$.i18n.prop('delete')}</th>
+ <th>${$.i18n.prop('modified')}</th>
+ </tr>
+ </thead>
+ <tbody>
+ {{each(i, row) itemsOnCurrentPage()}}
+ <tr data-bind="css:{ 'modified': row.modified()}">
+ {{each(j, columnDefinition) columns}}
+ {{var val = (typeof columnDefinition.rowText == 'function' ?
columnDefinition.rowText(row) : row[columnDefinition.rowText])}}
+ <td>
+ ${val}
+ </td>
+ {{/each}}
+ {{if row.password()}}
+ <td>*****</td>
+ {{else}}
+ <td></td>
+ {{/if}}
+ <td>${row.useNtlm()}</td>
+ <td>
+ <a href="#" data-bind="click: function(){ editNetworkProxy(row) }">
+ <span class="btn btn-primary">
+ <i class="icon-pencil icon-white"/>
+ </span>
+ </a>
+ </td>
+ <td>
+ <a href="#" data-bind="click: function(){ removeNetworkProxy(row)
}">
+ <span class="btn btn-danger">
+ <i class="icon-trash icon-white"/>
+ </span>
+ </a>
+ </td>
+ {{if row.modified()}}
+ <td>
+ <a href="#" data-bind="click: function(){ updateNetworkProxy(row)
}" class="btn btn-warning">${$.i18n.prop('save')}</a>
+ </td>
+ {{else}}
+ <td></td>
+ {{/if}}
+
+ </tr>
+ {{/each}}
+ </tbody>
+
+</script>
+
+<script id="network-proxy-edit-tmpl" type='text/html'>
+ <form id="network-proxy-edit-form" class="well form-horizontal">
+ <fieldset id="network-proxy-edit-fieldset">
+ <div class="control-group">
+ <label class="control-label" for="id">${$.i18n.prop('id')}</label>
+ <div class="controls">
+ {{if update}}
+ <span class="uneditable-input">${$data.networkProxy.id}</span>
+ {{else}}
+ <input type="text" class="xlarge" id="id" name="id" size="10"
+ data-bind="value:
networkProxy.id,css:{'uneditable-input': update},readonly:update"/>
+ {{/if}}
+ </div>
+ </div>
+ <div class="control-group">
+ <label class="control-label"
for="protocol">${$.i18n.prop('protocol')}</label>
+ <div class="controls">
+ <input type="text" class="xlarge required" id="protocol"
name="protocol" size="8"
+ data-bind="value: networkProxy.protocol"/>
+ </div>
+ </div>
+ <div class="control-group">
+ <label class="control-label"
for="host">${$.i18n.prop('host')}</label>
+ <div class="controls">
+ <input type="text" class="xlarge required" id="host" name="host"
size="15"
+ data-bind="value: networkProxy.host"/>
+ </div>
+ </div>
+ <div class="control-group">
+ <label class="control-label"
for="port">${$.i18n.prop('port')}</label>
+ <div class="controls">
+ <input type="text" class="xlarge required digits" id="port"
name="port" size="6"
+ data-bind="value: networkProxy.port"/>
+ </div>
+ </div>
+ <div class="control-group">
+ <label class="control-label"
for="username">${$.i18n.prop('username')}</label>
+ <div class="controls">
+ <input type="text" class="xlarge" id="username" name="username"
size="50"
+ data-bind="value: networkProxy.username"/>
+ </div>
+ </div>
+ <div class="control-group">
+ <label class="control-label"
for="password">${$.i18n.prop('password')}</label>
+ <div class="controls">
+ <input type="password" class="xlarge" id="password"
name="password" size="50"
+ data-bind="value: networkProxy.password"/>
+ </div>
+ </div>
+ <div class="control-group">
+ <label class="control-label"
for="useNtlm">${$.i18n.prop('network.proxy.useNtlm')}</label>
+ <div class="controls">
+ <input type="checkbox" id="useNtlm" name="useNtlm"
data-bind="checked: networkProxy.useNtlm"/>
+ </div>
+ </div>
+
+ </fieldset>
+ <button id="network-proxy-btn-save" data-bind="click: save"
class="btn">${$.i18n.prop('save')}</button>
+ {{if networkProxy.modified()}}
+ ${("#network-proxy-btn-save").button('reset')}
+ {{/if}}
+ <button data-bind="click: displayGrid"
class="btn">${$.i18n.prop('cancel')}</button>
+ </form>
+</script>
+
+<script id="network-proxies-bulk-save-tmpl" type='text/html'>
+ {{if bulkSave()}}
+ <a data-bind="click: updateModifiedNetworkProxies" class="btn btn-danger"
href="#">${$.i18n.prop('save.all')}</a>
+ {{/if}}
+</script>
+<script id="network-proxy-delete-warning-tmpl" type='text/html'>
+ <div>
+ <span class="label
label-warning">${$.i18n.prop('warning.not.undone.operation')}</span>
+ </div>
</script>
\ No newline at end of file
