diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/docs.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/docs.html
index af763b2e6..c02950247 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/docs.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/docs.html
@@ -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">
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
index 9be8eb52f..489e442dc 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
@@ -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() },
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/generics.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/generics.html
index a0fad0e45..9fd3989c8 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/generics.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/generics.html
@@ -46,21 +46,22 @@
     <a target="_blank" href="http://archiva.apache.org/">Apache Archiva&nbsp;-&nbsp;${version}</a>
   </div>
   <div class="pull-right">
-    Copyright &#169;  ${copyrightRange}  <a target="_blank" href="http://www.apache.org/">The Apache Software Foundation</a>
+    Copyright &#169; ${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>
 
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/menu.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/menu.html
index 504eaaf63..4be060d2f 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/menu.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/menu.html
@@ -20,17 +20,6 @@
   <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 -->
-    </ul>
-
-    <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 +30,20 @@
       <!-- /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-configuration']}"
+        data-bind="foreach: administrationMenuItems">
+      <!-- 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-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
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/modal.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/modal.html
index 976ebfa58..3ec4278ca 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/modal.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/modal.html
@@ -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">&#215;</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">&#215;</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">&#215;</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>
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
index 739cb1476..b35557f43 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
@@ -17,399 +17,435 @@
   ~ under the License.
 -->
 <script id="repositoriesMain" type="text/html">
-    <div class="page-header">
-      <h2><img src="images/system-file-manager-32-32.png"/>${$.i18n.prop('administration.repositories')}</h2>
+  <div class="page-header">
+    <h2><img src="images/system-file-manager-32-32.png"/>${$.i18n.prop('administration.repositories')}</h2>
+  </div>
+
+  <ul id="repositories-tabs" class="nav nav-tabs">
+    <li class="active">
+      <a data-toggle="tab" href="#managed-repositories-content">${$.i18n.prop('managedrepositories.grid.head')}</a>
+    </li>
+    <li>
+      <a data-toggle="tab" href="#remote-repositories-content">${$.i18n.prop('remoterepositories.grid.head')}</a>
+    </li>
+  </ul>
+  <div class="tab-content">
+    <div id="managed-repositories-content" class="tab-pane active">
+      <ul id="managed-repositories-pills" class="nav nav-pills">
+        <li class="active" id="managed-repositories-view-li">
+          <a data-toggle="tab" href="#managed-repositories-view" id="managed-repositories-view-a">${$.i18n.prop('managedrepositories.grid.tab.title')}</a>
+        </li>
+        <li id="managed-repository-edit-li">
+          <a data-toggle="tab" href="#managed-repository-edit">${$.i18n.prop('add')}</a>
+        </li>
+      </ul>
+      <div id="managed-repositories-tabs-content" class="pill-content">
+        <div id="managed-repositories-view" class="pill-pane active">
+          <div id="managed-repositories-bulk-save-btn"
+               data-bind='template:{name:"managed-repositories-bulk-save-tmpl"}'></div>
+          <table class="table table-striped table-bordered" id="managed-repositories-table"
+                 data-bind="simpleGrid: gridViewModel,simpleGridTemplate:'ko_managed-repositoriesGrid',pageLinksId:'managed-repositoriesPagination',data:'managedRepositories'">
+          </table>
+          <div id="managed-repositoriesPagination"></div>
+          <div id="managed-repositories-pom-snippet"></div>
+        </div>
+        <div id="managed-repository-edit" class="pill-pane" data-bind='template: {name:"managed-repository-edit-tmpl"}'>
+        </div>
+      </div>
     </div>
 
-      <ul id="repositories-tabs" class="nav nav-tabs">
-        <li class="active">
-          <a data-toggle="tab" href="#managed-repositories-content">${$.i18n.prop('managedrepositories.grid.head')}</a>
-        </li>  
-        <li>
-          <a data-toggle="tab" href="#remote-repositories-content">${$.i18n.prop('remoterepositories.grid.head')}</a>
+
+    <div id="remote-repositories-content" class="tab-pane">
+      <ul id="remote-repositories-pills" class="nav nav-pills">
+        <li class="active" id="remote-repositories-view-li">
+          <a data-toggle="tab" href="#remote-repositories-view" id="remote-repositories-view-a">${$.i18n.prop('remoterepositories.grid.tab.title')}</a>
         </li>
-      </ul>  
-      <div class="tab-content">
-    	<div id="managed-repositories-content" class="tab-pane active">
-            <ul id="managed-repositories-pills" class="nav nav-pills">
-              <li class="active" id="managed-repositories-view-li">
-                <a data-toggle="tab" href="#managed-repositories-view" id="managed-repositories-view-a">${$.i18n.prop('managedrepositories.grid.tab.title')}</a>
-              </li>
-              <li id="managed-repository-edit-li">
-                <a data-toggle="tab" href="#managed-repository-edit">${$.i18n.prop('add')}</a>
-              </li>
-            </ul>
-            <div id="managed-repositories-tabs-content" class="pill-content">
-              <div id="managed-repositories-view" class="pill-pane active">
-                <div id="managed-repositories-bulk-save-btn" data-bind='template:{name:"managed-repositories-bulk-save-tmpl"}'></div>
-                <table class="table table-striped table-bordered" id="managed-repositories-table"
-                       data-bind="simpleGrid: gridViewModel,simpleGridTemplate:'ko_managed-repositoriesGrid',pageLinksId:'managed-repositoriesPagination',data:'managedRepositories'">
-                </table>
-                <div id="managed-repositoriesPagination"></div>
-                <div id="managed-repositories-pom-snippet"></div>
-              </div>
-              <div id="managed-repository-edit" class="pill-pane" data-bind='template: {name:"managed-repository-edit-tmpl"}'>
-              </div>
-            </div>
-    	</div>
-
-
-    	<div id="remote-repositories-content" class="tab-pane">
-            <ul id="remote-repositories-pills" class="nav nav-pills">
-              <li class="active" id="remote-repositories-view-li">
-                <a data-toggle="tab" href="#remote-repositories-view" id="remote-repositories-view-a">${$.i18n.prop('remoterepositories.grid.tab.title')}</a>
-              </li>
-              <li id="remote-repository-edit-li">
-                <a data-toggle="tab" href="#remote-repository-edit">${$.i18n.prop('add')}</a>
-              </li>
-            </ul>
-            <div id="remote-repositories-tabs-content" class="pill-content">
-              <div id="remote-repositories-view" class="pill-pane active">
-                  <div id="remote-repositories-bulk-save-btn" data-bind='template:{name:"remote-repositories-bulk-save-tmpl"}'></div>
-                  <table class="table table-striped table-bordered" id="remote-repositories-table"
-                         data-bind="simpleGrid: gridViewModel,simpleGridTemplate:'ko_remote-repositoriesGrid',pageLinksId:'remote-repositoriesPagination',data:'remoteRepositories'">
-                  </table>
-                  <div id="remote-repositoriesPagination"></div>
-              </div>
-              <div id="remote-repository-edit" class="pill-pane" data-bind='template:{name:"remote-repository-edit-tmpl"}'>
-              </div>
-            </div>
-    	</div>
+        <li id="remote-repository-edit-li">
+          <a data-toggle="tab" href="#remote-repository-edit">${$.i18n.prop('add')}</a>
+        </li>
+      </ul>
+      <div id="remote-repositories-tabs-content" class="pill-content">
+        <div id="remote-repositories-view" class="pill-pane active">
+          <div id="remote-repositories-bulk-save-btn"
+               data-bind='template:{name:"remote-repositories-bulk-save-tmpl"}'></div>
+          <table class="table table-striped table-bordered" id="remote-repositories-table"
+                 data-bind="simpleGrid: gridViewModel,simpleGridTemplate:'ko_remote-repositoriesGrid',pageLinksId:'remote-repositoriesPagination',data:'remoteRepositories'">
+          </table>
+          <div id="remote-repositoriesPagination"></div>
+        </div>
+        <div id="remote-repository-edit" class="pill-pane" data-bind='template:{name:"remote-repository-edit-tmpl"}'>
+        </div>
       </div>
+    </div>
+  </div>
 </script>
 
 <script id='ko_managed-repositoriesGrid' type='text/html'>
   <thead>
-      <tr>
-        {{each(i, columnDefinition) columns}}
-          <th title="${ columnDefinition.title }">${ columnDefinition.headerText }</th>
-        {{/each}}
-        <th>Releases</th>
-        <th>Snapshots</th>
-        <th>${$.i18n.prop('managedrepository.actions')}</th>
-        <th>${$.i18n.prop('edit')}</th>
-        <th>${$.i18n.prop('delete')}</th>
-        <th>${$.i18n.prop('modified')}</th>
-        <th>${$.i18n.prop('managed.repository.rss.header')}</th>
-        <th title="${$.i18n.prop('managedrepository.stats')}">${$.i18n.prop('managedrepository.stats.grid.header')}</th>
-      </tr>
+  <tr>
+    {{each(i, columnDefinition) columns}}
+    <th title="${ columnDefinition.title }">${ columnDefinition.headerText }</th>
+    {{/each}}
+    <th>Releases</th>
+    <th>Snapshots</th>
+    <th>${$.i18n.prop('managedrepository.actions')}</th>
+    <th>${$.i18n.prop('edit')}</th>
+    <th>${$.i18n.prop('delete')}</th>
+    <th>${$.i18n.prop('modified')}</th>
+    <th>${$.i18n.prop('managed.repository.rss.header')}</th>
+    <th title="${$.i18n.prop('managedrepository.stats')}">${$.i18n.prop('managedrepository.stats.grid.header')}</th>
+  </tr>
   </thead>
   <tbody>
-      {{each(i, row) itemsOnCurrentPage()}}
-          <tr data-bind="css:{ 'modified': row.modified()}">
-            {{each(j, columnDefinition) columns}}
-              <td>${ typeof columnDefinition.rowText == 'function' ? columnDefinition.rowText(row) : row[columnDefinition.rowText] }</td>
-            {{/each}}
-            <td>
-            {{if row.releases() == true}}
-              <img src="images/weather-clear-22-22.png" title="${$.i18n.prop('release.included')}"/>
-            {{else}}
-              <img src="images/dialog-error-22-22.png" title="${$.i18n.prop('release.notincluded')}"/>
-            {{/if}}
-            </td>
+  {{each(i, row) itemsOnCurrentPage()}}
+  <tr data-bind="css:{ 'modified': row.modified()}">
+    {{each(j, columnDefinition) columns}}
+    <td>
+      ${ typeof columnDefinition.rowText == 'function' ? columnDefinition.rowText(row) : row[columnDefinition.rowText] }
+    </td>
+    {{/each}}
+    <td>
+      {{if row.releases() == true}}
+      <img src="images/weather-clear-22-22.png" title="${$.i18n.prop('release.included')}"/>
+      {{else}}
+      <img src="images/dialog-error-22-22.png" title="${$.i18n.prop('release.notincluded')}"/>
+      {{/if}}
+    </td>
 
-            <td>
-              {{if row.snapshots() == true}}
-                <img src="images/weather-clear-22-22.png" title="${$.i18n.prop('snapshots.included')}"/>
-              {{else}}
-                <img src="images/dialog-error-22-22.png" title="${$.i18n.prop('snapshots.notincluded')}"/>
-              {{/if}}
-            </td>
-              <td>
-                <div class="btn-group">
-                  <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">Actions<span class="caret"></span> </a>
-                  <ul class="dropdown-menu">
-                    <li>
-                        <a href="#" data-bind="click: function(){ scanNow(row) }">
+    <td>
+      {{if row.snapshots() == true}}
+      <img src="images/weather-clear-22-22.png" title="${$.i18n.prop('snapshots.included')}"/>
+      {{else}}
+      <img src="images/dialog-error-22-22.png" title="${$.i18n.prop('snapshots.notincluded')}"/>
+      {{/if}}
+    </td>
+    <td>
+      <div class="btn-group">
+        <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">Actions<span class="caret"></span> </a>
+        <ul class="dropdown-menu">
+          <li>
+            <a href="#" data-bind="click: function(){ scanNow(row) }">
                           <span class="btn btn-success">
                             <i class="icon-refresh icon-white"></i>
                           </span>
-                          ${$.i18n.prop('managedrepository.scan.grid.header')}
-                        </a>
-                    </li>
-                    <li>
-                        <a href="#" data-bind="click: function(){directoriesScan(row)}">
+              ${$.i18n.prop('managedrepository.scan.grid.header')}
+            </a>
+          </li>
+          <li>
+            <a href="#" data-bind="click: function(){directoriesScan(row)}">
                           <span class="btn btn-warning">
                             <i class="icon-wrench icon-white"></i>
                           </span>
-                          ${$.i18n.prop('managedrepository.scan.directories.grid.header')}
-                        </a>
-                    </li>
-                    <li>
-                        <a href="#" data-bind="click: function(){ showPomSnippet(row) }">
+              ${$.i18n.prop('managedrepository.scan.directories.grid.header')}
+            </a>
+          </li>
+          <li>
+            <a href="#" data-bind="click: function(){ showPomSnippet(row) }">
                             <span class="btn btn-info">
                               <i class="icon-user icon-white"></i>
                             </span>
-                            ${$.i18n.prop('managedrepository.pomsnippet')}
-                        </a>
-                    </li>
-                    <li>
-                      {{if row.stageRepoNeeded()}}
-                        stage
-                      {{/if}}
-                    </li>
-                    <li>
-                        <!-- todo check archiva-merge-repository operation -->
-                        <a href="#" data-bind="click: function(){ mergeRepo(row) }">
+              ${$.i18n.prop('managedrepository.pomsnippet')}
+            </a>
+          </li>
+          <li>
+            {{if row.stageRepoNeeded()}}
+            stage
+            {{/if}}
+          </li>
+          <li>
+            <!-- todo check archiva-merge-repository operation -->
+            <a href="#" data-bind="click: function(){ mergeRepo(row) }">
                             <span class="btn btn-info">
                               <i class="icon-share icon-white"></i>
                             </span>
-                            ${$.i18n.prop('managedrepository.mergerepo')}
-                        </a>
-                    </li>
-                  </ul>
-                </div>
-              </td>
-            <td>
-              <a href="#" data-bind="click: function(){ editManagedRepository(row) }">
+              ${$.i18n.prop('managedrepository.mergerepo')}
+            </a>
+          </li>
+        </ul>
+      </div>
+    </td>
+    <td>
+      <a href="#" data-bind="click: function(){ editManagedRepository(row) }">
                 <span class="btn btn-primary">
                   <i class="icon-pencil icon-white"/>
                 </span>
-              </a>
-            </td>
-            <td>
-              <a href="#" data-bind="click: function(){ removeManagedRepository(row) }">
+      </a>
+    </td>
+    <td>
+      <a href="#" data-bind="click: function(){ removeManagedRepository(row) }">
                 <span class="btn btn-danger">
                   <i class="icon-trash icon-white"/>
                 </span>
-              </a>
-            </td>
-            {{if row.modified()}}
-              <td>
-                <a href="#" class="btn btn-warning" data-bind="click: function(){ updateManagedRepository(row) }">${$.i18n.prop('save')}</a>
-              </td>
-            {{else}}
-              <td></td>
-            {{/if}}
-            <td>
-               <a href="${row.feedsUrl}"><img src="images/atom.gif" alt="" title="${$.i18n.prop('managedrepository.feeds')} ${row.name()}"/></a>
-            </td>
-            <td id="managedrepository-stats-${row.id()}">
-              <img src="images/utilities-system-monitor-22-22.png" data-original-title="${$.i18n.prop('managedrepository.stats')}"
-                   data-bind="event: { mouseover: function(){ showStats(row) }, mouseout: function(){ hideStats(row) },}"
-                   id="managedrepository-stats-img-${row.id()}"/>
-            </td>
-          </tr>
-      {{/each}}
+      </a>
+    </td>
+    {{if row.modified()}}
+    <td>
+      <a href="#" class="btn btn-warning" data-bind="click: function(){ updateManagedRepository(row) }">${$.i18n.prop('save')}</a>
+    </td>
+    {{else}}
+    <td></td>
+    {{/if}}
+    <td>
+      <a href="${row.feedsUrl}"><img src="images/atom.gif" alt=""
+                                     title="${$.i18n.prop('managedrepository.feeds')} ${row.name()}"/></a>
+    </td>
+    <td id="managedrepository-stats-${row.id()}">
+      <img src="images/utilities-system-monitor-22-22.png"
+           data-original-title="${$.i18n.prop('managedrepository.stats')}"
+           data-bind="event: { mouseover: function(){ showStats(row) }, mouseout: function(){ hideStats(row) },}"
+           id="managedrepository-stats-img-${row.id()}"/>
+    </td>
+  </tr>
+  {{/each}}
   </tbody>
 
 </script>
 
 <script id="managed-repository-edit-tmpl" type='text/html'>
-    <form id="managed-repository-edit-form" class="well form-horizontal">
-      <fieldset id="managed-repository-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.managedRepository.id}</span>
-            {{else}}
-              <input type="text" class="input-xlarge required" id="id" name="id" size="50"
-                     data-bind="value: managedRepository.id,css:{'uneditable-input': update},readonly:update"/>
-            {{/if}}
-              <a class="btn btn-warning btn-mini popover-doc" id="managedRepository-id-info-button"
-                 data-original-title="${$.i18n.prop('managedRepository.id.help.title')}"
-                 data-content="${$.i18n.prop('managedRepository.id.help.content')}">
-                  <i class="icon-question-sign icon-white"></i>
-              </a>
-          </div>
-        </div>
-        <div class="control-group">
-          <label class="control-label" for="name">${$.i18n.prop('name')}</label>
-          <div class="controls">
-            <input type="text" class="input-xlarge required" id="name" name="name" size="50"
-                   data-bind="value: managedRepository.name"/>
-              <a class="btn btn-warning btn-mini popover-doc" id="managedRepository-name-info-button"
-                 data-original-title="${$.i18n.prop('managedRepository.name.help.title')}"
-                 data-content="${$.i18n.prop('managedRepository.name.help.content')}">
-                  <i class="icon-question-sign icon-white"></i>
-              </a>
-          </div>
-        </div>
-        <div class="control-group">
-          <label class="control-label" for="location">${$.i18n.prop('directory')}</label>
-          <div class="controls">
-            <input type="text" class="input-xxlarge required" id="location" name="location" size="50" data-bind="value: managedRepository.location"/>
-              <a class="btn btn-warning btn-mini popover-doc" id="managedRepository-location-info-button"
-                 data-original-title="${$.i18n.prop('managedRepository.location.help.title')}"
-                 data-content="${$.i18n.prop('managedRepository.location.help.content')}">
-                  <i class="icon-question-sign icon-white"></i>
-              </a>
-          </div>
-        </div>
-        <div class="control-group">
-          <label class="control-label" for="indexDirectory">${$.i18n.prop('index.directory')}</label>
-          <div class="controls">
-            <input type="text" class="input-xxlarge" id="indexDirectory" name="indexDirectory" size="50" data-bind="value: managedRepository.indexDirectory"/>
-              <a class="btn btn-warning btn-mini popover-doc" id="managedRepository-indexDirectory-info-button"
-                 data-original-title="${$.i18n.prop('managedRepository.indexDirectory.help.title')}"
-                 data-content="${$.i18n.prop('managedRepository.indexDirectory.help.content')}">
-                  <i class="icon-question-sign icon-white"></i>
-              </a>
-          </div>
-        </div>
-        <div class="control-group">
-          <label class="control-label" for="layout">${$.i18n.prop('type')}</label>
-          <div class="controls">
-            <select id="layout" data-bind="options: availableLayouts,optionsText: 'label',optionsValue:'type',value: managedRepository.layout"/>
-          </div>
-        </div>
-        <div class="control-group">
-          <label class="control-label" for="cronExpression">${$.i18n.prop('cronExpression')}</label>
-          <div class="controls">
-            <input type="text" id="cronExpression" class="required" name="cronExpression" size="40" data-bind="value: managedRepository.cronExpression"/>
-            <a class="btn btn-warning btn-mini popover-doc" id="cronExpression-info-button"
-               data-original-title="${$.i18n.prop('cronExpression.help.title')}"
-               data-content="${$.i18n.prop('cronExpression.help.content')}">
-                <i class="icon-question-sign icon-white"></i>
-            </a>
-          </div>
-        </div>
-        <div class="control-group">
-          <label class="control-label" for="daysOlder">${$.i18n.prop('daysOlder')}</label>
-          <div class="controls">
-            <input type="text" id="daysOlder" class="digits" name="daysOlder" size="5" data-bind="value: managedRepository.daysOlder"/>
-              <a class="btn btn-warning btn-mini popover-doc" id="managedRepository-daysOlder-info-button"
-                 data-original-title="${$.i18n.prop('managedRepository.daysOlder.help.title')}"
-                 data-content="${$.i18n.prop('managedRepository.daysOlder.help.content')}">
-                  <i class="icon-question-sign icon-white"></i>
-              </a>
-          </div>
-        </div>
-        <div class="control-group">
-          <label class="control-label" for="retentionCount">${$.i18n.prop('retentionCount')}</label>
-          <div class="controls">
-            <input type="text" id="retentionCount" name="retentionCount" size="5" data-bind="value: managedRepository.retentionCount"/>
-              <a class="btn btn-warning btn-mini popover-doc" id="managedRepository-retentionCount-info-button"
-                 data-original-title="${$.i18n.prop('managedRepository.retentionCount.help.title')}"
-                 data-content="${$.i18n.prop('managedRepository.retentionCount.help.content')}">
-                  <i class="icon-question-sign icon-white"></i>
-              </a>
-          </div>
-        </div>
-        <div class="control-group">
-          <label class="control-label" for="description">${$.i18n.prop('description')}</label>
-          <div class="controls">
-            <textarea rows="3" id="description" name="description" data-bind="value: managedRepository.description"></textarea>
-              <a class="btn btn-warning btn-mini popover-doc" id="managedRepository-description-info-button"
-                 data-original-title="${$.i18n.prop('managedRepository.description.help.title')}"
-                 data-content="${$.i18n.prop('managedRepository.description.help.content')}">
-                  <i class="icon-question-sign icon-white"></i>
-              </a>
-          </div>
-        </div>
-        <div class="control-group">
-          <label class="control-label" for="releases">${$.i18n.prop('releases')}</label>
-          <div class="controls">
-            <input type="checkbox" id="releases" name="releases" size="5" data-bind="checked: managedRepository.releases"/>
-              <a class="btn btn-warning btn-mini popover-doc" id="managedRepository-release-info-button"
-                 data-original-title="${$.i18n.prop('managedRepository.release.help.title')}"
-                 data-content="${$.i18n.prop('managedRepository.release.help.content')}">
-                  <i class="icon-question-sign icon-white"></i>
-              </a>
-          </div>
-        </div>
-        <div class="control-group">
-          <label class="control-label" for="snapshots">${$.i18n.prop('snapshots')}</label>
-          <div class="controls">
-            <input type="checkbox" id="snapshots" name="snapshots" size="5" data-bind="checked: managedRepository.snapshots"/>
-              <a class="btn btn-warning btn-mini popover-doc" id="managedRepository-snapshots-info-button"
-                 data-original-title="${$.i18n.prop('managedRepository.snapshots.help.title')}"
-                 data-content="${$.i18n.prop('managedRepository.snapshots.help.content')}">
-                  <i class="icon-question-sign icon-white"></i>
-              </a>
-          </div>
-        </div>
-        <div class="control-group">
-          <label class="control-label" for="blockRedeployments">${$.i18n.prop('blockRedeployments')}</label>
-          <div class="controls">
-            <input type="checkbox" id="blockRedeployments" name="blockRedeployments" size="5" data-bind="checked: managedRepository.blockRedeployments"/>
-              <a class="btn btn-warning btn-mini popover-doc" id="managedRepository-blockRedeployments-info-button"
-                 data-original-title="${$.i18n.prop('managedRepository.blockRedeployments.help.title')}"
-                 data-content="${$.i18n.prop('managedRepository.blockRedeployments.help.content')}">
-                  <i class="icon-question-sign icon-white"></i>
-              </a>
-          </div>
-        </div>
-        <div class="control-group">
-          <label class="control-label" for="scanned">${$.i18n.prop('scanned')}</label>
-          <div class="controls">
-            <input type="checkbox" id="scanned" name="scanned" size="5" data-bind="checked: managedRepository.scanned"/>
-              <a class="btn btn-warning btn-mini popover-doc" id="managedRepository-scanned-info-button"
-                 data-original-title="${$.i18n.prop('managedRepository.scanned.help.title')}"
-                 data-content="${$.i18n.prop('managedRepository.scanned.help.content')}">
-                  <i class="icon-question-sign icon-white"></i>
-              </a>
-          </div>
-        </div>
-        <div class="control-group">
-          <label class="control-label" for="deleteReleasedSnapshots">${$.i18n.prop('deleteReleasedSnapshots')}</label>
-          <div class="controls">
-            <input type="checkbox" id="deleteReleasedSnapshots" name="deleteReleasedSnapshots" size="5"
-                   data-bind="checked: managedRepository.deleteReleasedSnapshots"/>
-              <a class="btn btn-warning btn-mini popover-doc" id="managedRepository-deleteReleasedSnapshots-info-button"
-                 data-original-title="${$.i18n.prop('managedRepository.deleteReleasedSnapshots.help.title')}"
-                 data-content="${$.i18n.prop('managedRepository.deleteReleasedSnapshots.help.content')}">
-                  <i class="icon-question-sign icon-white"></i>
-              </a>
-          </div>
-        </div>
-        <div class="control-group">
-          <label class="control-label" for="stageRepoNeeded">${$.i18n.prop('stageRepoNeeded')}</label>
-          <div class="controls">
-            <input type="checkbox" id="stageRepoNeeded" name="stageRepoNeeded" size="5"
-                   data-bind="checked: managedRepository.stageRepoNeeded"/>
-              <a class="btn btn-warning btn-mini popover-doc" id="managedRepository-stageRepoNeeded-info-button"
-                 data-original-title="${$.i18n.prop('managedRepository.stageRepoNeeded.help.title')}"
-                 data-content="${$.i18n.prop('managedRepository.stageRepoNeeded.help.content')}">
-                  <i class="icon-question-sign icon-white"></i>
-              </a>
-          </div>
-        </div>
-        <div class="control-group">
-          <label class="control-label" for="skipPackedIndexCreation">${$.i18n.prop('skipPackedIndexCreation')}</label>
-          <div class="controls">
-            <input type="checkbox" id="skipPackedIndexCreation" name="skipPackedIndexCreation" size="5"
-                   data-bind="checked: managedRepository.skipPackedIndexCreation"/>
-            <a class="btn btn-warning btn-mini popover-doc" id="skipPackedIndexCreation-info-button"
-               data-original-title="${$.i18n.prop('skipPackedIndexCreation.help.title')}"
-               data-content="${$.i18n.prop('skipPackedIndexCreation.help.content')}">
-                <i class="icon-question-sign icon-white"></i>
-            </a>
-          </div>
-        </div>
+  <form id="managed-repository-edit-form" class="well form-horizontal">
+    <fieldset id="managed-repository-edit-fieldset">
+      <div class="control-group">
+        <label class="control-label" for="id">${$.i18n.prop('id')}</label>
 
-      </fieldset>
-      <button data-bind="click: save" class="btn" id="managed-repository-save-button">${$.i18n.prop('save')}</button>
-      <button data-bind="click: displayGrid" class="btn">${$.i18n.prop('cancel')}</button>
-    </form>
+        <div class="controls">
+          {{if update}}
+          <span class="uneditable-input">${$data.managedRepository.id}</span>
+          {{else}}
+          <input type="text" class="input-xlarge required" id="id" name="id" size="50"
+                 data-bind="value: managedRepository.id,css:{'uneditable-input': update},readonly:update"/>
+          {{/if}}
+          <a class="btn btn-warning btn-mini popover-doc" id="managedRepository-id-info-button"
+             data-original-title="${$.i18n.prop('managedRepository.id.help.title')}"
+             data-content="${$.i18n.prop('managedRepository.id.help.content')}">
+            <i class="icon-question-sign icon-white"></i>
+          </a>
+        </div>
+      </div>
+      <div class="control-group">
+        <label class="control-label" for="name">${$.i18n.prop('name')}</label>
+
+        <div class="controls">
+          <input type="text" class="input-xlarge required" id="name" name="name" size="50"
+                 data-bind="value: managedRepository.name"/>
+          <a class="btn btn-warning btn-mini popover-doc" id="managedRepository-name-info-button"
+             data-original-title="${$.i18n.prop('managedRepository.name.help.title')}"
+             data-content="${$.i18n.prop('managedRepository.name.help.content')}">
+            <i class="icon-question-sign icon-white"></i>
+          </a>
+        </div>
+      </div>
+      <div class="control-group">
+        <label class="control-label" for="location">${$.i18n.prop('directory')}</label>
+
+        <div class="controls">
+          <input type="text" class="input-xxlarge required" id="location" name="location" size="50"
+                 data-bind="value: managedRepository.location"/>
+          <a class="btn btn-warning btn-mini popover-doc" id="managedRepository-location-info-button"
+             data-original-title="${$.i18n.prop('managedRepository.location.help.title')}"
+             data-content="${$.i18n.prop('managedRepository.location.help.content')}">
+            <i class="icon-question-sign icon-white"></i>
+          </a>
+        </div>
+      </div>
+      <div class="control-group">
+        <label class="control-label" for="indexDirectory">${$.i18n.prop('index.directory')}</label>
+
+        <div class="controls">
+          <input type="text" class="input-xxlarge" id="indexDirectory" name="indexDirectory" size="50"
+                 data-bind="value: managedRepository.indexDirectory"/>
+          <a class="btn btn-warning btn-mini popover-doc" id="managedRepository-indexDirectory-info-button"
+             data-original-title="${$.i18n.prop('managedRepository.indexDirectory.help.title')}"
+             data-content="${$.i18n.prop('managedRepository.indexDirectory.help.content')}">
+            <i class="icon-question-sign icon-white"></i>
+          </a>
+        </div>
+      </div>
+      <div class="control-group">
+        <label class="control-label" for="layout">${$.i18n.prop('type')}</label>
+
+        <div class="controls">
+          <select id="layout"
+                  data-bind="options: availableLayouts,optionsText: 'label',optionsValue:'type',value: managedRepository.layout"/>
+        </div>
+      </div>
+      <div class="control-group">
+        <label class="control-label" for="cronExpression">${$.i18n.prop('cronExpression')}</label>
+
+        <div class="controls">
+          <input type="text" id="cronExpression" class="required" name="cronExpression" size="40"
+                 data-bind="value: managedRepository.cronExpression"/>
+          <a class="btn btn-warning btn-mini popover-doc" id="cronExpression-info-button"
+             data-original-title="${$.i18n.prop('cronExpression.help.title')}"
+             data-content="${$.i18n.prop('cronExpression.help.content')}">
+            <i class="icon-question-sign icon-white"></i>
+          </a>
+        </div>
+      </div>
+      <div class="control-group">
+        <label class="control-label" for="daysOlder">${$.i18n.prop('daysOlder')}</label>
+
+        <div class="controls">
+          <input type="text" id="daysOlder" class="digits" name="daysOlder" size="5"
+                 data-bind="value: managedRepository.daysOlder"/>
+          <a class="btn btn-warning btn-mini popover-doc" id="managedRepository-daysOlder-info-button"
+             data-original-title="${$.i18n.prop('managedRepository.daysOlder.help.title')}"
+             data-content="${$.i18n.prop('managedRepository.daysOlder.help.content')}">
+            <i class="icon-question-sign icon-white"></i>
+          </a>
+        </div>
+      </div>
+      <div class="control-group">
+        <label class="control-label" for="retentionCount">${$.i18n.prop('retentionCount')}</label>
+
+        <div class="controls">
+          <input type="text" id="retentionCount" name="retentionCount" size="5"
+                 data-bind="value: managedRepository.retentionCount"/>
+          <a class="btn btn-warning btn-mini popover-doc" id="managedRepository-retentionCount-info-button"
+             data-original-title="${$.i18n.prop('managedRepository.retentionCount.help.title')}"
+             data-content="${$.i18n.prop('managedRepository.retentionCount.help.content')}">
+            <i class="icon-question-sign icon-white"></i>
+          </a>
+        </div>
+      </div>
+      <div class="control-group">
+        <label class="control-label" for="description">${$.i18n.prop('description')}</label>
+
+        <div class="controls">
+          <textarea rows="3" id="description" name="description"
+                    data-bind="value: managedRepository.description"></textarea>
+          <a class="btn btn-warning btn-mini popover-doc" id="managedRepository-description-info-button"
+             data-original-title="${$.i18n.prop('managedRepository.description.help.title')}"
+             data-content="${$.i18n.prop('managedRepository.description.help.content')}">
+            <i class="icon-question-sign icon-white"></i>
+          </a>
+        </div>
+      </div>
+      <div class="control-group">
+        <label class="control-label" for="releases">${$.i18n.prop('releases')}</label>
+
+        <div class="controls">
+          <input type="checkbox" id="releases" name="releases" size="5"
+                 data-bind="checked: managedRepository.releases"/>
+          <a class="btn btn-warning btn-mini popover-doc" id="managedRepository-release-info-button"
+             data-original-title="${$.i18n.prop('managedRepository.release.help.title')}"
+             data-content="${$.i18n.prop('managedRepository.release.help.content')}">
+            <i class="icon-question-sign icon-white"></i>
+          </a>
+        </div>
+      </div>
+      <div class="control-group">
+        <label class="control-label" for="snapshots">${$.i18n.prop('snapshots')}</label>
+
+        <div class="controls">
+          <input type="checkbox" id="snapshots" name="snapshots" size="5"
+                 data-bind="checked: managedRepository.snapshots"/>
+          <a class="btn btn-warning btn-mini popover-doc" id="managedRepository-snapshots-info-button"
+             data-original-title="${$.i18n.prop('managedRepository.snapshots.help.title')}"
+             data-content="${$.i18n.prop('managedRepository.snapshots.help.content')}">
+            <i class="icon-question-sign icon-white"></i>
+          </a>
+        </div>
+      </div>
+      <div class="control-group">
+        <label class="control-label" for="blockRedeployments">${$.i18n.prop('blockRedeployments')}</label>
+
+        <div class="controls">
+          <input type="checkbox" id="blockRedeployments" name="blockRedeployments" size="5"
+                 data-bind="checked: managedRepository.blockRedeployments"/>
+          <a class="btn btn-warning btn-mini popover-doc" id="managedRepository-blockRedeployments-info-button"
+             data-original-title="${$.i18n.prop('managedRepository.blockRedeployments.help.title')}"
+             data-content="${$.i18n.prop('managedRepository.blockRedeployments.help.content')}">
+            <i class="icon-question-sign icon-white"></i>
+          </a>
+        </div>
+      </div>
+      <div class="control-group">
+        <label class="control-label" for="scanned">${$.i18n.prop('scanned')}</label>
+
+        <div class="controls">
+          <input type="checkbox" id="scanned" name="scanned" size="5" data-bind="checked: managedRepository.scanned"/>
+          <a class="btn btn-warning btn-mini popover-doc" id="managedRepository-scanned-info-button"
+             data-original-title="${$.i18n.prop('managedRepository.scanned.help.title')}"
+             data-content="${$.i18n.prop('managedRepository.scanned.help.content')}">
+            <i class="icon-question-sign icon-white"></i>
+          </a>
+        </div>
+      </div>
+      <div class="control-group">
+        <label class="control-label" for="deleteReleasedSnapshots">${$.i18n.prop('deleteReleasedSnapshots')}</label>
+
+        <div class="controls">
+          <input type="checkbox" id="deleteReleasedSnapshots" name="deleteReleasedSnapshots" size="5"
+                 data-bind="checked: managedRepository.deleteReleasedSnapshots"/>
+          <a class="btn btn-warning btn-mini popover-doc" id="managedRepository-deleteReleasedSnapshots-info-button"
+             data-original-title="${$.i18n.prop('managedRepository.deleteReleasedSnapshots.help.title')}"
+             data-content="${$.i18n.prop('managedRepository.deleteReleasedSnapshots.help.content')}">
+            <i class="icon-question-sign icon-white"></i>
+          </a>
+        </div>
+      </div>
+      <div class="control-group">
+        <label class="control-label" for="stageRepoNeeded">${$.i18n.prop('stageRepoNeeded')}</label>
+
+        <div class="controls">
+          <input type="checkbox" id="stageRepoNeeded" name="stageRepoNeeded" size="5"
+                 data-bind="checked: managedRepository.stageRepoNeeded"/>
+          <a class="btn btn-warning btn-mini popover-doc" id="managedRepository-stageRepoNeeded-info-button"
+             data-original-title="${$.i18n.prop('managedRepository.stageRepoNeeded.help.title')}"
+             data-content="${$.i18n.prop('managedRepository.stageRepoNeeded.help.content')}">
+            <i class="icon-question-sign icon-white"></i>
+          </a>
+        </div>
+      </div>
+      <div class="control-group">
+        <label class="control-label" for="skipPackedIndexCreation">${$.i18n.prop('skipPackedIndexCreation')}</label>
+
+        <div class="controls">
+          <input type="checkbox" id="skipPackedIndexCreation" name="skipPackedIndexCreation" size="5"
+                 data-bind="checked: managedRepository.skipPackedIndexCreation"/>
+          <a class="btn btn-warning btn-mini popover-doc" id="skipPackedIndexCreation-info-button"
+             data-original-title="${$.i18n.prop('skipPackedIndexCreation.help.title')}"
+             data-content="${$.i18n.prop('skipPackedIndexCreation.help.content')}">
+            <i class="icon-question-sign icon-white"></i>
+          </a>
+        </div>
+      </div>
+
+    </fieldset>
+    <button data-bind="click: save" class="btn" id="managed-repository-save-button">${$.i18n.prop('save')}</button>
+    <button data-bind="click: displayGrid" class="btn">${$.i18n.prop('cancel')}</button>
+  </form>
 </script>
 
 <script id="managed-repository-delete-warning-tmpl" type='text/html'>
   <div>
     <span class="label label-warning">${$.i18n.prop('warning.not.undone.operation')}</span>
+
     <div>
       <span><strong>${$.i18n.prop('managedrepository.delete.warning.message')}</strong>.</span>
+
       <div>${$.i18n.prop('id')}: ${id()}</div>
       <div>${$.i18n.prop('name')}: ${name()}</div>
     </div>
     <div>
-        ${$.i18n.prop('managedrepository.delete.content')}: <input type="checkbox" id="managedrepository-deletecontent">
+      ${$.i18n.prop('managedrepository.delete.content')}: <input type="checkbox" id="managedrepository-deletecontent">
     </div>
   </div>
 </script>
 
 <script type="text/html" id="remote-repository-delete-modal-tmpl">
-    <div>
-      <span class="label label-warning">${$.i18n.prop('warning.not.undone.operation')}</span>
-    </div>
+  <div>
+    <span class="label label-warning">${$.i18n.prop('warning.not.undone.operation')}</span>
+  </div>
 </script>
 
 <script id="managed-repository-location-warning-tmpl" type='text/html'>
   <div>
     <span class="label label-warning">${$.i18n.prop('managedrepository.location.already.exists')}</span>
+
     <div>
       <span><strong>${$.i18n.prop('managedrepository.location.already.exists.warning.message')}</strong>.</span>
+
       <div>${$.i18n.prop('id')}: ${id()}</div>
       <div>${$.i18n.prop('name')}: ${name()}</div>
     </div>
@@ -440,61 +476,63 @@
 
 <script id='ko_remote-repositoriesGrid' type='text/html'>
   <thead>
-      <tr>
-        {{each(i, columnDefinition) columns}}
-          <th title="${ columnDefinition.title }">${ columnDefinition.headerText }</th>
-        {{/each}}
-        <th>${$.i18n.prop('edit')}</th>
-        <th>${$.i18n.prop('delete')}</th>
-        <th>${$.i18n.prop('modified')}</th>
-        <th>${$.i18n.prop('description')}</th>
-        <th>${$.i18n.prop('remoterepository.downloadremoteindex')}</th>
-      </tr>
+  <tr>
+    {{each(i, columnDefinition) columns}}
+    <th title="${ columnDefinition.title }">${ columnDefinition.headerText }</th>
+    {{/each}}
+    <th>${$.i18n.prop('edit')}</th>
+    <th>${$.i18n.prop('delete')}</th>
+    <th>${$.i18n.prop('modified')}</th>
+    <th>${$.i18n.prop('description')}</th>
+    <th>${$.i18n.prop('remoterepository.downloadremoteindex')}</th>
+  </tr>
   </thead>
   <tbody>
-      {{each(i, row) itemsOnCurrentPage()}}
-          <tr data-bind="css:{ 'modified': row.modified()}">
-            {{each(j, columnDefinition) columns}}
-              <td>${ typeof columnDefinition.rowText == 'function' ? columnDefinition.rowText(row) : row[columnDefinition.rowText] }</td>
-            {{/each}}
-            <td>
-              <a href="#" data-bind="click: function(){ editRemoteRepository(row) }">
+  {{each(i, row) itemsOnCurrentPage()}}
+  <tr data-bind="css:{ 'modified': row.modified()}">
+    {{each(j, columnDefinition) columns}}
+    <td>
+      ${ typeof columnDefinition.rowText == 'function' ? columnDefinition.rowText(row) : row[columnDefinition.rowText] }
+    </td>
+    {{/each}}
+    <td>
+      <a href="#" data-bind="click: function(){ editRemoteRepository(row) }">
                 <span class="btn btn-primary">
                   <i class="icon-pencil icon-white"/>
                 </span>
-              </a>
-            </td>
-            <td>
-              <a href="#" data-bind="click: function(){ removeRemoteRepository(row) }">
+      </a>
+    </td>
+    <td>
+      <a href="#" data-bind="click: function(){ removeRemoteRepository(row) }">
                 <span class="btn btn-danger">
                   <i class="icon-trash icon-white"/>
                 </span>
-              </a>
-            </td>
-            {{if row.modified()}}
-              <td>
-                <a href="#" class="btn btn-warning" data-bind="click: function(){ updateRemoteRepository(row) }">${$.i18n.prop('save')}</a>
-              </td>
-            {{else}}
-              <td></td>
-            {{/if}}
-            <td>
-                {{if row.description()}}
-                <a class="btn btn-warning btn-mini popover-doc" id="remoterepo-description-help"
-                   data-content="${row.description()}" data-title="${$.i18n.prop('description')}">
-                    <i class="icon-question-sign icon-white"></i>
-                </a>
-                {{/if}}
-            </td>
-            <td>
-              <a href="#" data-bind="click: function(){ scheduleDownloadRemoteIndex(row) }">
+      </a>
+    </td>
+    {{if row.modified()}}
+    <td>
+      <a href="#" class="btn btn-warning" data-bind="click: function(){ updateRemoteRepository(row) }">${$.i18n.prop('save')}</a>
+    </td>
+    {{else}}
+    <td></td>
+    {{/if}}
+    <td>
+      {{if row.description()}}
+      <a class="btn btn-warning btn-mini popover-doc" id="remoterepo-description-help"
+         data-content="${row.description()}" data-title="${$.i18n.prop('description')}">
+        <i class="icon-question-sign icon-white"></i>
+      </a>
+      {{/if}}
+    </td>
+    <td>
+      <a href="#" data-bind="click: function(){ scheduleDownloadRemoteIndex(row) }">
                 <span class="btn btn-success">
                   <i class="icon-refresh icon-white"/>
                 </span>
-              </a>
-            </td>
-          </tr>
-      {{/each}}
+      </a>
+    </td>
+  </tr>
+  {{/each}}
   </tbody>
 
 </script>
@@ -503,187 +541,221 @@
 <script id="remote-repository-edit-tmpl" type='text/html'>
 
 
-    <form id="remote-repository-edit-form" class="well form-horizontal">
-      <fieldset id="remote-repository-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.remoteRepository.id}</span>
-            {{else}}
-              <input type="text" class="input-xlarge required" id="id" name="id" size="50"
-                     data-bind="value: remoteRepository.id,css:{'uneditable-input': update},readonly:update"/>
-            {{/if}}
-          </div>
-        </div>
-        <div class="control-group">
-          <label class="control-label" for="name">${$.i18n.prop('name')}</label>
-          <div class="controls">
-            <input type="text" class="input-xlarge required" id="name" name="name" size="50"
-                   data-bind="value: remoteRepository.name"/>
-          </div>
-        </div>
-        <div class="control-group">
-          <label class="control-label" for="url">${$.i18n.prop('url')}</label>
-          <div class="controls">
-            <input type="text" class="input-xxlarge required" id="url" name="location" size="50" data-bind="value: remoteRepository.url"/>
-          </div>
-        </div>
-        <div class="control-group">
-          <label class="control-label" for="userName">${$.i18n.prop('username')}</label>
-          <div class="controls">
-            <input type="text" class="input-xlarge" id="userName" name="userName" size="50" data-bind="value: remoteRepository.userName"/>
-          </div>
-        </div>
-        <div class="control-group">
-          <label class="control-label" for="password">${$.i18n.prop('password')}</label>
-           <div class="controls">
-             <input type="password" class="input-xlarge" id="password" name="password" size="50" data-bind="value: remoteRepository.password"/>
-          </div>
-        </div>
-        <div class="control-group">
-          <label class="control-label" for="timeout">${$.i18n.prop('timeout')}</label>
-          <div class="controls">
-            <input type="text" id="timeout" class="digits" name="daysOlder" size="5" data-bind="value: remoteRepository.timeout"/>
-          </div>
-        </div>
+  <form id="remote-repository-edit-form" class="well form-horizontal">
+    <fieldset id="remote-repository-edit-fieldset">
+      <div class="control-group">
+        <label class="control-label" for="id">${$.i18n.prop('id')}</label>
 
-        <div class="control-group">
-          <label class="control-label" for="layout">${$.i18n.prop('type')}</label>
-          <div class="controls">
-            <select id="layout" data-bind="options: availableLayouts,optionsText: 'label',optionsValue:'type',value: remoteRepository.layout"/>
-          </div>
-        </div>
-        <div class="control-group">
-          <label class="control-label" for="downloadRemoteIndex">${$.i18n.prop('downloadRemoteIndex')}</label>
-          <div class="controls">
-            <input type="checkbox" id="downloadRemoteIndex" name="downloadRemoteIndex" size="5" data-bind="checked: remoteRepository.downloadRemoteIndex"/>
-          </div>
+        <div class="controls">
+          {{if update}}
+          <span class="uneditable-input">${$data.remoteRepository.id}</span>
+          {{else}}
+          <input type="text" class="input-xlarge required" id="id" name="id" size="50"
+                 data-bind="value: remoteRepository.id,css:{'uneditable-input': update},readonly:update"/>
+          {{/if}}
         </div>
+      </div>
+      <div class="control-group">
+        <label class="control-label" for="name">${$.i18n.prop('name')}</label>
 
-        <div class="control-group">
-          <label class="control-label" for="remoteIndexUrl">${$.i18n.prop('remoteIndexUrl')}</label>
-          <div class="controls">
-            <input type="text" class="input-xxlarge" id="remoteIndexUrl" name="remoteIndexUrl" size="5" data-bind="value: remoteRepository.remoteIndexUrl"/>
-          </div>
-        </div>
-        <div class="control-group">
-          <label class="control-label" for="cronExpression">${$.i18n.prop('cronExpression')}</label>
-          <div class="controls">
-            <input type="text" id="cronExpression" name="cronExpression" size="40" data-bind="value: remoteRepository.cronExpression"/>
-            <a class="btn btn-warning btn-mini popover-doc" id="cronExpression-info-button"
-               data-original-title="${$.i18n.prop('cronExpression.help.title')}"
-               data-content="${$.i18n.prop('cronExpression.help.content')}">
-                <i class="icon-question-sign icon-white"></i>
-            </a>
-          </div>
-        </div>
-        <div class="control-group">
-          <label class="control-label" for="indexDirectory">${$.i18n.prop('index.directory')}</label>
-          <div class="controls">
-            <input type="text" class="input-xlarge" id="indexDirectory" name="indexDirectory" size="50" data-bind="value: remoteRepository.indexDirectory"/>
-          </div>
-        </div>
-        <div class="control-group">
-          <label class="control-label" for="remoteDownloadTimeout">${$.i18n.prop('remoteDownloadTimeout')}</label>
-          <div class="controls">
-            <input type="text" id="remoteDownloadTimeout" class="digits" name="remoteDownloadTimeout" size="5"
-                   data-bind="value: remoteRepository.remoteDownloadTimeout"/>
-          </div>
+        <div class="controls">
+          <input type="text" class="input-xlarge required" id="name" name="name" size="50"
+                 data-bind="value: remoteRepository.name"/>
         </div>
+      </div>
+      <div class="control-group">
+        <label class="control-label" for="url">${$.i18n.prop('url')}</label>
 
-        <div class="control-group">
-          <label class="control-label" for="remoteDownloadNetworkProxyId">${$.i18n.prop('remoteDownloadNetworkProxyId')}</label>
-          <div class="controls">
-            <select id="remoteDownloadNetworkProxyId" data-bind="options: networkProxies, optionsText: 'id',optionsValue:'id', value: remoteRepository.remoteDownloadNetworkProxyId, optionsCaption: 'Choose...'"></select>
-          </div>
+        <div class="controls">
+          <input type="text" class="input-xxlarge required" id="url" name="location" size="50"
+                 data-bind="value: remoteRepository.url"/>
         </div>
+      </div>
+      <div class="control-group">
+        <label class="control-label" for="userName">${$.i18n.prop('username')}</label>
 
-        <div class="control-group">
-          <label class="control-label" for="downloadRemoteIndexOnStartup">${$.i18n.prop('downloadRemoteIndexOnStartup')}</label>
-          <div class="controls">
-            <input type="checkbox" id="downloadRemoteIndexOnStartup" name="downloadRemoteIndexOnStartup"
-                   data-bind="checked: remoteRepository.downloadRemoteIndexOnStartup"/>
-          </div>
+        <div class="controls">
+          <input type="text" class="input-xlarge" id="userName" name="userName" size="50"
+                 data-bind="value: remoteRepository.userName"/>
         </div>
+      </div>
+      <div class="control-group">
+        <label class="control-label" for="password">${$.i18n.prop('password')}</label>
 
-        <div class="control-group">
-          <label class="control-label" for="daysOlder">${$.i18n.prop('description')}</label>
-          <div class="controls">
-            <textarea rows="3" id="description" name="description" data-bind="value: remoteRepository.description"></textarea>
-          </div>
+        <div class="controls">
+          <input type="password" class="input-xlarge" id="password" name="password" size="50"
+                 data-bind="value: remoteRepository.password"/>
         </div>
+      </div>
+      <div class="control-group">
+        <label class="control-label" for="timeout">${$.i18n.prop('timeout')}</label>
 
-        <div class="row-fluid">
-          <div class="control-group span6">
-            <h4>${$.i18n.prop('remoteRepository.extraParametersEntries')}</h4>
-            <div id="extra-parameters-error"></div>
-            <table class="table">
-              <thead>
-                <th>${$.i18n.prop('key')}:<input type="text" id="extraParameter-key"/></th>
-                <th>${$.i18n.prop('value')}:<input type="text" id="extraParameter-value"/></th>
-                <th><a href="#" data-bind="click: function(){ addExtraParameter() }">${$.i18n.prop('add')}</a></th>
-              </thead>
-              <tbody>
-                {{each(i, extraParameterEntry) remoteRepository.extraParametersEntries}}
-                <tr>
-                  <td>${extraParameterEntry.key}</td>
-                  <td>${extraParameterEntry.value}</td>
-                  <td><a href="#" data-bind="click: function(){ deleteExtraParameter(extraParameterEntry.key)}">${$.i18n.prop('delete')}</a></td>
-                </tr>
-                {{/each}}
-              </tbody>
-            </table>
-          </div>
+        <div class="controls">
+          <input type="text" id="timeout" class="digits" name="daysOlder" size="5"
+                 data-bind="value: remoteRepository.timeout"/>
         </div>
+      </div>
 
-        <div class="row-fluid">
-          <div class="control-group span6">
-            <h4>${$.i18n.prop('remoteRepository.extraHeadersEntries')}</h4>
-            <div id="extra-headers-error"></div>
-            <table class="table">
-              <thead>
-                <th>${$.i18n.prop('key')}:<input type="text" id="extraHeader-key"/></th>
-                <th>${$.i18n.prop('value')}:<input type="text" id="extraHeader-value"/></th>
-                <th><a href="#" data-bind="click: function(){ addExtraHeader() }">${$.i18n.prop('add')}</a></th>
-              </thead>
-              <tbody>
-                {{each(i, extraHeaderEntry) remoteRepository.extraHeadersEntries}}
-                <tr>
-                  <td>${extraHeaderEntry.key}</td>
-                  <td>${extraHeaderEntry.value}</td>
-                  <td><a href="#" data-bind="click: function(){ deleteExtraHeader(extraHeaderEntry.key)}">${$.i18n.prop('delete')}</a></td>
-                </tr>
-                {{/each}}
-              </tbody>
-            </table>
-          </div>
+      <div class="control-group">
+        <label class="control-label" for="layout">${$.i18n.prop('type')}</label>
+
+        <div class="controls">
+          <select id="layout"
+                  data-bind="options: availableLayouts,optionsText: 'label',optionsValue:'type',value: remoteRepository.layout"/>
         </div>
+      </div>
+      <div class="control-group">
+        <label class="control-label" for="downloadRemoteIndex">${$.i18n.prop('downloadRemoteIndex')}</label>
 
-      </fieldset>
-      <button data-bind="click: save" data-loading-text="${$.i18n.prop('common.loading')}" id="remote-repository-save-button" class="btn">${$.i18n.prop('save')}</button>
-      <button data-bind="click: displayGrid" class="btn">${$.i18n.prop('cancel')}</button>
-    </form>
+        <div class="controls">
+          <input type="checkbox" id="downloadRemoteIndex" name="downloadRemoteIndex" size="5"
+                 data-bind="checked: remoteRepository.downloadRemoteIndex"/>
+        </div>
+      </div>
+
+      <div class="control-group">
+        <label class="control-label" for="remoteIndexUrl">${$.i18n.prop('remoteIndexUrl')}</label>
+
+        <div class="controls">
+          <input type="text" class="input-xxlarge" id="remoteIndexUrl" name="remoteIndexUrl" size="5"
+                 data-bind="value: remoteRepository.remoteIndexUrl"/>
+        </div>
+      </div>
+      <div class="control-group">
+        <label class="control-label" for="cronExpression">${$.i18n.prop('cronExpression')}</label>
+
+        <div class="controls">
+          <input type="text" id="cronExpression" name="cronExpression" size="40"
+                 data-bind="value: remoteRepository.cronExpression"/>
+          <a class="btn btn-warning btn-mini popover-doc" id="cronExpression-info-button"
+             data-original-title="${$.i18n.prop('cronExpression.help.title')}"
+             data-content="${$.i18n.prop('cronExpression.help.content')}">
+            <i class="icon-question-sign icon-white"></i>
+          </a>
+        </div>
+      </div>
+      <div class="control-group">
+        <label class="control-label" for="indexDirectory">${$.i18n.prop('index.directory')}</label>
+
+        <div class="controls">
+          <input type="text" class="input-xlarge" id="indexDirectory" name="indexDirectory" size="50"
+                 data-bind="value: remoteRepository.indexDirectory"/>
+        </div>
+      </div>
+      <div class="control-group">
+        <label class="control-label" for="remoteDownloadTimeout">${$.i18n.prop('remoteDownloadTimeout')}</label>
+
+        <div class="controls">
+          <input type="text" id="remoteDownloadTimeout" class="digits" name="remoteDownloadTimeout" size="5"
+                 data-bind="value: remoteRepository.remoteDownloadTimeout"/>
+        </div>
+      </div>
+
+      <div class="control-group">
+        <label class="control-label"
+               for="remoteDownloadNetworkProxyId">${$.i18n.prop('remoteDownloadNetworkProxyId')}</label>
+
+        <div class="controls">
+          <select id="remoteDownloadNetworkProxyId"
+                  data-bind="options: networkProxies, optionsText: 'id',optionsValue:'id', value: remoteRepository.remoteDownloadNetworkProxyId, optionsCaption: 'Choose...'"></select>
+        </div>
+      </div>
+
+      <div class="control-group">
+        <label class="control-label"
+               for="downloadRemoteIndexOnStartup">${$.i18n.prop('downloadRemoteIndexOnStartup')}</label>
+
+        <div class="controls">
+          <input type="checkbox" id="downloadRemoteIndexOnStartup" name="downloadRemoteIndexOnStartup"
+                 data-bind="checked: remoteRepository.downloadRemoteIndexOnStartup"/>
+        </div>
+      </div>
+
+      <div class="control-group">
+        <label class="control-label" for="daysOlder">${$.i18n.prop('description')}</label>
+
+        <div class="controls">
+          <textarea rows="3" id="description" name="description"
+                    data-bind="value: remoteRepository.description"></textarea>
+        </div>
+      </div>
+
+      <div class="row-fluid">
+        <div class="control-group span6">
+          <h4>${$.i18n.prop('remoteRepository.extraParametersEntries')}</h4>
+
+          <div id="extra-parameters-error"></div>
+          <table class="table">
+            <thead>
+            <th>${$.i18n.prop('key')}:<input type="text" id="extraParameter-key"/></th>
+            <th>${$.i18n.prop('value')}:<input type="text" id="extraParameter-value"/></th>
+            <th><a href="#" data-bind="click: function(){ addExtraParameter() }">${$.i18n.prop('add')}</a></th>
+            </thead>
+            <tbody>
+            {{each(i, extraParameterEntry) remoteRepository.extraParametersEntries}}
+            <tr>
+              <td>${extraParameterEntry.key}</td>
+              <td>${extraParameterEntry.value}</td>
+              <td><a href="#" data-bind="click: function(){ deleteExtraParameter(extraParameterEntry.key)}">${$.i18n.prop('delete')}</a>
+              </td>
+            </tr>
+            {{/each}}
+            </tbody>
+          </table>
+        </div>
+      </div>
+
+      <div class="row-fluid">
+        <div class="control-group span6">
+          <h4>${$.i18n.prop('remoteRepository.extraHeadersEntries')}</h4>
+
+          <div id="extra-headers-error"></div>
+          <table class="table">
+            <thead>
+            <th>${$.i18n.prop('key')}:<input type="text" id="extraHeader-key"/></th>
+            <th>${$.i18n.prop('value')}:<input type="text" id="extraHeader-value"/></th>
+            <th><a href="#" data-bind="click: function(){ addExtraHeader() }">${$.i18n.prop('add')}</a></th>
+            </thead>
+            <tbody>
+            {{each(i, extraHeaderEntry) remoteRepository.extraHeadersEntries}}
+            <tr>
+              <td>${extraHeaderEntry.key}</td>
+              <td>${extraHeaderEntry.value}</td>
+              <td><a href="#" data-bind="click: function(){ deleteExtraHeader(extraHeaderEntry.key)}">${$.i18n.prop('delete')}</a>
+              </td>
+            </tr>
+            {{/each}}
+            </tbody>
+          </table>
+        </div>
+      </div>
+
+    </fieldset>
+    <button data-bind="click: save" data-loading-text="${$.i18n.prop('common.loading')}"
+            id="remote-repository-save-button" class="btn">${$.i18n.prop('save')}
+    </button>
+    <button data-bind="click: displayGrid" class="btn">${$.i18n.prop('cancel')}</button>
+  </form>
 </script>
 
 <script id="remote-repository-scan-modal-tmpl" type='text/html'>
-    <div>
-      ${$.i18n.prop('remoterepository.download.remote.now')}: <input type="checkbox" id="remoterepository-scan-now">
-    </div>
-    <div>
-      ${$.i18n.prop('remoterepository.download.remote.full')}: <input type="checkbox" id="remoterepository-scan-full">
-    </div>
+  <div>
+    ${$.i18n.prop('remoterepository.download.remote.now')}: <input type="checkbox" id="remoterepository-scan-now">
+  </div>
+  <div>
+    ${$.i18n.prop('remoterepository.download.remote.full')}: <input type="checkbox" id="remoterepository-scan-full">
+  </div>
 </script>
 
 <script id="managed-repositories-bulk-save-tmpl" type='text/html'>
   {{if bulkSave()}}
-    <a data-bind="click: updateModifiedManagedRepositories" class="btn btn-danger" href="#">${$.i18n.prop('save.all')}</a>
+  <a data-bind="click: updateModifiedManagedRepositories" class="btn btn-danger" href="#">${$.i18n.prop('save.all')}</a>
   {{/if}}
 </script>
 
 <script id="remote-repositories-bulk-save-tmpl" type='text/html'>
   {{if bulkSave()}}
-    <a data-bind="click: updateModifiedRemoteRepositories" class="btn btn-danger" href="#">${$.i18n.prop('save.all')}</a>
+  <a data-bind="click: updateModifiedRemoteRepositories" class="btn btn-danger" href="#">${$.i18n.prop('save.all')}</a>
   {{/if}}
 </script>
 
@@ -702,11 +774,11 @@
   </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 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>
@@ -714,135 +786,143 @@
 </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) }">
+  <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) }">
+      </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}}
+      </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>
+  </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>
+  <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>
 
-      </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>
+        <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>
+  <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>
+  <div>
+    <span class="label label-warning">${$.i18n.prop('warning.not.undone.operation')}</span>
+  </div>
 </script>
 
 <script id="proxyConnectorsMain" type="text/html">
@@ -855,7 +935,8 @@
       <a data-toggle="tab" href="#proxy-connectors-view" id="proxy-connectors-view-tabs-a-network-proxies-grid">${$.i18n.prop('proxy-connectors.grid.tab.title')}</a>
     </li>
     <li id="proxy-connectors-view-tabs-li-edit">
-      <a data-toggle="tab" href="#proxy-connectors-edit" id="proxy-connectors-view-tabs-a-edit">${$.i18n.prop('add')}</a>
+      <a data-toggle="tab" href="#proxy-connectors-edit"
+         id="proxy-connectors-view-tabs-a-edit">${$.i18n.prop('add')}</a>
     </li>
     <li id="proxy-connectors-view-tabs-li-edit-order">
       <a data-toggle="tab" href="#proxy-connectors-edit-order" id="proxy-connectors-view-tabs-a-edit-order">${$.i18n.prop('proxy-connectors.grid.tab.edit.order')}</a>
@@ -871,9 +952,10 @@
     </div>
     <div id="proxy-connectors-edit" class="tab-pane"></div>
     <div id="proxy-connector-edit-order" class="tab-pane span8">
-      <div id="proxy-connector-edit-order-managed-repository-div" data-bind='template:{name:"proxy-connector-edit-order-managed-repository-tmpl"}'></div>
+      <div id="proxy-connector-edit-order-managed-repository-div"
+           data-bind='template:{name:"proxy-connector-edit-order-managed-repository-tmpl"}'></div>
       <div id="proxy-connector-edit-order-div"
-         data-bind="sortable: { template: 'proxy-connector-edit-order-tmpl', data: proxyConnectors,afterMove: proxyConnectorMoved}">
+           data-bind="sortable: { template: 'proxy-connector-edit-order-tmpl', data: proxyConnectors,afterMove: proxyConnectorMoved}">
       </div>
     </div>
   </div>
@@ -881,71 +963,72 @@
 </script>
 
 <script id='ko-proxy-connectors-grid' type='text/html'>
-    <thead>
-      <tr>
-        <th title="${$.i18n.prop('proxy-connectors.grid.managedrepo.title')}">
-          ${$.i18n.prop('proxy-connectors.grid.managedrepo.grid.header')}
-        </th>
-        <th title="${$.i18n.prop('proxy-connectors.grid.remoterepo.title')}">
-          ${$.i18n.prop('proxy-connectors.grid.remoterepo.grid.header')}
-        </th>
-        <th>${$.i18n.prop('proxy-connectors.grid.remoterepo.settings.popover.title')}</th>
-        <th>${$.i18n.prop('edit')}</th>
-        <th>${$.i18n.prop('delete')}</th>
-        <th>${$.i18n.prop('save')}</th>
-        <th>${$.i18n.prop('proxy-connectors.grid.header.order')}</th>
-      </tr>
-    </thead>
-    <tbody>
-    {{each(i, row) itemsOnCurrentPage()}}
-    <tr data-bind="css:{ 'modified': row.modified()}">
-      <td>${row.sourceRepoId()}</td>
-      <td>${row.targetRepoId()}</td>
-      <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-html="true">
-              <i class="icon-question-sign icon-white"></i>
-          </a>
+  <thead>
+  <tr>
+    <th title="${$.i18n.prop('proxy-connectors.grid.managedrepo.title')}">
+      ${$.i18n.prop('proxy-connectors.grid.managedrepo.grid.header')}
+    </th>
+    <th title="${$.i18n.prop('proxy-connectors.grid.remoterepo.title')}">
+      ${$.i18n.prop('proxy-connectors.grid.remoterepo.grid.header')}
+    </th>
+    <th>${$.i18n.prop('proxy-connectors.grid.remoterepo.settings.popover.title')}</th>
+    <th>${$.i18n.prop('edit')}</th>
+    <th>${$.i18n.prop('delete')}</th>
+    <th>${$.i18n.prop('save')}</th>
+    <th>${$.i18n.prop('proxy-connectors.grid.header.order')}</th>
+  </tr>
+  </thead>
+  <tbody>
+  {{each(i, row) itemsOnCurrentPage()}}
+  <tr data-bind="css:{ 'modified': row.modified()}">
+    <td>${row.sourceRepoId()}</td>
+    <td>${row.targetRepoId()}</td>
+    <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-html="true">
+        <i class="icon-question-sign icon-white"></i>
+      </a>
 
-      </td>
-      <td>
-        <a data-bind="click: function(){ editProxyConnector(row)}" href="#">
+    </td>
+    <td>
+      <a data-bind="click: function(){ editProxyConnector(row)}" href="#">
           <span class="btn btn-primary">
             <i class="icon-pencil icon-white"/>
           </span>
-        </a>
-      </td>
-      <td>
-        <a href="#" data-bind="click: function(){ deleteProxyConnector(row)}">
+      </a>
+    </td>
+    <td>
+      <a href="#" data-bind="click: function(){ deleteProxyConnector(row)}">
           <span class="btn btn-danger">
             <i class="icon-trash icon-white"/>
           </span>
-        </a>
-      </td>
-      <td>
-        {{if row.modified()}}
-          <a href="#" class="btn btn-warning" data-bind="click: function(){ updateProxyConnector(row)}">
-              ${$.i18n.prop('save')}
-          </a>
-        {{/if}}
-      </td>
-      <td>
-        {{if orderChangeAware(row)}}
-          <a href="#" data-bind="click: function(){ displayOrderEdit(row)}">
+      </a>
+    </td>
+    <td>
+      {{if row.modified()}}
+      <a href="#" class="btn btn-warning" data-bind="click: function(){ updateProxyConnector(row)}">
+        ${$.i18n.prop('save')}
+      </a>
+      {{/if}}
+    </td>
+    <td>
+      {{if orderChangeAware(row)}}
+      <a href="#" data-bind="click: function(){ displayOrderEdit(row)}">
             <span class="btn btn-info">
               <i class="icon-resize-vertical icon-white"/>
                ${$.i18n.prop('proxy-connectors.order.edit')}
             </span>
 
-          </a>
-          <span class="badge badge-info">${row.order()}</span>
-        {{/if}}
-      </td>
-    </tr>
-    {{/each}}
-    </tbody>
-    <div id="proxy-connectors-grid-remoterepo-settings-content-${val}-${targetRepoId}" style="display:none"></div>
+      </a>
+      <span class="badge badge-info">${row.order()}</span>
+      {{/if}}
+    </td>
+  </tr>
+  {{/each}}
+  </tbody>
+  <div id="proxy-connectors-grid-remoterepo-settings-content-${val}-${targetRepoId}" style="display:none"></div>
 </script>
 
 <script id='proxy-connectors-remote-settings-popover-tmpl' type='text/html'>
@@ -957,16 +1040,16 @@
     {{/if}}
     <table class="table table-bordered">
       <thead>
-        <th colspan="2">${$.i18n.prop('proxy-connector.policies')}</th>
+      <th colspan="2">${$.i18n.prop('proxy-connector.policies')}</th>
       </thead>
       <tbody>
-        {{each(i, entry) proxyConnector.policiesEntries}}
-        {{var name = proxyConnectorsViewModel.findPolicyInformationName(entry.key)}}
-        <tr>
-          <td>${name}</td>
-          <td>${entry.value}</td>
-        </tr>
-        {{/each}}
+      {{each(i, entry) proxyConnector.policiesEntries}}
+      {{var name = proxyConnectorsViewModel.findPolicyInformationName(entry.key)}}
+      <tr>
+        <td>${name}</td>
+        <td>${entry.value}</td>
+      </tr>
+      {{/each}}
       </tbody>
     </table>
   </span>
@@ -974,118 +1057,126 @@
 
 <script id="proxy-connector-edit-form-tmpl" type='text/html'>
 
-    <form id="proxy-connector-edit-form" class="well form-horizontal">
-      <fieldset id="remote-repository-edit-fieldset">
-        <div class="control-group">
-          <label class="control-label" for="proxyId">${$.i18n.prop('proxy-connector.network-proxy.id')}</label>
-          <div class="controls">
-            <select id="proxyId"
-                    data-bind="options: proxyConnectorsViewModel.networkProxies, optionsText: 'id',optionsValue:'id',
+  <form id="proxy-connector-edit-form" class="well form-horizontal">
+    <fieldset id="remote-repository-edit-fieldset">
+      <div class="control-group">
+        <label class="control-label" for="proxyId">${$.i18n.prop('proxy-connector.network-proxy.id')}</label>
+
+        <div class="controls">
+          <select id="proxyId"
+                  data-bind="options: proxyConnectorsViewModel.networkProxies, optionsText: 'id',optionsValue:'id',
                      value: proxyConnector.proxyId, optionsCaption: 'direct connection'"></select>
-          </div>
         </div>
-        <div class="control-group">
-          <label class="control-label" for="proxyId">${$.i18n.prop('proxy-connector.managed.repository.id')}</label>
-          <div class="controls">
-              <select id="sourceRepoId"
-                      data-bind="options: proxyConnectorsViewModel.managedRepositories, optionsText: 'id',optionsValue:'id',
+      </div>
+      <div class="control-group">
+        <label class="control-label" for="proxyId">${$.i18n.prop('proxy-connector.managed.repository.id')}</label>
+
+        <div class="controls">
+          <select id="sourceRepoId"
+                  data-bind="options: proxyConnectorsViewModel.managedRepositories, optionsText: 'id',optionsValue:'id',
                       value: proxyConnector.sourceRepoId,attr: {disabled: isUpdate() }"></select>
-          </div>
         </div>
-        <div class="control-group">
-          <label class="control-label" for="proxyId">${$.i18n.prop('proxy-connector.remote.repository.id')}</label>
-          <div class="controls">
-            <select id="targetRepoId"
-                    data-bind="options: proxyConnectorsViewModel.remoteRepositories, optionsText: 'id',optionsValue:'id',
+      </div>
+      <div class="control-group">
+        <label class="control-label" for="proxyId">${$.i18n.prop('proxy-connector.remote.repository.id')}</label>
+
+        <div class="controls">
+          <select id="targetRepoId"
+                  data-bind="options: proxyConnectorsViewModel.remoteRepositories, optionsText: 'id',optionsValue:'id',
                      value: proxyConnector.targetRepoId,attr: {disabled: isUpdate() }"></select>
-          </div>
         </div>
-        <div class="row-fluid">
-          <div class="control-group span6">
-            <table class="table">
-              <thead>
-                <th colspan="2">${$.i18n.prop('proxy-connector.policies')}</th>
-              </thead>
-              <tbody data-bind="foreach: proxyConnectorsViewModel.policyInformations()">
-                  <tr>
-                    <td data-bind="text: name"></td>
-                    <td>
-                      <select data-bind="options: getPolicyOptions(id()),value:getSelectedPolicyOption(id()),
+      </div>
+      <div class="row-fluid">
+        <div class="control-group span6">
+          <table class="table">
+            <thead>
+            <th colspan="2">${$.i18n.prop('proxy-connector.policies')}</th>
+            </thead>
+            <tbody data-bind="foreach: proxyConnectorsViewModel.policyInformations()">
+            <tr>
+              <td data-bind="text: name"></td>
+              <td>
+                <select data-bind="options: getPolicyOptions(id()),value:getSelectedPolicyOption(id()),
                               attr: { id: 'policy-'+id() },event: { change: function(){ changePolicyOption(id())},}">
-                      </select>
-                    </td>
-                  </tr>
-              </tbody>
-            </table>
-          </div>
+                </select>
+              </td>
+            </tr>
+            </tbody>
+          </table>
         </div>
-        <div class="row-fluid">
-          <div class="control-group span6">
-            <h4>${$.i18n.prop('proxy-connector.properties')}</h4>
-            <table class="table">
-              <thead>
-                <th><input type="text" id="property-key"/></th>
-                <th><input type="text" id="property-value"/></th>
-                <th><a href="#" data-bind="click: function(){ addProperty() }">${$.i18n.prop('add')}</a></th>
-              </thead>
-              <tbody data-bind="foreach: proxyConnector.propertiesEntries">
-                <tr>
-                  <td data-bind="text: key"></td>
-                  <td data-bind="text: value"></td>
-                  <td><a href="#" data-bind="click: function(){ $parent.deleteProperty(key)}">${$.i18n.prop('delete')}</a></td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
+      </div>
+      <div class="row-fluid">
+        <div class="control-group span6">
+          <h4>${$.i18n.prop('proxy-connector.properties')}</h4>
+          <table class="table">
+            <thead>
+            <th><input type="text" id="property-key"/></th>
+            <th><input type="text" id="property-value"/></th>
+            <th><a href="#" data-bind="click: function(){ addProperty() }">${$.i18n.prop('add')}</a></th>
+            </thead>
+            <tbody data-bind="foreach: proxyConnector.propertiesEntries">
+            <tr>
+              <td data-bind="text: key"></td>
+              <td data-bind="text: value"></td>
+              <td><a href="#" data-bind="click: function(){ $parent.deleteProperty(key)}">${$.i18n.prop('delete')}</a>
+              </td>
+            </tr>
+            </tbody>
+          </table>
         </div>
-        <div class="row-fluid">
-          <div class="control-group span6">
-            <h4>${$.i18n.prop('proxy-connector.blacklist')}</h4>
-            <table class="table">
-              <thead>
-                <th><input type="text" id="blacklist-value"/></th>
-                <th><a href="#" data-bind="click: function(){ addBlacklistPattern() }">${$.i18n.prop('add')}</a></th>
-              </thead>
-              <tbody data-bind="foreach: proxyConnector.blackListPatterns">
-                <tr>
-                  <td data-bind="text: $data"></td>
-                  <td><a href="#" data-bind="click: function(){removeBlacklistPattern($data)}">${$.i18n.prop('delete')}</a></td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
+      </div>
+      <div class="row-fluid">
+        <div class="control-group span6">
+          <h4>${$.i18n.prop('proxy-connector.blacklist')}</h4>
+          <table class="table">
+            <thead>
+            <th><input type="text" id="blacklist-value"/></th>
+            <th><a href="#" data-bind="click: function(){ addBlacklistPattern() }">${$.i18n.prop('add')}</a></th>
+            </thead>
+            <tbody data-bind="foreach: proxyConnector.blackListPatterns">
+            <tr>
+              <td data-bind="text: $data"></td>
+              <td><a href="#" data-bind="click: function(){removeBlacklistPattern($data)}">${$.i18n.prop('delete')}</a>
+              </td>
+            </tr>
+            </tbody>
+          </table>
         </div>
-        <div class="row-fluid">
-          <div class="control-group span6">
-            <h4>${$.i18n.prop('proxy-connector.whitelist')}</h4>
-            <table class="table">
-              <thead>
-                <th><input type="text" id="whitelist-value"/></th>
-                <th><a href="#" data-bind="click: function(){ addWhitelistPattern() }">${$.i18n.prop('add')}</a></th>
-              </thead>
-              <tbody data-bind="foreach: proxyConnector.whiteListPatterns">
-                <tr>
-                  <td data-bind="text: $data"></td>
-                  <td><a href="#" data-bind="click: function(){removeWhitelistPattern($data)}">${$.i18n.prop('delete')}</a></td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
+      </div>
+      <div class="row-fluid">
+        <div class="control-group span6">
+          <h4>${$.i18n.prop('proxy-connector.whitelist')}</h4>
+          <table class="table">
+            <thead>
+            <th><input type="text" id="whitelist-value"/></th>
+            <th><a href="#" data-bind="click: function(){ addWhitelistPattern() }">${$.i18n.prop('add')}</a></th>
+            </thead>
+            <tbody data-bind="foreach: proxyConnector.whiteListPatterns">
+            <tr>
+              <td data-bind="text: $data"></td>
+              <td><a href="#" data-bind="click: function(){removeWhitelistPattern($data)}">${$.i18n.prop('delete')}</a>
+              </td>
+            </tr>
+            </tbody>
+          </table>
         </div>
-      </fieldset>
+      </div>
+    </fieldset>
 
-      <button id="proxy-connector-btn-save" data-bind="click: save" data-loading-text="${$.i18n.prop('common.loading')}" class="btn">${$.i18n.prop('save')}</button>
-      {{if modified()}}
-       ${("#network-proxy-btn-save").button('reset')}
-      {{/if}}
-      <button data-bind="click: displayGrid" class="btn">${$.i18n.prop('cancel')}</button>
+    <button id="proxy-connector-btn-save" data-bind="click: save" data-loading-text="${$.i18n.prop('common.loading')}"
+            class="btn">${$.i18n.prop('save')}
+    </button>
+    {{if modified()}}
+    ${("#network-proxy-btn-save").button('reset')}
+    {{/if}}
+    <button data-bind="click: displayGrid" class="btn">${$.i18n.prop('cancel')}</button>
 
-    </form>
+  </form>
 
 </script>
 <script id="proxy-connectors-bulk-save-tmpl" type='text/html'>
   {{if bulkSave()}}
-    <a data-bind="click: updateModifiedProxyConnectors" class="btn btn-danger" href="#">${$.i18n.prop('save.all')}</a>
+  <a data-bind="click: updateModifiedProxyConnectors" class="btn btn-danger" href="#">${$.i18n.prop('save.all')}</a>
   {{/if}}
 </script>
 
@@ -1095,19 +1186,21 @@
     <div class="row-fluid">
       <div class="span1">
         <img src="images/system-software-update-32-32.png"/>
-          <br/>
-          <img src="images/utilities-system-monitor-22-22.png"
-               id="proxy-connectors-order-remoterepo-settings-edit-${sourceRepoId()}-${targetRepoId()}"
-               data-original-title="${$.i18n.prop('proxy-connectors.grid.remoterepo.settings.popover.title')}"
-               data-bind="event: { mouseover: function(){ displaySettings(sourceRepoId(),targetRepoId())},}">
-          <div id="proxy-connectors-order-remoterepo-settings-content-${sourceRepoId()}-${targetRepoId()}"
-               style="display:none"></div>
+        <br/>
+        <img src="images/utilities-system-monitor-22-22.png"
+             id="proxy-connectors-order-remoterepo-settings-edit-${sourceRepoId()}-${targetRepoId()}"
+             data-original-title="${$.i18n.prop('proxy-connectors.grid.remoterepo.settings.popover.title')}"
+             data-bind="event: { mouseover: function(){ displaySettings(sourceRepoId(),targetRepoId())},}">
+
+        <div id="proxy-connectors-order-remoterepo-settings-content-${sourceRepoId()}-${targetRepoId()}"
+             style="display:none"></div>
       </div>
       <div class="span6 pull-left">
         <blockquote>
-            ${targetRepoId}
-            <br/>
-            ${remoteRepository.name()}&nbsp;(<a href="${remoteRepository.url()}" target="_blank">${remoteRepository.url()}</a>)
+          ${targetRepoId}
+          <br/>
+          ${remoteRepository.name()}&nbsp;(<a href="${remoteRepository.url()}"
+                                              target="_blank">${remoteRepository.url()}</a>)
         </blockquote>
       </div>
       <div class="span2">
@@ -1131,18 +1224,18 @@
     </div>
     <div class="span2">
       {{if proxyConnectorsViewModel.bulkSave()}}
-        <p>
-          <a data-bind="click: function(){updateModifiedProxyConnectors()}"
-             href="#" class="btn btn-warning">${$.i18n.prop('save.all')}</a></p>
+      <p>
+        <a data-bind="click: function(){updateModifiedProxyConnectors()}"
+           href="#" class="btn btn-warning">${$.i18n.prop('save.all')}</a></p>
       {{/if}}
     </div>
   </div>
 </script>
 
 <script id="proxy-connector-delete-warning-tmpl" type='text/html'>
-    <div>
-      <span class="label label-warning">${$.i18n.prop('warning.not.undone.operation')}</span>
-    </div>
+  <div>
+    <span class="label label-warning">${$.i18n.prop('warning.not.undone.operation')}</span>
+  </div>
 </script>
 
 <script id="repositoryGroupsMain" type="text/html">
@@ -1156,37 +1249,39 @@
       </a>
     </li>
     <li id="repository-groups-view-tabs-li-edit">
-      <a data-toggle="tab" href="#repository-groups-edit" id="repository-groups-view-tabs-a-edit">${$.i18n.prop('add')}</a>
+      <a data-toggle="tab" href="#repository-groups-edit"
+         id="repository-groups-view-tabs-a-edit">${$.i18n.prop('add')}</a>
     </li>
 
   </ul>
   <div id="repository-groups-view-tabs-content" class="tab-content">
-        <div id="repository-groups-view" class="tab-pane active">
-          <div id="repository-groups-table" data-bind='template:{name:"repository-groups-table-tmpl"}'>
+    <div id="repository-groups-view" class="tab-pane active">
+      <div id="repository-groups-table" data-bind='template:{name:"repository-groups-table-tmpl"}'>
+      </div>
+    </div>
+    <div id="repository-groups-edit" class="tab-pane">
+      <div class="row-fluid">
+        <div class="span6 dotted">
+          <div id="repository-groups-edit-div" data-bind='template:{name:"repository-group-edit-tmpl"}'></div>
+          <div id="repository-groups-edit-order-div" style="min-height: 80px"
+               data-bind="sortable: { template: 'repository-group-edit-order-tmpl-choosed',data:repositoryGroup.managedRepositories,afterMove:repositoryMoved}">
           </div>
         </div>
-        <div id="repository-groups-edit" class="tab-pane">
-              <div class="row-fluid">
-                <div class="span6 dotted">
-                  <div id="repository-groups-edit-div" data-bind='template:{name:"repository-group-edit-tmpl"}'></div>
-                  <div id="repository-groups-edit-order-div" style="min-height: 80px"
-                     data-bind="sortable: { template: 'repository-group-edit-order-tmpl-choosed',data:repositoryGroup.managedRepositories,afterMove:repositoryMoved}">
-                  </div>
-                </div>
 
-                <div class="span6 dotted">
-                  <h5>${$.i18n.prop('repository.groups.available.repositories')}</h5>
-                  <br/>
-                  <div id="repository-groups-edit-available-repositories" style="min-height: 80px"
-                       data-bind="sortable: { template: 'repository-group-edit-order-tmpl-available',data:availableRepositories,afterMove:repositoryMoved}">
+        <div class="span6 dotted">
+          <h5>${$.i18n.prop('repository.groups.available.repositories')}</h5>
+          <br/>
 
-                  </div>
-                </div>
-
-              </div>
+          <div id="repository-groups-edit-available-repositories" style="min-height: 80px"
+               data-bind="sortable: { template: 'repository-group-edit-order-tmpl-available',data:availableRepositories,afterMove:repositoryMoved}">
 
+          </div>
         </div>
 
+      </div>
+
+    </div>
+
   </div>
 </script>
 
@@ -1231,45 +1326,45 @@
 <script id="repository-groups-table-tmpl" type="text/html">
   <table class="table table-striped table-bordered">
     <thead>
-      <th>${$.i18n.prop('repository.groups.groups.grid.header')}</th>
-      <th>${$.i18n.prop('repository.groups.repositories.grid.header')}</th>
-      <th>${$.i18n.prop('edit')}</th>
-      <th>${$.i18n.prop('delete')}</th>
-      <th>${$.i18n.prop('save')}</th>
+    <th>${$.i18n.prop('repository.groups.groups.grid.header')}</th>
+    <th>${$.i18n.prop('repository.groups.repositories.grid.header')}</th>
+    <th>${$.i18n.prop('edit')}</th>
+    <th>${$.i18n.prop('delete')}</th>
+    <th>${$.i18n.prop('save')}</th>
     </thead>
     <tbody>
     {{each(i, repositoryGroup) repositoryGroups}}
-      <tr data-bind="css:{ 'modified': repositoryGroup.modified()}">
-        <td>${repositoryGroup.id}</td>
-        <td>
-          <ul>
+    <tr data-bind="css:{ 'modified': repositoryGroup.modified()}">
+      <td>${repositoryGroup.id}</td>
+      <td>
+        <ul>
           {{each(j,id) repositoryGroup.repositories()}}
-            <li>${id}</li>
+          <li>${id}</li>
           {{/each}}
-          </ul>
-        </td>
-        <td>
-          <a href="#" data-bind="click: function(){editRepositoryGroup(repositoryGroup)}">
+        </ul>
+      </td>
+      <td>
+        <a href="#" data-bind="click: function(){editRepositoryGroup(repositoryGroup)}">
             <span class="btn btn-primary">
               <i class="icon-pencil icon-white"/>
             </span>
-          </a>
-        </td>
-        <td>
-          <a href="#" data-bind="click: function(){deleteRepositoryGroup(repositoryGroup)}">
+        </a>
+      </td>
+      <td>
+        <a href="#" data-bind="click: function(){deleteRepositoryGroup(repositoryGroup)}">
             <span class="btn btn-danger">
               <i class="icon-trash icon-white"/>
             </span>
-          </a>
-        </td>
-        <td>
-          {{if repositoryGroup.modified()}}
-            <a href="#" class="btn btn-warning" data-bind="click: function(){saveRepositoryGroup(repositoryGroup)}">
-              ${$.i18n.prop('save')}
-            </a>
-          {{/if}}
-        </td>
-      </tr>
+        </a>
+      </td>
+      <td>
+        {{if repositoryGroup.modified()}}
+        <a href="#" class="btn btn-warning" data-bind="click: function(){saveRepositoryGroup(repositoryGroup)}">
+          ${$.i18n.prop('save')}
+        </a>
+        {{/if}}
+      </td>
+    </tr>
     {{/each}}
     </tbody>
   </table>
@@ -1277,7 +1372,7 @@
 
 <script id="repository-group-edit-tmpl" type="text/html">
   <div class="row-fluid">
-  {{if update}}
+    {{if update}}
     <div class="dotted span8">
       <blockquote>
         ${repositoryGroup.id}
@@ -1287,160 +1382,175 @@
         </a>
       </blockquote>
     </div>
-  {{else}}
+    {{else}}
     <div class="dotted span8">
       <form id="repository-group-edit-form" class="well">
         <fieldset id="repository-group-edit-fieldset">
           <div class="control-group">
             <label class="control-label" for="id">${$.i18n.prop('id')}</label>
+
             <div class="controls">
               <input type="text" class="input-medium required" id="id" name="id" size="15"
-                   data-bind="value: repositoryGroup.id,css:{'uneditable-input': update},readonly:update"/>
+                     data-bind="value: repositoryGroup.id,css:{'uneditable-input': update},readonly:update"/>
             </div>
           </div>
         </fieldset>
       </form>
     </div>
-  {{/if}}
-  {{if repositoryGroup.modified()}}
+    {{/if}}
+    {{if repositoryGroup.modified()}}
     <div class="span3">
-      <a href="#" class="btn btn-warning" data-loading-text="${$.i18n.prop('common.loading')}" id="repository-group-save" data-bind="click: function(){saveRepositoryGroup(repositoryGroup)}">${$.i18n.prop('save')}</a>
+      <a href="#" class="btn btn-warning" data-loading-text="${$.i18n.prop('common.loading')}"
+         id="repository-group-save" data-bind="click: function(){saveRepositoryGroup(repositoryGroup)}">${$.i18n.prop('save')}</a>
     </div>
     <br/>
-  {{/if}}
+    {{/if}}
   </div>
 </script>
 
 
-
 <script id="repository-group-delete-warning-tmpl" type='text/html'>
-    <div>
-      <span class="label label-warning">${$.i18n.prop('warning.not.undone.operation')}</span>
-    </div>
+  <div>
+    <span class="label label-warning">${$.i18n.prop('warning.not.undone.operation')}</span>
+  </div>
 </script>
 
 
 <script id="merge-repo-dialog-content" type="text/html">
-    <div class="btn-group btn-group-vertical">
-      {{each(i, repository) repositories}}
-        <button class="btn" type="button" onclick="mergeRepositories(encodeURIComponent('${sourceRepoId}'),encodeURIComponent('${repository.id()}'))">${repository.name()}</button>
-      {{/each}}
-    </div>
+  <div class="btn-group btn-group-vertical">
+    {{each(i, repository) repositories}}
+    <button class="btn" type="button"
+            onclick="mergeRepositories(encodeURIComponent('${sourceRepoId}'),encodeURIComponent('${repository.id()}'))">
+      ${repository.name()}
+    </button>
+    {{/each}}
+  </div>
 </script>
 
-<script id="merge-repo-skip-conflicts"  type="text/html">
+<script id="merge-repo-skip-conflicts" type="text/html">
   <div>
     <ul>
       {{each(i, artifact) artifacts}}
-        <li>${artifact.groupId}:${artifact.artifactId}:${artifact.version}</li>
+      <li>${artifact.groupId}:${artifact.artifactId}:${artifact.version}</li>
       {{/each}}
     </ul>
   </div>
   <div>
-    <button class="btn btn-success" onclick="doMerge(encodeURIComponent('${sourceRepository}'),encodeURIComponent('${targetRepository}'),false);" type="button">${$.i18n.prop('managedrepository.merge.domerge')}</button>
+    <button class="btn btn-success"
+            onclick="doMerge(encodeURIComponent('${sourceRepository}'),encodeURIComponent('${targetRepository}'),false);"
+            type="button">${$.i18n.prop('managedrepository.merge.domerge')}
+    </button>
     {{if artifacts.length > 0}}
-      <button class="btn btn-warning" onclick="doMerge(encodeURIComponent('${sourceRepository}'),encodeURIComponent('${targetRepository}'),true);" type="button">${$.i18n.prop('managedrepository.merge.domerge.skipconflicts')}</button>
+    <button class="btn btn-warning"
+            onclick="doMerge(encodeURIComponent('${sourceRepository}'),encodeURIComponent('${targetRepository}'),true);"
+            type="button">${$.i18n.prop('managedrepository.merge.domerge.skipconflicts')}
+    </button>
     {{/if}}
   </div>
 </script>
 
 
 <script id="proxyConnectorsRulesMain" type="text/html">
-    <div class="page-header">
-      <h2>${$.i18n.prop('proxy-connector-rules.list')}</h2>
+  <div class="page-header">
+    <h2>${$.i18n.prop('proxy-connector-rules.list')}</h2>
+  </div>
+
+  <ul id="proxy-connectors-rules-view-tabs" class="nav nav-tabs">
+    <li id="proxy-connectors-rules-view-tabs-li-grid" class="active">
+      <a data-toggle="tab" href="#proxy-connector-rules-view" id="proxy-connectors-rules-view-tabs-a-grid">${$.i18n.prop('proxy-connectors-rules.grid.tab.title')}</a>
+    </li>
+    <li id="proxy-connectors-rules-view-tabs-li-edit">
+      <a data-toggle="tab" href="#proxy-connector-rules-edit" id="proxy-connectors-rules-view-tabs-a-edit">${$.i18n.prop('add')}</a>
+    </li>
+  </ul>
+  <div id="proxy-connectors-rules-view-tabs-content" class="tab-content">
+    <div id="proxy-connector-rules-view" class="tab-pane active">
+      <div id="proxy-connectors-rules-view-tabs-bulk-save-btn"
+           data-bind='template:{name:"proxy-connectors-rules-view-tabs-bulk-save-tmpl"}'></div>
+      <table class="table table-striped table-bordered" id="proxy-connectors-rules-view-tabsTable"
+             data-bind="simpleGrid: gridViewModel,simpleGridTemplate:'ko-proxy-connectors-rules-grid',pageLinksId:'proxy-connectors-rules-pagination'">
+      </table>
+      <div id="proxy-connectors-rules-view-tabs-pagination"></div>
     </div>
+    <div id="proxy-connector-rules-edit" class="tab-pane">
+      <div class="row-fluid">
+        <div class="span6 dotted">
+          <div id="proxy-connectors-rules-edit-div"
+               data-bind='template:{name:"proxy-connectors-rules-edit-tmpl"}'></div>
+          <div id="proxy-connectors-rules-edit-order-div" style="min-height: 80px"
+               data-bind="sortable: { template: 'proxy-connectors-rules-edit-proxy-connectors-tmpl-choosen',data:proxyConnectorRule.proxyConnectors,afterMove:proxyConnectorMoved}">
+          </div>
+        </div>
 
-    <ul id="proxy-connectors-rules-view-tabs" class="nav nav-tabs">
-      <li id="proxy-connectors-rules-view-tabs-li-grid" class="active">
-        <a data-toggle="tab" href="#proxy-connector-rules-view" id="proxy-connectors-rules-view-tabs-a-grid">${$.i18n.prop('proxy-connectors-rules.grid.tab.title')}</a>
-      </li>
-      <li id="proxy-connectors-rules-view-tabs-li-edit">
-        <a data-toggle="tab" href="#proxy-connector-rules-edit" id="proxy-connectors-rules-view-tabs-a-edit">${$.i18n.prop('add')}</a>
-      </li>
-    </ul>
-    <div id="proxy-connectors-rules-view-tabs-content" class="tab-content">
-      <div id="proxy-connector-rules-view" class="tab-pane active">
-        <div id="proxy-connectors-rules-view-tabs-bulk-save-btn" data-bind='template:{name:"proxy-connectors-rules-view-tabs-bulk-save-tmpl"}'></div>
-        <table class="table table-striped table-bordered" id="proxy-connectors-rules-view-tabsTable"
-               data-bind="simpleGrid: gridViewModel,simpleGridTemplate:'ko-proxy-connectors-rules-grid',pageLinksId:'proxy-connectors-rules-pagination'">
-        </table>
-        <div id="proxy-connectors-rules-view-tabs-pagination"></div>
-      </div>
-      <div id="proxy-connector-rules-edit" class="tab-pane">
-          <div class="row-fluid">
-            <div class="span6 dotted">
-              <div id="proxy-connectors-rules-edit-div" data-bind='template:{name:"proxy-connectors-rules-edit-tmpl"}'></div>
-              <div id="proxy-connectors-rules-edit-order-div" style="min-height: 80px"
-                 data-bind="sortable: { template: 'proxy-connectors-rules-edit-proxy-connectors-tmpl-choosen',data:proxyConnectorRule.proxyConnectors,afterMove:proxyConnectorMoved}">
-              </div>
-            </div>
+        <div class="span6 dotted">
+          <h5>${$.i18n.prop('proxy-connector-rules.available.proxyConnectors')}</h5>
+          <br/>
 
-            <div class="span6 dotted">
-              <h5>${$.i18n.prop('proxy-connector-rules.available.proxyConnectors')}</h5>
-              <br/>
-              <div id="proxy-connectors-rules-available-proxy-connectors" style="min-height: 80px"
-                   data-bind="sortable: { template: 'proxy-connectors-rules-edit-proxy-connectors-tmpl-availables',data:availableProxyConnectors,afterMove:proxyConnectorMoved}">
-
-              </div>
-            </div>
+          <div id="proxy-connectors-rules-available-proxy-connectors" style="min-height: 80px"
+               data-bind="sortable: { template: 'proxy-connectors-rules-edit-proxy-connectors-tmpl-availables',data:availableProxyConnectors,afterMove:proxyConnectorMoved}">
 
           </div>
-      </div>
+        </div>
 
+      </div>
     </div>
 
+  </div>
+
 </script>
 
 <script id='ko-proxy-connectors-rules-grid' type='text/html'>
-    <thead>
-      <tr>
-        <th title="${$.i18n.prop('proxy-connector-rules.grid.pattern.title')}">
-          ${$.i18n.prop('proxy-connector-rules.grid.pattern.header')}
-        </th>
-        <th title="${$.i18n.prop('proxy-connector-rules.grid.type.title')}">
-          ${$.i18n.prop('proxy-connector-rules.grid.type.header')}
-        </th>
-        <th>${$.i18n.prop('proxy-connector-rules.grid.proxy-connectors.header')}</th>
-        <th>${$.i18n.prop('edit')}</th>
-        <th>${$.i18n.prop('delete')}</th>
-        <th>${$.i18n.prop('save')}</th>
-      </tr>
-    </thead>
-    <tbody>
-    {{each(i, row) itemsOnCurrentPage()}}
-        <tr data-bind="css:{ 'modified': row.modified()}">
-          <td>${row.pattern()}</td>
-          <td><img src="${row.ruleType.image}" title="${row.ruleType.label}"></img></td>
-          <td>
-            <ul>
-            {{each(j,proxyConnector) row.proxyConnectors()}}
-              <li>${proxyConnector.sourceRepoId()} <-> ${proxyConnector.targetRepoId()}</li>
-            {{/each}}
-            </ul>
-          </td>
-          <td>
-              <a href="#" data-bind="click: function(){ editProxyConnectorRule(row) }">
+  <thead>
+  <tr>
+    <th title="${$.i18n.prop('proxy-connector-rules.grid.pattern.title')}">
+      ${$.i18n.prop('proxy-connector-rules.grid.pattern.header')}
+    </th>
+    <th title="${$.i18n.prop('proxy-connector-rules.grid.type.title')}">
+      ${$.i18n.prop('proxy-connector-rules.grid.type.header')}
+    </th>
+    <th>${$.i18n.prop('proxy-connector-rules.grid.proxy-connectors.header')}</th>
+    <th>${$.i18n.prop('edit')}</th>
+    <th>${$.i18n.prop('delete')}</th>
+    <th>${$.i18n.prop('save')}</th>
+  </tr>
+  </thead>
+  <tbody>
+  {{each(i, row) itemsOnCurrentPage()}}
+  <tr data-bind="css:{ 'modified': row.modified()}">
+    <td>${row.pattern()}</td>
+    <td><img src="${row.ruleType.image}" title="${row.ruleType.label}"></img></td>
+    <td>
+      <ul>
+        {{each(j,proxyConnector) row.proxyConnectors()}}
+        <li>${proxyConnector.sourceRepoId()} <-> ${proxyConnector.targetRepoId()}</li>
+        {{/each}}
+      </ul>
+    </td>
+    <td>
+      <a href="#" data-bind="click: function(){ editProxyConnectorRule(row) }">
                 <span class="btn btn-primary" data-loading-text="${$.i18n.prop('common.loading')}">
                   <i class="icon-pencil icon-white"/>
                 </span>
-              </a>
-          </td>
-          <td>
-              <a data-bind="click: function(){ removeProxyConnectorRule(row) }" data-loading-text="${$.i18n.prop('common.loading')}">
+      </a>
+    </td>
+    <td>
+      <a data-bind="click: function(){ removeProxyConnectorRule(row) }"
+         data-loading-text="${$.i18n.prop('common.loading')}">
                 <span class="btn btn-danger" data-loading-text="${$.i18n.prop('common.loading')}">
                   <i class="icon-trash icon-white"/>
                 </span>
-              </a>
-          </td>
-          <td>
-            {{if row.modified()}}
-              <a href="#" id="proxy-connector-rule-update-btn" class="btn btn-warning" data-loading-text="${$.i18n.prop('common.loading')}"
-                 data-bind="click: function(){ updateProxyConnectorRule(row) }">${$.i18n.prop('save')}</a>
-            {{/if}}
-          </td>
-        </tr>
-    {{/each}}
-    </tbody>
+      </a>
+    </td>
+    <td>
+      {{if row.modified()}}
+      <a href="#" id="proxy-connector-rule-update-btn" class="btn btn-warning"
+         data-loading-text="${$.i18n.prop('common.loading')}"
+         data-bind="click: function(){ updateProxyConnectorRule(row) }">${$.i18n.prop('save')}</a>
+      {{/if}}
+    </td>
+  </tr>
+  {{/each}}
+  </tbody>
 </script>
 
 <script id="proxy-connectors-rules-view-tabs-bulk-save-tmpl" type="text/html">
@@ -1448,56 +1558,60 @@
 </script>
 
 <script id="proxy-connectors-rules-edit-tmpl" type="text/html">
-    <div class="row-fluid">
+  <div class="row-fluid">
     {{if update}}
-      <div class="dotted span8">
-        <blockquote>
-          ${proxyConnectorRule.pattern()}
-          <br/>
-          ${proxyConnectorRule.ruleType.label}
-        </blockquote>
-      </div>
+    <div class="dotted span8">
+      <blockquote>
+        ${proxyConnectorRule.pattern()}
+        <br/>
+        ${proxyConnectorRule.ruleType.label}
+      </blockquote>
+    </div>
     {{else}}
-      <div class="dotted span8">
-        <form id="proxy-connector-rule-edit-form" class="well">
-          <fieldset id="proxy-connector-rule-edit-fieldset">
-            <div class="control-group">
-              <label class="control-label" for="id">${$.i18n.prop('proxy-connector-rule.pattern')}</label>
-              <div class="controls">
-                <input type="text" class="input-large required" id="pattern" name="pattern" size="15"
+    <div class="dotted span8">
+      <form id="proxy-connector-rule-edit-form" class="well">
+        <fieldset id="proxy-connector-rule-edit-fieldset">
+          <div class="control-group">
+            <label class="control-label" for="id">${$.i18n.prop('proxy-connector-rule.pattern')}</label>
+
+            <div class="controls">
+              <input type="text" class="input-large required" id="pattern" name="pattern" size="15"
                      data-bind="value:proxyConnectorRule.pattern,css:{'uneditable-input': update},readonly:update"/>
-              </div>
             </div>
-            <div class="control-group">
-              <label class="control-label" for="layout">${$.i18n.prop('type')}</label>
-              <div class="controls">
-                <select id="proxy-connector-rule-pattern-type"
-                        data-bind="options: proxyConnectorRulesViewModel.ruleTypes,optionsText: 'label',optionsValue:'type',value: proxyConnectorRule.proxyConnectorRuleType"/>
-              </div>
+          </div>
+          <div class="control-group">
+            <label class="control-label" for="layout">${$.i18n.prop('type')}</label>
+
+            <div class="controls">
+              <select id="proxy-connector-rule-pattern-type"
+                      data-bind="options: proxyConnectorRulesViewModel.ruleTypes,optionsText: 'label',optionsValue:'type',value: proxyConnectorRule.proxyConnectorRuleType"/>
             </div>
-          </fieldset>
-        </form>
-      </div>
+          </div>
+        </fieldset>
+      </form>
+    </div>
     {{/if}}
 
-      <div class="span3" data-bind="visible: proxyConnectorRule.modified()">
-          {{if update && proxyConnectorRule.modified()}}
-            <a href="#" class="btn btn-warning" data-loading-text="${$.i18n.prop('common.loading')}"
-             id="proxy-connector-rule-update-btn" data-bind="click: function(){updateProxyConnectorRule(proxyConnectorRule)}">${$.i18n.prop('update')}</a>
-          {{else}}
-            <a href="#" class="btn btn-warning" data-loading-text="${$.i18n.prop('common.loading')}"
-               id="proxy-connector-rule-add-btn" data-bind="click: function(){addProxyConnectorRule(proxyConnectorRule)}">${$.i18n.prop('add')}</a>
-          {{/if}}
-      </div>
-
-      <br/>
-
+    <div class="span3" data-bind="visible: proxyConnectorRule.modified()">
+      {{if update && proxyConnectorRule.modified()}}
+      <a href="#" class="btn btn-warning" data-loading-text="${$.i18n.prop('common.loading')}"
+         id="proxy-connector-rule-update-btn"
+         data-bind="click: function(){updateProxyConnectorRule(proxyConnectorRule)}">${$.i18n.prop('update')}</a>
+      {{else}}
+      <a href="#" class="btn btn-warning" data-loading-text="${$.i18n.prop('common.loading')}"
+         id="proxy-connector-rule-add-btn" data-bind="click: function(){addProxyConnectorRule(proxyConnectorRule)}">${$.i18n.prop('add')}</a>
+      {{/if}}
     </div>
+
+    <br/>
+
+  </div>
 </script>
 
 <script id="proxy-connectors-rules-edit-proxy-connectors-tmpl-choosen" type="text/html">
   <div class="well draggable-item">
-    <i class="icon-minus-sign cursor-hand pull-right" data-source-repoId="${$data.sourceRepoId()}" data-target-repoId="${$data.targetRepoId()}"/>
+    <i class="icon-minus-sign cursor-hand pull-right" data-source-repoId="${$data.sourceRepoId()}"
+       data-target-repoId="${$data.targetRepoId()}"/>
     <blockquote>
       ${$data.sourceRepoId()} <-> ${$data.targetRepoId()}
     </blockquote>
@@ -1507,7 +1621,8 @@
 
 <script id="proxy-connectors-rules-edit-proxy-connectors-tmpl-availables" type="text/html">
   <div class="well draggable-item">
-    <i class="icon-plus-sign cursor-hand pull-right" data-source-repoId="${$data.sourceRepoId()}" data-target-repoId="${$data.targetRepoId()}"/>
+    <i class="icon-plus-sign cursor-hand pull-right" data-source-repoId="${$data.sourceRepoId()}"
+       data-target-repoId="${$data.targetRepoId()}"/>
     <blockquote>
       ${$data.sourceRepoId()} <-> ${$data.targetRepoId()}
     </blockquote>
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
index 4a278f407..57df252a1 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
@@ -45,35 +45,39 @@
 
       <!-- if null we are on root level -->
       {{if $root.parentBrowseViewModel}}
-        <li class="browse-list" data-bind="click:function(){displayParentGroupId()}">
-          <a href="#">..</a>
-        </li>
+      <li class="browse-list" data-bind="click:function(){displayParentGroupId()}">
+        <a href="#">..</a>
+      </li>
       {{/if}}
       {{each(i,browseResultEntry) browseResultEntries}}
-        {{if browseResultEntry.project}}
-          {{if deleteKarma}}
-            <li class="browse-list-project">
-              <img class="cursor-hand" id="delete-${browseResultEntry.name}" src="images/trash.png" data-bind="click:function(){deleteProject(groupId,displayEntry(browseResultEntry.name))}"/>
-              <a href="#" data-bind="click:function(){displayProjectEntry(browseResultEntry.name)}">${displayEntry(browseResultEntry.name)}</a>
-            </li>
-          {{else}}
-            <li class="browse-list-project">
-              <a href="#" data-bind="click:function(){displayProjectEntry(browseResultEntry.name)}">${displayEntry(browseResultEntry.name)}</a>
-              <a href="${$root.feedsUrl}/${$root.groupId}/${browseResultEntry.name}"><img src="images/atom.gif"></img></a>
-            </li>
-          {{/if}}
-        {{else}}
-          {{if deleteKarma}}
-            <li class="browse-list">
-              <img class="cursor-hand" id="delete-${browseResultEntry.name}" src="images/trash.png" data-bind="click:function(){deleteGroupId(browseResultEntry.name)}"/>
-              <a data-bind="click:function(){displayGroupId(browseResultEntry.name)}" href="#" title="folder ${displayEntry(browseResultEntry.name)}">${displayEntry(browseResultEntry.name)}</a>
-            </li>
-          {{else}}
-            <li class="browse-list" >
-              <a href="#" title="folder ${displayEntry(browseResultEntry.name)}" data-bind="click:function(){displayGroupId(browseResultEntry.name)}">${displayEntry(browseResultEntry.name)}</a>
-            </li>
-          {{/if}}
-        {{/if}}          
+      {{if browseResultEntry.project}}
+      {{if deleteKarma}}
+      <li class="browse-list-project">
+        <img class="cursor-hand" id="delete-${browseResultEntry.name}" src="images/trash.png"
+             data-bind="click:function(){deleteProject(groupId,displayEntry(browseResultEntry.name))}"/>
+        <a href="#" data-bind="click:function(){displayProjectEntry(browseResultEntry.name)}">${displayEntry(browseResultEntry.name)}</a>
+      </li>
+      {{else}}
+      <li class="browse-list-project">
+        <a href="#" data-bind="click:function(){displayProjectEntry(browseResultEntry.name)}">${displayEntry(browseResultEntry.name)}</a>
+        <a href="${$root.feedsUrl}/${$root.groupId}/${browseResultEntry.name}"><img src="images/atom.gif"></img></a>
+      </li>
+      {{/if}}
+      {{else}}
+      {{if deleteKarma}}
+      <li class="browse-list">
+        <img class="cursor-hand" id="delete-${browseResultEntry.name}" src="images/trash.png"
+             data-bind="click:function(){deleteGroupId(browseResultEntry.name)}"/>
+        <a data-bind="click:function(){displayGroupId(browseResultEntry.name)}" href="#"
+           title="folder ${displayEntry(browseResultEntry.name)}">${displayEntry(browseResultEntry.name)}</a>
+      </li>
+      {{else}}
+      <li class="browse-list">
+        <a href="#" title="folder ${displayEntry(browseResultEntry.name)}"
+           data-bind="click:function(){displayGroupId(browseResultEntry.name)}">${displayEntry(browseResultEntry.name)}</a>
+      </li>
+      {{/if}}
+      {{/if}}
 
       {{/each}}
     </ul>
@@ -86,30 +90,32 @@
       <img class="cursor-hand" src="images/view-refresh.png" data-bind="click: function(){refreshContent()}"/>
     </li>
     <li>
-      <a href="#" data-bind="click: function(){ browseRoot()}"><img src="images/go-home.png"/></a>&nbsp;<span class="divider">/</span>
+      <a href="#" data-bind="click: function(){ browseRoot()}"><img src="images/go-home.png"/></a>&nbsp;<span
+            class="divider">/</span>
     </li>
     {{var number=breadCrumbEntries().length}}
     {{each(i,breadCrumbEntry) breadCrumbEntries}}
-      <li>
-        {{if i==(number-1)}}
-          ${breadCrumbEntry.displayValue}
-        {{else}}
-          {{if breadCrumbEntry.artifact}}
-            <a href="#" data-bind="click: function(){goToArtifactDetail(breadCrumbEntry.groupId,breadCrumbEntry.artifactId)}">${breadCrumbEntry.displayValue}</a>
-          {{else}}
-            <a href="#" data-bind="click: function(){displayGroupId(breadCrumbEntry.groupId)}">${breadCrumbEntry.displayValue}</a>
-          {{/if}}
-        {{/if}}
-        {{if i<(number-1)}}
-          <span class="divider">/</span>
-        {{/if}}
-      </li>
+    <li>
+      {{if i==(number-1)}}
+      ${breadCrumbEntry.displayValue}
+      {{else}}
+      {{if breadCrumbEntry.artifact}}
+      <a href="#" data-bind="click: function(){goToArtifactDetail(breadCrumbEntry.groupId,breadCrumbEntry.artifactId)}">${breadCrumbEntry.displayValue}</a>
+      {{else}}
+      <a href="#"
+         data-bind="click: function(){displayGroupId(breadCrumbEntry.groupId)}">${breadCrumbEntry.displayValue}</a>
+      {{/if}}
+      {{/if}}
+      {{if i<(number-1)}}
+      <span class="divider">/</span>
+      {{/if}}
+    </li>
     {{/each}}
     <li>
       {{if number>0}}
-        <span class="divider" id="browse-autocomplete-divider">/</span>
+      <span class="divider" id="browse-autocomplete-divider">/</span>
       {{/if}}
-        <input type="text" class="input-large" size="50" id="browse-autocomplete"/>
+      <input type="text" class="input-large" size="50" id="browse-autocomplete"/>
     </li>
   </ul>
 
@@ -124,56 +130,56 @@
       <div id="artifact-info" class="alert alert-info">
         <table class="table table-condensed">
           <tbody>
-            <tr>
-              <th>${$.i18n.prop('browse.artifact.groupId')}</th>
-              <td>${groupId}</td>
-            </tr>
-            <tr>
-              <th>${$.i18n.prop('browse.artifact.artifactId')}</th>
-              <td>${artifactId}</td>
-            </tr>
-            {{if projectVersionMetadata}}
-            <tr>
-              <th>${$.i18n.prop('browse.artifact.name')}</th>
-              <td>${projectVersionMetadata.name}</td>
-            </tr>
-            {{/if}}
-            {{if projectVersionMetadata}}
-            <tr>
-              <th>${$.i18n.prop('browse.artifact.description')}</th>
-              <td>${projectVersionMetadata.description}</td>
-            </tr>
-            {{/if}}
-            {{if projectVersionMetadata && projectVersionMetadata.mavenFacet}}
-            <tr>
-              <th>${$.i18n.prop('browse.artifact.packaging')}</th>
-              <td>${projectVersionMetadata.mavenFacet.packaging}</td>
-            </tr>
-            {{/if}}
-            {{if projectVersionMetadata && projectVersionMetadata.organization}}
-            <tr>
-              <th>${$.i18n.prop('browse.artifact.organization.name')}</th>
-              {{if projectVersionMetadata.organization.url}}
-                <td>
-                  <a href="${projectVersionMetadata.organization.url}" target="_blank">
-                    <img src="images/internet-web-browser.png" alt=""/>${projectVersionMetadata.organization.name}
-                  </a>
-                </td>
-              {{else}}
-                <td>${projectVersionMetadata.organization.name}</td>
-              {{/if}}
-            </tr>
-            {{/if}}
-            {{if projectVersionMetadata && projectVersionMetadata.issueManagement}}
-            <tr>
-              <th>${$.i18n.prop('browse.artifact.organization.issueManagement')}</th>
-              <td>
-                <a href="${projectVersionMetadata.issueManagement.url}" target="_blank">
-                  <img src="images/internet-web-browser.png" alt=""/>${projectVersionMetadata.issueManagement.system}
-                </a>
-              </td>
-            </tr>
+          <tr>
+            <th>${$.i18n.prop('browse.artifact.groupId')}</th>
+            <td>${groupId}</td>
+          </tr>
+          <tr>
+            <th>${$.i18n.prop('browse.artifact.artifactId')}</th>
+            <td>${artifactId}</td>
+          </tr>
+          {{if projectVersionMetadata}}
+          <tr>
+            <th>${$.i18n.prop('browse.artifact.name')}</th>
+            <td>${projectVersionMetadata.name}</td>
+          </tr>
+          {{/if}}
+          {{if projectVersionMetadata}}
+          <tr>
+            <th>${$.i18n.prop('browse.artifact.description')}</th>
+            <td>${projectVersionMetadata.description}</td>
+          </tr>
+          {{/if}}
+          {{if projectVersionMetadata && projectVersionMetadata.mavenFacet}}
+          <tr>
+            <th>${$.i18n.prop('browse.artifact.packaging')}</th>
+            <td>${projectVersionMetadata.mavenFacet.packaging}</td>
+          </tr>
+          {{/if}}
+          {{if projectVersionMetadata && projectVersionMetadata.organization}}
+          <tr>
+            <th>${$.i18n.prop('browse.artifact.organization.name')}</th>
+            {{if projectVersionMetadata.organization.url}}
+            <td>
+              <a href="${projectVersionMetadata.organization.url}" target="_blank">
+                <img src="images/internet-web-browser.png" alt=""/>${projectVersionMetadata.organization.name}
+              </a>
+            </td>
+            {{else}}
+            <td>${projectVersionMetadata.organization.name}</td>
             {{/if}}
+          </tr>
+          {{/if}}
+          {{if projectVersionMetadata && projectVersionMetadata.issueManagement}}
+          <tr>
+            <th>${$.i18n.prop('browse.artifact.organization.issueManagement')}</th>
+            <td>
+              <a href="${projectVersionMetadata.issueManagement.url}" target="_blank">
+                <img src="images/internet-web-browser.png" alt=""/>${projectVersionMetadata.issueManagement.system}
+              </a>
+            </td>
+          </tr>
+          {{/if}}
           </tbody>
         </table>
       </div>
@@ -184,15 +190,18 @@
       </div>
       <div class="alert alert-success">
         <table class="table table-condensed">
-        {{each(i,version) versions}}
+          {{each(i,version) versions}}
           <tr>
             {{if deleteKarma}}
-              <th><a id="delete-${version}" href="#" data-bind="click: function(){deleteVersion(version)}"><img src="images/trash.png"/></a>&nbsp;<a href="#" data-bind="click: function(){displayArtifactVersionDetail(version)}">${version}</a></th>
+            <th><a id="delete-${version}" href="#" data-bind="click: function(){deleteVersion(version)}"><img
+                    src="images/trash.png"/></a>&nbsp;<a href="#"
+                                                         data-bind="click: function(){displayArtifactVersionDetail(version)}">${version}</a>
+            </th>
             {{else}}
-              <th><a href="#" data-bind="click: function(){displayArtifactVersionDetail(version)}">${version}</a></th>
+            <th><a href="#" data-bind="click: function(){displayArtifactVersionDetail(version)}">${version}</a></th>
             {{/if}}
           </tr>
-        {{/each}}
+          {{/each}}
         </table>
       </div>
     </div>
@@ -213,70 +222,83 @@
         <li class="active" id="search-form-collapse-li">
           <a data-toggle="tab" href="#search-form-collapse">${$.i18n.prop('search.artifact.form.header')}</a>
         </li>
-          <li id="search-results-li">
-            <a data-toggle="tab" href="#search-results">${$.i18n.prop('search.artifact.results.header')}</a>
-          </li>
+        <li id="search-results-li">
+          <a data-toggle="tab" href="#search-results">${$.i18n.prop('search.artifact.results.header')}</a>
+        </li>
       </ul>
       <div class="tab-content">
 
-      <div id="search-form-collapse" class="tab-pane active">
-        <div class="tabbable tabs-below">
-          <ul class="nav nav-pills">
-            <li class="active">
-              <a href="#search-basic-form-pane" data-toggle="tab">${$.i18n.prop('search.artifact.search.form.basic')}</a>
-            </li>
-            <li>
-              <a href="#search-advanced-form-pane" data-toggle="tab">${$.i18n.prop('search.artifact.search.form.advanced')}</a>
-            </li>
-            <li>
-              <a href="#search-osgi-form-pane" data-toggle="tab">${$.i18n.prop('search.artifact.search.form.osgi')}</a>
-            </li>
-          </ul>
-          <div class="pill-content">
-            <div class="pill-pane active" id="search-basic-form-pane">
-              <form class="well form-inline" id="search-basic-form">
-                <fieldset>
-                  <div class="control-group" id="search-basic-repositories">
-                    <select data-placeholder="${$.i18n.prop('search.artifact.search.form.query.repositories')}"
-                            id="search-basic-repositories-select" class="chzn-select defaults"
-                            multiple style="width:350px;" tabindex="4">
-                      <option value="all">${$.i18n.prop('search.artifact.search.form.repositories.all')}</option>
-                      {{each(i,repoId) observableRepoIds}}
+        <div id="search-form-collapse" class="tab-pane active">
+          <div class="tabbable tabs-below">
+            <ul class="nav nav-pills">
+              <li class="active">
+                <a href="#search-basic-form-pane"
+                   data-toggle="tab">${$.i18n.prop('search.artifact.search.form.basic')}</a>
+              </li>
+              <li>
+                <a href="#search-advanced-form-pane" data-toggle="tab">${$.i18n.prop('search.artifact.search.form.advanced')}</a>
+              </li>
+              <li>
+                <a href="#search-osgi-form-pane"
+                   data-toggle="tab">${$.i18n.prop('search.artifact.search.form.osgi')}</a>
+              </li>
+            </ul>
+            <div class="pill-content">
+              <div class="pill-pane active" id="search-basic-form-pane">
+                <form class="well form-inline" id="search-basic-form">
+                  <fieldset>
+                    <div class="control-group" id="search-basic-repositories">
+                      <select data-placeholder="${$.i18n.prop('search.artifact.search.form.query.repositories')}"
+                              id="search-basic-repositories-select" class="chzn-select defaults"
+                              multiple style="width:350px;" tabindex="4">
+                        <option value="all">${$.i18n.prop('search.artifact.search.form.repositories.all')}</option>
+                        {{each(i,repoId) observableRepoIds}}
                         <option value="${repoId}">${repoId}</option>
-                      {{/each}}
-                    </select>
-                  </div>
-                  <div class="control-group">
-                    <label class="control-label" for="search-terms"></label>
-                    <div class="controls">
-                      <input type="text" class="defaults" id="search-terms" name="search-terms" size="50"
-                             data-bind="value: searchRequest().queryTerms" placeholder="${$.i18n.prop('search.artifact.search.form.query.terms')}"/>
+                        {{/each}}
+                      </select>
                     </div>
-                  </div>
-                  <button type="submit" id="btn-basic-search" class="btn btn-primary"
-                          data-loading-text="${$.i18n.prop('search.artifact.searching')}" data-bind="click: basicSearch" accesskey="${$.i18n.prop('search.artifact.search.form.btn.search')[0]}">${$.i18n.prop('search.artifact.search.form.btn.search')}</button>
-                </fieldset>
-              </form>
-            </div>
-            <div class="pill-pane" id="search-advanced-form-pane">
+                    <div class="control-group">
+                      <label class="control-label" for="search-terms"></label>
+
+                      <div class="controls">
+                        <input type="text" class="defaults" id="search-terms" name="search-terms" size="50"
+                               data-bind="value: searchRequest().queryTerms"
+                               placeholder="${$.i18n.prop('search.artifact.search.form.query.terms')}"/>
+                      </div>
+                    </div>
+                    <button type="submit" id="btn-basic-search" class="btn btn-primary"
+                            data-loading-text="${$.i18n.prop('search.artifact.searching')}"
+                            data-bind="click: basicSearch"
+                            accesskey="${$.i18n.prop('search.artifact.search.form.btn.search')[0]}">
+                      ${$.i18n.prop('search.artifact.search.form.btn.search')}
+                    </button>
+                  </fieldset>
+                </form>
+              </div>
+              <div class="pill-pane" id="search-advanced-form-pane">
                 <form class="well form-horizontal" id="search-advanced-form">
                   <fieldset>
                     <div class="control-group">
                       <label class="control-label" for="groupId">${$.i18n.prop('search.artifact.search.form.query.groupId')}</label>
+
                       <div class="controls">
-                        <input type="text" class="defaults" id="groupId" name="groupId" size="50" placeholder="my.group.id"
+                        <input type="text" class="defaults" id="groupId" name="groupId" size="50"
+                               placeholder="my.group.id"
                                data-bind="value: searchRequest().groupId"/>
                       </div>
                     </div>
                     <div class="control-group">
                       <label class="control-label" for="artifactId">${$.i18n.prop('search.artifact.search.form.query.artifactId')}</label>
+
                       <div class="controls">
-                        <input type="text" class="defaults" id="artifactId" name="artifactId" size="50" placeholder="my.artifact.id"
+                        <input type="text" class="defaults" id="artifactId" name="artifactId" size="50"
+                               placeholder="my.artifact.id"
                                data-bind="value: searchRequest().artifactId"/>
                       </div>
                     </div>
                     <div class="control-group">
                       <label class="control-label" for="version">${$.i18n.prop('search.artifact.search.form.query.version')}</label>
+
                       <div class="controls">
                         <input type="text" class="defaults" id="version" name="version" size="50" placeholder="0.0.0"
                                data-bind="value: searchRequest().version"/>
@@ -284,13 +306,16 @@
                     </div>
                     <div class="control-group">
                       <label class="control-label" for="classifier">${$.i18n.prop('search.artifact.search.form.query.classifier')}</label>
+
                       <div class="controls">
-                        <input type="text" class="defaults" id="classifier" name="classifier" size="50" placeholder="bin"
+                        <input type="text" class="defaults" id="classifier" name="classifier" size="50"
+                               placeholder="bin"
                                data-bind="value: searchRequest().classifier"/>
                       </div>
                     </div>
                     <div class="control-group">
                       <label class="control-label" for="packaging">${$.i18n.prop('search.artifact.search.form.query.packaging')}</label>
+
                       <div class="controls">
                         <input type="text" class="defaults" id="packaging" name="packaging" size="50" placeholder="jar"
                                data-bind="value: searchRequest().packaging"/>
@@ -298,87 +323,107 @@
                     </div>
                     <div class="control-group">
                       <label class="control-label" for="className">${$.i18n.prop('search.artifact.search.form.query.className')}</label>
+
                       <div class="controls">
-                        <input type="text" class="defaults" id="className" name="className" size="50" placeholder="my.ClassName"
+                        <input type="text" class="defaults" id="className" name="className" size="50"
+                               placeholder="my.ClassName"
                                data-bind="value: searchRequest().className"/>
                       </div>
                     </div>
 
                   </fieldset>
                   <button type="submit" id="btn-advanced-search" class="btn btn-primary"
-                          data-bind="click: advancedSearch" accesskey="${$.i18n.prop('search.artifact.search.form.btn.search')[0]}">${$.i18n.prop('search.artifact.search.form.btn.search')}</button>
+                          data-bind="click: advancedSearch"
+                          accesskey="${$.i18n.prop('search.artifact.search.form.btn.search')[0]}">
+                    ${$.i18n.prop('search.artifact.search.form.btn.search')}
+                  </button>
 
                 </form>
-            </div>
-            <div class="pill-pane" id="search-osgi-form-pane">
+              </div>
+              <div class="pill-pane" id="search-osgi-form-pane">
                 <form class="well form-horizontal" id="search-osgi-form">
                   <fieldset>
                     <div class="control-group">
                       <label class="control-label" for="bundleSymbolicName">${$.i18n.prop('search.artifact.search.form.query.bundleSymbolicName')}</label>
+
                       <div class="controls">
-                        <input type="text" class="defaults" id="bundleSymbolicName" name="bundleSymbolicName" size="50" placeholder="my.SymbolicName"
+                        <input type="text" class="defaults" id="bundleSymbolicName" name="bundleSymbolicName" size="50"
+                               placeholder="my.SymbolicName"
                                data-bind="value: searchRequest().bundleSymbolicName"/>
                       </div>
                     </div>
                     <div class="control-group">
                       <label class="control-label" for="bundleVersion">${$.i18n.prop('search.artifact.search.form.query.bundleVersion')}</label>
+
                       <div class="controls">
-                        <input type="text" class="defaults" id="bundleVersion" name="bundleVersion" size="50" placeholder="0.0.0"
+                        <input type="text" class="defaults" id="bundleVersion" name="bundleVersion" size="50"
+                               placeholder="0.0.0"
                                data-bind="value: searchRequest().bundleVersion"/>
                       </div>
                     </div>
                     <div class="control-group">
                       <label class="control-label" for="bundleExportPackage">${$.i18n.prop('search.artifact.search.form.query.bundleExportPackage')}</label>
+
                       <div class="controls">
-                        <input type="text" class="defaults" id="bundleExportPackage" name="bundleExportPackage" size="50" placeholder="my.package;version=0.0,..."
+                        <input type="text" class="defaults" id="bundleExportPackage" name="bundleExportPackage"
+                               size="50" placeholder="my.package;version=0.0,..."
                                data-bind="value: searchRequest().bundleExportPackage"/>
                       </div>
                     </div>
                     <div class="control-group">
                       <label class="control-label" for="bundleExportService">${$.i18n.prop('search.artifact.search.form.query.bundleExportService')}</label>
+
                       <div class="controls">
-                        <input type="text" class="defaults" id="bundleExportService" name="bundleExportService" size="50" placeholder="my.SomeService"
+                        <input type="text" class="defaults" id="bundleExportService" name="bundleExportService"
+                               size="50" placeholder="my.SomeService"
                                data-bind="value: searchRequest().bundleExportService"/>
                       </div>
                     </div>
                     <div class="control-group">
                       <label class="control-label" for="bundleImportPackage">${$.i18n.prop('search.artifact.search.form.query.bundleImportPackage')}</label>
+
                       <div class="controls">
-                        <input type="text" class="defaults" id="bundleImportPackage" name="bundleImportPackage" size="50" placeholder="my.package;version=0.0,..."
+                        <input type="text" class="defaults" id="bundleImportPackage" name="bundleImportPackage"
+                               size="50" placeholder="my.package;version=0.0,..."
                                data-bind="value: searchRequest().bundleImportPackage"/>
                       </div>
                     </div>
                     <div class="control-group">
                       <label class="control-label" for="bundleRequireBundle">${$.i18n.prop('search.artifact.search.form.query.bundleRequireBundle')}</label>
+
                       <div class="controls">
-                        <input type="text" class="defaults" id="bundleRequireBundle" name="bundleRequireBundle" size="50" placeholder="my.package;version=0.0,..."
+                        <input type="text" class="defaults" id="bundleRequireBundle" name="bundleRequireBundle"
+                               size="50" placeholder="my.package;version=0.0,..."
                                data-bind="value: searchRequest().bundleRequireBundle"/>
                       </div>
                     </div>
                   </fieldset>
                   <button type="submit" id="btn-osgi-search" class="btn btn-primary"
-                          data-bind="click: advancedSearch" accesskey="${$.i18n.prop('search.artifact.search.form.btn.search')[0]}">${$.i18n.prop('search.artifact.search.form.btn.search')}</button>
+                          data-bind="click: advancedSearch"
+                          accesskey="${$.i18n.prop('search.artifact.search.form.btn.search')[0]}">
+                    ${$.i18n.prop('search.artifact.search.form.btn.search')}
+                  </button>
 
                 </form>
+              </div>
             </div>
           </div>
         </div>
-      </div>
 
 
-      <div id="search-results" class="tab-pane">
-        <div class="row-fluid">
-          <div class="span6">
-            <a href="#" class="btn btn-warning" data-bind="click: removeFilter" id="remove-filter-id">${$.i18n.prop('search.artifact.result.filter')}</a>
-          </div>
-          <div class="span6" id="search-result-number-div">
+        <div id="search-results" class="tab-pane">
+          <div class="row-fluid">
+            <div class="span6">
+              <a href="#" class="btn btn-warning" data-bind="click: removeFilter" id="remove-filter-id">${$.i18n.prop('search.artifact.result.filter')}</a>
+            </div>
+            <div class="span6" id="search-result-number-div">
+            </div>
           </div>
+          <table class="table table-striped table-bordered" id="search-results-grid">
+          </table>
+          <div id="search-results-view-grid-pagination"></div>
+
         </div>
-        <table class="table table-striped table-bordered" id="search-results-grid">
-        </table>
-        <div id="search-results-view-grid-pagination"></div>
-
-      </div>
 
       </div>
     </div>
@@ -388,50 +433,54 @@
 
 <script type="text/html" id="search-result-number-div-tmpl">
   <blockquote>
-      ${$.i18n.prop('search.artifact.result.size')}:&nbsp;${resultViewModel.artifacts().length}
+    ${$.i18n.prop('search.artifact.result.size')}:&nbsp;${resultViewModel.artifacts().length}
   </blockquote>
 
 </script>
 
 <script id="search-results-view-grid-tmpl" type="text/html">
-    <thead>
-        <tr>
-            <th title="${$.i18n.prop('search.artifact.results.groupId')}">${$.i18n.prop('search.artifact.results.groupId')}</th>
-            <th title="${$.i18n.prop('search.artifact.results.artifactId')}">${$.i18n.prop('search.artifact.results.artifactId')}</th>
-            <th title="${$.i18n.prop('search.artifact.results.version')}">${$.i18n.prop('search.artifact.results.version')}</th>
-            <th title="${$.i18n.prop('search.artifact.results.classifier')}">${$.i18n.prop('search.artifact.results.classifier')}</th>
-        </tr>
-        <tr>
+  <thead>
+  <tr>
+    <th title="${$.i18n.prop('search.artifact.results.groupId')}">${$.i18n.prop('search.artifact.results.groupId')}</th>
+    <th title="${$.i18n.prop('search.artifact.results.artifactId')}">
+      ${$.i18n.prop('search.artifact.results.artifactId')}
+    </th>
+    <th title="${$.i18n.prop('search.artifact.results.version')}">${$.i18n.prop('search.artifact.results.version')}</th>
+    <th title="${$.i18n.prop('search.artifact.results.classifier')}">
+      ${$.i18n.prop('search.artifact.results.classifier')}
+    </th>
+  </tr>
+  <tr>
 
-            <th title="${$.i18n.prop('search.artifact.results.groupId')}">
-              <input type="text" class="form-search" id="search-filter-auto-groupId"
-                     placeholder="${$.i18n.prop('search.artifact.result.grid.filter')}"/>
-            </th>
-            <th title="${$.i18n.prop('search.artifact.results.artifactId')}">
-              <input type="text" class="form-search" id="search-filter-auto-artifactId"
-                     placeholder="${$.i18n.prop('search.artifact.result.grid.filter')}"/>
-            </th>
-            <th title="${$.i18n.prop('search.artifact.results.version')}">
-              <input type="text" class="form-search" id="search-filter-auto-version"
-                     placeholder="${$.i18n.prop('search.artifact.result.grid.filter')}"/>
-            </th>
-            <th title="${$.i18n.prop('search.artifact.results.classifier')}">
-              <input type="text" class="form-search" id="search-filter-auto-classifier"
-                     placeholder="${$.i18n.prop('search.artifact.result.grid.filter')}"/>
-            </th>
+    <th title="${$.i18n.prop('search.artifact.results.groupId')}">
+      <input type="text" class="form-search" id="search-filter-auto-groupId"
+             placeholder="${$.i18n.prop('search.artifact.result.grid.filter')}"/>
+    </th>
+    <th title="${$.i18n.prop('search.artifact.results.artifactId')}">
+      <input type="text" class="form-search" id="search-filter-auto-artifactId"
+             placeholder="${$.i18n.prop('search.artifact.result.grid.filter')}"/>
+    </th>
+    <th title="${$.i18n.prop('search.artifact.results.version')}">
+      <input type="text" class="form-search" id="search-filter-auto-version"
+             placeholder="${$.i18n.prop('search.artifact.result.grid.filter')}"/>
+    </th>
+    <th title="${$.i18n.prop('search.artifact.results.classifier')}">
+      <input type="text" class="form-search" id="search-filter-auto-classifier"
+             placeholder="${$.i18n.prop('search.artifact.result.grid.filter')}"/>
+    </th>
 
-        </tr>
-    </thead>
-    <tbody>
-    {{each(i, row) itemsOnCurrentPage()}}
-      <tr>
-        <td><a href="#" data-bind="click: function(){groupIdView(row)}">${row.groupId}</a></td>
-        <td><a href="#" data-bind="click: function(){artifactIdView(row)}">${row.artifactId}</a></td>
-        <td><a href="#" data-bind="click: function(){artifactDetailView(row)}">${row.version}</a></td>
-        <td>${row.classifier}</td>
-      </tr>
-    {{/each}}
-    </tbody>
+  </tr>
+  </thead>
+  <tbody>
+  {{each(i, row) itemsOnCurrentPage()}}
+  <tr>
+    <td><a href="#" data-bind="click: function(){groupIdView(row)}">${row.groupId}</a></td>
+    <td><a href="#" data-bind="click: function(){artifactIdView(row)}">${row.artifactId}</a></td>
+    <td><a href="#" data-bind="click: function(){artifactDetailView(row)}">${row.version}</a></td>
+    <td>${row.classifier}</td>
+  </tr>
+  {{/each}}
+  </tbody>
 </script>
 
 
@@ -439,456 +488,479 @@
   <select id="select_browse_repository" onchange="changeBrowseRepository()">
     <option value="">All</option>
     {{each(i,repository) repositories}}
-      {{if selected && selected==repository.id}}
-        <option value="${repository.id}" selected>${repository.name}</option>
-      {{else}}
-        <option value="${repository.id}">${repository.name}</option>
-      {{/if}}
+    {{if selected && selected==repository.id}}
+    <option value="${repository.id}" selected>${repository.name}</option>
+    {{else}}
+    <option value="${repository.id}">${repository.name}</option>
+    {{/if}}
     {{/each}}
   </select>
   {{if selected && feedsUrl}}
-    <a href="${feedsUrl}"><img src="images/atom.gif"/></a>
+  <a href="${feedsUrl}"><img src="images/atom.gif"/></a>
   {{/if}}
 </script>
 
 <script id="browse-artifact-detail-tmpl" type="text/html">
-    <ul id="artifact-details-tabs" class="nav nav-tabs">
-      <li class="active">
-        <a data-toggle="tab" id="artifact-details-info-content-a" data-target="#artifact-details-info-content" href="#artifact-details-info-content">${$.i18n.prop('artifact.detail.tab.header.info')}</a>
-      </li>
-      <li>
-        <a data-toggle="tab" id="artifact-details-dependencies-content-a" data-target="#artifact-details-dependencies-content" href="#artifact-details-dependencies-content">${$.i18n.prop('artifact.detail.tab.header.dependencies')}</a>
-      </li>
-      <li>
-        <a data-toggle="tab" id="artifact-details-dependency-tree-content-a" data-target="#artifact-details-dependency-tree-content" href="#artifact-details-dependency-tree-content">${$.i18n.prop('artifact.detail.tab.header.dependency.tree')}</a>
-      </li>
-      <li>
-        <a data-toggle="tab" id="artifact-details-files-content-a" data-target="#artifact-details-files-content" href="#artifact-details-files-content">${$.i18n.prop('artifact.detail.tab.header.file.content')}</a>
-      </li>
-      <li>
-        <a data-toggle="tab" id="artifact-details-download-content-a" data-target="#artifact-details-download-content" href="#artifact-details-download-content">${$.i18n.prop('artifact.detail.tab.header.file.download')}</a>
-      </li>
-      <li>
-        <a data-toggle="tab" id="artifact-details-used-by-content-a" data-target="#artifact-details-used-by-content" href="#artifact-details-used-by-content">${$.i18n.prop('artifact.detail.tab.header.used.by')}</a>
-      </li>
-      <li>
-        <a data-toggle="tab" id="artifact-details-mailing-list-content-a" data-target="#artifact-details-mailing-list-content" href="#artifact-details-mailing-list-content">${$.i18n.prop('artifact.detail.tab.header.mailing.list')}</a>
-      </li>
-      <li>
-        <a data-toggle="tab" id="artifact-details-metadatas-content-a" data-target="#artifact-details-metadatas-content" href="#artifact-details-metadatas-content">${$.i18n.prop('artifact.detail.tab.header.metadatas')}</a>
-      </li>
-    </ul>
-    <div class="tab-content">
-      {{if projectVersionMetadata}}
-  	  <div id="artifact-details-info-content" class="tab-pane active">
-        <blockquote>${projectVersionMetadata.description}</blockquote>
-        <div class="row-fluid">
-          <div class="span6">
-            <table class="table">
-              <tbody>
-                <tr>
-                  <th>${$.i18n.prop('browse.artifact.groupId')}</th>
-                  <td>${groupId}</td>
-                </tr>
-                <tr>
-                  <th>${$.i18n.prop('browse.artifact.artifactId')}</th>
-                  <td>${artifactId}</td>
-                </tr>
-                <tr>
-                  <th>${$.i18n.prop('browse.artifact.version')}</th>
-                  <td>${version}</td>
-                </tr>
-                <tr>
-                  <th>${$.i18n.prop('browse.artifact.packaging')}</th>
-                  {{if projectVersionMetadata.mavenFacet}}
-                    <td>${projectVersionMetadata.mavenFacet.packaging}</td>
-                  {{else}}
-                    <td></td>
-                  {{/if}}
-                </tr>
-                {{if projectVersionMetadata.mavenFacet}}
-                  {{if projectVersionMetadata.mavenFacet.parent }}
-                  <tr>
-                    <th>${$.i18n.prop('browse.artifact.parent')}</th>
-                    <td>
-                      <a href="#" data-bind="click: displayParent">
-                      ${projectVersionMetadata.mavenFacet.parent.groupId}:${projectVersionMetadata.mavenFacet.parent.artifactId}:${projectVersionMetadata.mavenFacet.parent.version}
-                      </a>
-                    </td>
-                  </tr>
-                  {{/if}}
-                {{/if}}
-              </tbody>
-            </table>
-          </div>
-          <div class="span6">
-            <h4>${$.i18n.prop('browse.artifact.pom.snippet')}</h4>
-              <pre class="prettyprint">&lt;dependency&gt;<br/>&nbsp;&nbsp;&lt;groupId&gt;${groupId}&lt;/groupId&gt;<br/>&nbsp;&nbsp;&lt;artifactId&gt;${artifactId}&lt;/artifactId&gt;<br/>&nbsp;&nbsp;&lt;version&gt;${version}&lt;/version&gt;<br/>&lt;/dependency&gt;</pre>
-          </div>
-        </div>
-        <div>
-          <div class="page-header">
-            <h4>${$.i18n.prop('browse.artifact.other.details')}</h4>
-          </div>
-          <div>
-            <div class="row-fluid">
-              <div class="span9">
-                <table class="table">
-                  <tbody>
-                    {{if projectVersionMetadata.url}}
-                    <tr>
-                      <th>${$.i18n.prop('browse.artifact.url')}</th>
-                      <td><a href="${projectVersionMetadata.url}" target="_blank">${projectVersionMetadata.url}</a></td>
-                    </tr>
-                    {{/if}}
-                    {{if projectVersionMetadata.organization}}
-                    <tr>
-                      <th>${$.i18n.prop('browse.artifact.organization.name')}</th>
-                      {{if projectVersionMetadata.organization.url}}
-                        <td>
-                          <a href="${projectVersionMetadata.organization.url}" target="_blank">
-                            <img src="images/internet-web-browser.png" alt=""/>${projectVersionMetadata.organization.name}
-                          </a>
-                        </td>
-                      {{else}}
-                        <td>${projectVersionMetadata.organization.name}</td>
-                      {{/if}}
-                    </tr>
-                    {{/if}}
-                    {{each(i,license) projectVersionMetadata.licenses}}
-                    <tr>
-                      <th>${$.i18n.prop('browse.artifact.license')}</th>
-                      {{if license.url}}
-                        <td>
-                          <a href="${license.url}" target="_blank">
-                            <img src="images/internet-web-browser.png" alt=""/>${license.name}
-                          </a>
-                        </td>
-                      {{else}}
-                        <td>${license.name}</td>
-                      {{/if}}
-                      </tr>
-                    {{/each}}
-                    {{if projectVersionMetadata.issueManagement}}
-                    <tr>
-                      <th>${$.i18n.prop('browse.artifact.organization.issueManagement')}</th>
-                      <td>
-                        <a href="${projectVersionMetadata.issueManagement.url}" target="_blank">
-                          <img src="images/internet-web-browser.png" alt=""/>${projectVersionMetadata.issueManagement.system}
-                        </a>
-                      </td>
-                    </tr>
-                    {{/if}}
-                    {{if projectVersionMetadata.ciManagement}}
-                    <tr>
-                      <th>${$.i18n.prop('browse.artifact.organization.ciManagement')}</th>
-                      <td>
-                        <a href="${projectVersionMetadata.ciManagement.url}" target="_blank">
-                          <img src="images/internet-web-browser.png" alt=""/>${projectVersionMetadata.ciManagement.system}
-                        </a>
-                      </td>
-                    </tr>
-                    {{/if}}
-                  </tbody>
-                </table>
-              </div>
-            </div>
-          </div>
-        </div>
-        {{if projectVersionMetadata.scm}}
-        <div>
-          <div class="page-header">
-            <h4>${$.i18n.prop('browse.artifact.scm')}</h4>
-          </div>
-          <div>
-            <div class="row-fluid">
-              <div class="span12">
-                <table class="table">
-                  <tbody>
-                    <tr>
-                      <th>${$.i18n.prop('browse.artifact.scm.connection')}</th>
-                      <td>${projectVersionMetadata.scm.connection}</td>
-                    </tr>
-                    <tr>
-                      <th>${$.i18n.prop('browse.artifact.scm.devconnection')}</th>
-                      <td>${projectVersionMetadata.scm.developerConnection}</td>
-                    </tr>
-                    <tr>
-                      <th>${$.i18n.prop('browse.artifact.scm.viewer')}</th>
-                      <td>${projectVersionMetadata.scm.url}</td>
-                    </tr>
-                  </tbody>
-                </table>
-              </div>
-            </div>
-          </div>
-        </div>
+<ul id="artifact-details-tabs" class="nav nav-tabs">
+  <li class="active">
+    <a data-toggle="tab" id="artifact-details-info-content-a" data-target="#artifact-details-info-content"
+       href="#artifact-details-info-content">${$.i18n.prop('artifact.detail.tab.header.info')}</a>
+  </li>
+  <li>
+    <a data-toggle="tab" id="artifact-details-dependencies-content-a"
+       data-target="#artifact-details-dependencies-content" href="#artifact-details-dependencies-content">${$.i18n.prop('artifact.detail.tab.header.dependencies')}</a>
+  </li>
+  <li>
+    <a data-toggle="tab" id="artifact-details-dependency-tree-content-a"
+       data-target="#artifact-details-dependency-tree-content" href="#artifact-details-dependency-tree-content">${$.i18n.prop('artifact.detail.tab.header.dependency.tree')}</a>
+  </li>
+  <li>
+    <a data-toggle="tab" id="artifact-details-files-content-a" data-target="#artifact-details-files-content"
+       href="#artifact-details-files-content">${$.i18n.prop('artifact.detail.tab.header.file.content')}</a>
+  </li>
+  <li>
+    <a data-toggle="tab" id="artifact-details-download-content-a" data-target="#artifact-details-download-content"
+       href="#artifact-details-download-content">${$.i18n.prop('artifact.detail.tab.header.file.download')}</a>
+  </li>
+  <li>
+    <a data-toggle="tab" id="artifact-details-used-by-content-a" data-target="#artifact-details-used-by-content"
+       href="#artifact-details-used-by-content">${$.i18n.prop('artifact.detail.tab.header.used.by')}</a>
+  </li>
+  <li>
+    <a data-toggle="tab" id="artifact-details-mailing-list-content-a"
+       data-target="#artifact-details-mailing-list-content" href="#artifact-details-mailing-list-content">${$.i18n.prop('artifact.detail.tab.header.mailing.list')}</a>
+  </li>
+  <li>
+    <a data-toggle="tab" id="artifact-details-metadatas-content-a" data-target="#artifact-details-metadatas-content"
+       href="#artifact-details-metadatas-content">${$.i18n.prop('artifact.detail.tab.header.metadatas')}</a>
+  </li>
+</ul>
+<div class="tab-content">
+{{if projectVersionMetadata}}
+<div id="artifact-details-info-content" class="tab-pane active">
+  <blockquote>${projectVersionMetadata.description}</blockquote>
+  <div class="row-fluid">
+    <div class="span6">
+      <table class="table">
+        <tbody>
+        <tr>
+          <th>${$.i18n.prop('browse.artifact.groupId')}</th>
+          <td>${groupId}</td>
+        </tr>
+        <tr>
+          <th>${$.i18n.prop('browse.artifact.artifactId')}</th>
+          <td>${artifactId}</td>
+        </tr>
+        <tr>
+          <th>${$.i18n.prop('browse.artifact.version')}</th>
+          <td>${version}</td>
+        </tr>
+        <tr>
+          <th>${$.i18n.prop('browse.artifact.packaging')}</th>
+          {{if projectVersionMetadata.mavenFacet}}
+          <td>${projectVersionMetadata.mavenFacet.packaging}</td>
+          {{else}}
+          <td></td>
+          {{/if}}
+        </tr>
+        {{if projectVersionMetadata.mavenFacet}}
+        {{if projectVersionMetadata.mavenFacet.parent }}
+        <tr>
+          <th>${$.i18n.prop('browse.artifact.parent')}</th>
+          <td>
+            <a href="#" data-bind="click: displayParent">
+              ${projectVersionMetadata.mavenFacet.parent.groupId}:${projectVersionMetadata.mavenFacet.parent.artifactId}:${projectVersionMetadata.mavenFacet.parent.version}
+            </a>
+          </td>
+        </tr>
         {{/if}}
-  	  </div>
-      {{/if}}
-
-
-  	  <div id="artifact-details-dependencies-content" class="tab-pane">
-            <table class="table table-striped table-bordered" id="artifact-dependencies-table"
-                   data-bind="simpleGrid: gridViewModel,simpleGridTemplate:'ko_dependenciesGrid',pageLinksId:'dependenciesPagination',data:'dependencies'">
-            </table>
-            <div id="dependenciesPagination"></div>
-  	  </div>
-
-      <div id="artifact-details-dependency-tree-content" class="tab-pane"></div>
-
-      <div id="artifact-details-files-content" class="tab-pane"></div>
-
-      <div id="artifact-details-download-content" class="tab-pane"></div>
-
-      <div id="artifact-details-used-by-content" class="tab-pane">
-          <table class="table table-striped table-bordered" id="artifact-usedby-table">
-          </table>
-          <div id="usedbyPagination"></div>
-      </div>
-
-      <div id="artifact-details-mailing-list-content" class="tab-pane">
-        {{if projectVersionMetadata.mailingLists && projectVersionMetadata.mailingLists.length>0}}
-          <div id="accordion_mailing_lists" class="accordion">
-          {{each(i,mailingList) projectVersionMetadata.mailingLists}}
-            <div class="accordion-group">
-              <div class="accordion-heading">
-                <a class="accordion-toggle" href="#ml_collapse_${i}" data-parent="#accordion_mailing_lists" data-toggle="collapse">${mailingList.name}</a>
-              </div>
-              {{if i==0}}
-                <div id="ml_collapse_${i}" class="accordion-body collapse in">
-              {{else}}
-                <div id="ml_collapse_${i}" class="accordion-body collapse">
-              {{/if}}
-                <div class="accordion-inner">
-                  {{if mailingList.subscribeAddress}}
-                  <div>
-                    <b>${$.i18n.prop('browse.artifact.mailingList.subscribe')}</b>: <a href="mailto:${mailingList.subscribeAddress}">${mailingList.subscribeAddress}</a>
-                  </div>
-                  {{/if}}
-                  {{if mailingList.postAddress}}
-                  <div>
-                    <b>${$.i18n.prop('browse.artifact.mailingList.post')}</b>: <a href="mailto:${mailingList.postAddress}">${mailingList.postAddress}</a>
-                  </div>
-                  {{/if}}
-                  {{if mailingList.unsubscribeAddress}}
-                  <div>
-                    <b>${$.i18n.prop('browse.artifact.mailingList.unsubscribe')}</b>: <a href="mailto:${mailingList.unsubscribeAddress}">${mailingList.unsubscribeAddress}</a>
-                  </div>
-                  {{/if}}
-                  {{if mailingList.mainArchiveUrl}}
-                  <div>
-                    <b>${$.i18n.prop('browse.artifact.mailingList.mainArchiveUrl')}</b>: <a href="${mailingList.mainArchiveUrl}" target="_blank">${mailingList.mainArchiveUrl}</a>
-                  </div>
-                  {{/if}}
-                  {{if mailingList.otherArchives && mailingList.otherArchives.length>0}}
-                  <div>
-                    <b>${$.i18n.prop('browse.artifact.mailingList.otherArchivesUrls')}:</b>
-                    <ul>
-                    {{each(j,otherArchive) mailingList.otherArchives}}
-                      <li><b>${$.i18n.prop('browse.artifact.mailingList.otherArchiveUrl')}</b>: <a href="${otherArchive}" target="_blank">${otherArchive}</a></li>
-                    {{/each}}
-                    </ul>
-                  </div>
-                  {{/if}}
-                </div>
-              </div>
-            </div>
-          {{/each}}
-          </div>
-        {{else}}
-          ${$.i18n.prop('browse.artifact.mailingList.none')}
         {{/if}}
-      </div>
-
-      <div id="artifact-details-metadatas-content" class="tab-pane">
-        <table class="table table-striped table-bordered" id="artifact-details-metadatas-content-table"
-               data-bind="simpleGrid: gridMetatadasViewModel,simpleGridTemplate:'artifact_metadata_properties_tmpl',pageLinksId:'artifactMetadata_Pagination'">
-
-        </table>
-        <div id="artifactMetadata_Pagination"></div>
-        {{if hasSavePropertyKarma()}}
-          <a href="#" class="btn btn-primary" data-bind="click: addProperty">${$.i18n.prop('browse.artifact.metadatas.add')}</a>
-        {{/if}}
-      </div>
-
+        </tbody>
+      </table>
+    </div>
+    <div class="span6">
+      <h4>${$.i18n.prop('browse.artifact.pom.snippet')}</h4>
+      <pre class="prettyprint">&lt;dependency&gt;<br/>&nbsp;&nbsp;&lt;groupId&gt;${groupId}&lt;/groupId&gt;<br/>&nbsp;&nbsp;&lt;artifactId&gt;${artifactId}&lt;/artifactId&gt;<br/>&nbsp;&nbsp;&lt;version&gt;${version}&lt;/version&gt;<br/>&lt;/dependency&gt;</pre>
     </div>
   </div>
+  <div>
+    <div class="page-header">
+      <h4>${$.i18n.prop('browse.artifact.other.details')}</h4>
+    </div>
+    <div>
+      <div class="row-fluid">
+        <div class="span9">
+          <table class="table">
+            <tbody>
+            {{if projectVersionMetadata.url}}
+            <tr>
+              <th>${$.i18n.prop('browse.artifact.url')}</th>
+              <td><a href="${projectVersionMetadata.url}" target="_blank">${projectVersionMetadata.url}</a></td>
+            </tr>
+            {{/if}}
+            {{if projectVersionMetadata.organization}}
+            <tr>
+              <th>${$.i18n.prop('browse.artifact.organization.name')}</th>
+              {{if projectVersionMetadata.organization.url}}
+              <td>
+                <a href="${projectVersionMetadata.organization.url}" target="_blank">
+                  <img src="images/internet-web-browser.png" alt=""/>${projectVersionMetadata.organization.name}
+                </a>
+              </td>
+              {{else}}
+              <td>${projectVersionMetadata.organization.name}</td>
+              {{/if}}
+            </tr>
+            {{/if}}
+            {{each(i,license) projectVersionMetadata.licenses}}
+            <tr>
+              <th>${$.i18n.prop('browse.artifact.license')}</th>
+              {{if license.url}}
+              <td>
+                <a href="${license.url}" target="_blank">
+                  <img src="images/internet-web-browser.png" alt=""/>${license.name}
+                </a>
+              </td>
+              {{else}}
+              <td>${license.name}</td>
+              {{/if}}
+            </tr>
+            {{/each}}
+            {{if projectVersionMetadata.issueManagement}}
+            <tr>
+              <th>${$.i18n.prop('browse.artifact.organization.issueManagement')}</th>
+              <td>
+                <a href="${projectVersionMetadata.issueManagement.url}" target="_blank">
+                  <img src="images/internet-web-browser.png" alt=""/>${projectVersionMetadata.issueManagement.system}
+                </a>
+              </td>
+            </tr>
+            {{/if}}
+            {{if projectVersionMetadata.ciManagement}}
+            <tr>
+              <th>${$.i18n.prop('browse.artifact.organization.ciManagement')}</th>
+              <td>
+                <a href="${projectVersionMetadata.ciManagement.url}" target="_blank">
+                  <img src="images/internet-web-browser.png" alt=""/>${projectVersionMetadata.ciManagement.system}
+                </a>
+              </td>
+            </tr>
+            {{/if}}
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+  </div>
+  {{if projectVersionMetadata.scm}}
+  <div>
+    <div class="page-header">
+      <h4>${$.i18n.prop('browse.artifact.scm')}</h4>
+    </div>
+    <div>
+      <div class="row-fluid">
+        <div class="span12">
+          <table class="table">
+            <tbody>
+            <tr>
+              <th>${$.i18n.prop('browse.artifact.scm.connection')}</th>
+              <td>${projectVersionMetadata.scm.connection}</td>
+            </tr>
+            <tr>
+              <th>${$.i18n.prop('browse.artifact.scm.devconnection')}</th>
+              <td>${projectVersionMetadata.scm.developerConnection}</td>
+            </tr>
+            <tr>
+              <th>${$.i18n.prop('browse.artifact.scm.viewer')}</th>
+              <td>${projectVersionMetadata.scm.url}</td>
+            </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+  </div>
+  {{/if}}
+</div>
+{{/if}}
+
+
+<div id="artifact-details-dependencies-content" class="tab-pane">
+  <table class="table table-striped table-bordered" id="artifact-dependencies-table"
+         data-bind="simpleGrid: gridViewModel,simpleGridTemplate:'ko_dependenciesGrid',pageLinksId:'dependenciesPagination',data:'dependencies'">
+  </table>
+  <div id="dependenciesPagination"></div>
+</div>
+
+<div id="artifact-details-dependency-tree-content" class="tab-pane"></div>
+
+<div id="artifact-details-files-content" class="tab-pane"></div>
+
+<div id="artifact-details-download-content" class="tab-pane"></div>
+
+<div id="artifact-details-used-by-content" class="tab-pane">
+  <table class="table table-striped table-bordered" id="artifact-usedby-table">
+  </table>
+  <div id="usedbyPagination"></div>
+</div>
+
+<div id="artifact-details-mailing-list-content" class="tab-pane">
+  {{if projectVersionMetadata.mailingLists && projectVersionMetadata.mailingLists.length>0}}
+  <div id="accordion_mailing_lists" class="accordion">
+    {{each(i,mailingList) projectVersionMetadata.mailingLists}}
+    <div class="accordion-group">
+      <div class="accordion-heading">
+        <a class="accordion-toggle" href="#ml_collapse_${i}" data-parent="#accordion_mailing_lists"
+           data-toggle="collapse">${mailingList.name}</a>
+      </div>
+      {{if i==0}}
+      <div id="ml_collapse_${i}" class="accordion-body collapse in">
+        {{else}}
+        <div id="ml_collapse_${i}" class="accordion-body collapse">
+          {{/if}}
+          <div class="accordion-inner">
+            {{if mailingList.subscribeAddress}}
+            <div>
+              <b>${$.i18n.prop('browse.artifact.mailingList.subscribe')}</b>: <a
+                    href="mailto:${mailingList.subscribeAddress}">${mailingList.subscribeAddress}</a>
+            </div>
+            {{/if}}
+            {{if mailingList.postAddress}}
+            <div>
+              <b>${$.i18n.prop('browse.artifact.mailingList.post')}</b>: <a href="mailto:${mailingList.postAddress}">${mailingList.postAddress}</a>
+            </div>
+            {{/if}}
+            {{if mailingList.unsubscribeAddress}}
+            <div>
+              <b>${$.i18n.prop('browse.artifact.mailingList.unsubscribe')}</b>: <a
+                    href="mailto:${mailingList.unsubscribeAddress}">${mailingList.unsubscribeAddress}</a>
+            </div>
+            {{/if}}
+            {{if mailingList.mainArchiveUrl}}
+            <div>
+              <b>${$.i18n.prop('browse.artifact.mailingList.mainArchiveUrl')}</b>: <a
+                    href="${mailingList.mainArchiveUrl}" target="_blank">${mailingList.mainArchiveUrl}</a>
+            </div>
+            {{/if}}
+            {{if mailingList.otherArchives && mailingList.otherArchives.length>0}}
+            <div>
+              <b>${$.i18n.prop('browse.artifact.mailingList.otherArchivesUrls')}:</b>
+              <ul>
+                {{each(j,otherArchive) mailingList.otherArchives}}
+                <li><b>${$.i18n.prop('browse.artifact.mailingList.otherArchiveUrl')}</b>: <a href="${otherArchive}"
+                                                                                             target="_blank">${otherArchive}</a>
+                </li>
+                {{/each}}
+              </ul>
+            </div>
+            {{/if}}
+          </div>
+        </div>
+      </div>
+      {{/each}}
+    </div>
+    {{else}}
+    ${$.i18n.prop('browse.artifact.mailingList.none')}
+    {{/if}}
+  </div>
+
+  <div id="artifact-details-metadatas-content" class="tab-pane">
+    <table class="table table-striped table-bordered" id="artifact-details-metadatas-content-table"
+           data-bind="simpleGrid: gridMetatadasViewModel,simpleGridTemplate:'artifact_metadata_properties_tmpl',pageLinksId:'artifactMetadata_Pagination'">
+
+    </table>
+    <div id="artifactMetadata_Pagination"></div>
+    {{if hasSavePropertyKarma()}}
+    <a href="#" class="btn btn-primary"
+       data-bind="click: addProperty">${$.i18n.prop('browse.artifact.metadatas.add')}</a>
+    {{/if}}
+  </div>
+
+</div>
+</div>
 </script>
 
 <script id="ko_dependenciesGrid" type="text/html">
   <tbody>
 
 
-    {{each(i, row) itemsOnCurrentPage()}}
-      <tr>
-        <th>${row.artifactId}</th>
-      </tr>
-      <tr>
-        <td>
-          {{var entries=row.crumbEntries()}}
-          {{each(j,crumbEntry) entries}}
-            {{if j < entries.length - 2}}
-              <a href="#" data-bind="click: function(){displayGroup(crumbEntry.groupId)}">${crumbEntry.displayValue}</a>
-            {{else j == entries.length - 2}}
-              <a href="#" data-bind="click: function(){displayArtifactDetailView(crumbEntry.groupId,crumbEntry.artifactId)}">${crumbEntry.displayValue}</a>
-            {{else j == entries.length - 1}}
-              &nbsp;|&nbsp;<b>${$.i18n.prop('browse.artifact.version')}:</b>&nbsp;
-               <a href="#" data-bind="click: function(){displayArtifactVersionDetailViewModel(crumbEntry.groupId,crumbEntry.artifactId,crumbEntry.version)}">${row.version}</a>&nbsp;
-            {{/if}}
-            {{if j < entries.length - 2}}
-               &nbsp;/&nbsp;
-            {{/if}}
-          {{/each}}
+  {{each(i, row) itemsOnCurrentPage()}}
+  <tr>
+    <th>${row.artifactId}</th>
+  </tr>
+  <tr>
+    <td>
+      {{var entries=row.crumbEntries()}}
+      {{each(j,crumbEntry) entries}}
+      {{if j < entries.length - 2}}
+      <a href="#" data-bind="click: function(){displayGroup(crumbEntry.groupId)}">${crumbEntry.displayValue}</a>
+      {{else j == entries.length - 2}}
+      <a href="#" data-bind="click: function(){displayArtifactDetailView(crumbEntry.groupId,crumbEntry.artifactId)}">${crumbEntry.displayValue}</a>
+      {{else j == entries.length - 1}}
+      &nbsp;|&nbsp;<b>${$.i18n.prop('browse.artifact.version')}:</b>&nbsp;
+      <a href="#"
+         data-bind="click: function(){displayArtifactVersionDetailViewModel(crumbEntry.groupId,crumbEntry.artifactId,crumbEntry.version)}">${row.version}</a>&nbsp;
+      {{/if}}
+      {{if j < entries.length - 2}}
+      &nbsp;/&nbsp;
+      {{/if}}
+      {{/each}}
 
-          {{if row.scope}}
-            |&nbsp;<b>${$.i18n.prop('browse.artifact.scope')}:</b>&nbsp;${row.scope}
-          {{/if}}
-        </td>
-      </tr>
-    {{/each}}
+      {{if row.scope}}
+      |&nbsp;<b>${$.i18n.prop('browse.artifact.scope')}:</b>&nbsp;${row.scope}
+      {{/if}}
+    </td>
+  </tr>
+  {{/each}}
 
   </tbody>
 </script>
 
 <script id="dependency_tree_tmpl" type="text/html">
   <ul>
-  {{each(i,treeEntry) treeEntries}}
+    {{each(i,treeEntry) treeEntries}}
     <li>
-        {{var entries=treeEntry.artifact.crumbEntries()}}
-        {{each(j,crumbEntry) entries}}
-          {{if j < entries.length - 2}}
-            <a class="cursor-hand" onclick="generalDisplayGroup(encodeURIComponent('${crumbEntry.groupId}'))">${crumbEntry.displayValue}</a>
-          {{else j == entries.length - 2}}
-            <a class="cursor-hand" onclick="generalDisplayArtifactDetailView(encodeURIComponent('${crumbEntry.groupId}'),encodeURIComponent('${crumbEntry.artifactId}'))">${crumbEntry.displayValue}</a>
-          {{else j == entries.length - 1}}
-            &nbsp;|&nbsp;<b>${$.i18n.prop('browse.artifact.version')}:</b>&nbsp;
-             <a class="cursor-hand" onclick="generalDisplayArtifactVersionDetailViewModel(encodeURIComponent('${crumbEntry.groupId}'),encodeURIComponent('${crumbEntry.artifactId}'),encodeURIComponent('${crumbEntry.version}'))">${crumbEntry.version}</a>&nbsp;
-          {{/if}}
-          {{if j < entries.length - 2}}
-             &nbsp;/&nbsp;
-          {{/if}}
-        {{/each}}
+      {{var entries=treeEntry.artifact.crumbEntries()}}
+      {{each(j,crumbEntry) entries}}
+      {{if j < entries.length - 2}}
+      <a class="cursor-hand" onclick="generalDisplayGroup(encodeURIComponent('${crumbEntry.groupId}'))">${crumbEntry.displayValue}</a>
+      {{else j == entries.length - 2}}
+      <a class="cursor-hand"
+         onclick="generalDisplayArtifactDetailView(encodeURIComponent('${crumbEntry.groupId}'),encodeURIComponent('${crumbEntry.artifactId}'))">${crumbEntry.displayValue}</a>
+      {{else j == entries.length - 1}}
+      &nbsp;|&nbsp;<b>${$.i18n.prop('browse.artifact.version')}:</b>&nbsp;
+      <a class="cursor-hand"
+         onclick="generalDisplayArtifactVersionDetailViewModel(encodeURIComponent('${crumbEntry.groupId}'),encodeURIComponent('${crumbEntry.artifactId}'),encodeURIComponent('${crumbEntry.version}'))">${crumbEntry.version}</a>&nbsp;
+      {{/if}}
+      {{if j < entries.length - 2}}
+      &nbsp;/&nbsp;
+      {{/if}}
+      {{/each}}
     </li>
     {{if treeEntry.childs.length>0}}
-      {{tmpl({treeEntries:treeEntry.childs}) "#dependency_tree_tmpl"}}
+    {{tmpl({treeEntries:treeEntry.childs}) "#dependency_tree_tmpl"}}
     {{/if}}
-  {{/each}}
+    {{/each}}
   </ul>
 </script>
 
 <script id="dependees_tmpl" type="text/html">
-    <ul>
+  <ul>
     {{each(i, artifact) itemsOnCurrentPage()}}
 
-      <li>
-          {{var entries=artifact.crumbEntries()}}
-          {{each(j,crumbEntry) entries}}
-            {{if j < entries.length - 2}}
-              <a class="cursor-hand" onclick="generalDisplayGroup(encodeURIComponent('${crumbEntry.groupId}'))">${crumbEntry.displayValue}</a>
-            {{else j == entries.length - 2}}
-              <a class="cursor-hand" onclick="generalDisplayArtifactDetailView(encodeURIComponent('${crumbEntry.groupId}'),encodeURIComponent('${crumbEntry.artifactId}'))">${crumbEntry.displayValue}</a>
-            {{else j == entries.length - 1}}
-              &nbsp;|&nbsp;<b>${$.i18n.prop('browse.artifact.version')}:</b>&nbsp;
-               <a class="cursor-hand" onclick="generalDisplayArtifactVersionDetailViewModel(encodeURIComponent('${crumbEntry.groupId}'),encodeURIComponent('${crumbEntry.artifactId}'),encodeURIComponent('${crumbEntry.version}'))">${crumbEntry.version}</a>&nbsp;
-            {{/if}}
-            {{if j < entries.length - 2}}
-               &nbsp;/&nbsp;
-            {{/if}}
-          {{/each}}
-      </li>
+    <li>
+      {{var entries=artifact.crumbEntries()}}
+      {{each(j,crumbEntry) entries}}
+      {{if j < entries.length - 2}}
+      <a class="cursor-hand" onclick="generalDisplayGroup(encodeURIComponent('${crumbEntry.groupId}'))">${crumbEntry.displayValue}</a>
+      {{else j == entries.length - 2}}
+      <a class="cursor-hand"
+         onclick="generalDisplayArtifactDetailView(encodeURIComponent('${crumbEntry.groupId}'),encodeURIComponent('${crumbEntry.artifactId}'))">${crumbEntry.displayValue}</a>
+      {{else j == entries.length - 1}}
+      &nbsp;|&nbsp;<b>${$.i18n.prop('browse.artifact.version')}:</b>&nbsp;
+      <a class="cursor-hand"
+         onclick="generalDisplayArtifactVersionDetailViewModel(encodeURIComponent('${crumbEntry.groupId}'),encodeURIComponent('${crumbEntry.artifactId}'),encodeURIComponent('${crumbEntry.version}'))">${crumbEntry.version}</a>&nbsp;
+      {{/if}}
+      {{if j < entries.length - 2}}
+      &nbsp;/&nbsp;
+      {{/if}}
+      {{/each}}
+    </li>
     {{/each}}
-    </ul>
+  </ul>
 </script>
 
 <script id="artifact_metadata_properties_tmpl" type="text/html">
-    <thead>
-      <tr>
-        <th title="${$.i18n.prop('browse.artifact.metadatas.key')}">${$.i18n.prop('browse.artifact.metadatas.key')}</th>
-        <th title="${$.i18n.prop('browse.artifact.metadatas.value')}">${$.i18n.prop('browse.artifact.metadatas.value')}</th>
-        <th title="${$.i18n.prop('browse.artifact.metadatas.delete')}">${$.i18n.prop('browse.artifact.metadatas.delete')}</th>
-        <th title="${$.i18n.prop('browse.artifact.metadatas.save')}">${$.i18n.prop('browse.artifact.metadatas.save')}</th>
-      </tr>
+  <thead>
+  <tr>
+    <th title="${$.i18n.prop('browse.artifact.metadatas.key')}">${$.i18n.prop('browse.artifact.metadatas.key')}</th>
+    <th title="${$.i18n.prop('browse.artifact.metadatas.value')}">${$.i18n.prop('browse.artifact.metadatas.value')}</th>
+    <th title="${$.i18n.prop('browse.artifact.metadatas.delete')}">${$.i18n.prop('browse.artifact.metadatas.delete')}
+    </th>
+    <th title="${$.i18n.prop('browse.artifact.metadatas.save')}">${$.i18n.prop('browse.artifact.metadatas.save')}</th>
+  </tr>
 
-    </thead>
-    <tbody>
-    {{each(i, row) itemsOnCurrentPage()}}
-      <tr>
-        {{if row.editable && hasSavePropertyKarma()}}
-          <td><input type="text" data-bind="value: row.key"/></td>
-        {{else}}
-          <td>${row.key}</td>
-        {{/if}}
-        <td>
-          {{if hasSavePropertyKarma()}}
-            <input type="text" data-bind="value: row.value"/>
-          {{else}}
-            ${row.value}
-          {{/if}}
-        </td>
-        <td>
-          {{if hasDeletePropertyKarma()}}
-          <a href="#" class="btn btn-danger" data-bind="click: function(){deleteProperty(row)}">${$.i18n.prop('browse.artifact.metadatas.delete')}</a>
-          {{/if}}
-        </td>
-        <td>
-          {{if row.modified && hasSavePropertyKarma()}}
-            <a href="#" class="btn btn-warning" data-bind="click: function(){saveProperty(row)}">${$.i18n.prop('browse.artifact.metadatas.save')}</a>
-          {{/if}}
-        </td>
-      </tr>
-    {{/each}}
-    </tbody>
+  </thead>
+  <tbody>
+  {{each(i, row) itemsOnCurrentPage()}}
+  <tr>
+    {{if row.editable && hasSavePropertyKarma()}}
+    <td><input type="text" data-bind="value: row.key"/></td>
+    {{else}}
+    <td>${row.key}</td>
+    {{/if}}
+    <td>
+      {{if hasSavePropertyKarma()}}
+      <input type="text" data-bind="value: row.value"/>
+      {{else}}
+      ${row.value}
+      {{/if}}
+    </td>
+    <td>
+      {{if hasDeletePropertyKarma()}}
+      <a href="#" class="btn btn-danger" data-bind="click: function(){deleteProperty(row)}">${$.i18n.prop('browse.artifact.metadatas.delete')}</a>
+      {{/if}}
+    </td>
+    <td>
+      {{if row.modified && hasSavePropertyKarma()}}
+      <a href="#" class="btn btn-warning" data-bind="click: function(){saveProperty(row)}">${$.i18n.prop('browse.artifact.metadatas.save')}</a>
+      {{/if}}
+    </td>
+  </tr>
+  {{/each}}
+  </tbody>
 </script>
 
 <script id="artifact_content_tree_partial" type="text/html">
   <ul class="jqueryFileTree" style="display: none;">
     {{each artifactContentEntries}}
-      {{if $value.file == true}}
-        <li class="file">
-          <a href="#" rel="${$value.path}/">${$value.text}</a>
-        </li>
-      {{else}}
-        <li class="directory collapsed">
-          <a href="#" rel="${$value.path}/">${$value.text}</a>
-        </li>
-      {{/if}}
+    {{if $value.file == true}}
+    <li class="file">
+      <a href="#" rel="${$value.path}/">${$value.text}</a>
+    </li>
+    {{else}}
+    <li class="directory collapsed">
+      <a href="#" rel="${$value.path}/">${$value.text}</a>
+    </li>
+    {{/if}}
     {{/each}}
   </ul>
 </script>
 
 <script id="artifact-details-files-content_tmpl" type="text/html">
-      <div class="row-fluid">
-        <div class="span5">
-           <ul id="artifact-content-list-files" class="package-list">
-           {{each artifactDownloadInfos}}
-             <li id="${$value.classifier}:${$value.version}:${$value.packaging}">
-               <a>${$value.packaging}:${$value.version}&nbsp;-&nbsp;${$value.size}</a>
-             </li>
-           {{/each}}
-           </ul>
-        </div>
-        <div class="span7">
-          <div id="artifact_content_tree">
-          </div>
-        </div>
-      </div>
-      <h4 id="artifact-content-text-header">${$.i18n.prop('browse.artifact.content.header')}</h4>
-      <div class="source">
-         <pre class="prettyprint linenums" id="artifact-content-text"></pre>
+  <div class="row-fluid">
+    <div class="span5">
+      <ul id="artifact-content-list-files" class="package-list">
+        {{each artifactDownloadInfos}}
+        <li id="${$value.classifier}:${$value.version}:${$value.packaging}">
+          <a>${$value.packaging}:${$value.version}&nbsp;-&nbsp;${$value.size}</a>
+        </li>
+        {{/each}}
+      </ul>
+    </div>
+    <div class="span7">
+      <div id="artifact_content_tree">
       </div>
+    </div>
+  </div>
+  <h4 id="artifact-content-text-header">${$.i18n.prop('browse.artifact.content.header')}</h4>
+
+  <div class="source">
+    <pre class="prettyprint linenums" id="artifact-content-text"></pre>
+  </div>
 </script>
 
 <script id="artifact-details-download-content_tmpl" type="text/html">
-    <ul id="artifact-download-list-files" class="package-list">
+  <ul id="artifact-download-list-files" class="package-list">
     {{each(i, row) artifacts()}}
-      <li>
-        {{if deleteKarma}}
-          <a href="#" data-bind="click: function(){deleteArtifact(row)}"><img src="images/trash.png"/></a>&nbsp;<a href="${row.url}">${row.packaging}:${row.version}&nbsp;-&nbsp;${row.size}</a>
-        {{else}}
-          <a href="${row.url}">${row.packaging}:${row.version}&nbsp;-&nbsp;${row.size}</a>
-        {{/if}}
-      </li>
+    <li>
+      {{if deleteKarma}}
+      <a href="#" data-bind="click: function(){deleteArtifact(row)}"><img src="images/trash.png"/></a>&nbsp;<a
+            href="${row.url}">${row.packaging}:${row.version}&nbsp;-&nbsp;${row.size}</a>
+      {{else}}
+      <a href="${row.url}">${row.packaging}:${row.version}&nbsp;-&nbsp;${row.size}</a>
+      {{/if}}
+    </li>
     {{/each}}
-    </ul>
+  </ul>
 </script>
\ No newline at end of file
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/login.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/login.html
index 808c1660f..0baa26089 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/login.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/login.html
@@ -19,26 +19,31 @@
 <div id="modal-login" class="modal hide fade">
   <div class="modal-header">
     <a href="#" class="close" data-dismiss="modal">&times;</a>
+
     <h3>${$.i18n.prop('login.section.title')}</h3>
   </div>
   <div class="modal-body" id="modal-login-content">
-      <form id="user-login-form" class="form-horizontal">
-        <div id="modal-login-err-message" class="alert alert-error" style="display:none"></div>
-        <fieldset>
-          <div class="control-group">
-            <label class="control-label" for="user-login-form-username">${$.i18n.prop('username')}</label>
-            <div class="controls">
-              <input type="text" id="user-login-form-username" name="user-login-form-username" class="required" placeholder="${$.i18n.prop('login.username.placehoder')}"/>
-            </div>
+    <form id="user-login-form" class="form-horizontal">
+      <div id="modal-login-err-message" class="alert alert-error" style="display:none"></div>
+      <fieldset>
+        <div class="control-group">
+          <label class="control-label" for="user-login-form-username">${$.i18n.prop('username')}</label>
+
+          <div class="controls">
+            <input type="text" id="user-login-form-username" name="user-login-form-username" class="required"
+                   placeholder="${$.i18n.prop('login.username.placehoder')}"/>
           </div>
-          <div class="control-group">
-            <label class="control-label" for="user-login-form-password">${$.i18n.prop('password')}</label>
-            <div class="controls">
-              <input type="password" id="user-login-form-password" name="user-login-form-password" class="required" placeholder="${$.i18n.prop('login.password.placehoder')}"/>
-            </div>
+        </div>
+        <div class="control-group">
+          <label class="control-label" for="user-login-form-password">${$.i18n.prop('password')}</label>
+
+          <div class="controls">
+            <input type="password" id="user-login-form-password" name="user-login-form-password" class="required"
+                   placeholder="${$.i18n.prop('login.password.placehoder')}"/>
           </div>
-        </fieldset>
-      </form>
+        </div>
+      </fieldset>
+    </form>
   </div>
   <div class="modal-footer" id="modal-login-footer">
     <div class="pull-left">
@@ -46,7 +51,9 @@
         <input type="checkbox" id="user-login-form-rememberme">${$.i18n.prop('rememberme')}
       </label>
     </div>
-    <button class="btn btn-primary" id="modal-login-ok" data-loading-text="${$.i18n.prop('common.loading')}">${$.i18n.prop('login')}</button>
+    <button class="btn btn-primary" id="modal-login-ok" data-loading-text="${$.i18n.prop('common.loading')}">
+      ${$.i18n.prop('login')}
+    </button>
     <button class="btn btn-info" id="modal-login-password-reset">${$.i18n.prop('password.reset')}</button>
   </div>
 </div>
@@ -54,71 +61,84 @@
 <div id="modal-register" class="modal hide fade">
   <div class="modal-header">
     <a href="#" class="close" data-dismiss="modal">&times;</a>
+
     <h3>${$.i18n.prop('register.section.title')}</h3>
   </div>
   <div class="modal-body" id="modal-register-content">
-      <form id="user-register-form" class="form-horizontal">
-        <div id="modal-register-err-message" class="alert-message error" style="display:none"></div>
-        <fieldset>
-          <div class="control-group">
-            <label class="control-label" for="user-register-form-username">${$.i18n.prop('username')}</label>
-            <div class="controls">
-              <input type="text" id="user-register-form-username" name="user-register-form-username" class="required" />
-            </div>
-          </div>
-          <div class="control-group">
-            <label class="control-label" for="user-register-form-fullname">${$.i18n.prop('full.name')}</label>
-            <div class="controls">
-              <input type="text" id="user-register-form-fullname" name="user-register-form-fullname" class="required" />
-            </div>
-          </div>
-          <div class="control-group">
-            <label class="control-label" for="user-register-form-email">${$.i18n.prop('email')}</label>
-            <div class="controls">
-              <input type="text" id="user-register-form-email" name="user-register-form-email" class="required email" />
-            </div>
-          </div>
+    <form id="user-register-form" class="form-horizontal">
+      <div id="modal-register-err-message" class="alert-message error" style="display:none"></div>
+      <fieldset>
+        <div class="control-group">
+          <label class="control-label" for="user-register-form-username">${$.i18n.prop('username')}</label>
 
-        </fieldset>
-      </form>
+          <div class="controls">
+            <input type="text" id="user-register-form-username" name="user-register-form-username" class="required"/>
+          </div>
+        </div>
+        <div class="control-group">
+          <label class="control-label" for="user-register-form-fullname">${$.i18n.prop('full.name')}</label>
+
+          <div class="controls">
+            <input type="text" id="user-register-form-fullname" name="user-register-form-fullname" class="required"/>
+          </div>
+        </div>
+        <div class="control-group">
+          <label class="control-label" for="user-register-form-email">${$.i18n.prop('email')}</label>
+
+          <div class="controls">
+            <input type="text" id="user-register-form-email" name="user-register-form-email" class="required email"/>
+          </div>
+        </div>
+
+      </fieldset>
+    </form>
   </div>
   <div class="modal-footer" id="modal-register-footer">
-      <button class="btn btn-primary" id="modal-register-ok">${$.i18n.prop('register')}</button>
+    <button class="btn btn-primary" id="modal-register-ok">${$.i18n.prop('register')}</button>
   </div>
 </div>
 
 <div id="modal-password-change" class="modal hide fade">
   <div class="modal-header">
     <a href="#" class="close" data-dismiss="modal">&times;</a>
+
     <h3>${$.i18n.prop('password.section.title')}</h3>
   </div>
   <div class="modal-body" id="modal-password-change-content">
-      <form id="password-change-form" class="form-horizontal">
-        <div id="modal-password-change-err-message" class="alert-message error" style="display:none"></div>
-        <fieldset>
-          <!-- part displayed only when a logged user want to change password will be hide when validate user registration -->
-          <div class="control-group" id="password-change-form-current-password-div">
-            <label class="control-label" for="password-change-form-current-password">${$.i18n.prop('password.existing')}</label>
-            <div class="controls">
-              <input type="password" id="password-change-form-current-password" name="password-change-form-current-password" class="required" value=""/>
-            </div>
-          </div>
+    <form id="password-change-form" class="form-horizontal">
+      <div id="modal-password-change-err-message" class="alert-message error" style="display:none"></div>
+      <fieldset>
+        <!-- part displayed only when a logged user want to change password will be hide when validate user registration -->
+        <div class="control-group" id="password-change-form-current-password-div">
+          <label class="control-label"
+                 for="password-change-form-current-password">${$.i18n.prop('password.existing')}</label>
 
-          <div class="control-group">
-            <label class="control-label" for="passwordChangeFormNewPassword">${$.i18n.prop('password.new')}</label>
-            <div class="controls">
-              <input type="password" id="passwordChangeFormNewPassword" name="passwordChangeFormNewPassword" class="required" value=""/>
-            </div>
+          <div class="controls">
+            <input type="password" id="password-change-form-current-password"
+                   name="password-change-form-current-password" class="required" value=""/>
           </div>
+        </div>
 
-          <div class="control-group">
-            <label class="control-label"  for="passwordChangeFormNewPasswordConfirm">${$.i18n.prop('password.new.confirm')}</label>
-            <div class="controls">
-              <input type="password" id="passwordChangeFormNewPasswordConfirm" name="passwordChangeFormNewPasswordConfirm" class="required" value=""/>
-            </div>
+        <div class="control-group">
+          <label class="control-label" for="passwordChangeFormNewPassword">${$.i18n.prop('password.new')}</label>
+
+          <div class="controls">
+            <input type="password" id="passwordChangeFormNewPassword" name="passwordChangeFormNewPassword"
+                   class="required" value=""/>
           </div>
-        </fieldset>
-      </form>
+        </div>
+
+        <div class="control-group">
+          <label class="control-label"
+                 for="passwordChangeFormNewPasswordConfirm">${$.i18n.prop('password.new.confirm')}</label>
+
+          <div class="controls">
+            <input type="password" id="passwordChangeFormNewPasswordConfirm" name="passwordChangeFormNewPasswordConfirm"
+                   class="required" value=""/>
+          </div>
+        </div>
+      </fieldset>
+    </form>
   </div>
   <div class="modal-footer" id="modal-password-change-footer">
     <button class="btn btn-primary" onclick="return" id="modal-change-password-ok">${$.i18n.prop('ok')}</button>
@@ -128,6 +148,7 @@
 <div id="modal-user-edit" class="modal hide fade">
   <div class="modal-header">
     <a href="#" class="close" data-dismiss="modal">&times;</a>
+
     <h3>${$.i18n.prop('password.section.title')}</h3>
   </div>
   <div class="modal-body" id="modal-user-edit-content">
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/user-edit.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/user-edit.html
index 7715cfa8e..d5117ffdb 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/user-edit.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/user-edit.html
@@ -17,89 +17,103 @@
   ~ under the License.
 -->
 <script id='redback/user-edit-tmpl' type='text/html'>
-<div id="edit-user-details-pills">
-  <ul id="edit_user_details_pills_headers" class="nav nav-pills" data-target="#edit-user-details-pills-content">
-    <li class="active" id="user-view-detail-li">
-      <a data-toggle="tab" href="#user-create-div">${$.i18n.prop('edit')}</a>
-    </li>
-    <li id="user-edit-roles-edit-li">
-      <a data-toggle="tab" href="#user-edit-roles-edit">${$.i18n.prop('effective.roles.edit')}</a>
-    </li>
-  </ul>
-  <div class="pill-content" id="edit-user-details-pills-content">
-    <div id="user-create-div" class="active pill-pane">
-      <div class="row-fluid">
-        <div class="span8 columns">
-          <form id="user-create" class="well form-horizontal" data-bind="submit: save">
-            <fieldset id="user-create-fieldset">
-              <div class="control-group">
-                <label class="control-label" for="username">${$.i18n.prop('username')}</label>
-                <div class="controls" id="username-div">
-                  {{if $data.username.length>0}}
+  <div id="edit-user-details-pills">
+    <ul id="edit_user_details_pills_headers" class="nav nav-pills" data-target="#edit-user-details-pills-content">
+      <li class="active" id="user-view-detail-li">
+        <a data-toggle="tab" href="#user-create-div">${$.i18n.prop('edit')}</a>
+      </li>
+      <li id="user-edit-roles-edit-li">
+        <a data-toggle="tab" href="#user-edit-roles-edit">${$.i18n.prop('effective.roles.edit')}</a>
+      </li>
+    </ul>
+    <div class="pill-content" id="edit-user-details-pills-content">
+      <div id="user-create-div" class="active pill-pane">
+        <div class="row-fluid">
+          <div class="span8 columns">
+            <form id="user-create" class="well form-horizontal" data-bind="submit: save">
+              <fieldset id="user-create-fieldset">
+                <div class="control-group">
+                  <label class="control-label" for="username">${$.i18n.prop('username')}</label>
+
+                  <div class="controls" id="username-div">
+                    {{if $data.username.length>0}}
                     <span class="uneditable-input">${$data.username}</span>
-                  {{else}}
-                    <input type="text" id="username" name="username" size="30" class="required" data-bind="value: username"/>
-                  {{/if}}
+                    {{else}}
+                    <input type="text" id="username" name="username" size="30" class="required"
+                           data-bind="value: username"/>
+                    {{/if}}
+                  </div>
                 </div>
-              </div>
-              <div class="control-group">
-                <label class="control-label" for="fullname">${$.i18n.prop('full.name')}</label>
-                <div class="controls">
-                  <input type="text" id="fullname" name="fullname" size="30" class="required" data-bind="value: fullName"/>
+                <div class="control-group">
+                  <label class="control-label" for="fullname">${$.i18n.prop('full.name')}</label>
+
+                  <div class="controls">
+                    <input type="text" id="fullname" name="fullname" size="30" class="required"
+                           data-bind="value: fullName"/>
+                  </div>
                 </div>
-              </div>
-              <div class="control-group">
-                <label class="control-label" for="password">${$.i18n.prop('password')}</label>
-                <div class="controls">
-                  <input type="password" id="password" name="password" class="required" data-bind="value: password"/>
+                <div class="control-group">
+                  <label class="control-label" for="password">${$.i18n.prop('password')}</label>
+
+                  <div class="controls">
+                    <input type="password" id="password" name="password" class="required" data-bind="value: password"/>
+                  </div>
                 </div>
-              </div>
-              <div class="control-group">
-                <label class="control-label" for="confirmPassword">${$.i18n.prop('confirm.password')}</label>
-                <div class="controls">
-                  <input type="password" id="confirmPassword" name="confirmPassword" data-bind="value: confirmPassword"/>
+                <div class="control-group">
+                  <label class="control-label" for="confirmPassword">${$.i18n.prop('confirm.password')}</label>
+
+                  <div class="controls">
+                    <input type="password" id="confirmPassword" name="confirmPassword"
+                           data-bind="value: confirmPassword"/>
+                  </div>
                 </div>
-              </div>
-              <div class="control-group">
-                <label class="control-label" for="email">${$.i18n.prop('email.address')}</label>
-                <div class="controls">
-                  <input type="text" id="email" name="email" class="required email" data-bind="value: email"/>
+                <div class="control-group">
+                  <label class="control-label" for="email">${$.i18n.prop('email.address')}</label>
+
+                  <div class="controls">
+                    <input type="text" id="email" name="email" class="required email" data-bind="value: email"/>
+                  </div>
                 </div>
-              </div>
-              <div class="control-group">
-                <label class="control-label" for="validated">${$.i18n.prop('validated')}</label>
-                <div class="controls">
-                  <input type="checkbox" id="validated" name="validated" data-bind="checked: validated"/>
+                <div class="control-group">
+                  <label class="control-label" for="validated">${$.i18n.prop('validated')}</label>
+
+                  <div class="controls">
+                    <input type="checkbox" id="validated" name="validated" data-bind="checked: validated"/>
+                  </div>
                 </div>
-              </div>
-              <div class="control-group">
-                <label class="control-label" for="locked">${$.i18n.prop('locked')}</label>
-                <div class="controls">
-                  <input type="checkbox" id="locked" name="locked" data-bind="checked: locked"/>
+                <div class="control-group">
+                  <label class="control-label" for="locked">${$.i18n.prop('locked')}</label>
+
+                  <div class="controls">
+                    <input type="checkbox" id="locked" name="locked" data-bind="checked: locked"/>
+                  </div>
                 </div>
-              </div>
-              <div class="control-group">
-                <label class="control-label" for="passwordChangeRequired">${$.i18n.prop('user.change.password.required')}</label>
-                <div class="controls">
-                  <input type="checkbox" id="passwordChangeRequired" name="passwordChangeRequired" data-bind="checked: passwordChangeRequired"/>
+                <div class="control-group">
+                  <label class="control-label" for="passwordChangeRequired">${$.i18n.prop('user.change.password.required')}</label>
+
+                  <div class="controls">
+                    <input type="checkbox" id="passwordChangeRequired" name="passwordChangeRequired"
+                           data-bind="checked: passwordChangeRequired"/>
+                  </div>
                 </div>
-              </div>
-            </fieldset>
-            <button data-bind="click: saveUser" class="btn" id="user-create-form-register-button">${$.i18n.prop('save')}</button>
-            <button class="btn" id="user-create-form-cancel-button">${$.i18n.prop('cancel')}</button>
-          </form>
-        </div>
-        <div class="span4 columns" id="user-edit-roles">
-          <div id="user-edit-roles-view"></div>
+              </fieldset>
+              <button data-bind="click: saveUser" class="btn" id="user-create-form-register-button">
+                ${$.i18n.prop('save')}
+              </button>
+              <button class="btn" id="user-create-form-cancel-button">${$.i18n.prop('cancel')}</button>
+            </form>
+          </div>
+          <div class="span4 columns" id="user-edit-roles">
+            <div id="user-edit-roles-view"></div>
+          </div>
         </div>
       </div>
-    </div>
 
-    <div id="user-edit-roles-edit" class="pill-pane">
-      roles edit
+      <div id="user-edit-roles-edit" class="pill-pane">
+        roles edit
+      </div>
     </div>
   </div>
-</div>
 </script>
 
 <script id="user_view_roles_list_tmpl" type="text/html">
@@ -109,7 +123,7 @@
   <div>
     <ul>
       {{each $data.user.assignedRoles}}
-        <li>${$value}</li>
+      <li>${$value}</li>
       {{/each}}
     </ul>
   </div>
@@ -119,41 +133,42 @@
 
   <div>
     {{each $data.applicationRoles}}
-      <div class="page-header">
-        <h3>${$value.name}</h3>
-      </div>
-      <blockquote>
-        <p>${$value.description}</p>
-      </blockquote>
-      <ul>
+    <div class="page-header">
+      <h3>${$value.name}</h3>
+    </div>
+    <blockquote>
+      <p>${$value.description}</p>
+    </blockquote>
+    <ul>
       {{each $value.globalRoles}}
-        <li><input type="checkbox" value="${$value}" data-bind="checked: user.assignedRoles">&nbsp;${$value}</input></li>
+      <li><input type="checkbox" value="${$value}" data-bind="checked: user.assignedRoles">&nbsp;${$value}</input></li>
       {{/each}}
-      </ul>
+    </ul>
 
-      {{if roleTemplates}}
-      <table class="bordered-table">
-        <thead>
-          <tr>
-            <th>&nbsp;</th>
-            {{each roleTemplates}}
-              <th>${$value.namePrefix}</th>
-            {{/each}}
-          </tr>
-        </thead>
-        <tbody>
-          {{each resources}}
-            {{var curResource = $value}}
-            <tr>
-              <td>${curResource}</td>
-              {{each roleTemplates}}
-                <td><input type="checkbox" value="${$value.namePrefix}${$value.delimiter}${curResource}" data-bind="checked: user.assignedRoles"/></td>
-              {{/each}}
-            </tr>
-          {{/each}}
-        </tbody>
-      </table>
-      {{/if}}
+    {{if roleTemplates}}
+    <table class="bordered-table">
+      <thead>
+      <tr>
+        <th>&nbsp;</th>
+        {{each roleTemplates}}
+        <th>${$value.namePrefix}</th>
+        {{/each}}
+      </tr>
+      </thead>
+      <tbody>
+      {{each resources}}
+      {{var curResource = $value}}
+      <tr>
+        <td>${curResource}</td>
+        {{each roleTemplates}}
+        <td><input type="checkbox" value="${$value.namePrefix}${$value.delimiter}${curResource}"
+                   data-bind="checked: user.assignedRoles"/></td>
+        {{/each}}
+      </tr>
+      {{/each}}
+      </tbody>
+    </table>
+    {{/if}}
 
     {{/each}}
 
@@ -164,104 +179,106 @@
 
 <script id='ko_usersGrid_grid' type='text/html'>
   <thead>
-      <tr>
-        {{each(i, columnDefinition) columns}}
-          <th>${ columnDefinition.headerText }</th>
-        {{/each}}
-        <th>${$.i18n.prop('edit')}</th>
-        <th>${$.i18n.prop('delete')}</th>
-        <th>${$.i18n.prop('user.list.locked')}</th>
-        <th>${$.i18n.prop('user.change.password.required')}</th>
-      </tr>
+  <tr>
+    {{each(i, columnDefinition) columns}}
+    <th>${ columnDefinition.headerText }</th>
+    {{/each}}
+    <th>${$.i18n.prop('edit')}</th>
+    <th>${$.i18n.prop('delete')}</th>
+    <th>${$.i18n.prop('user.list.locked')}</th>
+    <th>${$.i18n.prop('user.change.password.required')}</th>
+  </tr>
   </thead>
   <tbody>
-      {{each(i, row) itemsOnCurrentPage()}}
-        <tr data-bind="css:{ 'modified': row.modified()}">
-          {{each(j, columnDefinition) columns}}
-          <td>${ typeof columnDefinition.rowText == 'function' ? columnDefinition.rowText(row) : row[columnDefinition.rowText] }</td>
-          {{/each}}
-          <td id="users-grid-user-id-${row.username()}">
-            <a href="#" data-bind="click: function(){ editUserBox(row) }">
+  {{each(i, row) itemsOnCurrentPage()}}
+  <tr data-bind="css:{ 'modified': row.modified()}">
+    {{each(j, columnDefinition) columns}}
+    <td>
+      ${ typeof columnDefinition.rowText == 'function' ? columnDefinition.rowText(row) : row[columnDefinition.rowText] }
+    </td>
+    {{/each}}
+    <td id="users-grid-user-id-${row.username()}">
+      <a href="#" data-bind="click: function(){ editUserBox(row) }">
               <span class="btn btn-primary">
                 <i class="icon-pencil icon-white"/>
               </span>
-            </a>
-          </td>
-          {{if row.username()=="admin" || row.username()=="guest"}}
-            <td></td>
-          {{else}}
-            <td>
-              <a href="#" data-bind="click: function(){ deleteUser(row) }" id="users-grid-delete-${row.username()}">
+      </a>
+    </td>
+    {{if row.username()=="admin" || row.username()=="guest"}}
+    <td></td>
+    {{else}}
+    <td>
+      <a href="#" data-bind="click: function(){ deleteUser(row) }" id="users-grid-delete-${row.username()}">
                 <span class="btn btn-danger">
                   <i class="icon-trash icon-white"/>
                 </span>
-              </a>
-            </td>
-          {{/if}}
+      </a>
+    </td>
+    {{/if}}
 
-            {{if row.locked()==true}}
-              <td>
-                <a href="#" data-bind="click: function(){ unlock(row) }"><img src="images/system-lock-screen-22-22.png"/></a>
-              </td>
-            {{else}}
-              <td>
-                <a href="#" data-bind="click: function(){ lock(row) }"><img src="images/weather-clear-22-22.png"/></a>
-              </td>
-            {{/if}}
+    {{if row.locked()==true}}
+    <td>
+      <a href="#" data-bind="click: function(){ unlock(row) }"><img src="images/system-lock-screen-22-22.png"/></a>
+    </td>
+    {{else}}
+    <td>
+      <a href="#" data-bind="click: function(){ lock(row) }"><img src="images/weather-clear-22-22.png"/></a>
+    </td>
+    {{/if}}
 
-          {{if row.username()=="admin"}}
-            <td></td>
-          {{else}}
-            {{if row.passwordChangeRequired()==true}}
-              <td>
-                <a href="#" data-bind="click: function(){ passwordChangeRequire(row,false) }">
-                  <img src="images/dialog-error-22-22.png"/>
-                </a>
-              </td>
-            {{else}}
-            <td>
-              <a href="#" data-bind="click: function(){ passwordChangeRequire(row,true) }">
-                <img src="images/weather-clear-22-22.png"/>
-              </a>
-            </td>
-            {{/if}}
-          {{/if}}
-        </tr>
-      {{/each}}
+    {{if row.username()=="admin"}}
+    <td></td>
+    {{else}}
+    {{if row.passwordChangeRequired()==true}}
+    <td>
+      <a href="#" data-bind="click: function(){ passwordChangeRequire(row,false) }">
+        <img src="images/dialog-error-22-22.png"/>
+      </a>
+    </td>
+    {{else}}
+    <td>
+      <a href="#" data-bind="click: function(){ passwordChangeRequire(row,true) }">
+        <img src="images/weather-clear-22-22.png"/>
+      </a>
+    </td>
+    {{/if}}
+    {{/if}}
+  </tr>
+  {{/each}}
   </tbody>
 
 </script>
 
-<script id="usersGrid"  type="text/html">
-    <div class="page-header">
-      <h3><img src="images/system-users-32-32.png"/>${$.i18n.prop('users.list')}</h3>
-    </div>
-    <ul id="users-view-tabs" class="nav nav-tabs" data-target="#users-view-tabs-content">
-      <li class="active" id="users-view-tabs-li-users-grid">
-        <a data-toggle="tab" href="#users-view">${$.i18n.prop('users.grid.tab.title')}</a>
-      </li>
-      <li id="users-view-tabs-li-user-edit">
-        <a data-toggle="tab" href="#createUserForm" id="users-view-tabs-li-user-edit-a">${$.i18n.prop('add')}</a>
-      </li>
-    </ul>
-    <div id="users-view-tabs-content" class="tab-content">
-      <div id="users-view" class="tab-pane">
-        <button data-bind='click: sortByName'  class="btn">
-            ${$.i18n.prop('users.sort.byname')}
-        </button>
-        <table class="table table-striped table-bordered" id="usersTable"
-               data-bind="simpleGrid: gridViewModel,simpleGridTemplate:'ko_usersGrid_grid',pageLinksId:'usersPagination'">
-        </table>
-        <div id="usersPagination"></div>
-      </div>
-      <div id="createUserForm" class="tab-pane"></div>
+<script id="usersGrid" type="text/html">
+  <div class="page-header">
+    <h3><img src="images/system-users-32-32.png"/>${$.i18n.prop('users.list')}</h3>
+  </div>
+  <ul id="users-view-tabs" class="nav nav-tabs" data-target="#users-view-tabs-content">
+    <li class="active" id="users-view-tabs-li-users-grid">
+      <a data-toggle="tab" href="#users-view">${$.i18n.prop('users.grid.tab.title')}</a>
+    </li>
+    <li id="users-view-tabs-li-user-edit">
+      <a data-toggle="tab" href="#createUserForm" id="users-view-tabs-li-user-edit-a">${$.i18n.prop('add')}</a>
+    </li>
+  </ul>
+  <div id="users-view-tabs-content" class="tab-content">
+    <div id="users-view" class="tab-pane">
+      <button data-bind='click: sortByName' class="btn">
+        ${$.i18n.prop('users.sort.byname')}
+      </button>
+      <table class="table table-striped table-bordered" id="usersTable"
+             data-bind="simpleGrid: gridViewModel,simpleGridTemplate:'ko_usersGrid_grid',pageLinksId:'usersPagination'">
+      </table>
+      <div id="usersPagination"></div>
     </div>
+    <div id="createUserForm" class="tab-pane"></div>
+  </div>
 </script>
 
 <script id="user-delete-warning-tmpl" type='text/html'>
-    <div>
-      <span class="label label-warning">${$.i18n.prop('warning.not.undone.operation')}</span>
-    </div>
+  <div>
+    <span class="label label-warning">${$.i18n.prop('warning.not.undone.operation')}</span>
+  </div>
 </script>
 
 <script id="rolesTabs" type="text/html">
@@ -271,7 +288,8 @@
 
   <ul id="roles-view-tabs" class="nav nav-tabs" data-target="roles-view-tabs-content">
     <li class="active" id="roles-view-tabs-li-roles-grid">
-      <a data-toggle="tab" href="#roles-view" id="roles-view-tabs-a-roles-grid">${$.i18n.prop('roles.grid.tab.title')}</a>
+      <a data-toggle="tab" href="#roles-view"
+         id="roles-view-tabs-a-roles-grid">${$.i18n.prop('roles.grid.tab.title')}</a>
     </li>
     <li id="roles-view-tabs-li-roles-edit">
       <a data-toggle="tab" href="#role-edit">${$.i18n.prop('edit')}</a>
@@ -279,14 +297,14 @@
   </ul>
   <div id="roles-view-tabs-content" class="tab-content">
     <div id="roles-view" class="tab-pane">
-        <div data-bind="style: { display: bulkSave() ? '' : 'none' }">
-          <a data-bind="click: updateModifiedRoles" class="btn btn-danger" href="#">${$.i18n.prop('save.all')}</a>
-          <br/>
-        </div>
-        <table class="table table-striped table-bordered" id="rolesTable"
-               data-bind="simpleGrid: gridViewModel,simpleGridTemplate:'ko_rolesGrid',pageLinksId:'rolesPagination'">
-        </table>
-        <div id="rolesPagination"></div>
+      <div data-bind="style: { display: bulkSave() ? '' : 'none' }">
+        <a data-bind="click: updateModifiedRoles" class="btn btn-danger" href="#">${$.i18n.prop('save.all')}</a>
+        <br/>
+      </div>
+      <table class="table table-striped table-bordered" id="rolesTable"
+             data-bind="simpleGrid: gridViewModel,simpleGridTemplate:'ko_rolesGrid',pageLinksId:'rolesPagination'">
+      </table>
+      <div id="rolesPagination"></div>
     </div>
     <div id="role-edit" class="tab-pane" data-bind="template: {name:'editRoleTab',data: currentRole}"></div>
   </div>
@@ -304,21 +322,23 @@
       <div id="role-collapse" class="accordion-body collapse in">
         <table class="table table-bordered" id="editRoleTable">
           <tbody>
-            <tr>
-              <td>${$.i18n.prop('name')}:</td>
-              <td id="role-edit-name">${$data.name}</td>
-            </tr>
-            <tr>
-              <td>${$.i18n.prop('description')}:</td>
-              <td><input type="text" id="role-edit-description" data-bind="value: description"></td>
-            </tr>
-            <tr>
-              <td colspan="2">
-                <div class="pull-left">
-                  <button class="btn" id="role-edit-description-save" data-bind="click: saveRoleDescription">${$.i18n.prop('save')}</button>
-                </div>
-              </td>
-            </tr>
+          <tr>
+            <td>${$.i18n.prop('name')}:</td>
+            <td id="role-edit-name">${$data.name}</td>
+          </tr>
+          <tr>
+            <td>${$.i18n.prop('description')}:</td>
+            <td><input type="text" id="role-edit-description" data-bind="value: description"></td>
+          </tr>
+          <tr>
+            <td colspan="2">
+              <div class="pull-left">
+                <button class="btn" id="role-edit-description-save" data-bind="click: saveRoleDescription">
+                  ${$.i18n.prop('save')}
+                </button>
+              </div>
+            </td>
+          </tr>
           </tbody>
         </table>
 
@@ -328,7 +348,7 @@
         {{if $data.parentRoleNames}}
         <ul>
           {{each $data.parentRoleNames}}
-            <li>${$value}</li>
+          <li>${$value}</li>
           {{/each}}
         </ul>
         {{/if}}
@@ -339,7 +359,7 @@
         {{if $data.childRoleNames}}
         <ul>
           {{each $data.childRoleNames}}
-            <li>${$value}</li>
+          <li>${$value}</li>
           {{/each}}
         </ul>
         {{/if}}
@@ -348,39 +368,40 @@
           <h3>${$.i18n.prop('permissions')}</h3>
         </div>
         {{if $data.permissions}}
-          <table class="table table-striped table-bordered" id="rolePermissionsTable">
-            <thead>
-              <tr>
-                <th>${$.i18n.prop('name')}</th>
-                <th>${$.i18n.prop('role.operation')}</th>
-                <th>${$.i18n.prop('role.resource')}</th>
-              </tr>
-            </thead>
-            <tbody>
-              {{each permissions}}
-              <tr>
-                <td>${$value.name}</td>
-                {{if $value.operation }}
-                  <td>${$value.operation().name}</td>
-                {{else}}
-                  <td></td>
-                {{/if}}
-                {{if $value.resource }}
-                  <td>${$value.resource().identifier}</td>
-                {{else}}
-                  <td></td>
-                {{/if}}
-              </tr>
-             {{/each}}
-            </tbody>
-          </table>
+        <table class="table table-striped table-bordered" id="rolePermissionsTable">
+          <thead>
+          <tr>
+            <th>${$.i18n.prop('name')}</th>
+            <th>${$.i18n.prop('role.operation')}</th>
+            <th>${$.i18n.prop('role.resource')}</th>
+          </tr>
+          </thead>
+          <tbody>
+          {{each permissions}}
+          <tr>
+            <td>${$value.name}</td>
+            {{if $value.operation }}
+            <td>${$value.operation().name}</td>
+            {{else}}
+            <td></td>
+            {{/if}}
+            {{if $value.resource }}
+            <td>${$value.resource().identifier}</td>
+            {{else}}
+            <td></td>
+            {{/if}}
+          </tr>
+          {{/each}}
+          </tbody>
+        </table>
         {{/if}}
       </div>
     </div>
     <div class="accordion-group>">
       <div class="accordion-heading">
         <h3>
-          <a class="accordion-toggle" href="#role-users-collapse" data-parent="#edit-role-accordion" data-toggle="collapse">${$.i18n.prop('role.edit.section.users')}</a>
+          <a class="accordion-toggle" href="#role-users-collapse" data-parent="#edit-role-accordion"
+             data-toggle="collapse">${$.i18n.prop('role.edit.section.users')}</a>
         </h3>
       </div>
       <div id="role-users-collapse" class="accordion-body collapse">
@@ -389,9 +410,9 @@
           <h3>${$.i18n.prop('role.edit.users.defined.in.parent.roles')}</h3>
         </div>
         <ul>
-        {{each $data.parentsRolesUsers}}
-          <li>${$value.fullName} - ( ${$value.username} - ${$value.email} ) </li>
-        {{/each}}
+          {{each $data.parentsRolesUsers}}
+          <li>${$value.fullName} - ( ${$value.username} - ${$value.email} )</li>
+          {{/each}}
         </ul>
         {{/if}}
 
@@ -413,11 +434,11 @@
               {{if users().length>0}}
               <ul>
                 {{each(j, user) users()}}
-                <li>${user.fullName()} - ( ${user.username()} - ${user.email()} ) </li>
+                <li>${user.fullName()} - ( ${user.username()} - ${user.email()} )</li>
                 {{/each}}
               </ul>
               {{else}}
-                ${$.i18n.prop('role.edit.no.user.defined')}
+              ${$.i18n.prop('role.edit.no.user.defined')}
               {{/if}}
             </div>
           </div>
@@ -425,16 +446,20 @@
           <div id="role-edit-users" class="clearfix ar-multiselect pill-pane">
 
             <div class="ar-multiselect-column ar-multiselect-left">
-              <select data-bind="options: otherUsers ,optionsText: 'username',selectedOptions:selectedOtherUsers" multiple="true" id="role-edit-available-users"></select>
+              <select data-bind="options: otherUsers ,optionsText: 'username',selectedOptions:selectedOtherUsers"
+                      multiple="true" id="role-edit-available-users"></select>
             </div>
             <div class="ar-multiselect-column ar-multiselect-center">
               <ul style="list-style: none">
-                <li><input class="btn" id="role-edit-users-add-user" type="button" data-bind="click: addUser" value="&gt;"/></li>
-                <li><input class="btn" id="role-edit-users-remove-user" type="button" data-bind="click: removeUser" value="&lt;"/></li>
+                <li><input class="btn" id="role-edit-users-add-user" type="button" data-bind="click: addUser"
+                           value="&gt;"/></li>
+                <li><input class="btn" id="role-edit-users-remove-user" type="button" data-bind="click: removeUser"
+                           value="&lt;"/></li>
               </ul>
             </div>
             <div class="ar-multiselect-column ar-multiselect-right">
-              <select data-bind="options: users ,optionsText: 'username',selectedOptions:selectedUsers" multiple="true" id="role-edit-affected-users"></select>
+              <select data-bind="options: users ,optionsText: 'username',selectedOptions:selectedUsers" multiple="true"
+                      id="role-edit-affected-users"></select>
             </div>
             <button class="btn" id="role-edit-users-save" data-bind="click: saveUsers">${$.i18n.prop('save')}</button>
           </div>
@@ -446,93 +471,102 @@
 
 <script id='ko_rolesGrid' type='text/html'>
   <thead>
-      <tr>
-        {{each(i, columnDefinition) columns}}
-          <th>${ columnDefinition.headerText }</th>
-        {{/each}}
-        <th>${$.i18n.prop('edit')}</th>
-        <th>${$.i18n.prop('save')}</th>
-      </tr>
+  <tr>
+    {{each(i, columnDefinition) columns}}
+    <th>${ columnDefinition.headerText }</th>
+    {{/each}}
+    <th>${$.i18n.prop('edit')}</th>
+    <th>${$.i18n.prop('save')}</th>
+  </tr>
   </thead>
   <tbody>
-      {{each(i, row) itemsOnCurrentPage()}}
-          <tr data-bind="css:{ 'modified': row.modified()||row.usersModified()}">
-              {{each(j, columnDefinition) columns}}
-              {{var val = (typeof columnDefinition.rowText == 'function' ? columnDefinition.rowText(row) : row[columnDefinition.rowText])}}
-              <td id="role-${columnDefinition.rowText}-${row.name()}">
-                ${val}
-              </td>
-              {{/each}}
-              <td>
-                <a id="edit-role-${row.name()}" href="#" data-bind="click: function(){ editRole(row) }">
+  {{each(i, row) itemsOnCurrentPage()}}
+  <tr data-bind="css:{ 'modified': row.modified()||row.usersModified()}">
+    {{each(j, columnDefinition) columns}}
+    {{var val = (typeof columnDefinition.rowText == 'function' ? columnDefinition.rowText(row) :
+    row[columnDefinition.rowText])}}
+    <td id="role-${columnDefinition.rowText}-${row.name()}">
+      ${val}
+    </td>
+    {{/each}}
+    <td>
+      <a id="edit-role-${row.name()}" href="#" data-bind="click: function(){ editRole(row) }">
                   <span class="btn btn-primary">
                     <i class="icon-pencil icon-white"/>
                   </span>
-                </a>
-              </td>
-              <td>
-                {{if row.modified()}}
-                  <a href="#" class="btn btn-warning" data-bind="click: function(){ updateRole(row) }">${$.i18n.prop('save')}</a>
-                {{/if}}
-              </td>
-          </tr>
-      {{/each}}
+      </a>
+    </td>
+    <td>
+      {{if row.modified()}}
+      <a href="#" class="btn btn-warning" data-bind="click: function(){ updateRole(row) }">${$.i18n.prop('save')}</a>
+      {{/if}}
+    </td>
+  </tr>
+  {{/each}}
 </script>
 
 
 <script type="text/html" id="modal-user-edit-tmpl">
 
-    <form id="user-edit-form" class="form-horizontal">
-      <div id="modal-user-edit-err-message" class="alert-message error" style="display:none"></div>
-      <fieldset>
-        <div class="control-group">
-          <label class="control-label" for="username">${$.i18n.prop('username')}</label>
-          <div class="controls" id="username-div">
-            <span class="uneditable-input" data-bind="text: user.username"></span>
-          </div>
-        </div>
-        <div class="control-group">
-          <label class="control-label" for="fullname">${$.i18n.prop('full.name')}</label>
-          <div class="controls">
-              {{if user.readOnly}}
-                <span class="uneditable-input" data-bind="text: user.fullName"></span>
-              {{else}}
-                <input type="text" id="fullname" name="fullname" size="30" class="required" data-bind="value: user.fullName"/>
-              {{/if}}
-          </div>
-        </div>
-        <div class="control-group">
-          <label class="control-label" for="email">${$.i18n.prop('email.address')}</label>
-          <div class="controls">
-            {{if user.readOnly}}
-              <span class="uneditable-input" data-bind="text: user.email"></span>
-            {{else}}
-              <input type="text" id="email" name="email" size="30" class="required email" data-bind="value: user.email"/>
-            {{/if}}
-          </div>
-        </div>
-        <div class="control-group" id="user-edit-form-current-password-div">
-          <label class="control-label" for="userEditFormCurrentPassword">${$.i18n.prop('password.existing')}</label>
-          <div class="controls">
-            <input type="password" id="userEditFormCurrentPassword" name="userEditFormCurrentPassword" class="required" value=""/>
-          </div>
-        </div>
+  <form id="user-edit-form" class="form-horizontal">
+    <div id="modal-user-edit-err-message" class="alert-message error" style="display:none"></div>
+    <fieldset>
+      <div class="control-group">
+        <label class="control-label" for="username">${$.i18n.prop('username')}</label>
 
-        <div class="control-group">
-          <label class="control-label" for="userEditFormNewPassword">${$.i18n.prop('password.new')}</label>
-          <div class="controls">
-            <input type="password" id="userEditFormNewPassword" name="userEditFormNewPassword" class="" value=""/>
-          </div>
+        <div class="controls" id="username-div">
+          <span class="uneditable-input" data-bind="text: user.username"></span>
         </div>
+      </div>
+      <div class="control-group">
+        <label class="control-label" for="fullname">${$.i18n.prop('full.name')}</label>
 
-        <div class="control-group">
-          <label class="control-label" for="userEditFormNewPasswordConfirm">${$.i18n.prop('password.new.confirm')}</label>
-          <div class="controls">
-            <input type="password" id="userEditFormNewPasswordConfirm" name="userEditFormNewPasswordConfirm" class="" value=""/>
-          </div>
+        <div class="controls">
+          {{if user.readOnly}}
+          <span class="uneditable-input" data-bind="text: user.fullName"></span>
+          {{else}}
+          <input type="text" id="fullname" name="fullname" size="30" class="required" data-bind="value: user.fullName"/>
+          {{/if}}
         </div>
-      </fieldset>
-    </form>
+      </div>
+      <div class="control-group">
+        <label class="control-label" for="email">${$.i18n.prop('email.address')}</label>
+
+        <div class="controls">
+          {{if user.readOnly}}
+          <span class="uneditable-input" data-bind="text: user.email"></span>
+          {{else}}
+          <input type="text" id="email" name="email" size="30" class="required email" data-bind="value: user.email"/>
+          {{/if}}
+        </div>
+      </div>
+      <div class="control-group" id="user-edit-form-current-password-div">
+        <label class="control-label" for="userEditFormCurrentPassword">${$.i18n.prop('password.existing')}</label>
+
+        <div class="controls">
+          <input type="password" id="userEditFormCurrentPassword" name="userEditFormCurrentPassword" class="required"
+                 value=""/>
+        </div>
+      </div>
+
+      <div class="control-group">
+        <label class="control-label" for="userEditFormNewPassword">${$.i18n.prop('password.new')}</label>
+
+        <div class="controls">
+          <input type="password" id="userEditFormNewPassword" name="userEditFormNewPassword" class="" value=""/>
+        </div>
+      </div>
+
+      <div class="control-group">
+        <label class="control-label" for="userEditFormNewPasswordConfirm">${$.i18n.prop('password.new.confirm')}</label>
+
+        <div class="controls">
+          <input type="password" id="userEditFormNewPasswordConfirm" name="userEditFormNewPasswordConfirm" class=""
+                 value=""/>
+        </div>
+      </div>
+    </fieldset>
+  </form>
 
 </script>