Changeset 1678

Show
Ignore:
Timestamp:
12/18/07 12:31:54
Author:
douglm
Message:

Yet more config code

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/config/configs/democal.options.xml

    r1675 r1678  
    166166 
    167167          <!-- Default value for 24 hour mode --> 
    168           <hour24>false</hour24> 
     168          <hour24>true</hour24> 
    169169 
    170170          <!-- Default value for minute increments --> 
    …… 
    279279                          User CalDAV server UserCalDAV 
    280280             ================================================================== --> 
    281         <UserCalDAV classname="org.bedework.calfacade.configs.CalDAVConfig"> 
     281        <Usercaldav classname="org.bedework.calfacade.configs.CalDAVConfig"> 
    282282          <!-- Comment out or delete for no real time server to server service 
    283283               Currently under development and may present a security risk in 
    …… 
    287287          <!-- Comment out or delete for no freebusy url service --> 
    288288          <fburlServiceURI>/fbsvc</fburlServiceURI> 
    289         </UserCalDAV> 
     289        </Usercaldav> 
    290290 
    291291        <!-- ================================================================== 
    292292                          Public (unauthenticated) CalDAV server PublicCalDAV 
    293293             ================================================================== --> 
    294         <PublicCalDAV classname="org.bedework.calfacade.configs.CalDAVConfig"> 
     294        <Pubcaldav classname="org.bedework.calfacade.configs.CalDAVConfig"> 
    295295          <!-- Comment out or delete for no real time server to server service 
    296296               Currently under development and may present a security risk in 
    …… 
    300300          <!-- Comment out or delete for no freebusy url service --> 
    301301          <fburlServiceURI>/fbsvc</fburlServiceURI> 
    302         </PublicCalDAV> 
     302        </Pubcaldav> 
    303303 
    304304        <!-- ================================================================== 

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

    r1675 r1678  
    77  <!-- ==================================================================== --> 
    88  <xsl:output method="xhtml" indent="yes" media-type="text/html" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" standalone="yes" omit-xml-declaration="yes"/> 
    9   <xsl:variable name="appRoot" select="/bedeworkconfig/appRoot"/> 
    10   <xsl:variable name="urlPrefix" select="/bedeworkconfig/urlPrefix"/> 
     9  <xsl:variable name="appRoot" select="/bedework/appRoot"/> 
     10  <xsl:variable name="urlPrefix" select="/bedework/urlPrefix"/> 
    1111 
    1212  <xsl:variable name="firstView">welcome</xsl:variable> 
    13   <xsl:variable name="lastView" select="/bedeworkconfig/propertyGroups/form/propertyGroup[position()=last()]/@name"/> 
     13  <xsl:variable name="lastView" select="/bedework/propertyGroups/form/propertyGroup[position()=last()]/@name"/> 
    1414  <xsl:variable name="currentView"> 
    1515    <xsl:choose> 
    16       <xsl:when test="/bedeworkconfig/appvar/key='setView'"><xsl:value-of select="/bedeworkconfig/appvar[key='setView']/value"/></xsl:when> 
     16      <xsl:when test="/bedework/appvar/key='setView'"><xsl:value-of select="/bedework/appvar[key='setView']/value"/></xsl:when> 
    1717      <xsl:otherwise><xsl:value-of select="$firstView"/></xsl:otherwise> 
    1818    </xsl:choose> 
    …… 
    2121    <xsl:choose> 
    2222      <xsl:when test="$currentView = $firstView">0</xsl:when> 
    23       <xsl:otherwise><xsl:for-each select="/bedeworkconfig/propertyGroups/form/propertyGroup[@name=$currentView]"><xsl:number/></xsl:for-each></xsl:otherwise> 
     23      <xsl:otherwise><xsl:for-each select="/bedework/propertyGroups/form/propertyGroup[@name=$currentView]"><xsl:number/></xsl:for-each></xsl:otherwise> 
    2424    </xsl:choose> 
    2525  </xsl:variable> 
    …… 
    2727    <xsl:choose> 
    2828      <xsl:when test="$currentView = $firstView">$currentView</xsl:when> 
    29       <xsl:otherwise><xsl:value-of select="/bedeworkconfig/propertyGroups/form/propertyGroup[position()=number($currentViewPos)-1]/@name"/></xsl:otherwise> 
     29      <xsl:otherwise><xsl:value-of select="/bedework/propertyGroups/form/propertyGroup[position()=number($currentViewPos)-1]/@name"/></xsl:otherwise> 
    3030    </xsl:choose> 
    3131  </xsl:variable> 
    …… 
    3333    <xsl:choose> 
    3434      <xsl:when test="$currentView = $lastView">$currentView</xsl:when> 
    35       <xsl:otherwise><xsl:value-of select="/bedeworkconfig/propertyGroups/form/propertyGroup[position()=number($currentViewPos)+1]/@name"/></xsl:otherwise> 
     35      <xsl:otherwise><xsl:value-of select="/bedework/propertyGroups/form/propertyGroup[position()=number($currentViewPos)+1]/@name"/></xsl:otherwise> 
    3636    </xsl:choose> 
    3737  </xsl:variable> 
    …… 
    7878            </div> 
    7979          </div> 
    80           <xsl:if test="/bedeworkconfig/message"> 
     80          <xsl:if test="/bedework/message"> 
    8181            <div id="messages"> 
    82               <xsl:apply-templates select="/bedeworkconfig/message"/> 
     82              <xsl:apply-templates select="/bedework/message"/> 
    8383            </div> 
    8484          </xsl:if> 
    85           <xsl:if test="/bedeworkconfig/error"> 
     85          <xsl:if test="/bedework/error"> 
    8686            <div id="errors"> 
    87               <xsl:apply-templates select="/bedeworkconfig/error"/> 
     87              <xsl:apply-templates select="/bedework/error"/> 
    8888            </div> 
    8989          </xsl:if> 
    9090          <div id="content"> 
    9191            <xsl:choose> 
    92               <xsl:when test="/bedeworkconfig/page='main'"> 
     92              <xsl:when test="/bedework/page='main'"> 
    9393                <form action="save.do" method="POST" enctype="multipart/form-data" name="propsForm"> 
    9494                  <div id="buttonMenuTop"> 
    …… 
    118118                  <select name="setappvar" onchange="submit()"> 
    119119                    <option value="setView(welcome)">welcome</option> 
    120                     <xsl:for-each select="/bedeworkconfig/propertyGroups/form/propertyGroup"> 
     120                    <xsl:for-each select="/bedework/propertyGroups/form/propertyGroup"> 
    121121                      <xsl:variable name="groupName" select="@name"/> 
    122122                      <xsl:choose> 
    …… 
    137137                  advanced: 
    138138                  <xsl:choose> 
    139                     <xsl:when test="/bedeworkconfig/propertyGroups/form/propertyGroup[@name='modules']/property[@name='advanced']/fieldValue='true'"> 
     139                    <xsl:when test="/bedework/propertyGroups/form/propertyGroup[@name='modules']/property[@name='advanced']/fieldValue='true'"> 
    140140                      <input type="radio" name="modules.advanced" value="true" checked="checked" onclick="submit()"/> yes 
    141141                      <input type="radio" name="modules.advanced" value="false" onclick="submit()"/> no 
    …… 
    175175                    </xsl:when> 
    176176                    <xsl:otherwise> 
    177                       <xsl:apply-templates select="/bedeworkconfig/propertyGroups/form/propertyGroup[@name=$currentView]"/> 
     177                      <xsl:apply-templates select="/bedework/propertyGroups/form/propertyGroup[@name=$currentView]"/> 
    178178                    </xsl:otherwise> 
    179179                  </xsl:choose> 
    …… 
    185185                </form> 
    186186              </xsl:when> 
    187               <xsl:when test="/bedeworkconfig/page='save'"> 
     187              <xsl:when test="/bedework/page='save'"> 
    188188                <form action="save.do" method="POST" enctype="multipart/form-data" name="downloadForm"> 
    189189                  <input type="hidden" name="contentType" value="text/text"/> 
    …… 
    198198                <h1>Your Configured Properties File:</h1> 
    199199                <div id="propFile"> 
    200                   <xsl:for-each select="/bedeworkconfig/propertyGroups/propertyGroup"> 
     200                  <xsl:for-each select="/bedework/propertyGroups/propertyGroup"> 
    201201                    #<br/> 
    202202                    # <xsl:value-of select="@name"/><br/> 
    …… 
    415415      </xsl:when> 
    416416      <xsl:otherwise> 
    417         <xsl:value-of select="id"/> 
     417        <p><xsl:value-of select="id"/> 
    418418        <xsl:if test="param"> = 
    419419          <xsl:for-each select="param"> 
    420420            <xsl:value-of select="."/> 
    421421          </xsl:for-each> 
    422         </xsl:if> 
     422        </xsl:if></p> 
    423423      </xsl:otherwise> 
    424424    </xsl:choose>