Changeset 2071

Show
Ignore:
Timestamp:
02/23/09 23:50:38
Author:
johnsa
Message:

validate login pages
admin client: expose underlying calendar aliases below folder subscriptions in topical areas

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/deployment/resources/login/error.html

    r1862 r2071  
    1 <html> 
     1<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
     2<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> 
    23  <head> 
    34    <title>@DISPLAY-NAME@ Login</title> 

  • trunk/deployment/resources/login/login.html

    r1862 r2071  
    1 <html> 
     1<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
     2<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> 
    23  <head> 
    34    <title>@DISPLAY-NAME@ Login</title> 
    …… 
    4647      <img src="/bedework-common/images/bedeworkLogo.gif" alt="Bedework Logo"/> 
    4748    </div> 
    48     <!--<h3 id="title">@DISPLAY-NAME@ Login</h3>--> 
    4949    <form method="post" action="j_security_check" > 
    5050      <table border="0" id="loginBox"> 
    …… 
    5454          </td> 
    5555          <td> 
    56             <input type="text" name="j_username"> 
     56            <input type="text" name="j_username" size="20"/> 
    5757          </td> 
    5858        </tr> 
    …… 
    6262          </td> 
    6363          <td> 
    64             <input type="password" name="j_password"> 
    65             <input type="submit" name="j_security_check" value="login"> 
     64            <input type="password" name="j_password" size="20"/> 
     65            <input type="submit" name="j_security_check" value="login"/> 
    6666          </td> 
    6767        </tr> 

  • trunk/deployment/resources/login/logout.html

    r1866 r2071  
    1 <html> 
     1<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
     2<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> 
    23  <head> 
    34    <title>@DISPLAY-NAME@ Login</title> 

  • trunk/deployment/webadmin/webapp/resources/default/default/default.css

    r2041 r2071  
    10101010} 
    10111011.aliasTree li ul { 
    1012   margin-left: 10px; 
     1012  margin: 0 0 0.5em 0.75em; 
    10131013  padding-left: 10px; 
     1014} 
     1015img.folderForAliasTree { 
     1016  padding: 0.5em 0.2em 0 0.5em; 
    10141017} 
    10151018.catlist { 

  • trunk/deployment/webadmin/webapp/resources/default/default/default.xsl

    r2070 r2071  
    23792379      <xsl:if test="$root != 'true'"> 
    23802380        <!-- hide the root calendar. --> 
    2381         <input type="checkbox" name="alias"> 
    2382           <xsl:attribute name="value"><xsl:value-of select="path"/></xsl:attribute> 
    2383           <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> 
    2384         </input> 
     2381        <xsl:choose> 
     2382          <xsl:when test="calType = '0'"> 
     2383            <!-- no direct selecting of folders or folder aliases: we only want users to select the 
     2384                 underlying calendar aliases --> 
     2385            <!--img src="{$resourcesRoot}/resources/catIcon.gif" width="13" height="13" alt="folder" class="folderForAliasTree" border="0"/--> 
     2386            <input type="checkbox" name="forDiplayOnly" disabled="disabled"/> 
     2387          </xsl:when> 
     2388          <xsl:otherwise> 
     2389            <input type="checkbox" name="alias"> 
     2390              <xsl:attribute name="value"><xsl:value-of select="path"/></xsl:attribute> 
     2391              <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> 
     2392            </input> 
     2393          </xsl:otherwise> 
     2394        </xsl:choose> 
    23852395        <xsl:value-of select="name"/> 
    23862396      </xsl:if>