Attachment 9185 Details for Bug 7936 – Bug 7936: Help for Serials in 3.8

[patch] Bug 7936: Help for Serials in 3.8

Bug-7936-Help-for-Serials-in-38.patch (text/plain), 155.72 KB, created by Nicole C. Engard on 2012-04-13 17:59:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nicole C. Engard

Created: 2012-04-13 17:59:00 UTC

Size: 155.72 KB

patch

obsolete

>From c7ce7e3e75d5c7ed99dba6ff730b417591600ff0 Mon Sep 17 00:00:00 2001
>From: Nicole C. Engard <nengard@bywatersolutions.com>
>Date: Fri, 13 Apr 2012 13:58:27 -0400
>Subject: [PATCH] Bug 7936: Help for Serials in 3.8
>
>---
> .../prog/en/modules/serials/checkexpiration.tt     |  133 +--
> .../prog/en/modules/serials/claims.tt              |  408 +-----
> .../prog/en/modules/serials/routing.tt             |   98 +--
> .../prog/en/modules/serials/serials-collection.tt  |  280 +----
> .../prog/en/modules/serials/serials-edit.tt        |  446 +------
> .../prog/en/modules/serials/serials-home.tt        |  159 +--
> .../prog/en/modules/serials/subscription-add.tt    | 1537 ++------------------
> .../prog/en/modules/serials/subscription-detail.tt |  392 +-----
> 8 files changed, 151 insertions(+), 3302 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
>index 272f19e..369ba8e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
>@@ -1,132 +1,13 @@
>-[% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Serials &rsaquo; Check expiration</title>
>-[% INCLUDE 'doc-head-close.inc' %]
>-[% INCLUDE 'calendar.inc' %]
>-<script type="text/javascript" language="JavaScript">
>-// <![CDATA[
>-    /**
>-     *  Function CheckForm
>-     *  This function checks the form before submit
>-     */
>-     function CheckForm(form){
>-        if(form.date.value){
>-            return true;
>-        }
>-        else {
>-            alert(_("You must enter a date !"));
>-            document.f.date.focus();
>-            return false;
>-        }
>-     }
>+[% INCLUDE 'help-top.inc' %]
> 
>-	function popup(subscriptionid) {
>-	   newin=window.open("subscription-renew.pl?mode=popup&subscriptionid="+subscriptionid,'popup','width=590,height=440,toolbar=false,scrollbars=yes,resize=yes');
>-	}
>+<h1>Check Serial Expiration</h1>
> 
>-     // ]]>
>-</script>
>-
>-</head>
>-<body id="ser_checkexpiration" class="ser">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'serials-search.inc' %]
>+<p>When adding serials you enter a subscription length, using the check expiration tool you can see when your subscriptions are about to expire. To use the tool click the link to 'Check expiration' on the serials menu.</p>
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; Check expiration </div>
>+<p>In the form that appears you need to enter at least a date to search by.</p>
> 
>-<div id="doc3" class="yui-t2">
>-   
>-   <div id="bd">
>-	<div id="yui-main">
>-	<div class="yui-b">
>+<p>In your results you will see all subscriptions that will expire before the date you entered. From there you can choose to view the subscription further or renew it in one click.</P>
> 
>-<h1>Check expiration</h1>
>+<p><strong>See the full documentation for Checking Serial Expiration in the <a href="http://manual.koha-community.org/3.8/en/serialexpiration.html">manual</a> (online).</strong></p>
> 
>-    <form name="f" action="/cgi-bin/koha/serials/checkexpiration.pl" method="post" onsubmit="return CheckForm(this);">
>-<fieldset class="rows">
>-    <legend>Filter results :</legend>
>-    
>-         <ol>
>-        <li><label for="title">Title:</label>
>-        <input id="title" type="text" name="title" size="15" value="[% title %]" /></li>
>-
>-        <li><label for="issn">ISSN:</label>
>-        <input id="issn" type="text" name="issn" size="15" value="[% issn %]" /></li>
>-
>-        <li><label for="date" class="required" title="Required field">Expiring before:</label>
>-        <input id="date" type="text" name="date" size="10" value="[% date %]" class="focus" />
>-                <img src="[% themelang %]/lib/calendar/cal.gif" alt="Show calendar" border="0" id="openCalendar" style="cursor: pointer;" />
>-            <script type="text/javascript">
>-                Calendar.setup(
>-                 {
>-					button : "openCalendar",
>-                     inputField : "date",
>-                     ifFormat : "[% DHTMLcalendar_dateformat %]"
>-                 }
>-                );
>-            </script> <span class="required">Required</span>
>-			<div class="hint">[% INCLUDE 'date-format.inc' %]</div></li>
>-			</ol>
>-        
>-</fieldset>
>-<fieldset class="action"><input type="submit" value="Search" /></fieldset>
>-</form>
>-
>-[% IF ( subscriptions_loop ) %]
>-<p>
>-    <b>[% numsubscription %]</b> subscription(s)
>-        [% IF ( title ) %]
>-        with title matching <span class="title">[% title %]</class>
>-        [% IF ( issn ) %]and [% END %]
>-    [% END %]
>-    [% IF ( issn ) %]
>-        with ISSN matching <b>[% issn %]</b>
>-    [% END %]
>-        will expire before <b>[% date %]</b>
>-</p>
>-<table>
>-        <tr>
>-            <th>ISSN</th>
>-            <th>Title</th>
>-            <th>Note</th>
>-            <th>Expiration date</th>
>-			<th colspan="2">&nbsp;</th>
>-        </tr>
>-    [% FOREACH subscriptions_loo IN subscriptions_loop %]
>-        [% IF ( subscriptions_loo.toogle ) %]
>-        <tr class="highlight">
>-        [% ELSE %]
>-        <tr>
>-        [% END %]
>-            <td>
>-                [% subscriptions_loo.issn %]
>-            </td>
>-            <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptions_loo.subscriptionid |url %]">[% IF ( subscriptions_loo.title ) %]
>-                    [% subscriptions_loo.title |html %]
>-                [% ELSE %]
>-                    |
>-                [% END %]
>-                </a>
>-            </td>
>-            <td>
>-                [% subscriptions_loo.notes %]
>-            </td>
>-            <td>
>-                [% subscriptions_loo.expirationdate %]
>-            </td>
>-			<td><a href="/cgi-bin/koha/serials/subscription-add.pl?op=mod&amp;subscriptionid=[% subscriptions_loo.subscriptionid %]">Edit</a></td>
>-			<td><a href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=[% subscriptions_loo.subscriptionid %]" onclick="popup([% subscriptions_loo.subscriptionid %]); return false;">Renew</a></td>
>-        </tr>
>-    [% END %]
>-    </table>
>-[% ELSE %]
>-    <p>No results for your query</p>
>-[% END %]
>-
>-</div>
>-</div>
>-
>-<div class="yui-b">
>-[% INCLUDE 'serials-menu.inc' %]
>-</div>
>-</div>
>-[% INCLUDE 'intranet-bottom.inc' %]
>+[% INCLUDE 'help-bottom.inc' %]
>\ No newline at end of file
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
>index 399c933..c6d8ade 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
>@@ -1,408 +1,18 @@
>-[% INCLUDE 'doc-head-open.inc' %]
>-    <title>Koha &rsaquo; Serials &rsaquo; Claims</title>
>-    [% INCLUDE 'doc-head-close.inc' %]
>-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
>-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.uitablefilter.js"></script>
>-<script type="text/JavaScript" language="JavaScript">
>-//<![CDATA[
>-	 $(document).ready(function() {
>-		[% UNLESS ( preview ) %]$("#claimst").tablesorter({[% IF ( dateformat == 'metric' ) %]
>-			dateFormat: 'uk',[% END %]
>-			headers: { 0: { sorter: false },1:{sorter:false}}
>-		});[% END %]
>-	    $('#supplierid').change(function() {
>-    	    $('#claims').submit();
>-	    });
>+[% INCLUDE 'help-top.inc' %]
> 
>-	    // Case-insensitive version of jquery's contains function
>-	    jQuery.extend(
>-		jQuery.expr[':'], { 
>-		    icontains : "jQuery(a).text().toUpperCase().indexOf(m[3].toUpperCase())>=0" 
>-		}
>-	    );
>+<h1>Serials Claims</h1>
> 
>+<p>Koha can send email messages to your serial vendors if you have late issues. To the left of the main serials page there is a link to 'Claims'</p>
> 
>-	    // Checkboxes : Select All / None
>-	    $("span.checkall").html("<input type=\"checkbox\" name=\"CheckAll\"> "+_("Check All")+"</input>");
>-	    $("span.exportSelected").html("<a id=\"ExportSelected\" href=\"/cgi-bin/koha/serials/claims.pl\"> "+_("Export selected items data") +"<\/a>");
>+<p>The links to claims also appears to the left of the subscription detail page</p>
> 
>-        $("#CheckAll").click(function() {
>-            $("#claimst tr:visible :checkbox").attr('checked', $("#CheckAll").is(':checked'));
>-        });
>+<p>If you don't have a claim notice defined yet you will see a warning message that you need to first define a notice.</p>
> 
>-	    // Generates a dynamic link for exporting the selection's data as CSV
>-	    $("#ExportSelected").click(function() {
>-		// We use input:checked because it's faster, but if there must new checkboxes  
>-		// used for other purpose on this page, please use [name=serialid]:checked instead
>-		var selected = $("input:checked");
>+<p>Clicking 'Claims' will open a report that will ask you to choose from your various serial vendors to generate claims for late issues.</p>
> 
>-		if (selected.length == 0) {
>-			alert(_('Please select at least one item to export.'));
>-			return false;
>-		}
>-		
>-		// Building the url from currently checked boxes
>-		var url = '/cgi-bin/koha/serials/lateissues-excel.pl?supplierid=&amp;op=claims';
>-		for (var i = 0; i < selected.length; i++) {
>-		    url += '&amp;serialid=' + selected[i].value;
>-		}
>-		// And redirecting to the CSV page
>-		location.href = url;
>-		return false;
>-	    });	
>+<p>From the list of late issues you can choose which ones you want to send a claim email to by clicking the checkbox to the left of late issue, choosing the notice template to use and clicking the 'Send notification' button.</p>
> 
>-        $("#titlefilter").keyup(function() {
>-            $.uiTableFilter($("#claimst"), $("#titlefilter").val())
>-	    });
>+<p><strong>See the full documentation for Serial Claims in the <a href="http://manual.koha-community.org/3.8/en/serialclaims.html">manual</a> (online).</strong></p>
> 
>-        $("#branchfilter").keyup(function() {
>-            $.uiTableFilter($("#claimst"), $("#branchfilter").val())
>-	    });
>-	 });
>+[% INCLUDE 'help-bottom.inc' %]
> 
>-	// Checks if the form can be sent (at least one checkbox must be checked)
>-	function checkForm() {
>-	    if ($("input:checked").length == 0) {
>-		alert(_('Please select at least one item.'));
>-		return false;
>-	    }
>-	}
>-
>-	// Filter by status
>-	function filterByStatus() {
>-	    selectedStatus = $("#statusfilter").val();
>-	    if (selectedStatus == "all") {
>-		clearFilters();
>-	    } else {
>-		$("table#claimst tbody tr").hide();
>-		$("table#claimst tbody tr:contains(" + selectedStatus + ")").show();
>-	    }
>-	}
>-
>-	// Filter by branch
>-	function filterByBranch() {
>-	    selectedBranch = $("#branchfilter").val();
>-	    if (selectedBranch == "all") {
>-		clearFilters();
>-	    } else {
>-		$("table#claimst tbody tr").hide();
>-		$("table#claimst tbody tr:contains(" + selectedBranch + ")").show();
>-	    }
>-	}
>-	// Filter by date
>-	function filterByDate() {
>-	    var beginDate = Date_from_syspref($("#begindate").val()).getTime();
>-	    var endDate   = Date_from_syspref($("#enddate").val()).getTime();
>-	    
>-	    // Checks if the beginning date is valid
>-	    if (!parseInt(beginDate)) {
>-		alert(_('The beginning date is missing or invalid.'));
>-		return false;
>-	    }
>-
>-	    // Checks if the ending date is valid
>-	    if (!parseInt(endDate)) {
>-		alert(_('The ending date is missing or invalid.'));
>-		return false;
>-	    }
>-
>-	    // Checks if beginning date is before ending date
>-	    if (beginDate > endDate) {
>-		// If not, we swap them
>-		var tmpDate = endDate;
>-		endDate = beginDate;
>-		beginDate = tmpDate;
>-	    }
>-	   
>-	    // We hide everything
>-	    $("table#claimst tbody tr").hide();
>-
>-	    // For each date in the table
>-	    $(".planneddate").each(function() {
>-
>-		// We make a JS Date Object, according to the locale
>-		var pdate = Date_from_syspref($(this).text()).getTime();
>-
>-		// And checks if the date is between the beginning and ending dates
>-		if (pdate > beginDate && 
>-		    pdate < endDate) {
>-			// If so, we can show the row
>-			$(this).parent().show();
>-		    }
>-
>-	    });
>-	}
>-
>-	// Clears filters : shows everything
>-	function clearFilters() {
>-	    $("table#claimst tbody tr").show();
>-	}
>-
>-	function popup(supplierid,serialid){
>-		window.open('claims.pl?supplierid='+ supplierid +'&amp;serialid='+ serialid +'&amp;op=preview' ,'popup', 'width=600,height=400,toolbar=no,scrollbars=yes');
>-	}
>-
>-//]]>
>-</script>
>-[% INCLUDE 'calendar.inc' %]
>-</head>
>-<body id="ser_claims" class="ser">
>-    [% INCLUDE 'header.inc' %]
>-[% UNLESS ( preview ) %]
>-    [% INCLUDE 'serials-search.inc' %]
>-[% END %]
>-
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; Claims</div>
>-
>-[% UNLESS ( preview ) %]
>-
>-<div id="doc3" class="yui-t2">
>-   
>-   <div id="bd">
>-	<div id="yui-main">
>-	<div class="yui-b">
>-
>-    <h1>Claims</h1>
>-
>-[% IF ( letter ) %][% UNLESS ( missingissues ) %][% IF ( supplierid ) %] <div class="dialog alert">No missing issues found.</div>[% ELSE %]<div class="dialog message">Please choose a vendor.</div>[% END %][% END %][% END %]
>-	
>-	     [% IF ( SHOWCONFIRMATION ) %]
>-     <div class="dialog alert">Your notification has been sent.</div>
>-     [% END %]
>-[% UNLESS ( letter ) %]<div class="dialog alert">No claims notice defined. <a href="/cgi-bin/koha/tools/letter.pl">Please define one</a>.</div>[% END %]
>-    <form id="claims" name="claims" action="claims.pl" method="post">
>-    <fieldset>
>-	    <label for="supplierid">Vendor: </label>
>-	    <select id="supplierid" name="supplierid">
>-	        [% FOREACH suploo IN suploop %]
>-	            [% IF ( suploo.selected ) %]
>-	            <option value="[% suploo.id %]" selected="selected" >
>-	            [% ELSE %]
>-	            <option value="[% suploo.id %]">
>-	            [% END %]
>-	                [% suploo.name %]
>-	                ([% suploo.count %])
>-	            </option>
>-	        [% END %]
>-	    </select>
>-        <input type="submit" value="OK" />
>-        [% IF ( phone ) %]Phone: [% phone %][% END %]
>-        [% IF ( booksellerfax ) %]Fax: [% booksellerfax %][% END %]
>-        [% IF ( bookselleremail ) %]</p><p><a href="mailto:[% bookselleremail %]">[% bookselleremail %]</a>[% END %]
>-    </fieldset>
>-</form>
>-
>-   [% IF ( missingissues ) %]	
>-    <h3>Missing issues</h3>
>-    <form action="claims.pl" onsubmit="return false;">
>-	<fieldset class="rows">
>-	<legend>Filters :</legend>
>-	
>-	<ol>
>-	<li>
>-	    <label for="statusfilter">Status : </label>
>-	    <select id="statusfilter" onchange="filterByStatus();">
>-		<option value="all" selected="selected">(All)</option>
>-		<option>Expected</option>
>-		<option>Arrived</option>
>-		<option>Late</option>
>-		<option>Missing</option>
>-		<option>Claimed</option>
>-	    </select>
>-	</li>
>-	
>-	<li>
>-	    <label for="titlefilter">Title : </label>
>-	    <input id="titlefilter" type="text" />
>-	    <label for="branchfilter">Library: </label>
>-	    <select id="branchfilter" onchange="filterByBranch();">
>-            [% FOREACH branchloo IN branchloop %]
>-                [% IF ( branchloo.selected ) %]
>-                <option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>
>-                [% ELSE %]
>-                <option value="[% branchloo.value %]">[% branchloo.branchname %]</option>
>-                [% END %]
>-            [% END %]
>-        </select>
>-	</li>
>-	
>-	<li>
>-	    <label for="begindate">From</label>
>-        <img src="[% themelang %]/lib/calendar/cal.gif" id="begindatebutton" style="cursor: pointer;" alt="Show calendar" title="Show Calendar" />
>-	    <input type="text" name="begindate" id="begindate" value="[% begindate %]" size="10" maxlength="10" />
>-	    <script type="text/javascript">
>-		 //<![CDATA[ 
>-		Calendar.setup({
>-		    inputField	: "begindate", 
>-		    button		: "begindatebutton",
>-		    ifFormat	: "[% DHTMLcalendar_dateformat %]"
>-		});
>-		//]]>
>-	    </script>
>-
>-	    <label for="enddate" style="float:none;">To</label>
>-        <img src="[% themelang %]/lib/calendar/cal.gif" id="enddatebutton" style="cursor: pointer;" alt="Show calendar" title="Show Calendar" />
>-	    <input type="text" name="enddate" id="enddate" value="[% enddate %]" size="10" maxlength="10" />
>-	    <script type="text/javascript">
>-		 //<![CDATA[ 
>-		 Calendar.setup({
>-		    inputField      : "enddate", 
>-		    button          : "enddatebutton",
>-		    ifFormat        : "[% DHTMLcalendar_dateformat %]"
>-		});
>-		//]]>
>-	    </script> <span class="hint">[% INCLUDE 'date-format.inc' %]</span>
>-	    <input type="button" value="OK" onclick="filterByDate();" />
>-        </li>
>-	
>-	<li>
>-        <input type="reset" value="Clear filters" onclick="clearFilters();" />
>-	</li>
>-	</ol>
>-	</fieldset>
>-    </form>
>-
>-    <fieldset>
>-	<form action="claims.pl" method="post" class="checkboxed" onsubmit="return checkForm()">
>-        <input type="hidden" name="order" value="[% order %]" />
>-         <table id="claimst">
>-                <thead><tr>
>-                    [% IF ( letter ) %]
>-                    <th><input type="checkbox" id="CheckAll"></th>
>-                    [% END %]
>-                    <th>Vendor</th>
>-                    <th>Library</th>
>-                    <th>Title</th>
>-                    <th>Issue number</th>
>-                    <th>Status</th>
>-                    <th>Since</th>
>-                    <th>Claim date</th>
>-                <th>Begin claim</th>
>-                </tr></thead>
>-                <tbody>[% FOREACH missingissue IN missingissues %]
>-                    <tr>
>-                        [% IF ( letter ) %]
>-                            <td>
>-                    <input type="checkbox" name="serialid" value="[% missingissue.serialid %]" />
>-                            </td>
>-                        [% END %]
>-                        <td>
>-                        [% missingissue.name %]
>-                        </td>
>-                        <td>
>-                        [% missingissue.branchcode %]
>-                        </td>
>-                        <td>
>-                        <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% missingissue.subscriptionid %]">[% missingissue.title |html %]</a>
>-                        </td>
>-                        <td>
>-                        [% missingissue.serialseq %]
>-                        </td>
>-                        <td>
>-                            [% IF ( missingissue.status1 ) %]Expected[% END %]
>-                            [% IF ( missingissue.status2 ) %]Arrived[% END %]
>-                            [% IF ( missingissue.status3 ) %]Late[% END %]
>-                            [% IF ( missingissue.status4 ) %]Missing[% END %]
>-                            [% IF ( missingissue.status7 ) %]Claimed[% END %]
>-                        </td>
>-                        <td class="planneddate">
>-                        [% missingissue.planneddate %]
>-                        </td>
>-                        <td>
>-                        [% missingissue.claimdate %]
>-                        </td>
>-                        <td>
>-                            <a href="/cgi-bin/koha/serials/lateissues-excel.pl?supplierid=[% missingissue.supplieri %]&amp;serialid=[% missingissue.serialid %]&amp;op=claims">Export item data</a>
>-                        </td>
>-                    </tr>
>-                [% END %]</tbody>
>-            </table>
>-	     <p><span class="exportSelected"></span></p>
>-
>-[% IF ( letter ) %]
>-        <fieldset class="action"> <label for="letter_code">Select notice:</label>
>-            <select name="letter_code" id="letter_code">
>-                [% FOREACH letter IN letters %]
>-                    <option value="[% letter.code %]">[% letter.name %]</option>
>-                [% END %]
>-			</select>
>-	    <input type="hidden" name="op" value="send_alert" /><input type="submit" name="submit" class="button" value="Send notification" /></fieldset>
>-            [% END %]
>-        </form>
>-    </fieldset>
>-[% END %]
>-
>-[% ELSE %]
>-
>-<div id="doc" class="yui-t7">
>-   <div id="bd">
>-	
>-[% IF ( supplierloop ) %]
>-        [% FOREACH supplierloo IN supplierloop %]
>-        [% IF ( supplierloo.name ) %]
>-        <p><b>[% supplierloo.name %]</b><br />
>-        [% END %]
>-        [% IF ( supplierloo.postal ) %]
>-        [% supplierloo.postal %]<br />
>-        [% END %]
>-        [% IF ( supplierloo.contphone ) %]
>-        Ph: [% supplierloo.contphone %]<br />
>-        [% END %]
>-        [% IF ( supplierloo.contfax ) %]
>-        Fax: [% supplierloo.contfax %]<br />
>-        [% END %]
>-        [% IF ( supplierloo.contemail ) %]
>-        Email: [% supplierloo.contemail %]<br />
>-        [% END %]
>-        [% IF ( supplierloo.accountnumber ) %]
>-        A/C: [% supplierloo.accountnumber %]</p>
>-        [% END %]
>-        [% IF ( supplierloo.contact ) %]
>-        <p>Dear [% supplierloo.contact %]</p>
>-        [% ELSE %]
>-        <p>To whom it may concern</p>
>-        [% END %]
>-        <p>The following items have not been received from you and are now considered missing:</p>
>-        [% END %]
>-[% END %]
>-        [% IF ( missingissues ) %]
>-        <h3>Missing issues</h3>
>-        <table>
>-            <tr>
>-                <td><b>Vendor<b></td>
>-                <td><b>Title</b></td>
>-                <td><b>Issue number</b></td>
>-                <td><b>Missing since</b></td>
>-            </tr>
>-            [% FOREACH missingissue IN missingissues %]
>-                <tr>
>-                    <td>
>-                    [% missingissue.name %]
>-                    </td>
>-                    <td>
>-                    [% missingissue.Title |html %]
>-                    </td>
>-                    <td>
>-                    [% missingissue.serialseq %]
>-                    </td>
>-                    <td>
>-                    [% missingissue.planneddate %]
>-                    </td>
>-                </tr>
>-            [% END %]
>-        </table>
>-        [% END %]
>-
>-<p class="noprint"><a href="#" onclick="window.print(); return false;">Print</a> &nbsp; <a href="#" class="close">Close</a></p>
>-[% END %]
>-
>-</div>
>-</div>
>-
>-[% UNLESS ( preview ) %]
>-<div class="yui-b">
>-[% INCLUDE 'serials-menu.inc' %]
>-</div>
>-[% END %]
>-</div>
>-[% INCLUDE 'intranet-bottom.inc' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt
>index a677e29..911e239 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt
>@@ -1,97 +1,21 @@
>-[% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Serials &rsaquo; [% title |html %] &rsaquo; [% IF ( op ) %]Create Routing List[% ELSE %]Edit routing list[% END %]</title>
>-[% INCLUDE 'doc-head-close.inc' %]
>-<script language="javascript" type="text/javascript">
>-
>-</script>
>-</head>
>-<body id="ser_routing" class="ser">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'serials-search.inc' %]
>+<p>When on the subscription page you will see a link to the left that reads 'Create Routing List.'</p>
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid %]"><i>[% title |html %]</i></a> &rsaquo; [% IF ( op ) %]Create Routing List[% ELSE %]Edit routing list[% END %]</div>
>+<p>Clicking that link will bring you to the menu to add a new routing list.</p>
> 
>-<div id="doc3" class="yui-t2">
>-   
>-   <div id="bd">
>-	<div id="yui-main">
>-	<div class="yui-b">
>+<p>From here you want to click 'Add recipients' in order to add people to the routing list. In the menu that appears you can filter patrons by part of their name, their library and/or patron category.</p>
> 
>+<p>Clicking 'Add' to the right of each name will add them to the routing list. When you have chosen all of the people for the list, click the 'Close' link to be redirected to the routing list.</p>
> 
>-[% IF ( op ) %]
>-<h1>Create routing list for <i>[% title |html %]</i></h1>
>-[% ELSE %]
>-<h1>Edit routing list for <i>[% title |html %]</i></h1>
>-[% END %]
>+<p>If the list looks the way you expect it to, then click 'Save'. Next you will be brought to a preview of the routing list. To print the list click 'Save and preview routing slip.' This will open a printable version of the list.</p>
> 
>-<form method="post" action="routing.pl">
>-<input type="hidden" name="op" value="save" />
>-<input type="hidden" name="subscriptionid" value="[% subscriptionid %]" />
>-<fieldset class="rows">
>-	<ol>
>-		<li><label for="date_selected">Issue: </label>
>-<select name="date_selected" id="date_selected">
>-[% FOREACH date IN dates %]
>-[% IF ( date.selected ) %]<option value="[% date.serialseq %] ([% date.planneddate %])" selected="selected">[% date.serialseq %] ([% date.planneddate %])</option>[% ELSE %]<option value="[% date.serialseq %] ([% date.planneddate %])">[% date.serialseq %] ([% date.planneddate %])</option>[% END %]
>-[% END %]
>-</select> [% issue %]</li>
>+<p>If RoutingListAddReserves is set to on then patrons listed in the routing list will automatically be added to the holds list for the issue.</p>
> 
>-[% IF memberloop %]
>-<li><span class="label">Recipients:</span><table style="clear:none;margin:0;">
>-        <tr><th>Name</th>
>-            <th>Rank</th>
>-            <th>Delete</th>
>-        </tr>
>-        [% USE m_loop = iterator(memberloop) %]
>-        [% FOREACH member IN m_loop %]
>-        <tr><td>[% member.name %]</td>
>-            <td>
>-                <select name="itemrank" onchange="reorder_item([%- subscriptionid -%], [%- member.routingid -%], this.option[this.selectedIndex].value)">
>-                [% rankings = [1 .. m_loop.size] %]
>-                [% FOREACH r IN rankings %]
>-                    [% IF r == member.ranking %]
>-                      <option selected="selected" value="[% r %]">[% r %]</option>
>-                    [% ELSE %]
>-                      <option value="[% r %]">[% r %]</option>
>-                    [% END %]
>-                [% END %]
>-                </select>
>-            </td>
>-            <td><a href="/cgi-bin/koha/serials/routing.pl?routingid=[% member.routingid %]&amp;subscriptionid=[% subscriptionid %]&amp;op=delete">Delete</a></td>
>-        </tr>
>-        [% END %]
>-        </table><p style="margin-left:10em;"><a onclick="search_member([% subscriptionid %]); return false"
>-href="/cgi-bin/koha/serials/member-search.pl?subscriptionid=[% subscriptionid %]" class="button">Add recipients</a> &nbsp; <a
>-href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscriptionid %]&amp;op=delete" class="button">Delete all</a></p></li>
>-[% ELSE %]
>-<li><span class="label">Recipients:</span>
>-    <a onclick="search_member([% subscriptionid %]); return false" href="/cgi-bin/koha/serials/member-search.pl?subscriptionid=[% subscriptionid %]" class="button">Add recipients</a></li>
>-[% END %]
>+<p><strong>See the full documentation for Routing Lists in the <a href="http://manual.koha-community.org/3.8/en/routinglist.html">manual</a> (online).</strong></p>
> 
>-	<li><label for="notes">Notes:</label><textarea name="notes" id="notes" rows="3" cols="50">[% routingnotes %]</textarea></li>
>-	</ol>
>-
>-</fieldset>
>-<fieldset class="action"><input type="submit" name="submit" value="Save" /></fieldset>
>-</form>
>-
>-
>-</div>
>-</div>
>-
>-<div class="yui-b">
>-[% INCLUDE 'serials-menu.inc' %]
>-</div>
>-</div>
>-[% INCLUDE 'intranet-bottom.inc' %]
>+[% INCLUDE 'help-bottom.inc' %]
>\ No newline at end of file
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
>index a478461..45916df 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt
>@@ -1,279 +1,15 @@
>-[% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Serials &rsaquo; Serial collection information for [% bibliotitle %]</title>
>-[% INCLUDE 'doc-head-close.inc' %]
>+[% INCLUDE 'help-top.inc' %]
> 
>-<script type="text/javascript">
>-//<![CDATA[
>-function print_slip(subscriptionid,issue){
>-    var myurl = 'routing-preview.pl?ok=1&subscriptionid='+subscriptionid+'&issue='+issue;
>-    window.open(myurl,'PrintSlip','width=500,height=500,toolbar=no,scrollbars=yes');
>-}
>-function addsubscriptionid()
>-{
>-	var tab=new Array();
>-    var serialids = document.edition.serialid;
>-    for (i=0; i<serialids.length; i++){
>-      if (serialids[i].checked == true){
>-        var found=false;
>-        for (var val in tab){
>-          if (tab[val] == document.getElementsByName("subs")[i].getAttribute('val')){found = true;}
>-        }
>-        if (found == false){
>-          tab=tab.concat((document.getElementsByName("subs")[i].getAttribute('val')));
>-        }
>-      }
>-    }
>-    var string="";
>-    for (var val in tab){
>-      string = string + tab[val] + ",";
>-    }
>-    string=string.substring(0,string.length -1);
>-    document.edition.subscriptionid.value=string;
>-}
>-function popup(subscriptionid) {
>-    newin=window.open('subscription-renew.pl?mode=popup&subscriptionid='+subscriptionid,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
>-}
>+<h1>Serial Collection</h1>
> 
>-function generateNext(subscriptionid) {
>-	if(confirm(_("Do you really want to generate next serial?"))){
>-		document.location = 'serials-collection.pl?op=gennext&subscriptionid='+subscriptionid;
>-	}
>-}
>+<p>This page shows a short summary of the subscription along with all of the issues that have been received, are expected, or marked late.</p>
> 
>-$(document).ready(function() {
>-	$('#subscription_years > ul').tabs();
>-});
>- 
>+<p>From here you can choose to edit specific issue or receive new issues.</p>
> 
>-//]]>
>-</script>
>-</head>
>-<body id="ser_serials-collection" class="yui-skin-sam ser">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'serials-search.inc' %]
>+<p>To edit or receive an issue, simply check the box in the 'Edit' column and click the 'Edit Serial' button.</p>
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; Serial collection information for  <i>[% bibliotitle %]</i></div>
>+<p>If you are adding multiple issues at once or if the latest expected issue is late, you can click the 'Generate Next' button to generate the next issue based on the subscription pattern.</p>
> 
>-<div id="doc3" class="yui-t2">
>-   
>-   <div id="bd">
>-	<div id="yui-main">
>-	<div class="yui-b">
>+<p><strong>See the full documentation for Serials in the <a href="http://manual.koha-community.org/3.8/en/serials.html">manual</a> (online).</strong></p>
> 
>-
>-[% UNLESS ( popup ) %]
>-	[% INCLUDE 'serials-toolbar.inc' %]
>-
>-	<h1>Serial collection information for  <i>[% bibliotitle %]</i>
>-        [% IF location %] ([% location %] ) [% END %]
>-		[% IF ( callnumber ) %]callnumber: [% callnumber %][% END %]</h1>
>-[% END %]
>-
>-[% IF ( subscriptions ) %]
>-<table>
>-[% IF ( subscriptions.size == 1 ) %]
>-<caption> Subscription summary</caption>
>-[% ELSE %]
>-<caption> Subscription summaries</caption>
>-[% END %]
>-<tr>
>-  <th>Subscription num.</th>
>-  <th>Frequency</th>
>-  <th>Numbering pattern</th>
>-  <th>Library</th>
>-  <th>Call number</th>
>-  <th>Notes</th>
>-  [% IF ( routing && CAN_user_serials_routing ) %]<th>Routing</th>[% END %]
>-  <th>Renew</th>
>-</tr>
>-[% FOREACH subscription IN subscriptions %]
>-    [% UNLESS ( loop.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
>-      <td><a href="subscription-detail.pl?subscriptionid=[% subscription.subscriptionid %]"># [% subscription.subscriptionid %]</a> </td>
>-      <td>         [% IF ( subscription.periodicity1 ) %]
>-                        1/day
>-                [% END %]
>-                [% IF ( subscription.periodicity2 ) %]
>-                        1/week
>-                [% END %]
>-                [% IF ( subscription.periodicity3 ) %]
>-                        1/2 weeks
>-                [% END %]
>-                [% IF ( subscription.periodicity4 ) %]
>-                        1/3 weeks
>-                [% END %]
>-                [% IF ( subscription.periodicity5 ) %]
>-                        1/Month
>-                [% END %]
>-                [% IF ( subscription.periodicity6 ) %]
>-                        1/2 Months (6/year)
>-                [% END %]
>-                [% IF ( subscription.periodicity7 ) %]
>-                        1/quarter
>-                [% END %]
>-                [% IF ( subscription.periodicity8 ) %]
>-                        1/quarter
>-                [% END %]
>-                [% IF ( subscription.periodicity9 ) %]
>-                        2/year
>-                [% END %]
>-                [% IF ( subscription.periodicity10 ) %]
>-                        1/year
>-                [% END %]
>-                [% IF ( subscription.periodicity11 ) %]
>-                        1/2 years
>-                [% END %]</td>
>-           <td>
>-                [% IF ( subscription.numberpattern1 ) %]
>-                    Number
>-                [% END %]
>-                [% IF ( subscription.numberpattern2 ) %]
>-                    Volume, number, issue
>-                [% END %]
>-                [% IF ( subscription.numberpattern3 ) %]
>-                    Volume, number
>-                [% END %]
>-                [% IF ( subscription.numberpattern4 ) %]
>-                    Volume, issue
>-                [% END %]
>-                [% IF ( subscription.numberpattern5 ) %]
>-                    Number, issue
>-                [% END %]
>-                [% IF ( subscription.numberpattern6 ) %]
>-                    Seasonal only
>-                [% END %]
>-                [% IF ( subscription.numberpattern7 ) %]
>-                    None of the above
>-                [% END %]</td>
>-            <td> [% subscription.branchcode %]</td>
>-            <td> [% subscription.callnumber %]</td>
>-        <td> [% subscription.notes %]        [% IF ( subscription.subscriptionexpired ) %]<br /><span class="problem"> Subscription expired</span>
>-        [% END %]
>-        </td>
>-        [% IF ( routing && CAN_user_serials_routing ) %]
>-        <td>
>-            <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]">Edit routing list</a>
>-        </td>
>-        [% END %]
>-        [% IF ( subscription.abouttoexpire ) %]<td class="problem"> <a href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=[% subscription.subscriptionid %]" onclick="popup([% subscription.subscriptionid %]); return false;">Renew</a></td>
>-        [% ELSE %]
>-        [% IF ( subscription.subscriptionexpired ) %]<td class="problem"> <a href="/cgi-bin/koha/serials/subscription-renew.pl?subscriptionid=[% subscription.subscriptionid %]" onclick="popup([% subscription.subscriptionid %]); return false;">Renew</a></td>
>-        [% ELSE %]
>-        <td> &nbsp;</td>
>-        [% END %]
>-        [% END %]
>-
>-      </tr>
>-[% END %]
>-[% IF ( subscr ) %]
>-[% IF ( subscriptioncount > 1 ) %]
>-<tr ><td colspan="8">  <a href="serials-collection.pl?biblionumber=[% biblionumber %]">See any subscription attached to this biblio</a></td>
>-</tr>
>-[% END %]
>-[% END %]
>-</table>
>-[% END %]
>-
>-
>-[% IF ( years ) %]<form name="edition" action="serials-edit.pl" method="post">
>-<div id="subscription_years" class="toptabs numbered">
>-<ul>
>-	[% FOREACH year IN years %]
>-        [% IF ( year.year ) %]
>-            <li><a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% year.subscriptionid %]#subscription-year-[% year.year %]">[% year.year %]</a></li>
>-        [% END %]
>-    [% END %]
>-</ul>
>-
>- [% FOREACH year IN years %]
>-<div id="subscription-year-[% year.year %]">
>-    [% IF ( CAN_user_serials_receive_serials ) %]
>-        <p>
>-            <input type="submit" value="Edit serials" />&nbsp;
>-            <input type="button" value="Generate Next" onclick="javascript:generateNext([% subscriptionidlist %])" />
>-        </p>
>-    [% END %]
>-
>-        <table>
>-	  <tr>
>-[% IF ( subscriptions.size > 1 ) %]
>-                <th># Subs</th>
>-[% END %]
>-                <th>Date published
>-                </th>
>-                <th>Date received
>-                </th>
>-                <th>Number
>-                </th>
>-                <th>Status
>-                </th>
>-                <th>Notes
>-                </th>
>-                <th>Library
>-                </th>
>-                [% IF ( routing ) %]<th>Routing</th>[% END %]
>-                [% IF ( CAN_user_serials_receive_serials ) %]<th>Edit</th>[% END %]
>-            </tr>
>-      [% FOREACH serial IN year.serials %]
>-    [% UNLESS ( loop.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
>-[% IF ( subscriptions.size > 1 ) %]
>-                 <td><a href="serials-collection.pl?subscriptionid=[% serial.subscriptionid %]">[% serial.subscriptionid %]</a></td>
>-[% END %]
>-                <td>
>-                    [% serial.publisheddate %]
>-                </td>
>-                <td>
>-                    [% serial.planneddate %]
>-                </td>
>-                <td>
>-                    [% serial.serialseq %]
>-                </td>
>-                <td>
>-                    [% IF ( serial.status1 ) %]Expected[% END %][% IF ( serial.status2 ) %]Arrived[% END %][% IF ( serial.status3 ) %]Late[% END %][% IF ( serial.status4 ) %]Missing[% END %][% IF ( serial.status5 ) %]Not Available[% END %][% IF ( serial.status7 ) %]Claimed[% END %]
>-                </td>
>-                <td>
>-                    [% serial.notes %]
>-                </td>
>-                <td>
>-                    [% serial.branchcode %]
>-                </td>
>-                [% IF ( routing ) %]
>-                <td>
>-                    <a href="" onclick="print_slip([% serial.subscriptionid |html %], '[% serial.serialseq |html %] ([% serial.planneddate %])'); return false" >Print list</a>
>-                </td>
>-                [% END %]
>-            [% IF ( CAN_user_serials_receive_serials ) %]
>-                <td>
>-                  [% IF ( serial.cannotedit ) %]
>-                    disabled
>-                  [% ELSE %]
>-                    [% IF ( serial.subscriptionexpired ) %]
>-                    <input type="checkbox" name="serialid" value="[% serial.serialid %]" disabled="disabled" />
>-                    [% ELSE %]
>-                      [% IF ( serial.checked ) %]
>-                    <input type="checkbox" name="serialid" checked="checked" value="[% serial.serialid %]" />
>-                      [% ELSE %]
>-                    <input type="checkbox" name="serialid" value="[% serial.serialid %]" />
>-                      [% END %]           
>-                    [% END %]
>-                  [% END %]
>-                </td>
>-            [% END %]
>-            </tr>
>-      [% END %]
>-        </table>
>-    </div>
>-    [% END %]
>-  <input type="hidden" name="subscriptionid" value="[% subscriptionidlist %]" />
>-
>-</div>
>-</form>
>-[% END %]
>-
>-</div>
>-</div>
>-
>-<div class="yui-b">
>-[% INCLUDE 'serials-menu.inc' %]
>-</div>
>-</div>
>-[% INCLUDE 'intranet-bottom.inc' %]
>+[% INCLUDE 'help-bottom.inc' %]
>\ No newline at end of file
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
>index 7c82b48..f3f76fc 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
>@@ -1,443 +1,29 @@
>-[% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Serials &rsaquo; Serial edition [% bibliotitle %]</title>
>-[% INCLUDE 'doc-head-close.inc' %]
>-<script language="JavaScript" type="text/javascript">
>-//<![CDATA[
>-function popup(subscriptionid) {
>-	window.open("subscription-renew.pl?subscriptionid="+subscriptionid,"subscription_renewal",'width=700,height=400,toolbar=false,scrollbars=yes');
>-}
>+[% INCLUDE 'help-top.inc' %]
> 
>-function barcode_check(){
>-    [% IF ( count ) %]
>-    var count = [% count %];
>-    for(var i=1;i<=count;i++){
>+<h1>Recieving Serials</h1>
> 
>-        var barcodenum = "barcode"+i;
>-        var statusnum = "status"+i;
>-        var elembarcode = "document.getElementById('"+barcodenum+"')";
>-        var elemstatus = "document.getElementById('"+statusnum+"')";
>-// alert(elembarcode+"\n"+eval(elembarcode+".value));
>-// alert(elemstatus+"\n"+eval(elemstatus+".value"));
>-        if(eval(elembarcode+".value") =='' && eval(elemstatus+".value") == 2){
>-            var answer = confirm("Leave barcode blank?\n - Note: unable to change this later");
>-            if (answer){
>-                document.f.submit();
>-            } else {
>-                return false;
>-            }
>-        }
>-        if(eval(elembarcode+".value".indexOf('TEMP')) > 0 && eval(elemstatus+".value") == 2){
>-            var answer = confirm("A barcode was not entered.\nDo you want to put in a barcode\nor do you want to use a system generated barcode?");
>-            if (answer){
>-                document.f.submit();
>-            } else {
>-                return false;
>-            }
>-        }
>-    }
>-    [% END %]
>-}
>-function unHideItems(index,labelindex, serialId) {
>-	subfield = document.getElementById(index);
>-	subfield.style.display = 'block';
>-	label = document.getElementById(labelindex);
>-	label.style.display='none';	
>+<p>Issues can be marked as received from several locations. To find a subscription, use the search box at the top of the Serials page to search for the serial you'd like to receive issues for</p>
> 
>-	// Prefilling 995$h with serial enumeration/issue number
>-	// Getting item id
>-	itemid = $("fieldset#" + index + " div.cataloguing_additem_itemlist div.items").attr("id");
>-	// Getting subfield id
>-	subfieldid = "subfield" + itemid.substr(4) + "h";
>-	// Setting text field 
>-	$("#" + subfieldid + " input[type='text']").val($("#serialseq" + serialId).val());
>+<p>From the search results you can click the 'Serial Receive' link or you can click on the subscription title and then click the 'Receive' button.</p>
> 
>-}
>-function HideItems(index,labelindex) {
>-	subfield = document.getElementById(index);
>-	subfield.style.display = 'none';
>-	label = document.getElementById(labelindex);
>-	label.style.display='block';	
>-}
>-function setStatus(serialid){
>-    $("#status"+serialid).val("2").attr("selected","selected");
>-}
>-function changeDate(elem, adate) {
>-    $(elem).closest('tr').find('#expecteddate').val(adate);
>-}
>-function changeDate2(adate) {
>-   var elem = document.getElementById("supexpecteddate");
>-    elem.value = adate;
>-}
>-function CloneSubfield(index){
>-    var original = document.getElementById(index); //original <div>
>-    var clone = original.cloneNode(true);
>-    var new_key = CreateKey();
>-    var old_id =  original.getAttribute('id');
>-    old_id=old_id.substr(12);
>-    var new_id  = old_id+new_key;
>-    
>-    // set the attribute for the new 'div' subfields
>-    var inputs     = clone.getElementsByTagName('input');
>-    var selects    = clone.getElementsByTagName('select');
>-    var textareas  = clone.getElementsByTagName('textarea');
>-        
>-    // input
>-    var id_input = "";
>-    for(var i=0,len=inputs.length; i<len ; i++ ){
>-        id_input = inputs[i].getAttribute('id')+new_key;
>-        inputs[i].setAttribute('id',id_input);
>-        inputs[i].setAttribute('name',inputs[i].getAttribute('name'));
>-    }
>-    
>-    // select 
>-    for(var i=0,len=selects.length; i<len ; i++ ){
>-        id_input = selects[i].getAttribute('id')+new_key;
>-        selects[i].setAttribute('id',selects[i].getAttribute('id')+new_key);
>-        selects[i].setAttribute('name',selects[i].getAttribute('name'));
>-    }
>-    
>-    // textarea
>-    for(var i=0,len=textareas.length; i<len ; i++ ){
>-        id_input = textareas[i].getAttribute('id')+new_key;
>-        textareas[i].setAttribute('id',textareas[i].getAttribute('id')+new_key);
>-        textareas[i].setAttribute('name',textareas[i].getAttribute('name'));
>-    }
>-    
>-    [% UNLESS ( advancedMARCEditor ) %]
>-    // when cloning a subfield, reset its label too.
>-    var label = clone.getElementsByTagName('label')[0];
>-    label.setAttribute('for',id_input);
>-    [% END %]
>-    
>-    // setting a new if for the parent div
>-    clone.setAttribute('id',new_id);
>-    
>-    var CloneButtonPlus;
>-    try {
>-      var spans = clone.getElementsByTagName('span');
>-      if(spans.length){
>-          for(var i = 0 ,lenspans = spans.length ; i < lenspans ; i++){
>-            if(spans[i].getAttribute('class') == 'buttonPlus'){
>-                    CloneButtonPlus = spans[i];
>-                    CloneButtonPlus.setAttribute('onclick',"CloneSubfield('" + new_id + "')");
>-                    var buttonUp = clone.getElementsByTagName('img')[0];
>-                    buttonUp.setAttribute('onclick',"upSubfield('" + new_id + "')");
>-                }
>-            }
>-        }
>-    }
>-    catch(e){
>-        // do nothig if ButtonPlus & CloneButtonPlus don't exist.
>-    }
>-    // insert this line on the page
>-    original.parentNode.insertBefore(clone,original.nextSibling);
>-}
>-$(document).ready(function() {
>-	$("form#serials_edit").submit(function() {
>-	    var total_errors = 0;
>-        $(".subfield_line:visible", this).each(function() {
>-            if ($("*[name=field_value]", this).val().length == 0 &&
>-                $("*[name=mandatory]", this).val() == 1) {
>-                total_errors++;
>-            }
>-        });
>-        if ( total_errors > 0 ) {
>-            var mes  = _("Form not submitted because of the following problem(s)");
>-            mes += "\n------------------------------------------------------------------------------------\n";
>-            mes += "\n- "+ total_errors+_(" mandatory fields empty (see bold subfields)");
>-            alert(mes);
>-            return false;
>-        }
>-    });
>-});
>-//]]>
>-</script>
>-<style type="text/css">#serials_edit fieldset.rows label, #serials_edit fieldset.rows span.label {
>-	font-size : 100%;
>-	width : 25%;
>-}
>-#serials_edit fieldset.rows select { max-width : 15em; }
>-#serials_edit fieldset.rows li {
>-	padding-bottom : 3px;
>-}
>-#serials_edit .input_marceditor {
>-	width : auto;
>-}</style>
>-</head>
>-<body id="ser_serials-edit" class="ser">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'serials-search.inc' %]
>+<p>The final way to receive serials is from the 'Serial Collection' page. To the left of the Subscription summary page there is a menu with a link to 'Serial Collection'</p>
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; Serial edition <i>[% bibliotitle %] [% IF ( callnumber ) %]([% callnumber %])[% END %]</i></div>
>+<p>From the page that opens up you can click 'Edit Serial' with the issue you want to receive checked.</p>
> 
>-<div id="doc3" class="yui-t2">
>-   
>-   <div id="bd">
>-	<div id="yui-main">
>-	<div class="yui-b">
>+<p>All three of these options will open up the issue receive form:</p>
> 
>-<h1>Serial edition <i>[% bibliotitle %]</i>
>-	[% IF location %] ( [% location %] ) [% END %]
>-    [% IF ( callnumber ) %] callnumber: [% callnumber %][% END %]</h1>
>-<form method="post" name="f" action="serials-edit.pl" id="serials_edit">
>-
>-
>-[% IF ( Errors ) %]
>-<div class="dialog alert">
> <ul>
>-[% IF ( barcode_not_unique ) %]<li>Error: Barcode not unique for [% FOREACH errse IN errseq %]serialseq [% errse.serialseq %]<br/>[% END %]</li>[% END %]
>+	<li>Choose 'Arrived' from the status pull down to mark a serial as received.</li>
>+	<li>If you have decided to have an item record created for each issue an item add form will appear</li>
>+	<li>If your issue has a supplemental issue with it, fill in the Supplemental Issue information.</li>
>+	<li>If you have decided to have an item record created for each issue an item add form will appear for your supplement and for the issue itself</li>
>+	<li>Once you have entered your info you can click 'Save'</li>
> </ul>
>-</div>
>-[% END %]
>-
>-    <input type="hidden" name="op" value="serialchangestatus" />
>-    [% FOREACH subscription IN subscriptions %]
>-    <input type="hidden" name="subscriptionid" value="[% subscription.subscriptionid %]" />
>-    [% END %]
>-	<table>
>-	<tr>
>-		<th>Numbered</th>
>-		<th>Published on</th>
>-		<th>Expected on</th>
>-		<th>Status</th>
>-		<th>Notes</th>
>-	</tr>
>-[% FOREACH serialslis IN serialslist %]
>-    [% UNLESS ( loop.odd ) %]
>-    <tr class="highlight">
>-    [% ELSE %]
>-    <tr>
>-    [% END %]
>-        <td>
>-            <input type="hidden" name="serialid" value="[% serialslis.serialid %]" />
>-            <input type="hidden" name="biblionumber" value="[% serialslis.biblionumber %]" />
>-            <input type="hidden" name="itemcount" value="[% serialslis.issuesatonce %]" />
>-            <input type="hidden" name="user" value="[% serialslis.librarian %]" />
>-            Issue <input type="text" name="serialseq" id="serialseq[% serialslis.serialid %]" value="[% serialslis.serialseq %]" size="20" maxlength="100" />
>-        </td>
>-        <td>
>-            <input type="text" name="publisheddate" value="[% serialslis.publisheddate %]" size="10" maxlength="15" />
>-        </td>
>-        <td>
>-            <input type="text" id="expecteddate" name="planneddate" value="[% serialslis.planneddate %]" size="10" maxlength="15" />
>-        </td>
>-        <td>
>-            [% IF ( serialslis.editdisable ) %]
>-              <input type="hidden" name="status" id="status[% serialslis.serialid %]" value="1">
>-              <select name="status" size="1"  disabled="disabled">
>-            [% ELSE %]
>-              [% IF ( serialslis.serialsadditems ) %]
>-              <select name="status" size="1" id="status[% serialslis.serialid %]" onchange="if (this.value==2){unHideItems('items'+[% serialslis.subscriptionid %][% serialslis.serialid %],'label[% serialslis.subscriptionid %][% serialslis.serialid %]','[% serialslis.serialid %]'); changeDate(this, '[% serialslis.arriveddate %]')} else if (this.value==7){changeDate(this, '[% serialslis.arriveddate %]')} else { HideItems('items'+[% serialslis.subscriptionid %]+[% serialslis.serialid %],'label[% serialslis.subscriptionid %][% serialslis.serialid %]'); changeDate(this, '[% serialslis.planneddate %]')}" >
>-               [% ELSE %]
>-              <select name="status" size="1" id="status[% serialslis.serialid %]" onchange="if (this.value==2 || this.value==7){changeDate(this, '[% serialslis.arriveddate %]')} else {changeDate(this, '[% serialslis.planneddate %]')}" >
>-               [% END %] 
>-            [% END %]
>-  [% IF ( serialslis.status1 ) %]
>-                    <option value="1" selected="selected">Expected</option>
>-  [% END %]
>-  [% IF ( serialslis.status2 ) %]
>-                    <option value="2" selected="selected">Arrived</option>
>-  [% ELSE %]
>-                    <option value="2">Arrived</option>
>-  [% END %]
>-  [% IF ( serialslis.status3 ) %]
>-                    <option value="3" selected="selected">Late</option>
>-  [% ELSE %]
>-                    <option value="3">Late</option>
>-  [% END %]
>-  [% IF ( serialslis.status4 ) %]
>-                    <option value="4" selected="selected">Missing</option>
>-  [% ELSE %]
>-                    <option value="4">Missing</option>
>-  [% END %]
>-  [% IF ( serialslis.status7 ) %]
>-                    <option value="7" selected="selected">Claimed</option>
>-  [% ELSE %]
>-                    <option value="7">Claimed</option>
>-  [% END %]
>-  [% IF ( serialslis.status5 ) %]
>-                    <option value="5" selected="selected">Not available</option>
>-  [% ELSE %]
>-                    <option value="5">Not available</option>
>-  [% END %]
>-  [% IF ( serialslis.status6 ) %]
>-                    <option value="6" selected="selected">Delete</option>
>-  [% ELSE %]
>-                    <option value="6">Delete</option>
>-  [% END %]
>-            </select>
>-
>-        </td>
>-        <td>
>-            <input type="text" name="notes" value="[% serialslis.sernotes %]" size="20" maxlength="255" />
>-        </td>
>-    </tr>
>-  [% UNLESS ( serialslis.subscriptionexpired ) %]
>-  [% IF ( serialslis.serialsadditems ) %]
>-          <tr>
>-          <td colspan="5">
>-      <a id="label[% serialslis.subscriptionid %][% serialslis.serialid %]" style="color: grey; font-size: 80%; cursor: pointer;"  onclick="unHideItems('items[% serialslis.subscriptionid %][% serialslis.serialid %]','label[% serialslis.subscriptionid %][% serialslis.serialid %]',  '[% serialslis.serialid %]');setStatus([% serialslis.serialid %]);">
>-             Click to add item</a>
>-        <fieldset class="rows" style="display:none;" id="items[% serialslis.subscriptionid %][% serialslis.serialid %]">
>-        <legend><a style="cursor: pointer;"  onclick="HideItems('items[% serialslis.subscriptionid %][% serialslis.serialid %]','label[% serialslis.subscriptionid %][% serialslis.serialid %]')">
>-                Item</a>
>-        </legend>
>-          <div class="cataloguing_additem_itemlist">
>-        [% FOREACH item IN serialslis.items %]
>-        <div id="item[% item.serialid %][% item.countitems %]" class="items">
>-        <ol>[% FOREACH iteminformatio IN item.iteminformation %]<li>
>-               <div class="subfield_line" style="[% iteminformatio.hidden %];" id="subfield[% item.serialid %][% item.countitems %][% iteminformatio.subfield %][% iteminformatio.random %]">
>-                              
>-                <label>[% iteminformatio.subfield %] - [% IF ( iteminformatio.mandatory ) %]<b>[% END %][% iteminformatio.marc_lib %][% IF ( iteminformatio.mandatory ) %] *</b>[% END %]</label>
>-                [% iteminformatio.marc_value %]
>-                <input type="hidden" name="itemid" value="[% item.itemid %]" />
>-                <input type="hidden" name="kohafield" value="[% iteminformatio.kohafield %]" />
>-                <input type="hidden" name="tag" value="[% iteminformatio.tag %]" />
>-                <input type="hidden" name="subfield" value="[% iteminformatio.subfield %]" />
>-                <input type="hidden" name="mandatory" value="[% iteminformatio.mandatory %]" />
>-                [% IF ( iteminformatio.ITEM_SUBFIELDS_ARE_NOT_REPEATABLE ) %]
>-                    <span class="buttonPlus" onclick="CloneSubfield('subfield[% item.serialid %][% item.countitems %][% iteminformatio.subfield %][% iteminformatio.random %]')">+</span>
>-                [% END %]
>-        
>-            </div></li>
>-        [% END %]</ol></div>
>-        
>-        <input type="hidden" name="moditem" value="" /> 
>-        <input type="hidden" name="tag" value="[% item.itemtagfield %]" />
>-        <input type="hidden" name="subfield" value="[% item.itemtagsubfield %]" />
>-        <input type="hidden" name="serial" value="[% item.serialid %]" />
>-        <input type="hidden" name="bibnum" value="[% item.biblionumber %]" />
>-        <input type="hidden" name="itemid" value="[% item.itemid %]" />
>-        <input type="hidden" name="field_value" value="[% item.itemnumber %]" />
>-        [% END %] 
>-        </div>
>-        </fieldset>
>-    </td>
>-    </tr>
>-  [% END %]
>-  [% END %]
>-[% END %]
>-[% FOREACH newserialloo IN newserialloop %]
>-    [% UNLESS ( newserialloo.subscriptionexpired ) %]
>-    <tr>
>-        <td>
>-            <input type="hidden" name="serialid" value="NEW" />
>-            <input type="hidden" name="biblionumber" value="[% newserialloo.biblionumber %]" />
>-            <input type="hidden" name="itemcount" value="[% newserialloo.issuesatonce %]" />
>-            <input type="hidden" name="user" value="[% newserialloo.librarian %]" />
>-            Supplemental issue <input type="text" name="serialseq" id="serialseq[% newserialloo.serialid %]" value="" size="20" maxlength="100" onchange="if (this.value!=''){unHideItems('items[% newserialloo.subscriptionid %][% newserialloo.serialid %]','label[% newserialloo.subscriptionid %][% newserialloo.serialid %]', '[% newserialloo.serialid %]')} else {HideItems('items[% newserialloo.subscriptionid %][% newserialloo.serialid %]','label[% newserialloo.subscriptionid %][% newserialloo.serialid %]')}" />
>-        </td>
>-        <td>
>-            <input type="text" name="publisheddate" value="[% newserialloo.publisheddate %]" size="10" maxlength="15" />
>-        </td>
>-        <td>
>-            <input type="text" name="planneddate" id="supexpecteddate" value="[% newserialloo.planneddate %]" size="10" maxlength="15" />
>-        </td>
>-        <td>
>-            <select name="status" size="1" id="addstatus[% newserialloo.serialid %]" onchange="if (this.value==2){unHideItems('items'+'[% newserialloo.subscriptionid %][% newserialloo.serialid %]','label[% newserialloo.subscriptionid %][% newserialloo.serialid %]','[% newserialloo.serialid %]'); changeDate2('[% newserialloo.arriveddate %]')} else if (this.value==7){changeDate('[% newserialloo.arriveddate %]')} else { HideItems('items'+'[% newserialloo.subscriptionid %]'+[% newserialloo.serialid %],'label[% serialslis.subscriptionid %][% serialslis.serialid %]'); changeDate2('[% serialslis.planneddate %]')}" >
> 
>-                    <option value="">----</option>
>-  [% IF ( newserialloo.status1 ) %]
>-                    <option value="1" selected="selected">Expected</option>
>-  [% END %]
>-  [% IF ( newserialloo.status2 ) %]
>-                    <option value="2" selected="selected">Arrived</option>
>-  [% ELSE %]
>-                    <option value="2">Arrived</option>
>-  [% END %]
>-  [% IF ( newserialloo.status3 ) %]
>-                    <option value="3" selected="selected">Late</option>
>-  [% ELSE %]
>-                    <option value="3">Late</option>
>-  [% END %]
>-  [% IF ( newserialloo.status4 ) %]
>-                    <option value="4" selected="selected">Missing</option>
>-  [% ELSE %]
>-                    <option value="4">Missing</option>
>-  [% END %]
>-  [% IF ( newserialloo.status7 ) %]
>-                    <option value="7" selected="selected">Claimed</option>
>-  [% ELSE %]
>-                    <option value="7">Claimed</option>
>-  [% END %]
>-  [% IF ( newserialloo.status5 ) %]
>-                    <option value="5" selected="selected">Not available</option>
>-  [% ELSE %]
>-                    <option value="5">Not available</option>
>-  [% END %]
>-  [% IF ( newserialloo.status6 ) %]
>-                    <option value="6" selected="selected">Delete</option>
>-  [% ELSE %]
>-                    <option value="6">Delete</option>
>-  [% END %]
>-            </select>
>+<p>If you are receiving multiple issues at once, or have marked an issue as 'Late' or 'Missing' there you can click the 'Generate Next' button below the list of issues.</p>
> 
>-        </td>
>-        <td>
>-            <input type="text" name="notes" value="" size="20" maxlength="255" />
>-        </td>
>-    </tr>
>-  [% IF ( newserialloo.serialsadditems ) %]
>-          <tr>
>-          <td colspan="5">
>-      <a id="label[% newserialloo.subscriptionid %][% newserialloo.serialid %]" style="color: grey; font-size: 80%; cursor: pointer;"  onclick="unHideItems('items[% newserialloo.subscriptionid %][% newserialloo.serialid %]','label[% newserialloo.subscriptionid %][% newserialloo.serialid %]', '[% newserialloo.serialid %]')">
>-             Click to add item</a>
>-        <fieldset  class="rows" style="display:none;" id="items[% newserialloo.subscriptionid %][% newserialloo.serialid %]">
>-        <legend><a style="cursor: pointer;"  onclick="HideItems('items[% newserialloo.subscriptionid %][% newserialloo.serialid %]','label[% newserialloo.subscriptionid %][% newserialloo.serialid %]')">
>-                Item</a>
>-        </legend>
>-          <div class="cataloguing_additem_itemlist">
>-        <div id="item[% newserialloo.serialid %][% newserialloo.countitems %]" class="items">
>-        <ol>[% FOREACH iteminformatio IN newserialloo.iteminformation %]<li>
>-               <div class="subfield_line" style="[% iteminformatio.hidden %];" id="subfield[% newserialloo.serialid %][% newserialloo.countitems %][% iteminformatio.subfield %][% iteminformatio.random %]">
>-   
>-                <label>[% iteminformatio.subfield %] - [% IF ( iteminformatio.mandatory ) %]<b>[% END %][% iteminformatio.marc_lib %][% IF ( iteminformatio.mandatory ) %] *</b>[% END %]</label>
>-                [% iteminformatio.marc_value %]
>-                <input type="hidden" name="itemid" value="[% newserialloo.itemid %]" />
>-                <input type="hidden" name="kohafield" value="[% iteminformatio.kohafield %]" />
>-                <input type="hidden" name="tag" value="[% iteminformatio.tag %]" />
>-                <input type="hidden" name="subfield" value="[% iteminformatio.subfield %]" />
>-                <input type="hidden" name="mandatory" value="[% iteminformatio.mandatory %]" />
>-                [% IF ( iteminformatio.ITEM_SUBFIELDS_ARE_NOT_REPEATABLE ) %]
>-                    <span class="buttonPlus" onclick="CloneSubfield('subfield[% newserialloo.serialid %][% newserialloo.countitems %][% iteminformatio.subfield %][% iteminformatio.random %]')">+</span>
>-                [% END %]
>-        </div>
>-       </li>[% END %]</ol>
>-        
>-        <input type="hidden" name="moditem" value="" /> 
>-        <input type="hidden" name="tag" value="[% newserialloo.itemtagfield %]" />
>-        <input type="hidden" name="subfield" value="[% newserialloo.itemtagsubfield %]" />
>-        <input type="hidden" name="serial" value="[% newserialloo.serialid %]" />
>-        <input type="hidden" name="bibnum" value="[% newserialloo.biblionumber %]" />
>-        <input type="hidden" name="itemid" value="[% newserialloo.itemid %]" />
>-        <input type="hidden" name="field_value" value="[% newserialloo.itemnumber %]" />
>-        </div>
>-        </div>
>-        </fieldset>
>-    </td>
>-    </tr>
>-  [% END %]
>-  [% END %]
>-[% END %]
>+<p>Clicking this button will generate the next issue for you and mark the previously expected issue as 'Late' automatically. You can then check the 'Edit' box to the right of each issue and edit the status on multiple issues at once.</p>
> 
>-</table>
>-    <fieldset class="action"><input type="submit" value="Save"  class="button" accesskey="w" />
>-</form>
>+<p><strong>See the full documentation for Receiving a Serial in the <a href="http://manual.koha-community.org/3.8/en/receiveissues.html">manual</a> (online).</strong></p>
> 
>-</div>
>-</div>
>-
>-<div class="yui-b">
>-[% INCLUDE 'serials-menu.inc' %]
>-<ul>
>-    [% FOREACH subscription IN subscriptions %]
>-        <li><a href="serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]" title="serial collection for [% subscription.bibliotitle %]">Serial collection #[% subscription.subscriptionid %]</a></li>
>-        <li><a href="subscription-detail.pl?subscriptionid=[% subscription.subscriptionid %]" title="detail of the subscription">Subscription #[% subscription.subscriptionid %]</a></li>
>-        [% IF ( subscription.abouttoexpire ) %]
>-            <li><a href="#" onclick="javascript:popup([% subscription.subscriptionid %])">Renew #[% subscription.subscriptionid %]</a></li>
>-        [% END %]
>-    [% END %]
>-    <li><a href="/cgi-bin/koha/catalogue/[% default_bib_view %].pl?biblionumber=[% biblionumber %]" title="go to [% bibliotitle %]">Show biblio</a></li></ul>
>-</div>
>-</div>
>-[% INCLUDE 'intranet-bottom.inc' %]
>+[% INCLUDE 'help-bottom.inc' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt
>index 1fdf693..d4ee4f5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-home.tt
>@@ -1,159 +1,12 @@
>-[% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Serials [% biblionumber %]</title>
>-<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
>-[% INCLUDE 'doc-head-close.inc' %]
>-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
>-[% INCLUDE 'datatables-strings.inc' %]
>-<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
>-<script type="text/javascript">
>-//<![CDATA[
>- $(document).ready(function() {
>-    var srlt = $("#srlt").dataTable($.extend(true, {}, dataTablesDefaults, {
>-        "aoColumnDefs": [
>-            { "aTargets": [ -1, -2, -3 ], "bSortable": false, "bSearchable": false },
>-        ],
>-        "sPaginationType": "four_button"
>-    } ) );
>+[% INCLUDE 'help-top.inc' %]
> 
>-    srlt.fnAddFilters("filter", 750);
>- });
>- //]]>
>-</script>
>-</head>
>-<body id="ser_serials-home" class="ser">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'serials-search.inc' %]
>+<h1>Serials</h1>
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; [% IF ( done_searched ) %]<a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; Search results[% ELSE %]Serials [% END %] </div>
>+<p>The serials module assists in managing your serial subscriptions (journals, magazines, and newspapers).</p>
> 
>-<div id="doc3" class="yui-t2">
>-   
>-   <div id="bd">
>-	<div id="yui-main">
>-	<div class="yui-b">
>-	[% INCLUDE 'serials-toolbar.inc' %]
>-	
>-[% IF ( information ) %]
>-Serials updated :
>-<table>
>-  <tr>
>-    <th>
>-      Serialseq
>-    </th>
>-    <th>
>-      Status
>-    </th>
>-    <th>
>-      Published date
>-    </th>
>-    <th>
>-      Planned date
>-    </th>
>-    <th>
>-      Notes
>-    </th>
>-  </tr>  
>-[% FOREACH informatio IN information %]
>-  <tr>
>-    <td>
>-      [% informatio.serialseq %]
>-    </td>
>-    <td>
>-      [% informatio.status %]
>-    </td>
>-    <td>
>-      [% informatio.publisheddate %]
>-    </td>
>-    <td>
>-      [% informatio.planneddate %]
>-    </td>
>-    <td>
>-      [% informatio.notes %]
>-    </td>
>-  </tr>  
>-[% END %]
>-</table>
>-[% END %]
>-        [% IF ( done_searched ) %]
>-<h2>Serials subscriptions</h2>
>+<p>You can search for existing subscriptions by using the search box at the top of the page. You can search for any part of the serial title or ISSN.</p>
> 
>-    <table id="srlt">
>-	<thead>
>-        <tr>
>-            <th>ISSN</th>
>-            <th>Title</th>
>-            <th> Notes </th>
>-            <th>
>-                Library (callnumber)
>-            </th>
>-            [% IF ( routing && CAN_user_serials_routing ) %]
>-              <th>Routing list</th>
>-            [% END %]        
>-            <th>&nbsp;</th>
>-            <th>&nbsp;</th>
>-        </tr>
>-	</thead>
>-    <tfoot>
>-        <tr>
>-            <td><input type="text" class="filter" data-column_num="0" placeholder="Search ISSN" /></td>
>-            <td><input type="text" class="filter" data-column_num="1" placeholder="Search title" /></td>
>-            <td><input type="text" class="filter" data-column_num="2" placeholder="Search notes" /></td>
>-            <td><input type="text" class="filter" data-column_num="3" placeholder="Search library" /></td>
>-            [% IF ( routing && CAN_user_serials_routing ) %]<td></td>[% END %]
>-            <td></td>
>-            <td></td>
>-        </tr>
>-    </tfoot>
>-	<tbody> 
>-        [% FOREACH subscription IN subscriptions %]
>-            <tr>
>-                <td>
>-                [% IF ( subscription.issn ) %][% subscription.issn %]
>-                [% END %]
>-                </td>
>-                <td><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscription.subscriptionid %]" class="button" title="subscription detail">[% subscription.title |html %]</a>
>-                </td>
>-                <td>[% IF ( subscription.notes ) %][% subscription.notes %][% END %]
>-                [% IF ( subscription.internalnotes ) %]([% subscription.internalnotes %])[% END %]
>-                </td>
>-                <td>
>-                [% IF ( subscription.branchname ) %][% subscription.branchname %][% END %]
>-                [% IF ( subscription.callnumber ) %]([% subscription.callnumber %])[% END %]
>-                </td>
>-                [% IF ( routing && CAN_user_serials_routing ) %]
>-                <td>
>-                    [% IF ( subscription.cannotedit ) %]
>-                        &nbsp;
>-                    [% ELSE %]
>-                        [% IF ( subscription.routingedit ) %]
>-                            <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]">Edit</a>
>-                        [% ELSE %]
>-                            <a href="/cgi-bin/koha/serials/routing.pl?subscriptionid=[% subscription.subscriptionid %]&amp;op=new">New</a>
>-                        [% END %]
>-                    [% END %]
>-                </td>
>-                [% END %]
>-                <td><a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]">Issue history</a>
>-                </td>
>-                <td>
>-                [% IF ( subscription.cannotedit ) %]
>-                  &nbsp;        
>-                [% ELSE %]
>-                  [% IF ( CAN_user_serials_receive_serials ) %]<a href="/cgi-bin/koha/serials/serials-edit.pl?subscriptionid=[% subscription.subscriptionid %]&amp;serstatus=1,3,7">Serial receive</a>[% END %]
>-                [% END %]
>-                </td>
>-            </tr>
>-        [% END %]
>-	</tbody>
>-    </table>
>-    
>-        [% END %]
>+<p><strong>See the full documentation for Serials in the <a href="http://manual.koha-community.org/3.8/en/serials.html">manual</a> (online).</strong></p>
> 
>-</div>
>-</div>
>+[% INCLUDE 'help-bottom.inc' %]
> 
>-<div class="yui-b">
>-[% INCLUDE 'serials-menu.inc' %]
>-</div>
>-</div>
>-[% INCLUDE 'intranet-bottom.inc' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
>index 3312f7f..247ded7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
>@@ -1,1450 +1,89 @@
>-[% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Serials &rsaquo; [% IF ( modify ) %][% bibliotitle |html %] &rsaquo; Modify subscription[% ELSE %]New subscription[% END %]</title>
>-[% INCLUDE 'doc-head-close.inc' %]
>-[% INCLUDE 'calendar.inc' %]
>+[% INCLUDE 'help-top.inc' %]
>+
>+<h1>Add A New Serial Subscription</h1>
>+
>+<p>Subscriptions can be added by clicking the 'New' button on any bibliographic record or by visiting the Serials module and clicking 'New Subscription'</p>
>+
>+<p>If you are entering a new subscription from the Serials module you will be presented with a blank form (if creating new from a bibliographic record the form will include the bib info).</p>
>+
>+<ul>
>+	<li>'Librarian' field will show the logged in librarian's username</li>
>+	<li>'Vendor' can be found by either searching vendors entered via the Acquisitions module or entering the vendor ID number
>+<ul>
>+	<li>Vendor information is not required</li>
>+	<li>In order to claim missing and late issues you need to enter vendor information</li>
>+</ul>
>+</li>
>+	<li>'Biblio' is the MARC record you'd like to link this subscription to
>+<ul>
>+	<li>This can be done by searching for an existing record by clicking on the 'Search for Biblio' link below the boxes or by entering the bib number for a record in the first box. Only if you search with the field between the parenthesis.</li>
>+</ul>
>+</li>
>+	<li>Next you can choose whether a new item is created when receiving an issue</li>
>+	<li>'Location' is for the shelving location</li>
>+	<li>'Call Number' is for your item's call number prefix</li>
>+	<li>'Library' is the library that owns this subscription.
>+<ul>
>+	<li>If more than one library subscribes to this serial you will need to create a subscription for each library</li>
>+	<li>This can be done easily by using the 'Edit as New (Duplicate)' option found on the subscription information page and changing only the 'Library' field</li>
>+</ul>
>+</li>
>+	<li>The 'Grace Period' is the number of days before an issue is automatically moved from 'expected' status to 'waiting' and how many days before an issue is automatically moved from 'waiting' status to 'late'</li>
>+	<li>Use the 'Public Note' for any notes you would like to appear in the OPAC for the patrons</li>
>+	<li>'Nonpublic Note' should be used for notes that are only visible to the librarians via the staff client</li>
>+	<li>To set up a routing list for serials, choose 'Routing List' from the 'Patron notification' field.
>+<ul>
>+	<li>For this option to appear you need to make sure that you have a Routing List notice set up in the Notices Tool</li>
>+	<li>Learn more about Routing Lists later in this manual</li>
>+</ul>
>+</li>
>+	<li>The Staff and OPAC Display options allow you to control how many issues appear by default on bibliographic records in the Staff Client and the OPAC
>+<ul>
>+	<li>If no values are entered in these fields, they will use the OPACSerialIssueDisplayCount and StaffSerialIssueDisplayCount system preference values</li>
>+</ul>
>+</li>
>+	<li>In 'First issue publication date' you want to enter the date of the issue you have in your hand, the date from which the prediction pattern will start</li>
>+	<li>There are several pre-defined options for the 'Frequency' of publication
>+<ul>
>+	<li>Without periodicy: some very specific (usually high level science journals) don't have a true periodicity. When you subscribe to the title, you subscribe for 6 issues, which can arrive in 1 year... or 2... There is no regularity or known schedule.</li>
>+	<li>Unknown select this if none of the other choices are relevant</li>
>+	<li>Irregular: The journal is not "regular" but has a periodicity. You know that it comes out on January, then in October and December, it is irregular, but you know when it's going to arrive.</li>
>+	<li>2/day: Twice daily</li>
>+	<li>1/day: Daily</li>
>+	<li>3/week: Three times a week</li>
>+	<li>1/week: Weekly</li>
>+	<li>1/ 2 weeks: Twice monthly (fortnightly)</li>
>+	<li>1/ 3 weeks: Tri-weekly</li>
>+	<li>1/month: Monthly</li>
>+	<li>1/ 2 months (6/year): Bi-monthly</li>
>+	<li>1/ 3 months (1/quarter): Quarterly</li>
>+	<li>1/quarter (seasonal) : Quarterly related to seasons (ie. Summer, Autumn, Winter, Spring)</li>
>+	<li>2/year: Half yearly</li>
>+	<li>1/year: Annual</li>
>+	<li>1/ 2 years: Bi-annual</li>
>+</ul>
>+</li>
>+	<li>Checking the 'Manual history' box will allow you to enter serials outside the prediction pattern.</li>
>+	<li>'Numbering pattern' will help you determine how the numbers are printed for each issue
>+<ul>
>+	<li>Start with the numbering on the issue you have in hand, the numbering that matches the date you entered in the 'First issue publication' field</li>
>+	<li>If you have chosen any 'Numbering Format' other than 'Number' in the 'Rollover at' field, enter the last issue number before the volume number changes
>+<ul>
>+	<li>If you chose the 'Number' Numbering Format you will see 'issues expected' in which you will enter the total number of issues you expect to receive.</li>
>+</ul>
>+</li>
>+	<li>You can choose to create your own numbering pattern by choosing 'None of the above' and clicking the 'Show/Hide Advanced Pattern' button at the bottom of the form</li>
>+</ul>
>+</li>
>+	<li>'Subscription start date' is the date at which the subscription begins. This is used for setting up renewal alerts</li>
>+	<li>'Subscription length' is the number of issues or months in the subscription. This is also used for setting up renewal alerts</li>
>+	<li>'Subscription end date' should only be entered for subscriptions that have ended (if you're entering in a backlog of serials)</li>
>+	<li>The 'Numbering formula' is editable to match the way you'd like your numbering to print on the item record and subscription information pages</li>
>+</ul>
>+
>+<p>Click 'Save Subscription' to save the information you have entered.</p>
>+
>+<p><strong>See the full documentation for Adding a Subscription in the <a href="http://manual.koha-community.org/3.8/en/serials.html#newsubscription">manual</a> (online).</strong></p>
>+
>+[% INCLUDE 'help-bottom.inc' %]
> 
>-<style type="text/css">
>-fieldset.rows li.radio { width: 100%; } /* override staff-global.css */
>-.yui-u li p label.widelabel {
>-    width: 300px;  /* not enough for IE7 apparently */
>-}
>-</style>
>-<script type="text/javascript">
>-//<![CDATA[
>-
>-// the english words used in display purposes
>-var text = new Array(_("Number"),_("Volume"),_("Issue"),_("Month"),_("Week"),_("Starting with:"),_("Rollover at:"),_("Choose Hemisphere:"),_("Northern"),_("Southern"),
>-_("Autumn"),_("Winter"),_("Spring"),_("Summer"),_("Fall"),_("Season"),_("Year"));
>-var weekno_label = _("Week # ");
>-var is_season = 0;
>-var is_hemisphere = 1;
>-var irregular_issues;   // will hold irregularity object.
>-
>-function formatDate(myDate) {
>-    var d = new Array( myDate.getFullYear(), myDate.getMonth() + 1 ,myDate.getDate());
>-    if(d[1].toString().length == 1) { d[1] = '0'+d[1] };
>-    if(d[2].toString().length == 1) { d[2] = '0'+d[2] };
>-    [% IF ( dateformat_us ) %]
>-        return(d[1] + '/' + d[2] + '/' + d[0]) ;
>-    [% ELSIF ( dateformat_metric ) %]
>-        return(d[2] + '/' + d[1] + '/' + d[0]) ;
>-    [% ELSE %]
>-        return(''+d[0] + '-' + d[1] + '-' + d[2]) ;
>-    [% END %]    
>-}
>-
>-Date.prototype.addDays = function(days) {
>-    this.setDate(this.getDate()+days);
>-}
>-
>-function getWeeksArray(startDate,periodicity) {
>-// returns an array of syspref-formatted dates starting at the first day of startDate's year.
>-// This prediction method will not accurately predict irregularites beyond the first year.
>-// FIXME : Should replace with ajax query to get the first Monday of the year so that week numbers have correct dates.
>-    var incr=1;
>-    if(periodicity==3) {  // 1/2 wks
>-        incr=2;
>-    } else if(periodicity == 4) { // 1/3 wks
>-        incr=3;
>-    }
>-    var weeksArray = new Array;
>-    var jan01 = new Date();
>-    jan01.setDate(1);
>-    jan01.setMonth(0);
>-    jan01.setFullYear(startDate.getFullYear());
>-    for(var i=0;i<52;i++) {
>-        weeksArray[i] = formatDate(jan01) + ' ' + weekno_label + (i + 1);
>-        jan01.addDays( 7 ); 
>-    }
>-    return weeksArray;
>-}
>-
>-function YMDaToYWDa(S) {
>-    with (new Date(Date.UTC(S[0], S[1] - 1, S[2]))) {
>-        var DoW = getUTCDay();
>-        setUTCDate(getUTCDate() - (DoW + 6) % 7 + 3);
>-        var ms = valueOf();
>-        setUTCMonth(0, 4);
>-        var WN = Math.round((ms - valueOf()) / 604800000) + 1;
>-        return [getUTCFullYear(), WN, DoW == 0 ? 7 : DoW];
>-    }
>-}
>-function dayofyear(d) { // d is a Date object
>-var yn = d.getFullYear();
>-var mn = d.getMonth();
>-var dn = d.getDate();
>-var d1 = new Date(yn,0,1,12,0,0); // noon on Jan. 1
>-var d2 = new Date(yn,mn,dn,12,0,0); // noon on input date
>-var ddiff = Math.round((d2-d1)/864e5);
>-return ddiff+1;
>-}
>-
>-
>-// create irregularity object.
>-function IrregularPattern() {
>-	this.months = new Array(_("January"),_("February"),_("March"),_("April"),_("May"),_("June"),_("July"),_("August"),_("September"),_("October"),_("November"),_("December"));
>-	this.seasons = new Array(_("Autumn"),_("Winter"),_("Spring"),_("Summer"),_("Fall"));
>-    this.daynames = new Array(_("Monday"),_("Tuesday"),_("Wednesday"),_("Thursday"),_("Friday"),_("Saturday"),_("Sunday"));
>-    // create weeks irregularity selection array:
>-    this.firstissue = new Date();
>-    this.firstissue.setDate(1);
>-    this.firstissue.setMonth(0);
>-    [% IF ( firstacquiyear ) %] // it's a mod, we already have a start date.
>-        this.firstissue.setFullYear( [% firstacquiyear %] );
>-    [% END %]
>-   	this.weeks = getWeeksArray(this.firstissue); 
>-
>-    this.numskipped = 0;
>-    // init:
>-	var irregular = '[% irregularity %]';
>-    this.skipped = irregular.split(',');
>-}
>-
>-IrregularPattern.prototype.update = function() {
>-		this.skipped= new Array;
>-		var cnt = 0;
>-		// daily periodicity, we interpret irregular array as which days of week to skip.
>-		// else if weekly periodicity, week numbers (starting from 01 Jan) to skip.
>-        // else  irregular array is list of issues to skip
>-		var summary_str = '';
>-		this.numskipped = 0;
>-        if(document.f.irregularity_select) {
>-            //$("#irregularity_select option:selected").each(...); //jquery can combine both conditionals and the for loop
>-            for( var i in document.f.irregularity_select.options ) {
>-                if( document.f.irregularity_select.options[i].selected ) {
>-                    this.skipped[cnt] = document.f.irregularity_select.options[i].value ;
>-                    summary_str += document.f.irregularity_select.options[i].text + "\n" ;
>-				    cnt++;
>-				    this.numskipped++;
>-			    }
>-		    }
>-		    var summary = document.getElementById("irregularity_summary");
>-		    if(summary) {
>-			    summary.value = summary_str;
>-			    summary.rows= ( cnt > 6 ) ? cnt : 6 ; // textarea will bre resized, but not more than 6 lines will show.
>-		    }
>-        }
>-}
>-
>-IrregularPattern.prototype.irregular = function(index) { 
>-	for( var i in this.skipped) {
>-			if( this.skipped[i] == index) {
>-				return true;
>-			}
>-	}
>-	return false;
>-}
>-
>-function init_pattern() {
>-	irregular_issues = new IrregularPattern();
>-}
>-function reset_pattern() {
>-	document.getElementById("numberpattern").value = '';
>-    document.getElementById("irregularity").innerHTML = '';
>-	init_pattern();
>-	reset_num_pattern();
>-}
>-
>-// common pre defined number patterns
>-function reset_num_pattern() {
>-var patternchoice = document.getElementById("numberpattern").value;
>-    switch(patternchoice){
>-    case "2":
>-        document.f.add1.value=1;
>-        document.f.add2.value=1;
>-        document.f.add3.value=1;
>-        document.f.every1.value=12;
>-        document.f.every2.value=1;
>-        document.f.every3.value=1;
>-        document.f.whenmorethan1.value=9999999;
>-        document.f.whenmorethan2.value=12;
>-        document.f.whenmorethan3.value=4;
>-        document.f.setto1.value=0;
>-        document.f.setto2.value=1;
>-        document.f.setto3.value=1;
>-        document.f.lastvalue1.value=1;
>-        document.f.lastvalue2.value=1;
>-        document.f.lastvalue3.value=1;
>-        document.f.numberingmethod.value=_("Vol {X}, No {Y}, Issue {Z}");
>-        moreoptions(text[1],text[0],text[2]);
>-        display_table(0); // toggle info box on (1) or off (0)
>-        break;
>-    case "3":
>-        document.f.add1.value=1;
>-        document.f.add2.value=1;
>-        document.f.add3.value='';
>-        document.f.every1.value=12;
>-        document.f.every2.value=1;
>-        document.f.every3.value='';
>-        document.f.whenmorethan1.value=9999999;
>-        document.f.whenmorethan2.value=12;
>-        document.f.whenmorethan3.value='';
>-        document.f.setto1.value=0;
>-        document.f.setto2.value=1;
>-        document.f.setto3.value='';
>-        document.f.lastvalue1.value=1;
>-        document.f.lastvalue2.value=1;
>-        document.f.lastvalue3.value='';
>-        document.f.numberingmethod.value=_("Vol {X}, No {Y}");
>-        moreoptions(text[1],text[0]);
>-        display_table(0);
>-        break;
>-    case "4":
>-        document.f.add1.value=1;
>-        document.f.add2.value=1;
>-        document.f.add3.value='';
>-        document.f.every1.value=12;
>-        document.f.every2.value=1;
>-        document.f.every3.value='';
>-        document.f.whenmorethan1.value=9999999;
>-        document.f.whenmorethan2.value=12;
>-        document.f.whenmorethan3.value='';
>-        document.f.setto1.value=0;
>-        document.f.setto2.value=1;
>-        document.f.setto3.value='';
>-        document.f.lastvalue1.value=1;
>-        document.f.lastvalue2.value=1;
>-        document.f.lastvalue3.value='';
>-        document.f.numberingmethod.value=_("Vol {X}, Issue {Y}");
>-        moreoptions(text[1],text[2]);
>-        display_table(0);
>-        break;
>-    case "5":
>-//        var d = new Date(document.f.firstacquidate.value);
>-//        var smonth = d.getMonth();
>-        document.f.add1.value=1;
>-        document.f.add2.value=1;
>-        document.f.add3.value='';
>-        document.f.every1.value=12;
>-        document.f.every2.value=1;
>-        document.f.every3.value='';
>-        document.f.whenmorethan1.value=9999999;
>-        document.f.whenmorethan2.value=12;
>-        document.f.whenmorethan3.value='';
>-        document.f.setto1.value=0;
>-        document.f.setto2.value=1;
>-        document.f.setto3.value='';
>-        document.f.numberingmethod.value=_("No {X}, Issue {Y}");
>-        moreoptions(text[0],text[2]);
>-        display_table(0);
>-        break;
>-    case "6":
>-        var d = new Date(document.f.firstacquidate.value);
>-        var sYear = d.getFullYear();
>-        moreoptions_seasons(text[15],sYear);
>-        var d = new Date(document.f.firstacquidate.value);
>-        var sYear = d.getFullYear();
>-        document.f.add1.value=1;
>-        document.f.add2.value='1';
>-        document.f.add3.value='';
>-        document.f.every1.value=4;
>-        document.f.every2.value='1';
>-        document.f.every3.value='';
>-        document.f.whenmorethan1.value=9999999;
>-        document.f.whenmorethan2.value='4';
>-        document.f.whenmorethan3.value='';
>-        document.f.setto1.value=0;
>-        document.f.setto2.value='1';
>-        document.f.setto3.value='';
>-        document.f.periodicity.value='8';
>-        document.f.numberingmethod.value=_("{Y} {X}");
>-        moreoptions_seasons(text[15],sYear);
>-        document.f.lastvalue1temp.value=document.f.lastvalue1.value=sYear;
>-        display_table(0);
>-        is_season = 1;
>-        break;
>-    case "7":
>-        display_table(1);
>-        document.getElementById("more_options").innerHTML = '';
>-        document.f.irreg_check.value=1; 
>-        break;
>-    case "8":  // Year/Number
>-        var d = (document.f.firstacquidate.value) ? new Date( document.f.firstacquidate.value) : new Date() ;
>-        var sYear = d.getFullYear();
>-        document.f.add1.value=1;
>-        document.f.add2.value=1;
>-        document.f.add3.value='';
>-        document.f.every1.value=12;
>-        document.f.every2.value=1;
>-        document.f.every3.value='';
>-        document.f.whenmorethan1.value=9999999;
>-        document.f.whenmorethan2.value=12;
>-        document.f.whenmorethan3.value='';
>-        document.f.setto1.value=0;
>-        document.f.setto2.value=1;
>-        document.f.setto3.value='';
>-        document.f.lastvalue1.value=sYear;
>-          switch (document.f.periodicity.value){
>-            case 1:              
>-              var doy = dayofyear(d);
>-              document.f.lastvalue2.value=doy; 
>-              document.f.whenmorethan2.value=365; 
>-              break;      
>-            case 12:     
>-              var doy = dayofyear(d);
>-              document.f.lastvalue2.value=doy*2; 
>-              document.f.whenmorethan2.value=730; 
>-              break;      
>-            case 2:
>-            case 3:
>-            case 4:
>-              var YWDa = YMDaToYWDa(d);
>-              document.f.lastvalue2.value=YWDA[1]/(document.f.periodicity.value-1); 
>-              break;      
>-            case 5:
>-              var smonth = d.getMonth();
>-              document.f.lastvalue2.value=smonth;
>-              break;      
>-            case 6:
>-              var smonth = d.getMonth();
>-              document.f.lastvalue2.value=smonth/2;
>-              document.f.whenmorethan2.value=6;
>-              break;      
>-            case 7:
>-            case 8:      
>-              var smonth = d.getMonth();
>-              document.f.lastvalue2.value=smonth/3;
>-              document.f.whenmorethan2.value=4;
>-              break;      
>-            case 9:                        
>-              var smonth = d.getMonth();
>-              document.f.lastvalue2.value=smonth/6;
>-              document.f.whenmorethan2.value=2;
>-              break;      
>-            default:
>-          } 
>-        document.f.lastvalue3.value='';
>-        document.f.numberingmethod.value=_("{X} / {Y}");
>-        moreoptions(text[16],text[0]);
>-     //   document.f.lastvalue1temp.value=sYear;
>-     //   document.f.lastvalue2temp.value=document.f.lastvalue2.value;
>-        display_table(0);
>-        break;
>-    default:
>-        document.f.add1.value=1;
>-        document.f.add2.value='';
>-        document.f.add3.value='';
>-        document.f.every1.value=1;
>-        document.f.every2.value='';
>-        document.f.every3.value='';
>-        document.f.whenmorethan1.value=9999999;
>-        document.f.whenmorethan2.value='';
>-        document.f.whenmorethan3.value='';
>-        document.f.setto1.value=0;
>-        document.f.setto2.value='';
>-        document.f.setto3.value='';
>-        document.f.lastvalue1.value=1;
>-        document.f.lastvalue2.value='';
>-        document.f.lastvalue3.value='';
>-        document.f.numberingmethod.value='{X}';
>-//        moreoptions_daily_check(text[0]);
>-        moreoptions(text[0]);
>-        document.f.irreg_check.value=1;
>-        display_table(0);
>-        break;
>-    }
>-}
>-
>-function display_table(n) {
>-    if(n==1){
>-        document.getElementById("basetable").style.display = 'block';
>-    } else if(n==0){
>-        document.getElementById("basetable").style.display = 'none';
>-    } else {
>-		var disp_val = ( document.getElementById("basetable").style.display == 'none' ) ? 'block' : 'none' ;
>-			document.getElementById("basetable").style.display = disp_val;
>-	}
>-}
>-
>-function set_num_pattern_from_template_vars() {
>-	if(!document.getElementById("numberpattern")){ return false; }
>-    document.getElementById("numberpattern").value = '[% numberpattern %]';
>-    reset_num_pattern();
>-    
>-    document.f.add1.value='[% add1 %]';
>-    document.f.add2.value='[% add2 %]';
>-    document.f.add3.value='[% add3 %]';
>-    document.f.every1.value='[% every1 %]';
>-    document.f.every2.value='[% every2 %]';
>-    document.f.every3.value='[% every3 %]';
>-    document.f.whenmorethan1.value='[% whenmorethan1 %]';
>-    document.f.whenmorethan2.value='[% whenmorethan2 %]';
>-    document.f.whenmorethan3.value='[% whenmorethan3 %]';
>-    document.f.setto1.value='[% setto1 %]';
>-    document.f.setto2.value='[% setto2 %]';
>-    document.f.setto3.value='[% setto3 %]';
>-    document.f.lastvalue1.value='[% lastvalue1 %]';
>-    document.f.lastvalue2.value='[% lastvalue2 %]';
>-    document.f.lastvalue3.value='[% lastvalue3 %]';
>-    document.f.numberingmethod.value='[% numberingmethod %]';
>-
>-    var more_strY;
>-    var more_strZ;
>-    [% IF ( add2 ) %]
>-    if([% add2 %] > 0){
>-        more_strY="Y";
>-    }
>-    [% END %]
>-    [% IF ( add3 ) %]
>-    if([% add3 %] > 0){
>-        more_strZ="Z";
>-    }
>-    [% END %]
>-    document.f.lastvalue1temp.value='[% lastvalue1 %]';
>-    if(more_strY){
>-        document.f.lastvalue2temp.value='[% lastvalue2 %]';
>-    document.f.whenmorethan2temp.value='[% whenmorethan2 %]';
>-    }
>-    if(more_strZ){
>-        document.f.lastvalue3temp.value='[% lastvalue3 %]';
>-    document.f.whenmorethan3temp.value='[% whenmorethan3 %]';
>-    }
>-}
>-
>-// a pre check with more options to see if 'number' and '1/day' are chosen
>-function moreoptions_daily_check(x) {
>-    var periodicity = document.f.periodicity.value;
>-    var errortext='';
>-    if(periodicity == 1){ // i.e. daily
>-        document.getElementById("irregularity").innerHTML = '';
>-        errortext =_("Please indicate which days of the week you DO NOT expect to receive issues.")+"<br \/>";
>-        for(var j=0;j<irregular_issues.daynames.length;j++){
>-            errortext +="<input type='checkbox' name='irregular' id='irregular"+(j+1)+"' value='"+(j+1)+"' />"+irregular_issues.daynames[j]+" &nbsp; ";
>-        }
>-        var error = errortext;
>-        moreoptions(x);
>-        document.getElementById("irregularity").innerHTML = error;
>-    } else {
>-        document.getElementById("irregularity").innerHTML = '';
>-        document.getElementById("more_options").innerHTML = '';
>-        moreoptions(x);
>-    }
>-}
>-
>-// to dispaly the more options section
>-function moreoptions(x,y,z){
>-document.getElementById("irregularity").innerHTML = '';
>-document.getElementById("more_options").innerHTML = '';
>-var textbox = '';
>-    // alert("X: "+x+"Y: "+y+"Z: "+z);
>-    if(x){
>-        textbox +="<table id='irregularity_table'>\n<tr><th>&nbsp;<\/th><th>"+x+"<\/th>";
>-        if(y){
>-            textbox +="<th>"+y+"<\/th>";
>-            if(z){
>-                textbox +="<th>"+z+"<\/th>";
>-            }
>-        }
>-        textbox +="<\/tr>\n";
>-        textbox +="<tr><th scope=\"row\">"+text[5]+"<\/td><td><input type='text' name='lastvalue1temp' id='lastvalue1temp' size='4' onkeyup='moreoptionsupdate(this)' value=\"" + document.f.lastvalue1.value +  "\" /><\/td>\n";
>-        if(y){
>-            textbox +="<td><input type=\"text\" name=\"lastvalue2temp\" id=\"lastvalue2temp\" size=\"4\" onkeyup=\"moreoptionsupdate(this)\" value=\"" + document.f.lastvalue2.value + "\" /><\/td>\n";
>-            if(z){
>-                textbox +="<td><input type=\"text\" name=\"lastvalue3temp\" id=\"lastvalue3temp\" size=\"4\" onkeyup=\"moreoptionsupdate(this)\" value=\"" + document.f.lastvalue3.value + "\" /><\/td>\n";
>-            }
>-        }
>-        textbox +="<\/tr>\n";
>-        if(y){
>-            textbox +="<tr><th scope=\"row\">"+text[6]+"<\/th>";
>-            textbox +="<td>&nbsp;<\/td>\n";
>-            textbox +="<td><input type=\"text\" name=\"whenmorethan2temp\" id=\"whenmorethan2temp\" size=\"4\" onkeyup=\"moreoptionsupdate(this,1)\"><\/td>\n";
>-            if(z){
>-                textbox +="<td><input type=\"text\" name=\"whenmorethan3temp\" id=\"whenmorethan3temp\" size=\"4\" onkeyup=\"moreoptionsupdate(this,1)\"><\/td>\n";
>-            }
>-            textbox +="<\/tr>";
>-        } else {
>-          textbox +="<tr> <td>"+_("issues expected")+"<\/td><td><input type=\"text\" name=\"issuesexpected1temp\" id=\"issuesexpected1temp\" size=\"4\" onkeyup=\"moreoptionsupdate(this,0)\" value=\"" + document.f.issuesexpected1.value + "\" ><\/td><\/tr>";
>-        }
>-        textbox +="<\/table>\n";
>-    }
>-    document.getElementById("more_options").innerHTML = textbox;
>-}
>-
>-function hemispheres(chosen){
>-var selbox = document.getElementById("season1");
>-    if(selbox){
>-    var selboxselected = selbox.options[selbox.selectedIndex].value;
>-    selbox.options.length = 0;
>-
>-    if ( (chosen == "1") || ( ! (chosen) && is_hemisphere == 1 )) {
>-        selbox.options[selbox.options.length] = new Option(text[11],'1');
>-        selbox.options[selbox.options.length] = new Option(text[12],'2');
>-        selbox.options[selbox.options.length] = new Option(text[13],'3');
>-        selbox.options[selbox.options.length] = new Option(text[14],'4');
>-        is_hemisphere = 1;
>-        selbox.options[selboxselected-1].selected = true;
>-    }
>-
>-    if ( (chosen == "2") || ( ! (chosen) && is_hemisphere == 2 )) {
>-        selbox.options[selbox.options.length] = new Option(text[13],'1');
>-        selbox.options[selbox.options.length] = new Option(text[10],'2');
>-        selbox.options[selbox.options.length] = new Option(text[11],'3');
>-        selbox.options[selbox.options.length] = new Option(text[12],'4');
>-        is_hemisphere = 2;
>-        selbox.options[selboxselected-1].selected = true;
>-    }
>-    }
>-}
>-
>-// to display the more options section for seasons
>-function moreoptions_seasons(x,y){
>-// x = 'Season'.  y = 'Year'.
>-document.getElementById("irregularity").innerHTML = '';
>-document.getElementById("more_options").innerHTML = '';
>-var textbox = '';
>-    //alert("X: "+x+"Year: "+y);
>-    if(x){
>-        var hemi_select = parseInt('[% hemisphere %]');
>-        textbox +="<li><label for=\"hemisphere\">"+ text[7]  +"<\/label><select name=\"hemisphere\" id=\"hemisphere\" onchange=\"hemispheres(this.options[this.selectedIndex].value)\">";
>-        for(var i = 1; i <= 2; i++){
>-            textbox +="<option value='"+i+"'";
>-            if(i == hemi_select){
>-                textbox += " selected "
>-            }
>-            textbox +=">"+text[i+7]+"<\/option>";
>-        }
>-        textbox +="<\/li>\n";
>-        textbox +="<table id=\"seasonal_irregularity\"><tr><th>&nbsp;<\/th><th>"+x+"<\/th>";
>-        textbox +="<th>"+text[16]+"<\/th>";
>-        textbox +="<\/tr>\n";
>-        textbox +="<tr><th scope=\"row\">"+text[5]+"<\/th><td><select name=\"lastvalue2temp\" id=\"lastvalue2temp\" id=\"season1\" onchange=\"moreoptionsupdate(this)\">";
>-        for(var j = 1; j <= 4; j++){
>-            textbox +="<option value='"+j+"'>"+text[j+9]+"<\/option>";
>-        }
>-        textbox +="<\/select><\/td>";
>-        var isyr = irregular_issues.firstissue;
>-        textbox += "<td>" + irregular_issues.firstissue.getFullYear() + "<\/td><\/tr>\n";
>-        textbox +="<tr><th scope=\"row\">"+text[6]+"<\/th>";
>-        textbox +="<td><input type=\"text\" name=\"whenmorethan2temp\" id=\"whenmorethan2temp\" size=\"4\" onkeyup=\"moreoptionsupdate(this,1)\"><\/td>\n";
>-        textbox +="<\/tr><\/table>\n";
>-    }
>-    document.getElementById("more_options").innerHTML = textbox;
>-}
>-
>-function irregularity_check(){
>-    document.f.irreg_check.value = 1; // Irregularity button now pushed
>-    var periodicity = document.f.periodicity.value;
>-	var rollover = document.f.issuesexpected1.value;
>-    if( (document.f.whenmorethan2) && ( document.f.whenmorethan2.value > 0) ){
>-      rollover = document.f.whenmorethan2.value;
>-    }
>-    if((document.f.whenmorethan3) && document.f.whenmorethan3.value > 0 ){
>-        // FIXME: Irregularity check assumes that the full prediction pattern repeats each year.
>-		//  In cases where the outermost periodicity is > 1 year,  
>-		//  e.g. where a volume spans two years, the irregularity check will be incorrect, 
>-        // but you can safely ignore the check, submit the form, and the prediction pattern should be correct.
>-		//  a way to distinguish between these two cases is needed.
>-		rollover = document.f.whenmorethan3.value * document.f.whenmorethan2.value;
>-    }
>-    var error='';
>-    var toobig;
>-    var expected; 
>-    var errortext = "<b>"+_("Warning irregularity detected")+"</b><br \/>";
>-    switch(periodicity){
>-    case "12":
>-        if(rollover < 730) expected =730;
>-        if(rollover > 730) {
>-            expectedover=730;
>-            toobig=1;
>-        }
>-        break;
>-    case "1":
>-        if(rollover < 365) expected =365;
>-        if(rollover > 365) {
>-            expectedover=365;
>-            toobig=1;
>-        }
>-        break;
>-    case "2":
>-        if(rollover < 52) expected =52;
>-        if(rollover > 52){
>-            expectedover=52;
>-            toobig=1;
>-        }
>-        break;
>-    case "3":
>-        if(rollover < 26) expected =26;
>-        if(rollover > 26){
>-            expectedover=26;
>-            toobig=1;
>-        }
>-        break;
>-    case "4":
>-        if(rollover < 17) expected =17;
>-        if(rollover > 17){
>-            expectedover=17;
>-            toobig=1;
>-        }
>-        break;
>-    case "5":
>-        if(rollover < 12) expected =12;
>-        if(rollover > 12){
>-            expectedover=12;
>-            toobig=1;
>-        }
>-        break;
>-    case "6":
>-        if(rollover < 6) expected =6;
>-        if(rollover > 6){
>-            expectedover=6;
>-            toobig=1;
>-        }
>-        break;
>-    case "7":
>-        if(rollover < 4) expected =4;
>-        if(rollover > 4){
>-            expectedover=4;
>-            toobig=1;
>-        }
>-        break;
>-    case "8":
>-        if(rollover < 4) expected =4;
>-        if(rollover > 4){
>-            expectedover=4;
>-            toobig=1;
>-        }
>-        break;
>-    case "9":
>-        if(rollover < 2) expected =2;
>-        if(rollover > 2){
>-            expectedover=2;
>-            toobig=1;
>-        }
>-        break;
>-    case "10":
>-        if(rollover < 1) expected =1;
>-        if(rollover > 1){
>-            expectedover=1;
>-            toobig=1;
>-        }
>-        break;
>-    default:
>-        break;
>-    }
>-    if(expected){
>-        if(expected == 365 || expected==730){  // what about leap years ?
>-			// FIXME:  We interpret irregularity as which days per week for periodicity==1.
>-			//  We need two cases: one in which we're published n days/week, in which case irregularity should be per week,
>-			//  and a regular daily pub, where irregularity should be per year.
>-            errortext += _("Please indicate which days of the week you DO NOT expect to receive issues.")+"<br \/>";
>-        } else {
>-            errortext +=expected+_(" issues expected, ")+rollover+_(" were entered.")+"<br \/>"+_("Please indicate which date(s) an issue is not expected")+"<br \/>";
>-            irregular_issues.numskipped = expected - rollover;
>-		}
>-        errortext +="<select multiple id=\"irregularity_select\" name=\"irregularity_select\" onchange=\"irregular_issues.update();\">\n";
>-		errortext +=irregular_options(periodicity);
>-		errortext += "<\/select>\n <textarea rows=\"6\" width=\"18\" id=\"irregularity_summary\" name=\"irregularity_summary\" value=\"foo\"><\/textarea>";
>-        error=errortext;
>-    }
>-    if(toobig){
>-        errortext +=expectedover+_(" issues expected, ")+rollover+_(" were entered")+"<p class=\"warning\">"+_("You seem to have indicated more issues per year than expected.<\/p>");
>-        error=errortext;
>-    }
>-    if(error.length ==0){
>-        error=_("No irregularities noticed");
>-    }
>-	display_example(expected);
>-    document.getElementById("irregularity").innerHTML = error;
>-	irregular_issues.update();
>-}
>-
>-function irregular_options(periodicity){
>-    var titles;
>-    var count;
>-    var errortext='';
>-    var numberpattern = document.getElementById('numberpattern').value;
>-    if(periodicity == 1) {
>-        expected = 7;
>-        titles = irregular_issues.daynames;
>-        count = 1;
>-    }
>-    if(periodicity == 2 || periodicity == 3 || periodicity == 4) { 
>-        titles = irregular_issues.weeks;
>-		count = 1;
>-        if(periodicity==3) {  // 1/2 wks
>-            expected = 26;
>-        } else if(periodicity == 4) { // 1/3 wks
>-            expected = 17;
>-        } else {
>-            expected = 52;
>-        }
>-    }
>-    if(periodicity == 5 || periodicity == 6 || periodicity == 7 || periodicity == 8 || periodicity == 9) {
>-        if(periodicity == 8 && numberpattern==8) {
>-            is_season = 1; // setting up from edit page
>-        } 
>-        if(is_season){
>-            titles = irregular_issues.seasons;
>-            expected = 4;
>-            if(is_hemisphere == 2){
>-                count = 2;
>-            } else {
>-                count = 1;
>-            }
>-        } else {
>-            titles = irregular_issues.months;
>-            expected = 12;
>-            count = 1;
>-        }
>-    }
>-	if( !expected) {
>-		return '';   // don't know how to deal with irregularity.
>-	} 	
>-    for(var j=0;j<expected;j++){   // rch - changed frrom (1..expected).
>-        if(isArray(titles)){
>-            if(count>expected){
>-                count = count-expected;
>-            }
>-            if(is_season && is_hemisphere == 1){
>-                errortext +="<option value='"+((count*3)-2)+"'>"+titles[j]+"<\/option>\n";
>-// alert("value: "+((count*3)-2)+" title: "+titles[j]);
>-            } else if(is_season && is_hemisphere == 2){
>-                errortext +="<option value='"+((count*3)-2)+"'>"+titles[j-1]+"<\/option>\n";
>-// alert("value: "+((count*3)-2)+" title: "+titles[j-1]);
>-            } else {  // all non-seasonal periodicities:
>-                var incr=1; // multiplier for ( 1/n weeks)  patterns; in this case the irreg calc relies on the week# , not the issue#.
>-                if(periodicity==3) {  // 1/2 wks
>-                    incr=2;
>-                } else if(periodicity == 4) { // 1/3 wks
>-                    incr=3;
>-                }
>-                errortext += "<option value='" + (1+j*incr) ;  
>-				if(irregular_issues.irregular(1+incr*j)) {
>-					errortext += "' selected='selected" ;
>-				}
>-				errortext += "'>"+titles[incr*j]+"<\/option>\n";
>-            }
>-            count++;
>-        } else { 
>-            errortext +="<option value='"+j+"'>"+titles+" "+j+"<\/option>\n";
>-        }
>-    }
>-    return errortext;
>-}
>-
>-
>-function display_example(expected){
>-    var startfrom1 = parseInt(document.f.lastvalue1.value);
>-    var startfrom2 = parseInt(document.f.lastvalue2.value);
>-    var startfrom3 = parseInt(document.f.lastvalue3.value);
>-    var every1 = parseInt(document.f.every1.value);
>-    var every2 = parseInt(document.f.every2.value);
>-    var every3 = parseInt(document.f.every3.value);
>-    var numberpattern = document.f.numberingmethod.value;
>-    var whenmorethan2 = parseInt(document.f.whenmorethan2.value);
>-    var whenmorethan3 = parseInt(document.f.whenmorethan3.value);
>-    var setto2 = parseInt(document.f.setto2.value);
>-    var setto3 = parseInt(document.f.setto3.value);
>-    var displaytext = _("Based on the information entered, the Numbering Pattern will look like this: ") + "<br \/><ul class=\"numpattern_preview\">";
>-    if(startfrom3>0){
>-        var count=startfrom3-1;
>-        var count2=startfrom2;
>-        for(var i = 0 ; i < 12; i++){
>-            if(count>=whenmorethan3){
>-                count=setto3;
>-                if(count2>=whenmorethan2){
>-                    startfrom1++;
>-                    count2=setto2;
>-                } else {
>-                    count2++;
>-                }
>-            } else {
>-                count++;
>-            }
>-            displaytext += '<li>' + numberpattern.replace(/{Z}/,count) + '<\/li>\n';
>-            displaytext = displaytext.replace(/{Y}/,count2);
>-            displaytext = displaytext.replace(/{X}/,startfrom1);
>-
>-        }
>-    }
>-    if(startfrom2>0 && !startfrom3){
>-        var count=startfrom2-1;
>-        for(var i=0;i<12;i++){
>-            if(count>=whenmorethan2){
>-                startfrom1++;
>-                count=setto2;
>-            } else {
>-                count++;
>-            }
>-
>-            if(is_season){
>-                if(is_hemisphere == 2){
>-                    if(count == 1) {
>-                        displaytext += numberpattern.replace(/{Y}/,text[count+12])+'\n';
>-                    } else {
>-                        displaytext += numberpattern.replace(/{Y}/,text[count+8])+'\n';
>-                    }
>-                } else {
>-                displaytext += numberpattern.replace(/{Y}/,text[count+10])+'\n';
>-                }
>-            } else {
>-                displaytext += numberpattern.replace(/{Y}/,count)+'\n';
>-            }
>-            displaytext = displaytext.replace(/{X}/,startfrom1)+'<br \/>\n';
>-        }
>-    }
>-    if(startfrom1>0 && !startfrom2 && !startfrom3){
>-        var offset=eval(document.f.issuesexpected1.value);
>-        if (!offset){
>-            offset = 12 
>-        }
>-        for(var i=startfrom1;i<(startfrom1+offset);i+=every1){
>-            displaytext += numberpattern.replace(/{X}/,i)+'<br \/>\n';
>-        }
>-    }
>-   //  displaytext = "<div style='padding: 5px; background-color: #CCCCCC'>"+displaytext+"<\/div>";
>-    document.getElementById("displayexample").innerHTML = displaytext;
>-}
>-
>-function isArray(obj) {
>-if (obj.constructor.toString().indexOf("Array") == -1)
>-    return false;
>-else
>-    return true;
>-}
>-
>-function moreoptionsupdate(inputfield,rollover){
>-    fieldname = inputfield.name;
>-    // find parent element in base table by stripping 'temp' from element name.
>-    basefield = document.getElementById(fieldname.slice(0,-4));
>-    var fieldnumber = fieldname.slice(-5,-4);
>-
>-    basefield.value = inputfield.value;
>-    var patternchoice = document.getElementById("numberpattern").value;
>-    switch(patternchoice){
>-    case "2":
>-    case "4":
>-    case "5":
>-    case "8": // Year, Number.  -- Why not just use Vol, Number withvol==year??
>-                //  FIXME: this my conflict with innerloop calc below.
>-       if (document.f.lastvalue2temp.value > 0){document.f.innerloop1.value = document.f.lastvalue2temp.value - 1;}
>-      break;   
>-    }  
>-    if(basefield.name.slice(0,-1) == 'lastvalue' || 'whenmorethan' ) {
>-        // The enumeration string is held in a positional numeral notation with three positions, X,Y,Z.
>-        // The last values lastvalue1, lastvalue2,lastvalue3 should match the last received serial's X,Y,Z enumeration.
>-        // make array indexes start with 1 for consistency with variable names.
>-        var innerloop = new Array( undefined, document.getElementById('innerloop1'), document.getElementById('innerloop2'), document.getElementById('innerloop3') );
>-        var lastvalue = new Array( undefined, document.getElementById('lastvalue1').value *1 , document.getElementById('lastvalue2').value *1 , document.getElementById('lastvalue3').value *1  );
>-        var every = new Array( undefined, document.getElementById('every1').value *1 , document.getElementById('every2').value *1 , document.getElementById('every3').value *1  );
>-        var add = new Array( undefined, document.getElementById('add1').value *1 , document.getElementById('add2').value *1 , document.getElementById('add3').value *1  );
>-        var whenmorethan = new Array( undefined, document.getElementById('whenmorethan1').value *1 , document.getElementById('whenmorethan2').value *1 , document.getElementById('whenmorethan3').value *1  );
>-        
>-       if(rollover){
>-       // calculate rollover  for higher level of periodicity.
>-       // if there are two levels of periodicity, (e.g. vol{X},num{Y},issue{Z}, then every1=every2*whenmorethan2 / add2 .
>-          for(var N=3;N>1;N--){
>-            if( add[N] > 0){
>-                var addN = (add[N]) ? add[N] : 1 ;
>-                var everyN = (document.getElementById('every'+N)) ? document.getElementById('every'+N).value : 1 ;
>-                document.getElementById('every'+(N-1)).value = whenmorethan[N] * everyN / addN ;
>-            }
>-          }
>-        }
>-        innerloop[3].value = ( every[3] > 1 ) ? lastvalue[3] % every[3] : 0 ;
>-        innerloop[2].value = ( every[2] > 1 ) ? lastvalue[3] - 1 : 0 ;
>-        innerloop[1].value = ( every[1] > 1 ) ? 
>-                                    ( whenmorethan[3] > 0 ) ?  (lastvalue[2] - 1) * every[2] + 1* innerloop[2].value 
>-                                                            : lastvalue[2] - 1
>-                                               : 0 ;
>-    }
>-     //FIXME : add checks for innerloop || lastvalue .gt. rollover  
>-}
>-
>-
>-function check_input(e){
>-    var unicode=e.charCode? e.charCode : e.keyCode
>-    if (unicode!=8 && unicode !=46 && unicode!=9 && unicode !=13){ // if key isn't backspace or delete
>-        if (unicode<48||unicode>57) { // if not a number
>-            alert(_("Needs to be entered in digit form -eg 10"));
>-            return false // disable key press
>-        }
>-    }
>-}
>-
>-function addbiblioPopup(biblionumber) {
>-	var destination = "/cgi-bin/koha/cataloguing/addbiblio.pl?mode=popup";
>-	if(biblionumber){ destination += "&biblionumber="+biblionumber; }
>- window.open(destination,'AddBiblioPopup','width=1024,height=768,toolbar=no,scrollbars=yes');
>-}
>-
>-function Plugin(f)
>-{
>-	 window.open('subscription-bib-search.pl','FindABibIndex','width=800,height=400,toolbar=no,scrollbars=yes');
>-}
>-
>-function FindAcqui(f)
>-{
>-	 window.open('acqui-search.pl','FindASupplier','width=800,height=400,toolbar=no,scrollbars=yes');
>-}
>-
>-function Find_ISSN(f)
>-{
>-	 window.open('issn-search.pl','FindABibIndex','width=800,height=400,toolbar=no,scrollbars=yes');
>-}
>-
>-
>-function Check(f) {
>-    if (f.aqbooksellerid.value.length==0) {
>-        input_box = confirm(_("If you wish to claim late or missing issues you must link this subscription to a vendor. Click OK to ignore or Cancel to return and enter a vendor"));
>-		if (input_box==true) {
>-		}
>-		else {
>-			return false;
>-		}
>-    }
>-	if (f.biblionumber.value.length==0) {
>-        alert(_("You must choose or create a biblio"));
>-    } else if(f.startdate.value.length != 0 && f.sublength.value > 0) {
>-        if (f.irreg_check.value == 1) {
>-            document.f.submit();
>-        } else {
>-            if(f.numbering_pattern.value == ''){
>-                alert(_("Please choose a numbering pattern"));
>-            } else {
>-                alert(_("Please check for irregularity by clicking 'Test Prediction Pattern'"));
>-            }
>-        }
>-    } else {
>-        alert(_("You must choose a start date and a subscription length"));
>-    }
>-	if(irregular_issues.numskipped < irregular_issues.skipped.length ) {
>-		alert(_("You have not accounted for all missing issues."));
>-	}
>-    return false;
>-}
>-
>-$(document).ready(function() {
>-    init_pattern();
>-	
>-	[% IF ( history ) %] $("#subscription_form_history").show();[% END %]
>-	$("#cancel_manual_history").click(function(){
>-		$("#subscription_form_history").hide();
>-		$("#manuallist").attr("checked","");
>-	});
>-   	$("#manuallist").click( function(){
>-		if($(this).attr("checked")){
>-			$("#subscription_form_history").show();
>-		} else {
>-			$("#subscription_form_history").hide();
>-		}
>-	}
>-	);
>-   //  $(".widelabel").attr("width", "300px");  // labels stay skinny in IE7 anyway.
>-[% IF ( modify ) %]
>-    set_num_pattern_from_template_vars();
>-    [% IF ( hemisphere ) %]
>-	is_hemisphere = [% hemisphere %] ;
>-    hemispheres();
>-    [% END %]
>-[% END %]
>-[% IF ( irregularity ) %]
>-    irregularity_check();
>-[% END %]
>-    $('#numberpattern').change( function() { 
>-        reset_num_pattern(); 
>-    });
>-
>-    var node;
>-    [% FOREACH field IN dont_export_field_loop %]
>-        node = $("#[% field.fieldid %]");
>-        if ( $(node).is('input') || $(node).is('textarea') ) {
>-            $(node).val("");
>-        } else if ( $(node).is('select') ) {
>-            $(node).find("option:first").attr('selected','selected');
>-        }
>-    [% END %]
>-});
>-//]]>
>-</script>
>-</head>
>-<body id="ser_subscription-add" class="ser">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'serials-search.inc' %]
>-
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; [% IF ( modify ) %]<a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid %]"><i>[% bibliotitle |html %]</i></a> &rsaquo; Modify subscription[% ELSE %]New subscription[% END %]</div>
>-
>-<div id="doc3" class="yui-t7">
>-   
>-   <div id="bd">
>-<h1>[% IF ( modify ) %] Modify subscription for <i>[% bibliotitle |html %]</i>[% ELSE %]Add a new subscription[% END %]</h1>
>-   <div class="yui-g">
>-    <form method="post" name="f" action="/cgi-bin/koha/serials/subscription-add.pl">
>-[% IF ( modify ) %]
>-        <input type="hidden" name="op" value="modsubscription" />
>-        <input type="hidden" name="subscriptionid" value="[% subscriptionid %]" />
>-[% ELSE %]
>-        <input type="hidden" name="op" value="addsubscription" />
>-[% END %]
>-<input type="hidden" name="user" value="[% loggedinusername %]" />
>-<input type="hidden" name="irreg_check" value="0" />
>-<input type="hidden" name="issuesexpected1" id="issuesexpected1" value="0" />
>-
>-	<div class="yui-u first">
>-    <fieldset id="subscription_add_information" class="rows">
>-	<legend>Subscription details</legend>
>-	<ol>
>-	    [% IF ( subscriptionid ) %]
>-        <li><span class="label">Subscription #</span> [% subscriptionid %]</li>
>-        [% END %]
>-        <li>
>-            <label for="aqbooksellerid">Vendor: </label>
>-            <input type="text" name="aqbooksellerid" id="aqbooksellerid" value="[% aqbooksellerid %]" size="8" /> (<input type="text" name="aqbooksellername" value="[% aqbooksellername %]" disabled="disabled" readonly="readonly" />) <a href="#" onclick="FindAcqui(f)">Search for a vendor</a>
>-        </li>
>-        <li>
>-            <label for="biblionumber" class="required" title="Subscriptions must be associated with a bibliographic record">Biblio:</label>
>-            
>-                <input type="text" name="biblionumber" id="biblionumber" value="[% bibnum %]" size="8" /> 
>-                (<input type="text" name="title" value="[% bibliotitle %]" disabled="disabled" readonly="readonly" />) <span class="required" title="Subscriptions must be associated with a bibliographic record">Required</span>
>-               <div class="inputnote"> <a href="#" onclick="Plugin(f)">Search for Biblio</a>
>-		    [% IF ( CAN_user_editcatalogue ) %] 
>-		       [% IF ( modify ) %]
>-		       | <a href="#" onclick="addbiblioPopup([% bibnum %]); return false;">Edit biblio</a>
>-		       [% ELSE %]
>-		       | <a href="#" onclick="addbiblioPopup(); return false;">Create Biblio</a>
>-		       [% END %]
>-		    [% END %]
>-	       </div>
>-            
>-        </li>
>-        <li class="radio">
>-            [% IF ( serialsadditems ) %]
>-                <p><input type="radio" id="serialsadditems-yes" name="serialsadditems" value="1" checked="checked" /><label class="widelabel" for="serialsadditems-yes">create an item record when receiving this serial</label></p>
>-                <p><input type="radio" id="serialsadditems-no" name="serialsadditems" value="0" /><label class="widelabel" for="serialsadditems-no">do not create an item record when receiving this serial </label></p>
>-            [% ELSE %]
>-                <p><input type="radio" id="serialsadditems-yes" name="serialsadditems" value="1"/><label class="widelabel" for="serialsadditems-yes">create an item record when receiving this serial</label></p>
>-                <p><input type="radio" id="serialsadditems-no" name="serialsadditems" value="0" checked="checked" /><label class="widelabel" for="serialsadditems-no">do not create an item record when receiving this serial</label></p>
>-            [% END %]
>-        </li>
>-        <li>
>-            <label for="branchcode">Library:</label>
>-            
>-                <select name="branchcode" id="branchcode" style="width: 20em;">
>-                    [% UNLESS ( Independantbranches ) %]<option value="">None</option>[% END %]
>-                    [% FOREACH branchloo IN branchloop %][% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>
>-				[% ELSE %]
>-				<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>
>-				[% END %]
>-                    [% END %]
>-                </select> (select a library)
>-            
>-        </li>
>-        <li>
>-            <label for="location">Location:</label>
>-            <select name="location" id="location">
>-                <option value="">None</option>
>-                [% FOREACH locations_loo IN locations_loop %][% IF ( locations_loo.selected ) %]<option value="[% locations_loo.authorised_value %]" selected="selected">[% locations_loo.lib %]</option>[% ELSE %]<option value="[% locations_loo.authorised_value %]">[% locations_loo.lib %]</option>[% END %][% END %]
>-            </select>
>-        </li>
>-         <li>
>-            <label for="callnumber">Call number:</label>
>-            <input type="text" name="callnumber" id="callnumber" value="[% callnumber %]" size="20" />
>-        </li>
>-        <li>
>-            <label for="graceperiod">Grace period:</label> <input type="text" name="graceperiod" id="graceperiod" value="[% graceperiod %]" size="5"/> day(s)
>-        </li>
>-        <li>
>-            <label for="notes">OPAC note:</label>
>-            <textarea name="notes" id="notes" cols="30" rows="2">[% notes %]</textarea>
>-        </li>
>-        <li>
>-            <label for="internalnotes">Nonpublic note:</label>
>-            <textarea name="internalnotes" id="internalnotes" cols="30" rows="2">[% internalnotes %]</textarea>
>-        </li>
>-        <li>
>-            
>-               [% IF ( letterloop ) %]
>-            <label for="letter">Patron notification: </label>
>-			   <select name="letter" id="letter">
>-                    <option value="">None</option>
>-                [% FOREACH letterloo IN letterloop %]
>-				[% IF ( letterloo.selected ) %]
>-                    <option value="[% letterloo.value %]" selected="selected">[% letterloo.lettername %]</option>
>-[% ELSE %]
>-                    <option value="[% letterloo.value %]">[% letterloo.lettername %]</option>
>-[% END %]
>-                [% END %]
>-                </select> 
>-                <div class="hint">Select a notice and subscribers will be notified when new issues are received.</div>
>-            	[% ELSE %]
>-            <span class="label">Patron notification: </span>
>-				<div class="hint">To notify patrons of new serial issues, you must <a href="/cgi-bin/koha/tools/letter.pl">define a notice</a>.</div>
>-				[% END %]
>-        </li>
>-		<li>
>-			 <label class="widelabel" for="staffdisplaycount">Number of issues to display to staff: </label>
>-			 <input type="text" name="staffdisplaycount" id="staffdisplaycount" value="[% staffdisplaycount %]" size="4"/>
>-		 </li>
>-		 <li>
>-            <label class="widelabel" for="opacdisplaycount">Number of issues to display in OPAC: </label>
>-			<input type="text" name="opacdisplaycount" id="opacdisplaycount" value="[% opacdisplaycount %]" size="4"/>
>-		</li>
>-	</ol>
>-	</fieldset>
>-	</div>
>-	
>-<div id="subscription_form_history" class="yui-u" style="display:none">
>-<div><h3 style="display:inline">Subscription history</h3> <a href="#" id="cancel_manual_history">[cancel manual history]</a></div>
>-        <p>Hint: you can update the serial history manually. This can be useful for an old subscription or to clean the existing history. Modify these fields with care, as future serial receive will continue to update them automatically.</p>
>-        <fieldset class="rows">
>-            <ol>
>-                <li>
>-                <label for="histstartdate">Subscription start date</label>
>-                <input type="text" name="histstartdate" id="histstartdate" value="[% histstartdate %]" /><div class="hint"> (start date of the 1st subscription)</div>
>-                </li>
>-                <li>
>-                <label for="histenddate">Subscription end date</label>
>-                <input type="text" name="histenddate" id="histenddate" value="[% histenddate %]" /> <div class="hint">(if empty, subscription is still active)</div>
>-                </li>
>-                <li>
>-                <label for="recievedlist">Received issues</label>
>-                <textarea name="recievedlist" id="recievedlist" cols="60" rows="5">[% recievedlist %]</textarea>
>-                </li>
>-                <li>
>-                <label for="missinglist">Missing issues</label>
>-                <textarea name="missinglist" id="missinglist" cols="60" rows="5">[% missinglist %]</textarea>
>-                </li>
>-                <li>
>-                <label for="opacnote">Note for OPAC</label>
>-                <textarea name="opacnote" id="opacnote" cols="60" rows="5">[% opacnote %]</textarea>
>-                </li>
>-                <li>
>-                <label for="librariannote">Note for staff</label>
>-                <textarea name="librariannote" id="librariannote" cols="60" rows="5">[% librariannote %]</textarea>
>-                </li>
>-            </ol>
>-        </fieldset>
>-    <fieldset class="action"><input type="submit" value="Save subscription history"  /></fieldset>
>-</div>
>-
>-<div class="yui-g">
>-<div id="subscription_form_planning">
>-	<fieldset class="rows">
>-	<legend>Serials planning</legend>
>-    <ol>
>-        <li>
>-           <label for="acqui_date"> First issue publication date:</label>
>-                [% UNLESS ( modify ) %]<img src="[% themelang %]/lib/calendar/cal.gif" id="acqui_button" style="cursor: pointer;" alt="Show Calendar" title="Show Calendar" />[% END %]
>-                [% IF ( modify ) %]<input type="text" name="firstacquidate" value="[% firstacquidate %]"  size="13" maxlength="10" id="acqui_date" disabled="disabled" />
>-                [% ELSE %]<input type="text" name="firstacquidate" value="[% firstacquidate %]"  size="13" maxlength="10" id="acqui_date" />[% END %]
>-        </li>
>-           [% IF ( modify ) %]<li><label for="next_acqui_date"> Next issue publication date:</label>
>-                <img src="[% themelang %]/lib/calendar/cal.gif" id="next_acqui_button" style="cursor: pointer;" alt="Show Calendar" title="Show Calendar" />
>-                <input type="text" name="nextacquidate" value="[% nextacquidate %]" size="13" maxlength="10" id="next_acqui_date" />
>-                </li>[% END %]
>-                
>-        <li> 
>-                <script type="text/javascript">
>-                    Calendar.setup({
>-                        inputField      :   "[% IF ( modify ) %]next_[% END %]acqui_date",
>-                        ifFormat       :   "[% DHTMLcalendar_dateformat %]",
>-                        button         :   "[% IF ( modify ) %]next_[% END %]acqui_button",
>-                        align          :   "Tl",
>-                        onUpdate        :    function(cal) { 
>-                                                             irregular_issues.weeks = getWeeksArray(cal.date);
>-                                                            irregular_issues.firstissue = cal.date;
>-                                                            if(document.irregularity_summary) {
>-                                                                irregular_issues.update();
>-                                                            }
>-                                                            if(document.getElementById("seasonal_irregularity")) {
>-                                                                moreoptions_seasons(text[15]);
>-                                                            }
>-                                                        } 
>-                        });
>-                    Calendar.setup({
>-                        inputField      :   "[% IF ( modify ) %]next_[% END %]acqui_date",
>-                        ifFormat       :   "[% DHTMLcalendar_dateformat %]",
>-                        button         :   "[% IF ( modify ) %]next_[% END %]acqui_date",
>-                        align          :   "Tl",
>-                        onUpdate        :    function(cal) { irregular_issues.weeks = getWeeksArray(cal.date);
>-                                                            irregular_issues.firstissue = cal.date;
>-                                                            if(document.irregularity_summary) {
>-                                                                irregular_issues.update();
>-                                                            }
>-                                                            if(document.getElementById("seasonal_irregularity")) {
>-                                                                moreoptions_seasons(text[15]);
>-                                                            }
>-                                                        } 
>-                        });
>-                </script>
>-            <label for="periodicity" class="required">Frequency:</label>
>-            
>-                <select name="periodicity" size="1" id="periodicity" onchange="javascript:document.getElementsByName('manualhist')[0].checked=(this.value==1); reset_num_pattern();">
>-                <option value="" selected="selected">-- please choose --</option>
>-                [% IF ( periodicity16 ) %]
>-                <option value="16" selected="selected">Without periodicity</option>
>-                [% ELSE %]
>-                    <option value="16">Without periodicity</option>
>-                [% END %]
>-                [% IF ( periodicity48 ) %]
>-                <option value="48" selected="selected">Unknown</option>
>-                [% ELSE %]
>-                <option value="48">Unknown</option>
>-                [% END %]
>-                [% IF ( periodicity32 ) %]
>-                <option value="32" selected="selected">Irregular</option>
>-                [% ELSE %]
>-                    <option value="32">Irregular</option>
>-                [% END %]
>-
>-                [% IF ( periodicity12 ) %]
>-                    <option value="12" selected="selected">2/day</option>
>-                [% ELSE %]
>-                    <option value="12">2/day</option>
>-                [% END %]
>-                [% IF ( periodicity1 ) %]
>-                    <option value="1" selected="selected">daily (n/week)</option>
>-                [% ELSE %]
>-                    <option value="1">daily (n/week)</option>
>-                [% END %]
>-                [% IF ( periodicity2 ) %]
>-                    <option value="2" selected="selected">1/week</option>
>-                [% ELSE %]
>-                    <option value="2">1/week</option>
>-                [% END %]
>-                [% IF ( periodicity3 ) %]
>-                    <option value="3" selected="selected">1/2 weeks </option>
>-                [% ELSE %]
>-                    <option value="3">1/2 weeks </option>
>-                [% END %]
>-                [% IF ( periodicity4 ) %]
>-                    <option value="4" selected="selected">1/3 weeks</option>
>-                [% ELSE %]
>-                    <option value="4">1/3 weeks</option>
>-                [% END %]
>-                [% IF ( periodicity5 ) %]
>-                    <option value="5" selected="selected">1/month</option>
>-                [% ELSE %]
>-                    <option value="5">1/month</option>
>-                [% END %]
>-                [% IF ( periodicity6 ) %]
>-                    <option value="6" selected="selected">1/2 months (6/year)</option>
>-                [% ELSE %]
>-                    <option value="6">1/2 months (6/year)</option>
>-                [% END %]
>-                [% IF ( periodicity7 ) %]
>-                    <option value="7" selected="selected">1/3 months (1/quarter)</option>
>-                [% ELSE %]
>-                    <option value="7">1/3 months (1/quarter)</option>
>-                [% END %]
>-                
>-                [% IF ( periodicity8 ) %]
>-                    <option value="8" selected="selected">1/quarter (seasonal)</option>
>-                [% ELSE %]
>-                    <option value="8">1/quarter (seasonal)</option>
>-                [% END %]
>-                [% IF ( periodicity13 ) %]
>-                    <option value="13" selected="selected">1/4 months (3/year)</option>
>-                [% ELSE %]
>-                    <option value="13">1/4 months (3/year)</option>
>-                [% END %]
>-
>-                [% IF ( periodicity9 ) %]
>-                    <option value="9" selected="selected">2/years</option>
>-                [% ELSE %]
>-                    <option value="9">2/year</option>
>-                [% END %]
>-                [% IF ( periodicity10 ) %]
>-                    <option value="10" selected="selected">1/year</option>
>-                [% ELSE %]
>-                    <option value="10">1/year</option>
>-                [% END %]
>-                [% IF ( periodicity11 ) %]
>-                    <option value="11" selected="selected">1/2 years</option>
>-                [% ELSE %]
>-                    <option value="11">1/2 years</option>
>-                [% END %]
>-                </select> <span class="required">Required</span></li>
>-                <li>
>-                    <label for="manuallist"> Manual history:</label>
>-                    [% IF ( manualhistory ) %]
>-                        <input type="checkbox" name="manualhist" id="manuallist" value="1" checked="checked" />
>-                    [% ELSE %]
>-                        <input type="checkbox" name="manualhist" id="manuallist" value="1" />
>-                    [% END %]
>-                </li>
>-        <li>
>-           <label for="numberpattern"> Numbering pattern:</label>
>-            
>-                <select name="numbering_pattern" size="1" id="numberpattern" >
>-                    <option value="" selected="selected">-- please choose --</option>
>-                    [% IF ( numberpattern1 ) %]
>-                        <option value="1" selected="selected">Number</option>
>-                    [% ELSE %]
>-                        <option value="1">Number</option>
>-                    [% END %]
>-                    [% IF ( numberpattern2 ) %]
>-                        <option value="2" selected="selected">Volume, number, issue</option>
>-                    [% ELSE %]
>-                        <option value="2">Volume, number, issue</option>
>-                    [% END %]
>-                    [% IF ( numberpattern3 ) %]
>-                        <option value="3" selected="selected">Volume, number</option>
>-                    [% ELSE %]
>-                        <option value="3">Volume, number</option>
>-                    [% END %]
>-                    [% IF ( numberpattern4 ) %]
>-                        <option value="4" selected="selected">Volume, issue</option>
>-                    [% ELSE %]
>-                        <option value="4">Volume, issue</option>
>-                    [% END %]
>-                    [% IF ( numberpattern5 ) %]
>-                        <option value="5" selected="selected">Number, issue</option>
>-                    [% ELSE %]
>-                        <option value="5">Number, issue</option>
>-                    [% END %]
>-                    [% IF ( numberpattern6 ) %]
>-                        <option value="6" selected="selected">Seasonal only</option>
>-                    [% ELSE %]
>-                        <option value="6">Seasonal only</option>
>-                    [% END %]
>-                    [% IF ( numberpattern8 ) %]
>-                        <option value="8" selected="selected">Year/Number</option>
>-                    [% ELSE %]
>-                        <option value="8">Year/Number</option>
>-                    [% END %]          
>-                    [% IF ( numberpattern7 ) %]
>-                        <option value="7" selected="selected">None of the above</option>
>-                    [% ELSE %]
>-                        <option value="7">None of the above</option>
>-                    [% END %]
>-                </select>
>-        </li>
>-                <li id="more_options"></li>
>-                <li id="irregularity"></li>
>-   	           <li id="displayexample"></li>
>-        <li>
>-           <label for="beginning_date" class="required"> Subscription start date:</label>
>-            
>-                <img src="[% themelang %]/lib/calendar/cal.gif" id="button1" style="cursor: pointer;" alt="Show calendar" title="Show calendar" />
>-                <input type="text" name="startdate" value="[% startdate %]" size="13" maxlength="10" id="beginning_date" />
>-                 
>-                <script type="text/javascript">
>-                    Calendar.setup({
>-                        inputField   : "beginning_date",
>-                        ifFormat     : "[% DHTMLcalendar_dateformat %]",
>-                        button       : "button1",
>-                        align        : "Tl"
>-                    });
>-                    Calendar.setup({
>-                        inputField   : "beginning_date",
>-                        ifFormat     : "[% DHTMLcalendar_dateformat %]",
>-                        button       : "beginning_date",
>-                        align        : "Tl"
>-                    });
>-                </script>
>-            <span class="required">Required</span>
>-        </li>
>-        <li>
>-            <label for="subtype" class="required">Subscription length:</label>
>-            
>-                <select name="subtype" id="subtype">
>-                    [% IF ( subtype_monthlength ) %]<option value="monthlength" selected="selected">[% ELSE %]<option value="monthlength">[% END %] Number of months</option>
>-                    [% IF ( subtype_numberlength ) %]<option value="numberlength" selected="selected">[% ELSE %]<option value="numberlength">[% END %] Number of issues</option>
>-                    [% IF ( subtype_weeklength ) %]<option value="weeklength" selected="selected">[% ELSE %]<option value="weeklength">[% END %] Number of weeks</option>
>-                </select>
>-                <input type="text" id="numberlength" name="sublength" value="[% sublength %]" size="3" onkeypress="return check_input(event)" /> (enter amount in numerals)
>-            <span class="required">Required</span>
>-        </li>
>-        <li>
>-           <label for="ending_date"> Subscription end date:</label>
>-            
>-                <img src="[% themelang %]/lib/calendar/cal.gif" id="buttonend1" style="cursor: pointer;" alt="Show Calendar" title="Show Calendar" />
>-                <input type="text" name="enddate" value="[% enddate %]" size="13" maxlength="10" id="ending_date" />
>-                 
>-                <script type="text/javascript">
>-                    Calendar.setup({
>-                        inputField   : "ending_date",
>-                        ifFormat     : "[% DHTMLcalendar_dateformat %]",
>-                        button       : "buttonend1",
>-                        align        : "Tl"
>-                    });
>-                    Calendar.setup({
>-                        inputField   : "ending_date",
>-                        ifFormat     : "[% DHTMLcalendar_dateformat %]",
>-                        button       : "ending_date",
>-                        align        : "Tl"
>-                    });
>-                </script>
>-        </li>
>-    <li><label for="numberingmethod">Numbering formula:</label> <input type="text" name="numberingmethod" id="numberingmethod" value="[% numberingmethod %]" />
>-    </li>
>-    </ol>
>-	</fieldset>
>-</div>
>-	<fieldset class="action">
>-    <input type="button" class="action_test" value="Test prediction pattern" onclick="javascript:irregularity_check()" />
>-    <input type="button" class="action_reset" value="Reset pattern" onclick="javascript:reset_pattern()" />
>-    <input type="button" class="action_save"  value="Save subscription" onclick="Check(this.form)" accesskey="w" />
>-	</fieldset>
>-    <fieldset class="action">
>-    <input type="button" class="action_advanced" value="Show/Hide advanced pattern" onclick="javascript:display_table()" />
>-    </fieldset>
>-           <div id="basetable"  style="display: none;">
>-            <table class="small">
>-                <tr><th colspan="4">Advanced prediction pattern</th></tr>
>-				<tr>
>-                    <th>&nbsp;</th>
>-                    <th>X</th>
>-                    <th>Y</th>
>-                    <th>Z</th>
>-                </tr>
>-                <tr>
>-                    <td>Add</td>
>-                    <td>
>-                        <input type="text" name="add1" id="add1" value="[% add1 %]" />
>-                    </td>
>-                    <td>
>-                        <input type="text" name="add2" id="add2" value="[% add2 %]" />
>-                    </td>
>-                    <td>
>-                        <input type="text" name="add3" id="add3" value="[% add3 %]" />
>-                    </td>
>-                </tr>
>-                <tr>
>-                    <td>once every</td>
>-                    <td><input type="text" name="every1" id="every1" value="[% every1 %]" /></td>
>-                    <td><input type="text" name="every2" id="every2" value="[% every2 %]" /></td>
>-                    <td><input type="text" name="every3" id="every3" value="[% every3 %]" /></td>
>-                </tr>
>-                <tr>
>-                    <td>When more than</td>
>-                    <td><input type="text" name="whenmorethan1" id="whenmorethan1" value="[% whenmorethan1 %]" /></td>
>-                    <td><input type="text" name="whenmorethan2" id="whenmorethan2" value="[% whenmorethan2 %]" /></td>
>-                    <td><input type="text" name="whenmorethan3" id="whenmorethan3" value="[% whenmorethan3 %]" /></td>
>-                </tr>
>-                <tr>
>-                    <td>inner counter</td>
>-                    <td><input type="text" name="innerloop1" id="innerloop1" value="[% innerloop1 %]" /></td>
>-                    <td><input type="text" name="innerloop2" id="innerloop2" value="[% innerloop2 %]" /></td>
>-                    <td><input type="text" name="innerloop3" id="innerloop3" value="[% innerloop3 %]" /></td>
>-                </tr>
>-                <tr>
>-                    <td>Set back to</td>
>-                    <td><input type="text" name="setto1" id="setto1" value="[% setto1 %]" /></td>
>-                    <td><input type="text" name="setto2" id="setto2" value="[% setto2 %]" /></td>
>-                    <td><input type="text" name="setto3" id="setto3" value="[% setto3 %]" /></td>
>-                </tr>
>-                <tr>
>-                    <td>
>-                        [% IF ( modify ) %]
>-                            Last value
>-                        [% ELSE %]
>-                            Begins with
>-                        [% END %]
>-                    </td>
>-                    <td><input type="text" name="lastvalue1" id="lastvalue1" value="[% lastvalue1 %]" /></td>
>-                    <td><input type="text" name="lastvalue2" id="lastvalue2" value="[% lastvalue2 %]" /></td>
>-                    <td><input type="text" name="lastvalue3" id="lastvalue3" value="[% lastvalue3 %]" /></td>
>-                </tr>
>-            </table>
>-        </div>
>-
>-</div>
>-
>-</form>
>-</div>
>-
>-</div>
>-
>-[% INCLUDE 'intranet-bottom.inc' %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
>index ebf2afc..fbada5d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
>@@ -1,391 +1,11 @@
>-[% INCLUDE 'doc-head-open.inc' %]
>-<title>Koha &rsaquo; Serials &rsaquo; Details for subscription #[% subscriptionid %]</title>
>-[% INCLUDE 'doc-head-close.inc' %]
>-<script type="text/javascript">
>-//<![CDATA[
>-// the english words used in display purposes
>-var text = new Array(_("Number"),_("Volume"),_("Issue"),_("Month"),_("Week"),_("Starting with:"),_("Rollover at:"),_("Choose Hemisphere:"),_("Northern"),_("Southern",
>-"Autumn"),_("Winter"),_("Spring"),_("Summer"),_("Fall"),_("Season"),_("Year"));
>+[% INCLUDE 'help-top.inc' %]
> 
>+<h1>Subscription Detail</h1>
> 
>-// to display the options section
>-function options(x,y,z){
>-var textbox = '';
>-    // alert("X: "+x+"Y: "+y+"Z: "+z);
>-    if(x){
>-        document.f.xfield.value = x;
>-        if(y){
>-            document.f.yfield.value = y;
>-            if(z){
>-                document.f.zfield.value = z;
>-            }
>-        }
>-    }
>-}
>+<p>This page shows you all of the information about your subscription including issue history.</p>
> 
>-function confirm_deletion() {
>-    var is_confirmed = confirm(_("Are you sure you want to delete this subscription?"));
>-    if (is_confirmed) {
>-        window.location="subscription-detail.pl?subscriptionid=[% subscriptionid %]&op=del";
>-    }
>-}
>-function popup(subscriptionid) {
>-    newin=window.open("subscription-renew.pl?mode=popup&subscriptionid="+subscriptionid,'popup','width=590,height=440,toolbar=false,scrollbars=yes');
>-}
>-$(document).ready(function() {
>-    $("#subscription_description > ul").tabs();
>-});
>-//]]>
>-</script>
>-</head>
>-<body id="ser_subscription-detail" class="ser">
>-[% INCLUDE 'header.inc' %]
>-[% INCLUDE 'serials-search.inc' %]
>+<p>From here you can edit your subscription, renew it and/or recieve issues.</p>
> 
>-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; Details for subscription #[% subscriptionid %]</div>
>+<p><strong>See the full documentation for Serials in the <a href="http://manual.koha-community.org/3.8/en/serials.html">manual</a> (online).</strong></p>
> 
>-<div id="doc3" class="yui-t2">
>-   
>-   <div id="bd">
>-	<div id="yui-main">
>-	<div class="yui-b">
>-	[% INCLUDE 'serials-toolbar.inc' %]
>-
>-    <h1>Subscription for [% bibliotitle %] </h1>
>-    [% IF ( abouttoexpire ) %]<div class="problem">Subscription is near its end. It should be renewed now.</div>[% END %]
>-    [% IF ( NEEDSCONFIRMATION ) %]
>-    <div id="circ_needsconfirmation" class="dialog alert">
>-			<h3>Please Confirm Subscription deletion</h3>
>-
>-			<ul>
>-			[% IF ( NOTEXPIRED ) %] <li>The subscription has not expired yet</li> [% END %] 
>-			[% IF ( LINKEDISSUES ) %] <li>The subscription has linked issues</li> [% END %]
>-			[% IF ( LINKEDITEMS ) %] <li>The subscription has linked items<br /> Those items won't be deleted</li> [% END %]
>-			</ul>
>-			<form method="post" action="/cgi-bin/koha/serials/subscription-detail.pl">
>-			<input type="hidden" name="subscriptionid" value="[% subscriptionid %]" />
>-			<input type="hidden" name="issueconfirmed" value="1" />
>-			<input type="hidden" name="op" value="del" />
>-            <input type="submit" class="approve" value="Yes, delete (Y)" accesskey="y" />
>-			</form>
>-			<form method="get" action="/cgi-bin/koha/serials/subscription-detail.pl">
>-			<input type="hidden" name="subscriptionid" value="[% subscriptionid %]" />
>-            <input type="submit" class="deny" value="No, don't delete (N)" accesskey="n" />
>-			</form>
>-
>-	</div>
>-	[% END %] 
>-
>-<div id="subscription_description" class="toptabs">
>-<ul class="ui-tabs-nav">
>-    <li><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid %]#subscription_info">Information</a></li>
>-    <li><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid %]#subscription_planning">Planning</a></li>
>-    <li><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid %]#subscription_issues">Issues</a></li>
>-    <li><a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid %]#subscription_summary">Summary</a></li>
>-</ul>
>-
>-<div id="subscription_info">
>-    <div class="yui-g">
>-    <div class="yui-u first">
>-    <div class="rows">
>-		<ol>
>-		<li><span class="label">Subscription ID: </span>[% subscriptionid %]</li>
>-        <li><span class="label">Librarian identity:</span> [% librarian %]</li>
>-        <li><span class="label">Vendor:</span> <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% aqbooksellerid %]">[% aqbooksellername %]</a></li>
>-        <li><span class="label">Biblio:</span>  <a href="/cgi-bin/koha/catalogue/[% default_bib_view %].pl?biblionumber=[% bibnum %]">[% bibliotitle %]</a> <i>([% bibnum %])</i></li>
>-[% IF ( branchcode ) %]<li><span class="label">Library:</span> [% branchcode %]</li>[% END %]
>-        [% IF ( serialsadditems ) %]
>-            <li><span class="label">Items:</span> Serial receipt creates an item record.</li>
>-        [% ELSE %]
>-            <li><span class="label">Items:</span> Serial receipt does not create an item record.</li>
>-        [% END %]
>-        <li><span class="label">Grace period:</span> [% graceperiod %]</li>
>-        </ol>
>-    </div>
>-    </div>
>-    <div class="yui-u">
>-    <div class="rows">
>-        <ol>
>-        [% IF ( location ) %]<li><span class="label">Location:</span> [% location %]</li>[% END %]
>-        [% IF ( callnumber ) %]<li><span class="label">Call number:</span> [% callnumber %]</li>[% END %]
>-		[% IF ( staffdisplaycount ) %]<li><span class="label">Number of issues to display to staff:</span>[% staffdisplaycount %]</li>[% END %]
>-        [% IF ( opacdisplaycount ) %]<li><span class="label">Number of issues to display in OPAC:</span>[% opacdisplaycount %]</li>[% END %]
>-        [% IF ( letter ) %]
>-            <li>
>-                <span class="label">Patron notification:</span> [% letter %]
>-                (<a href="/cgi-bin/koha/serials/viewalerts.pl?subscriptionid=[% subscriptionid %]">subscribers</a>)
>-            </li>
>-        [% END %]
>-        [% IF ( hasRouting ) %]<li><span class="label">Routing:</span> yes</li>[% END %]
>-     </ol>
>-     </div>
>-     </div>
>-</div>
>-</div>
>-    <div id="subscription_planning">
>-    <div class="yui-g">
>-    <div class="rows">
>-        <ol>
>-            <li><span class="label">Beginning date:</span> [% startdate %]
>-            </li>
>-            <li><span class="label">Frequency (*):</span>
>-                [% IF ( periodicity16 ) %]
>-                        Without regularity
>-                [% END %]
>-                [% IF ( periodicity32 ) %]
>-                        Irregular
>-                [% END %]
>-                [% IF ( periodicity0 ) %]
>-                        Unknown
>-                [% END %]
>-                [% IF ( periodicity12 ) %]
>-                        2/day
>-                [% END %]
>-                [% IF ( periodicity1 ) %]
>-                        1/day
>-                [% END %]
>-                [% IF ( periodicity13 ) %]
>-                        1/4 months (3/year)
>-                [% END %]
>-                [% IF ( periodicity2 ) %]
>-                        1/week
>-                [% END %]
>-                [% IF ( periodicity3 ) %]
>-                        1/2 weeks
>-                [% END %]
>-                [% IF ( periodicity4 ) %]
>-                        1/3 weeks
>-                [% END %]
>-                [% IF ( periodicity5 ) %]
>-                        1/month
>-                [% END %]
>-                [% IF ( periodicity6 ) %]
>-                        1/2 months (6/year)
>-                [% END %]
>-                [% IF ( periodicity7 ) %]
>-                        1/quarter
>-                [% END %]
>-                [% IF ( periodicity8 ) %]
>-                        1/quarter
>-                [% END %]
>-                [% IF ( periodicity9 ) %]
>-                        2/year
>-                [% END %]
>-                [% IF ( periodicity10 ) %]
>-                        1/year
>-                [% END %]
>-                [% IF ( periodicity11 ) %]
>-                        1/2 years
>-                [% END %]
>-            </li>
>-            <li>
>-              <span class="label">Manual history: </span>
>-                [% IF ( manualhistory ) %]
>-                    Disabled
>-                [% ELSE %]
>-                    Enabled
>-                [% END %]
>-            </li>
>-            <li><span class="label">Number pattern:</span>
>-                [% IF ( numberpattern1 ) %]
>-                    Number only
>-                [% END %]
>-                [% IF ( numberpattern2 ) %]
>-                    Volume, number, issue
>-                [% END %]
>-                [% IF ( numberpattern3 ) %]
>-                    Volume, number
>-                [% END %]
>-                [% IF ( numberpattern4 ) %]
>-                    Volume, issue
>-                [% END %]
>-                [% IF ( numberpattern5 ) %]
>-                    Number, issue
>-                [% END %]
>-                [% IF ( numberpattern8 ) %]
>-                    Year/Number
>-                [% END %]
>-                [% IF ( numberpattern6 ) %]
>-                    Seasonal only
>-                [% END %]
>-                [% IF ( numberpattern7 ) %]
>-                    None of the above
>-                [% END %]
>-            </li>
>-            <li><table>
>-            <tr><td>Starting with:</td>
>-                <td align="center">[% lastvalue1 %]</td>
>-            [% IF ( lastvalue2 ) %]
>-                <td align="center">&nbsp; 
>-                    [% lastvalue2 %]
>-                </td>
>-            [% END %]
>-            [% IF ( lastvalue3 ) %]
>-                <td align="center">&nbsp; 
>-                    [% lastvalue3 %]
>-                </td>
>-            [% END %]
>-            </tr>
>-            <tr><td>Rollover:</td>
>-                <td align="center">
>-                    [% IF ( whenmorethan1 < 9999999 ) %][% whenmorethan1 %][% ELSE %]Never[% END %]
>-                </td>
>-            [% IF ( whenmorethan2 ) %]
>-                <td align="center">&nbsp;
>-                    [% IF ( whenmorethan2 < 9999999 ) %][% whenmorethan2 %][% ELSE %]Never[% END %]
>-                </td>
>-            [% END %]
>-            [% IF ( whenmorethan3 ) %]
>-                <td align="center">&nbsp;
>-                    [% IF ( whenmorethan3 < 9999999 ) %][% whenmorethan3 %][% ELSE %]Never[% END %]
>-                </td>
>-            [% END %]
>-            </tr>
>-            </table></li>
>-            [% IF ( irregular_issues ) %]
>-            <li><span class="label">Irregularity:</span> [% irregular_issues %] issues
>-            </li>
>-            [% END %]
>-            <li><span class="label">First arrival:</span> [% firstacquidate %]
>-            </li>
>-        [% IF ( numberlength ) %]<li><span class="label">Number of issues:</span> [% numberlength %]</li>[% END %]
>-        [% IF ( weeklength ) %]<li><span class="label">Number of weeks:</span> [% weeklength %]</li>[% END %]
>-        [% IF ( monthlength ) %]<li><span class="label">Number of months:</span> [% monthlength %]</li>[% END %]
>-        </ol>
>-    </div>
>-    </div>
>-    </div>
>-    <div id="subscription_numbering" style="display:none;">
>-        <h3>Numbering calculation</h3>
>-        <p><label>Numbering formula:</label> [% numberingmethod %]</p>
>-        <table>
>-            <tr>
>-                <th>&nbsp;</th>
>-                <th>X</th>
>-                <th>Y</th>
>-                <th>Z</th>
>-                </tr>
>-                <tr>
>-                    <td>Add</td>
>-                    <td>
>-                        [% add1 %]
>-                    </td>
>-                    <td>
>-                        [% add2 %]
>-                    </td>
>-                    <td>
>-                        [% add3 %]
>-                    </td>
>-                </tr>
>-                <tr>
>-                    <td>once every</td>
>-                    <td>[% every1 %]</td>
>-                    <td>[% every2 %]</td>
>-                    <td>[% every3 %]</td>
>-                </tr>
>-                <tr>
>-                    <td>When more than</td>
>-                    <td>[% whenmorethan1 %] [% IF ( innerloop1 ) %]<br />
>-                        <i>(is [% innerloop1 %])</i>[% END %]</td>
>-                    <td>[% whenmorethan2 %] [% IF ( innerloop2 ) %]<br />
>-                        <i>(is [% innerloop2 %])</i>[% END %]</td>
>-                    <td>[% whenmorethan3 %] [% IF ( innerloop3 ) %]<br />
>-                        <i>(is [% innerloop3 %])</i>[% END %]</td>
>-                </tr>
>-                <tr>
>-                    <td>Set back to</td>
>-                    <td>[% setto1 %]</td>
>-                    <td>[% setto2 %]</td>
>-                    <td>[% setto3 %]</td>
>-                </tr>
>-                <tr>
>-                    <td>
>-                            Inner counter
>-                    </td>
>-                    <td>[% innerloop1 %]</td>
>-                    <td>[% innerloop2 %]</td>
>-                    <td>[% innerloop3 %]</td>
>-                </tr>
>-                <tr>
>-                    <td>
>-                            Last value
>-                    </td>
>-                    <td>[% lastvalue1 %]</td>
>-                    <td>[% lastvalue2 %]</td>
>-                    <td>[% lastvalue3 %]</td>
>-                </tr>
>-            </table>
>-    </div>
>-    <div id="subscription_issues">
>-        <table>
>-        <tr>
>-            <th>Issue number</th>
>-            <th>Planned date</th>
>-            <th>Published date</th>
>-            <th>Status</th>
>-        </tr>
>-        [% FOREACH serialslis IN serialslist %]
>-            <tr>
>-                <td>
>-                    [% serialslis.serialseq %]
>-                </td>
>-                <td>
>-                    [% serialslis.planneddate %]
>-                </td>
>-                <td>
>-                    [% serialslis.publisheddate %]
>-                </td>
>-                <td>
>-                        [% IF ( serialslis.status1 ) %]
>-                            Expected
>-                        [% END %]
>-                        [% IF ( serialslis.status2 ) %]
>-                            Arrived
>-                        [% END %]
>-                        [% IF ( serialslis.status3 ) %]
>-                            Late
>-                        [% END %]
>-                        [% IF ( serialslis.status4 ) %]
>-                            Missing
>-                        [% END %]
>-                        [% IF ( serialslis.status5 ) %]
>-                            Not available
>-                        [% END %]
>-                        [% IF ( serialslis.status7 ) %]
>-                            Claimed
>-                             [% IF ( serialslis.claimdate ) %]
>-                             [% serialslis.claimdate %]
>-                             [% END %]
>-                        [% END %]
>-                </td>
>-            </tr>
>-        [% END %]
>-        </table>
>-    </div>
>-    <div id="subscription_summary">
>-    <div class="yui-g">
>-    <div class="rows">
>-        <ol>
>-            <li><span class="label">Start date:</span> [% startdate %] </li>
>-            <li><span class="label">End date:</span> [% enddate %]</li>
>-            <li><span class="label">History start date:</span> [% histstartdate %] </li>
>-            <li><span class="label">History end date:</span> [% histenddate %]</li>
>-            <li><span class="label">Received issues:</span>[% recievedlist %]</li>
>-            <li><span class="label">Missing issues:</span>[% missinglist %]</li>
>-            <li><span class="label">Nonpublic note:</span>[% internalnotes %]</li>
>-            <li><span class="label">OPAC note:</span>[% notes %]</li>
>-            <li><span class="label">History staff note</span>[% librariannote %]</li>
>-            <li><span class="label">History OPAC note</span>[% opacnote %]</li>
>-        </ol>
>-    </div>
>-    </div>
>-    </div>
>-    </div>
>-</div>
>-</div>
>-
>-<div class="yui-b">
>-[% INCLUDE 'serials-menu.inc' %]
>-</div>
>-</div>
>-[% INCLUDE 'intranet-bottom.inc' %]
>+[% INCLUDE 'help-bottom.inc' %]
>\ No newline at end of file
>-- 
>1.7.2.3

Actions: View | Diff | Splinter Review

Attachments on bug 7936: 9049 | 9051 | 9053 | 9080 | 9083 | 9084 | 9085 | 9086 | 9088 | 9098 | 9099 | 9100 | 9101 | 9102 | 9103 | 9104 | 9105 | 9106 | 9117 | 9119 | 9120 | 9121 | 9126 | 9136 | 9137 | 9138 | 9139 | 9140 | 9158 | 9177 | 9180 | 9181 | 9184 | 9185 | 9186 | 9187 | 9929 | 9930 | 9931 | 9932 | 9933 | 9934 | 9935 | 9936 | 9937 | 9938 | 9939 | 9967