Attachment #2959 for bug #4950

View | Details | Raw Unified | Return to bug 4950
Collapse All | Expand All

Lines 1424-1429 div#changelanguage{ Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/css/opac.css (+1 lines)
1424	color : #666;	1424	color : #666;
1425	font-size : 85%;	1425	font-size : 85%;
1426	padding : 1em;	1426	padding : 1em;
		1427	margin-top : 2em;
1427	}	1428	}
1428		1429
1429	div#changelanguage a {	1430	div#changelanguage a {




    <div id="bd">
	  <div id="yui-g">
        <div id="holds" class="container">
        <!-- TMPL_IF NAME="message" -->
          <!-- TMPL_IF NAME="message" -->
            <!-- TMPL_IF NAME="GNA" -->
              <div id="gna" class="dialog alert">
                <p><strong>Sorry</strong>, you cannot place holds because the library doesn't have up-to-date <a href="/cgi-bin/koha/opac-userupdate.pl">contact information</a> on file.</p>
              <p>Please contact your librarian, or use the <a href="/cgi-bin/koha/opac-userupdate.pl">online update form</a> to submit current information (<em>Please note:</em> there may be a delay in restoring your account if you submit online)</p>
              <div class="dialog alert">Please contact your librarian, or use the <a href="/cgi-bin/koha/opac-userupdate.pl">online update form</a> to submit current information (<em>Please note:</em> there may be a delay in restoring your account if you submit online)
              </div>
            <!-- /TMPL_IF -->
            <!-- TMPL_IF NAME="lost" -->
              <div id="lost" class="dialog alert">
                <p><strong>Sorry</strong>, you cannot place holds because your library card has been marked as lost or stolen.</p>
                <p>If this is an error, please take your card to the circulation desk at your local library and the error will be corrected.</p>
              <div class="dialog alert">If this is an error, please take your card to the circulation desk at your local library and the error will be corrected.
              </div>
            <!-- /TMPL_IF -->
            <!-- TMPL_IF NAME="debarred" -->
              <div id="debarred" class="dialog alert">
                <p><strong>Sorry</strong>, you cannot place holds because your account has been frozen.</p>
                <p>Usually the reason for freezing an account is old overdues or damage fees.   If <a href="/cgi-bin/koha/opac-user.pl">your account page</a> shows your account to be clear, please consult a librarian.</p>
              <div class="dialog alert">Usually the reason for freezing an account is old overdues or damage fees.   If <a href="/cgi-bin/koha/opac-user.pl">your account page</a> shows your account to be clear, please consult a librarian.
              </div>
            <!-- /TMPL_IF -->
            <!-- TMPL_IF NAME="too_much_oweing" -->

            <!-- TMPL_IF NAME="bad_data" -->
              <div class="dialog alert">ERROR: Internal error: incomplete hold request.</div>
            <!-- /TMPL_IF -->
          <!-- TMPL_ELSE -->
            <!-- TMPL_IF NAME="none_available" -->
                <div class="dialog alert"><strong>Sorry</strong>, none of these items can be placed on hold.
                </div>
              <!-- /TMPL_IF -->
          <!-- /TMPL_IF --><!-- NAME="message" -->

      <!-- TMPL_UNLESS NAME="message" --><!-- TMPL_UNLESS NAME="none_available" --><h3>Confirm holds for:
                      <!-- TMPL_LOOP NAME="USER_INFO" -->
                        <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)
                      <!-- /TMPL_LOOP -->
                    </h3><!-- /TMPL_UNLESS -->
              </h3>

            <form action="/cgi-bin/koha/opac-reserve.pl" method="post">
            <input type="hidden" name="place_reserve" value="1"/>

            <input type="hidden" name="selecteditems" id="selections"/>
            <div id="bigloop">
              <table id="bibitemloop">
                <!-- TMPL_UNLESS NAME="none_available" --><tr>
                  <th>Hold</th>
                  <th>Title</th>
                  <!-- TMPL_UNLESS NAME="item-level_itypes" -->
                    <th>Item Type</th>

                  <!-- TMPL_UNLESS NAME="singleBranchMode" -->
                    <th>Pickup Location</th>
                  <!-- /TMPL_UNLESS -->
                </tr><!-- TMPL_ELSE --><tr><th colspan="5">Title</th></tr><!-- /TMPL_UNLESS -->

                <!-- TMPL_LOOP name="bibitemloop" -->
                  <tr>
                      <!-- TMPL_IF NAME="holdable" -->
					  <td>
                      <input class="reserve_mode" name="reserve_mode" type="hidden" value="single"/>
                      <input class="single_bib" name="single_bib" type="hidden" value="<!-- TMPL_VAR NAME="biblionumber" -->"/>
                        <span class="confirmjs_hold" title="<!-- TMPL_VAR NAME="biblionumber" -->"></span>

                        </span>
					</td>
                      <!-- TMPL_ELSE -->
					  <!-- TMPL_UNLESS NAME="none_available" --><td>&nbsp;</td><!-- /TMPL_UNLESS -->
                      <!-- /TMPL_IF -->
                    <!-- TMPL_IF NAME="holdable" --><td><!-- TMPL_ELSE --><td colspan="5"><!-- /TMPL_IF -->
                      <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --><!-- TMPL_IF NAME="subtitle" --> <!-- TMPL_LOOP NAME="subtitle" --><!--TMPL VAR Name="subfield"--><!--/TMPL_LOOP--><!-- /TMPL_IF --></a>
                      <!-- TMPL_IF NAME="author" -->,  by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --> 

                      <!-- TMPL_UNLESS NAME="holdable" -->

                                 value="any" />
                        </span>
					</td><td>
                        <!-- TMPL_IF NAME="already_reserved" -->
                          <div class="bibmessage">You have already requested this title.</div>
                        <!-- /TMPL_IF -->
                        <!-- TMPL_UNLESS NAME="bib_available" -->
                          <div class="bibmessage">No available items.</div>
                        <!-- TMPL_ELSE -->
                          <!-- TMPL_UNLESS NAME="bib_available" -->
                            <div class="bibmessage">No available items.</div>
                          <!-- TMPL_ELSE -->
                            <div class="bibmessage">This title cannot be requested.</div>
                          <!-- /TMPL_UNLESS -->
                        <!-- /TMPL_IF -->


                        <!-- /TMPL_UNLESS -->

                    </td>
                    <!-- TMPL_IF NAME="holdable" --><!-- TMPL_UNLESS NAME="item-level_itypes" -->
                                          <td>
                                            <!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="" /><!-- /TMPL_IF -->
                                <!-- TMPL_VAR NAME="description" -->
                                          </td>
                                        <!-- /TMPL_UNLESS --><!-- /TMPL_IF -->
                    <!-- TMPL_IF NAME="holdable" --><!-- TMPL_IF NAME="showpriority" --><td><!-- TMPL_VAR name="rank" --> out of <!-- TMPL_VAR NAME="reservecount" --></td><!-- /TMPL_IF --><!-- /TMPL_IF -->
                        <!-- TMPL_UNLESS NAME="noItemTypeImages" -->
                        <!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="" /><!-- /TMPL_IF -->
                        <!-- /TMPL_UNLESS -->
						<!-- TMPL_VAR NAME="description" -->
                      </td>
                    <!-- /TMPL_UNLESS -->
                    <!-- TMPL_IF NAME="showpriority" --><td><!-- TMPL_VAR name="rank" --> out of <!-- TMPL_VAR NAME="reservecount" --></td><!-- /TMPL_IF -->
		    <!-- TMPL_IF NAME="reserve_in_future" -->
		    <!-- TMPL_IF NAME="holdable" --><td>
              <input name="reserve_date_<!-- TMPL_VAR NAME="biblionumber" -->" id="reserve_date_<!-- TMPL_VAR NAME="biblionumber" -->" size="10">
              <script language="JavaScript" type="text/javascript">
              //<![CDATA[
              $("#reserve_date_<!-- TMPL_VAR NAME="biblionumber" -->").attr( 'readonly', 'readonly' );

              var cal_img = document.createElement('img');
              cal_img.src = "<!-- TMPL_VAR NAME="themelang" -->/lib/calendar/cal.gif";
              cal_img.alt = "Show Calendar";
              cal_img.border = "0";
              cal_img.id = "CalendarReserveDate<!-- TMPL_VAR NAME="biblionumber" -->";
              cal_img.style.cursor = "pointer";
              document.getElementById("reserve_date_<!-- TMPL_VAR NAME="biblionumber" -->").parentNode.appendChild( cal_img );

              function validate<!-- TMPL_VAR NAME="biblionumber" -->(date) {
                  var today = new Date();
                        if ( (date > today) ||
                                ( date.getDate() == today.getDate() &&
                                  date.getMonth() == today.getMonth() &&
                                  date.getFullYear() == today.getFullYear() ) ) {
                            return false;
                        } else {
                            return true;
                        }
              };
              Calendar.setup(
              {
                inputField : "reserve_date_<!-- TMPL_VAR NAME="biblionumber" -->",
                ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
                button : "CalendarReserveDate<!-- TMPL_VAR NAME="biblionumber" -->",
                disableFunc : validate<!-- TMPL_VAR NAME="biblionumber" -->,
                dateStatusFunc : validate<!-- TMPL_VAR NAME="biblionumber" -->,
              }
              );
              //]]>
              </script>
                </td><!-- /TMPL_IF -->

		    <!-- /TMPL_IF -->
	<!-- TMPL_IF NAME="holdable" --><td>
        <input name="expiration_date_<!-- TMPL_VAR NAME="biblionumber" -->" id="expiration_date_<!-- TMPL_VAR NAME="biblionumber" -->" size="10" readonly="readonly" />
        <img src="<!-- TMPL_VAR NAME="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="CalendarExpirationDate_<!-- TMPL_VAR NAME="biblionumber" -->" style="cursor: pointer;" />
        <script language="JavaScript" type="text/javascript">
      //<![CDATA[
      function validate1(date) {
        var today = new Date();
        if ( (date > today) ||
                      ( date.getDate() == today.getDate() &&
                        date.getMonth() == today.getMonth() &&
                        date.getFullYear() == today.getFullYear() ) ) {
          return false;
        } else {
          return true;
        }
      };
      Calendar.setup(
        {
          inputField : "expiration_date_<!-- TMPL_VAR NAME="biblionumber" -->",
          ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
          button : "CalendarExpirationDate_<!-- TMPL_VAR NAME="biblionumber" -->",
          disableFunc : validate1,
          dateStatusFunc : validate1,
        }
      );
      //]]>
        </script>
      <p style="margin:.3em 2em;">
      <a href="#" style="font-size:85%;text-decoration:none;" onclick="document.getElementById('expiration_date_<!-- TMPL_VAR NAME="biblionumber" -->').value='';return false;">Clear Date</a></p>
    </td><!-- /TMPL_IF -->

                    <!-- TMPL_IF NAME="holdable" --><!-- TMPL_IF NAME="OPACItemHolds" -->
                                          <td class="place_on_type" style="display:none">
                                            <table>
                                              <tr>
                                                <td>
                                                  <!-- TMPL_UNLESS NAME="holdable" -->
                                                    <input type="radio" name="reqtype_<!-- TMPL_VAR NAME="biblionumber" -->"
                                                           id="reqany_<!-- TMPL_VAR NAME="biblionumber" -->"
                                                           class="selectany"
                                                           value="Any"
                                                           disabled="disabled"
                                                    />
                                                  <!-- TMPL_ELSE -->
                                                    <input type="radio" name="reqtype_<!-- TMPL_VAR NAME="biblionumber" -->"
                                                           id="reqany_<!-- TMPL_VAR NAME="biblionumber" -->"
                                                           class="selectany"
                                                           value="Any"
                                                           checked="checked"
                                                    />
                                                  <!-- /TMPL_UNLESS -->
                                                  <label for="reqany_<!-- TMPL_VAR NAME="biblionumber" -->">Next available copy</label>
                                                </td>
                                              </tr>
                                              <tr>
                                                <td>
                                                  <!-- TMPL_UNLESS NAME="holdable" -->
                                                    <input type="radio" name="reqtype_<!-- TMPL_VAR NAME="biblionumber" -->"
                                                           id="reqspecific_<!-- TMPL_VAR NAME="biblionumber" -->"
                                                           class="selectspecific"
                                                           disabled="disabled"
                                                           value="Specific"
                                                    />
                                                  <!-- TMPL_ELSE -->
                                                    <input type="radio" name="reqtype_<!-- TMPL_VAR NAME="biblionumber" -->"
                                                           id="reqspecific_<!-- TMPL_VAR NAME="biblionumber" -->"
                                                           class="selectspecific"
                                                           value="Specific"
                                                    />
                                                  <!-- /TMPL_UNLESS -->
                                                  <label for="reqspecific_<!-- TMPL_VAR NAME="biblionumber"-->">A specific copy</label>
                                                </td>
                                              </tr>
                                            </table>
                                          </td>
                                        <!-- /TMPL_IF --><!-- /TMPL_IF -->

                    <!-- TMPL_UNLESS NAME="singleBranchMode" -->
                      <!-- TMPL_IF NAME="holdable" --><td>
                                              <select name="branch" id="branch_<!-- TMPL_VAR NAME="biblionumber" -->"
                                                <!-- TMPL_UNLESS NAME="holdable" -->disabled="disabled"<!-- /TMPL_UNLESS --> >
                                                <!-- TMPL_LOOP NAME="branchChoicesLoop" -->
                                                  <!-- TMPL_IF name="selected" -->
                                                    <option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="branchname" --></option>
                                                  <!-- TMPL_ELSE -->
                                                    <option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="branchname" --></option>
                                                  <!-- /TMPL_IF -->
                                                <!-- /TMPL_LOOP -->
                                              </select>
                                            </td><!-- /TMPL_IF -->
                    <!-- /TMPL_UNLESS -->
                  </tr>

                  <!-- TMPL_IF NAME="OPACItemHolds" -->
                  <!-- TMPL_IF NAME="holdable" -->
                    <tr class="copiesrow" id="copiesrow_<!-- TMPL_VAR NAME="biblionumber"-->">
                      <td colspan="1">
                      </td>

                  <!-- /TMPL_IF --><!-- OPACItemHolds -->
                <!-- /TMPL_LOOP -->
              </table><!-- bibitemloop -->
              <!-- /TMPL_UNLESS --> <!-- if message -->
            </div><!-- bigloop -->

            <!-- TMPL_UNLESS NAME="message" -->
            <!-- TMPL_UNLESS NAME="none_available" -->
            <!-- TMPL_ELSE -->
            <input type="submit" value="Place Hold" class="placehold" />
            <!-- /TMPL_UNLESS -->
            <!-- /TMPL_UNLESS -->

            </form>

          <!-- /TMPL_UNLESS --><!-- message -->

        </div><!-- holds -->
      </div><!-- yui-g -->
    </div><!-- bd    -->




my $biblioLoop = [];
my $numBibsAvailable = 0;
my $itemdata_enumchron = 0;
my $anyholdable;
my $itemLevelTypes = C4::Context->preference('item-level_itypes');
$template->param('item-level_itypes' => $itemLevelTypes);


        }
    }

    $biblioLoopIter{itemTypeDescription} = $itemTypes->{$biblioData->{itemtype}}{description};

    $biblioLoopIter{itemLoop} = [];
    my $numCopiesAvailable = 0;
    foreach my $itemInfo (@{$biblioData->{itemInfos}}) {

        $numBibsAvailable++;
        $biblioLoopIter{bib_available} = 1;
        $biblioLoopIter{holdable} = 1;
        $anyholdable = 1;
    }
    if ($biblioLoopIter{already_reserved}) {
        $biblioLoopIter{holdable} = undef;
        $anyholdable = undef;
    }
    if(not CanBookBeReserved($borrowernumber,$biblioNum)){
        $biblioLoopIter{holdable} = undef;
        $anyholdable = undef;
    }

    push @$biblioLoop, \%biblioLoopIter;
}

if ( $numBibsAvailable == 0 || !$anyholdable) {
    $template->param( none_available => 1 );
}

my $itemTableColspan = 5;
- 

Return to bug 4950

Lines 289-294 my $notforloan_label_of = get_notforloan_label_of(); Link Here

(-)a/opac/opac-reserve.pl (-5 / +6 lines)
289	my $biblioLoop = [];	289	my $biblioLoop = [];
290	my $numBibsAvailable = 0;	290	my $numBibsAvailable = 0;
291	my $itemdata_enumchron = 0;	291	my $itemdata_enumchron = 0;
		292	my $anyholdable;
292	my $itemLevelTypes = C4::Context->preference('item-level_itypes');	293	my $itemLevelTypes = C4::Context->preference('item-level_itypes');
293	$template->param('item-level_itypes' => $itemLevelTypes);	294	$template->param('item-level_itypes' => $itemLevelTypes);
294		295
Lines 336-343 foreach my $biblioNum (@biblionumbers) { Link Here
336	}	337	}
337	}	338	}
338		339
339	$biblioLoopIter{itemTypeDescription} = $itemTypes->{$biblioData->{itemtype}}{description};
340
341	$biblioLoopIter{itemLoop} = [];	340	$biblioLoopIter{itemLoop} = [];
342	my $numCopiesAvailable = 0;	341	my $numCopiesAvailable = 0;
343	foreach my $itemInfo (@{$biblioData->{itemInfos}}) {	342	foreach my $itemInfo (@{$biblioData->{itemInfos}}) {
Lines 455-473 foreach my $biblioNum (@biblionumbers) { Link Here
455	$numBibsAvailable++;	454	$numBibsAvailable++;
456	$biblioLoopIter{bib_available} = 1;	455	$biblioLoopIter{bib_available} = 1;
457	$biblioLoopIter{holdable} = 1;	456	$biblioLoopIter{holdable} = 1;
		457	$anyholdable = 1;
458	}	458	}
459	if ($biblioLoopIter{already_reserved}) {	459	if ($biblioLoopIter{already_reserved}) {
460	$biblioLoopIter{holdable} = undef;	460	$biblioLoopIter{holdable} = undef;
		461	$anyholdable = undef;
461	}	462	}
462	if(not CanBookBeReserved($borrowernumber,$biblioNum)){	463	if(not CanBookBeReserved($borrowernumber,$biblioNum)){
463	$biblioLoopIter{holdable} = undef;	464	$biblioLoopIter{holdable} = undef;
		465	$anyholdable = undef;
464	}	466	}
465		467
466	push @$biblioLoop, \%biblioLoopIter;	468	push @$biblioLoop, \%biblioLoopIter;
467	}	469	}
468		470
469	if ( $numBibsAvailable == 0 ) {	471	if ( $numBibsAvailable == 0 \|\| !$anyholdable) {
470	$template->param( none_available => 1, message => 1 );	472	$template->param( none_available => 1 );
471	}	473	}
472		474
473	my $itemTableColspan = 5;	475	my $itemTableColspan = 5;
474	-