]> source.dussan.org Git - archiva.git/commitdiff
using icons for YES/NO/ENABLED/DISABLED
authorBrett Porter <brett@apache.org>
Sat, 26 Aug 2006 04:38:32 +0000 (04:38 +0000)
committerBrett Porter <brett@apache.org>
Sat, 26 Aug 2006 04:38:32 +0000 (04:38 +0000)
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@437076 13f79535-47bb-0310-9956-ffa450edef68

maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/index.jsp
maven-repository-webapp/src/main/webapp/WEB-INF/jsp/admin/proxiedRepositories.jsp

index d0a9198a09913e25e51e445907381cf71269685c..6f8a66e789a46fd3396ae65afe8346eda40b9297 100644 (file)
@@ -20,7 +20,7 @@
 <html>
 <head>
   <title>Administration</title>
-  <ww:head />
+  <ww:head/>
 </head>
 
 <body>
 <h1>Administration</h1>
 
 <div id="contentArea">
-  <h2>Configuration</h2>
+<h2>Configuration</h2>
+
+<table>
+  <tr>
+    <th>Index Directory</th>
+    <td>
+      <ww:property value="indexPath"/>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <th>Indexing Schedule</th>
+    <td>
+      <ww:property value="indexerCronExpression"/>
+    </td>
+    <%-- TODO: a "run now without timestamp checking" operation should be here too, to pick up any stragglers (in the event of a bug) --%>
+    <%-- TODO: a "delete index and run now" operation should be here too (really clean, remove deletions that didn't get picked up) --%>
+    <td><a href="<ww:url action="runIndexer" />">Run Now</a></td>
+  </tr>
+</table>
+
+<ww:set name="proxy" value="proxy"/>
+<c:if test="${!empty(proxy.host)}">
+  <h3>HTTP Proxy</h3>
 
   <table>
     <tr>
-      <th>Index Directory</th>
-      <td>
-        <ww:property value="indexPath" />
-      </td>
-      <td></td>
+      <th>Host</th>
+      <td>${proxy.host}</td>
+    </tr>
+    <tr>
+      <th>Port</th>
+      <td>${proxy.port}</td>
     </tr>
     <tr>
-      <th>Indexing Schedule</th>
-      <td>
-        <ww:property value="indexerCronExpression" />
-      </td>
-      <%-- TODO: a "run now without timestamp checking" operation should be here too, to pick up any stragglers (in the event of a bug) --%>
-      <%-- TODO: a "delete index and run now" operation should be here too (really clean, remove deletions that didn't get picked up) --%>
-      <td><a href="<ww:url action="runIndexer" />">Run Now</a></td>
+      <th>Username</th>
+      <td>${proxy.username}</td>
     </tr>
   </table>
+</c:if>
 
-  <ww:set name="proxy" value="proxy" />
-  <c:if test="${!empty(proxy.host)}">
-    <h3>HTTP Proxy</h3>
+<p>
+  <a href="<ww:url action="configure" />">Edit Configuration</a>
+</p>
 
+<h2>Managed Repositories</h2>
+
+<ww:set name="repositories" value="repositories"/>
+<c:if test="${empty(repositories)}">
+  <strong>There are no managed repositories configured yet.</strong>
+</c:if>
+<c:forEach items="${repositories}" var="repository" varStatus="i">
+  <div>
+    <div style="float: right">
+        <%-- TODO replace with icons --%>
+      <a href="<ww:url action="editRepository" method="input"><ww:param name="repoId" value="%{'${repository.id}'}" /></ww:url>">Edit
+        Repository</a> | <a
+        href="<ww:url action="deleteRepository" method="input"><ww:param name="repoId" value="%{'${repository.id}'}" /></ww:url>">Delete
+      Repository</a>
+    </div>
+    <h3>${repository.name}</h3>
     <table>
       <tr>
-        <th>Host</th>
-        <td>${proxy.host}</td>
+        <th>Identifier</th>
+        <td>
+          <code>${repository.id}</code>
+        </td>
+      </tr>
+      <tr>
+        <th>Directory</th>
+        <td>${repository.directory}</td>
+      </tr>
+      <tr>
+        <th>Type</th>
+        <!-- TODO: can probably just use layout appended to a key prefix in i18n to simplify this -->
+        <td>
+          <c:choose>
+            <c:when test="${repository.layout == 'default'}">
+              Maven 2.x Repository
+            </c:when>
+            <c:otherwise>
+              Maven 1.x Repository
+            </c:otherwise>
+          </c:choose>
+        </td>
       </tr>
       <tr>
-        <th>Port</th>
-        <td>${proxy.port}</td>
+        <th>Snapshots Included</th>
+        <td class="${repository.includeSnapshots ? 'doneMark' : 'errorMark'}"></td>
       </tr>
       <tr>
-        <th>Username</th>
-        <td>${proxy.username}</td>
+        <th>Indexed</th>
+        <td class="${repository.indexed ? 'doneMark' : 'errorMark'}"></td>
       </tr>
     </table>
-  </c:if>
-
-  <p>
-    <a href="<ww:url action="configure" />">Edit Configuration</a>
-  </p>
-
-  <h2>Managed Repositories</h2>
-
-  <ww:set name="repositories" value="repositories" />
-  <c:if test="${empty(repositories)}">
-    <strong>There are no managed repositories configured yet.</strong>
-  </c:if>
-  <c:forEach items="${repositories}" var="repository" varStatus="i">
-    <div>
-      <div style="float: right">
-          <%-- TODO replace with icons --%>
-        <a href="<ww:url action="editRepository" method="input"><ww:param name="repoId" value="%{'${repository.id}'}" /></ww:url>">Edit
-          Repository</a> | <a
-          href="<ww:url action="deleteRepository" method="input"><ww:param name="repoId" value="%{'${repository.id}'}" /></ww:url>">Delete
-        Repository</a>
-      </div>
-      <h3>${repository.name}</h3>
-      <table>
-        <tr>
-          <th>Identifier</th>
-          <td>
-            <code>${repository.id}</code>
-          </td>
-        </tr>
-        <tr>
-          <th>Directory</th>
-          <td>${repository.directory}</td>
-        </tr>
-        <tr>
-          <th>Type</th>
-          <!-- TODO: can probably just use layout appended to a key prefix in i18n to simplify this -->
-          <td>
-            <c:choose>
-              <c:when test="${repository.layout == 'default'}">
-                Maven 2.x Repository
-              </c:when>
-              <c:otherwise>
-                Maven 1.x Repository
-              </c:otherwise>
-            </c:choose>
-          </td>
-        </tr>
-        <tr>
-          <th>Snapshots Included</th>
-          <td>
-            <c:if test="${!repository.includeSnapshots}">
-              <span class="statusFailed">NO</span>
-            </c:if>
-            <c:if test="${repository.includeSnapshots}">
-              <span class="statusOk">YES</span>
-            </c:if>
-          </td>
-        </tr>
-        <tr>
-          <th>Indexed</th>
-          <td>
-            <c:if test="${!repository.indexed}">
-              <span class="statusFailed">NO</span>
-            </c:if>
-            <c:if test="${repository.indexed}">
-              <span class="statusOk">YES</span>
-            </c:if>
-          </td>
-        </tr>
-      </table>
-    </div>
-  </c:forEach>
+  </div>
+</c:forEach>
 
-  <p>
-    <a href="<ww:url action="addRepository" method="input" />">Add Repository</a>
-  </p>
+<p>
+  <a href="<ww:url action="addRepository" method="input" />">Add Repository</a>
+</p>
 </div>
 
 </body>
index 25a05de27ed6dd50e98ebaf4f44e93b565bd6c8e..b0670d29c3a1c929047e1ed7d8c3ba8f00694642 100644 (file)
@@ -20,7 +20,7 @@
 <html>
 <head>
   <title>Administration</title>
-  <ww:head />
+  <ww:head/>
 </head>
 
 <body>
@@ -30,7 +30,7 @@
 <div id="contentArea">
 <h2>Proxied Repositories</h2>
 
-<ww:set name="proxiedRepositories" value="proxiedRepositories" />
+<ww:set name="proxiedRepositories" value="proxiedRepositories"/>
 <c:if test="${empty(proxiedRepositories)}">
   <strong>There are no proxied repositories configured yet.</strong>
 </c:if>
 </div>
 <h3>${repository.name}</h3>
 <table>
-<tr>
-  <th>Identifier</th>
-  <td>
-    <code>${repository.id}</code>
-  </td>
-</tr>
-<tr>
-  <th>URL</th>
-  <td><a href="${repository.url}">${repository.url}</a></td>
-</tr>
-<tr>
-  <th>Type</th>
-  <!-- TODO: can probably just use layout appended to a key prefix in i18n to simplify this -->
-  <td>
-    <c:choose>
-      <c:when test="${repository.layout == 'default'}">
-        Maven 2.x Repository
-      </c:when>
-      <c:otherwise>
-        Maven 1.x Repository
-      </c:otherwise>
-    </c:choose>
-  </td>
-</tr>
-<tr>
-  <th>Snapshots</th>
-  <td>
-    <!-- TODO! turn into a tag -->
-    <c:choose>
-      <c:when test="${repository.snapshotsPolicy == 'disabled'}">
-        <span class="statusFailed">DISABLED</span>
-      </c:when>
-      <c:when test="${repository.snapshotsPolicy == 'always'}">
-        <span class="statusOk">ENABLED</span>: updated every request
-      </c:when>
-      <c:when test="${repository.snapshotsPolicy == 'hourly'}">
-        <span class="statusOk">ENABLED</span>: updated hourly
-      </c:when>
-      <c:when test="${repository.snapshotsPolicy == 'daily'}">
-        <span class="statusOk">ENABLED</span>: updated daily
-      </c:when>
-      <c:when test="${repository.snapshotsPolicy == 'interval'}">
-        <span class="statusOk">ENABLED</span>: updated every ${repository.snapshotsInterval} minutes
-      </c:when>
-    </c:choose>
-  </td>
-</tr>
-<tr>
-  <th>Releases</th>
-  <td>
-    <!-- TODO! turn into a tag -->
-    <c:choose>
-      <c:when test="${repository.releasesPolicy == 'disabled'}">
-        <span class="statusFailed">DISABLED</span>
-      </c:when>
-      <c:when test="${repository.releasesPolicy == 'always'}">
-        <span class="statusOk">ENABLED</span>: updated every request
-      </c:when>
-      <c:when test="${repository.releasesPolicy == 'hourly'}">
-        <span class="statusOk">ENABLED</span>: updated hourly
-      </c:when>
-      <c:when test="${repository.releasesPolicy == 'daily'}">
-        <span class="statusOk">ENABLED</span>: updated daily
-      </c:when>
-      <c:when test="${repository.releasesPolicy == 'interval'}">
-        <span class="statusOk">ENABLED</span>: updated every ${repository.releasesInterval} minutes
-      </c:when>
-    </c:choose>
-  </td>
-</tr>
-<tr>
-  <th>Proxied through</th>
-  <td>
-    <!-- TODO: this is the hard way! would be nice if there was a ref in the model so it was directly linked -->
-      ${repositoriesMap[repository.managedRepository].name}
-    (<code>${repositoriesMap[repository.managedRepository].id}</code>)
-  </td>
-</tr>
-<tr>
-  <th>Use HTTP Proxy</th>
-  <td>
-    <c:if test="${!repository.useNetworkProxy}">
-      <span class="statusFailed">NO</span>
-    </c:if>
-    <c:if test="${repository.useNetworkProxy}">
-      <span class="statusOk">YES</span>
-    </c:if>
-  </td>
-</tr>
-<tr>
-  <th>Cache Failures</th>
-  <td>
-    <c:if test="${!repository.cacheFailures}">
-      <span class="statusFailed">NO</span>
-    </c:if>
-    <c:if test="${repository.cacheFailures}">
-      <span class="statusOk">YES</span>
-    </c:if>
-  </td>
-</tr>
-<tr>
-  <th>Fail Whole Group</th>
-  <td>
-    <c:if test="${!repository.hardFail}">
-      <span class="statusFailed">NO</span>
-    </c:if>
-    <c:if test="${repository.hardFail}">
-      <span class="statusOk">YES</span>
-    </c:if>
-  </td>
-</tr>
+  <tr>
+    <th>Identifier</th>
+    <td>
+      <code>${repository.id}</code>
+    </td>
+  </tr>
+  <tr>
+    <th>URL</th>
+    <td><a href="${repository.url}">${repository.url}</a></td>
+  </tr>
+  <tr>
+    <th>Type</th>
+    <!-- TODO: can probably just use layout appended to a key prefix in i18n to simplify this -->
+    <td>
+      <c:choose>
+        <c:when test="${repository.layout == 'default'}">
+          Maven 2.x Repository
+        </c:when>
+        <c:otherwise>
+          Maven 1.x Repository
+        </c:otherwise>
+      </c:choose>
+    </td>
+  </tr>
+  <tr>
+    <th>Snapshots</th>
+    <td>
+      <!-- TODO! turn into a tag -->
+      <c:choose>
+        <c:when test="${repository.snapshotsPolicy == 'disabled'}">
+          Disabled
+        </c:when>
+        <c:when test="${repository.snapshotsPolicy == 'always'}">
+          Updated every request
+        </c:when>
+        <c:when test="${repository.snapshotsPolicy == 'hourly'}">
+          Updated hourly
+        </c:when>
+        <c:when test="${repository.snapshotsPolicy == 'daily'}">
+          Updated daily
+        </c:when>
+        <c:when test="${repository.snapshotsPolicy == 'interval'}">
+          Updated every ${repository.snapshotsInterval} minutes
+        </c:when>
+      </c:choose>
+    </td>
+  </tr>
+  <tr>
+    <th>Releases</th>
+    <td>
+      <!-- TODO! turn into a tag -->
+      <c:choose>
+        <c:when test="${repository.releasesPolicy == 'disabled'}">
+          Disabled
+        </c:when>
+        <c:when test="${repository.releasesPolicy == 'always'}">
+          Updated every request
+        </c:when>
+        <c:when test="${repository.releasesPolicy == 'hourly'}">
+          Updated hourly
+        </c:when>
+        <c:when test="${repository.releasesPolicy == 'daily'}">
+          Updated daily
+        </c:when>
+        <c:when test="${repository.releasesPolicy == 'interval'}">
+          Updated every ${repository.releasesInterval} minutes
+        </c:when>
+      </c:choose>
+    </td>
+  </tr>
+  <tr>
+    <th>Proxied through</th>
+    <td>
+      <!-- TODO: this is the hard way! would be nice if there was a ref in the model so it was directly linked -->
+        ${repositoriesMap[repository.managedRepository].name}
+      (<code>${repositoriesMap[repository.managedRepository].id}</code>)
+    </td>
+  </tr>
+  <tr>
+    <th>Use HTTP Proxy</th>
+    <td class="${repository.useNetworkProxy ? 'doneMark' : 'errorMark'}"></td>
+  </tr>
+  <tr>
+    <th>Cache Failures</th>
+    <td class="${repository.cacheFailures ? 'doneMark' : 'errorMark'}"></td>
+  </tr>
+  <tr>
+    <th>Fail Whole Group</th>
+    <td class="${repository.hardFail ? 'doneMark' : 'errorMark'}"></td>
+  </tr>
 </table>
 </div>
 </c:forEach>