You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2015/12/22 20:56:40 UTC
svn commit: r1721457 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main:
java/org/apache/uima/ducc/ws/server/DuccHandler.java webapp/root/login.jsp
webapp/root/logout.jsp
Author: degenaro
Date: Tue Dec 22 19:56:39 2015
New Revision: 1721457
URL: http://svn.apache.org/viewvc?rev=1721457&view=rev
Log:
UIMA-4716 DUCC Web Server (WS) cosmetics and minor improvements
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/login.jsp
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/logout.jsp
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java?rev=1721457&r1=1721456&r2=1721457&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java Tue Dec 22 19:56:39 2015
@@ -242,7 +242,7 @@ public class DuccHandler extends DuccAbs
}
else {
String link = "https://"+request.getServerName()+":"+getDuccWebServer().getPortSsl()+"/";
- String href = "<a href=\""+link+"login.html\" onclick=\"var newWin = window.open(this.href,'"+_window_login_logout+"','height=600,width=475,scrollbars'); newWin.focus(); return false;\">Login</a>";
+ String href = "<a href=\""+link+"login.html\" onclick=\"var newWin = window.open(this.href,'"+_window_login_logout+"','height=600,width=550,scrollbars'); newWin.focus(); return false;\">Login</a>";
sb.append(href);
}
}
@@ -259,7 +259,7 @@ public class DuccHandler extends DuccAbs
boolean userAuth = isAuthenticated(request,response);
if (userAuth) {
String link = "https://"+request.getServerName()+":"+getDuccWebServer().getPortSsl()+"/";
- String href = "<a href=\""+link+"logout.html\" onclick=\"var newWin = window.open(this.href,'"+_window_login_logout+"','height=600,width=475,scrollbars'); newWin.focus(); return false;\">Logout</a>";
+ String href = "<a href=\""+link+"logout.html\" onclick=\"var newWin = window.open(this.href,'"+_window_login_logout+"','height=600,width=550,scrollbars'); newWin.focus(); return false;\">Logout</a>";
sb.append(href);
}
else {
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/login.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/login.jsp?rev=1721457&r1=1721456&r2=1721457&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/login.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/login.jsp Tue Dec 22 19:56:39 2015
@@ -36,9 +36,8 @@ under the License.
<body onload="ducc_init('authentication-login');">
<table>
-
<tr>
-<td valign="top">
+<td valign="top" class="ducc-lhs">
<div>
<span>
<h2><span class="title">ducc-mon</span></h2>
@@ -58,7 +57,7 @@ under the License.
<br>
<span class="idtitle" id="identity"></span>
</h4>
- <h3><span class="subtitle">Authentication<span></h3>
+ <h3><span class="subtitle">Authentication</span></h3>
<h5><span class="authenticator">authenticator: </span><span class="authenticator" id="authenticator_version_area"></span>
<br>
<br>
@@ -71,11 +70,12 @@ under the License.
<%@ include file="$banner/c3-image-login.jsp" %>
</span>
<br>
-
+ </div>
+</td>
<td valign="top">
<div style="display:none">
<span>
- <h2><span class="title">  </span></h2>
+ <h2><span class="title"> </span></h2>
</span>
<h3>Refresh</h3>
<table>
@@ -92,11 +92,8 @@ under the License.
</form>
</div>
</table>
-
</div>
-
- <form id="login" name="login" method="post" action="/ducc-servlet/user-login">
-
+ <form id="login" name="login" method="post" action="/ducc-servlet/user-login">
<div class="segment">
<br/>
<br/>
@@ -128,16 +125,11 @@ under the License.
</table>
</div>
</div>
-
</form>
-
- </div>
-
<tr>
<td>
- <%@ include file="$copyright.jsp" %>
+ <%@ include file="$copyright-narrow.jsp" %>
<td>
-
</table>
<script src="opensources/navigation/menu.js"></script>
</body>
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/logout.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/logout.jsp?rev=1721457&r1=1721456&r2=1721457&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/logout.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/logout.jsp Tue Dec 22 19:56:39 2015
@@ -35,9 +35,8 @@ under the License.
<body onload="ducc_init('authentication-logout');">
<table>
-
<tr>
-<td valign="top">
+<td valign="top" class="ducc-lhs">
<div>
<span>
<h2><span class="title">ducc-mon</span></h2>
@@ -57,7 +56,7 @@ under the License.
<br>
<span class="idtitle" id="identity"></span>
</h4>
- <h3><span class="subtitle">Authentication<span></h3>
+ <h3><span class="subtitle">Authentication</span></h3>
<h5><span class="authenticator">authenticator: </span><span class="authenticator" id="authenticator_version_area"></span>
<br>
<br>
@@ -70,11 +69,12 @@ under the License.
<%@ include file="$banner/c3-image-logout.jsp" %>
</span>
<br>
-
+ </div>
+</td>
<td valign="top">
<div style="display:none">
<span>
- <h2><span class="title">  </span></h2>
+ <h2><span class="title"> </span></h2>
</span>
<h3>Refresh</h3>
<table>
@@ -91,9 +91,7 @@ under the License.
</form>
</div>
</table>
-
</div>
-
<div class="segment">
<br/>
<br/>
@@ -108,13 +106,10 @@ under the License.
</table>
</div>
</div>
- </div>
-
<tr>
<td>
- <%@ include file="$copyright.jsp" %>
+ <%@ include file="$copyright-narrow.jsp" %>
<td>
-
</table>
<script src="opensources/navigation/menu.js"></script>
</body>