[Bedework-commit] bedework r1860 - in
releases/bedework-3.4.1.1/deployment/resources: . images login
svnadmin at bedework.org
svnadmin at bedework.org
Fri Apr 25 01:12:49 EDT 2008
Author: johnsa
Date: 2008-04-25 01:12:46 -0400 (Fri, 25 Apr 2008)
New Revision: 1860
Added:
releases/bedework-3.4.1.1/deployment/resources/images/
releases/bedework-3.4.1.1/deployment/resources/images/bedeworkLogo.gif
Modified:
releases/bedework-3.4.1.1/deployment/resources/build.xml
releases/bedework-3.4.1.1/deployment/resources/login/error.html
releases/bedework-3.4.1.1/deployment/resources/login/login.html
releases/bedework-3.4.1.1/deployment/resources/login/logout.html
Log:
web clients: update login pages
Modified: releases/bedework-3.4.1.1/deployment/resources/build.xml
===================================================================
--- releases/bedework-3.4.1.1/deployment/resources/build.xml 2008-04-24 18:57:39 UTC (rev 1859)
+++ releases/bedework-3.4.1.1/deployment/resources/build.xml 2008-04-25 05:12:46 UTC (rev 1860)
@@ -11,8 +11,8 @@
value="${org.bedework.global.build.common.context.deploy.dir}" />
<property name="propval.app.display.name"
value="${org.bedework.global.build.common.context.name}" />
- <property name="propval.app.war.name"
- value="${org.bedework.global.build.common.context.war.name}" />
+ <property name="propval.app.war.name"
+ value="${org.bedework.global.build.common.context.war.name}" />
<import file="${build.dir}/buildfilters.xml" />
@@ -67,6 +67,7 @@
<copy todir="${common.dest.war}">
<fileset dir="${common.resources.dir}/xsl" />
+ <fileset dir="${common.resources.dir}/images" />
</copy>
<!-- build the war file -->
@@ -124,7 +125,9 @@
<copy todir="${cmn.destdir}">
<fileset dir="${common.resources.dir}/xsl" />
+ <fileset dir="${common.resources.dir}/images" />
</copy>
+
</then>
</if>
</else>
Added: releases/bedework-3.4.1.1/deployment/resources/images/bedeworkLogo.gif
===================================================================
(Binary files differ)
Property changes on: releases/bedework-3.4.1.1/deployment/resources/images/bedeworkLogo.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: releases/bedework-3.4.1.1/deployment/resources/login/error.html
===================================================================
--- releases/bedework-3.4.1.1/deployment/resources/login/error.html 2008-04-24 18:57:39 UTC (rev 1859)
+++ releases/bedework-3.4.1.1/deployment/resources/login/error.html 2008-04-25 05:12:46 UTC (rev 1860)
@@ -1,140 +1,65 @@
<html>
<head>
- <title>@DISPLAY-NAME@ Login Error</title>
+ <title>@DISPLAY-NAME@ Login</title>
+ <script language="JavaScript" type="text/javascript">
+ <!--
+ // places the cursor in the first available form element when the page is loaded
+ // (if a form exists on the page)
+ function focusFirstElement() {
+ if (window.document.forms[0]) {
+ window.document.forms[0].elements[0].focus();
+ }
+ }
+ // -->
+ </script>
<style type="text/css">
<!--
body {
font-family: Arial, Helvetica, Verdana, sans-serif;
- margin:0px;
- padding:0px;
- background-color: #ccc;
- color: black;
- }
- #bodyBox {
- height: 100%;
- }
- #contentBox {
- text-align: center;
+ margin: 0;
+ padding: 2em;
background-color: white;
color: black;
- width: 400px;
- margin: 1em 1em 0.5em 1em;
- padding: 1em 1em 1em 1em ;
- border-top: thick solid #DDD;
- border-left: thick solid #DDD;
- border-bottom: thick solid #888;
- border-right: thick solid #888;
- }
+ }
#title {
- color: black;
white-space: nowrap;
font-size: 1.1em;
}
#loginBox {
text-align: left;
- margin-left: 0em;
+ margin-left: 0em;
+ white-space: nowrap;
}
#loginBox td {
padding-right: 0.5em;
}
- #logoBox {
- width: 435px;
- margin: 0em;
- padding: 0em;
+ form {
+ margin: 1em 0;
+ padding: 0;
+ }
+ a:link,
+ a:active,
+ a:visited {
+ color: #900;
+ background-color: transparent;
+ text-decoration: underline;
+ }
+ a:hover {
+ color: #900;
+ background-color: #fc0;
+ text-decoration: none;
}
- .styleButtons {
- font-size: 0.9em;
- padding: 3px;
- white-space: nowrap;
- margin-left: 4em;
- color: #eee;
- background-color: transparent;
- }
- /* LINK DEFINITIONS */
- .styleButtons a:link {
- color: #900;
- background-color: #ccc;
- text-decoration: none;
- font-weight: normal;
- margin-left: 10px;
- padding: 1px 2px 1px 2px;
- border-top: 2px solid #DDD;
- border-left: 2px solid #DDD;
- border-bottom: 2px solid #888;
- border-right: 2px solid #888;
- }
- .styleButtons a:visited {
- color: #900;
- background-color: #ccc;
- text-decoration: none;
- font-weight: normal;
- margin-left: 10px;
- padding: 1px 2px 1px 2px;
- border-top: 2px solid #DDD;
- border-left: 2px solid #DDD;
- border-bottom: 2px solid #888;
- border-right: 2px solid #888;
- }
- .styleButtons a:active {
- color: #900;
- background-color: #ccc;
- text-decoration: none;
- font-weight: normal;
- margin-left: 10px;
- padding: 1px 2px 1px 2px;
- border-top: 2px solid #DDD;
- border-left: 2px solid #DDD;
- border-bottom: 2px solid #888;
- border-right: 2px solid #888;
- }
- .styleButtons a:hover {
- color: #000;
- background-color: #fc0;
- font-weight: normal;
- text-decoration: none;
- margin-left: 10px;
- padding: 1px 2px 1px 2px;
- border-top: 2px solid #DDD;
- border-left: 2px solid #DDD;
- border-bottom: 2px solid #888;
- border-right: 2px solid #888;
- }
- a:link {
- color: #900;
- background-color: transparent;
- text-decoration: underline;
- }
- a:visited {
- color: #900;
- background-color: transparent;
- text-decoration: underline;
- }
- a:active {
- color: #900;
- background-color: transparent;
- text-decoration: underline;
- }
- a:hover {
- color: #900;
- background-color: #fc0;
- text-decoration: none;
- }
-->
</style>
</head>
- <body bgcolor="white">
- <table border="0" width="100%" height="100%" id="bodyBox">
- <tr>
- <td valign="middle" align="center">
- <div id="contentBox" align="center">
- <h3 id="title">Login error</h3>
- <div id="loginBox">
- <p>Please try <a href="setup.do">again</a>.</p>
- </div>
- </div>
- </td>
- </tr>
- </table>
+ <body bgcolor="white" onLoad="javascript:focusFirstElement()">
+ <div id="logo">
+ <img src="/bedework-common/images/bedeworkLogo.gif" alt="Bedework Logo"/>
+ </div>
+ <h3 id="title">Login error</h3>
+ <div id="loginBox">
+ <p>Please try <a href="setup.do">again</a>.</p>
+ </div
</body>
</html>
Modified: releases/bedework-3.4.1.1/deployment/resources/login/login.html
===================================================================
--- releases/bedework-3.4.1.1/deployment/resources/login/login.html 2008-04-24 18:57:39 UTC (rev 1859)
+++ releases/bedework-3.4.1.1/deployment/resources/login/login.html 2008-04-25 05:12:46 UTC (rev 1860)
@@ -16,28 +16,12 @@
<!--
body {
font-family: Arial, Helvetica, Verdana, sans-serif;
- margin:0px;
- padding:0px;
- background-color: #ccc;
+ margin: 0;
+ padding: 2em;
+ background-color: white;
color: black;
- }
- #bodyBox {
- height: 100%;
- }
- #contentBox {
- text-align: center;
- background-color: #eee;
- color: black;
- width: 400px;
- margin: 1em 1em 0.5em 1em;
- padding: 1em 1em 1em 1em ;
- border-top: thick solid #ddd;
- border-left: thick solid #ddd;
- border-bottom: thick solid #888;
- border-right: thick solid #888;
- }
+ }
#title {
- color: black;
white-space: nowrap;
font-size: 1.1em;
}
@@ -49,126 +33,39 @@
#loginBox td {
padding-right: 0.5em;
}
- #logoBox {
- width: 435px;
- margin: 0em;
- padding: 0em;
- }
form {
- margin: 0;
+ margin: 1em 0;
padding: 0;
}
- .styleButtons {
- font-size: 0.9em;
- padding: 3px;
- white-space: nowrap;
- margin-left: 4em;
- color: #eee;
- background-color: transparent;
- }
- /* LINK DEFINITIONS */
- .styleButtons a:link {
- color: #900;
- background-color: #ccc;
- text-decoration: none;
- font-weight: normal;
- margin-left: 10px;
- padding: 1px 2px 1px 2px;
- border-top: 2px solid #ddd;
- border-left: 2px solid #ddd;
- border-bottom: 2px solid #888;
- border-right: 2px solid #888;
- }
- .styleButtons a:visited {
- color: #900;
- background-color: #ccc;
- text-decoration: none;
- font-weight: normal;
- margin-left: 10px;
- padding: 1px 2px 1px 2px;
- border-top: 2px solid #ddd;
- border-left: 2px solid #ddd;
- border-bottom: 2px solid #888;
- border-right: 2px solid #888;
- }
- .styleButtons a:active {
- color: #900;
- background-color: #ccc;
- text-decoration: none;
- font-weight: normal;
- margin-left: 10px;
- padding: 1px 2px 1px 2px;
- border-top: 2px solid #ddd;
- border-left: 2px solid #ddd;
- border-bottom: 2px solid #888;
- border-right: 2px solid #888;
- }
- .styleButtons a:hover {
- color: #000;
- background-color: #fc0;
- font-weight: normal;
- text-decoration: none;
- margin-left: 10px;
- padding: 1px 2px 1px 2px;
- border-top: 2px solid #ddd;
- border-left: 2px solid #ddd;
- border-bottom: 2px solid #888;
- border-right: 2px solid #888;
- }
- a:link {
- color: #900;
- background-color: transparent;
- text-decoration: underline;
- }
- a:visited {
- color: #900;
- background-color: transparent;
- text-decoration: underline;
- }
- a:active {
- color: #900;
- background-color: transparent;
- text-decoration: underline;
- }
- a:hover {
- color: #900;
- background-color: #fc0;
- text-decoration: none;
- }
-->
</style>
</head>
- <body bgcolor="white" onLoad="javascript:focusFirstElement()">
- <table border="0" width="100%" height="100%" id="bodyBox">
+ <body bgcolor="white" onLoad="javascript:focusFirstElement()">
+ <div id="logo">
+ <img src="/bedework-common/images/bedeworkLogo.gif" alt="Bedework Logo"/>
+ </div>
+ <!--<h3 id="title">@DISPLAY-NAME@ Login</h3>-->
+ <form method="post" action="j_security_check" >
+ <table border="0" id="loginBox">
<tr>
- <td valign="middle" align="center">
- <div id="contentBox" align="center">
- <h3 id="title">@DISPLAY-NAME@ Login</h3>
- <form method="post" action="j_security_check" >
- <table border="0" id="loginBox">
- <tr>
- <td>
- UserID:
- </td>
- <td>
- <input type="text" name="j_username">
- </td>
- </tr>
- <tr>
- <td>
- Password:
- </td>
- <td>
- <input type="password" name="j_password">
- <input type="submit" name="j_security_check" value="login">
- </td>
- </tr>
- </table>
- </form>
- </div>
+ <td>
+ UserID:
</td>
+ <td>
+ <input type="text" name="j_username">
+ </td>
</tr>
- </table>
+ <tr>
+ <td>
+ Password:
+ </td>
+ <td>
+ <input type="password" name="j_password">
+ <input type="submit" name="j_security_check" value="login">
+ </td>
+ </tr>
+ </table>
+ </form>
</body>
</html>
Modified: releases/bedework-3.4.1.1/deployment/resources/login/logout.html
===================================================================
--- releases/bedework-3.4.1.1/deployment/resources/login/logout.html 2008-04-24 18:57:39 UTC (rev 1859)
+++ releases/bedework-3.4.1.1/deployment/resources/login/logout.html 2008-04-25 05:12:46 UTC (rev 1860)
@@ -1,148 +1,103 @@
<html>
<head>
- <title>@DISPLAY-NAME@ Logged Out</title>
+ <title>@DISPLAY-NAME@ Login</title>
+ <script language="JavaScript" type="text/javascript">
+ <!--
+ // places the cursor in the first available form element when the page is loaded
+ // (if a form exists on the page)
+ function focusFirstElement() {
+ if (window.document.forms[0]) {
+ window.document.forms[0].elements[0].focus();
+ }
+ }
+ // -->
+ </script>
<style type="text/css">
<!--
body {
font-family: Arial, Helvetica, Verdana, sans-serif;
- margin:0px;
- padding:0px;
- background-color: #ccc;
- color: black;
- }
- #bodyBox {
- height: 100%;
- }
- #contentBox {
- text-align: center;
+ margin: 0;
+ padding: 2em;
background-color: white;
color: black;
- width: 400px;
- margin: 1em 1em 0.5em 1em;
- padding: 1em 1em 1em 1em ;
- border-top: thick solid #DDD;
- border-left: thick solid #DDD;
- border-bottom: thick solid #888;
- border-right: thick solid #888;
- background-image : url(loginbg.jpg);
- }
+ }
#title {
- color: black;
white-space: nowrap;
font-size: 1.1em;
}
#loginBox {
text-align: left;
- margin-left: 0em;
+ margin-left: 0em;
+ white-space: nowrap;
}
#loginBox td {
padding-right: 0.5em;
}
- #logoBox {
- width: 435px;
- margin: 0em;
- padding: 0em;
+ form {
+ margin: 1em 0;
+ padding: 0;
+ }
+ .styleButtons {
+ font-size: 0.9em;
+ padding: 3px;
+ white-space: nowrap;
+ margin-left: 4em;
+ color: #eee;
+ background-color: transparent;
+ }
+ .styleButtons a:link,
+ .styleButtons a:active,
+ .styleButtons a:visited {
+ color: #900;
+ background-color: #ccc;
+ text-decoration: none;
+ font-weight: normal;
+ margin-left: 10px;
+ padding: 1px 2px 1px 2px;
+ border-top: 2px solid #DDD;
+ border-left: 2px solid #DDD;
+ border-bottom: 2px solid #888;
+ border-right: 2px solid #888;
+ }
+ .styleButtons a:hover {
+ color: #000;
+ background-color: #fc0;
+ font-weight: normal;
+ text-decoration: none;
+ margin-left: 10px;
+ padding: 1px 2px 1px 2px;
+ border-top: 2px solid #DDD;
+ border-left: 2px solid #DDD;
+ border-bottom: 2px solid #888;
+ border-right: 2px solid #888;
+ }
+ a:link,
+ a:active,
+ a:visited {
+ color: #900;
+ background-color: transparent;
+ text-decoration: underline;
+ }
+ a:hover {
+ color: #900;
+ background-color: #fc0;
+ text-decoration: none;
}
- .styleButtons {
- font-size: 0.9em;
- padding: 3px;
- white-space: nowrap;
- margin-left: 4em;
- color: #eee;
- background-color: transparent;
- }
- /* LINK DEFINITIONS */
- .styleButtons a:link {
- color: #900;
- background-color: #ccc;
- text-decoration: none;
- font-weight: normal;
- margin-left: 10px;
- padding: 1px 2px 1px 2px;
- border-top: 2px solid #DDD;
- border-left: 2px solid #DDD;
- border-bottom: 2px solid #888;
- border-right: 2px solid #888;
- }
- .styleButtons a:visited {
- color: #900;
- background-color: #ccc;
- text-decoration: none;
- font-weight: normal;
- margin-left: 10px;
- padding: 1px 2px 1px 2px;
- border-top: 2px solid #DDD;
- border-left: 2px solid #DDD;
- border-bottom: 2px solid #888;
- border-right: 2px solid #888;
- }
- .styleButtons a:active {
- color: #900;
- background-color: #ccc;
- text-decoration: none;
- font-weight: normal;
- margin-left: 10px;
- padding: 1px 2px 1px 2px;
- border-top: 2px solid #DDD;
- border-left: 2px solid #DDD;
- border-bottom: 2px solid #888;
- border-right: 2px solid #888;
- }
- .styleButtons a:hover {
- color: #000;
- background-color: #fc0;
- font-weight: normal;
- text-decoration: none;
- margin-left: 10px;
- padding: 1px 2px 1px 2px;
- border-top: 2px solid #DDD;
- border-left: 2px solid #DDD;
- border-bottom: 2px solid #888;
- border-right: 2px solid #888;
- }
- a:link {
- color: #900;
- background-color: transparent;
- text-decoration: underline;
- }
- a:visited {
- color: #900;
- background-color: transparent;
- text-decoration: underline;
- }
- a:active {
- color: #900;
- background-color: transparent;
- text-decoration: underline;
- }
- a:hover {
- color: #900;
- background-color: #fc0;
- text-decoration: none;
- }
-->
</style>
</head>
- <body bgcolor="white">
- <table border="0" width="100%" height="100%" id="bodyBox">
- <tr>
- <td valign="middle" align="center">
- <div id="contentBox" align="center">
- <h3 id="title">@DISPLAY-NAME@</h3>
- <div id="loginBox">
- <p>
- Logged out
- <span class="styleButtons">
- <a href="setup.do">
- Log In
- </a>
- </span>
- </p>
- </div>
- </div>
- </td>
- </tr>
- </table>
+ <body bgcolor="white" onLoad="javascript:focusFirstElement()">
+ <div id="logo">
+ <img src="/bedework-common/images/bedeworkLogo.gif" alt="Bedework Logo"/>
+ </div>
+ <div id="loginBox">
+ Logged out
+ <span class="styleButtons">
+ <a href="setup.do">
+ Log In
+ </a>
+ </span>
+ </div>
</body>
</html>
More information about the Bedework-commit
mailing list