aboutsummaryrefslogtreecommitdiffstats
path: root/archiva-modules/archiva-web/archiva-webapp-js
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2012-02-03 18:06:55 +0000
committerOlivier Lamy <olamy@apache.org>2012-02-03 18:06:55 +0000
commit09179a82c60b2f88269c2d5c937291843fcde9fa (patch)
tree568c0dc4507c6e333b54ce95e6a8e8383e963d5e /archiva-modules/archiva-web/archiva-webapp-js
parent3937e98cca45ad21c02bbbd70a10d37b9efde4ae (diff)
downloadarchiva-09179a82c60b2f88269c2d5c937291843fcde9fa.tar.gz
archiva-09179a82c60b2f88269c2d5c937291843fcde9fa.zip
fix modified css for bulk save due to bootstrap 2.0 upgrade
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1240269 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web/archiva-webapp-js')
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css5
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html14
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html2
3 files changed, 13 insertions, 8 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css
index 7671fa1c8..ef2c891d4 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css
@@ -43,4 +43,9 @@
.modified {
border:2px solid #fbc7c6;
+}
+
+.modified td{
+ border-top:2px solid #fbc7c6;
+ border:2px solid #fbc7c6;
} \ No newline at end of file
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html
index 1d2b1c375..7164a1783 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html
@@ -56,28 +56,28 @@
</thead>
<tbody>
{{each(i, row) itemsOnCurrentPage()}}
- <tr>
+ <tr data-bind="css:{ 'modified': row.modified()}">
{{each(j, columnDefinition) columns}}
{{var val = (typeof columnDefinition.rowText == 'function' ? columnDefinition.rowText(row) : row[columnDefinition.rowText])}}
- <td data-bind="css:{ 'modified': row.modified()}">
+ <td>
${val}
</td>
{{/each}}
{{if row.password()}}
- <td data-bind="css:{ 'modified': row.modified()}">*****</td>
+ <td>*****</td>
{{else}}
- <td data-bind="css:{ 'modified': row.modified()}"></td>
+ <td></td>
{{/if}}
- <td data-bind="css:{ 'modified': row.modified()}">
+ <td>
<a href="#" data-bind="click: function(){ editNetworkProxy(row) }">${$.i18n.prop('edit')}</a>
</td>
- <td data-bind="css:{ 'modified': row.modified()}">
+ <td>
<a href="#" data-bind="click: function(){ removeNetworkProxy(row) }">
<img src="images/edit-cut.png" title="${$.i18n.prop('delete')}"/>
</a>
</td>
{{if row.modified()}}
- <td data-bind="css:{ 'modified': row.modified()}">
+ <td>
<a href="#" data-bind="click: function(){ updateNetworkProxy(row) }">${$.i18n.prop('save')}</a>
</td>
{{else}}
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html
index 7530b7722..e70b514e8 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/topbar.html
@@ -48,7 +48,7 @@
</a>
</li>
<li class="pull-right">
- <form class="pull-right" action="">
+ <form class="form-search pull-right" action="">
<input type="text" placeholder="Search" />
</form>
</li>