Skip to content

Commit 744f43b

Browse files
douglmdouglm
committed
Some changes to event list format - prepare for more buttons
1 parent 0546baa commit 744f43b

File tree

3 files changed

+49
-47
lines changed

3 files changed

+49
-47
lines changed

‎bw-calendar-xsl-caladminrsrc/src/main/webapp/default/strings.xsl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@
162162
<xsl:variable name="bwStr-EvLC-Suggested">Suggested</xsl:variable>
163163
<xsl:variable name="bwStr-EvLC-TopicalAreas">Topical Areas</xsl:variable>
164164
<xsl:variable name="bwStr-EvLC-Categories">Categories</xsl:variable>
165+
<xsl:variable name="bwStr-EvLC-AcceptQ">Accept?</xsl:variable>
165166
<xsl:variable name="bwStr-EvLC-Author">Author</xsl:variable>
166167
<xsl:variable name="bwStr-EvLC-Description">Description</xsl:variable>
167168
<xsl:variable name="bwStr-EvLC-NoEvents">No events to display</xsl:variable>
@@ -180,7 +181,7 @@
180181
<xsl:variable name="bwStr-EvLC-ThisEventCrossTagged">This event is cross-tagged.</xsl:variable>
181182
<xsl:variable name="bwStr-EvLC-ShowTagsByOtherGroups">Show tags by other groups</xsl:variable>
182183
<xsl:variable name="bwStr-EvLC-RecurringEventEdit">Recurring event. Edit:</xsl:variable>
183-
<xsl:variable name="bwStr-EvLC-Master">Edit master</xsl:variable>
184+
<xsl:variable name="bwStr-EvLC-Master">Edit&#160;master</xsl:variable>
184185
<xsl:variable name="bwStr-EvLC-ApproveDDD">Approve...</xsl:variable>
185186
<xsl:variable name="bwStr-EvLC-ClaimBeforeApprove">Claim before Approval</xsl:variable>
186187
<xsl:variable name="bwStr-EvLC-Instance">instance</xsl:variable>

‎bw-calendar-xsl-caladminrsrc/src/main/webapp/es_ES/strings.xsl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@
162162
<xsl:variable name="bwStr-EvLC-Suggested">Sugerido</xsl:variable>
163163
<xsl:variable name="bwStr-EvLC-TopicalAreas">Áreas topicas </xsl:variable>
164164
<xsl:variable name="bwStr-EvLC-Categories">Categorías</xsl:variable>
165+
<xsl:variable name="bwStr-EvLC-AcceptQ">Accept?</xsl:variable>
165166
<xsl:variable name="bwStr-EvLC-Author">Autor</xsl:variable>
166167
<xsl:variable name="bwStr-EvLC-Description">Descripción</xsl:variable>
167168
<xsl:variable name="bwStr-EvLC-NoEvents">No hay eventos para mostrar</xsl:variable>
@@ -179,7 +180,7 @@
179180
<xsl:variable name="bwStr-EvLC-ThisEventCrossTagged">Este evento tiene referencias cruzadas en sus etiquetas.</xsl:variable>
180181
<xsl:variable name="bwStr-EvLC-ShowTagsByOtherGroups">Mostrar etiquetas por otros grupos</xsl:variable>
181182
<xsl:variable name="bwStr-EvLC-RecurringEventEdit">Evento recurrente. Editar:</xsl:variable>
182-
<xsl:variable name="bwStr-EvLC-Master">Editar maestro</xsl:variable>
183+
<xsl:variable name="bwStr-EvLC-Master">Editar&#160;maestro</xsl:variable>
183184
<xsl:variable name="bwStr-EvLC-ApproveDDD">Approve...</xsl:variable>
184185
<xsl:variable name="bwStr-EvLC-Instance">instance</xsl:variable>
185186
<xsl:variable name="bwStr-EvLC-Lastmod">Last modified:</xsl:variable><!-- XXX translate -->

‎bw-calendar-xsl-caladminrsrc/src/main/webapp/themes/bedeworkAdminTheme/eventsListCommon.xsl‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@
3131
<thead>
3232
<tr>
3333
<th><xsl:copy-of select="$bwStr-EvLC-Title"/></th>
34+
<xsl:choose>
35+
<xsl:when test="$suggestionQueue = 'true'">
36+
<th><xsl:copy-of select="$bwStr-EvLC-AcceptQ"/></th>
37+
</xsl:when>
38+
<xsl:otherwise><th><xsl:text> </xsl:text></th></xsl:otherwise>
39+
</xsl:choose>
3440
<xsl:if test="$pending = 'true'">
3541
<th><xsl:copy-of select="$bwStr-EvLC-CalSuite"/></th>
3642
<th><xsl:copy-of select="$bwStr-EvLC-ClaimedBy"/></th>
@@ -48,12 +54,6 @@
4854
</xsl:if>
4955
<th><xsl:copy-of select="$bwStr-EvLC-Author"/></th>
5056
<th><xsl:copy-of select="$bwStr-EvLC-Description"/></th>
51-
<xsl:choose>
52-
<xsl:when test="$suggestionQueue = 'true'">
53-
<th>Accept?</th>
54-
</xsl:when>
55-
<xsl:otherwise><th><xsl:text> </xsl:text></th></xsl:otherwise>
56-
</xsl:choose>
5757
</tr>
5858
</thead>
5959
<tbody id="commonListTableBody">
@@ -223,6 +223,45 @@
223223
</xsl:otherwise>
224224
</xsl:choose>
225225
</td>
226+
<td>
227+
<xsl:if test="recurring = 'true' or recurrenceId != ''">
228+
<div class="recurrenceEditLinks">
229+
<button type="button" class="next" onclick="location.href='{$event-fetchForUpdate}&amp;calPath={$calPath}&amp;guid={$guid}'">
230+
<xsl:copy-of select="$bwStr-EvLC-Master"/>
231+
</button>
232+
</div>
233+
</xsl:if>
234+
<xsl:if test="(($pending = 'true') and ($approverUser = 'true'))">
235+
<div class="recurrenceEditLinks">
236+
<xsl:choose>
237+
<xsl:when test="$claimedPending = 'true'">
238+
<button type="button" class="next" onclick="location.href='{$event-fetchForApprovePublish}&amp;calPath={$calPath}&amp;guid={$guid}'">
239+
<xsl:copy-of select="$bwStr-EvLC-ApproveDDD"/>
240+
</button>
241+
</xsl:when>
242+
<xsl:otherwise>
243+
<xsl:copy-of select="$bwStr-EvLC-ClaimBeforeApprove"/>
244+
</xsl:otherwise>
245+
</xsl:choose>
246+
</div>
247+
</xsl:if>
248+
<xsl:if test="(($approvalQueue = 'true') and ($approverUser = 'true'))">
249+
<div class="recurrenceEditLinks">
250+
<button type="button" class="next" onclick="location.href='{$event-fetchForApprovePublish}&amp;calPath={$calPath}&amp;guid={$guid}'">
251+
<xsl:copy-of select="$bwStr-EvLC-ApproveDDD"/>
252+
</button>
253+
</div>
254+
</xsl:if>
255+
<xsl:if test="$suggestionQueue = 'true'">
256+
<xsl:variable name="actionPrefix"><xsl:value-of select="$suggest-setStatus"/>&amp;calPath=<xsl:value-of select="$calPath"/>&amp;guid=<xsl:value-of select="$guid"/>&amp;recurrenceId=<xsl:value-of select="$recurrenceId"/></xsl:variable>
257+
<button onclick="setSuggestionRowStatus('accept','{$actionPrefix}','suggestionRow{$i}','{$bwStr-EvLC-NoEvents}')">
258+
<xsl:value-of select="$bwStr-SEBu-Accept"/>
259+
</button>
260+
<button onclick="setSuggestionRowStatus('reject','{$actionPrefix}','suggestionRow{$i}','{$bwStr-EvLC-NoEvents}')">
261+
<xsl:value-of select="$bwStr-SEBu-Reject"/>
262+
</button>
263+
</xsl:if>
264+
</td>
226265
<xsl:if test="$pending = 'true'">
227266
<td>
228267
<xsl:value-of select="calSuite"/>
@@ -364,45 +403,6 @@
364403
<xsl:value-of select="substring(created,10,2)"/>:<xsl:value-of select="substring(created,12,2)"/> utc
365404
</div>
366405
</td>
367-
<td>
368-
<xsl:if test="recurring = 'true' or recurrenceId != ''">
369-
<div class="recurrenceEditLinks">
370-
<button type="button" class="next" onclick="location.href='{$event-fetchForUpdate}&amp;calPath={$calPath}&amp;guid={$guid}'">
371-
<xsl:copy-of select="$bwStr-EvLC-Master"/>
372-
</button>
373-
</div>
374-
</xsl:if>
375-
<xsl:if test="(($pending = 'true') and ($approverUser = 'true'))">
376-
<div class="recurrenceEditLinks">
377-
<xsl:choose>
378-
<xsl:when test="$claimedPending = 'true'">
379-
<button type="button" class="next" onclick="location.href='{$event-fetchForApprovePublish}&amp;calPath={$calPath}&amp;guid={$guid}'">
380-
<xsl:copy-of select="$bwStr-EvLC-ApproveDDD"/>
381-
</button>
382-
</xsl:when>
383-
<xsl:otherwise>
384-
<xsl:copy-of select="$bwStr-EvLC-ClaimBeforeApprove"/>
385-
</xsl:otherwise>
386-
</xsl:choose>
387-
</div>
388-
</xsl:if>
389-
<xsl:if test="(($approvalQueue = 'true') and ($approverUser = 'true'))">
390-
<div class="recurrenceEditLinks">
391-
<button type="button" class="next" onclick="location.href='{$event-fetchForApprovePublish}&amp;calPath={$calPath}&amp;guid={$guid}'">
392-
<xsl:copy-of select="$bwStr-EvLC-ApproveDDD"/>
393-
</button>
394-
</div>
395-
</xsl:if>
396-
<xsl:if test="$suggestionQueue = 'true'">
397-
<xsl:variable name="actionPrefix"><xsl:value-of select="$suggest-setStatus"/>&amp;calPath=<xsl:value-of select="$calPath"/>&amp;guid=<xsl:value-of select="$guid"/>&amp;recurrenceId=<xsl:value-of select="$recurrenceId"/></xsl:variable>
398-
<button onclick="setSuggestionRowStatus('accept','{$actionPrefix}','suggestionRow{$i}','{$bwStr-EvLC-NoEvents}')">
399-
<xsl:value-of select="$bwStr-SEBu-Accept"/>
400-
</button>
401-
<button onclick="setSuggestionRowStatus('reject','{$actionPrefix}','suggestionRow{$i}','{$bwStr-EvLC-NoEvents}')">
402-
<xsl:value-of select="$bwStr-SEBu-Reject"/>
403-
</button>
404-
</xsl:if>
405-
</td>
406406
</tr>
407407
</xsl:template>
408408

0 commit comments

Comments
 (0)