Changeset 3498

Show
Ignore:
Timestamp:
03/05/12 17:19:09
Author:
johnsa
Message:

admin client: more image upload work, error messages, ability to overwrite image
public client: incorporate "upcoming" list into views navigation

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/deployment/resources/xsl/de_DE/default/errors.xsl

    r3220 r3498  
    278278        To publish this event, you must move it to a public calendar.  Please select a different calendar. 
    279279      </xsl:when> 
     280      <xsl:when test="id='org.bedework.client.error.duplicateimage'"> 
     281        Image with that name already uploaded. 
     282      </xsl:when> 
     283      <xsl:when test="id='org.bedework.client.error.imageerror'"> 
     284        The file you attempted to upload is not a recognized image format.  Use JPG, PNG, or GIF. 
     285      </xsl:when> 
     286      <xsl:when test="id='org.bedework.validation.error.toolarge'"> 
     287        The file you attempted to upload is too large:  <em><xsl:value-of select="param[position() = 1]"/> bytes</em>.  Max size allowed: <xsl:value-of select="param[position() = 2]"/> bytes. 
     288      </xsl:when> 
    280289 
    281290      <!-- Scheduling error codes are defined in CalfacadeException --> 

  • trunk/deployment/resources/xsl/es_ES/default/errors.xsl

    r3220 r3498  
    278278        To publish this event, you must move it to a public calendar.  Please select a different calendar. 
    279279      </xsl:when> 
     280      <xsl:when test="id='org.bedework.client.error.duplicateimage'"> 
     281        Image with that name already uploaded. 
     282      </xsl:when> 
     283      <xsl:when test="id='org.bedework.client.error.imageerror'"> 
     284        The file you attempted to upload is not a recognized image format.  Use JPG, PNG, or GIF. 
     285      </xsl:when> 
     286      <xsl:when test="id='org.bedework.validation.error.toolarge'"> 
     287        The file you attempted to upload is too large:  <em><xsl:value-of select="param[position() = 1]"/> bytes</em>.  Max size allowed: <xsl:value-of select="param[position() = 2]"/> bytes. 
     288      </xsl:when> 
    280289 
    281290      <!-- Scheduling error codes are defined in CalfacadeException --> 

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

    r3497 r3498  
    758758      <ul id="errors"> 
    759759        <xsl:for-each select="/bedework/error"> 
    760           <li><xsl:apply-templates select="."/></li> 
     760          <li> 
     761            <xsl:apply-templates select="."/> 
     762                  <!-- Special cases for handling error conditions: --> 
     763                  <xsl:if test="/bedework/error/id = 'org.bedework.client.error.duplicateimage'"> 
     764              <input type="checkbox" id="overwriteEventImage" onclick="setOverwriteImageField(this);"/><label for="overwriteEventImage"><xsl:copy-of select="$bwStr-AEEF-Overwrite"/></label><xsl:text> </xsl:text> 
     765              <!-- input type="checkbox" id="reuseEventImage"/><label for="reuseEventImage">Reuse</label>--> 
     766                  </xsl:if> 
     767          </li> 
    761768        </xsl:for-each> 
    762769      </ul> 
    …… 
    25792586                    <xsl:text> </xsl:text> 
    25802587                    <input type="file" name="eventImageUpload" id="eventImageUpload" size="45"/> 
    2581                     <button name="eventImageUseExisting" id="eventImageUseExisting"><xsl:copy-of select="$bwStr-AEEF-UseExisting"/></button><br/> 
     2588                    <input type="checkbox" name="replaceImage" id="replaceImage" value="true"/><label for="replaceImage"><xsl:copy-of select="$bwStr-AEEF-Overwrite"/></label> 
     2589                    <!-- button name="eventImageUseExisting" id="eventImageUseExisting"><xsl:copy-of select="$bwStr-AEEF-UseExisting"/></button--><br/> 
    25822590                    <div class="fieldInfoAlone"><xsl:copy-of select="$bwStr-AEEF-OptionalImageUpload"/></div> 
    25832591                  </xsl:if> 

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

    r3497 r3498  
    257257  <xsl:variable name="bwStr-AEEF-OptionalEventThumbImage">optional link to thumbnail for event lists, 80px wide</xsl:variable> 
    258258  <xsl:variable name="bwStr-AEEF-UseExisting">Use existing...</xsl:variable> 
     259  <xsl:variable name="bwStr-AEEF-Overwrite">Overwrite</xsl:variable> 
    259260  <xsl:variable name="bwStr-AEEF-OptionalImageUpload">Uploads can be JPG, PNG, or GIF and will overwrite the image and thumbnail URLs.</xsl:variable> 
    260261  <xsl:variable name="bwStr-AEEF-Location">Location:</xsl:variable> 

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

    r3497 r3498  
    257257  <xsl:variable name="bwStr-AEEF-OptionalEventThumbImage">optional link to thumbnail for event lists, 80px wide</xsl:variable> 
    258258  <xsl:variable name="bwStr-AEEF-UseExisting">Use existing...</xsl:variable> 
     259  <xsl:variable name="bwStr-AEEF-Overwrite">Overwrite</xsl:variable> 
    259260  <xsl:variable name="bwStr-AEEF-OptionalImageUpload">Uploads can be JPG, PNG, or GIF and will overwrite the image and thumbnail URLs.</xsl:variable> 
    260261  <xsl:variable name="bwStr-AEEF-Location">Localización:</xsl:variable> 

  • trunk/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js

    r3487 r3498  
    769769  formObj.sntext.value = message; 
    770770} 
    771  
    772  
     771function setOverwriteImageField(chkBox) { 
     772  if(chkBox.checked) { 
     773    $("#replaceImage").attr('checked','checked'); 
     774  } else { 
     775    $("#replaceImage").removeAttr('checked'); 
     776  } 
     777} 
     778 

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

    r3491 r3498  
    5757       subscriptions but (currently) has no hierarchy. View are maintained in the  
    5858       "Calendar Suite" tab of the admin web client. --> 
    59 <xsl:variable name="useViewsNav">false</xsl:variable> 
     59<xsl:variable name="useViewsNav">true</xsl:variable> 
    6060 
    6161  <!-- SUBSCRIPTIONS LISTING --> 
    …… 
    6565       the top level subscriptions will be shown with all folders closed. Generating  
    6666       the subscriptions listing requires a second request to the server (an ajax call).  --> 
    67 <xsl:variable name="useSubscriptionsNav">true</xsl:variable>   
     67<xsl:variable name="useSubscriptionsNav">false</xsl:variable>   
    6868   
    6969   

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

    r2837 r3498  
    3232        <li> 
    3333          <a href="{$setSelection}&amp;viewName={$viewName}"> 
     34            <xsl:attribute name="href"> 
     35              <xsl:choose> 
     36                <xsl:when test="/bedework/page = 'eventList'"><xsl:value-of select="$setSelectionList"/>&amp;viewName=<xsl:value-of select="$viewName"/></xsl:when> 
     37                <xsl:otherwise><xsl:value-of select="$setSelection"/>&amp;viewName=<xsl:value-of select="$viewName"/></xsl:otherwise> 
     38              </xsl:choose> 
     39            </xsl:attribute> 
    3440            <xsl:if test="$viewName = (/bedework/selectionState/view/name)"> 
    3541              <xsl:attribute name="class">current</xsl:attribute>