Changeset 2518

Show
Ignore:
Timestamp:
12/19/09 03:11:31
Author:
johnsa
Message:

public client: added "deadlines" feature, more clean up
admin client: some clean up of event form, added entityType (but not functional yet)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2506 r2518  
    12801280          </td> 
    12811281          <td> 
    1282             <input type="text" value="Bfranklin plays chess" size="60" name="summary"> 
     1282            <input type="text" size="60" name="summary"> 
    12831283              <xsl:attribute name="value"><xsl:value-of select="form/title/input/@value"/></xsl:attribute> 
    12841284              <xsl:if test="$canEdit = 'false'"><xsl:attribute name="class">invisible</xsl:attribute></xsl:if> 
    …… 
    12891289              </div> 
    12901290            </xsl:if> 
     1291          </td> 
     1292        </tr> 
     1293 
     1294        <tr> 
     1295          <xsl:if test="$canEdit = 'false'"><xsl:attribute name="class">invisible</xsl:attribute></xsl:if> 
     1296          <td class="fieldName"> 
     1297            <xsl:copy-of select="$bwStr-AEEF-Type"/> 
     1298          </td> 
     1299          <td> 
     1300            <input type="radio" name="entityType" value="1"/><xsl:copy-of select="$bwStr-AEEF-Event"/> 
     1301            <input type="radio" name="entityType" value="2"/><xsl:copy-of select="$bwStr-AEEF-Deadline"/> 
    12911302          </td> 
    12921303        </tr> 
    …… 
    13941405 
    13951406            <!-- floating event: no timezone (and not UTC) --> 
    1396             <xsl:choose> 
    1397               <xsl:when test="form/floating/input/@checked='checked'"> 
    1398                 <input type="checkbox" name="floatingFlag" id="floatingFlag" onclick="swapFloatingTime(this)" value="on" checked="checked"/> 
    1399                 <input type="hidden" name="eventStartDate.floating" value="on" id="startFloating"/> 
    1400                 <input type="hidden" name="eventEndDate.floating" value="on" id="endFloating"/> 
    1401               </xsl:when> 
    1402               <xsl:otherwise> 
    1403                 <input type="checkbox" name="floatingFlag" id="floatingFlag" onclick="swapFloatingTime(this)" value="off"/> 
    1404                 <input type="hidden" name="eventStartDate.floating" value="off" id="startFloating"/> 
    1405                 <input type="hidden" name="eventEndDate.floating" value="off" id="endFloating"/> 
    1406               </xsl:otherwise> 
    1407             </xsl:choose> 
    1408             <xsl:copy-of select="$bwStr-AEEF-Floating"/> 
     1407            <!-- let's hide it completely unless it comes in checked 
     1408                 (e.g. from import); to restore this field, remove the if  --> 
     1409            <xsl:if test="form/floating/input/@checked='checked'"> 
     1410              <xsl:choose> 
     1411                <xsl:when test="form/floating/input/@checked='checked'"> 
     1412                  <input type="checkbox" name="floatingFlag" id="floatingFlag" onclick="swapFloatingTime(this)" value="on" checked="checked"/> 
     1413                  <input type="hidden" name="eventStartDate.floating" value="on" id="startFloating"/> 
     1414                  <input type="hidden" name="eventEndDate.floating" value="on" id="endFloating"/> 
     1415                </xsl:when> 
     1416                <xsl:otherwise> 
     1417                  <input type="checkbox" name="floatingFlag" id="floatingFlag" onclick="swapFloatingTime(this)" value="off"/> 
     1418                  <input type="hidden" name="eventStartDate.floating" value="off" id="startFloating"/> 
     1419                  <input type="hidden" name="eventEndDate.floating" value="off" id="endFloating"/> 
     1420                </xsl:otherwise> 
     1421              </xsl:choose> 
     1422              <xsl:copy-of select="$bwStr-AEEF-Floating"/> 
     1423            </xsl:if> 
    14091424 
    14101425            <!-- store time as coordinated universal time (UTC) --> 
    1411             <xsl:choose> 
    1412               <xsl:when test="form/storeUTC/input/@checked='checked'"> 
    1413                 <input type="checkbox" name="storeUTCFlag" id="storeUTCFlag" onclick="swapStoreUTC(this)" value="on" checked="checked"/> 
    1414                 <input type="hidden" name="eventStartDate.storeUTC" value="on" id="startStoreUTC"/> 
    1415                 <input type="hidden" name="eventEndDate.storeUTC" value="on" id="endStoreUTC"/> 
    1416               </xsl:when> 
    1417               <xsl:otherwise> 
    1418                 <input type="checkbox" name="storeUTCFlag" id="storeUTCFlag" onclick="swapStoreUTC(this)" value="off"/> 
    1419                 <input type="hidden" name="eventStartDate.storeUTC" value="off" id="startStoreUTC"/> 
    1420                 <input type="hidden" name="eventEndDate.storeUTC" value="off" id="endStoreUTC"/> 
    1421               </xsl:otherwise> 
    1422             </xsl:choose> 
    1423             <xsl:copy-of select="$bwStr-AEEF-StoreAsUTC"/> 
     1426            <!-- like floating time, let's hide UTC completely unless an 
     1427                 event comes in checked; (e.g. from import); 
     1428                 to restore this field, remove the if --> 
     1429            <xsl:if test="form/storeUTC/input/@checked='checked'"> 
     1430              <xsl:choose> 
     1431                <xsl:when test="form/storeUTC/input/@checked='checked'"> 
     1432                  <input type="checkbox" name="storeUTCFlag" id="storeUTCFlag" onclick="swapStoreUTC(this)" value="on" checked="checked"/> 
     1433                  <input type="hidden" name="eventStartDate.storeUTC" value="on" id="startStoreUTC"/> 
     1434                  <input type="hidden" name="eventEndDate.storeUTC" value="on" id="endStoreUTC"/> 
     1435                </xsl:when> 
     1436                <xsl:otherwise> 
     1437                  <input type="checkbox" name="storeUTCFlag" id="storeUTCFlag" onclick="swapStoreUTC(this)" value="off"/> 
     1438                  <input type="hidden" name="eventStartDate.storeUTC" value="off" id="startStoreUTC"/> 
     1439                  <input type="hidden" name="eventEndDate.storeUTC" value="off" id="endStoreUTC"/> 
     1440                </xsl:otherwise> 
     1441              </xsl:choose> 
     1442              <xsl:copy-of select="$bwStr-AEEF-StoreAsUTC"/> 
     1443            </xsl:if> 
    14241444 
    14251445            <br/> 
    …… 
    23432363        </tr> 
    23442364        <!--  Transparency  --> 
     2365        <!-- let's not set this in the public client, and let the defaults hold 
    23452366        <tr> 
    23462367          <xsl:if test="$canEdit = 'false'"><xsl:attribute name="class">invisible</xsl:attribute></xsl:if> 
    …… 
    23592380            <xsl:copy-of select="$bwStr-AEEF-NoTransparent"/> 
    23602381          </td> 
    2361         </tr> 
     2382        </tr> --> 
    23622383        <!--  Description  --> 
    23632384        <tr> 

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

    r2492 r2518  
    121121  <xsl:variable name="bwStr-AEEF-For">for</xsl:variable> 
    122122  <xsl:variable name="bwStr-AEEF-Title">Title:</xsl:variable> 
     123  <xsl:variable name="bwStr-AEEF-Type">Type:</xsl:variable> 
    123124  <xsl:variable name="bwStr-AEEF-Calendar">Calendar:</xsl:variable> 
    124125  <xsl:variable name="bwStr-AEEF-SelectColon">Select:</xsl:variable> 
    …… 
    143144  <xsl:variable name="bwStr-AEEF-Task">task</xsl:variable> 
    144145  <xsl:variable name="bwStr-AEEF-Event">event</xsl:variable> 
     146  <xsl:variable name="bwStr-AEEF-Deadline">deadline</xsl:variable> 
    145147  <xsl:variable name="bwStr-AEEF-HasNoDurationEndDate">has no duration / end date</xsl:variable> 
    146148  <xsl:variable name="bwStr-AEEF-ThisEventHasNoDurationEndDate">This event has no duration / end date</xsl:variable> 

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/default/strings.xsl

    r2517 r2518  
    2828  <xsl:variable name="bwStr-Ongoing-Title">Ongoing</xsl:variable> 
    2929  <xsl:variable name="bwStr-Ongoing-NoEvents">There are no ongoing events in this time period or view</xsl:variable> 
     30 
     31  <!-- deadlines --> 
     32  <xsl:variable name="bwStr-Deadline-Title">Deadlines</xsl:variable> 
     33  <xsl:variable name="bwStr-Deadline-NoEvents">There are no deadlines in this time period or view</xsl:variable> 
     34 
    3035 
    3136  <!--  xsl:template name="tabs" --> 

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/bedework.xsl

    r2517 r2518  
    5454  <!-- DEFINE INCLUDES --> 
    5555  <!-- Theme preferences --> 
    56   <xsl:include href="./themeSettings.xsl" /> 
    57 s 
     56  <xsl:include href="themeSettings.xsl" /> 
     57 
    5858  <!-- theme utility functions --> 
    59   <xsl:include href="./themeUtil.xsl" /> 
     59  <xsl:include href="themeUtil.xsl" /> 
    6060 
    6161  <!-- Page subsections --> 
    62   <xsl:include href="./head.xsl" /> 
    63   <xsl:include href="./header.xsl" /> 
    64   <xsl:include href="./leftColumn.xsl" /> 
     62  <xsl:include href="head.xsl" /> 
     63  <xsl:include href="header.xsl" /> 
     64  <xsl:include href="leftColumn.xsl" /> 
    6565  <xsl:include href="views.xsl" /> 
    6666  <xsl:include href="featuredEvents.xsl"/> 
    …… 
    7272  <xsl:include href="search.xsl"/> 
    7373  <xsl:include href="ongoing.xsl" /> 
     74  <xsl:include href="deadlines.xsl" /> 
    7475  <xsl:include href="groups.xsl"/> 
    7576  <xsl:include href="systemStats.xsl"/> 
    …… 
    169170            </div> 
    170171 
    171             <!-- ONGOING EVENTS, if enabled --> 
    172             <xsl:if test="$ongoingEvents = 'true'"> 
     172            <!-- ONGOING EVENTS and DEADLINES, if enabled --> 
     173            <xsl:if test="$ongoingEvents = 'true' or $deadlines = 'true'"> 
    173174              <div class="right_column" id="right_column"> 
    174                 <xsl:call-template name="ongoingEventList" /> 
     175                <xsl:if test="$ongoingEvents = 'true'"> 
     176                  <xsl:call-template name="ongoingEventList" /> 
     177                </xsl:if> 
     178                <xsl:if test="$deadlines = 'true'"> 
     179                  <xsl:call-template name="deadlines" /> 
     180                </xsl:if> 
    175181              </div> 
    176182            </xsl:if> 

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/css/fixed.css

    r2517 r2518  
    295295.secondaryColHeader { 
    296296 padding: 0 0 0 10px; 
    297  background: #273E6D; 
     297 background-color: #273E6D; 
    298298 white-space: nowrap; 
    299299 clear: both; 
    300300} 
    301 .secondaryColHeader h3 { 
     301.secondaryColHeaderGray { 
     302 padding: 0 0 0 10px; 
     303 background-color: #E0E6D8; 
     304 color: #273E6D; 
     305 white-space: nowrap; 
     306 clear: both; 
     307} 
     308.secondaryColHeader h3, 
     309.secondaryColHeaderGray h3 { 
    302310 display: inline; 
    303311} 

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/themeSettings.xsl

    r2516 r2518  
    4444 
    4545 
     46   <!-- DEADLINES/TASKS --> 
     47   <!-- use the deadlines sidebar? --> 
     48   <!-- if deadlines sidebar is enabled, deadlines will appear 
     49        in the sidebar under ongoing events --> 
     50   <xsl:variable name="deadlinesEnabled">true</xsl:variable> 
     51 
     52   <!-- always display sidebar, even if no deadlines are present? --> 
     53   <xsl:variable name="deadlinesAlwaysDisplayed">true</xsl:variable> 
     54 
    4655 
    4756  <!-- VIEW HIERARCHY --> 

  • trunk/deployment/webpublic/webapp/resources/demoskins/MainCampus/themes/bedeworkTheme/themeUtil.xsl

    r2511 r2518  
    2323  </xsl:variable> 
    2424 
     25  <!-- look for existence of deadlines --> 
     26  <xsl:variable name="deadlines"> 
     27    <xsl:choose> 
     28      <xsl:when test="$deadlinesEnabled = 'true' and 
     29                      /bedework/page = 'eventscalendar' and 
     30                      /bedework/periodname != 'Year'"> 
     31        <xsl:choose> 
     32          <xsl:when test="$deadlinesAlwaysDisplayed = 'true'">true</xsl:when> 
     33          <xsl:when test="/bedework/eventscalendar//event/entityType = 2">true</xsl:when> 
     34          <xsl:otherwise>false</xsl:otherwise> 
     35        </xsl:choose> 
     36      </xsl:when> 
     37      <xsl:otherwise>false</xsl:otherwise> 
     38    </xsl:choose> 
     39  </xsl:variable> 
     40 
    2541</xsl:stylesheet>