Changeset 2981

Show
Ignore:
Timestamp:
08/18/10 17:16:13
Author:
johnsa
Message:

web clients:

- disable ability to make a recurring event non-recurring (users can blow away all their overrides)
- add categories to rss output
- hide zoom from scheduling widget
- some minor css/layout cleanup

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/deployment/feeder/webapp/resources/demoskins/MainCampus/default/default/list-rss.xsl

    r2940 r2981  
    282282            <xsl:value-of select="contact/phone" /> 
    283283          </xsl:if> 
    284           <![CDATA[ 
    285             <br/> 
    286           ]]> 
    287         </xsl:if> 
    288  
    289         <xsl:if test="categories[1]/category"> 
    290           <xsl:copy-of select="$bwStr-SgEv-Categories"/><xsl:text> </xsl:text> 
    291           <xsl:for-each select="categories/category"> 
    292             <xsl:value-of select="value"/><xsl:if test="position() != last()">, </xsl:if> 
    293           </xsl:for-each> 
    294           <![CDATA[ 
    295             <br/> 
    296           ]]> 
    297284        </xsl:if> 
    298285      </description> 
     286       
     287      <xsl:if test="categories[1]/category"> 
     288        <xsl:for-each select="categories/category"> 
     289          <category><xsl:value-of select="value"/></category> 
     290        </xsl:for-each> 
     291      </xsl:if> 
     292 
    299293    </item> 
    300294  </xsl:template> 

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

    r2862 r2981  
    17541754                <!-- has recurrenceId, so is master --> 
    17551755 
    1756                 <div id="recurringSwitch"> 
    1757                   <xsl:if test="$canEdit = 'false'"><xsl:attribute name="class">invisible</xsl:attribute></xsl:if> 
    1758                   <!-- set or remove "recurring" and show or hide all recurrence fields: --> 
    1759                   <input type="radio" name="recurring" value="true" onclick="swapRecurrence(this)"> 
    1760                     <xsl:if test="form/recurringEntity = 'true'"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if> 
    1761                   </input><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-AEEF-EventRecurs"/> 
    1762                   <input type="radio" name="recurring" value="false" onclick="swapRecurrence(this)"> 
    1763                     <xsl:if test="form/recurringEntity = 'false'"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if> 
    1764                   </input><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-AEEF-EventDoesNotRecur"/> 
    1765                 </div> 
     1756                      <xsl:choose> 
     1757                        <xsl:when test="form/recurringEntity = 'false'"> 
     1758                                <!-- the switch is required to turn recurrence on - maybe we can infer this instead? --> 
     1759                                <div id="recurringSwitch"> 
     1760                                  <xsl:if test="$canEdit = 'false'"><xsl:attribute name="class">invisible</xsl:attribute></xsl:if> 
     1761                                  <!-- set or remove "recurring" and show or hide all recurrence fields: --> 
     1762                                  <input type="radio" name="recurring" value="true" onclick="swapRecurrence(this)"> 
     1763                                    <xsl:if test="form/recurringEntity = 'true'"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if> 
     1764                                  </input><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-AEEF-EventRecurs"/> 
     1765                                  <input type="radio" name="recurring" value="false" onclick="swapRecurrence(this)"> 
     1766                                    <xsl:if test="form/recurringEntity = 'false'"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if> 
     1767                                  </input><xsl:text> </xsl:text><xsl:copy-of select="$bwStr-AEEF-EventDoesNotRecur"/> 
     1768                                </div> 
     1769                              </xsl:when> 
     1770                                    <xsl:otherwise> 
     1771                                      <!-- is a recurring event; once created as such, it can no longer be made non-recurring. --> 
     1772                                      <input type="hidden" name="recurring" value="true"/> 
     1773                                    </xsl:otherwise> 
     1774                                  </xsl:choose> 
    17661775 
    17671776                <!-- wrapper for all recurrence fields (rrules and rdates): --> 
    …… 
    17741783                  </h4> 
    17751784                  <!-- show or hide rrules fields when editing: --> 
     1785                  <!-- DEPRECATED: No longer allow the changing of recurrence information once created. 
    17761786                  <xsl:if test="form/recurrence"> 
    17771787                    <span id="rrulesSwitch"> 
    …… 
    17821792                      <xsl:copy-of select="$bwStr-AEEF-ChangeRecurrenceRules"/> 
    17831793                    </span> 
    1784                   </xsl:if> 
     1794                  </xsl:if> --> 
    17851795                  <span id="rrulesUiSwitch"> 
    17861796                    <xsl:if test="form/recurrence"> 

  • trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/attendees.xsl

    r2979 r2981  
    2424   
    2525   <!-- Transform the attendees into an array of json objects  
    26        for use in the BwGrid.  This is called on edit event and after each update to  
    27        the attendees using xml from the attendee widget.  --> 
     26       for use in the BwGrid.  This is called on edit event to process  
     27       attendees from the xml.  --> 
    2828  <xsl:template match="attendees" mode="loadBwGrid"> 
    2929    <xsl:for-each select="attendee"> 
    …… 
    9797  </xsl:template> 
    9898   
    99     <xsl:template match="attendees"> 
     99  <xsl:template match="attendees"> 
    100100    <xsl:param name="trash">yes</xsl:param> 
    101101    <table id="attendees" class="widget" cellspacing="0"> 

  • trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/css/bedeworkTheme.css

    r2950 r2981  
    11311131} 
    11321132#bedework a.emailIcon { 
    1133   margin-left: 0.5em; 
     1133  margin: 0 0.5em; 
    11341134} 
    11351135#bedework form#subscriptions { 
    …… 
    11861186#bedework table.common #attendees td { 
    11871187  padding: 2px 20px 2px 6px; 
    1188   font-size: 1.1em; 
    11891188} 
    11901189#bedework table.common #attendees td.status { 

  • trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/event.xsl

    r2896 r2981  
    419419        </tr> 
    420420      </xsl:if> 
    421       <xsl:if test="scheduleMethod != 3"> 
     421      <xsl:if test="scheduleMethod != 3 and description != ''"> 
    422422        <tr> 
    423423          <td class="fieldname"><xsl:copy-of select="$bwStr-SgEv-Description"/><xsl:text> </xsl:text></td> 

  • trunk/deployment/webuser/webapp/resources/demoskins/themes/bedeworkTheme/eventForm.xsl

    r2974 r2981  
    836836          <!-- has recurrenceId, so is master --> 
    837837           
    838           <!-- the switch is current required to turn recurrence on or off - we can probably infer this instead --> 
    839           <div id="recurringSwitch"> 
    840             <!-- set or remove "recurring" and show or hide all recurrence fields: --> 
    841             <input type="radio" name="recurring" value="true" onclick="swapRecurrence(this)"> 
    842               <xsl:if test="form/recurringEntity = 'true'"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if> 
    843             </input> <xsl:copy-of select="$bwStr-AEEF-EventRecurs"/> 
    844             <input type="radio" name="recurring" value="false" onclick="swapRecurrence(this)"> 
    845               <xsl:if test="form/recurringEntity = 'false'"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if> 
    846             </input> <xsl:copy-of select="$bwStr-AEEF-EventDoesNotRecur"/> 
    847           </div> 
     838          <xsl:choose> 
     839            <xsl:when test="form/recurringEntity = 'false'"> 
     840                          <!-- the switch is required to turn recurrence on - maybe we can infer this instead? --> 
     841                          <div id="recurringSwitch"> 
     842                            <!-- set or remove "recurring" and show or hide all recurrence fields: --> 
     843                            <input type="radio" name="recurring" value="true" onclick="swapRecurrence(this)"> 
     844                              <xsl:if test="form/recurringEntity = 'true'"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if> 
     845                            </input> <xsl:copy-of select="$bwStr-AEEF-EventRecurs"/> 
     846                            <input type="radio" name="recurring" value="false" onclick="swapRecurrence(this)"> 
     847                              <xsl:if test="form/recurringEntity = 'false'"><xsl:attribute name="checked">checked</xsl:attribute></xsl:if> 
     848                            </input> <xsl:copy-of select="$bwStr-AEEF-EventDoesNotRecur"/> 
     849                          </div> 
     850                        </xsl:when> 
     851                        <xsl:otherwise> 
     852                          <!-- is a recurring event; once created as such, it can no longer be made non-recurring. --> 
     853                          <input type="hidden" name="recurring" value="true"/> 
     854                        </xsl:otherwise> 
     855          </xsl:choose> 
    848856           
    849857          <!-- wrapper for all recurrence fields (rrules and rdates): --> 
    …… 
    853861            <h4><xsl:copy-of select="$bwStr-AEEF-RecurrenceRules"/></h4> 
    854862            <!-- show or hide rrules fields when editing: --> 
     863            <!-- DEPRECATED: No longer allow the changing of recurrence information once created. 
    855864            <xsl:if test="form/recurrence"> 
    856865              <input type="checkbox" name="rrulesFlag" onclick="swapRrules(this)" value="on"/> 
    …… 
    858867                <xsl:copy-of select="$bwStr-AEEF-ChangeRecurrenceRules"/> 
    859868              </span> 
    860             </xsl:if> 
     869            </xsl:if> --> 
    861870            <span id="rrulesUiSwitch"> 
    862871              <xsl:if test="form/recurrence"> 
    …… 
    15021511                </tr> 
    15031512                <tr> 
    1504                   <td class="zoom">             
     1513                  <td class="zoom"> 
     1514                    <!--  hid the zoom for now - may not use it. --> 
     1515                    <!--              
    15051516                    <span class="zoomControl">-</span> 
    15061517                    <select name="zoom"> 
    …… 
    15131524                    </select> 
    15141525                    <span class="zoomControl">+</span> 
     1526                    --> 
    15151527                  </td> 
    15161528                  <td>