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 2013/01/29 22:15:19 UTC
svn commit: r1440136 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root:
submit.reservation.html submit.reservation.jsp
Author: degenaro
Date: Tue Jan 29 21:15:19 2013
New Revision: 1440136
URL: http://svn.apache.org/viewvc?rev=1440136&view=rev
Log:
UIMA-2617 DUCC webserver (WS) should use common copyright for submit reservation page
Added:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/submit.reservation.jsp
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/submit.reservation.html
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/submit.reservation.html
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/submit.reservation.html?rev=1440136&r1=1440135&r2=1440136&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/submit.reservation.html (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/submit.reservation.html Tue Jan 29 21:15:19 2013
@@ -18,138 +18,12 @@ under the License.
-->
<html>
<head>
- <link rel="shortcut icon" href="ducc.ico" />
- <title>ducc-mon</title>
- <meta http-equiv="CACHE-CONTROL" content="NO-CACHE">
- <script src="opensources/jquery-1.4.2.js" type="text/javascript"></script>
- <script src="opensources/jgrowl/jquery.jgrowl.js" type="text/javascript"></script>
- <link rel="stylesheet" href="opensources/jgrowl/jquery.jgrowl.css" type="text/css"/>
- <link href="opensources/jquery-ui-1.8.4/gallery/jquery-ui-themes-1.8.4/themes/redmond/jquery-ui.css" rel="stylesheet" type="text/css"/>
- <script src="opensources/jquery-ui-1.8.4/ui/minified/jquery-ui.min.js"></script>
- <link href="opensources/navigation/menu.css" rel="stylesheet" type="text/css">
- <script src="js/ducc.js"></script>
- <script type="text/javascript" src="opensources/sorttable.js"></script>
- <link href="ducc.css" rel="stylesheet" type="text/css">
+<script language="javascript">
+<!--
+location.replace("submit.reservation.jsp"+location.search)
+//-->
+</script>
</head>
-
-<body onload="ducc_init('submit-reservation');">
-<table>
-
-<tr>
-<td valign="top">
- <div>
- <span>
- <h2><span class="title">ducc-mon</span></h2>
- <h4><span class="fulltitle">Distributed</span>
- <br>
- <span class="fulltitle">UIMA</span>
- <br>
- <span class="fulltitle">Cluster</span>
- <br>
- <span class="fulltitle">Computing</span>
- <br>
- <span class="fulltitle">Monitor</span>
- <br>
- <br>
- version: <span class="version" id="version"></span>
- <br>
- <br>
- <span class="idtitle" id="identity"></span>
- </h4>
- <h3><span class="subtitle">Reservation<span></h3>
- <h5><span class="timestamptitle">updated: </span><span class="timestamptitle" id="timestamp_area"></span>
- <br>
- <span class="authenticationtitle">authentication status: </span><span class="authenticationtitle" id="authentication_area"></span>
- </h5>
- </span>
- <span>
- <img src="opensources/images/chick-1.7x1.3.jpg" style="border:3px solid #ffff7a" alt="logo">
- </span>
- <br>
-
-<td valign="top">
- <div>
- <span>
- <h2><span class="title">  </span></h2>
- </span>
- <span class="noshow">
- <h3>Refresh</h3>
- <table>
- <tr>
- <td>
- <div id="refreshbutton">
- <input type="image" onClick="ducc_refresh('submit-reservation')" title="Refresh" alt="Refresh" src="opensources/images/1284662827_refresh.png">
- </div>
- <td>
- <div>
- <form name="duccform">
- <input type="radio" name="refresh" value="manual" onClick="ducc_put_cookie('ducc:refreshmode','manual' )" /> Manual
- <input type="radio" name="refresh" value="automatic" checked onClick="ducc_put_cookie('ducc:refreshmode','automatic')" /> Automatic
- </form>
- </div>
- </table>
- </span>
-
- </div>
-
- <div class="segment">
- <div class="logout">
- <h3>Reservation</h3>
- <table>
- <tr>
- <td align="right">description
- <td align="right">
- <td align="left" ><span id="description_area"><input type="text" size="40" id="description">
- </span>
- <tr>
- <td align="right">scheduling class
- <td align="right">
- <td align="left" ><span id="scheduling_class_area">
- </span>
- <tr>
- <td align="right">instance memory size
- <td align="right">
- <td align="left" ><span id="instance_memory_sizes_area">
- </span>
- <tr>
- <td align="right">instance memory units
- <td align="right">
- <td align="left" ><span id="instance_memory_units_area">
- </span>
- <tr>
- <td align="right">number of instances
- <td align="right">
- <td align="left" ><span id="number_of_instances_area">
- </span>
- <tr>
- <td align="right">
- <td align="right">
- <td align="left">
- <table>
- <tr>
- <td align="left" ><span id="reservation_submit_button_area">
- </span>
- <td align="left" ><input type="button" onclick="ducc_cancel_submit_reservation()" value="Cancel" />
- </table>
- </table>
- </div>
- </div>
-
- </div>
-
-<tr>
-<td>
- <table>
- <tr>
- <td valign="middle" align="left">
- <small>Copyright © 2012 The Apache Software Foundation</small>
- <tr>
- <td valign="middle" align="left">
- <small>Copyright © 2011, 2012 International Business Machines Corporation</small>
- </table>
-<td>
-
-</table>
-<script src="opensources/navigation/menu.js"></script>
+<body>
</body>
</html>
Added: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/submit.reservation.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/submit.reservation.jsp?rev=1440136&view=auto
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/submit.reservation.jsp (added)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/submit.reservation.jsp Tue Jan 29 21:15:19 2013
@@ -0,0 +1,152 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<html>
+<head>
+ <link rel="shortcut icon" href="ducc.ico" />
+ <title>ducc-mon</title>
+ <meta http-equiv="CACHE-CONTROL" content="NO-CACHE">
+ <script src="opensources/jquery-1.4.2.js" type="text/javascript"></script>
+ <script src="opensources/jgrowl/jquery.jgrowl.js" type="text/javascript"></script>
+ <link rel="stylesheet" href="opensources/jgrowl/jquery.jgrowl.css" type="text/css"/>
+ <link href="opensources/jquery-ui-1.8.4/gallery/jquery-ui-themes-1.8.4/themes/redmond/jquery-ui.css" rel="stylesheet" type="text/css"/>
+ <script src="opensources/jquery-ui-1.8.4/ui/minified/jquery-ui.min.js"></script>
+ <link href="opensources/navigation/menu.css" rel="stylesheet" type="text/css">
+ <script src="js/ducc.js"></script>
+ <script type="text/javascript" src="opensources/sorttable.js"></script>
+ <link href="ducc.css" rel="stylesheet" type="text/css">
+</head>
+
+<body onload="ducc_init('submit-reservation');">
+<table>
+
+<tr>
+<td valign="top">
+ <div>
+ <span>
+ <h2><span class="title">ducc-mon</span></h2>
+ <h4><span class="fulltitle">Distributed</span>
+ <br>
+ <span class="fulltitle">UIMA</span>
+ <br>
+ <span class="fulltitle">Cluster</span>
+ <br>
+ <span class="fulltitle">Computing</span>
+ <br>
+ <span class="fulltitle">Monitor</span>
+ <br>
+ <br>
+ version: <span class="version" id="version"></span>
+ <br>
+ <br>
+ <span class="idtitle" id="identity"></span>
+ </h4>
+ <h3><span class="subtitle">Reservation<span></h3>
+ <h5><span class="timestamptitle">updated: </span><span class="timestamptitle" id="timestamp_area"></span>
+ <br>
+ <span class="authenticationtitle">authentication status: </span><span class="authenticationtitle" id="authentication_area"></span>
+ </h5>
+ </span>
+ <span>
+ <img src="opensources/images/chick-1.7x1.3.jpg" style="border:3px solid #ffff7a" alt="logo">
+ </span>
+ <br>
+
+<td valign="top">
+ <div>
+ <span>
+ <h2><span class="title">  </span></h2>
+ </span>
+ <span class="noshow">
+ <h3>Refresh</h3>
+ <table>
+ <tr>
+ <td>
+ <div id="refreshbutton">
+ <input type="image" onClick="ducc_refresh('submit-reservation')" title="Refresh" alt="Refresh" src="opensources/images/1284662827_refresh.png">
+ </div>
+ <td>
+ <div>
+ <form name="duccform">
+ <input type="radio" name="refresh" value="manual" onClick="ducc_put_cookie('ducc:refreshmode','manual' )" /> Manual
+ <input type="radio" name="refresh" value="automatic" checked onClick="ducc_put_cookie('ducc:refreshmode','automatic')" /> Automatic
+ </form>
+ </div>
+ </table>
+ </span>
+
+ </div>
+
+ <div class="segment">
+ <div class="logout">
+ <h3>Reservation</h3>
+ <table>
+ <tr>
+ <td align="right">description
+ <td align="right">
+ <td align="left" ><span id="description_area"><input type="text" size="40" id="description">
+ </span>
+ <tr>
+ <td align="right">scheduling class
+ <td align="right">
+ <td align="left" ><span id="scheduling_class_area">
+ </span>
+ <tr>
+ <td align="right">instance memory size
+ <td align="right">
+ <td align="left" ><span id="instance_memory_sizes_area">
+ </span>
+ <tr>
+ <td align="right">instance memory units
+ <td align="right">
+ <td align="left" ><span id="instance_memory_units_area">
+ </span>
+ <tr>
+ <td align="right">number of instances
+ <td align="right">
+ <td align="left" ><span id="number_of_instances_area">
+ </span>
+ <tr>
+ <td align="right">
+ <td align="right">
+ <td align="left">
+ <table>
+ <tr>
+ <td align="left" ><span id="reservation_submit_button_area">
+ </span>
+ <td align="left" ><input type="button" onclick="ducc_cancel_submit_reservation()" value="Cancel" />
+ </table>
+ </table>
+ </div>
+ </div>
+
+ </div>
+
+<tr>
+<td>
+ <table>
+ <tr>
+ <td valign="middle" align="left">
+ <%@ include file="$copyright.jsp" %>
+ </table>
+<td>
+
+</table>
+<script src="opensources/navigation/menu.js"></script>
+</body>
+</html>