Changeset 60

Show
Ignore:
Timestamp:
02/01/06 16:31:15
Author:
johnsa
Message:

added system parameters form to admin stylesheet
updated xml and added views for use in pull down (select) list
added success message to UpdateSysparsAction?
added unremoveable value to subscriptions xml

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r58 r60  
    7979  <xsl:variable name="calendar-fetchForUpdate" select="/bedeworkadmin/urlPrefixes/calendar/fetchForUpdate/a/@href"/><!-- used --> 
    8080  <xsl:variable name="calendar-update" select="/bedeworkadmin/urlPrefixes/calendar/update/a/@href"/><!-- used --> 
    81   <!-- subs and views are all good - no need to clean any of these out  --> 
     81  <!-- all good - no need to clean any of these out  --> 
    8282  <xsl:variable name="subscriptions-fetch" select="/bedeworkadmin/urlPrefixes/subscriptions/fetch/a/@href"/> 
    8383  <xsl:variable name="subscriptions-fetchForUpdate" select="/bedeworkadmin/urlPrefixes/subscriptions/fetchForUpdate/a/@href"/> 
    …… 
    8989  <xsl:variable name="view-update" select="/bedeworkadmin/urlPrefixes/view/update/a/@href"/> 
    9090  <xsl:variable name="view-remove" select="/bedeworkadmin/urlPrefixes/view/remove/a/@href"/> 
    91   <!-- === --> 
    92   <xsl:variable name="timezones-showUpload" select="/bedeworkadmin/urlPrefixes/timezones/showUpload/a/@href"/> 
     91  <xsl:variable name="system-fetch" select="/bedeworkadmin/urlPrefixes/system/fetch/a/@href"/> 
     92  <xsl:variable name="system-update" select="/bedeworkadmin/urlPrefixes/system/update/a/@href"/> 
    9393  <xsl:variable name="timezones-initUpload" select="/bedeworkadmin/urlPrefixes/timezones/initUpload/a/@href"/> 
    9494  <xsl:variable name="timezones-upload" select="/bedeworkadmin/urlPrefixes/timezones/upload/a/@href"/> 
     95  <!-- === --> 
    9596  <xsl:variable name="authuser-showModForm" select="/bedeworkadmin/urlPrefixes/authuser/showModForm/a/@href"/> 
    9697  <xsl:variable name="authuser-showUpdateList" select="/bedeworkadmin/urlPrefixes/authuser/showUpdateList/a/@href"/> 
    …… 
    178179              <xsl:call-template name="modView"/> 
    179180            </xsl:when> 
     181            <xsl:when test="/bedeworkadmin/page='modSyspars'"> 
     182              <xsl:call-template name="modSyspars"/> 
     183            </xsl:when> 
    180184            <xsl:when test="/bedeworkadmin/page='deleteViewConfirm'"> 
    181185              <xsl:call-template name="deleteViewConfirm"/> 
    …… 
    314318            <a href="{$view-fetch}"> 
    315319              Manage views 
     320            </a> 
     321          </li> 
     322          <li> 
     323            <a href="{$system-fetch}"> 
     324              Manage system preferences 
    316325            </a> 
    317326          </li> 
    …… 
    18691878  </xsl:template> 
    18701879 
     1880  <!--+++++++++++++++ System Parameters (preferences) ++++++++++++++++++++--> 
     1881  <xsl:template name="modSyspars"> 
     1882    <h2>Modify System Parameters</h2> 
     1883    <form name="systemParamsForm" action="{$system-update}" method="post"> 
     1884      <table class="eventFormTable"> 
     1885        <tr> 
     1886          <th>Default view:</th> 
     1887          <td> 
     1888            <xsl:variable name="defaultView" select="/bedeworkadmin/system/defaultUserViewName"/> 
     1889            <select name="defaultUserViewName"> 
     1890              <xsl:for-each select="/bedeworkadmin/views/view"> 
     1891                <xsl:variable name="view" select="."/> 
     1892                <xsl:choose> 
     1893                  <xsl:when test="$view = $defaultView"> 
     1894                    <option value="{$view}" selected="selected"><xsl:value-of select="$view"/></option> 
     1895                  </xsl:when> 
     1896                  <xsl:otherwise> 
     1897                    <option value="{$view}"><xsl:value-of select="$view"/></option> 
     1898                  </xsl:otherwise> 
     1899                </xsl:choose> 
     1900              </xsl:for-each> 
     1901            </select> 
     1902          </td> 
     1903        </tr> 
     1904        <tr> 
     1905          <th>Directory browsing disallowed:</th> 
     1906          <td> 
     1907            <xsl:variable name="dirBrowse" select="/bedeworkadmin/system/directoryBrowsingDisallowed"/> 
     1908            <xsl:choose> 
     1909              <xsl:when test="$dirBrowse = 'true'"> 
     1910                <input type="radio" name="directoryBrowsingDisallowed" value="true" checked="checked"/> true 
     1911                <input type="radio" name="directoryBrowsingDisallowed" value="false"/> false 
     1912              </xsl:when> 
     1913              <xsl:otherwise> 
     1914                <input type="radio" name="directoryBrowsingDisallowed" value="true"/> true 
     1915                <input type="radio" name="directoryBrowsingDisallowed" value="false" checked="checked"/> false 
     1916              </xsl:otherwise> 
     1917            </xsl:choose> 
     1918          </td> 
     1919        </tr> 
     1920        <tr> 
     1921          <th>Http connections per user:</th> 
     1922          <td> 
     1923            <xsl:variable name="httpPerUser" select="/bedeworkadmin/system/httpConnectionsPerUser"/> 
     1924            <input value="{$httpPerUser}" name="httpConnectionsPerUser" size="20"/> 
     1925          </td> 
     1926        </tr> 
     1927        <tr> 
     1928          <th>Http connections per host:</th> 
     1929          <td> 
     1930            <xsl:variable name="httpPerHost" select="/bedeworkadmin/system/httpConnectionsPerHost"/> 
     1931            <input value="{$httpPerHost}" name="httpConnectionsPerHost" size="20"/> 
     1932          </td> 
     1933        </tr> 
     1934        <tr> 
     1935          <th>Total http connections:</th> 
     1936          <td> 
     1937            <xsl:variable name="httpTotal" select="/bedeworkadmin/system/httpConnections"/> 
     1938            <input value="{$httpTotal}" name="httpConnections" size="20"/> 
     1939          </td> 
     1940        </tr> 
     1941        <tr> 
     1942          <th>Default user quota:</th> 
     1943          <td> 
     1944            <xsl:variable name="defaultUserQuota" select="/bedeworkadmin/system/defaultUserQuota"/> 
     1945            <input value="{$defaultUserQuota}" name="defaultUserQuota" size="20"/> 
     1946          </td> 
     1947        </tr> 
     1948      </table> 
     1949      <table border="0" width="100%" id="submitTable"> 
     1950        <tr> 
     1951          <td> 
     1952            <input type="submit" name="updateSystemParams" value="Update" class="padRight"/> 
     1953            <input type="submit" name="cancelled" value="Cancel"/> 
     1954            <input type="reset" value="Reset"/> 
     1955          </td> 
     1956        </tr> 
     1957      </table> 
     1958    </form> 
     1959  </xsl:template> 
     1960 
    18711961  <!--+++++++++++++++ Timezones ++++++++++++++++++++--> 
    18721962  <xsl:template name="uploadTimezones"> 
    …… 
    23522442          <xsl:when test="/bedeworkadmin/page='views' or /bedeworkadmin/page='modView'"> 
    23532443            Manage Views 
     2444          </xsl:when> 
     2445          <xsl:when test="/bedeworkadmin/page='modSyspars'"> 
     2446            Manage System Preferences 
    23542447          </xsl:when> 
    23552448          <xsl:when test="/bedeworkadmin/page='authUserList' or /bedeworkadmin/page='modAuthUser'"> 

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

    r37 r60  
    9696        View deleted 
    9797      </xsl:when> 
     98      <xsl:when test="id='org.bedework.client.message.syspars.updated'"> 
     99        System preferences updated 
     100      </xsl:when> 
    98101      <xsl:when test="id='org.bedework.client.message.event.mailed'"> 
    99102        Event has been mailed 

  • trunk/calendar3/webadmin/src/org/bedework/webadmin/system/UpdateSysparsAction.java

    r55 r60  
    141141    form.setSyspars(svci.getSyspars()); 
    142142 
     143    form.getMsg().emit("org.bedework.client.message.syspars.updated"); 
     144 
    143145    return "continue"; 
    144146  } 

  • trunk/calendar3/webadmin/war/docs/header.jsp

    r30 r60  
    119119      <remove><genurl:link page="/view/removeView.do?b=de"/></remove> 
    120120    </view> 
     121    <system> <!-- only those listed are used here (no need to clean up) --> 
     122      <fetch><genurl:link page="/syspars/fetch.do?b=de"/></fetch> 
     123      <update><genurl:link page="/syspars/update.do?b=de"/></update> 
     124    </system> 
    121125    <timezones> 
    122126      <showUpload><genurl:link page="/timezones/showUpload.rdo?b=de"/></showUpload> 

  • trunk/calendar3/webadmin/war/docs/subs/modSubscription.jsp

    r2 r60  
    1717    <emailNotifications><bean:write name="peForm" property="subscription.emailNotifications" /></emailNotifications> 
    1818    <calendarDeleted><bean:write name="peForm" property="subscription.calendarDeleted" /></calendarDeleted> 
     19    <unremoveable><bean:write name="subscription" property="unremoveable" /></unremoveable> 
    1920  </subscription> 
    2021 

  • trunk/calendar3/webadmin/war/docs/subs/subscriptions.jsp

    r39 r60  
    1717      <emailNotifications><bean:write name="subscription" property="emailNotifications" /></emailNotifications> 
    1818      <calendarDeleted><bean:write name="subscription" property="calendarDeleted" /></calendarDeleted> 
     19      <unremoveable><bean:write name="subscription" property="unremoveable" /></unremoveable> 
    1920    </subscription> 
    2021  </logic:iterate> 

  • trunk/calendar3/webadmin/war/docs/system/modSyspars.jsp

    r56 r60  
    99<page>modSyspars</page> 
    1010<bean:define id="systemParams" name="peForm" property="syspars"/> 
    11 <prefs> 
     11<system> 
    1212  <defaultUserViewName><bean:write name="systemParams" property="defaultUserViewName"/></defaultUserViewName> 
    1313  <directoryBrowsingDisallowed><bean:write name="systemParams" property="directoryBrowsingDisallowed"/></directoryBrowsingDisallowed> 
    …… 
    1616  <httpConnections><bean:write name="systemParams" property="httpConnections"/></httpConnections> 
    1717  <defaultUserQuota><bean:write name="systemParams" property="defaultUserQuota"/></defaultUserQuota> 
    18 </prefs> 
     18</system> 
     19 
     20<views> 
     21  <logic:iterate name="peForm" property="views" id="view"> 
     22    <view> 
     23      <name><bean:write name="view" property="name" /></name> 
     24    </view> 
     25  </logic:iterate> 
     26</views> 
    1927 
    2028<%@include file="/docs/footer.jsp"%>