Changeset 526

Show
Ignore:
Timestamp:
06/02/06 11:12:29
Author:
douglm
Message:

Configure demo departmental calendar. Some further changes to make it work.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java

    r524 r526  
    381381  public void setUser(String val) throws CalFacadeException { 
    382382    getCal().setUser(val); 
     383    dbi.setUser(findUser(val)); 
    383384  } 
    384385 
    …… 
    24052406      } 
    24062407 
    2407       if (pars.getPublicAdmin()) { 
     2408      if (pars.getPublicAdmin() || pars.isGuest()) { 
    24082409        /* We may be running as a different user. The preferences we want to see 
    24092410         * are those of the user we are running as - i.e. the 'run.as' user for 

  • trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvcDb.java

    r520 r526  
    112112  } 
    113113 
     114  /** 
     115   * @param val 
     116   */ 
     117  public void setUser(BwUser val) { 
     118    user = val; 
     119  } 
     120 
    114121  /* ==================================================================== 
    115122   *                    User preferences methods 

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

    r519 r526  
    110110          <refreshInterval>300</refreshInterval> 
    111111 
    112           <calSuite>mainCampus</calSuite> 
     112          <calSuite>MainCampus</calSuite> 
    113113        </Events> 
     114 
     115        <!-- ================================================================== 
     116                          Demo departmental Public web client SoEDept 
     117             ================================================================== --> 
     118        <SoEDept classname="org.bedework.webcommon.ClientConfig"> 
     119          <autoCreateSponsors>false</autoCreateSponsors> 
     120          <autoDeleteSponsors>false</autoDeleteSponsors> 
     121          <autoCreateLocations>false</autoCreateLocations> 
     122          <autoDeleteLocations>false</autoDeleteLocations> 
     123 
     124          <!-- Default value for 24 hour mode --> 
     125          <hour24>true</hour24> 
     126 
     127          <!-- Default value for minute increments --> 
     128          <minIncrement>5</minIncrement> 
     129 
     130          <showYearData>false</showYearData> 
     131 
     132          <logPrefix>SoEDept</logPrefix> 
     133 
     134          <refreshAction>setup.do</refreshAction> 
     135          <refreshInterval>300</refreshInterval> 
     136 
     137          <calSuite>SoEDepartmental</calSuite> 
     138        </SoEDept> 
    114139 
    115140        <!-- ================================================================== 

  • trunk/calendar3/config/configs/democal.properties

    r519 r526  
    1919 
    2020# Define the names of the applications we want to build 
    21 org.bedework.install.app.names=bwconfig,CalAdmin,Events,UserCal,Pubcaldav,Usercaldav,dumpres,restoreFrom2p3px 
    22 org.bedework.install.app.types=webconfig,webadmin,webpublic,webuser,publiccaldav,usercaldav,dumprestore,dumprestore 
     21org.bedework.install.app.names=bwconfig,CalAdmin,Events,SoEDept,UserCal,Pubcaldav,Usercaldav,dumpres,restoreFrom2p3px 
     22org.bedework.install.app.types=webconfig,webadmin,webpublic,webpublic,webuser,publiccaldav,usercaldav,dumprestore,dumprestore 
    2323 
    2424# 
    …… 
    119119# -------------------------------------------------------------------- 
    120120# 
     121# Demo departmental public Web Client 
     122# 
     123org.bedework.app.SoEDept.version=3.1 
     124org.bedework.app.SoEDept.default.contenttype=text/xml 
     125org.bedework.app.SoEDept.web.xml=guest/web.xml 
     126 
     127org.bedework.app.SoEDept.war.name=soedept 
     128org.bedework.app.SoEDept.ear.name=soedept 
     129org.bedework.app.SoEDept.context.root=soedept 
     130org.bedework.app.SoEDept.root=/calrsrc 
     131org.bedework.app.SoEDept.resources.dir=/webapps/ROOT/calrsrc 
     132org.bedework.app.SoEDept.deploy.dir=/webapps 
     133 
     134org.bedework.app.SoEDept.description=Struts based XML version of the Bedework calendar client. It may have many skins, determined by the XSLT. 
     135org.bedework.app.SoEDept.display.name=Demo departmental calendar 
     136org.bedework.app.SoEDept.name=SoEDept 
     137org.bedework.app.SoEDept.run.as.user=public-user 
     138 
     139org.bedework.app.SoEDept.skinset.name=demoskins 
     140org.bedework.app.SoEDept.guestmode=true 
     141org.bedework.app.SoEDept.publicadmin=false 
     142 
     143# 
     144# -------------------------------------------------------------------- 
     145# 
    121146# Personal Web Client 
    122147# 

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

    r525 r526  
    20422042          </td> 
    20432043        </tr> 
    2044         <tr> 
    2045           <th>Unremovable:</th> 
    2046           <td> 
    2047             <input type="radio" value="true" name="unremoveable" size="60"/> true 
    2048             <input type="radio" value="false" name="unremoveable" size="60" checked="checked"/> false 
    2049           </td> 
    2050         </tr> 
     2044        <xsl:if test="/bedeworkadmin/userInfo/superUser='true'"> 
     2045          <tr> 
     2046            <th>Unremovable:</th> 
     2047            <td> 
     2048              <input type="radio" value="true" name="unremoveable" size="60"/> true 
     2049              <input type="radio" value="false" name="unremoveable" size="60" checked="checked"/> false 
     2050            </td> 
     2051          </tr> 
     2052        </xsl:if> 
    20512053      </table> 
    20522054      <table border="0" id="submitTable"> 
    …… 
    21152117          </td> 
    21162118        </tr> 
    2117         <tr> 
    2118           <th>Unremovable:</th> 
    2119           <td> 
    2120             <xsl:choose> 
    2121               <xsl:when test="unremoveable='true'"> 
    2122                 <input type="radio" value="true" name="unremoveable" size="60" checked="checked"/> true 
    2123                 <input type="radio" value="false" name="unremoveable" size="60"/> false 
    2124               </xsl:when> 
    2125               <xsl:otherwise> 
    2126                 <input type="radio" value="true" name="unremoveable" size="60"/> true 
    2127                 <input type="radio" value="false" name="unremoveable" size="60" checked="checked"/> false 
    2128               </xsl:otherwise> 
    2129             </xsl:choose> 
    2130           </td> 
    2131         </tr> 
     2119        <xsl:if test="/bedeworkadmin/userInfo/superUser='true'"> 
     2120          <tr> 
     2121            <th>Unremovable:</th> 
     2122            <td> 
     2123              <xsl:choose> 
     2124                <xsl:when test="unremoveable='true'"> 
     2125                  <input type="radio" value="true" name="unremoveable" size="60" checked="checked"/> true 
     2126                  <input type="radio" value="false" name="unremoveable" size="60"/> false 
     2127                </xsl:when> 
     2128                <xsl:otherwise> 
     2129                  <input type="radio" value="true" name="unremoveable" size="60"/> true 
     2130                  <input type="radio" value="false" name="unremoveable" size="60" checked="checked"/> false 
     2131                </xsl:otherwise> 
     2132              </xsl:choose> 
     2133            </td> 
     2134          </tr> 
     2135        </xsl:if> 
    21322136      </table> 
    21332137      <table border="0" id="submitTable">