[Bedework-commit] bedework r2071 - in trunk/deployment:
resources/login webadmin/webapp/resources/default/default
svnadmin at bedework.org
svnadmin at bedework.org
Mon Feb 23 23:50:45 EST 2009
Author: johnsa
Date: 2009-02-23 23:50:38 -0500 (Mon, 23 Feb 2009)
New Revision: 2071
Modified:
trunk/deployment/resources/login/error.html
trunk/deployment/resources/login/login.html
trunk/deployment/resources/login/logout.html
trunk/deployment/webadmin/webapp/resources/default/default/default.css
trunk/deployment/webadmin/webapp/resources/default/default/default.xsl
Log:
validate login pages
admin client: expose underlying calendar aliases below folder subscriptions in topical areas
Modified: trunk/deployment/resources/login/error.html
===================================================================
--- trunk/deployment/resources/login/error.html 2009-02-23 20:09:05 UTC (rev 2070)
+++ trunk/deployment/resources/login/error.html 2009-02-24 04:50:38 UTC (rev 2071)
@@ -1,4 +1,5 @@
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<title>@DISPLAY-NAME@ Login</title>
<script language="JavaScript" type="text/javascript">
Modified: trunk/deployment/resources/login/login.html
===================================================================
--- trunk/deployment/resources/login/login.html 2009-02-23 20:09:05 UTC (rev 2070)
+++ trunk/deployment/resources/login/login.html 2009-02-24 04:50:38 UTC (rev 2071)
@@ -1,4 +1,5 @@
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<title>@DISPLAY-NAME@ Login</title>
<script language="JavaScript" type="text/javascript">
@@ -45,7 +46,6 @@
<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>
@@ -53,7 +53,7 @@
UserID:
</td>
<td>
- <input type="text" name="j_username">
+ <input type="text" name="j_username" size="20"/>
</td>
</tr>
<tr>
@@ -61,8 +61,8 @@
Password:
</td>
<td>
- <input type="password" name="j_password">
- <input type="submit" name="j_security_check" value="login">
+ <input type="password" name="j_password" size="20"/>
+ <input type="submit" name="j_security_check" value="login"/>
</td>
</tr>
</table>
Modified: trunk/deployment/resources/login/logout.html
===================================================================
--- trunk/deployment/resources/login/logout.html 2009-02-23 20:09:05 UTC (rev 2070)
+++ trunk/deployment/resources/login/logout.html 2009-02-24 04:50:38 UTC (rev 2071)
@@ -1,4 +1,5 @@
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<title>@DISPLAY-NAME@ Login</title>
<script language="JavaScript" type="text/javascript">
Modified: trunk/deployment/webadmin/webapp/resources/default/default/default.css
===================================================================
--- trunk/deployment/webadmin/webapp/resources/default/default/default.css 2009-02-23 20:09:05 UTC (rev 2070)
+++ trunk/deployment/webadmin/webapp/resources/default/default/default.css 2009-02-24 04:50:38 UTC (rev 2071)
@@ -1009,9 +1009,12 @@
padding: 0;
}
.aliasTree li ul {
- margin-left: 10px;
+ margin: 0 0 0.5em 0.75em;
padding-left: 10px;
}
+img.folderForAliasTree {
+ padding: 0.5em 0.2em 0 0.5em;
+}
.catlist {
margin: 0;
padding: 0;
Modified: trunk/deployment/webadmin/webapp/resources/default/default/default.xsl
===================================================================
--- trunk/deployment/webadmin/webapp/resources/default/default/default.xsl 2009-02-23 20:09:05 UTC (rev 2070)
+++ trunk/deployment/webadmin/webapp/resources/default/default/default.xsl 2009-02-24 04:50:38 UTC (rev 2071)
@@ -2378,10 +2378,20 @@
<li>
<xsl:if test="$root != 'true'">
<!-- hide the root calendar. -->
- <input type="checkbox" name="alias">
- <xsl:attribute name="value"><xsl:value-of select="path"/></xsl:attribute>
- <xsl:if test="path = /bedework/formElements/form/xproperties//X-BEDEWORK-ALIAS/values/text"><xsl:attribute name="checked"><xsl:value-of select="checked"/></xsl:attribute></xsl:if>
- </input>
+ <xsl:choose>
+ <xsl:when test="calType = '0'">
+ <!-- no direct selecting of folders or folder aliases: we only want users to select the
+ underlying calendar aliases -->
+ <!--img src="{$resourcesRoot}/resources/catIcon.gif" width="13" height="13" alt="folder" class="folderForAliasTree" border="0"/-->
+ <input type="checkbox" name="forDiplayOnly" disabled="disabled"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <input type="checkbox" name="alias">
+ <xsl:attribute name="value"><xsl:value-of select="path"/></xsl:attribute>
+ <xsl:if test="path = /bedework/formElements/form/xproperties//X-BEDEWORK-ALIAS/values/text"><xsl:attribute name="checked"><xsl:value-of select="checked"/></xsl:attribute></xsl:if>
+ </input>
+ </xsl:otherwise>
+ </xsl:choose>
<xsl:value-of select="name"/>
</xsl:if>
More information about the Bedework-commit
mailing list