Marcel de Rooy
1b695f7dd7
This patch adjusts two instances where Koha says that an email has
been sent while it is just enqueued (put in the message queue). The
crontab example still suggests to run process_message_queue once an hour
and the manual even speaks about 1-4 hours.
In the process of selfregistration and sharing a shelf, I have adjusted
the text "has been sent" to "will be sent shortly". This covers imo
the one-hour frequency.
When writing this patch, I have examined all calls of EnqueueLetter;
I only found these two occurrences to be of interest.
Note: I would recommend to increase this frequency in the documentation,
but consider that for now to be outside the scope of this report.
Test plan:
[1] Self-register a new user with verification by email required. Look at
the text when you submit your data.
[2] Share a list with someone else. Look at the text when you submit the
invitation.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, small string change.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
92 lines
4.4 KiB
Text
92 lines
4.4 KiB
Text
[% USE Koha %]
|
|
[% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Share a list
|
|
[% INCLUDE 'doc-head-close.inc' %]
|
|
[% BLOCK cssinclude %][% END %]
|
|
</head>
|
|
|
|
[% INCLUDE 'bodytag.inc' bodyid='opac-shareshelf' bodyclass='scrollto' %]
|
|
[% INCLUDE 'masthead.inc' %]
|
|
<div class="main">
|
|
<ul class="breadcrumb">
|
|
<li><a href="/cgi-bin/koha/opac-main.pl">Home</a> <span class="divider">›</span></li>
|
|
[% IF ( loggedinusername ) %]
|
|
<li><a href="/cgi-bin/koha/opac-user.pl">[% FOREACH USER_INF IN USER_INFO %][% USER_INF.title %] [% USER_INF.firstname %] [% USER_INF.surname %][% END %]</a> <span class="divider">›</span></li>
|
|
[% END %]
|
|
<li>Share a list</li>
|
|
</ul> <!-- / .breadcrumb -->
|
|
|
|
<div class="container-fluid">
|
|
<div class="row-fluid">
|
|
[% IF ( OpacNav ) %]
|
|
<div class="span2">
|
|
<div id="navigation">
|
|
[% INCLUDE 'navigation.inc' IsPatronPage=1 %]
|
|
</div>
|
|
</div>
|
|
[% END %]
|
|
|
|
[%# This section contains the essential code for error messages and three operations: invite, confirm_invite and accept. %]
|
|
<h2>Share a list with another patron</h2>
|
|
<div class="span10">
|
|
<div id="shareshelf" class="maincontent">
|
|
|
|
[% IF errcode %]
|
|
[% IF errcode==1 && op %]<div class="alert">The operation [% op %] is not supported.</div>[% END %]
|
|
[% IF errcode==1 && !op %]<div class="alert">No operation parameter has been passed.</div>[% END %]
|
|
[% IF errcode==2 %]<div class="alert">Invalid shelf number.</div>[% END %]
|
|
[% IF errcode==3 %]<div class="alert">The feature of sharing lists is not in use in this library.</div>[% END %]
|
|
[% IF errcode==4 %]<div class="alert">You can only share a list if you are the owner.</div>[% END %]
|
|
[% IF errcode==5 %]<div class="alert">You cannot share a public list.</div>[% END %]
|
|
[% IF errcode==6 %]<div class="alert">Sorry, but you did not enter a valid email address.</div>[% END %]
|
|
[% IF errcode==7 %]<div class="alert">Sorry, but we could not accept this key. The invitation may have expired. Contact the patron who sent you the invitation.</div>[% END %]
|
|
[% IF errcode==8 %]<div class="alert">As owner of a list you cannot accept an invitation for sharing it.</div>[% END %]
|
|
<p><a href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves">Return to your lists</a></p>
|
|
|
|
[% ELSIF op=='invite' %]
|
|
<div id="invite">
|
|
<form method="post" onsubmit="return $('#invite_address').val().trim()!='';">
|
|
<fieldset class="rows">
|
|
<ol>
|
|
<input type="hidden" name="op" value="conf_invite"/>
|
|
<input type="hidden" name="shelfnumber" value="[% shelfnumber %]"/>
|
|
<li><label for="name">List name:</label> [% shelfname %]</li>
|
|
<li>
|
|
<label for="invite_address">Email address:</label>
|
|
<input id="invite_address" name="invite_address"/>
|
|
</li>
|
|
</ol>
|
|
</fieldset>
|
|
<fieldset class="action">
|
|
<input type="submit" value="Send" class="btn" />
|
|
<a href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves" class="cancel">Cancel</a>
|
|
</fieldset>
|
|
</form>
|
|
</div>
|
|
|
|
[% ELSIF op=='conf_invite' %]
|
|
<div id="conf_invite">
|
|
[% IF approvedaddress %]
|
|
<p>An invitation to share list <i>[% shelfname %]</i> will be sent shortly to [% approvedaddress %].</p>
|
|
[% END %]
|
|
[% IF failaddress %]
|
|
<p>Something went wrong while processing the following addresses. Please check them. These are: [% failaddress %]</p>
|
|
[% END %]
|
|
[% IF approvedaddress %]
|
|
<p>You will receive an email notification if someone accepts your share within two weeks.</p>
|
|
[% END %]
|
|
<p><a href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves">Return to your lists</a></p>
|
|
</div>
|
|
|
|
[% ELSIF op=='accept' %]
|
|
[%# Nothing to do: we already display an error or we redirect. %]
|
|
[% END %]
|
|
|
|
</div> <!-- / .span10 -->
|
|
</div> <!-- / .maincontent -->
|
|
[%# End of essential part %]
|
|
|
|
</div> <!-- / .row-fluid -->
|
|
</div> <!-- / .container-fluid -->
|
|
</div> <!-- / .main -->
|
|
[% INCLUDE 'opac-bottom.inc' %]
|
|
[% BLOCK jsinclude %][% END %]
|