Skip to content

Commit e83b186

Browse files
douglmdouglm
committed
Use String values throughout for forwarding. Return type of all action methods changed to String from int + various other related changes.
Changed ShowCurrentTabAction to use parameters to list valif forwards and event search forwards. Made possible by the above. Required struts.xml changes. Additionally, removed old search struts actions. Now we are using a single manage events tab specific search actions not needed. Fixed some redirects which were taking us to an invalid tab (searchList) XSL: fixed the status buttons - param was wrong. Added some default home content. Added help page and display help and home in iframe.
1 parent 6db0b27 commit e83b186

File tree

11 files changed

+124
-26
lines changed

11 files changed

+124
-26
lines changed

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<!DOCTYPE html>
2+
<html xml:lang="en" lang="en">
3+
<head>
4+
<title>Bedework Admin Client Home</title>
5+
<meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
6+
</head>
7+
<body>
8+
<h2>The Bedework Administrative Client</h2>
9+
<p>Select the tabs above to manage public events.</p>
10+
<h3>Event Submitters</h3>
11+
<p>If you are an event submitter, i.e you do not have approver access, you may create events that will await approval. Until they are approved you may update those events by locating them in the "Approval Queue" tab.</p>
12+
13+
<p>The "Manage Events" tab allows you to display events in
14+
your group(s), all events or to search for events matching
15+
specific criteria. As a non-approver you may only alter the status of these events. That is, you may cancel an instance, mark it as tentative or uncancel it</p>
16+
17+
<h3>Event Approvers</h3>
18+
<p>If you are an event approver, you may approve submitted events. This action publishes the event and makes it visible on the public client.</p>
19+
20+
<p>You may add and update events for your own group(s). The "Manage Events" tab, by default, show events for your group(s).</p>
21+
22+
<h3>Updating Master Events</h3>
23+
<p>Recurring events have a master event, which specifies rules
24+
for creating instances of the event. There may also be overrides, which are modified instances.</p>
25+
26+
<p>If the master is modified, for example, the description is changed, overrides are NOT modified. Please be aware of this when making changes.</p>
27+
28+
<p>Changing the rule for a master can have severe consequences. If there are associated overrides these will be lost.</p>
29+
</body>
30+
</html>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
<xsl:variable name="bwStr-Head-Change">change</xsl:variable>
4343
<xsl:variable name="bwStr-Head-LoggedInAs">Logged in as:</xsl:variable>
4444
<xsl:variable name="bwStr-Head-LogOut">log out</xsl:variable>
45+
<xsl:variable name="bwStr-Head-HelpPage">Help</xsl:variable>
4546
<xsl:variable name="bwStr-Head-HomePage">Home</xsl:variable>
4647
<xsl:variable name="bwStr-Head-ManageEvents">Manage&#160;Events</xsl:variable>
4748
<xsl:variable name="bwStr-Head-PendingEvents">Pending Queue</xsl:variable>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
<xsl:variable name="bwStr-Head-Change">cambiar</xsl:variable>
4343
<xsl:variable name="bwStr-Head-LoggedInAs">Conectado como:</xsl:variable>
4444
<xsl:variable name="bwStr-Head-LogOut">desconectar</xsl:variable>
45+
<xsl:variable name="bwStr-Head-HelpPage">Help</xsl:variable><!-- XXX translate -->
4546
<xsl:variable name="bwStr-Head-HomePage">Home</xsl:variable><!-- XXX translate -->
4647
<xsl:variable name="bwStr-Head-ManageEvents">Gestionar&#160;eventos</xsl:variable>
4748
<xsl:variable name="bwStr-Head-PendingEvents">Cola pendiente</xsl:variable>

‎bw-calendar-xsl-caladminrsrc/src/main/webapp/globals.xsl‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@
9898
select="/bedework/tab = 'contacts'"/>
9999
<xsl:variable name="isHomePage"
100100
select="/bedework/tab = 'homePage'"/>
101+
<xsl:variable name="isHelpPage"
102+
select="/bedework/tab = 'helpPage'"/>
101103
<xsl:variable name="isLocationsTab"
102104
select="/bedework/tab = 'locations'"/>
103105
<xsl:variable name="isSystemTab"
@@ -149,6 +151,7 @@
149151

150152
<!-- primary navigation, menu tabs -->
151153
<xsl:variable name="setup" select="/bedework/urlPrefixes/setup"/>
154+
<xsl:variable name="showHelpPage" select="/bedework/urlPrefixes/showHelpPage"/>
152155
<xsl:variable name="showHomePage" select="/bedework/urlPrefixes/showHomePage"/>
153156
<xsl:variable name="initEventList" select="/bedework/urlPrefixes/initEventList"/>
154157
<xsl:variable name="initPendingTab" select="/bedework/urlPrefixes/initPendingTab"/>
@@ -162,8 +165,7 @@
162165
<xsl:variable name="showCategoriesTab" select="/bedework/urlPrefixes/showCategoriesTab"/>
163166
<xsl:variable name="logout" select="/bedework/urlPrefixes/logout"/>
164167
<xsl:variable name="search" select="/bedework/urlPrefixes/search/search"/>
165-
<xsl:variable name="search-next" select="/bedework/urlPrefixes/search/next"/>
166-
<xsl:variable name="index-unindex" select="/bedework/urlPrefixes/search/unindex"/>
168+
<xsl:variable name="index-unindex" select="/bedework/urlPrefixes/unindex"/>
167169

168170
<!-- events -->
169171
<xsl:variable name="event-fetchForApprovePublish" select="/bedework/urlPrefixes/event/fetchForApprovePublish"/>
@@ -180,7 +182,6 @@
180182
<xsl:variable name="event-fetchForDisplay" select="/bedework/urlPrefixes/event/fetchForDisplay"/>
181183
<xsl:variable name="event-fetchForUpdate" select="/bedework/urlPrefixes/event/fetchForUpdate"/>
182184
<xsl:variable name="event-updateStatus" select="/bedework/urlPrefixes/event/updateStatus"/>
183-
<xsl:variable name="event-updateStatusFromSearch" select="/bedework/urlPrefixes/event/updateStatusFromSearch"/>
184185
<xsl:variable name="event-update" select="/bedework/urlPrefixes/event/update"/>
185186
<xsl:variable name="event-selectCalForEvent" select="/bedework/urlPrefixes/event/selectCalForEvent"/>
186187
<xsl:variable name="event-initUpload" select="/bedework/urlPrefixes/event/initUpload"/>

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,17 @@
177177
<xsl:copy-of select="$bwStr-Head-System"/>
178178
</a>
179179
</li>
180-
</xsl:if>
180+
</xsl:if><!--
181+
help page -->
182+
<li>
183+
<xsl:if test="$isHelpPage">
184+
<xsl:attribute name="class">selected</xsl:attribute>
185+
</xsl:if>
186+
<a id="helpLink">
187+
<xsl:attribute name="href"><xsl:value-of select="$showHelpPage"/></xsl:attribute>
188+
<xsl:copy-of select="$bwStr-Head-HelpPage"/>
189+
</a>
190+
</li>
181191
</ul>
182192
<xsl:call-template name="messagesAndErrors"/>
183193
</xsl:template>

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<!-- Site subsections -->
2929
<xsl:include href="head.xsl" />
3030
<xsl:include href="header.xsl" />
31+
<xsl:include href="helpPage.xsl" />
3132
<xsl:include href="homePage.xsl" />
3233
<xsl:include href="notifications.xsl" />
3334
<xsl:include href="adminMenu.xsl" />
@@ -66,7 +67,7 @@
6667

6768
<!--==== MAIN TEMPLATE ====-->
6869
<xsl:template match="/">
69-
<xsl:text disable-output-escaping='yes'>&lt;!DOCTYPE html></xsl:text><!-- HTML5 -->
70+
<xsl:text disable-output-escaping='yes'>&lt;!DOCTYPE html></xsl:text><!-- HTML5 -->
7071
<html lang="en">
7172
<xsl:call-template name="head"/>
7273
<body>
@@ -82,6 +83,9 @@
8283
</div>
8384
<div id="content">
8485
<xsl:choose>
86+
<xsl:when test="/bedework/page='helpPage'">
87+
<xsl:call-template name="helpPage"/>
88+
</xsl:when>
8589
<xsl:when test="/bedework/page='homePage'">
8690
<xsl:call-template name="homePage"/>
8791
</xsl:when>

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,38 @@ body {
254254
border-bottom: 2px solid black;
255255
text-align: center;
256256
}
257+
#helpContentContainer {
258+
position: relative;
259+
overflow: hidden;
260+
width: 100%;
261+
padding-top: 56.25%;
262+
}
263+
#helpContent {
264+
position: absolute;
265+
top: 0;
266+
left: 0;
267+
bottom: 0;
268+
right: 0;
269+
width: 100%;
270+
height: 100%;
271+
border: none;
272+
}
273+
#homeContentContainer {
274+
position: relative;
275+
overflow: hidden;
276+
width: 100%;
277+
padding-top: 56.25%;
278+
}
279+
#homeContent {
280+
position: absolute;
281+
top: 0;
282+
left: 0;
283+
bottom: 0;
284+
right: 0;
285+
width: 100%;
286+
height: 100%;
287+
border: none;
288+
}
257289
#content {
258290
grid-area: content;
259291
margin: 0;

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,7 @@
3232
<xsl:variable name="displayForNonApprover"
3333
select="/bedework/page = 'displayEventForNonApprover'"/>
3434
<xsl:variable name="updateStatusHref">
35-
<xsl:choose>
36-
<xsl:when test="$displayForNonApprover">
37-
<xsl:value-of select="$event-updateStatusFromSearch"/>
38-
</xsl:when>
39-
<xsl:otherwise>
40-
<xsl:value-of select="$event-updateStatus"/>
41-
</xsl:otherwise>
42-
</xsl:choose>
35+
<xsl:value-of select="$event-updateStatus"/>
4336
</xsl:variable>
4437

4538
<xsl:choose>

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

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,7 @@
2828
<xsl:param name="name"/><!--
2929
-->
3030
<xsl:variable name="updateStatusHref">
31-
<xsl:choose>
32-
<xsl:when test="/bedework/page = 'displayEventForNonApprover'">
33-
<xsl:value-of select="$event-updateStatusFromSearch"/>
34-
</xsl:when>
35-
<xsl:otherwise>
36-
<xsl:value-of select="$event-updateStatus"/>
37-
</xsl:otherwise>
38-
</xsl:choose>
31+
<xsl:value-of select="$event-updateStatus"/>
3932
</xsl:variable>
4033
<div>
4134
<button type="button" class="next" onclick="location.href='{$updateStatusHref}&amp;href={$href}&amp;status={$newStatus}'">
@@ -48,7 +41,7 @@
4841
<xsl:param name="href"/>
4942
<xsl:call-template name="changeStatusButton">
5043
<xsl:with-param name="href" select="$href"/>
51-
<xsl:with-param name="newStatus" select="CANCELLED" />
44+
<xsl:with-param name="newStatus" select="'CANCELLED'" />
5245
<xsl:with-param name="name"
5346
select="$bwStr-EvLC-SetCancelled"/>
5447
</xsl:call-template>
@@ -58,7 +51,7 @@
5851
<xsl:param name="href"/>
5952
<xsl:call-template name="changeStatusButton">
6053
<xsl:with-param name="href" select="$href"/>
61-
<xsl:with-param name="newStatus" select="CONFIRMED" />
54+
<xsl:with-param name="newStatus" select="'CONFIRMED'" />
6255
<xsl:with-param name="name"
6356
select="$bwStr-EvLC-SetConfirmed"/>
6457
</xsl:call-template>
@@ -68,7 +61,7 @@
6861
<xsl:param name="href"/>
6962
<xsl:call-template name="changeStatusButton">
7063
<xsl:with-param name="href" select="$href"/>
71-
<xsl:with-param name="newStatus" select="TENTATIVE" />
64+
<xsl:with-param name="newStatus" select="'TENTATIVE'" />
7265
<xsl:with-param name="name"
7366
select="$bwStr-EvLC-SetTentative"/>
7467
</xsl:call-template>

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Licensed to Jasig under one or more contributor license
4+
agreements. See the NOTICE file distributed with this work
5+
for additional information regarding copyright ownership.
6+
Jasig licenses this file to you under the Apache License,
7+
Version 2.0 (the "License"); you may not use this file
8+
except in compliance with the License. You may obtain a
9+
copy of the License at:
10+
11+
http://www.apache.org/licenses/LICENSE-2.0
12+
13+
Unless required by applicable law or agreed to in writing,
14+
software distributed under the License is distributed on
15+
an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16+
KIND, either express or implied. See the License for the
17+
specific language governing permissions and limitations
18+
under the License.
19+
-->
20+
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
21+
<xsl:template name="helpPage">
22+
<div id="helpContentContainer">
23+
<iframe id="helpContent"
24+
title="Bedework Help"
25+
src="https://nashville-public-library.github.io/bedework-docs/">
26+
</iframe>
27+
</div>
28+
</xsl:template>
29+
</xsl:stylesheet>

0 commit comments

Comments
 (0)