Author: olamy
Date: Thu Nov 15 12:54:06 2012
New Revision: 1409759
URL: http://svn.apache.org/viewvc?rev=1409759&view=rev
Log:
fix settings display
Modified:
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/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=1409759&r1=1409758&r2=1409759&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
Thu Nov 15 12:54:06 2012
@@ -916,7 +916,7 @@
<td>
<a class="btn btn-info btn-mini"
id="proxy-connectors-grid-remoterepo-settings-edit-${row.sourceRepoId()}-${row.targetRepoId()}"
data-original-title="${$.i18n.prop('proxy-connectors.grid.remoterepo.settings.popover.title')}"
- data-content="${buildSettings(row)}" data-bind="click:
showSettings">
+ data-content="${buildSettings(row)}" data-bind="click:
showSettings" data-html="true">
<i class="icon-question-sign icon-white"></i>
</a>
@@ -961,13 +961,13 @@
</script>
<script id='proxy-connectors-remote-settings-popover-tmpl' type='text/html'>
- <div>
+ <span>
{{if proxyId}}
${$.i18n.prop('proxy-connectors.remoterepo.settings.networkproxy')}:
${proxyConnector.proxyId}
{{else}}
${$.i18n.prop('proxy-connectors.remoterepo.settings.networkproxy')}:
${$.i18n.prop('none')}
{{/if}}
- <table class="table">
+ <table class="table table-bordered">
<thead>
<th colspan="2">${$.i18n.prop('proxy-connector.policies')}</th>
</thead>
@@ -981,7 +981,7 @@
{{/each}}
</tbody>
</table>
- </div>
+ </span>
</script>
<script id="proxy-connector-edit-form-tmpl" type='text/html'>
