First draft of programmer's templates: a stripped-down version of the templates for use by programmers in adding and testing new functionality. Template-authors can use these templates to track changes that need to be incorporated into their custom templates.

19 years ago · f1c85801de
53 changed files with 7374 additions and 0 deletions
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar/cal.gif
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar/cal.gif
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar/calendar-en.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar/calendar-en.js
@ -0,0 +1,127 @@
+// ** I18N
+
+// Calendar EN language
+// Author: Mihai Bazon, <mishoo@infoiasi.ro>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Sunday",
+ "Monday",
+ "Tuesday",
+ "Wednesday",
+ "Thursday",
+ "Friday",
+ "Saturday",
+ "Sunday");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Sun",
+ "Mon",
+ "Tue",
+ "Wed",
+ "Thu",
+ "Fri",
+ "Sat",
+ "Sun");
+
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+Calendar._FD = 0;
+
+// full month names
+Calendar._MN = new Array
+("January",
+ "February",
+ "March",
+ "April",
+ "May",
+ "June",
+ "July",
+ "August",
+ "September",
+ "October",
+ "November",
+ "December");
+
+// short month names
+Calendar._SMN = new Array
+("Jan",
+ "Feb",
+ "Mar",
+ "Apr",
+ "May",
+ "Jun",
+ "Jul",
+ "Aug",
+ "Sep",
+ "Oct",
+ "Nov",
+ "Dec");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "About the calendar";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2003\n" + // don't translate this this ;-)
+"For latest version visit: http://dynarch.com/mishoo/calendar.epl\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Date selection:\n" +
+"- Use the \xab, \xbb buttons to select year\n" +
+"- Use the " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " buttons to select month\n" +
+"- Hold mouse button on any of the above buttons for faster selection.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Time selection:\n" +
+"- Click on any of the time parts to increase it\n" +
+"- or Shift-click to decrease it\n" +
+"- or click and drag for faster selection.";
+
+Calendar._TT["PREV_YEAR"] = "Prev. year (hold for menu)";
+Calendar._TT["PREV_MONTH"] = "Prev. month (hold for menu)";
+Calendar._TT["GO_TODAY"] = "Go Today";
+Calendar._TT["NEXT_MONTH"] = "Next month (hold for menu)";
+Calendar._TT["NEXT_YEAR"] = "Next year (hold for menu)";
+Calendar._TT["SEL_DATE"] = "Select date";
+Calendar._TT["DRAG_TO_MOVE"] = "Drag to move";
+Calendar._TT["PART_TODAY"] = " (today)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Display %s first";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Close";
+Calendar._TT["TODAY"] = "Today";
+Calendar._TT["TIME_PART"] = "(Shift-)Click or drag to change value";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "wk";
+Calendar._TT["TIME"] = "Time:";
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar/calendar-setup.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar/calendar-setup.js
@ -0,0 +1,181 @@
+/*  Copyright Mihai Bazon, 2002, 2003  |  http://dynarch.com/mishoo/
+ * ---------------------------------------------------------------------------
+ *
+ * The DHTML Calendar
+ *
+ * Details and latest version at:
+ * http://dynarch.com/mishoo/calendar.epl
+ *
+ * This script is distributed under the GNU Lesser General Public License.
+ * Read the entire license text here: http://www.gnu.org/licenses/lgpl.html
+ *
+ * This file defines helper functions for setting up the calendar.  They are
+ * intended to help non-programmers get a working calendar on their site
+ * quickly.  This script should not be seen as part of the calendar.  It just
+ * shows you what one can do with the calendar, while in the same time
+ * providing a quick and simple method for setting it up.  If you need
+ * exhaustive customization of the calendar creation process feel free to
+ * modify this code to suit your needs (this is recommended and much better
+ * than modifying calendar.js itself).
+ */
+
+// $Id$
+
+/**
+ *  This function "patches" an input field (or other element) to use a calendar
+ *  widget for date selection.
+ *
+ *  The "params" is a single object that can have the following properties:
+ *
+ *    prop. name   | description
+ *  -------------------------------------------------------------------------------------------------
+ *   inputField    | the ID of an input field to store the date
+ *   displayArea   | the ID of a DIV or other element to show the date
+ *   button        | ID of a button or other element that will trigger the calendar
+ *   eventName     | event that will trigger the calendar, without the "on" prefix (default: "click")
+ *   ifFormat      | date format that will be stored in the input field
+ *   daFormat      | the date format that will be used to display the date in displayArea
+ *   singleClick   | (true/false) wether the calendar is in single click mode or not (default: true)
+ *   firstDay      | numeric: 0 to 6.  "0" means display Sunday first, "1" means display Monday first, etc.
+ *   align         | alignment (default: "Br"); if you don't know what's this see the calendar documentation
+ *   range         | array with 2 elements.  Default: [1900, 2999] -- the range of years available
+ *   weekNumbers   | (true/false) if it's true (default) the calendar will display week numbers
+ *   flat          | null or element ID; if not null the calendar will be a flat calendar having the parent with the given ID
+ *   flatCallback  | function that receives a JS Date object and returns an URL to point the browser to (for flat calendar)
+ *   disableFunc   | function that receives a JS Date object and should return true if that date has to be disabled in the calendar
+ *   onSelect      | function that gets called when a date is selected.  You don't _have_ to supply this (the default is generally okay)
+ *   onClose       | function that gets called when the calendar is closed.  [default]
+ *   onUpdate      | function that gets called after the date is updated in the input field.  Receives a reference to the calendar.
+ *   date          | the date that the calendar will be initially displayed to
+ *   showsTime     | default: false; if true the calendar will include a time selector
+ *   timeFormat    | the time format; can be "12" or "24", default is "12"
+ *   electric      | if true (default) then given fields/date areas are updated for each move; otherwise they're updated only on close
+ *   step          | configures the step of the years in drop-down boxes; default: 2
+ *   position      | configures the calendar absolute position; default: null
+ *   cache         | if "true" (but default: "false") it will reuse the same calendar object, where possible
+ *   showOthers    | if "true" (but default: "false") it will show days from other months too
+ *
+ *  None of them is required, they all have default values.  However, if you
+ *  pass none of "inputField", "displayArea" or "button" you'll get a warning
+ *  saying "nothing to setup".
+ */
+Calendar.setup = function (params) {
+	function param_default(pname, def) { if (typeof params[pname] == "undefined") { params[pname] = def; } };
+
+	param_default("inputField",     null);
+	param_default("displayArea",    null);
+	param_default("button",         null);
+	param_default("eventName",      "click");
+	param_default("ifFormat",       "%Y/%m/%d");
+	param_default("daFormat",       "%Y/%m/%d");
+	param_default("singleClick",    true);
+	param_default("disableFunc",    'dateStatusHandler');
+	param_default("dateStatusFunc", params["disableFunc"]);	// takes precedence if both are defined
+	param_default("firstDay",       0); // defaults to "Sunday" first
+	param_default("align",          "Br");
+	param_default("range",          [1900, 2999]);
+	param_default("weekNumbers",    true);
+	param_default("flat",           null);
+	param_default("flatCallback",   null);
+	param_default("onSelect",       null);
+	param_default("onClose",        null);
+	param_default("onUpdate",       null);
+	param_default("date",           null);
+	param_default("showsTime",      false);
+	param_default("timeFormat",     "24");
+	param_default("electric",       true);
+	param_default("step",           2);
+	param_default("position",       null);
+	param_default("cache",          false);
+	param_default("showOthers",     false);
+
+	var tmp = ["inputField", "displayArea", "button"];
+	for (var i in tmp) {
+		if (typeof params[tmp[i]] == "string") {
+			params[tmp[i]] = document.getElementById(params[tmp[i]]);
+		}
+	}
+	if (!(params.flat || params.inputField || params.displayArea || params.button)) {
+		alert("Calendar.setup:\n  Nothing to setup (no fields found).  Please check your code");
+		return false;
+	}
+
+	function onSelect(cal) {
+		var p = cal.params;
+		var update = (cal.dateClicked || p.electric);
+		if (update && p.flat) {
+			if (typeof p.flatCallback == "function")
+				p.flatCallback(cal);
+			else
+				alert("No flatCallback given -- doing nothing.");
+			return false;
+		}
+		if (update && p.inputField) {
+			p.inputField.value = cal.date.print(p.ifFormat);
+			if (typeof p.inputField.onchange == "function")
+				p.inputField.onchange();
+		}
+		if (update && p.displayArea)
+			p.displayArea.innerHTML = cal.date.print(p.daFormat);
+		if (update && p.singleClick && cal.dateClicked)
+			cal.callCloseHandler();
+		if (update && typeof p.onUpdate == "function")
+			p.onUpdate(cal);
+	};
+
+	if (params.flat != null) {
+		if (typeof params.flat == "string")
+			params.flat = document.getElementById(params.flat);
+		if (!params.flat) {
+			alert("Calendar.setup:\n  Flat specified but can't find parent.");
+			return false;
+		}
+		var cal = new Calendar(params.firstDay, params.date, params.onSelect || onSelect);
+		cal.showsTime = params.showsTime;
+		cal.time24 = (params.timeFormat == "24");
+		cal.params = params;
+		cal.weekNumbers = params.weekNumbers;
+		cal.setRange(params.range[0], params.range[1]);
+		cal.setDateStatusHandler(params.dateStatusFunc);
+		cal.create(params.flat);
+		cal.show();
+		return false;
+	}
+
+	var triggerEl = params.button || params.displayArea || params.inputField;
+	triggerEl["on" + params.eventName] = function() {
+		var dateEl = params.inputField || params.displayArea;
+		var dateFmt = params.inputField ? params.ifFormat : params.daFormat;
+		var mustCreate = false;
+		var cal = window.calendar;
+		if (!(cal && params.cache)) {
+			window.calendar = cal = new Calendar(params.firstDay,
+							     params.date,
+							     params.onSelect || onSelect,
+							     params.onClose || function(cal) { cal.hide(); });
+			cal.showsTime = params.showsTime;
+			cal.time24 = (params.timeFormat == "24");
+			cal.weekNumbers = params.weekNumbers;
+			mustCreate = true;
+		} else {
+			if (params.date)
+				cal.setDate(params.date);
+			cal.hide();
+		}
+		cal.showsOtherMonths = params.showOthers;
+		cal.yearStep = params.step;
+		cal.setRange(params.range[0], params.range[1]);
+		cal.params = params;
+		cal.setDateStatusHandler(params.dateStatusFunc);
+		cal.setDateFormat(dateFmt);
+		if (mustCreate)
+			cal.create();
+		cal.parseDate(dateEl.value || dateEl.innerHTML);
+		cal.refresh();
+		if (!params.position)
+			cal.showAtElement(params.button || params.displayArea || params.inputField, params.align);
+		else
+			cal.showAt(params.position[0], params.position[1]);
+		return false;
+	};
+};
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar/calendar-system.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar/calendar-system.css
@ -0,0 +1,254 @@
+/* The main calendar widget.  DIV containing a table. */
+
+.calendar {
+  position: relative;
+  display: none;
+  border: 1px solid;
+  border-color: #fff #000 #000 #fff;
+  font-size: 11px;
+  cursor: default;
+  background: Window;
+  color: WindowText;
+  font-family: tahoma,verdana,sans-serif;
+  width:250px;
+}
+
+.calendar table {
+  border: 1px solid;
+  border-color: #fff #000 #000 #fff;
+  font-size: 11px;
+  cursor: default;
+  background: Window;
+  color: WindowText;
+  font-family: tahoma,verdana,sans-serif;
+  border-collapse:separate;
+}
+
+/* Header part -- contains navigation buttons and day names. */
+
+.calendar .button { /* "<<", "<", ">", ">>" buttons have this class */
+  text-align: center;
+  padding: 1px;
+  border: 1px solid;
+  display: table-cell;
+  -moz-border-radius: 0px;
+  border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
+  background: ButtonFace;
+}
+
+.calendar .nav {
+  background: ButtonFace url('menuarrow.gif') no-repeat 100% 100%;
+}
+
+.calendar thead .title { /* This holds the current "month, year" */
+  font-weight: bold;
+  padding: 1px;
+  border: 1px solid #000;
+  background: ActiveCaption;
+  color: CaptionText;
+  text-align: center;
+}
+
+.calendar thead .headrow { /* Row <TR> containing navigation buttons */
+}
+
+.calendar thead .daynames { /* Row <TR> containing the day names */
+}
+
+.calendar thead .name { /* Cells <TD> containing the day names */
+  border-bottom: 1px solid ButtonShadow;
+  padding: 2px;
+  text-align: center;
+  background: ButtonFace;
+  color: ButtonText;
+}
+
+.calendar thead .weekend { /* How a weekend day name shows in header */
+//  color: #f00;
+}
+
+.calendar thead .hilite { /* How do the buttons in header appear when hover */
+  border: 2px solid;
+  padding: 0px;
+  border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
+}
+
+.calendar thead .active { /* Active (pressed) buttons in header */
+  border-width: 1px;
+  padding: 2px 0px 0px 2px;
+  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
+}
+
+/* The body part -- contains all the days in month. */
+
+.calendar tbody .day { /* Cells <TD> containing month days dates */
+  width: 2em;
+  text-align: right;
+  padding: 2px 4px 2px 2px;
+}
+.calendar tbody .day.othermonth {
+  font-size: 80%;
+  color: #aaa;
+}
+.calendar tbody .day.othermonth.oweekend {
+  color: #faa;
+}
+
+.calendar table .wn {
+  padding: 2px 3px 2px 2px;
+  border-right: 1px solid ButtonShadow;
+  background: ButtonFace;
+  color: ButtonText;
+}
+
+.calendar tbody .rowhilite td {
+//  background: Highlight;
+//  color: HighlightText;
+}
+
+.calendar tbody td.hilite { /* Hovered cells <TD> */
+  padding: 1px 3px 1px 1px;
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+}
+
+.calendar tbody td.active { /* Active (pressed) cells <TD> */
+//  padding: 2px 2px 0px 2px;
+//  border: 1px solid;
+//  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
+}
+
+.calendar tbody td.selected { /* Cell showing selected date */
+  font-weight: bold;
+  border: 1px solid;
+  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
+  padding: 2px 2px 0px 2px;
+  background: ButtonFace;
+  color: ButtonText;
+}
+
+.calendar tbody td.weekend { /* Cells showing weekend days */
+//  color: #f00;
+}
+
+.calendar tbody td.today { /* Cell showing today date */
+  font-weight: bold;
+  color: #00f;
+}
+
+.calendar tbody td.disabled { color: GrayText; }
+
+.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
+  visibility: hidden;
+}
+
+.calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
+  display: none;
+}
+
+/* The footer part -- status bar and "Close" button */
+
+.calendar tfoot .footrow { /* The <TR> in footer (only one right now) */
+}
+
+.calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */
+  background: ButtonFace;
+  padding: 1px;
+  border: 1px solid;
+  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
+  color: ButtonText;
+  text-align: center;
+}
+
+.calendar tfoot .hilite { /* Hover style for buttons in footer */
+  border-top: 1px solid #fff;
+  border-right: 1px solid #000;
+  border-bottom: 1px solid #000;
+  border-left: 1px solid #fff;
+  padding: 1px;
+  background: #e4e0d8;
+}
+
+.calendar tfoot .active { /* Active (pressed) style for buttons in footer */
+  padding: 2px 0px 0px 2px;
+  border-top: 1px solid #000;
+  border-right: 1px solid #fff;
+  border-bottom: 1px solid #fff;
+  border-left: 1px solid #000;
+}
+
+/* Combo boxes (menus that display months/years for direct selection) */
+
+.calendar .combo {
+  position: absolute;
+  display: none;
+  width: 4em;
+  top: 0px;
+  left: 0px;
+  cursor: default;
+  border: 1px solid;
+  border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
+  background: Menu;
+  color: MenuText;
+  font-size: 90%;
+  padding: 1px;
+}
+
+.calendar .combo .label,
+.calendar .combo .label-IEfix {
+  text-align: center;
+  padding: 1px;
+}
+
+.calendar .combo .label-IEfix {
+  width: 4em;
+}
+
+.calendar .combo .active {
+  padding: 0px;
+  border: 1px solid #000;
+}
+
+.calendar .combo .hilite {
+  background: Highlight;
+  color: HighlightText;
+}
+
+.calendar td.time {
+  border-top: 1px solid ButtonShadow;
+  padding: 1px 0px;
+  text-align: center;
+  background-color: ButtonFace;
+}
+
+.calendar td.time .hour,
+.calendar td.time .minute,
+.calendar td.time .ampm {
+  padding: 0px 3px 0px 4px;
+  border: 1px solid #889;
+  font-weight: bold;
+  background-color: Menu;
+}
+
+.calendar td.time .ampm {
+  text-align: center;
+}
+
+.calendar td.time .colon {
+  padding: 0px 2px 0px 3px;
+  font-weight: bold;
+}
+
+.calendar td.time span.hilite {
+  border-color: #000;
+  background-color: Highlight;
+  color: HighlightText;
+}
+
+.calendar td.time span.active {
+  border-color: #f00;
+  background-color: #000;
+  color: #0f0;
+}
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar/calendar.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar/calendar.js
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/countryCodes/countryCodes.dat
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/countryCodes/countryCodes.dat
@ -0,0 +1,14 @@
+00 = USA I
+93 = Australia
+94 = New Zealand
+779 = Argentina
+773 = Uruguay
+30 = France I
+84 = Spain
+45 = Japan
+777 = Bolivia
+80 = Italy I
+73 = Sweden
+40 = Germany
+31 = France II
+254 = Ucrania
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
@ -0,0 +1,9 @@
+</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="shortcut icon" href="<!-- TMPL_VAR NAME='themelang' -->/includes/favicon.ico" type="image/x-icon" />
+<style type="text/css"> 
+	@import url(<!-- TMPL_VAR NAME='themelang' -->/includes/intranet.css);
+</style>
+</head>
+
+<body>
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-open.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-open.inc
@ -0,0 +1,5 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/favicon.ico
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/favicon.ico
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet.css
@ -0,0 +1,46 @@
+body {
+	font-family : Verdana, Geneva, Arial, sans-serif;
+	font-size : .7em;
+}
+
+table {
+	border-collapse : collapse;
+	border-top : 1px solid #CCCCCC;
+	border-right : 1px solid #CCCCCC;
+	margin : 1em 0;
+}
+
+caption {
+	font-size : 140%;
+	text-align : left;
+	font-weight : bold;
+}
+
+td,th {
+	border-left : 1px solid #CCCCCC;
+	border-bottom : 1px solid #CCCCCC;
+	padding : 5px;
+}
+
+th {
+	background-color : #CCCCCC;
+	border-left : 1px solid #999999;
+	border-bottom : 1px solid #999999;
+}
+
+th[scope=row] {
+	background-color : #EEEEEE;
+	text-align : right;
+}
+
+input[type=submit], input[type=button] {
+	background-color : #6699cc;
+	color : #FFFFFF;
+	font-size : 1em;
+	font-weight : bold;
+}
+
+tr.highlight td, tr.highlight th {
+	background-color : #EEEEEE;
+}
+
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/labelConfig/itemsLabelConfig.conf
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/labelConfig/itemsLabelConfig.conf
@ -0,0 +1,8 @@
+marginBottom = 25
+pageType = A4
+columns = 5
+systemDpi = 96
+labelHeigth = 21
+rows = 13
+marginLeft = 2
+labelWidth = 41
--- a/koha-tmpl/intranet-tmpl/prog/en/members/deletemem.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/deletemem.tmpl
@ -0,0 +1,14 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Cannot Delete Member<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+	<h3>Cannot Delete Member</h3>
+		<!-- TMPL_IF name="ItemsOnIssues" -->
+			Member has <!-- TMPL_VAR name="ItemsOnIssues" --> item(s) checked out.
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="charges -->
+			Member has <!-- TMPL_VAR name="charges" --> in fines.
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF name="guarantees" -->
+			Member's record has child accounts attached.
+		<!-- /TMPL_IF -->
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/members/jmemberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/jmemberentry.tmpl
@ -0,0 +1,56 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Add Child<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<form action="/cgi-bin/koha/newjmember.pl" method="post">
+	<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="member" -->" />
+	<input type="hidden" name="updtype" value="I" />
+	<input type="hidden" name="area" value="<!-- TMPL_VAR NAME="area" -->" />
+	<input type="hidden" name="city" value="<!-- TMPL_VAR NAME="city" -->" />
+	<input type="hidden" name="physstreet" value="<!-- TMPL_VAR NAME="physstreet" -->" />
+	<input type="hidden" name="streetaddress" value="<!-- TMPL_VAR NAME="streetaddress" -->" />
+	<input type="hidden" name="streetcity" value="<!-- TMPL_VAR NAME="streetcity" -->" />
+	<input type="hidden" name="phone" value="<!-- TMPL_VAR NAME="phone" -->" />
+	<input type="hidden" name="phoneday" value="<!-- TMPL_VAR NAME="phoneday" -->" />
+	<input type="hidden" name="faxnumber" value="<!-- TMPL_VAR NAME="faxnumber" -->" />
+	<input type="hidden" name="emailaddress" value="<!-- TMPL_VAR NAME="emailaddress" -->" />
+	<input type="hidden" name="contactname" value="<!-- TMPL_VAR NAME="contactname" -->" />
+	<input type="hidden" name="altphone" value"<!-- TMPL_VAR NAME="altphone" -->" />
+
+	<h1>Add Child</h1>
+<table>
+  <caption>Parent or Guardian</caption>
+	<tr><th scope="row"><label for="firstname_guardian">First Name</label></th><td><input type="text" name="firstname_guardian" id="firstname_guardian" size="20" value="<!-- TMPL_VAR NAME="firstname" -->" /></td></tr>
+		<tr><th scope="row"><label for="surname_guardian">Last Name</label></th><td><input type="text" name="surname_guardian" id="surname_guardian" size="20" value="<!-- TMPL_VAR NAME="surname" -->" /></td></tr>
+		<tr><th scope="row"><label for="guardian_number">Library Card Number</label></th><td><input type="text" name="guardian_number" id="guardian_number" size="20" value="<!-- TMPL_VAR NAME="cardnumber" -->" /></td></tr>
+</table></div>
+
+	<div class="table"><!-- TMPL_LOOP NAME="cmemloop" -->
+	<table>
+		<caption>Child <!-- TMPL_VAR NAME="count" --></caption>
+	<tr>
+		<th scope="row"><label for="cmember">Member Number</label></th><td><!-- TMPL_VAR NAME="cmember" --></td>
+	</tr>
+	<tr>
+	<th scope="row"><label for="cardnumber_child_<!-- TMPL_VAR NAME="i" -->">Card Number</label></th><td><input type="text" id="cardnumber_child_<!-- TMPL_VAR NAME="i" -->" name="cardnumber_child_<!-- TMPL_VAR NAME="i" -->" size="20" value="<!-- TMPL_VAR NAME="jcardnumber" -->" /><input type="hidden" name="bornumber_child_<!-- TMPL_VAR NAME="i" -->" value="<!-- TMPL_VAR NAME="cmember" -->" /></td>
+	</tr>
+	<tr>
+		<th scope="row"><label for="firstname_child_<!-- TMPL_VAR NAME="i" -->">First Name(s)</label></th><td><input type="text" id="firstname_child_<!-- TMPL_VAR NAME="i" -->" name="firstname_child_<!-- TMPL_VAR NAME="i" -->" size="20"  /></td></tr>
+		<tr><th scope="row"><label for="surname_child_<!-- TMPL_VAR NAME="i" -->">Last Name</label></th><td><input type="text" id="surname_child_<!-- TMPL_VAR NAME="i" -->" name="surname_child_<!-- TMPL_VAR NAME="i" -->" size="20"  /></td></tr>
+		<tr><th scope="row"><label for="dateofbirth_child_<!-- TMPL_VAR NAME="i" -->">Date of Birth (<!-- TMPL_VAR NAME="dateformat" -->)</label></th><td><input type="text" name="dateofbirth_child_<!-- TMPL_VAR NAME="i" -->" id="dateofbirth_child_<!-- TMPL_VAR NAME="i" -->" size="10"  /></td></tr>
+		<tr><th scope="row"><label for="sex_child_<!-- TMPL_VAR NAME="i" -->">Sex</label></th><td>
+			<input type="radio" id="sex_child_<!-- TMPL_VAR NAME="i" -->" name="sex_child_<!-- TMPL_VAR NAME="i" -->" value="F" />F
+			<input type="radio" name="sex_child_<!-- TMPL_VAR NAME="i" -->" value="M" />M
+		</td></tr>
+	<tr><th scope="row"><label for="school_child_<!-- TMPL_VAR NAME="i" -->">School</label></th><td><input type="text" id="school_child_<!-- TMPL_VAR NAME="i" -->" name="school_child_<!-- TMPL_VAR NAME="i" -->" size="20" ></td>
+	</tr>
+	<tr>
+		<th scope="row"><label for="altnotes_child_<!-- TMPL_VAR NAME="i" -->">Notes</label></th><td><textarea name="altnotes_child_<!-- TMPL_VAR NAME="i" -->" id="altnotes_child_<!-- TMPL_VAR NAME="i" -->" cols="40" rows="3"></textarea></td>
+	</tr>
+	</table>
+	<!-- /TMPL_LOOP -->
+
+<input type="submit" value="Add New Member" />
+
+</form>
+
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/members/member-flags.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/member-flags.tmpl
@ -0,0 +1,27 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Set Privileges for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<form method="post" action="/cgi-bin/koha/members/member-flags.pl">
+	<input type="hidden" name="member" value="<!-- TMPL_VAR NAME="member" -->" />
+	<input type="hidden" name="newflags" value="1" />
+<table>
+	<caption>Set Privileges for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></caption>
+	<tr><th scope="col">Flag</th><th scope="col">Name</th><th scope="col">Description</th></tr>
+	<!-- TMPL_LOOP NAME="loop" -->
+		<tr>
+			<td>
+				<input type="checkbox" id="flag-<!-- TMPL_VAR NAME="bit" -->" name="flag-<!-- TMPL_VAR NAME="bit" -->" <!-- TMPL_VAR NAME="checked" --> />
+			</td>
+			<td>
+				<label for="flag-<!-- TMPL_VAR NAME="bit" -->"><!-- TMPL_VAR NAME="flag" --></label>
+			</td>
+			<td>
+				<!-- TMPL_VAR NAME="flagdesc" -->
+			</td>
+		</tr>
+	<!-- /TMPL_LOOP -->
+	</table>
+
+<input type="submit" value="Set Flags" />
+
+</form>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/members/member-password.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/member-password.tmpl
@ -0,0 +1,23 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="newpassword" -->Password Updated <!-- TMPL_ELSE -->Update Password for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --><!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<!-- TMPL_IF NAME="newpassword" -->
+<h3>Password Updated</h3>
+
+<!-- TMPL_ELSE -->
+
+<form method="post" action="/cgi-bin/koha/members/member-password.pl">
+<h3>Change Username and/or Password for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h3>
+	
+	<!-- TMPL_IF NAME="warn" -->
+		<p>You have entered a User ID that already exists.  Please choose another one.</p>
+	<!-- /TMPL_IF -->
+
+<table><tr><th scope="row">New UserID:</th><td><input type="hidden" name="member" value="<!-- TMPL_VAR NAME="member" -->" />
+	
+<input name="newuserid" size="20" value="<!-- TMPL_VAR NAME=userid -->" /></td></tr>
+<tr><th scope="row">New Password:</th><td><input name="newpassword" type="text" size="20" value="<!-- TMPL_VAR NAME="defaultnewpassword" -->" /></td></tr></table>
+
+<input type="submit" value="Confirm Password" /> 
+</form><!-- /TMPL_IF -->
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/members/member-quicksearch-results.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/member-quicksearch-results.tmpl
@ -0,0 +1,41 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Patron Quick Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<script type="text/javascript">
+  // Set the value of the form field to the passed value and optionally shift
+	// focus and close the popup.
+	function FillForm(val,formname,formfield) {
+	
+		document.forms[formname].elements[formfield].value = val;
+
+		// Uncomment below to shift focus after clicking link in popup.
+		document.forms[formname].elements[formfield].focus();
+		
+		// Uncomment below to close popup after clicking link.
+		newwin.close();
+	}
+</script>
+
+<table>
+  <tr>
+  	<th>&nbsp;</th>
+    <th>Card</th>
+    <th>Name (Cat.)</th>
+    <th>Address</th>
+  </tr>
+  <!-- TMPL_IF NAME="resultsloop" -->
+  <!-- TMPL_LOOP NAME="resultsloop" -->
+    <!-- TMPL_IF NAME="background" -->
+    <tr class="highlight">
+    <!-- TMPL_ELSE -->
+    <tr>
+    <!-- /TMPL_IF -->
+	 <td><form action="member-search-results.pl" method="get"><input type="button" value="Choose" title="Choose this Patron" onclick="window.opener.FillForm('<!-- TMPL_VAR NAME="cardnumber" -->','mainform','member'); return false;" /></form></td>
+      <td><!-- TMPL_VAR NAME="cardnumber" --></td>
+      <td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> (<!-- TMPL_VAR NAME="categorycode" -->)</td>
+      <td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city --></td>
+    </tr>
+  <!-- /TMPL_LOOP --></table>
+  <!-- TMPL_ELSE -->No results found<!-- /TMPL_IF -->
+
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/members/member-quicksearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/member-quicksearch.tmpl
@ -0,0 +1,8 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Patron Quick Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+	<form action="/cgi-bin/koha/members/member.pl" method="post" id="mainform" class="mainform">
+	<label for="member">Patron Search:</label><input id="member" type="text" size="25" name="member" /><input type="hidden" name="quicksearch" value="1" />
+	<input type="submit" value="Search" />
+	</form>
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/member.tmpl
@ -0,0 +1,31 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Member Search Results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<table>
+<caption>Member Search Results</caption>
+  <tr>
+    <th>Card</th>
+    <th>Name</th>
+    <th>Cat</th>
+    <th>Address</th>
+    <th>OD/Issues</th>
+	<th>Charges</th>
+    <th>Notes</th>
+  </tr>
+  <!-- TMPL_IF NAME="resultsloop" -->
+  <!-- TMPL_LOOP NAME="resultsloop" -->
+  
+  <tr> <td><!-- TMPL_VAR NAME="cardnumber" --></td>
+      <td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> </td>
+      <td><!-- TMPL_VAR NAME="categorycode" --></td>
+      <td><!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME=city --></td>
+      <td><!-- TMPL_VAR NAME="odissue" --></td>
+	<td><!-- TMPL_VAR NAME="fines" --></td>
+      <td><!-- TMPL_VAR NAME="borrowernotes" --></td>
+</tr>
+    <!-- /TMPL_LOOP -->
+  <!-- TMPL_ELSE --><td colspan="6">No results found</td><!-- /TMPL_IF -->
+</table>
+
+
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/members/memberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/memberentry.tmpl
@ -0,0 +1,153 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="modify" -->Edit Record<!-- TMPL_ELSE -->Add New <!-- TMPL_IF NAME="institution" -->Institutional <!-- /TMPL_IF -->Member<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+	<!-- TMPL_IF NAME="addAction" -->
+	<h1>
+		Add New <!-- TMPL_IF NAME="institution" -->Institutional <!-- /TMPL_IF -->Member
+	</h1>
+	<!-- TMPL_ELSE -->
+	<h1>
+		Update <!-- TMPL_IF NAME="institution" -->Institutional <!-- /TMPL_IF -->Member Details
+</h1>
+<h2><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR name="firstname" --></h2>
+	<!-- /TMPL_IF -->
+
+	<!-- TMPL_IF Name="NOK" -->
+		
+		<h3>Missing Information</h3>
+			<p>The following fields have a forbidden value. Correct them and press OK again :</p><ul>
+			<!-- TMPL_IF NAME="ERROR_surname" -->
+				<li><a href="#lastname">Last Name</a></li>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="ERROR_firstname" -->
+				<li><a href="#firstname">First Name</a></li>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="ERROR_gender" -->
+				<li><a href="sex">Sex</a></li>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="ERROR_address" -->
+				<li><a href="#address">Mailing Address</a></li>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="ERROR_city" -->
+				<li><a href="#city">Mailing Address City/State</a><br>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="ERROR_cardnumber" -->
+				<li><a href="#cardnumber">Card Number</a></li>
+			<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="ERROR_invalid_cardnumber" -->
+				<li><a href="#cardnumber">Invalid Card Number</a></li>
+			<!-- /TMPL_IF -->
+			</ul>
+		
+	<!-- /TMPL_IF -->
+	<form action="/cgi-bin/koha/members/memberentry.pl" method="post">
+		<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
+		<input type="hidden" name="type" value="borrowers" />
+		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
+		<input type="hidden" name="updtype" value="<!-- TMPL_VAR NAME="updtype" -->" />
+	<input type="hidden" name="actionType" value="<!-- TMPL_VAR NAME="actionType" -->" />
+		<!-- TMPL_IF NAME="addAction" -->
+			<input type="hidden" name="op" value="add" />
+		<!-- TMPL_ELSE -->
+			<input type="hidden" name="op" value="modify" />
+		<!-- /TMPL_IF -->
+<table>
+	<!-- TMPL_UNLESS name="institution" --><tr><th scope="row"><label for="title">Salutation:</label></th><td><!-- TMPL_VAR NAME="Mr" -->
+				<select name="title" id="title">
+					<option <!-- TMPL_VAR NAME="title_selected_ " --> value="">No Title</option>
+					<option value="Miss" <!-- TMPL_VAR NAME="title_Miss" -->>Miss</option>
+					<option value="Mrs" <!-- TMPL_VAR NAME="title_Mrs" -->>Mrs</option>
+					<option value="Ms" <!-- TMPL_VAR NAME="title_Ms" -->>Ms</option>
+					<option <!-- TMPL_VAR NAME="title_Mr" --> value="Mr" >Mr</option>
+					<option value="Dr" <!-- TMPL_VAR NAME="title_Dr" -->>Dr</option>
+					<option value="Sir" <!-- TMPL_VAR NAME="title_Sir" -->>Sir</option>
+				</select>
+				</td></tr><!-- /TMPL_UNLESS -->
+	<tr><th scope="row"><label for="surname"><a name="lastname" id="lastname"><!-- TMPL_IF NAME="institution" -->Institution name:<!-- TMPL_ELSE -->Last Name: <!-- /TMPL_IF --></a></label></th><td><input type="text" id="surname" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->"></td></tr>
+
+	<!-- TMPL_UNLESS name="institution" --><tr><th scope="row"><label for="firstname"<!-- TMPL_IF NAME="ERROR_firstname" --> class="focus"<!-- /TMPL_IF -->><a name="firstname" id="firstname">First Name:</a></label> </th><td><input type="text" id="firstname" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" -->"<!-- TMPL_IF NAME="ERROR_firstname" --> class="focus"<!-- /TMPL_IF -->></td></tr><!-- /TMPL_UNLESS -->
+				
+	<!-- TMPL_UNLESS name="institution" --><tr><th scope="row"><label for="initials">Initials:</label></th><td><input type="text" id="initials" name="initials" size="5" value="<!-- TMPL_VAR NAME="initials" -->"></td></tr><!-- /TMPL_UNLESS -->
+					
+	<!-- TMPL_UNLESS name="institution" --><tr><th scope="row"><label for="othernames">Prefered Name:</label></th><td><input type="text" id="othernames" name="othernames" size="20" value="<!-- TMPL_VAR NAME="othernames" -->"></td></tr><!-- /TMPL_UNLESS -->
+
+<!-- TMPL_UNLESS name="institution" --><tr><th scope="row"><label for="sex"><a name="sex" id="sex">Sex:</a> </label></th><td><input type="radio" id="sex" name="sex" value="F"<!-- TMPL_IF NAME="female" --> checked="checked"<!-- /TMPL_IF -->>F	<input type="radio" name="sex" value="M"<!-- TMPL_UNLESS name="female" --> checked="checked"<!-- /TMPL_UNLESS -->> M</td>
+</tr><!-- /TMPL_UNLESS -->
+
+<!-- TMPL_UNLESS name="institution" --><tr><th scope="row"><label for="dateofbirth">Date of Birth: </label></th><td><input type="text" id="dateofbirth" name="dateofbirth" size="10" value="<!-- TMPL_VAR NAME="dateofbirth" -->"> (<!-- TMPL_VAR NAME="dateformat" -->)</td>
+</tr><!-- /TMPL_UNLESS -->
+
+	<tr><th scope="row">Addresses:</th><td><fieldset><legend>Mailing Address</legend><label for="streetaddress"<!-- TMPL_IF NAME="ERROR_address" --> class="focus"<!-- /TMPL_IF -->><a name="address" id="address">Address:</a> </label><input type="text" id="streetaddress" name="streetaddress" size="25" value="<!-- TMPL_VAR NAME="address" -->"<!-- TMPL_IF NAME="ERROR_address" --> class="focus"<!-- /TMPL_IF -->>
+<br><label for="city"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF -->><a name="#city" id="#city">City, State:</a></label> <input type="text" id="city" name="city" size="20" value="<!-- TMPL_VAR NAME="city" -->"<!-- TMPL_IF NAME="ERROR_city" --> class="focus"<!-- /TMPL_IF --> />
+<br><label for="zipcode">Zip Code:</label> <input type="text" id="zipcode" name="zipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="zipcode" -->"></fieldset>
+
+<fieldset><legend>Street Address (if different)</legend>
+<label for="physstreet">Address:</label><input type="text" id="physstreet" name="physstreet" size="25" value="<!-- TMPL_VAR NAME="physstreet" -->" />
+<br><label for="streetcity">City, State: </label><input type="text" id="streetcity" name="streetcity" size="20" value="<!-- TMPL_VAR NAME="streetcity" -->" />
+<br><label for="homezipcode">Zip Code:</label><input type="text" id="homezipcode" name="homezipcode" size="20" maxlength="20" value="<!-- TMPL_VAR NAME="homezipcode" -->" /> 
+</fieldset>
+</td></tr>
+
+	<tr><th scope="row"><label for="phone">Phone (Home):</label> </th><td><input type="text" id="phone" name="phone" size="20" value="<!-- TMPL_VAR NAME="phone" -->" /></td></tr>
+	<tr><th scope="row"><label for="phoneday">Phone (Daytime):</label> </th><td><input type="text" id="phoneday" name="phoneday" size="20" value="<!-- TMPL_VAR NAME="phoneday" -->" /></td></tr>
+	<tr><th scope="row"><label for="faxnumber">Fax: </label></th><td><input type="text" id="faxnumber" name="faxnumber" size="20" value="<!-- TMPL_VAR NAME="faxnumber" -->" /></td></tr>
+	<tr><th scope="row"><label for="emailaddress">Email :</label> </th><td><input type="text" id="emailaddress" name="emailaddress" size="40" value="<!-- TMPL_VAR NAME="emailaddress" -->" /></td></tr>
+			</tr>
+	<tr><th scope="row"><label for="textmessaging">Member message:</label><p> (appears in OPAC)</p></th><td><textarea id="textmessaging" name="textmessaging" cols="30" rows="3"><!-- TMPL_VAR NAME="textmessaging" --></textarea></td></tr>
+	<tr><th scope="row"><label for="borrowernotes">Circulation note:</label> <p>(appears in Circulation)</p> </th><td><textarea id="borrowernotes" name="borrowernotes" cols="30" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea></td></tr>
+
+			<tr>
+				<!-- TMPL_IF NAME="addAction" -->
+					<th scope="row">Joining date (leave blank for today): </th>
+					<td><input type="text" name="joining" size="12" maxlength="10" value="<!-- TMPL_VAR name="joining" -->" /></td>
+				<!-- TMPL_ELSE -->
+					<th scope="row">Joining date: </th>
+					<td><!-- TMPL_VAR name="joining" --></td>
+				<!-- /TMPL_IF -->
+			</tr>
+			<tr>
+				<th scope="row">Expiry date (leave blank for auto calc): </th>
+				<td><input type="text" name="expiry" size="12" maxlength="10" value="<!-- TMPL_VAR name="expiry" -->" /></td>
+			</tr>
+
+			</table>
+
+
+<!-- TMPL_UNLESS name="institution" -->
+		<table>
+		<caption>Alternate Contact</caption>
+		<tr><th scope="row"><label for="contactname">Name: </label></th><td><input type="text" id="contactname"  name="contactname" size="40" value="<!-- TMPL_VAR NAME="contactname" -->"></td></tr>
+		<tr><th scope="row"><label for="altphone">Phone:</label> </th><td><input type="text" id="altphone" name="altphone" size="20" value="<!-- TMPL_VAR NAME="altphone" -->"></td></tr>
+		<tr><th scope="row"><label for="altrelationship">Relationship:</label> </th><td><select id="altrelationship" name="altrelationship" size="1">
+					<!-- TMPL_LOOP NAME="relshiploop" -->
+						<option <!-- TMPL_VAR NAME="selected" -->><!-- TMPL_VAR NAME="relationship" --></option>
+					<!-- /TMPL_LOOP -->
+					</select></td></tr>
+		<tr><th scope="row"><label for="altnotes">Notes: </label></th><td><textarea id="altnotes" name="altnotes" cols="30" rows="3"><!-- TMPL_VAR NAME="altnotes" --></textarea></td></tr>
+		</table><!-- /TMPL_UNLESS -->
+
+<table>
+	<caption>Flags</caption>
+	<!-- TMPL_LOOP NAME="flagloop" -->
+	<tr><th scope="row"><label for="<!-- TMPL_VAR NAME="name" -->"><!-- TMPL_VAR NAME="html" --></label></th><td><input type="radio" id="<!-- TMPL_VAR NAME="name" -->" name="<!-- TMPL_VAR NAME="name" -->" value="1" <!-- TMPL_VAR NAME="yes" -->>Yes <input type="radio" name="<!-- TMPL_VAR NAME="name" -->" value="0" <!-- TMPL_VAR NAME="no" -->>No</td></tr>
+				<!-- /TMPL_LOOP -->
+</table>
+
+<table>
+<caption>Member Details</caption>
+	<!-- TMPL_UNLESS NAME="addAction" --><tr><th scope="row"><label>Member Number:</label></th><td><span class="ex"><!-- TMPL_VAR NAME="member" --></span></td></tr><!-- /TMPL_UNLESS -->
+	<tr><th scope="row"><label for="categorycode">Category:</label> </th><td><!-- TMPL_VAR NAME="catcodepopup" --></td></tr>
+	<tr><th scope="row"><label for="branchcode">Branch:</label></th><td><!-- TMPL_VAR NAME="CGIbranch" --></td></tr>	
+	<tr><th scope="row"><label for="cardnumber"<!-- TMPL_IF NAME="ERROR_cardnumber" --> class="focus"<!-- /TMPL_IF --><!-- TMPL_IF NAME="ERROR_invalid_cardnumber" --> class="focus"<!-- /TMPL_IF -->><a name="cardnumber" id="cardnumber">Card Number</a></label></th><td><input id="cardnumber" type="text" name="cardnumber" size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->"<!-- TMPL_IF NAME="ERROR_cardnumber" --> class="focus"<!-- /TMPL_IF --><!-- TMPL_IF NAME="ERROR_invalid_cardnumber" --> class="focus"<!-- /TMPL_IF -->></td></tr>
+</table>
+<table><caption>Additional Fields</caption>
+	<tr><th scope="row"><label for="sort1">Sorting field 1</label></th><td><input type="text" id="sort1" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->"></td><td rowspan="2"><p>These fields are available for your own usage. They can be useful for statistical purposes</p></td></tr>
+	<tr><th scope="row"><label for="sort2">Sorting field 2</label></th><td><input type="text" id="sort2" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->"></td></tr>
+</table>
+
+
+<input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->">
+	<input name="submit" type="submit" class="submit" value="<!-- TMPL_IF NAME="modify" -->Update<!-- TMPL_ELSE -->Add<!-- /TMPL_IF --> This Member" />
+	</form>
+
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/members/members-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/members-home.tmpl
@ -0,0 +1,17 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Member Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<title>Member Search</title>
+</head>
+<body>
+<h1>Member Search</h1>
+
+	<form action="/cgi-bin/koha/members/member.pl" method="post">
+	<label for="member">Name or Barcode</label><input id="member" type="text" size="25" name="member" />
+ <select name="orderby" id="orderby">
+			<option value="surname,firstname">Order by Last Name</option>
+			<option value="cardnumber">Order by Card Number</option>
+		</select>
+	<input type="submit" value="Search" />
+	</form>
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/members/moremember-print.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/moremember-print.tmpl
@ -0,0 +1,60 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Summary for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)<!-- TMPL_INCLUDE NAME="doc-head-close-print.inc" -->
+
+<!-- main site -->
+
+<h3><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber" -->">Account Summary: <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</a></h3>
+
+<ul><li><!-- TMPL_VAR NAME="streetaddress" --></li><li><!-- TMPL_VAR NAME="city" -->, <!-- TMPL_VAR NAME="zipcode" --></li>
+<li><!-- TMPL_IF NAME="phone" --><!-- TMPL_VAR NAME="phone" --><!-- TMPL_ELSE -->(no phone number on file)<!-- /TMPL_IF --></li>
+<li><!-- TMPL_IF NAME="emailaddress" --><!-- TMPL_VAR NAME="emailaddress" --><!-- TMPL_ELSE -->(no email on file)<!-- /TMPL_IF --></li>
+</ul>
+
+<table>
+	<caption>Items Checked Out</caption>
+	<tr>
+		<th>Title</th>
+		<th>Author</th>
+		<th>Format</th>
+		<th>Date Due</th>
+		<th>Status</th>
+	</tr>
+
+	<!-- TMPL_loop name="issueloop" -->
+	<tr<!-- TMPL_IF name="red" --> class="overdue"</TMPL_IF>>
+		<td>
+		<!-- TMPL_VAR NAME="title" -->
+		<a href="/cgi-bin/koha/detail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->">
+		</a>
+		</td>
+		<td><!-- TMPL_VAR NAME="author" --></td>
+		<td><!-- TMPL_VAR NAME="itemtype" --></td>
+		<td><!-- TMPL_VAR NAME="date_due" --></td>
+		<td><!-- TMPL_IF NAME="red" -->Overdue!<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
+	</tr>
+	<!-- /TMPL_LOOP -->
+	</table>
+	
+<table>
+	<caption>Items on Reserve</caption>
+	<tr>
+		<th>Title</th>
+		<th>Author</th>
+		<th>Format</th>
+		<th>Requested</th>
+	</tr>
+
+<!-- TMPL_loop name="reserveloop" -->
+	<tr>
+		<td><a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a></td>
+		<td><!-- TMPL_VAR NAME="author" --></td>
+		<td><!-- TMPL_VAR NAME="description" --></td>
+		<td><!-- TMPL_VAR NAME="reservedate2" --></td>
+	</tr>
+	<!-- /tmpl_loop -->
+
+</table>
+
+
+<!-- endmenu -->
+
+<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/members/moremember-receipt.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/moremember-receipt.tmpl
@ -0,0 +1,44 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Print Receipt for <!-- TMPL_VAR NAME="cardnumber" --><!-- TMPL_INCLUDE NAME="doc-head-close-receipt.inc" -->
+
+<!-- main site -->
+
+<h3>Athens County Library</h3>
+<!-- TMPL_IF NAME="branchname" --><!-- TMPL_VAR NAME="branchname" --><br><!-- /TMPL_IF -->
+Issued To <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber">"><!-- TMPL_VAR NAME="cardnumber" --></a><br>
+<!-- TMPL_VAR NAME="todaysdate" --><br>
+<table>
+	<caption>Issues</caption>
+	<tr>
+		<th>Date Due</th>
+		<th>Title</th>
+	</tr>
+
+	<!-- TMPL_loop name="issueloop" -->
+	<!-- TMPL_IF name="red" --><!-- TMPL_ELSE -->
+		<tr>
+		<td><!-- TMPL_VAR NAME="date_due" --></td>
+		<td><a href="/cgi-bin/koha/detail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
+		</tr>
+	<!-- /TMPL_IF -->
+	<!-- /TMPL_LOOP -->
+	</table>
+	
+	<table>
+	<caption>Overdues</caption>
+	<tr>
+	<th>Date Due</th>
+	<th>Title</th>
+	</tr>
+	<!-- TMPL_LOOP NAME="issueloop" -->
+	<!-- TMPL_IF NAME="red" --><tr>
+	<td><!-- TMPL_VAR NAME="date_due" --></td>
+	<td><a href="/cgi-bin/koha/detail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="title" --></a></td>
+	</tr>
+	<!-- /TMPL_IF -->
+	<!-- /TMPL_LOOP -->
+	</table>
+
+
+<!-- endmenu -->
+
+<!-- TMPL_INCLUDE name="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl
@ -0,0 +1,175 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Member Details<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<h1><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</h1>
+
+<ul>
+	<!-- TMPL_IF name="IS_ADULT" --><li> <form action="/cgi-bin/koha/members/jmemberentry.pl" method="post"> <input type="submit" name="submit" value="Add Child" alt="Add Child" /><input type="hidden" name="type" value="add" /><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /></form></li><!-- /TMPL_IF -->
+	<li><!-- TMPL_IF name="I" --><form action="/cgi-bin/koha/members/imemberentry.pl" method="post"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="bornum" -->" /> <input type="submit" name="modify" value="Edit this Record" /></form><!-- TMPL_ELSE --> <form action="/cgi-bin/koha/members/memberentry.pl" method="post"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="bornum" -->" /> <input type="submit" name="modify" value="Edit this Record" /></form><!-- /TMPL_IF --></li>
+	<li><form action="/cgi-bin/koha/members/member-password.pl" method="post"><input type="hidden" name="member" value="<!-- TMPL_VAR NAME=bornum -->" /> <input type="submit" value="Change Member's Password" /></form></li>
+	<li> <form action="/cgi-bin/koha/members/member-flags.pl" method="post"><input type="hidden" name="member" value="<!-- TMPL_VAR NAME=bornum -->" /> <input type="submit" value="Modify Member's Privileges" /></form></li>
+	<li><form action="/cgi-bin/koha/members/deletemem.pl?member=<!-- TMPL_VAR NAME="bornum" -->"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="bornum" -->"><input type="submit" class="cancel" value="Delete this Member"></form></li>
+	<li><form action="/cgi-bin/koha/boraccount.pl" method="get"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /><input type="submit" value="View Account" /></form></li>
+	<li>	<form action="/cgi-bin/koha/pay.pl" method="get"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /><input type="submit" value="Pay Fines" /></form></li>
+<li><form action="/cgi-bin/koha/readingrec.pl" method="get"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /> <input type="submit" value="Member's Reading Record" /></form></li>
+</ul>
+
+<!-- TMPL_IF NAME="flagged" -->
+	<ul>
+		<!-- TMPL_IF NAME="debarred" --><li>Patron is debarred <form class="inline compact" action="/cgi-bin/koha/members/setdebar.pl" method="post"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /><input type="hidden" name="status" value="0" /><input type="submit" value="Lift Debarment" /></form></li><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="gonenoaddress" --><li>Patron's address is in doubt.</li><!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="lost" --><li>Patron's card has been reported lost.</li><!-- /TMPL_IF -->
+	</ul>
+
+<!-- /TMPL_IF -->
+
+<table>
+<caption>Borrower Information</caption>
+<tr><th scope="row">Title (borrowers.title): </th><td><!-- TMPL_VAR NAME="title" --></td></tr>
+<tr><th scope="row">First Name (borrowers.firstname):</th><td><!-- TMPL_VAR NAME="firstname" --></td></tr>
+<tr><th scope="row">Last Name (borrowers.lastname): </th><td></td></tr>
+<tr><th scope="row">Othernames (borrowers.othernames): </th><td><!-- TMPL_VAR NAME="othernames" --></td></tr>
+<tr><th scope="row">Initials (borrowers.initials): </th><td><!-- TMPL_VAR NAME="initials" --></td></tr>
+<tr><th scope="row">Street Address (borrowers.streetaddress): </th><td><!-- TMPL_VAR NAME="streetaddress" --></td></tr>
+<tr><th scope="row">City (borrowers.city): </th><td><!-- TMPL_VAR NAME="city" --></td></tr>
+<tr><th scope="row">Zip Code (borrowers.zipcode): </th><td><!-- TMPL_VAR NAME="zipcode" --></td></tr>
+
+<!-- TMPL_UNLESS NAME="I"--><tr><th scope="row">(borrowers.physstreet): </th><td><!-- TMPL_VAR NAME="physstreet" --></td></tr>
+<tr><th scope="row">(borrowers.streetcity): </th><td><!-- TMPL_VAR NAME="streetcity" --></td></tr>
+<tr><th scope="row">(borrowers.homezipcode): </th><td><!-- TMPL_VAR NAME="homezipcode" --></td></tr><!-- /TMPL_UNLESS -->
+
+<tr><th scope="row">Home Phone (borrowers.phone): </th><td><!-- TMPL_VAR NAME="phone" --></td></tr>
+<tr><th scope="row">Daytime Phone (borrowers.phoneday): </th><td><!-- TMPL_VAR NAME="phoneday" --></td></tr>
+<tr><th scope="row">Fax (borrowers.faxnumber): </th><td><!-- TMPL_VAR NAME="faxnumber" --></td></tr>
+<tr><th scope="row">E-mail Address (borrowers.emailaddress):</th><td><!-- TMPL_VAR NAME="emailaddress" --></td></tr>
+
+<!-- TMPL_UNLESS name="I" -->
+<tr><th scope="row">Date of Birth (borrowers.dateofbirth):</th><td><!-- TMPL_VAR NAME="dateofbirth" --></td></tr>
+<tr><th scope="row">Sex (borrowers.sex):</th><td><!-- TMPL_VAR NAME="sex" --></td></tr>
+<!-- /TMPL_UNLESS -->
+
+<tr><th scope="row">Member Number (borrowers.borrowernumber):</th><td><!-- TMPL_VAR NAME="borrowernumber" --></td></tr>
+<tr><th scope="row">Category (borrowers.categorycode):</th><td><!-- TMPL_VAR NAME="categorycode" --></td></tr>
+<tr><th scope="row">Registration Date (borrowers.dateenrolled):</th><td><!-- TMPL_VAR NAME="dateenrolled" --></td></tr>
+<tr><th scope="row">Expiration Date (borrowers.expiry): </th><td><!-- TMPL_VAR NAME="expiry" --></td></tr>
+<tr><th scope="row">Registration Branch (borrowers.branchcode):</th><td><!-- TMPL_VAR NAME="branchcode" --></td></tr>
+
+<!-- TMPL_IF NAME="printethnicityline" -->
+<tr><th scope="row">Ethnicity (borrowers.ethnicity):</th><td><!-- TMPL_VAR NAME="ethnicity" --></td></tr>
+<tr><th scope="row">Ethnicity Notes (borrowers.ethnotes): </th><td><!-- TMPL_VAR NAME="ethnotes" --></td></tr>
+<!-- /TMPL_IF -->
+
+<tr><th scope="row">Sort field 1 (borrowers.sort1): </th><td><!-- TMPL_VAR NAME="sort1" --></td></tr>
+<tr><th scope="row">Sort field 2 (borrowers.sort2):</th> <td><!-- TMPL_VAR NAME="sort2" --></td></tr>
+<tr><th scope="row">OPAC login (borrowers.userid): </th><td><!-- TMPL_VAR name="userid" --></td></tr>
+<tr><th scope="row">OPAC Password (borrowers.password): </th><td><!-- TMPL_VAR NAME="password" --></td></tr> 
+<tr><th scope="row">Circulation Notes (borrowers.borrowernotes) :</th> <td><!-- TMPL_VAR name="borrowernotes" --></td></tr>
+<tr><th scope="row">Patron Message (borrowers.textmessaging):</th><td><!-- TMPL_VAR NAME="textmessaging" --></td></tr>
+
+<!-- TMPL_UNLESS name="I" -->
+<tr><th scope="row">Alternate Contact Name (borrowers.contactname):</th><td><!-- TMPL_VAR NAME="contactname" --></td></tr>
+<tr><th scope="row">Alternate Contact Phone (borrowers.altphone): </th><td><!-- TMPL_VAR NAME="altphone" --></td></tr>
+<tr><th scope="row">Alternate Contact Relationship (borrowers.altrelationship):</th><td><!-- TMPL_VAR NAME="altrelationship" --></td></tr>
+<tr><th scope="row">Alternate Contact Notes (borrowers.altnotes): </th><td><!-- TMPL_VAR NAME="altnotes" --></td></tr>
+<!-- /TMPL_UNLESS -->
+
+		<!-- TMPL_UNLESS name="I" -->
+			<!-- TMPL_IF name="isguarantee" -->
+				<!-- TMPL_IF NAME="guaranteeloop" --><tr><th scope="row">Guarantees:</th><td><ul><!-- tmpl_loop name="guaranteeloop" --><li><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME=name --> - <!-- TMPL_VAR NAME="cardnumber" --></a></li><!-- /tmpl_loop --></ul></td></tr><!-- /TMPL_IF -->
+
+			<!-- TMPL_ELSE -->
+
+<!-- TMPL_IF name="guarantorborrowernumber" --><tr><th scope="row">Guarantor:</th>
+					<td><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="guarantorborrowernumber" -->"><!-- TMPL_VAR NAME="guarantorcardnumber" --></a></td></tr><!-- /TMPL_IF -->
+
+			<!-- /TMPL_IF -->
+			
+		<!-- /TMPL_UNLESS -->
+</table>
+
+<h3>Fines &amp; Charges</h3>
+	<!-- TMPL_IF name="totaldue" -->Total Due: <!-- TMPL_VAR NAME="totaldue" -->
+	<!-- TMPL_ELSE -->
+	No Outstanding Charges<!-- /TMPL_IF -->
+
+<form action="renewscript.pl" method="post">
+	<input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" />
+<table>
+	<caption>Items On Loan</caption>
+	<tr>
+		<th scope="col">Title</th>
+		<th scope="col">Due</th>
+		<th scope="col">Itemtype</th>
+		<th scope="col">Charge</th>
+		<th scope="col">Price</th>
+		<th scope="col">Renew</th>
+		<th scope="col">Return</th>
+	</tr>
+
+	<!-- tmpl_loop name="issueloop" -->
+	<tr>
+		<td><!-- TMPL_IF name="red" --><span class="overdue"><!-- /TMPL_IF -->
+		<!-- TMPL_VAR NAME="title" --><!-- TMPL_IF name="red" --></span><!-- /TMPL_IF -->
+		<a href="/cgi-bin/koha/detail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;bib=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->">
+			<!-- TMPL_VAR NAME="barcode" -->
+		</a>
+		</td>
+		<td><!-- TMPL_VAR NAME="date_due" --></td>
+		<td><!-- TMPL_VAR NAME="itemtype" --></td>
+		<td><!-- TMPL_VAR NAME="charge" --></td>
+		<td><!-- TMPL_VAR NAME="replacementprice" --></td>
+		<td>
+		<!-- TMPL_IF name="norenew" -->
+			<a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->">Reserved</a>
+		<!-- TMPL_ELSE -->
+			<input type="checkbox" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="y"<!-- TMPL_IF name="red" -->checked="checked"<!-- /TMPL_IF --> />
+		<!-- /TMPL_IF -->
+		</td>
+		<td><a href="/cgi-bin/koha/circ/returns.pl?barcode=<!-- TMPL_VAR NAME="barcode" -->">Return</a></td>
+	</tr>
+	<!-- /tmpl_loop -->
+	<tfoot><tr><td colspan="3">Total Replacement Cost:</td><td><!-- TMPL_VAR NAME="totalprice" --></td><td colspan="2">&nbsp;</td></tr></tfoot>
+	</table><p><input type="submit" value="Renew Checked Items" /></p>
+</form>
+
+<form action="renewscript.pl" method="post"><input type="hidden" name="bornum" value="<!-- TMPL_VAR NAME="bornum" -->" /><!-- TMPL_LOOP NAME="issueloop" --><!-- TMPL_UNLESS NAME="norenew" --><input type="hidden" name="renew_item_<!-- TMPL_VAR NAME="itemnumber" -->" value="y" /><!-- /TMPL_UNLESS --><!-- /TMPL_LOOP --><input type="submit" value="Renew All" /></form>
+
+
+
+
+	<form action="/cgi-bin/koha/modrequest.pl" method="post">
+	<input type="hidden" name="from" value="borrower" />
+	<table>
+	<caption>Reserves</caption>
+	<tr>
+		<th scope="row">Title</th>
+		<th scope="row">Requested</th>
+		<th scope="row">Remove</th>
+	</tr>
+
+
+
+	<!-- TMPL_LOOP name="reserveloop" -->
+	<tr>
+		<td>
+			<a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="btitle" --></a>
+			<!-- TMPL_IF name="volumeddesc" -->
+				<!-- TMPL_VAR NAME="volumeddesc" -->
+				<!-- TMPL_VAR NAME="itemtype" -->
+			<!-- /TMPL_IF -->
+		</td>
+		<td><!-- TMPL_VAR NAME="reservedate2" --></td>
+		<td>
+			<select name="rank-request">
+			<option value="n">No</option>
+			<option value="del">Yes</option>
+			</select>
+		</td>
+		<input type="hidden" name="biblio" value="<!-- TMPL_VAR NAME="biblionumber" -->" />
+		<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="bornum" -->" />
+	</tr>
+	<!-- /tmpl_loop -->
+
+</table>		<!-- TMPL_IF name="reserveloop" -->
+			<input type="submit" class="cancel" name="submit" value="Cancel Marked Requests" />
+		<!-- /TMPL_IF --></form>
+
--- a/koha-tmpl/intranet-tmpl/prog/en/members/pay.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/pay.tmpl
@ -0,0 +1,44 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Pay Fines for  <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+	<form action="/cgi-bin/koha/pay.pl" method="post"><input type="hidden" name="bornum" value="<!-- TMPL_VAR name="bornum" -->" />
+
+<table>
+<caption>Pay Fines for <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --></caption>
+<tr>
+	<th scope="col">Fines &amp; Charges</th>
+	<th scope="col">Description</th>
+	<th scope="col">Account Type</th>
+	<th scope="col">Amount</th>
+	<th scope="col">Amount Outstanding</th>
+</tr>
+	
+<!-- TMPL_LOOP name="loop_pay" -->
+<tr>
+	<td><select name="payfine<!-- TMPL_VAR name="i" -->">
+	<option value="no">Unpaid</option>
+	<option value="yes">Paid</option>
+	<option value="wo">Writeoff</option>
+	</select>
+	<input type="hidden" name="itemnumber<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="itemnumber" -->" />
+	<input type="hidden" name="accounttype<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="accounttype" -->" />
+	<input type="hidden" name="amount<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="amount" -->" />
+	<input type="hidden" name="out<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="amountoutstanding" -->" />
+	<input type="hidden" name="bornum<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="bornum" -->" />
+	<input type="hidden" name="accountno<!-- TMPL_VAR name="i" -->" value="<!-- TMPL_VAR name="accountno" -->" />
+	</td>
+	<td><!-- TMPL_VAR name="description" --><!-- TMPL_VAR name="title" --></td>
+	<td><!-- TMPL_VAR name="accounttype" --></td>
+	<td class="debit"><!-- TMPL_VAR name="amount" --></td>
+	<td class="debit"><!-- TMPL_VAR name="amountoutstanding" --></td>
+</tr>
+<!-- /TMPL_LOOP -->
+<tfoot>
+<tr>
+	<td colspan="4">Total Due</td>
+	<td class="debit"><!-- TMPL_VAR name="total" --></td>
+	</tr>
+	</tfoot>
+</table>
+<input type="submit" name="submit"  value="Make Payment" class="submit" /></form>
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/members/readingrec.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/readingrec.tmpl
@ -0,0 +1,45 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Reading Record for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_IF NAME="showfulllink" -->
+<ul>
+	<li>Showing All Items</li>
+	<li><a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&amp;limit=full">Show Last 50 Items Only</a></li>
+</ul>
+<!-- TMPL_ELSE -->
+<ul>
+	<li>Showing Last 50 Items</li>
+	<li><a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&amp;limit=full">Show All Items</a></li>
+</ul>
+<!-- /TMPL_IF -->
+<table>
+<caption>Reading Record for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></caption>
+<tr>
+	<th scope="col">
+		<a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&amp;order=title&amp;amp;limit=<!-- TMPL_VAR name="limit" -->">Title</a>
+	</th>
+	<th scope="col">
+		<a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&amp;order=author&amp;limit=<!-- TMPL_VAR name="limit" -->">Author</a>
+	</th>
+	<th scope="col">Call No.</th>
+	<th scope="col">
+		<a href="readingrec.pl?bornum=<!-- TMPL_VAR name="bornum" -->&amp;order=returndate DESC&amp;limit=<!-- TMPL_VAR name="limit" -->">Return Date</a>
+	</th>
+</tr>
+<!-- TMPL_LOOP name="loop_reading" -->
+<tr<!-- TMPL_IF NAME="toggle" --><!-- TMPL_ELSE --> class="highlight"<!-- /TMPL_IF -->>
+	<td<!-- TMPL_IF NAME="returndate" --><!-- TMPL_ELSE --> class="onissue"<!-- /TMPL_IF -->>
+ 		<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR name="title" --></a>
+	</td>
+	<td<!-- TMPL_IF NAME="returndate" --><!-- TMPL_ELSE --> class="onissue"<!-- /TMPL_IF -->>
+ 		<!-- TMPL_VAR name="author" -->
+	</td>
+	<td<!-- TMPL_IF NAME="returndate" --><!-- TMPL_ELSE --> class="onissue"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="classification" --></td>
+	<td<!-- TMPL_IF NAME="returndate" --><!-- TMPL_ELSE --> class="onissue"<!-- /TMPL_IF -->><!-- TMPL_IF NAME="returndate" --><!-- TMPL_VAR name="returndate" --><!-- TMPL_ELSE -->Checked Out<!-- /TMPL_IF -->
+	</td>
+<!-- /TMPL_LOOP -->
+</table>
+
+
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+
+
--- a/koha-tmpl/intranet-tmpl/prog/en/parameters/admin-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/parameters/admin-home.tmpl
@ -0,0 +1,107 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+
+
+<h1>Koha Administration</h1>
+
+<table>
+<caption>System Preferences</caption>
+<tr>
+	<th><a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a></th>
+	<td>Change essential system preferences like MARC flavor, date format, administrator e-mail, and templates.</td>
+</tr>
+</table>
+<table>
+<caption>System parameters </caption>
+<tr>
+<th colspan="2">For best results, configure these parameters in the order they appear</th>
+</tr>
+<tr>
+	<th><a href="/cgi-bin/koha/admin/branches.pl">Library branches</a></th>
+	<td>The different branches you manage with this Koha server.</td>
+</tr>
+<tr>
+	<th><a href="/cgi-bin/koha/admin/aqbookfund.pl">Book funds</a></th>
+	<td>Book fund administration. Remember to edit your book funds before you start editing the budgets.</td>
+</tr>
+<tr>
+	<th><a href="/cgi-bin/koha/admin/currency.pl">Currencies</a></th>
+	<td>Define exchange rates.</td>
+</tr>
+<tr>
+	<th><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></th>
+	<td>Define item types.</td>
+</tr>
+<tr>
+	<th><a href="/cgi-bin/koha/admin/categorie.pl">Borrower categories</a></th>
+	<td>Define the categories of borrowers.</td>
+</tr>
+<tr>
+	<th><a href="/cgi-bin/koha/admin/issuingrules.pl">Issuing rules</a></th>
+	<td>Define issuing rules for branches / borrowers / item types (nb of issues, duration, cost...)</td>
+</tr>
+<tr>
+	<th><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorised values</a></th>
+	<td>Define categories and authorised values for them. Authorised values are used in MARC form to limit and help editing MARC biblios.</td>
+</tr>
+<tr>
+	<th><a href="/cgi-bin/koha/admin/authtypes.pl">Thesaurus Structure</a></th>
+	<td>Define categories and thesaurus/authority MARC structure.</td>
+</tr>
+<tr>
+	<th><a href="/cgi-bin/koha/admin/biblio_framework.pl">Biblio framework (MARC structure)</a></th>
+	<td>the frameworks defined for the MARC editor. Create frameworks, then define the MARC structure (fields &amp; subfields)</td>
+</tr>
+<tr>
+	<th><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Links Koha - MARC DB</a></th>
+	<td>Define links between the Koha standard DB and the MARC one. Note those links can be defined through MARC structure. This tool is just a shortcut to speed up linkage.</td>
+</tr>
+<tr>
+	<th><a href="/cgi-bin/koha/admin/checkmarc.pl">MARC Check</a></th>
+	<td>Checks the MARC structure. USE IT before working with real data. It will show mistakes that can BREAK Koha's database!</td></tr>
+
+<tr>
+<th colspan="2">Various parameters</th>
+</tr>
+<tr>
+	<th><a href="/cgi-bin/koha/admin/printers.pl">Printers</a></th>
+	<td>Printers (UNIX paths).</td>
+</tr>
+<tr>
+	<th><a href="/cgi-bin/koha/admin/stopwords.pl">Stop words</a></th>
+	<td>Words deleted during searches.</td>
+</tr>
+<tr>
+	<th><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 Servers</a></th>
+	<td>Servers to query for MARC data.</td>
+</tr>
+</table>
+
+<table>
+	<caption>Tools</caption>
+	<tr>
+	<th colspan="2">Export</th>
+	</tr>
+	<tr>
+		<th><a href="/cgi-bin/koha/export/marc.pl">MARC biblio export</a></th>
+		<td> Exporting in MARC format.</td>
+	</tr>
+	<tr>
+	<th colspan="2">Import</th>
+	</tr>
+	<tr>
+		<th><a href="/cgi-bin/koha/import/breeding.pl">Upload MARC records to the reservoir</a></th>
+		<td>The reservoir is a table where imported MARC records are stored. A MARC record is stored in the reservoir as long as you have no item. When you type the ISBN or title of a biblio, it's searched for in the reservoir. If it is found, the biblio is added to Koha active table.
+		</td>
+	</tr>
+	<th colspan="2">Barcode generator</th>
+	</tr>
+	<tr>
+		<th><a href="/cgi-bin/koha/barcodes/barcodes.pl">Generate barcodes</a></th>
+		<td>the barcode generator deals with generating barcodes for items you acquire
+		</td>
+	</tr>
+</table>
+
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/parameters/aqbookfund.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/parameters/aqbookfund.tmpl
@ -0,0 +1,147 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: <!-- TMPL_IF name="else" -->Book Funds<!-- /TMPL_IF -->
+<!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="header" --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="add_validate" -->Data Recorded<!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of Fund '<!-- TMPL_VAR name="bookfundname" -->'<!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirmed" -->Data Deleted<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_IF name="else" -->
+<h1>Book Fund Administration</h1>
+<!-- TMPL_IF NAME="bookfund" --><form action="<!-- TMPL_VAR name=scriptname -->" method="post">
+<input type="text" name="searchfield" value="" /> <input type="submit" name="search" value="Search" /></form>
+<!-- TMPL_IF name="search" -->
+	You Searched for <span class="ex"><!-- TMPL_VAR name="searchfield" --></span>
+<!-- /TMPL_IF -->
+
+<table>
+<tr>
+	<th>Book Fund</th>
+	<th>Name</th>
+	<th>Edit</th>
+	<th>Delete</th>
+	</tr>
+<!-- TMPL_LOOP name="bookfund" -->
+	<tr>
+		<td><a href="<!-- TMPL_VAR name="action" -->?op=add_form&amp;bookfundid=<!-- TMPL_VAR name="bookfundid" --> "><!-- TMPL_VAR name="bookfundid" --></a></td>
+		<td><!-- TMPL_VAR name="bookfundname" --></td>
+		<td><form action="<!-- TMPL_VAR name="action" -->" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" /><input type="submit" value="Edit" /></form></td>
+		<td><form action="<!-- TMPL_VAR name="action" -->" method="get"><input type="hidden" name="op" value="delete_confirm" /><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" /><input type="submit" class="delete" value="Delete" /></form></td>
+	</tr>
+		<tr>
+		<td>&nbsp;</td>
+		<td>Budget</td>
+		<td><form action="aqbudget.pl" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" /><input type="submit" value="Add Budget" /></form></td>
+		<td></td>
+	</tr>
+	<!-- TMPL_LOOP name="budget" -->
+		<tr>
+			<td>&nbsp;</td>
+			<td>
+				<!-- TMPL_VAR name="startdate" --> - <!-- TMPL_VAR name="enddate" --> : <!-- TMPL_VAR name="budgetamount" -->
+			</td>
+			<td><form action="/cgi-bin/koha/admin/aqbudget.pl" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR name="aqbudgetid" -->" /><input type="submit" value="Edit" /></form></td>
+			<td><form action="/cgi-bin/koha/admin/aqbudget.pl" method="get"><input type="hidden" name="op" value="delete_confirm" /><input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR name="aqbudgetid" -->" /><input type="submit" class="delete" value="Delete" /></form></td>
+
+		</tr>
+	<!-- /TMPL_LOOP -->
+<!-- /TMPL_LOOP -->
+</table><!-- /TMPL_IF -->
+<form action="<!-- TMPL_VAR name=scriptname -->" method="post">
+	<p><input type="hidden" name="op" value="add_form" /></p>
+<input type="submit" value="Add bookfund" /></form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="add_form" -->
+<script>
+	//
+	function isNotNull(f,noalert) {
+		if (f.value.length ==0) {
+   return false;
+		}
+		return true;
+	}
+	//
+	function toUC(f) {
+		var x=f.value.toUpperCase();
+		f.value=x;
+		return true;
+	}
+	//
+	function isNum(v,maybenull) {
+	var n = new Number(v.value);
+	if (isNaN(n)) {
+		return false;
+		}
+	if (maybenull==0 && v.value=="") {
+		return false;
+	}
+	return true;
+	}
+	//
+	function isDate(f) {
+		var t = Date.parse(f.value);
+		if (isNaN(t)) {
+			return false;
+		}
+	}
+	//
+	function Check(f) {
+		var ok=1;
+		var _alertString="";
+		var alertString2;
+		if (f.bookfundid.value.length==0) {
+			_alertString += "- bookfundid missing\n";
+		}
+		if (f.bookfundname.value.length==0) {
+			_alertString += "- bookfundname missing\n";
+		}
+		if (_alertString.length==0) {
+			document.Aform.submit();
+		} else {
+			alertString2 = "Form not submitted because of the following problem(s)\n";
+			alertString2 += "------------------------------------------------------------------------------------\n\n";
+			alertString2 += _alertString;
+			alert(alertString2);
+		}
+	}
+	</SCRIPT>
+<form action="<!-- TMPL_VAR name="action" -->" name="Aform" method="post">
+<input type="hidden" name="op" value="add_validate" />
+<input type="hidden" name="checked" value="0" />
+
+<table>
+<caption><!-- TMPL_VAR name="header" --></caption>
+<!-- TMPL_IF name="add_or_modify" -->
+<tr><th>Book fund</th><td><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" /><!-- TMPL_VAR name="bookfundid" --></td></tr>
+<!-- TMPL_ELSE -->
+<tr><th>Book fund</th><td><input type="text" name="bookfundid" size="5" maxlength="5" onblur="toUC(this)" /></td></tr>
+<!-- /TMPL_IF -->
+<tr><th>Name</th><td><input type="text" name="bookfundname" size="40" maxlength="80" value="<!-- TMPL_VAR name="bookfundname" escape="HTML" -->" /></td></tr>
+</table>
+
+<p><input type="button" value="<!-- TMPL_VAR name="header" -->" onclick="Check(this.form); return false;" /> <input type="submit" value="Cancel" onclick="location.href='<!-- TMPL_VAR name="action" -->'; return false;" /></p>
+</form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="add_validate" -->
+<h3>Data Recorded</h3>
+<form action="<!-- TMPL_VAR name="action" -->" method="post">
+<input type="submit" value="OK" />
+</form></td></tr></table>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="delete_confirm" -->
+<h3>Confirm Deletion of Fund <em><!-- TMPL_VAR name="bookfundid" --></em></h3>
+<table>
+<tr><th>Book fund</th><td><!-- TMPL_VAR name="bookfundid" --></td></tr>
+<tr><th>Name</th><td><!-- TMPL_VAR name="bookfundname" --></td></tr><tr><th>Group</th><td><!-- TMPL_VAR name="bookfundgroup" --></td></tr>
+</table><form action="<!-- TMPL_VAR name="action" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR name="bookfundid" -->" /><input type="submit" value="Delete this Fund" /></form> <form action="<!-- TMPL_VAR name="action" -->" method="post"><input type="submit" value="Do not Delete" /></form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="delete_confirmed" -->
+<h3>Data Deleted</h3>
+<form action="<!-- TMPL_VAR name="action" -->" method="post">
+<input type="submit" value="OK" /></form>
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/parameters/aqbudget.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/parameters/aqbudget.tmpl
@ -0,0 +1,133 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: <!-- TMPL_IF name="else" -->Budget admin<!-- /TMPL_IF -->
+<!-- TMPL_IF name="add_form" --><!-- TMPL_VAR NAME="header" --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="add_validate" -->Budget Data Recorded<!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" -->Delete Book Fund '<!-- TMPL_VAR NAME="bookfundid" -->'<!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirmed" -->Book fund deleted<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<!-- TMPL_IF name="else" -->
+<h1>Budget admin</h1><form action="/cgi-bin/koha/admin/aqbudget.pl" method="post">
+	<input type="text" name="searchfield" value="" /> <input type="submit" name="search" value="Search" /></form>
+	<!-- TMPL_IF name="search" -->
+	You Searched for <!-- TMPL_VAR NAME="searchfield" --></span>
+	<!-- /TMPL_IF -->
+<table>
+	<tr><th>Book fund</th><th>Start date</th><th>End date</th><th>Budget amount</th><th colspan="2">&nbsp;</th></tr>
+	<!-- TMPL_LOOP name="budget" -->
+		<tr>
+			<td><!-- TMPL_VAR NAME="bookfundid" --> (<!-- TMPL_VAR NAME="bookfundname" -->)</td>
+			<td><!-- TMPL_VAR NAME="startdate" --></td>
+			<td><!-- TMPL_VAR NAME="enddate" --></td>
+			<td><!-- TMPL_VAR NAME="budgetamount" --></td>
+			<td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&amp;bookfundid=<!-- TMPL_VAR NAME="bookfundid" -->">Edit</a></td>
+			<td><a href="/cgi-bin/koha/admin/aqbudget.pl?op=delete_confirm&amp;bookfundid=<!-- TMPL_VAR NAME="bookfundid" -->">Delete</a></td>
+		</tr>
+	<!-- /TMPL_LOOP -->
+	</table>
+	<form action="/cgi-bin/koha/admin/aqbudget.pl" method="post">
+	<p><input type="hidden" name="op" value="add_form" /><input type="submit" value="Add Budget" /></p></form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="add_form" -->
+<script language="JavaScript" type="text/javascript">
+	//
+	function isNotNull(f,noalert) {
+		if (f.value.length ==0) {
+   return false;
+		}
+		return true;
+	}
+	//
+	function toUC(f) {
+		var x=f.value.toUpperCase();
+		f.value=x;
+		return true;
+	}
+	//
+	function isNum(v,maybenull) {
+	var n = new Number(v.value);
+	if (isNaN(n)) {
+		return false;
+		}
+	if (maybenull==0 && v.value=='') {
+		return false;
+	}
+	return true;
+	}
+	//
+	function isDate(f) {
+		var t = Date.parse(f.value);
+		if (isNaN(t)) {
+			return false;
+		}
+	}
+	//
+	function Check(f) {
+		var ok=1;
+		var _alertString="";
+		var alertString2;
+		if (f.bookfundid.value.length==0) {
+			_alertString += "- bookfundid missing\n";
+		}
+		if (!(isNotNull(window.document.Aform.budgetamount,1))) {
+			_alertString += "- Budget missing\n";
+		}
+		if (_alertString.length==0) {
+			document.Aform.submit();
+		} else {
+			alertString2 = "Form not submitted because of the following problem(s)\n";
+			alertString2 += "------------------------------------------------------------------------------------\n\n";
+			alertString2 += _alertString;
+			alert(alertString2);
+		}
+	}
+	</script>
+
+<form action="/cgi-bin/koha/admin/aqbudget.pl" name="Aform" method="post">
+<input type="hidden" name="op" value="add_validate" />
+<input type="hidden" name="checked" value="0" />
+<h1><!-- TMPL_VAR NAME="header" --></h1>
+
+<table>
+<!-- TMPL_IF name="modify" -->
+<tr><th>Book fund</th><td><input type="hidden" name="bookfundid" value="<!-- TMPL_VAR NAME="bookfundid" -->" /><!-- TMPL_VAR NAME="bookfundid" --></td></tr>
+<tr><th>Book fund name</th><td><!-- TMPL_VAR NAME="bookfundname" --></td></tr>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="adding" -->
+<tr><th><label for="bookfundid">Bookfund</label></th><td><input type="hidden" name="bookfundid" id="bookfundid" size="5" maxlength="5" value="<!-- TMPL_VAR NAME="bookfundid" -->" /><!-- TMPL_VAR NAME="bookfundid" --></td></tr>
+<!-- /TMPL_IF -->
+
+<tr><th><label for="startdate">Start date (<!-- TMPL_VAR NAME="dateformat" -->)</label></th><td><input type="text" id="startdate" name="startdate" value="<!-- TMPL_VAR NAME="startdate" -->" />&nbsp;</td></tr>
+<tr><th><label for="enddate">End date (<!-- TMPL_VAR NAME="dateformat" -->)</label></th><td><input type="text" id="enddate" name="enddate" value="<!-- TMPL_VAR NAME="enddate" -->" /></td></tr>
+<tr><th><label for="budgetamount">Budget amount</label></th><td><input type="text" name="budgetamount" id="budgetamount" value="<!-- TMPL_VAR NAME="budgetamount" -->" /></td></tr>
+</table>
+<input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR NAME="aqbudgetid" -->" /><input type="button" value="<!-- TMPL_VAR NAME="header" -->" onclick="Check(this.form)" /> <input type="button" value="Cancel" onclick="location.href='/cgi-bin/koha/admin/aqbudget.pl'; return false;" /></form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="add_validate" -->
+<h3>Budget Data Recorded</h3><table><tr><td>
+<form action="<!-- TMPL_VAR NAME="action" -->" method="post">
+<input type="submit" value="Continue" />
+</form></td></tr></table>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="delete_confirm" -->
+<h3>Delete Book Budget?</h3>
+<table>
+<tr><th>Start date</th><td><!-- TMPL_VAR NAME="startdate" --></td></tr>
+<tr><th>End date</th><td><!-- TMPL_VAR NAME="enddate" --></td></tr>
+<tr><th>Budget Amount</th><td><!-- TMPL_VAR NAME="budgetamount" --></td></tr>
+</table>
+
+<form action="<!-- TMPL_VAR NAME="action" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR NAME="aqbudgetid" -->" /><input type="submit" value="Delete this Book Fund" /></form> <form action="<!-- TMPL_VAR NAME="action" -->" method="post"><input type="submit" value="Do Not Delete" /></form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="delete_confirmed" -->
+<h3>Budget deleted</h3>
+<form action="<!-- TMPL_VAR NAME="action" -->" method="post">
+<input type="submit" value="Continue" />
+</form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/parameters/auth_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/parameters/auth_subfields_structure.tmpl
@ -0,0 +1,133 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+
+
+<!-- TMPL_IF NAME="add_form" -->
+	<h1>
+	<!-- TMPL_IF NAME="use-heading-flags-p" -->
+	<!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit subfields<!-- /TMPL_IF -->
+	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
+	</h1>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+	<input type="hidden" name="op" value="add_validate" />
+	<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
+	<table>
+	<!-- TMPL_LOOP NAME="loop" -->
+		<tr>
+		<td>
+			<h2>Tag <!-- TMPL_VAR NAME="tagfield" -->, Subfield <!-- TMPL_VAR NAME="tagsubfield" --></h2>
+			<h3>MARC constraints</h3>
+			<p>
+				<!-- TMPL_VAR NAME="repeatable" --> repeatable 
+				<!-- TMPL_VAR NAME="mandatory" --> mandatory
+			</p>
+			<p>
+				
+				<label>Search also</label><input type="text" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size="20" /> (example for 200a : '200c','200d','200e')
+			</p>
+			<h3>Editor constaints</h3>
+			<p> 
+				<label>Text for librarian</label>
+				<input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80" />
+			</p>
+			<p>
+				
+				<label>Text for OPAC</label> <input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80" />
+			</p>
+			<p><label>Managed</label> <!-- TMPL_VAR NAME="tab" --></p>
+			<p><!-- TMPL_VAR NAME="hidden" --> hidden (subfield is managed, but hidden. -should be filled by a plugin or thesaurus-)</p>
+			<p><!-- TMPL_VAR NAME="isurl" --> URL (if checked, it means that the subfield is an URL and can be clicked</p>
+			<p>
+				<label>Auth value:</label> <!-- TMPL_VAR NAME="authorised_value" -->
+				or thesaurus: <!-- TMPL_VAR NAME="thesaurus_category" -->
+				or plugin: <!-- TMPL_VAR NAME="value_builder" -->
+			</p>
+		</td>
+		</tr>
+	<!-- /TMPL_LOOP -->
+	</table>
+	<input type="submit" value="OK" class="button parameters">
+	<p>Note: in the last column, you can choose:
+	<ul><li>An "authorised value": it refers to a list of authorised values for this subfield. See the corresponding admin table.</li>
+	<li>A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically.</li>
+	</ul>
+	</p>
+	</form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="delete_confirm" -->
+
+<div id="bloc25">
+	<h2>
+		Subfield <!-- TMPL_VAR NAME="tagsubfield" -->
+		<!-- TMPL_VAR NAME="liblibrarian" -->
+	</h2>
+	<form action="<!-- TMPL_VAR NAME="delete_link" -->" method="post">
+		<input type="hidden" name="op" value="delete_confirmed" />
+		<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+		<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />
+		<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->" />
+		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
+		<p>CONFIRM DELETION</p>
+		<input type="submit" value="YES" />
+	</form>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />
+		<input type="submit" value="NO" />
+	</form>
+
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_IF NAME="else" -->
+<h1>Authority MARC subfield structure admin for tag <!-- TMPL_VAR NAME="tagfield" --> <!-- TMPL_IF NAME="authtypecode" -->(framework <!--TMPL_VAR NAME="authtypecode" -->)<!-- TMPL_ELSE -->(default framework)<!-- /TMPL_IF --></h1>
+<p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit. </p>
+
+<table>
+<tr>
+	<th>Subfield</th>
+	<th>Text</th>
+	<th>Constraints</th>
+	<th>Delete</th>
+<!-- TMPL_LOOP NAME="loop" -->
+<tr>
+	<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
+	<td>
+		<!-- TMPL_IF NAME="subfield_ignored" -->
+			<i><!-- TMPL_VAR NAME="liblibrarian" --></i>
+		<!-- TMPL_ELSE -->
+			<!-- TMPL_VAR NAME="liblibrarian" -->
+		<!-- /TMPL_IF -->
+	</td>
+	<td>
+		<!-- TMPL_IF NAME="subfield_ignored" -->
+			<i>subfield ignored</i>
+		<!-- TMPL_ELSE -->
+			Managed, <!-- TMPL_IF NAME="repeatable" -->Repeatable, <!-- TMPL_ELSE -->Not repeatable,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="mandatory" -->Mandatory, <!-- TMPL_ELSE -->Not mandatory,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="seealso" -->see also : <!-- TMPL_VAR NAME="seealso" -->,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="hidden" -->hidden,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="isurl" -->is an url,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="authorised_value" --> Auth value :<!-- TMPL_VAR NAME="authorised_value" -->,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="value_builder" -->Plugin :<!-- TMPL_VAR NAME="value_builder" -->,<!-- /TMPL_IF -->
+		<!-- /TMPL_IF -->
+	</td>
+	<td>
+		<a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a>
+	</td>
+</tr>
+<!-- /TMPL_LOOP -->
+</table>
+<!-- TMPL_VAR NAME="edit" -->Edit</a>
+<a href="auth_tag_structure.pl?searchfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" -->">
+	<img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/2uparrow.png" width="32" hspace="0" vspace="0" border="0">
+</a>
+<!-- TMPL_IF NAME="previous" --><!-- TMPL_VAR NAME="previous" -->&lt;&lt; Previous</a><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="next" -->
+	<!-- TMPL_VAR NAME="next" -->Next &gt;&gt;</a>
+<!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+
+
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/parameters/auth_tag_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/parameters/auth_tag_structure.tmpl
@ -0,0 +1,177 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+
+
+<h1>Authority MARC framework for <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --><!-- TMPL_ELSE -->default framework<!-- /TMPL_IF --></h1>
+<script language="javascript" type="text/javascript">
+	function _(s) { return s } // dummy function for gettext
+	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	function isNotNull(f,noalert) {
+		if (f.value.length ==0) {
+   return false;
+		}
+		return true;
+	}
+	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	function toUC(f) {
+		var x=f.value.toUpperCase();
+		f.value=x;
+		return true;
+	}
+	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	function isNum(v,maybenull) {
+	var n = new Number(v.value);
+	if (isNaN(n)) {
+		return false;
+		}
+	if (maybenull==0 && v.value=='') {
+		return false;
+	}
+	return true;
+	}
+	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	function isDate(f) {
+		var t = Date.parse(f.value);
+		if (isNaN(t)) {
+			return false;
+		}
+	}
+	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	function Check(f) {
+		var ok=1;
+		var _alertString="";
+		var alertString2;
+		if (f.tagfield.value.length==0) {
+			_alertString += "\n- " + _("tag number missing");
+		}
+		if (_alertString.length==0) {
+			document.Aform.submit();
+		} else {
+			alertString2  = _("Form not submitted because of the following problem(s)");
+			alertString2 += "\n------------------------------------------------------------------------------------\n";
+			alertString2 += _alertString;
+			alert(alertString2);
+		}
+	}
+	</script>
+
+<!-- TMPL_IF NAME="add_form" -->
+
+	<h1>
+	<!-- TMPL_IF NAME="use-heading-flags-p" -->
+	<!-- TMPL_IF NAME="heading-modify-tag-p" -->Modify tag<!-- /TMPL_IF -->
+	<!-- TMPL_IF NAME="heading-add-tag-p" -->Add tag<!-- /TMPL_IF -->
+	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
+	</h1>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+		<input type="hidden" name="op" value="add_validate" />
+		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
+		<p><label>Tag<label><!-- TMPL_VAR NAME="searchfield" --></p>
+		<p><label>Text for librarians</label><input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape=HTML -->" size="80" maxlength="100" /></p>
+		<p><label>Text for opac</label><input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape=HTML -->" size="80" maxlength="100" /></p>
+		<p><label>Repeatable</label><!-- TMPL_VAR NAME="repeatable" --></p>
+		<p><label>Mandatory</label><!-- TMPL_VAR NAME="mandatory" --></p>
+		<p><label>Authorised value</label><!-- TMPL_VAR NAME="authorised_value" --> (if you select a value here, the indicators will be limited to the authorised value list)</p>
+		<p><label>&nbsp;</label><input type="button" value="OK" onclick="Check(this.form)" /></p>
+	</form>
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_IF NAME="delete_confirm" -->
+
+<table>
+	<tr>
+		<td>tag</td>
+		<td><!-- TMPL_VAR NAME="searchfield" --></td>
+	</tr>
+	<tr>
+		<td>&nbsp;</td><td><!-- TMPL_VAR NAME="liblibrarian" --></td>
+	</tr>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<input type="hidden" name="op" value="delete_confirmed" />
+		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="authtypecode" -->">
+		<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+	<tr><td colspan="2" align="center">CONFIRM DELETION</td></tr>
+	<tr><td><input type="submit" value="YES"></form></td><td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="NO" /></form></td></tr>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="delete_confirmed" -->
+
+	Data deleted
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+	<input type="submit" value="OK" />
+	</form>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="authtype_create" -->
+
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<input type="hidden" name="op" value="authtype_create_confirm" />
+		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
+		Create authority framework for <!-- TMPL_VAR NAME="authtypecode" --> using
+		<select name="existingauthtypecode">
+			<option value="">Default</option>
+		<!-- TMPL_LOOP NAME="existingauthtypeloop" -->
+			<option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="authtypetext" --></option>
+		<!-- /TMPL_LOOP -->
+		</select>
+		<input type="submit" value="OK" />
+	</form>
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_IF NAME="else" -->
+<div id="bloc25">
+<h2>Select an authority framework</h2>
+<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+	<select name="authtypecode">
+		<option value="">Default</option>
+	<!-- TMPL_LOOP NAME="authtypeloop" -->
+		<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected<!-- /TMPL_IF -->>
+			<!-- TMPL_VAR NAME="authtypetext" -->
+		</option>
+	<!-- /TMPL_LOOP -->
+	</select>
+	<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+	<input type="submit" value="OK" />
+</form>
+
+<div id="bloc100">
+	<table>
+	<tr>
+		<th>Tag</th>
+		<th>Lib</th>
+		<th>Repeatable</th>
+		<th>Mandatory</th>
+		<th>Authorised<br />value</th>
+		<th>Subfields</th>
+		<th>Edit</th>
+		<th>Delete</th>
+	<!-- TMPL_LOOP NAME="loop" -->
+	<tr valign="top">
+		<td><!-- TMPL_VAR NAME="tagfield" --></td>
+		<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
+		<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+		<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+		<td><!-- TMPL_VAR NAME="authorised_value" --></td>
+		<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->">subfields</a></td>
+		<td><a href="<!-- TMPL_VAR NAME="edit" -->">Edit</a></td>
+		<td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
+	</tr>
+	<!-- /TMPL_LOOP -->
+	</table>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<input type="hidden" name="op" value="add_form" />
+		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
+		<input type="hidden" name="op" value="add_form" />
+		<input type="submit" value="Add Tag" />
+		<!-- TMPL_IF NAME="isprevpage" -->
+			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->">Previous Page</a>
+		<!-- /TMPL_IF -->
+		<!-- TMPL_IF NAME="nextpage" -->
+			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->">Next Page</a>
+		<!-- /TMPL_IF -->
+	</form>
+
+<!-- /TMPL_IF -->
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/parameters/authorised_values.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/parameters/authorised_values.tmpl
@ -0,0 +1,93 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: <!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" -->Confirm Deletion<!-- /TMPL_IF -->
+<!-- TMPL_IF name="else" -->Authorised values admin<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<!-- TMPL_IF name="add_form" -->
+	<form class="inline" action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
+	<input type="hidden" name="op" value="add_validate" />
+	<table>
+	<caption><!-- TMPL_VAR name="action" --></caption>
+	<tr>
+		<th><label for="category">Category</label></th>
+		<td><!-- TMPL_VAR name="category" --></td>
+	</tr>
+	<tr>
+		<th><label for="authorised_value">Authorised value</label></th>
+		<td><input type="text" id="authorised_value" name="authorised_value" value="<!-- TMPL_VAR name="authorised_value" -->" /></td>
+	</tr>
+	<tr>
+		<th><label for="lib">Description</label></th>
+		<td><input type="text" name="lib" id="lib" value="<!-- TMPL_VAR name="lib" -->" /></td>
+	</tr>
+	</table><input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->" />
+			<input type="submit" value="<!-- TMPL_VAR name="action" -->" /></form> <form class="inline" action="/cgi-bin/koha/admin/authorised_values.pl" method="get"><input type="submit" value="Cancel and Return to Authorized Values" /></form>
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_IF name="delete_confirm" -->
+<!-- -->
+<h3>Confirm Deletion</h3>
+<table>
+	<tr>
+		<td>Variable</td>
+		<td>Description</td>
+		<td><!-- TMPL_VAR name="searchfield" --></td>
+	</tr>
+	<tr><td>Value</td><td><!-- TMPL_VAR name="Tvalue" --></td></tr>
+	</table>
+	<form action="<!-- TMPL_VAR name=" script_name " -->" method="post">
+		<input type="hidden" name="op" value="delete_confirmed" />
+		<input type="hidden" name="id" value="<!-- TMPL_VAR name=" id " -->" />
+		<input type="hidden" name="searchfield" value="<!-- TMPL_VAR name="searchfield" -->" /><input type="submit" value="Confirm Deletion" /></form> <form class="inline" action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="submit" value="Do Not Delete" /></form>
+<!-- /TMPL_IF -->
+
+<!-- -->
+<!-- TMPL_IF name="else" -->
+
+<h1>Authorised values admin</h1>
+<p>This table is used in MARC definition. You can define as many categories as you want, and as many authorised values as you want in each category.</p>
+<p>When you define the MARC subfield structure, you can link a subfield to a authorised-value category. When the user ask for adding of modifying a biblio,
+the subfield is not entered through a free field, but though a list of authorised values</p>
+<form action="/cgi-bin/koha/admin/authorised_values.pl" method="post"><label for="searchfield">Show Category: </label><!-- TMPL_VAR name="tab_list" --> <input type="submit" value="Submit" /></form>
+<table>
+<tr>
+	<th>Category</th>
+	<th>Authorised value</th>
+	<th>Description</th>
+	<th>Edit</th>
+	<th>Delete</th>
+	</tr>
+<!-- TMPL_LOOP name="loop" -->
+<tr>
+	<td><!-- TMPL_VAR name="category" --></td>
+	<td><!-- TMPL_VAR name="authorised_value" --></td>
+	<td><!-- TMPL_VAR name="lib" --></td>
+	<td><a href="<!-- TMPL_VAR name="edit" -->">Edit</a></td>
+	<td><a href="<!-- TMPL_VAR name="delete" -->">Delete</a></td>
+</tr>
+<!-- /TMPL_LOOP -->
+</table>
+
+<!-- TMPL_IF NAME="isprevpage" -->
+<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+<input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="prevpage" -->" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+	<input type="submit" value="&lt;&lt; Previous Page" /></form>
+<!-- /TMPL_IF --> 
+
+<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+<input type="hidden" name="op" value="add_form">
+<input type="hidden" name="category" value="<!-- TMPL_VAR NAME="category" -->">
+<input type="submit" value="Add Authorised value" /></form> 
+
+<form class="inline" action="/cgi-bin/koha/admin/authorised_values.pl" method="get"><input type="hidden" value="add_form" name="op" /><input type="submit" value="Add New Category" /></form>
+
+<!-- TMPL_IF NAME="nextpage" -->
+<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+<input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="nextpage" -->" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+	<input type="submit" value="Next Page &gt;&gt;" /></form>
+<!-- /TMPL_IF -->
+
+<!-- /TMPL_IF -->
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/parameters/authtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/parameters/authtypes.tmpl
@ -0,0 +1,147 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+
+<script language="javascript" type="text/javascript">
+function _(s) { return s } // dummy function for gettext
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+function isNotNull(f,noalert) {
+	if (f.value.length ==0) {
+		return false;
+	}
+	return true;
+}
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+function toUC(f) {
+	var x=f.value.toUpperCase();
+	f.value=x;
+	return true;
+}
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+function isNum(v,maybenull) {
+var n = new Number(v.value);
+if (isNaN(n)) {
+	return false;
+	}
+if (maybenull==0 && v.value=='') {
+	return false;
+}
+return true;
+}
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+function isDate(f) {
+	var t = Date.parse(f.value);
+	if (isNaN(t)) {
+		return false;
+	}
+}
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+function Check(f) {
+	var ok=1;
+	var _alertString="";
+	var alertString2;
+	if (f.authtypecode.value.length==0) {
+		_alertString += "\n- " + _("Authority type : code missing");
+	}
+	if (!(isNotNull(window.document.Aform.authtypetext,1))) {
+		_alertString += "\n- " + _("Description missing");
+	}
+	if (_alertString.length==0) {
+		document.Aform.submit();
+	} else {
+		alertString2  = _("Form not submitted because of the following problem(s)");
+		alertString2 += "\n------------------------------------------------------------------------------------\n";
+		alertString2 += _alertString;
+		alert(alertString2);
+	}
+}
+</script>
+
+<!-- TMPL_IF NAME="add_form" -->
+
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+	<table>
+		<!-- TMPL_IF NAME="authtypecode" -->
+		<caption>Modify authority type</caption>
+	<!-- TMPL_ELSE -->
+		<caption>Add authority type</caption>
+	<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="authtypecode" -->
+				<tr><td><label for="authtypecode">Authority type<label></td><td><input type="hidden" name="op" value="add_validate" />
+		<input type="hidden" name="checked" value="0" /><input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" /><!-- TMPL_VAR NAME="authtypecode" --></td></tr>
+			<!-- TMPL_ELSE -->
+				<tr><td><label for="authtypecode">Authority type<label></td><td><input id="authtypecode" type="text" name="authtypecode" size="10" maxlength="10" onblur="toUC(this)" /></td></tr>
+			<!-- /TMPL_IF -->
+		<tr><td><label for="authtypetext">Description</label></td><td><input type="text" id="authtypetext" name="authtypetext" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="authtypetext" escape=HTML -->" /></td></tr>
+		<tr><td><label for="summary">Summary</label></td><td><textarea id="summary" name="summary" cols="40" rows="10"><!-- TMPL_VAR NAME="summary" --></textarea></td></tr>
+		<tr><td><label for="auth_tag_to_report">Report tag</label></td><td><input type="text" id="auth_tag_to_report" name="auth_tag_to_report" size="5" maxlength="3" value="<!-- TMPL_VAR NAME="auth_tag_to_report">" />Enter here the number of the tag that will be reported in the biblio (subfield by subfield). For example, in UNIMARC, enter 200 to report every 200 subfield in the 70x biblio</td></tr></table>
+	<p><input type="submit" value="OK" onclick="Check(this.form); return false;" />
+			</p>
+	</form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="delete_confirm" -->
+<div>
+	<h2>Authority structure definition for <!-- TMPL_VAR NAME="authtypetext" --> (<!-- TMPL_VAR NAME="authtypecode" -->)</h2>
+	<!-- TMPL_IF NAME="total" -->
+		<p>
+			This record is used <!-- TMPL_VAR NAME="total" --> times
+		</p>
+	<!-- /TMPL_IF -->
+	<p>CONFIRM DELETION</p>
+	<p>
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="hidden" name="op" value="delete_confirmed" />
+			<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
+			<input type="submit" value="YES" />
+		</form>
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="submit" value="NO" />
+		</form>
+	</p>
+
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="else" -->
+<h1>Auth type Admin</h1>
+<p>Define authority types, then authority MARC structure in the same way you define itemtypes and biblio MARC tag structure. Authority values are managed through plugins</p>
+<table>
+	<tr>
+		<th>Code</th>
+		<th>Description</th>
+		<th>summary</th>
+		<th>Tag reported</th>
+		<th>&nbsp;</th>
+		<th>Edit</th>
+		<th>Delete</th>
+	</tr>
+	<tr>
+		<td>&nbsp;</td>
+		<td>Default framework</td>
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
+		<td><a href="auth_tag_structure.pl">MARC structure</td>
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
+	</tr>
+	
+	<!-- TMPL_LOOP NAME="loop" -->
+		<tr>
+			<td><!-- TMPL_VAR NAME="authtypecode" --></td>
+			<td><!-- TMPL_VAR NAME="authtypetext" --></td>
+			<td><!-- TMPL_VAR NAME="summary" --></td>
+			<td><!-- TMPL_VAR NAME="auth_tag_to_report" --></td>
+			<td><a href="auth_tag_structure.pl?authtypecode=<!-- TMPL_VAR NAME="authtypecode" -->" class="button parameters" >MARC structure</a></td>
+			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" escape="HTML" -->">Edit</a></td>
+			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" escape="HTML" -->">Delete</a></td>
+		</tr>
+	<!-- /TMPL_LOOP -->
+</table>
+<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+	<input type="hidden" name="op" value="add_form" />
+	<input type="submit" value="Add authority type" title="Add authority type" alt="Add authority type" />
+	<td width="33%"><!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->">&lt;&lt; Previous</a><!-- /TMPL_IF --></td>
+	<td width="33%"><!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->">Next &gt;&gt;</a><!-- /TMPL_IF --></td>
+</form>
+
+<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/parameters/biblio_framework.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/parameters/biblio_framework.tmpl
@ -0,0 +1,130 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add framework<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" -->Delete Framework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?<!-- /TMPL_IF --><!-- TMPL_IF NAME="else" -->Biblio Framework<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+
+<script language="javascript" type="text/javascript">
+function _(s) { return s } // dummy function for gettext
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+function isNotNull(f,noalert) {
+	if (f.value.length ==0) {
+		return false;
+	}
+	return true;
+}
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+function toUC(f) {
+	var x=f.value.toUpperCase();
+	f.value=x;
+	return true;
+}
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+function isNum(v,maybenull) {
+var n = new Number(v.value);
+if (isNaN(n)) {
+	return false;
+	}
+if (maybenull==0 && v.value=='') {
+	return false;
+}
+return true;
+}
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+function isDate(f) {
+	var t = Date.parse(f.value);
+	if (isNaN(t)) {
+		return false;
+	}
+}
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+function Check(f) {
+	var ok=1;
+	var _alertString="";
+	var alertString2;
+	if (f.frameworkcode.value.length==0) {
+		_alertString += "\n- " + _("Framework code missing");
+	}
+	if (!(isNotNull(window.document.Aform.frameworktext,1))) {
+		_alertString += "\n- " + _("Description missing");
+	}
+	if (_alertString.length==0) {
+		document.Aform.submit();
+	} else {
+		alertString2  = _("Form not submitted because of the following problem(s)");
+		alertString2 += "\n------------------------------------------------------------------------------------\n";
+		alertString2 += _alertString;
+		alert(alertString2);
+	}
+}
+</script>
+
+<!-- TMPL_IF NAME="add_form" -->
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+		<input type="hidden" name="op" value="add_validate" />
+		<input type="hidden" name="checked" value="0" />
+	<table>
+	<caption><!-- TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- TMPL_ELSE -->Add framework<!-- /TMPL_IF --></caption>
+	<tr>
+			<!-- TMPL_IF NAME="frameworkcode" -->
+				<td><label for="frameworkcode">Framework Code<label></td><td><input type="hidden" id="frameworkcode" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><!-- TMPL_VAR NAME="frameworkcode" --></td>
+			<!-- TMPL_ELSE -->
+				<td><label for="frameworkcode">Framework Code<label></td><td><input type="text" id="frameworkcode" name="frameworkcode" size="4" maxlength="4" onblur="toUC(this)" /></td>
+			<!-- /TMPL_IF -->
+			</tr>
+			<tr>
+				<td><label for="description">Description</label></td><td>
+				<input type="text" name="frameworktext" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="frameworktext" escape=HTML -->" /></td>
+</tr></table>
+			<p>	<input type="button" value="Submit"class="submit" onclick="Check(this.form)" /></p>
+	</form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="delete_confirm" -->
+<h3>Delete ramework for <!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)?</h3>
+	<!-- TMPL_IF NAME="total" -->
+		<div class="error">This framework is used <!-- TMPL_VAR NAME="total" --> times
+	<!-- /TMPL_IF -->
+	<p>
+		<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><input type="submit" value="Yes, Delete this Framework!" />
+		</form>
+		<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="No, Do not Delete!" /></form>
+	</p>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="else" -->
+<h1>Biblio framework</h1>
+<p>Framework name, then go to MARC biblio to set MARC editor parameters</p>
+<table>
+	<tr>
+		<th>Code</th>
+		<th>Description</th>
+		<th>&nbsp;</th>
+		<th>Edit</th>
+		<th>Delete</th>
+	</tr>
+	<tr>
+		<td>&nbsp;</td>
+		<td>Default framework</td>
+		<td><a href="marctagstructure.pl?frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">MARC structure</td>
+		<td>&nbsp;</td>
+		<td>&nbsp;</td>
+	</tr>
+	
+	<!-- TMPL_LOOP NAME="loop" -->
+		<tr>
+			<td><!-- TMPL_VAR name="frameworkcode" --></td>
+			<td><!-- TMPL_VAR name="frameworktext" --></td>
+			<td><a href="marctagstructure.pl?frameworkcode=<!-- TMPL_VAR name="frameworkcode" -->" >MARC structure</a></td>
+			<td><a href="<!-- TMPL_VAR name="script_name" -->?op=add_form&amp;frameworkcode=<!-- TMPL_VAR name="frameworkcode" escape="HTML" -->">Edit</a></td>
+			<td><a href="<!-- TMPL_VAR name="script_name" -->?op=delete_confirm&amp;frameworkcode=<!-- TMPL_VAR name="frameworkcode" escape="HTML" -->">Delete</a></td>
+		</tr>
+	<!-- /TMPL_LOOP -->
+</table>
+<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+	<input type="hidden" name="op" value="add_form" />
+	<input type="submit" value="Add framework" />
+	<td><!-- TMPL_IF NAME="previous" --><a href="<!-- TMPL_VAR NAME="previous" -->">&lt;&lt; Previous</a><!-- /TMPL_IF --></td>
+	<td><!-- TMPL_IF NAME="next" --><a href="<!-- TMPL_VAR NAME="next" -->">Next &gt;&gt;</a><!-- /TMPL_IF --></td>
+</form>
+
+<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/parameters/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/parameters/branches.tmpl
@ -0,0 +1,215 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: <!-- TMPL_IF name="add" --><!-- TMPL_VAR name="head" --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" -->Confirm deletion of branch '<!-- TMPL_VAR NAME="branchcode" -->'<!-- /TMPL_IF -->
+<!-- TMPL_IF name="else" --><!-- TMPL_VAR name="head" --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_category" -->Confirm deletion of category<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_IF name="add" -->
+<h1><!-- TMPL_VAR name="head" --></h1>
+<form action="<!-- TMPL_VAR name="action" -->" name="Aform" method="post">
+<input type="hidden" name="op" value="add_validate" />
+<table>
+	<tr>
+		<td>Branch code</td>
+		<td>
+			<!-- TMPL_IF name="branchcode" -->
+				<input type="hidden" name="branchcode" value="<!-- TMPL_VAR name="branchcode" escape="HTML" -->" />
+				<!-- TMPL_VAR name="branchcode" -->
+			<!-- TMPL_ELSE -->
+				<input type="text" name="branchcode" size="5" maxlength="5" value="<!-- TMPL_VAR name="branchcode" escape="HTML" -->" />
+			<!-- /TMPL_IF -->
+		</td>
+	</tr>
+	<tr>
+		<td>Name</td>
+		<td><input type="text" name="branchname" size="40" maxlength="80" value="<!-- TMPL_VAR name="branchname" escape="HTML" -->" />&nbsp;</td>
+	</tr>
+<!-- TMPL_LOOP name="categoryloop" -->
+					<tr>
+						<td><!-- TMPL_VAR name="categoryname" --></td>
+						<td><input type="checkbox" name="<!-- TMPL_VAR name="categorycode" -->" <!-- TMPL_VAR name="checked" --> /><!-- TMPL_VAR name="codedescription" --></td>
+					</tr>
+				<!-- /TMPL_LOOP -->
+<tr>
+		<td>Address</td>
+		<td><input type="text" name="branchaddress1" value="<!-- TMPL_VAR name="branchaddress1" escape="HTML" -->" /></td>
+	</tr>
+	<tr>
+		<td>&nbsp;</td>
+		<td><input type="text" name="branchaddress2" value="<!-- TMPL_VAR name="branchaddress2" escape="HTML" -->" /></td>
+	</tr>
+	<tr>
+		<td>&nbsp;</td>
+		<td><input type="text" name="branchaddress3" value="<!-- TMPL_VAR name="branchaddress3" escape="HTML" -->" /></td>
+	</tr>
+	<tr>
+		<td>Phone</td>
+		<td><input type="text" name="branchphone" value="<!-- TMPL_VAR name="branchphone" escape="HTML" -->" /></td>
+	</tr>
+	<tr>
+		<td>Fax</td>
+		<td><input type="text" name="branchfax" value="<!-- TMPL_VAR name="branchfax" escape="HTML" -->" /></td>
+	</tr>
+	<tr>
+		<td>E-mail</td>
+		<td><input type="text" name="branchemail" value="<!-- TMPL_VAR name="branchemail" escape="HTML" -->" /></td>
+	</tr>
+</table><p><input type="submit" value="Submit" /></p>
+</form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="delete_confirm" -->
+	<h3>Confirm deletion of <!-- TMPL_VAR NAME="branchname" --> (<!-- TMPL_VAR NAME="branchcode" -->)?</h3>
+	<span class="form"><form action="<!-- TMPL_VAR name="action" -->" method="post">
+		<input type="hidden" name="op" value="delete_confirmed" />
+		<input type="hidden" name="branchcode" value="<!-- TMPL_VAR name="branchcode" escape="HTML" -->" />
+			<input type="hidden" name="branchname" value="<!-- TMPL_VAR NAME="branchname" escape="HTML" -->">
+		<input type="submit" value="Delete Branch" />
+	</form> 
+	<form action="<!-- TMPL_VAR name="action" -->" method="post"><input type="hidden" name="op" value="">
+		<input type="submit" value="Do Not Delete" />
+	</form></span>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="else" -->
+	
+	<!-- TMPL_IF NAME="message" --><div class="error"><!-- TMPL_VAR name="message" --><!-- /TMPL_IF -->
+	<table>
+	<caption><!-- TMPL_VAR name="head" --></caption>
+		<tr>
+			<th>Name</th>
+			<th>Code</th>
+			<th>Address</th>
+			<th>Category</th>
+			<th>&nbsp;</th>
+			<th>&nbsp;</th>
+		</tr>
+		<!-- TMPL_LOOP name="branches" -->
+			<tr>
+				<td><!-- TMPL_VAR name="branch_name" escape="HTML" --></td>
+				<td><!-- TMPL_VAR name="branch_code" escape="HTML" --></td>
+				<td>
+					<!-- TMPL_IF name="address-empty-p" -->
+						(nothing entered)
+					<!-- TMPL_ELSE -->
+						<!-- TMPL_IF name="branchaddress1" -->
+							<!-- TMPL_VAR name="branchaddress1" escape="HTML" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="branchaddress2" -->
+							<br /><!-- TMPL_VAR name="branchaddress2" escape="HTML" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="branchaddress3" -->
+							<br /><!-- TMPL_VAR name="branchaddress3" escape="HTML" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name=branchphone -->
+							<br />Ph: <!-- TMPL_VAR name="branchphone" escape="HTML" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="branchfax" -->
+							<br />Fax: <!-- TMPL_VAR name="branchfax" escape="HTML" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="branchemail" -->
+							<br />Email: <!-- TMPL_VAR name="branchemail" escape="HTML" --><!-- /TMPL_IF -->
+					<!-- /TMPL_IF -->
+				</td>
+				<td>
+					<!-- TMPL_IF name="no-categories-p" -->
+						(no categories set)
+					<!-- TMPL_ELSE -->
+						<!-- TMPL_LOOP name="category_list" -->
+							<!-- TMPL_VAR name="categoryname" --><br />
+						<!-- /TMPL_LOOP -->
+					<!-- /TMPL_IF -->
+				</td>
+				<td>
+					<form action="<!-- TMPL_VAR name=action -->" method="post">
+					<input type="hidden" name="op" value="edit" />
+					<input type="hidden" name="branchcode" value="<!-- TMPL_VAR name=value escape="HTML" -->" />
+					<input type="submit" value="Edit" />
+					</form>
+				</td>
+				<td>
+					<form action="<!-- TMPL_VAR name=action -->" method="post">
+					<input type="hidden" name="branchcode" value="<!-- TMPL_VAR name=value escape="HTML" -->" />
+<input type="hidden" name="branchname" value="<!-- TMPL_VAR NAME="branch_name" escape="HTML" -->">
+					<input type="hidden" name="op" value="delete" /><input type="submit" value="Delete" />
+					</form>
+				</td>
+			</tr>
+		<!-- /TMPL_LOOP -->
+	</table>
+<form action="<!-- TMPL_VAR name=action -->" method="post">
+		<p><input type="hidden" name="op" value="add" />
+		<input type="submit" value="Add New Branch" /></p>
+	</form>
+	
+	<table>
+	<caption>Branches Categories</caption>
+	<tr>
+		<th>Name</th>
+		<th>Code</th>
+		<th>Description</th>
+		<th>&nbsp;</th>
+		<th>&nbsp;</th>
+	</tr>
+	<!-- TMPL_LOOP name="branchcategories" -->
+		<tr>
+		<td><!-- TMPL_VAR name="categoryname" --></td>
+		<td><!-- TMPL_VAR name="categorycode" --></td>
+		<td><!-- TMPL_VAR name="codedescription" --></td>
+		<td>
+			<form action="<!-- TMPL_VAR name=action -->" method="post">
+			<input type="hidden" name="op" value="editcategory" />
+			<input type="hidden" name="categorycode" value="<!-- TMPL_VAR name=categorycode escape="HTML" -->" />
+			<input type="submit" value="Edit" />
+			</form>
+		</td>
+		<td>
+			<form action="<!-- TMPL_VAR name=action -->" method="post">
+			<input type="hidden" name="categorycode" value="<!-- TMPL_VAR name=categorycode escape="HTML" -->" />
+			<input type="hidden" name="op" value="delete_category" /><input type="submit" value="Delete" />
+			</form>
+		</td>
+		</tr>
+	<!-- /TMPL_LOOP -->
+	</table><form action="<!-- TMPL_VAR name="action" -->" method="post"><p>
+		<input type="hidden" name="op" value="editcategory" />
+		<input type="submit" value="Add New Category" /></p>
+	</form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="editcategory" -->
+	
+	<form action="<!-- TMPL_VAR name=action -->" name="Aform" method="post">
+	<input type="hidden" name=op value="addcategory_validate" />
+	<table>
+		<caption><!-- TMPL_VAR name="head" --></caption>
+		<tr>
+			<td>Category code</td>
+			<td>
+				<!-- TMPL_IF name="categorycode" -->
+					<input type="hidden" name="categorycode" value="<!-- TMPL_VAR name=categorycode escape="HTML" -->" />
+					<!-- TMPL_VAR name="categorycode" -->
+				<!-- TMPL_ELSE -->
+					<input type="text" name="categorycode" size="5" maxlength="5" value="<!-- TMPL_VAR name="categorycode" escape="HTML" -->" />
+				<!-- /TMPL_IF -->
+			</td>
+		</tr>
+		<tr>
+			<td>Name</td>
+			<td><input type="text" name="categoryname" size="40" maxlength="80" value="<!-- TMPL_VAR name=categoryname escape="HTML" -->" />&nbsp;</td>
+		</tr>
+		<tr>
+			<td>Description</td>
+			<td><input type="text" name="codedescription" size="40" maxlength="80" value="<!-- TMPL_VAR name="codedescription" escape="HTML" -->" />&nbsp;</td>
+		</tr>
+	</table><input type="submit" value="Update" />
+	</form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="delete_category" -->
+	Confirm delete:
+	<form action="<!-- TMPL_VAR name=action -->" method="post">
+		<input type="hidden" name="op" value="categorydelete_confirmed" />
+		<input type="hidden" name="categorycode" value="<!-- TMPL_VAR name=categorycode escape="HTML" -->" />
+		<input type="submit" value="YES" />
+	</form>
+	<form action="<!-- TMPL_VAR name="action" -->" method="post"><input type="hidden" name="op" value="">
+		<input type="submit" value="NO" />
+	</form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/parameters/categorie.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/parameters/categorie.tmpl
@ -0,0 +1,183 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: <!-- TMPL_IF NAME=add_form --><!-- TMPL_IF NAME="categorycode" -->Modify category '<!-- TMPL_VAR NAME="categorycode" -->'<!-- TMPL_ELSE -->Add category<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="add_validate" -->Data recorded<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion of Category '<!-- TMPL_VAR NAME="categorycode" -->'<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirmed" -->Category Deleted<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="else" -->Patron Categories<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+
+	
+<!-- TMPL_IF NAME=add_form -->
+	<script language="JavaScript" type="text/javascript">
+	//
+	function isNotNull(f,noalert) {
+		if (f.value.length ==0) {
+   return false;
+		}
+		return true;
+	}
+	//
+	function toUC(f) {
+		var x=f.value.toUpperCase();
+		f.value=x;
+		return true;
+	}
+	//
+	function isNum(v,maybenull) {
+	var n = new Number(v.value);
+	if (isNaN(n)) {
+		return false;
+		}
+	if (maybenull==0 && v.value=='') {
+		return false;
+	}
+	return true;
+	}
+	//
+	function isDate(f) {
+		var t = Date.parse(f.value);
+		if (isNaN(t)) {
+			return false;
+		}
+	}
+	//
+	function Check(f) {
+		var ok=1;
+		var _alertString="";
+		var alertString2;
+		if (f.categorycode.value.length==0) {
+			_alertString += "- categorycode missing\n";
+		}
+//		alert(window.document.Aform.description.value);
+		if (!(isNotNull(window.document.Aform.description,1))) {
+			_alertString += "- description missing\n";
+		}
+		if (!isNum(f.upperagelimit,0)) {
+			_alertString += "- upperagelimit is not a number\n";
+		}
+		if (_alertString.length==0) {
+			document.Aform.submit();
+		} else {
+			alertString2 = "Form not submitted because of the following problem(s)\n";
+			alertString2 += "------------------------------------------------------------------------------------\n\n";
+			alertString2 += _alertString;
+			alert(alertString2);
+		}
+	}
+	</script>
+
+
+	
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+	<input type="hidden" name="op" value="add_validate" />
+	<input type="hidden" name="checked" value="0" />
+<!-- TMPL_IF NAME="categorycode" -->
+		<h1>Modify category <!-- TMPL_VAR NAME="categorycode" --></h1>
+	<!-- TMPL_ELSE -->
+		<h1>Add category</h1>
+	<!-- /TMPL_IF -->
+	<table>
+	<!-- TMPL_IF NAME="categorycode" -->
+	<tr><th>Category code</th><td><!-- TMPL_VAR NAME="categorycode" -->
+				<input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" /></td></tr>
+	<!-- TMPL_ELSE -->
+	<tr><th>Category code</th><td><input type="text" name="categorycode" size="3" maxlength="2" onblur="toUC(this)" /></td></tr>
+	<!-- /TMPL_IF -->
+	<tr><th>Description</th><td>&nbsp; <input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME=description -->" /></td></tr>
+	<tr><th>Enrolment period</th><td>&nbsp; <input type="text" name="enrolmentperiod" size="2" maxlength="2" value="<!-- TMPL_VAR NAME=enrolmentperiod -->" /> years</td></tr>
+	<tr><th>Upperage limit</th><td>&nbsp; <input type="text" name="upperagelimit" size="3" maxlength="3" value="<!-- TMPL_VAR NAME=upperagelimit -->" /> years</td></tr>
+	<tr><th>Age Required</th><td>&nbsp; <input type="text" name="dateofbirthrequired" value="<!-- TMPL_VAR NAME=dateofbirthrequired -->" size="3" maxlength="3" /> years</td></tr>
+	<tr><th>Enrollment fee</th><td>$ <input type="text" name="enrolmentfee" size="6" value="<!-- TMPL_VAR NAME=enrolmentfee -->" /></td></tr>
+	<tr><th>Overdue notice required</th><td>&nbsp; <select name="overduenoticerequired" id="overduenoticerequired">
+						<option<!-- TMPL_UNLESS name="overduenoticerequired" --> selected="selected"<!-- /TMPL_UNLESS --> value="0">No</option>
+						<option<!-- TMPL_IF NAME="overduenoticerequired" --> selected="selected"<!-- /TMPL_IF --> value="1">Yes</option>
+					</select></td></tr>
+	<tr><th>Reserve fee</th><td>$ <input type="text" name="reservefee" size="6" value="<!-- TMPL_VAR NAME="reservefee" -->" /></td></tr>
+</table>
+	<p>				<input type="button" value="<!-- TMPL_IF NAME="categorycode" -->Update Category<!-- TMPL_ELSE -->Add Category<!-- /TMPL_IF -->" onclick="Check(this.form);" /> <input type="button" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->'; return false;" /></p>
+	</form>
+
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="add_validate" -->
+<h3>Data recorded</h3>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<input type="submit" value="OK" />
+	</form>
+
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="delete_confirm" -->
+	
+        	
+	<!-- TMPL_IF NAME="totalgtzero" --><h3>Cagegory <!-- TMPL_VAR NAME="categorycode" --> is in use.  Deletion not possible!</h3><!-- TMPL_ELSE --><h2>Confirm Deletion of Category <!-- TMPL_VAR NAME="categorycode" --></h2><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="totalgtzero" --><div class="error">This category is used <!-- TMPL_VAR NAME="total" --> times. Deletion not possible<!-- /TMPL_IF -->
+	<div class="compact"><table>
+	<tr><th>Category code</th><td><!-- TMPL_VAR NAME="categorycode" --></td></tr>
+	<tr><th>Description</th><td><!-- TMPL_VAR NAME="description" --></td></tr>
+	<tr><th>Enrolment period</th><td><!-- TMPL_VAR NAME="enrolmentperiod" --> years</td></tr>
+	<tr><th>Upperage limit</th><td><!-- TMPL_VAR NAME="upperagelimit" --> years</td></tr>
+	<tr><th>Age Required</th><td><!-- TMPL_VAR NAME="dateofbirthrequired" --> years</td></tr>
+	<tr><th>Enrolment fee</th><td>$<!-- TMPL_VAR NAME="enrolmentfee" --></td></tr>
+	<tr><th>Overdue notice required</th><td><!-- TMPL_IF NAME="overduenoticerequired" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td></tr>
+	<tr><th>Reserve fee</th><td>$<!-- TMPL_VAR NAME="reservefee" --></td></tr>
+</table>
+		<!-- TMPL_IF NAME="totalgtzero" -->
+<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="OK" /></form>
+		<!-- TMPL_ELSE -->
+<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="hidden" name="op" value="delete_confirmed" />
+			<input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" /> <input type="submit" value="Delete this Category" /></form> <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="Do Not Delete" /></form>
+		<!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="delete_confirmed" -->
+<h3>Category Deleted</h3>
+
+        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+        <input type="submit" value="OK" />
+        </form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="else" -->
+<h2>Patron Category Administration</h2>
+<!-- TMPL_IF NAME="searchfield" -->
+		You Searched for <!-- TMPL_VAR NAME="searchfield" --></span>
+	<!-- /TMPL_IF -->
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+		<input type="submit" name="search" value="Find" />
+	</form>	
+        <table>
+		<tr>
+			<th scope="col">Category Name</th>
+			<th scope="col">Code</th>
+			<th scope="col">Enrollment Period</th>
+			<th scope="col">Upper Age Limit</th>
+			<th scope="col">Age Required</th>
+ 			<th scope="col">Enrollment Fee</th>
+			<th scope="col">Overdue</th>
+ 			<th scope="col">Reservation Fee</th>
+			<th scope="col" colspan="2">&nbsp; </th>
+		</tr>
+		<!-- TMPL_LOOP NAME="loop" -->
+		<!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPl_IF -->
+                        <td><a href="<!-- TMPL_VAR NAME=script_name -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME=categorycode -->"><!-- TMPL_VAR NAME="description" --></a></td><td><!-- TMPL_VAR NAME="categorycode" --></td>
+                        
+                        <td><!-- TMPL_VAR NAME="enrolmentperiod" --> years</td>
+                        <td><!-- TMPL_VAR NAME="upperagelimit" --> years</td>
+                        <td><!-- TMPL_VAR NAME="dateofbirthrequired" --> years</td>
+                        <td><!-- TMPL_VAR NAME="enrolmentfee" --></td>
+                        <td><!-- TMPL_IF NAME="overduenoticerequired" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+                        <td><!-- TMPL_VAR NAME="reservefee" --></td>
+                        <td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" /><input type="submit" value="Edit" /></form></td>
+                        <td><form action="<!-- TMPL_VAR NAME=script_name -->" method="get"><input type="hidden" name="op" value="delete_confirm" /><input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->" /><input type="submit" value="Delete" /></form></td>
+		</tr>
+		<!-- /TMPL_LOOP -->
+	</table><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<input type="hidden" name="op" value="add_form" />
+		<input type="submit" value="Add Category" />
+	</form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/parameters/categoryitem.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/parameters/categoryitem.tmpl
@ -0,0 +1,306 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- <!-- TMPL_IF NAME="categorycode" -->Modify category<!-- TMPL_ELSE -->Add category<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+
+<!-- TMPL_IF NAME="add_form" -->
+        <script language="JavaScript" type="text/javascript">
+        //
+        function isNotNull(f,noalert) {
+                if (f.value.length ==0) {
+   return false;
+                }
+                return true;
+        }
+        //
+        function toUC(f) {
+                var x=f.value.toUpperCase();
+                f.value=x;
+                return true;
+        }
+        //
+        function isNum(v,maybenull) {
+        var n = new Number(v.value);
+        if (isNaN(n)) {
+                return false;
+                }
+        if (maybenull==0 && v.value=='') {
+                return false;
+        }
+        return true;
+        }
+        //
+        function isDate(f) {
+                var t = Date.parse(f.value);
+                if (isNaN(t)) {
+                        return false;
+                }
+        }
+        //
+        function Check(f) {
+                var ok=1;
+                var _alertString="";
+                var alertString2;
+                if (f.categorycode.value.length==0) {
+                        _alertString += "- categorycode missing\n";
+                }
+//              alert(window.document.Aform.description.value);
+                if (!(isNotNull(window.document.Aform.description,1))) {
+                        _alertString += "- description missing\n";
+                }
+                if (!isNum(f.upperagelimit,0)) {
+                        _alertString += "- upperagelimit is not a number\n";
+                }
+                if (_alertString.length==0) {
+                        document.Aform.submit();
+                } else {
+                        alertString2 = "Form not submitted because of the following problem(s)\n";
+                        alertString2 += "------------------------------------------------------------------------------------\n\n";
+                        alertString2 += _alertString;
+                }
+        }
+        </script>
+
+        <!-- TMPL_IF NAME="categorycode" -->
+                <h1>Modify category</h1>
+        <!-- TMPL_ELSE -->
+                <h1>Add category</h1>
+        <!-- /TMPL_IF -->
+
+        <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+        <input type="hidden" name="op" value="add_validate">
+        <input type="hidden" name="checked" value=0>
+                        
+        <table>  
+        <!-- TMPL_IF NAME="categorycode" -->
+                <tr>
+                        <td>Category code</td>
+                        <td>
+                                <input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->">
+                        </td>
+                </tr>
+        <!-- TMPL_ELSE -->
+                <tr>
+                        <td>Category code</td>
+                        <td>
+                                <input type="text" name="categorycode" size="3" maxlength="2" onblur="toUC(this)">
+                        </td>
+                </tr>
+        <!-- /TMPL_IF -->
+                <tr>
+                        <td>Description</td>
+                        <td>
+                                <input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="description" -->">
+                                &nbsp;
+                        </td>
+                </tr>
+                <tr>
+                        <td>Enrolment period</td>
+                        <td>
+                                <input type="text" name="enrolmentperiod" value="<!-- TMPL_VAR NAME="enrolmentperiod" -->">
+                        </td>
+                </tr>
+                <tr>
+                        <td>Upperage limit</td>
+                        <td>
+                                <input type="text" name="upperagelimit" value="<!-- TMPL_VAR NAME="upperagelimit" -->">
+                        </td>
+                </tr>
+                <tr>
+                        <td>Age Required</td>
+                        <td>
+                                <input type="text" name="dateofbirthrequired" value="<!-- TMPL_VAR NAME="dateofbirthrequired" -->">
+                        </td>
+                </tr>
+                <tr>
+                        <td>Fine type</td>
+                        <td>
+                                <input type="text" name="finetype" size="30" maxlength="30" value="<!-- TMPL_VAR NAME="finetype" -->">
+                        </td>
+                </tr>
+                <tr>
+                        <td>Bulk</td>
+                        <td>
+                                <input type="text" name="bulk" value="<!-- TMPL_VAR NAME="bulk" -->">
+                        </td>
+                </tr>
+                <tr>
+                        <td>Enrolment fee</td>
+                        <td>
+                                <input type="text" name="enrolmentfee" value="<!-- TMPL_VAR NAME="enrolmentfee" -->">
+                        </td>
+                </tr>
+                <tr>
+                        <td>Overdue notice required</td>
+                        <td>
+                                <input type="text" name="overduenoticerequired" value="<!-- TMPL_VAR NAME="overduenoticerequired" -->">
+                        </td>
+                </tr>
+                <tr>
+                        <td>Issue limit</td>
+                        <td>
+                                <input type="text" name="issuelimit" value="<!-- TMPL_VAR NAME="issuelimit" -->">
+                        </td>
+                </tr>
+                <tr>
+                        <td>Reserve fee</td>
+                        <td>
+                                <input type="text" name="reservefee" value="<!-- TMPL_VAR NAME="reservefee" -->">
+                        </td>
+                </tr>
+                <tr>
+                        <td>&nbsp;</td>
+                        <td>
+                                <input type="button" value="OK" onclick="Check(this.form)">
+                        </td>
+                </tr>
+        </table>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="add_validate" -->
+        Data recorded
+        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+                <input type="submit" value="OK">
+        </form>
+<!-- /TMPL_IF -->
+
+        TOTAL : <!-- TMPL_VAR NAME="categorycode" --> : <!-- TMPL_VAR NAME="total" --><br />
+                    
+        <table>
+                <tr>
+                        <td>
+                                Category code
+                        </td>
+                        <td>
+                                <!-- TMPL_VAR NAME="categorycode" -->
+                        </td>
+                </tr>
+                <form action="<!-- TMPL_VAR NAME=script_name -->" method="post">
+                        <input type="hidden" name="op" value="delete_confirmed">
+                        <input type="hidden" name="categorycode" value="<!-- TMPL_VAR NAME="categorycode" -->">
+                <tr>
+                        <td>Description</td>
+                        <td><!-- TMPL_VAR NAME="description" --></td>
+                </tr>
+                <tr>
+                        <td>Enrolment period</td>
+                        <td><!-- TMPL_VAR NAME="enrolmentperiod" --></td>
+                </tr>
+                <tr>
+                        <td>Upperage limit</td>
+                        <td><!-- TMPL_VAR NAME="upperagelimit" --></td>
+                </tr>
+                <tr>
+                        <td>Age Required</td>
+                        <td><!-- TMPL_VAR NAME="dateofbirthrequired" --></td>
+                </tr>
+                <tr>
+                        <td>Fine type</td>
+                        <td><!-- TMPL_VAR NAME="finetype" --></td>
+                </tr>
+                <tr>
+                        <td>Bulk</td>
+                        <td><!-- TMPL_VAR NAME="bulk" --></td>
+                </tr>
+                <tr>
+                        <td>Enrolment fee</td>
+                        <td><!-- TMPL_VAR NAME="enrolmentfee" --></td>
+                </tr>
+                <tr>
+                        <td>Overdue notice required</td>
+                        <td><!-- TMPL_VAR NAME="overduenoticerequired" --></td>
+                </tr>
+                <tr>
+                        <td>Issue limit</td>
+                        <td><!-- TMPL_VAR NAME="issuelimit" --></td>
+                </tr>
+                <tr>
+                        <td>Reserve fee</td>
+                        <td><!-- TMPL_VAR NAME="reservefee" --></td>
+                </tr>
+                <!-- TMPL_IF NAME="totalgtzero" -->
+                <tr>
+                        <td colspan="2">This record is used <!-- TMPL_VAR NAME="total" --> times. Deletion not possible</td>
+                </tr>
+               <tr>
+                        <td colspan=2>
+                                </form><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+                                <input type="submit" value="OK">
+                                </form>
+                        </td>
+                </tr>
+                <!-- TMPL_ELSE -->
+                <tr>
+                        <td colspan="2">CONFIRM DELETION</td>
+                </tr>
+                <tr>
+                        <td><input type="submit" value="YES"></form></td>
+                        <td><form action="<!-- TMPL_VAR NAME=script_name -->" method="post"><input type="submit" value="NO"></form></td>
+                </tr>
+                <!-- /TMPL_IF -->
+
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME=delete_confirmed -->
+        data deleted
+        <form action="<!-- TMPL_VAR NAME=script_name -->" method="post">
+        <input type="submit" value="OK">
+        </form>
+
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="else" -->
+        <h2>Category admin</h2>
+        <!-- TMPL_IF NAME="searchfield" -->
+                You Searched for <!-- TMPL_VAR NAME="searchfield" -->
+        <!-- /TMPL_IF -->
+
+        <form action="<TMP_VAR NAME="script_name">" method="post">
+                <input type="text" name="description" value="<!-- TMPL_VAR NAME=searchfield -->">
+                <input type="reset" name="reset" value="clr">
+        </form>
+
+        <table>
+                <tr>
+                        <th>Category</th>
+                        <th>Description</th>
+                        <th>Enrolment</th>
+                        <th>Upper Age Limit</th>
+                        <th>Age Required</th>
+                        <th>Fine</th>
+                        <th>Bulk</th>
+                        <th>Fee</th>
+                        <th>Overdue</th>
+                        <th>Issue Limit</th>
+                        <th>Reserve</th>
+                        <th>&nbsp;</th>
+                        <th>&nbsp;</th>
+                </tr>
+                <!-- TMPL_LOOP NAME="loop" -->
+                <tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
+                        <td><!-- TMPL_VAR NAME="categorycode" --></td>
+                        <td><!-- TMPL_VAR NAME="description" --></td>
+                        <td><!-- TMPL_VAR NAME="enrolmentperiod" --></td>
+                        <td><!-- TMPL_VAR NAME="upperagelimit" --></td>
+                        <td><!-- TMPL_VAR NAME="dateofbirthrequired" --></td>
+                        <td><!-- TMPL_VAR NAME="finetype" --></td>
+                        <td><!-- TMPL_VAR NAME="bulk" --></td>
+                        <td><!-- TMPL_VAR NAME="enrolmentfee" --></td>
+                        <td><!-- TMPL_VAR NAME="overduenoticerequired" --></td>
+                        <td><!-- TMPL_VAR NAME="issuelimit" --></td>
+                        <td><!-- TMPL_VAR NAME="reservefee" --></td>
+                        <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Edit</a></td>
+                        <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;categorycode=<!-- TMPL_VAR NAME="categorycode" -->">Delete</a></t$                </tr>
+                <!-- /TMPL_LOOP -->
+
+        </table>
+        <p><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+                <input type="hidden" name="op" value="add_form">
+                <input type="submit" value="Add Category"></a><br />
+        </form></p>
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+
+
+
+
--- a/koha-tmpl/intranet-tmpl/prog/en/parameters/charges.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/parameters/charges.tmpl
@ -0,0 +1,29 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: Fines
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<h2>Calculating Fines</h2>
+<p>Each box needs to be filled in with fine,time to start charging,charging cycle</p>
+<p>eg 1,7,7 = $1 fine, after 7 days, every 7 days</p>
+<p>Note : fines are calculated by the fines2.pl</span> script, located in misc</span> directory. Ask your administrator to put this script in crontab (after midnight) to have fines calculated every night</p>
+<form action="/cgi-bin/koha/admin/updatecharges.pl" method="post">
+<div class="table"><table>
+<tr>
+	<th>&nbsp;</th><!-- TMPL_LOOP NAME="title" --><th><!-- TMPL_VAR NAME="in_title" --></th><!-- /TMPL_LOOP -->
+</tr>
+<!-- TMPL_LOOP NAME="row" -->
+	<tr>
+		<th>
+			<!-- TMPL_VAR NAME="categorycode" -->
+		</th>
+		<!-- TMPL_LOOP NAME="cell" -->
+			<td bgcolor="<!-- TMPL_VAR name="toggle" -->">
+				<input name="<!-- TMPL_VAR name="inputname" -->" value="<!-- TMPL_VAR name="inputvalue" -->" size="6" maxlength="10">
+			</td>
+		<!-- /TMPL_LOOP -->
+	</TR>
+<!-- /TMPL_LOOP -->
+</table>
+<input type="submit" value="Submit Changes">
+</form>
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/parameters/checkmarc.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/parameters/checkmarc.tmpl
@ -0,0 +1,137 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: MARC Check: 
+<!-- TMPL_IF name="total" --><!-- TMPL_VAR name="total" --> errors found<!-- TMPL_ELSE -->Configuration OK!<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<h1>MARC Checks</h1>
+<table>
+	<tr>
+		<th>Test</th>
+		<th>Result</th>
+	</tr>
+<!-- -->
+<!-- TMPL_IF name="itemnum" -->
+	<tr>
+		<td>itemnum</td>
+		<td><ul><li>The field itemnum MUST be mapped </li>
+			<li>The correspounding subfield MUST be in with -1 (ignore) tab</li></ul></td>
+	</tr>
+<!-- TMPL_ELSE -->
+	<tr>
+		<td>OK</td>
+		<td>itemnum : the field itemnumber is mapped to a field in tab -1</td>
+	</tr>
+<!-- /TMPL_IF -->
+<!-- -->
+<!-- TMPL_IF name="itemfields" -->
+	<tr>
+		<td>item fields</td>
+		<td>ALL items fields MUST :<br />
+			<ul><li>be mapped to the same tag,</li>
+			<li>and they must all be in the 10 (items) tab</li></ul></td>
+	</tr>
+<!-- TMPL_ELSE -->
+	<tr>
+		<td>OK</td>
+		<td>All item fields are in the same tag and in item tab</td>
+	</tr>
+<!-- /TMPL_IF -->
+<!-- -->
+	<!-- TMPL_IF NAME="itemtags" -->
+		<tr>
+			<td>Item tag</td>
+			<td>There is more than 1 MARC tag related to items tab (10) : <!-- TMPL_VAR name="itemtags" --></td>
+		</tr>
+	<!-- TMPL_ELSE -->
+		<tr>
+			<td>OK</td>
+			<td><i>Only 1 MARC tag mapped to items</i></td>
+		</tr>
+	<!-- /TMPL_IF -->
+	<!--  -->
+<!-- TMPL_IF name="itemtype" -->
+	<tr>
+		<td>itemtype NOT mapped</td>
+		<td>the biblioitems.itemtype field MUST :<br />
+			<ul><li>be mapped to a MARC subfield, </li>
+			<li>the correspounding subfield MUST have authorised_value=itemtype</li></ul></td>
+	</tr>
+<!-- TMPL_ELSE -->
+	<tr>
+		<td>OK</td>
+		<td>biblioitems.itemtype defined</td>
+	</tr>
+<!-- /TMPL_IF -->
+<!-- -->
+<!-- TMPL_IF name="branch" -->
+	<tr>
+		<td>homebranch NOT mapped</td>
+		<td>the items.homebranch field MUST :<br />
+			<ul><li>be mapped to a MARC subfield,</li>
+			<li>the correspounding subfield MUST have authorised value=branches</li></ul></td>
+	</tr>
+<!-- TMPL_ELSE -->
+	<tr>
+		<td>OK</td>
+		<td>homebranch defined</td>
+	</tr>
+<!-- /TMPL_IF -->
+<!-- -->
+<!-- TMPL_IF name="holdingbranch" -->
+	<tr>
+		<td>holdingbranch NOT mapped</td>
+		<td>the items.holdingbranch field MUST :<br />
+			<ul><li>be mapped to a MARC subfield, </li>
+			<li>the correspounding subfield MUST have authorised value=branches</li></ul></td>
+	</tr>
+<!-- TMPL_ELSE -->
+	<tr>
+		<td>OK</td>
+		<td>holdingbranch defined</td>
+	</tr>
+<!-- /TMPL_IF -->
+<!-- -->
+<!-- TMPL_IF name="biblionumber" -->
+	<tr>
+		<td>biblio and biblionumber</td>
+		<td>The biblio.biblionumber and biblioitems.biblioitemnumber fields MUST :
+			<ul><li>be mapped to a MARC subfield,</li>
+			<li>be in the SAME tag (for example : 090$a and 090$b)</li>
+			<li>be in tab -1</li></ul></td>
+	</tr>
+<!-- TMPL_ELSE -->
+	<tr>
+		<td>OK</td>
+		<td>biblionumber and biblioitemnumber mapped correctly</td>
+	</tr>
+<!-- /TMPL_IF -->
+
+	<!-- TMPL_IF NAME="frameworknull" -->
+		<tr>
+			<td>framework values</td>
+			<td>there is a null value in a frameworkcode. Check the following tables<br/>
+				<li>select * from marc_subfield_structure where frameworkcode is NULL</li>
+				<li>select * from marc_tag_structure where frameworkcode is NULL</li>
+				<li>select * from marc_biblio where frameworkcode is NULL</li></td>
+		</tr>
+	<!-- TMPL_ELSE -->
+		<tr>
+			<td>OK</td>
+			<td><i>no NULL value in frameworkcode</i></td>
+		</tr>
+	<!-- /TMPL_IF -->
+
+<!-- -->
+<!-- TMPL_IF name="total" -->
+	<tr>
+		<td>TOTAL</td>
+		<td>You have <!-- TMPL_VAR name="total" --> error(s) in your MARC configuration. Please fix them before using Koha</td>
+	</tr>
+</table>
+<!-- TMPL_ELSE -->
+	</table>
+		<p>Configuration OK, you don't have errors in your MARC parameters table</p>
+<!-- /TMPL_IF -->
+
+
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/parameters/currency.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/parameters/currency.tmpl
@ -0,0 +1,190 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: 
+<!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="searchfield" -->Modify currency '<!-- TMPL NAME="searchfield" -->'<!-- TMPL_ELSE -->Add currency<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="add_validate" -->Data Recorded<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion of Currency '<!-- TMPL_VAR NAME="searchfield" -->'<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirmed" -->Currency Deleted<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="else" -->Currencies<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<!-- TMPL_IF NAME=add_form -->
+        <script>
+        //
+        function isNotNull(f,noalert) {
+                if (f.value.length ==0) {
+   return false;
+                }
+                return true;
+        }
+        //
+        function toUC(f) {
+                var x=f.value.toUpperCase();
+                f.value=x;
+                return true;
+        }
+        //
+        function isNum(v,maybenull) {
+        var n = new Number(v.value);
+        if (isNaN(n)) {
+                return false;
+                }
+        if (maybenull=="0" && v.value=="") {
+                return false;
+        }
+        return true;
+        }
+        //
+        function isDate(f) {
+                var t = Date.parse(f.value);
+                if (isNaN(t)) {
+                        return false;
+                }
+        }
+        //
+        function Check(f) {
+                var ok=1;
+                var _alertString="";
+                var alertString2;
+                if (f.currency.value.length==0) {
+                        _alertString += "- Currency name missing\\n";
+                }
+                if (f.rate.value.length==0) {
+                        _alertString += "- Rate missing\\n";
+                }
+                if (_alertString.length==0) {
+                        document.Aform.submit();
+                } else {
+                        alertString2 = "Form not submitted because of the following problem(s)\\n";
+                        alertString2 += "------------------------------------------------------------------------------------\\n\\n";
+                        alertString2 += _alertString;
+                        alert(alertString2);
+                }
+        }
+        </SCRIPT>
+
+        <form action="<!-- TMPL_VAR NAME=script_name -->" name="Aform" method="post">
+        <input type="hidden" name="op" value="add_validate" />
+
+	<table>
+	<caption><!-- TMPL_IF NAME=searchfield -->
+		Modify currency
+	<!-- TMPL_ELSE -->
+		Add currency
+	<!-- /TMPL_IF --></caption>
+	<!-- TMPL_IF NAME="searchfield" -->
+		<tr>
+			<th>Currency</th>
+			<td>
+				<input type="hidden" name="currency" value="<!-- TMPL_VAR NAME="searchfield" -->" /><!-- TMPL_VAR NAME="searchfield" -->
+			</td>
+		</tr>
+	<!-- TMPL_ELSE -->
+		<tr>
+			<th>Currency</th>
+			<td>
+				<input type="text" name="currency" size="50" maxlength="50" onblur="toUC(this);" />
+			</td>
+		</tr>
+	<!-- /TMPL_IF -->
+
+        	<tr>
+			<th>Rate</th	>
+			<td>
+				<input type="text" name="rate" size="10" maxlength="10" value="<!-- TMPL_VAR NAME="rate" -->" />
+			</td>
+		</tr>
+        </table>
+		
+		<input type="button" value="Update" onClick="Check(this.form)" /> <input type="button" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->'; return false;" />
+        </form>
+
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="add_validate" -->
+<h3>Data Recorded</h3>
+<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="OK" />
+        </form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="delete_confirm" -->
+<div class="table details">	<table><caption>Confirm Deletion of Currency <!-- TMPL_VAR NAME="searchfield" --></caption>
+
+		<tr>
+			<th>Currency</th>
+			<td><!-- TMPL_VAR NAME="searchfield" --></td>
+		</tr>
+
+
+        
+        	<tr>
+			<th>Rate</th>
+			<td><!-- TMPL_VAR NAME="rate" --></td>
+		</tr>
+		</table>
+		<!-- TMPL_IF NAME="totalgtzero" -->
+
+				<span class="alert">This currency is used <!-- TMPL_VAR NAME="total" --> times. Deletion not possible</span>
+				<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+					<input type="submit" value="OK" />
+				</form>
+		<!-- TMPL_ELSE -->
+     	<form action="<!-- TMPL_VAR NAME=script_name -->" method="post">
+			<input type="hidden" name="op" value="delete_confirmed" />
+			<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+				<input type="submit" value="Delete this Currency" />
+				</form>
+				<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+					<input type="submit" value="Do Not Delete" />
+				</form>
+		<!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="delete_confirmed" -->
+<h3>Currency Deleted</h3>
+<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<input type="submit" value="OK" />
+	</form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="else" -->
+
+<h2>Currencies Management</h2>
+	<!-- TMPL_IF NAME="searchfield" -->
+		You searched for <!-- TMPL_VAR NAME="searchfield" --></span>
+	<!-- /TMPL_IF -->	
+        <form action="<!-- TMPL_VAR NAME=script_name -->" method="post">
+                <input type="text" name="description" value="<!-- TMPL_VAR NAME=searchfield -->" />
+                <input type="submit" name="Search" value="Search" />
+        </form>	
+	<div class="table"><table>
+		<tr>
+			<th>Currency</th>
+			<th>Rate</th>
+			<th colspan="2">&nbsp;</th>
+		</tr>
+		<!-- TMPL_LOOP NAME="loop" -->
+		<tr>
+			<td><!-- TMPL_VAR NAME="currency" --></td>
+			<td><!-- TMPL_VAR NAME="rate" --></td>
+			<td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="currency" -->" /><input type="submit" value="Edit" /></form></td>
+                        <td><form action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="op" value="delete_confirm" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="currency" -->" /><input type="submit" value="Delete" /></form></td>
+		</tr>
+		<!-- /TMPL_LOOP -->
+	</table>
+<form action="<!-- TMPL_VAR NAME=script_name -->" method="post">
+        <input type="hidden" name="op" value="add_form" /><input type="submit" value="Add Currency" />
+        </form>
+
+	
+	<!-- TMPL_IF NAME="offsetgtzero" -->
+		<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Prev</a>
+	<!-- /TMPL_IF -->
+
+
+	<!-- TMPL_IF NAME="ltcount" -->
+		<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->">Next &gt;&gt;</a>	
+	<!-- /TMPL_iF -->
+
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/parameters/issuingrules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/parameters/issuingrules.tmpl
@ -0,0 +1,58 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: Issuing Rules<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+	<h1>Defining <!-- TMPL_IF NAME="branch" -->issuing rules for <!-- TMPL_VAR NAME="branch" --><!-- TMPL_ELSE -->default issuing rules<!-- /TMPL_IF --></h1>
+	<div class="help">
+		<h3>HINT for issues</h3>
+		<p>Each box needs to be filled in with issuelength,maxissues</p>
+		<p>eq 21,5</span> enables 5 issues for 21 days</p>
+		
+	<div class="help">
+		<h3>HINT for fines</h3>
+		<p>Each box needs to be filled in with fine,time to start charging,charging cycle</p>
+		<p>eg 1,7,7</span> = 1 [USD,EUR,etc] fine after 7 days, every 7 days</p>
+		<p>Fines are calculated by the fines2.pl script, located in misc directory.  Ask your administrator to put this script in crontab, after midnight, to have fines calculated every night</p>
+	
+	<div class="help">
+		<h3>Default values</h3>
+		<p> If a cell is not filled, the 1st of the following value is searched :</p>
+		<ul>
+			<li>same branch and same borrower category, itemtype *</li>
+			<li>same branch and same itemtype, borrower category *</li>
+			<li>same itemtype and borrower category, branch *</li>
+			<li>everywhere</li>
+			<li>If nothing is set, default is 21,5 (hardcoded)</li>
+		</ul>
+	
+		<form method="post" action="/cgi-bin/koha/admin/issuingrules.pl">
+		<label for="branch">Select a branch :</label>
+			<select id="branch" name="branch">
+				<option value="">Default</option>
+			<!-- TMPL_LOOP NAME="branchloop" -->
+				<option value="<!-- TMPL_VAR NAME="value" -->"<!-- TMPL_IF NAME="selected" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="branchname" --></option><!-- /TMPL_LOOP --></select>
+			<input type="submit" value="Select" />
+		</form>
+		<form method="post" action="/cgi-bin/koha/admin/issuingrules.pl">
+			<input type="hidden" name="op" value="save" />
+			
+			<table>
+			<caption>Defining issuing rules for <!-- TMPL_VAR NAME="branch" --></caption>
+			<tr>
+				<th>&nbsp;</th><!-- TMPL_LOOP NAME="title" --><th scope="col"><!-- TMPL_VAR NAME="in_title" --><br/>Issue / fine</th><!-- /TMPL_LOOP -->
+			</tr>
+			<!-- TMPL_LOOP NAME="row" -->
+				<tr>
+					<th><!-- TMPL_VAR NAME="categorycode" --></th>
+					<!-- TMPL_LOOP NAME="cell" -->
+						<td<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPL_IF -->>
+							<input name="<!-- TMPL_VAR NAME="issuingname" -->" value="<!-- TMPL_VAR NAME="issuingvalue" -->" size="6" maxlength="10" /> /
+							<input name="<!-- TMPL_VAR NAME="finesname" -->" value="<!-- TMPL_VAR NAME="finesvalue" -->" size="6" maxlength="10" />
+						</td>
+					<!-- /TMPL_LOOP -->
+				</tr>
+			<!-- /TMPL_LOOP -->
+			</table>
+			
+			<input type="submit" value="Save Changes" />
+		</form>
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/parameters/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/parameters/itemtypes.tmpl
@ -0,0 +1,168 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: 
+<!-- TMPL_IF name="add_form" --><!-- TMPL_IF name="itemtype" -->Modify item type '<!-- TMPL_VAR name="itemtype" -->'<!-- TMPL_ELSE -->Add item type<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" --><!-- TMPL_IF name="total" -->Cannot Delete Item Type '<!-- TMPL_VAR name="itemtype" -->'<!-- TMPL_ELSE -->Delete Item Type '<!-- TMPL_VAR name="itemtype" -->'?<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirmed" -->Data Deleted<!-- /TMPL_IF -->
+<!-- TMPL_IF name="else" -->Item Types Administration<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<!-- TMPL_IF name="add_form" -->
+
+	<form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
+		<input type="hidden" name="op" value="add_validate" />
+		<input type="hidden" name="checked" value="0" />
+		
+		<table>
+		<caption><!-- TMPL_IF name="itemtype" -->
+		Modify item type
+	<!-- TMPL_ELSE -->
+		Add item type
+	<!-- /TMPL_IF --></caption>
+			<!-- TMPL_IF name="itemtype" -->
+				<tr><th><label for="">Item type</label></th><td><input type="hidden" name="itemtype" value="<!-- TMPL_VAR name="itemtype" -->" /><!-- TMPL_VAR name="itemtype" --></td></tr>
+			<!-- TMPL_ELSE -->
+				<tr><th><label for="">Item type</label></th><td><input type="text" name="itemtype" size="6" maxlength="4" onblur="toUC(this)" /></td></tr>
+			<!-- /TMPL_IF -->
+			<tr>
+				<th><label for="description">Description</label></th>
+				<td><input type="text" id="description" name="description" size="48" maxlength="80" value="<!-- TMPL_VAR name="description" escape="HTML" -->" />&nbsp;</td>
+			</tr>
+			<tr>
+				<th><label for="notforloan">Not for loan</label></th>
+				<td><input type="checkbox" id="notforloan" name="notforloan"<!-- TMPL_IF name="notforloan" --> checked="checked"<!-- /TMPL_IF --> value="1"> (if checked, no item of this type can be issued. If not checked, every item of this type can be issued unless notforloan is set for a specific item)</td>
+			</tr>
+			<tr>
+			<tr>
+				<th><label for="renewalsallowed">Renewals</label></th>
+				<td><input type="text" id="renewalsallowed" name="renewalsallowed" size="3" maxlength="3" value="<!-- TMPL_IF name="renewalsallowed" --><!-- TMPL_VAR NAME="renewalsallowed" --><!-- /TMPL_IF -->" value="1" /><!-- Display for NPL //<input type="hidden" name="rentalcharge" value="0" /> //Display for NPL --></td>
+			</tr>
+<!-- Hide from NPL--> 			<tr>
+				<th><label for="rentalcharge">Rental charge</label></th>
+				<td><input type="text" id="rentalcharge" name="rentalcharge" size="10" value="<!-- TMPL_VAR name="rentalcharge" -->" /></td>
+			</tr><!--  /Hide from NPL -->
+		</table><input type="button" value="Save Changes" onclick="Check(this.form)" /> <input type="button" value="Cancel" onclick="history.back();" />
+	</form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="delete_confirm" -->
+<!-- TMPL_IF name="total" --><div class="error">This record is used <!-- TMPL_VAR name="total" --> times. Deletion is not possible.<!-- /TMPL_IF -->
+<div class="table details">	<table>
+	<caption><!-- TMPL_IF name="total" -->Cannot Delete Item Type<!-- TMPL_ELSE -->Delete Item Type '<!-- TMPL_VAR name="itemtype" -->'?<!-- /TMPL_IF --></caption>
+		<tr>
+			<th>Item type</th>
+			<td><!-- TMPL_VAR name="itemtype" --></td>
+		</tr>
+
+	<tr><th>Description</th><td><!-- TMPL_VAR name="description" --></td></tr>
+	<tr><th>Loan length</th><td><!-- TMPL_VAR name="loanlength" --></td></tr>
+	<tr><th>Renewals</th><td><!-- TMPL_IF name="renewalsallowed" -->Allowed<!-- TMPL_ELSE -->Not allowed<!-- /TMPL_IF --></td></tr>
+<!-- Hide from NPL  --><tr><th>Rental charge</th><td><!-- TMPL_VAR name="rentalcharge" --></td></tr><!-- Hide from NPL --></table>
+		<form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+		<input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="itemtype" value="<!-- TMPL_VAR name="itemtype" -->" /><!-- TMPL_IF name="total" -->
+		</form><form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="submit" value="OK" /></form>
+	<!-- TMPL_ELSE -->
+		<input type="submit" value="Delete this Item Type" /></form> <form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="submit" value="Do Not Delete" /></form>
+	<!-- /TMPL_IF -->
+
+	
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="else" -->
+<table>
+<caption>Item Types Administration</caption>
+	<tr>
+		<th>Code</th>
+		<th>Description</th>
+		<th>Not for Loan</th>
+		<th>Renewable</th>
+		<th>Charge</th>
+		<th>Edit</th>
+		<th>Delete</th>
+	</tr>
+	<!-- TMPL_LOOP name="loop" -->
+		<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
+			<td><a href="<!-- TMPL_VAR name="script_name" -->?op=add_form&amp;itemtype=<!-- TMPL_VAR name="itemtype" escape="HTML" -->"><!-- TMPL_VAR name="itemtype" --></a></td>
+			<td><!-- TMPL_VAR name="description" --></td>
+			<td><!-- TMPL_IF NAME="notforloan" -->Yes<!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_IF NAME="renewalsallowed" -->
+						<!-- TMPL_VAR name="renewalsallowed" --> time(s)
+					<!-- TMPL_ELSE -->
+						No
+					<!-- /TMPL_IF -->
+			</td>
+		<td><!-- TMPL_UNLESS name="notforloan" --><!-- TMPL_VAR NAME="rentalcharge" --><!-- /TMPL_UNLESS --></td>
+			<td><form action="<!-- TMPL_VAR name="script_name" -->" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="itemtype" value="<!-- TMPL_VAR name="itemtype" escape="HTML" -->" /><input type="submit" value="Edit" /></form></td>
+			<td><form action="<!-- TMPL_VAR name="script_name" -->" method="get"><input type="hidden" name="op" value="delete_confirm" /><input type="hidden" name="itemtype" value="<!-- TMPL_VAR name="itemtype" escape="HTML" -->" /><input type="submit" value="Delete" /></form></td>
+		</tr>
+	<!-- /TMPL_LOOP -->
+</table>
+
+<form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+<p><input type="hidden" name="op" value="add_form" />
+
+<!-- TMPL_IF name="previous" --><input type="button" onclick="location.href='<!-- TMPL_VAR name="previous" -->'; return false;" value="&lt;&lt; Previous Page" /><!-- /TMPL_IF -->
+
+<input type="submit" value="Add Item Type" />
+
+<!-- TMPL_IF name="next" --><input type="button" onclick="location.href='<!-- TMPL_VAR name="next" -->'; return false;" value="Next Page &gt;&gt;" /><!-- /TMPL_IF -->
+</p></form>
+<!-- /TMPL_IF -->
+
+
+<script language="javascript" type="text/javascript">
+function _(s) { return s } // dummy function for gettext
+
+function isNotNull(f,noalert) {
+	if (f.value.length ==0) {
+		return false;
+	}
+	return true;
+}
+
+function toUC(f) {
+	var x=f.value.toUpperCase();
+	f.value=x;
+	return true;
+}
+
+function isNum(v,maybenull) {
+var n = new Number(v.value);
+if (isNaN(n)) {
+	return false;
+	}
+if (maybenull==0 && v.value=='') {
+	return false;
+}
+return true;
+}
+
+function isDate(f) {
+	var t = Date.parse(f.value);
+	if (isNaN(t)) {
+		return false;
+	}
+}
+
+function Check(f) {
+	var ok=1;
+	var _alertString="";
+	var alertString2;
+	if (f.itemtype.value.length==0) {
+		_alertString += "\n- " + _("Itemtype missing");
+	}
+	if (!(isNotNull(window.document.Aform.description,1))) {
+		_alertString += "\n- " + _("Description missing");
+	}
+	if ((!isNum(f.rentalcharge,0)) && f.rentalcharge.value.length > 0) {
+		_alertString += "\n- " + _("Rental charge is not a number");
+	}
+	if (_alertString.length==0) {
+		document.Aform.submit();
+	} else {
+		alertString2  = _("Form not submitted because of the following problem(s)");
+		alertString2 += "\n------------------------------------------------------------------------------------\n";
+		alertString2 += _alertString;
+		alert(alertString2);
+	}
+}
+</script>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/parameters/koha2marclinks.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/parameters/koha2marclinks.tmpl
@ -0,0 +1,137 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: 
+<!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="else" -->MARC links <!-- TMPL_VAR name="tagfield" --><!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_IF name="add_form" -->
+<!-- -->
+<h1><!-- TMPL_VAR name="action" --></h1>
+	<p>Choose and validate 1 of the following for <!-- TMPL_VAR name="tablename" -->.<!-- TMPL_VAR name="kohafield" --></p><table>
+<tr><td><form action="<!-- TMPL_VAR name="script_name" -->" method="post">	<input type="hidden" name="op" value="add_validate" />
+			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
+			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
+			<!-- TMPL_VAR name="marclist0" --><input type="submit" value="OK" /></form>
+		</td>
+	</tr>
+	<tr>
+
+		<td>	<form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+			<input type="hidden" name="op" value="add_validate" />
+			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
+			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" /><input type="submit" value="OK" />
+			<!-- TMPL_VAR name="marclist1" -->	</form>
+		</td>
+	</tr>
+	<tr>
+
+		<td>
+				<form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="hidden" name="op" value="add_validate" />
+			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
+			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
+			<!-- TMPL_VAR name="marclist2" --><input type="submit" value="OK" /></form>
+		</td>
+	</tr>
+	<tr>
+	
+		<td><form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+			<input type="hidden" name="op" value="add_validate" />
+			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
+			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
+			<!-- TMPL_VAR name="marclist3" --><input type="submit" value="OK" />	</form>
+		</td>
+	</tr>
+	<tr>
+	
+		<td><form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+			<input type="hidden" name="op" value="add_validate" />
+			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
+			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
+			<!-- TMPL_VAR name="marclist4" --><input type="submit" value="OK" /></form>
+		</td>
+	</tr>
+	<tr>
+
+		<td>	<form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+			<input type="hidden" name="op" value="add_validate" />
+			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
+			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
+			<!-- TMPL_VAR name="marclist5" --><input type="submit" value="OK" /></form>
+		</td>
+	</tr>
+	<tr>
+	
+		<td><form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+			<input type="hidden" name="op" value="add_validate" />
+			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
+			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
+			<!-- TMPL_VAR name="marclist6" --><input type="submit" value="OK" /></form>
+		</td>
+	</tr>
+	<tr>
+	
+		<td><form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+			<input type="hidden" name="op" value="add_validate" />
+			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
+			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
+			<!-- TMPL_VAR name="marclist7" --><input type="submit" value="OK" /></form>
+		</td>
+	</tr>
+	<tr>
+	
+		<td><form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+			<input type="hidden" name="op" value="add_validate" />
+			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
+			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
+			<!-- TMPL_VAR name="marclist8" --><input type="submit" value="OK" /></form>
+		</td>
+	</tr>
+	<tr>
+	
+		<td><form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+			<input type="hidden" name="op" value="add_validate" />
+			<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
+			<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
+			<!-- TMPL_VAR name="marclist9" --><input type="submit" value="OK" /></form>
+		</td>
+	</tr>
+	<tr>
+		<td>
+			<form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
+				<input type="hidden" name="op" value="add_validate" />
+				<input type="hidden" name="tablename" value="<!-- TMPL_VAR name="tablename" -->" />
+				<input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->" />
+				<input type="hidden" name="choice" value="" />
+				<input type="submit" value="Click to &quot;Unmap&quot;" />
+			</form>
+		</td>
+	</tr>
+	</table>
+<!-- /TMPL_IF -->
+
+<!-- -->
+<!-- TMPL_IF name="else" -->
+
+<h1>MARC links <!-- TMPL_VAR name="tagfield" --></h1>
+<form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+<p><!-- TMPL_VAR name="tablename" --> <input type="submit" value="OK" /></p>
+</form>
+<table>
+<tr>
+	<th>Koha Field</th>
+	<th>Tag</th>
+	<th>Subfield</th>
+	<th>Lib</th>
+	<th>&nbsp;</th>
+</tr>
+<!-- TMPL_LOOP name="loop" -->
+<tr>
+	<td><a href="<!-- TMPL_VAR name="edit" -->"><!-- TMPL_VAR name="kohafield" --></a></td>
+	<td><!-- TMPL_VAR name="tagfield" --></td>
+	<td><!-- TMPL_VAR name="tagsubfield" --></td>
+	<td><!-- TMPL_VAR name="liblibrarian" --></td>
+	<td><a href="<!-- TMPL_VAR name="edit" -->">Edit</a></td>
+</tr>
+<!-- /TMPL_LOOP -->
+</table>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/parameters/marc_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/parameters/marc_subfields_structure.tmpl
@ -0,0 +1,131 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: 
+<!-- TMPL_IF name="add_form" --><!-- TMPL_IF NAME="modify" -->Modify system preference '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE -->Add a system preference<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF name="add_validate" -->Data Added<!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of Parameter '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirmed" -->Parameter Deleted<!-- /TMPL_IF --><!-- TMPL_IF name="else" -->Preferences<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<!-- TMPL_IF NAME="add_form" -->
+
+	<h1><!-- TMPL_IF NAME="use-heading-flags-p" -->
+	<!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit MARC subfields constraints<!-- /TMPL_IF -->
+	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --></h1>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+	<input type="hidden" name="op" value="add_validate" />
+	<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
+	<!-- TMPL_LOOP NAME="loop" -->
+	<div class="data <!-- TMPL_VAR NAME="toggle" -->"><h2>Tag <!-- TMPL_VAR NAME="tagfield" -->, Subfield <!-- TMPL_VAR NAME="tagsubfield" --></h2>
+	<table>
+	<caption>MARC constraints</caption>
+	<tr><th><label for="repeatable<!-- TMPL_VAR NAME="row" -->">Repeatable:</label></th><td><!-- TMPL_VAR NAME="repeatable" --></td></tr>
+	<tr><th><label for="mandatory<!-- TMPL_VAR NAME="row" -->">Mandatory:</label></th><td><!-- TMPL_VAR NAME="mandatory" --> </td></tr>
+	<tr><th><label for="seealso<!-- TMPL_VAR NAME="row" -->">Search also:</label></th><td><input type="text" id="seealso<!-- TMPL_VAR NAME="row" -->" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size="20" /> (example for 200a: '200c','200d','200e'...)</td></tr>
+	<tr><th><label for="kohafield<!-- TMPL_VAR NAME="row" -->">Koha link:</label></th><td><!-- TMPL_VAR NAME="kohafield" --></td></tr>
+			</table>
+	<table>
+	<caption>Editor constaints</caption>
+	<tr><th><label for="liblibrarian<!-- TMPL_VAR NAME="row" -->">Text for librarian:</label></th><td><input id="liblibrarian<!-- TMPL_VAR NAME="row" -->" type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80" /></td></tr>
+	<tr><th><label for="libopac<!-- TMPL_VAR NAME="row" -->">Text for OPAC:</label></th><td><input type="text" id="libopac<!-- TMPL_VAR NAME="row" -->" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80" /></td></tr>
+	<tr><th><label for="tab<!-- TMPL_VAR NAME="row" -->">Managed in tab:</label></th><td><!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield is NOT managed by Koha)</td></tr>
+	<tr><th><label for="hidden<!-- TMPL_VAR NAME="row" -->">Hidden: </label></th><td><!-- TMPL_VAR NAME="hidden" --> (subfield is managed, but hidden. -should be filled by a plugin or thesaurus-)</td></tr>
+	<tr><th><label for="isurl<!-- TMPL_VAR NAME="row" -->">Is a URL: </label></th><td><!-- TMPL_VAR NAME="isurl" --> (if checked, it means that the subfield is an URL and can be clicked</td></tr>
+<tr><th><label>Default Options: <p>(choose one)</p></label></th><td>
+<ul>
+	<li>Authorized Value: <!-- TMPL_VAR NAME="authorised_value" --></li>
+	<li>Thesaurus: <!-- TMPL_VAR NAME="authtypes" --></li>
+	<li>Plugin: <!-- TMPL_VAR NAME="value_builder" --></li>
+	<li>Link: <input type="text" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5" /> (exemple:200b)</li>
+</ul>
+</td></tr>	 
+		</table>
+		
+	<!-- /TMPL_LOOP -->
+	<input type="submit" value="Save Changes" />
+	<p>Note: in the last column, you can choose:
+	<ul><li>An "authorised value": it refers to a list of authorised values for this subfield. See the corresponding admin table.</li>
+	<li>A "thesaurus category": it refers to a thesaurus category. See the corresponding admin table.</li>
+	<li>A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically.</li>
+	</ul>
+	</p>
+	</form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="delete_confirm" -->
+
+<table>
+<caption>Confirm Deletion of Subfield <!-- TMPL_VAR NAME="tagsubfield" -->?</span></caption>
+	<tr>
+		<th>Subfield</th>
+		<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
+	</tr>
+	<tr><th>Description</th><td><!-- TMPL_VAR NAME="liblibrarian" --></td></tr>
+</table>
+			<form class="inline" action="<!-- TMPL_VAR NAME="delete_link" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" />
+				<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+				<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" /><input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><input type="submit" value="Yes, Delete this Subfield" />
+			</form> <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">	<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />	<input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->" />	<input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR NAME="tagsubfield" -->" />	<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />	<input type="submit" value="No, Do Not Delete" />
+			</form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="delete_confirmed" -->
+
+	Data deleted
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="tagfield" -->">
+	<input type="submit" value="OK" />
+	</form>
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_IF NAME="else" -->
+<h1>MARC subfield structure admin for <!-- TMPL_VAR NAME="tagfield" --> (framework <!--TMPL_VAR NAME="frameworkcode" -->)</h1>
+<p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit. </p>
+<p>The column Koha field shows that the subfield is linked with a Koha field. Koha can manage a MARC interface, or a Koha interface. This link ensures that both DB are synchronized, thus you can change from a MARC to a Koha interface easily.</p>
+
+<table>
+<tr>
+	<th>Subfield</th>
+	<th>Text</th>
+	<th>Constraints</th>
+	<th>Delete</th>
+<!-- TMPL_LOOP NAME="loop" -->
+<!-- TMPL_IF NAME="toggle" --><tr class="highlighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
+	<td><!-- TMPL_VAR NAME="tagsubfield" --></td>
+	<td>
+		<!-- TMPL_IF NAME="subfield_ignored" -->
+			<i><!-- TMPL_VAR NAME="liblibrarian" --></i>
+		<!-- TMPL_ELSE -->
+			<!-- TMPL_VAR NAME="liblibrarian" -->
+		<!-- /TMPL_IF -->
+	</td>
+	<td>
+		<!-- TMPL_IF NAME="subfield_ignored" -->
+			<i>subfield ignored</i>
+		<!-- TMPL_ELSE -->
+			Tab:<!-- TMPL_VAR NAME="tab" -->,
+			<!-- TMPL_IF NAME="kohafield" --> | Koha field: <!-- TMPL_VAR NAME="kohafield" -->, <!--/TMPL_IF -->
+			<!-- TMPL_IF NAME="repeatable" -->Repeatable, <!-- TMPL_ELSE -->Not repeatable,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="mandatory" -->Mandatory, <!-- TMPL_ELSE -->Not mandatory,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="seealso" --> | See Also: <!-- TMPL_VAR NAME="seealso" -->,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="hidden" -->hidden,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="isurl" -->is an url,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="authorised_value" --> | Auth value:<!-- TMPL_VAR NAME="authorised_value" -->,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="authtypecode" --> | Authority:<!-- TMPL_VAR NAME="authtypecode" -->,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="value_builder" --> | Plugin:<!-- TMPL_VAR NAME="value_builder" -->,<!-- /TMPL_IF -->
+			<!-- TMPL_IF NAME="link" --> | Link:<!-- TMPL_VAR NAME="link" -->,<!-- /TMPL_IF -->
+		<!-- /TMPL_IF -->
+	</td>
+	<td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
+</tr>
+<!-- /TMPL_LOOP -->
+</table>
+<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="tagfield" value="<!-- TMPL_VAR NAME="edit_tagfield" -->" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="edit_frameworkcode" -->" /><input type="submit" value="Edit Subfields" /></form> <form class="inline" action="marctagstructure.pl" method="get"><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="tagfield" -->" /><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" /><input type="submit" value="Return to Marc Structure" /></form>
+<!-- TMPL_IF NAME="previous" -->
+	<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0" >
+	</a><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="next" -->
+	<!-- TMPL_VAR NAME="next" -->
+		<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0" />
+	</a>
+<!-- /TMPL_IF -->
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/parameters/marctagstructure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/parameters/marctagstructure.tmpl
@ -0,0 +1,206 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: 
+<!-- TMPL_IF name="add_form" --><!-- TMPL_VAR name="action" --><!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of Tag '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirmed" -->Data Deleted<!-- /TMPL_IF -->
+<!-- TMPL_IF name="else" -->MARC tag Structure<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<h1>MARC tag structure admin for <!-- TMPL_IF NAME="frameworkcode" --><!-- TMPL_VAR NAME="frameworktext" --> (<!-- TMPL_VAR NAME="frameworkcode" -->)<!-- TMPL_ELSE -->default MARC framework<!-- /TMPL_IF --></h1>
+<script language="javascript" type="text/javascript">
+	function _(s) { return s } // dummy function for gettext
+	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	function isNotNull(f,noalert) {
+		if (f.value.length ==0) {
+   return false;
+		}
+		return true;
+	}
+	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	function toUC(f) {
+		var x=f.value.toUpperCase();
+		f.value=x;
+		return true;
+	}
+	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	function isNum(v,maybenull) {
+	var n = new Number(v.value);
+	if (isNaN(n)) {
+		return false;
+		}
+	if (maybenull==0 && v.value=='') {
+		return false;
+	}
+	return true;
+	}
+	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	function isDate(f) {
+		var t = Date.parse(f.value);
+		if (isNaN(t)) {
+			return false;
+		}
+	}
+	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	function Check(f) {
+		var ok=1;
+		var _alertString="";
+		var alertString2;
+		if (f.tagfield.value.length==0) {
+			_alertString += "\n- " + _("tag number missing");
+		}
+		if (_alertString.length==0) {
+			document.Aform.submit();
+		} else {
+			alertString2  = _("Form not submitted because of the following problem(s)");
+			alertString2 += "\n------------------------------------------------------------------------------------\n";
+			alertString2 += _alertString;
+			alert(alertString2);
+		}
+	}
+	</script>
+
+<!-- TMPL_IF NAME="add_form" -->
+<!-- ------------------------------------------------------------------------ -->
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+		<input type="hidden" name="op" value="add_validate">
+		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
+	<table>
+		<caption><!-- TMPL_IF NAME="use-heading-flags-p" --><!-- TMPL_IF NAME="heading-modify-tag-p" -->Modify tag<!-- /TMPL_IF --><!-- TMPL_IF NAME="heading-add-tag-p" -->Add tag<!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --></caption>
+	<tr><th><label>Tag<label></th><td><!-- TMPL_VAR NAME="searchfield" --></td></tr>
+	<tr><th><label for="liblibrarian">Tag Label in Intranet</label></th><td><input type="text" id="liblibrarian" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape=HTML -->" size="80" maxlength="100"></td></tr>
+	<tr><th><label for="libopac">Tag Label in OPAC</label></th><td><input type="text" id="libopac" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape=HTML -->" size="80" maxlength="100"></td></tr>
+	<tr><th><label for="repeatable">Repeatable</label></th><td><!-- TMPL_VAR NAME="repeatable" --></td></tr>
+	<tr><th><label for="mandatory">Mandatory</label></th><td><!-- TMPL_VAR NAME="mandatory" --></td></tr>
+	<tr><th><label for="authorised_value">Authorized value</label></th><td><!-- TMPL_VAR NAME="authorised_value" --> (if you select a value here, the indicators will be limited to the authorised value list)</td></tr>
+	</table>
+		<p><input type="submit" value="Save Changes" onclick="Check(this.form)" /></p>
+	<p><input type="submit" value="Cancel and Return to MARC Tag Structure" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->?frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->'; return false;" /></p>
+	</form>
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_IF NAME="delete_confirm" -->
+<!-- ------------------------------------------------------------------------ -->
+<table>
+<caption>Confirm Deletion of Tag <em><!-- TMPL_VAR NAME="searchfield" --></em>?</caption>
+	<tr><th>Tag: </th><td><!-- TMPL_VAR NAME="searchfield" --></td></tr>
+	<tr><th>Description: </th><td><!-- TMPL_VAR NAME="liblibrarian" --></td></tr>
+	</table>
+	<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed"><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->"><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">	<input type="submit" value="Yes, Delete this Tag"></form> <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="No, Do Not Delete"></form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="delete_confirmed" -->
+<!-- ------------------------------------------------------------------------ -->
+	<div class="details"><h3>Tag Deleted</h3>
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
+	<input type="submit" value="Return to MARC Tag Structure">
+	</form>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="framework_create" -->
+<!-- ------------------------------------------------------------------------ -->
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<input type="hidden" name="op" value="framework_create_confirm">
+		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
+		Create framework for <!-- TMPL_VAR NAME="frameworkcode" --> (<!-- TMPL_VAR NAME="frameworktext" -->) using
+		<select name="existingframeworkcode">
+			<option value="">Default</option>
+		<!-- TMPL_LOOP NAME="existingframeworkloop" -->
+			<option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="frameworktext" --></option>
+		<!-- /TMPL_LOOP -->
+		</select>
+		<input type="submit" value="OK">
+	</form>
+<!-- /TMPL_IF -->
+
+<!-- ------------------------------------------------------------------------ -->
+<!-- TMPL_IF NAME="else" -->
+
+<form name="f" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+<label for="frameworkcode">Select a framework: </label>
+	<select id="frameworkcode" name="frameworkcode">
+		<option value="">Default</option>
+	<!-- TMPL_LOOP NAME="frameworkloop" -->
+		<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="frameworktext" --></option>
+	<!-- /TMPL_LOOP -->
+	</select>
+	<label for="searchfield">Search for Tag: </label>
+	<input type="text" name="searchfield" id="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
+	<input type="submit" value="Search">
+			<p>
+		<label for="select_display">Display only used Tags/Subfields</label> <input type="checkbox" name="select_display" id="select_display" value="True"<!-- TMPL_IF Name="select_display"--> checked="checked"<!--/TMPL_IF -->  onchange="this.form.submit();" />
+		</p>
+</form>
+<p>NOTE : if you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/rebuildnonmarc.pl script.</p>
+
+	<table>
+	<tr>
+		<th>Tag</th>
+		<th>Lib</th>
+		<th>Repeatable</th>
+		<th>Mandatory</th>
+		<th>Authorized<br />value</th>
+		<th>Subfields</th>
+		<th>Edit</th>
+		<th>Delete</th>
+				<tr>
+	<!-- TMPL_IF NAME="select_display" -->
+		<!-- TMPL_LOOP NAME="loop" -->
+			<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
+			<td><!-- TMPL_VAR NAME="tagfield" --></td>
+			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
+			<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+			<td><!-- TMPL_VAR NAME="authorised_value" --></td>
+			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->">subfields</a></td>
+			<td><a href="<!-- TMPL_VAR NAME="edit" -->">Edit</a></td>
+			<td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
+		</tr>
+			<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
+			<td>
+				&nbsp;
+			</td>
+			<td colspan="7">
+				<!-- TMPL_LOOP NAME="subfields" -->
+					<p>	Tab:<!-- TMPL_VAR NAME="tab" --> | $<!-- TMPL_VAR NAME="tagsubfield" -->
+							<!-- TMPL_VAR NAME="liblibrarian" --> <!-- TMPL_IF NAME="kohafield" --><!-- TMPL_VAR NAME="kohafield" --><!--/TMPL_IF --><!-- TMPL_IF NAME="repeatable" -->, repeatable<!-- /TMPL_IF --><!-- TMPL_IF NAME="mandatory" -->, Mandatory<!-- /TMPL_IF --><!-- TMPL_IF NAME="seealso" -->, See <!-- TMPL_VAR name="seealso" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authorised_value" -->, <!-- TMPL_VAR NAME="authorised_value" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authtypecode" -->, <!-- TMPL_VAR NAME="authtypecode" --><!--/TMPL_IF --><!-- TMPL_IF NAME="value_builder" -->, <!-- TMPL_VAR NAME="value_builder" --><!--/TMPL_IF -->
+					</p>
+				<!-- /TMPL_LOOP -->
+			</td>
+		</tr>
+		<!-- /TMPL_LOOP -->
+	<!-- TMPL_ELSE -->
+	<!-- TMPL_LOOP NAME="loop" -->
+	<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="highlight"><!-- /TMPL_IF -->
+		<td><!-- TMPL_VAR NAME="tagfield" --></td>
+		<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
+		<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+		<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
+		<td><!-- TMPL_VAR NAME="authorised_value" --></td>
+		<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->">Edit Subfields</a></td>
+		<td><a href="<!-- TMPL_VAR NAME="edit" -->">Edit</a></td>
+		<td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
+	</tr>
+	<!-- /TMPL_LOOP -->
+	<!--/TMPL_IF -->
+	</table>
+	<!-- TMPL_IF NAME="isprevpage" -->
+			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">&lt;&lt; Previous</a>
+		<!-- /TMPL_IF --><form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+	<input type="hidden" name="op" value="add_form">
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<input type="hidden" name="op" value="add_form">
+	<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->">
+		<input type="submit" value="Add Tag" />
+	</form>
+		<!-- TMPL_IF NAME="nextpage" -->
+			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">Next &gt;&gt;</a>
+		<!-- /TMPL_IF -->
+		<script language="javascript" type="text/javascript">
+	function ChangeDisplay(checkbox) {
+		window.
+	}
+</script>
+
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/parameters/printers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/parameters/printers.tmpl
@ -0,0 +1,187 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: 
+<!-- TMPL_IF NAME=add_form --><!-- TMPL_IF NAME="searchfield" -->Modify printer '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE -->Add printer<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="add_validate" -->Printer Added<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion of Printer '<!-- TMPL_VAR NAME="searchfield" -->'<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirmed" -->Printer Deleted<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="else" -->Printers<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_IF NAME=add_form -->
+        <script language="JavaScript" type="text/javascript">
+        //
+        function isNotNull(f,noalert) {
+                if (f.value.length ==0) {
+   return false;
+                }
+                return true;
+        }
+        //
+        function toUC(f) {
+                var x=f.value.toUpperCase();
+                f.value=x;
+                return true;
+        }
+        //
+        function isNum(v,maybenull) {
+        var n = new Number(v.value);
+        if (isNaN(n)) {
+                return false;
+                }
+        if (maybenull==0 && v.value=="") {
+                return false;
+        }
+        return true;
+        }
+        //
+        function isDate(f) {
+                var t = Date.parse(f.value);
+                if (isNaN(t)) {
+                        return false;
+                }
+        }
+        //
+        function Check(f) {
+                var ok=1;
+                var _alertString="";
+                var alertString2;
+                if (f.printername.value.length==0) {
+                        _alertString += "- printer name missing\n";
+                }
+                if (f.printqueue.value.length==0) {
+                        _alertString += "- Queue missing\n";
+                }
+                if (_alertString.length==0) {
+                        document.Aform.submit();
+                } else {
+                        alertString2 = "Form not submitted because of the following problem(s)\n";
+                        alertString2 += "------------------------------------------------------------------------------------\n\n";
+                        alertString2 += _alertString;
+                        alert(alertString2);
+                }
+        }
+        </script>
+
+
+        
+<!-- TMPL_IF NAME="searchfield" -->
+		<h1>Modify printer</h1>
+	<!-- TMPL_ELSE -->
+		<h1>Add printer</h1>
+	<!-- /TMPL_IF -->
+        <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+        <input type="hidden" name="op" value="add_validate" />
+	<table>
+	<!-- TMPL_IF NAME="searchfield" -->
+		<tr>
+			<td>Printer Name</td>
+			<td>
+				<input type="hidden" name="printername" value="<!-- TMPL_VAR NAME=searchfield -->" /><!-- TMPL_VAR NAME="searchfield" -->
+			</td>
+		</tr>
+	<!-- TMPL_ELSE -->
+		<tr>
+			<td>Printer Name</td>
+			<td>
+				<input type="text" name="printername" size="50" maxlength="50" />
+			</td>
+		</tr>
+	<!-- /TMPL_IF -->
+
+        	<tr>
+			<td>Queue</td>
+			<td><input type="text" name="printqueue" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printqueue" -->" /> </td>
+		</tr>
+        	<tr>
+			<td>Type</td>
+			<td><input type="text" name="printtype" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printtype" -->" /> </td>
+		</tr>
+        </table><p><input type="button" value="OK" onclick="Check(this.form);" /> <input type="button" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->';" /></p>
+        </form>
+
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="add_validate" -->
+<h3>Printer Added</h3>
+<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+        <input type="submit" value="OK" />
+</form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="delete_confirm" -->
+<h3>Confirm Deletion of Printer <em><!-- TMPL_VAR NAME="searchfield" --></em></h3>
+<table>
+		<tr>
+			<td>Printer</td>
+			<td><!-- TMPL_VAR NAME="searchfield" --></td>
+		</tr>
+		<tr>
+			<td>Queue</td>
+			<td><!-- TMPL_VAR NAME="printqueue" --></td>
+		</tr>
+        	<tr>
+			<td>Type</td>
+			<td><!-- TMPL_VAR NAME="printtype" --></td>
+		</tr>
+        	<tr>
+			<td>
+
+			</td>
+			<td>
+
+			</td>
+		</tr>
+	</table>
+    	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+			<input type="hidden" name="op" value="delete_confirmed" />
+			<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+			<input type="submit" value="Delete this Printer" />
+			</form> <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+				<input type="submit" value="Do not Delete" />
+			</form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="delete_confirmed" -->
+<h3>Printer Deleted</h3>
+<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<input type="submit" value="Ok" />
+</form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="else" -->
+<h2>Printer Admin</h2>
+	<!-- TMPL_IF NAME=searchfield -->
+		You searched for <!-- TMPL_VAR NAME="searchfield" --></span>
+	<!-- /TMPL_IF -->
+<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+                <input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+                <input type="submit" name="submit" value="Search" />
+        </form>
+<table>
+		<tr>
+			<th>Name</th>
+			<th>Queue</th>
+			<th>Type</th>
+			<th>&nbsp;</th>
+		</tr>
+		<!-- TMPL_LOOP NAME=loop -->
+		<tr>
+			<td><!-- TMPL_VAR NAME="printername" --></td>
+			<td><!-- TMPL_VAR NAME="printqueue" --></td>
+			<td><!-- TMPL_VAR NAME="printtype" --></td>
+			<td><form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="printername" -->" /><input type="submit" value="Edit" /></form> <form class="inline" action="" method="get"><input type="hidden" name=
+"op" value="delete_confirm" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="printername" -->" /><input type="submit" value="Delete" /></form></td>
+		</tr>
+		<!-- /TMPL_LOOP -->
+	</table>
+<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+       <p> <input type="hidden" name="op" value="add_form" /><input type="submit" value="Add Printer" /></p></form>
+	<!-- TMPL_IF NAME="offsetgtzero" -->
+		<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Prev</a>
+	<!-- /TMPL_IF -->
+
+	<!-- TMPL_IF NAME="ltcount" -->
+		<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->">Next &gt;&gt;</a>	
+	<!-- /TMPL_iF -->
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/parameters/stopwords.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/parameters/stopwords.tmpl
@ -0,0 +1,156 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: 
+<!-- TMPL_IF NAME="else" -->Stop Words Administration<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="searchfield" -->Modify Stop Word<!-- TMPL_ELSE -->Add Stop Word<!-- /TMPL_IF --><!-- /TMPL_IF --> 
+<!-- TMPL_IF NAME="add_validate" -->Stop Word Added<!-- /TMPL_IF --> 
+<!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion of Stop Word '<!-- TMPL_VAR NAME="searchfield" -->'<!-- /TMPL_IF --> 
+<!-- TMPL_IF NAME="delete_confirmed" -->Stop Word Deleted<!-- /TMPL_IF --> 
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<!-- TMPL_IF NAME="add_form" -->
+        <script>
+        //
+        function isNotNull(f,noalert) {
+                if (f.value.length ==0) {
+   return false;
+                }
+                return true;
+        }
+        //
+        function toUC(f) {
+                var x=f.value.toUpperCase();
+                f.value=x;
+                return true;
+        }
+        //
+        function isNum(v,maybenull) {
+        var n = new Number(v.value);
+        if (isNaN(n)) {
+                return false;
+                }
+        if (maybenull==0 && v.value=="") {
+                return false;
+        }
+        return true;
+        }
+        //
+        function isDate(f) {
+                var t = Date.parse(f.value);
+                if (isNaN(t)) {
+                        return false;
+                }
+        }
+        //
+        function Check(f) {
+                var ok=1;
+                var _alertString="";
+                var alertString2;
+                if (f.word.value.length==0) {
+                        _alertString += "- word missing\n";
+                }
+                if (_alertString.length==0) {
+                        document.Aform.submit();
+                } else {
+                        alertString2 = "Form not submitted because of the following problem(s)\n";
+                        alertString2 += "------------------------------------------------------------------------------------\n\n";
+                        alertString2 += _alertString;
+                        alert(alertString2);
+                }
+        }
+        </SCRIPT>
+
+
+
+        <form action="<!-- TMPL_VAR NAME=script_name -->" name="Aform" method="post">
+        <input type="hidden" name="op" value="add_validate" />
+<!-- TMPL_IF NAME="searchfield" -->
+                <h1>Modify Stop Word</h1>
+        <!-- TMPL_ELSE -->
+                <h1>Add Stop Word</h1>
+        <!-- /TMPL_IF -->         
+<table>
+        <!-- TMPL_IF NAME="searchfield" -->
+                <tr>
+                        <td>Stop Word</td>
+                        <td><input type="hidden" name="word" value="<!-- TMPL_VAR NAME=searchfield -->" /><!-- TMPL_VAR NAME="searchfield" -->
+                        </td>
+                </tr>
+        <!-- TMPL_ELSE -->
+                <tr>
+                        <td>Stop Word: </td>
+                        <td>
+                                <input type="text" name="word" size="50" maxlength="250" onblur="toUC(this);" />
+                        </td>
+                </tr>
+        <!-- /TMPL_IF -->
+        </table><p><input type="button" value="<!-- TMPL_IF NAME="searchfield" -->Update Stop Word<!-- TMPL_ELSE -->Add Stop Word <!-- /TMPL_IF -->" onclick="Check(this.form);" /> <input type="button" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->';" /></p>
+        </form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="add_validate" -->
+<h3>Stop Word Added</h3>
+<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+        <input type="submit" value="OK" />
+        </form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="delete_confirm" -->
+ <h3>Confirm Deletion of Stop Word <em><!-- TMPL_VAR NAME="searchfield" --></em></h3>                       <table>
+                <tr>
+                        <td>Stop Word: </td>
+                        <td><!-- TMPL_VAR NAME="searchfield" --></td>
+                </tr>
+	</table><form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+                        <input type="hidden" name="op" value="delete_confirmed" />
+                        <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /><input type="submit" value="Delete this Stop Word" />
+                                </form> <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+                                        <input type="submit" value="Do Not Delete" />
+                                </form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="delete_confirmed" -->
+<h3>Stop Word Deleted</h3>
+<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+                <input type="submit" value="OK" />
+</form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="else" -->
+ <h3>Stop Words Administration</h3>
+        <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+                <input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+                <input type="submit" name="submit" value="Search" />
+        </form>
+        <!-- TMPL_IF NAME="searchfield" -->
+                You searched for <!-- TMPL_VAR NAME="searchfield" -->
+        <!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="loop" -->
+<table>
+                <tr>
+                        <th>Word</th>
+                        <th>&nbsp;</th>
+                </tr>
+                <!-- TMPL_LOOP NAME="loop" -->
+                <tr>
+                        <td><!-- TMPL_VAR NAME="word" --></td>
+                        <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="word" -->">Delete</a></td>
+                </tr>
+                <!-- /TMPL_LOOP -->
+        </table>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="offsetgtzero" -->
+               <form action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="prevpage" -->" /><input type="submit" value="&lt;&lt; Prev" /></form>
+        <!-- /TMPL_IF --> <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+        <input type="hidden" name="op" value="add_form" /><input type="submit" value="Add Word" />
+        </form> <!-- TMPL_IF NAME="ltcount" -->
+                <form action="<!-- TMPL_VAR NAME="script_name" -->" method="get"><input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="next_page" -->" /><input type="submit" value="Next &gt;&gt;" /></form>
+        <!-- /TMPL_iF -->
+        
+
+        
+
+        
+
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/parameters/systempreferences.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/parameters/systempreferences.tmpl
@ -0,0 +1,242 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: 
+<!-- TMPL_IF name="add_form" --><!-- TMPL_IF NAME="modify" -->Modify system preference '<!-- TMPL_VAR NAME="searchfield" -->'<!-- TMPL_ELSE -->Add a system preference<!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF name="add_validate" -->Data Added<!-- /TMPL_IF -->
+<!-- TMPL_IF name="delete_confirm" -->Confirm Deletion of Parameter '<!-- TMPL_VAR name="searchfield" -->'<!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirmed" -->Parameter Deleted<!-- /TMPL_IF --><!-- TMPL_IF name="else" -->Preferences<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<script language="JavaScript" type="text/javascript">
+		function _(s) { return s } // dummy function for gettext
+		//
+		function isNotNull(f,noalert) {
+			if (f.value.length ==0) {
+	return false;
+			}
+			return true;
+		}
+		//
+		function toUC(f) {
+			var x=f.value.toUpperCase();
+			f.value=x;
+			return true;
+		}
+		//
+		function isNum(v,maybenull) {
+		var n = new Number(v.value);
+		if (isNaN(n)) {
+			return false;
+			}
+		if (maybenull==0 && v.value=='') {
+			return false;
+		}
+		return true;
+		}
+		//
+		function isDate(f) {
+			var t = Date.parse(f.value);
+			if (isNaN(t)) {
+				return false;
+			}
+		}
+		//
+		function Check(f) {
+			var ok=1;
+			var _alertString="";
+			var alertString2;
+			if (f.variable.value.length==0) {
+				_alertString += "\n- " + _("variable missing");
+			}
+			if (f.value.value.length==0) {
+				_alertString += "\n- " + _("value missing");
+			}
+			if (_alertString.length==0) {
+				document.Aform.submit();
+			} else {
+				alertString2  = _("Form not submitted because of the following problem(s)");
+				alertString2 += "\n------------------------------------------------------------------------------------\n";
+				alertString2 += _alertString;
+				alert(alertString2);
+			}
+		}
+		</script>
+
+<!-- TMPL_IF NAME="add_form" -->
+	
+		<!-- TMPL_IF NAME="modify" -->
+			<h1>Modify a system preference</h1>
+		<!-- TMPL_ELSE -->
+			<h1>Add a system preference</h1>
+		<!-- /TMPL_IF -->
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+		
+		
+		<table>
+			<tr><td><label for="explanation">Explanation: </label></td><td><input type="text" name="explanation" id="explanation" size="60" value="<!-- TMPL_VAR NAME="explanation" escape="HTML" -->" /><input type="hidden" name="op" value="add_validate" /></td></tr>
+			<tr><!-- TMPL_IF NAME="searchfield" --><td><label>Variable</label></td><td><!-- TMPL_VAR NAME="searchfield" --><input type="hidden" name="variable" value="<!-- TMPL_VAR NAME="searchfield" -->"></td>
+			<!-- TMPL_ELSE --><td><label for="variable">Variable</label></td><td><input type="text" name="variable" id="variable" size="60" /></td><!-- /TMPL_IF --></tr>
+			<tr><td><label for="value">Value</label></td><td><!-- TMPL_IF NAME="type-free" -->
+					<input type="text" id="value" name="value" value="<!-- TMPL_VAR NAME="value" escape="HTML" -->" size="<!-- TMPL_VAR NAME="fieldlength" -->" />
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF NAME="type-textarea" -->
+					<textarea name="value" id="value" rows="<!--TMPL_VAR NAME="rows" -->" cols="<!-- TMPL_VAR NAME="cols" -->"><!-- TMPL_VAR NAME="value" escape="HTML" --></textarea>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF NAME="type-choice" -->
+					<select name="value" id="value">
+						<!-- TMPL_LOOP NAME="options" -->
+							<option value="<!-- TMPL_VAR NAME="option" -->"<!-- TMPL_IF NAME="selected" -->selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="option" --></option>
+						<!-- /TMPL_LOOP -->
+					</select>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_IF NAME="type-yesno" -->
+					<!-- TMPL_IF NAME="value-yes" -->
+					<input type="radio" name="value" id="value" value="1" checked="checked"><!-- TMPL_ELSE --><input type="radio" name="value" id="value" value="1" /><!-- /TMPL_IF -->Yes
+				<!-- TMPL_IF NAME="value-no" -->	
+					<input type="radio" name="value" value="0" checked="checked" /><!-- TMPL_ELSE --><input type="radio" name="value" value="0" /><!-- /TMPL_IF -->No<!-- /TMPL_IF -->
+				</td></tr>
+		</table>
+		<p><input type="submit" value="<!-- TMPL_IF NAME="modify" -->Save Changes<!-- TMPL_ELSE -->Add this Preference<!-- /TMPL_IF -->"> <input type="button"  value="Cancel" onclick="location.href='<!-- TMPL_VAR name="script_name" -->'; return false;" /></p>
+		
+<h3>Koha internal</h3>		
+		Note: you should have no reasons to modify the following default values
+		<table>
+		<tr><td><label for="preftype">Variable type:</label></td><td><input type="text" name="preftype" id="preftype" value="<!--TMPL_VAR NAME="preftype" -->" size="40" maxlength="40"><span class="formfield-notes"> (Choice, YesNo, Integer, Textarea, Float, Themes, or Languages)</td></tr>
+		<tr><td><label for="prefoptions">Variable options:</label></td><td><input type="text" name="prefoptions" id="prefoptions" value="<!-- TMPL_VAR NAME="prefoptions" -->" size="60" maxlength="80" />(a choice list for Choice (separated by |) or cols|rows for Texarea)</td></tr>
+		</table>
+		</form>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="add_validate" -->
+	
+
+		<h3>Data recorded</h3>
+		
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<input type="submit" value="OK" />
+		</form>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="delete_confirm" -->
+	
+	<table>
+		<caption>Confirm Deletion of <!-- TMPL_VAR NAME="searchfield" -->?</caption>
+		<tr>
+			<th>Variable Name:</th>
+			<td><!-- TMPL_VAR NAME="searchfield" --></td>
+		</tr>
+		<tr><th>Value: </th><td><!-- TMPL_VAR NAME="Tvalue" --></td></tr></table>
+		<form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+		<input type="submit"  value="Yes, Delete"></form> <form class="inline" action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="No, Do not Delete" /></form>
+	
+	
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="delete_confirmed" -->
+	
+		<h3>Data deleted</h3>
+		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<input type="submit" value="Back to System Preferences" />
+		</form>
+	<!-- /TMPL_IF -->
+	
+	<!-- TMPL_IF NAME="else" -->
+	<h1>System preferences admin</h1>
+		<ul>
+			<li>
+				<!--TMPL_IF Name="Admin"-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin" class="here">Admin
+					</a>
+				<!--TMPL_ELSE-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Admin">Admin
+					</a>
+				<!--/TMPL_IF-->
+			</li>
+			<li>
+				<!--TMPL_IF Name="Acquisitions"-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions" class="here">Acquisitions
+					</a>
+				<!--TMPL_ELSE-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Acquisitions">Acquisitions
+					</a>
+				<!--/TMPL_IF-->
+			</li>
+			<li>
+				<!--TMPL_IF Name="Authorities"-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities" class="here">Authorities
+					</a>
+				<!--TMPL_ELSE-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Authorities">Authorities
+					</a>
+				<!--/TMPL_IF-->
+			</li>
+			<li>
+				<!--TMPL_IF Name="Catalogue"-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue" class="here">Catalogue
+					</a>
+				<!--TMPL_ELSE-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Catalogue">Catalogue
+					</a>
+				<!--/TMPL_IF-->
+			</li>
+			<li>
+				<!--TMPL_IF Name="Circulation"-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation" class="here">Circulation
+					</a>
+				<!--TMPL_ELSE-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Circulation">Circulation
+					</a>
+				<!--/TMPL_IF-->
+			</li>
+			<li>
+				<!--TMPL_IF Name="Members"-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members" class="here">Members
+					</a>
+				<!--TMPL_ELSE-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=Members">Members
+					</a>
+				<!--/TMPL_IF-->
+			</li>
+			<li>
+				<!--TMPL_IF Name="OPAC"-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC" class="here">OPAC
+					</a>
+				<!--TMPL_ELSE-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=OPAC">OPAC
+					</a>
+				<!--/TMPL_IF-->
+			</li>
+			<li>
+				<!--TMPL_IF Name="Others"-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=" class="here">Others
+					</a>
+				<!--TMPL_ELSE-->
+					<a href="/cgi-bin/koha/admin/systempreferences.pl?tab=">Others
+					</a>
+				<!--/TMPL_IF-->
+			</li>
+		</ul>
+
+	<!-- TMPL_VAR NAME="searchfield" -->
+	<table>
+	<tr>
+		<th>Variable</th>
+		<th>Value</th>
+		<th colspan="3">Explanation</th>
+	</tr>
+	<!-- TMPL_LOOP NAME="loop" -->
+	<tr<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPL_IF -->>
+		<td><!-- TMPL_VAR NAME="variable" --></td>
+		<td><!-- TMPL_VAR NAME="value" --></td>
+		<td><!-- TMPL_VAR NAME="explanation" --></td>
+		<td><a href="<!-- TMPL_VAR NAME="edit" -->">Edit</a></td>
+		<td><a href="<!-- TMPL_VAR NAME="delete" -->">Delete</a></td>
+	</tr>
+	<!-- /TMPL_LOOP -->
+	</table>
+	</form>
+	
+	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+		<input type="hidden" name="op" value="add_form" />
+		<input type="submit" value="Add a System Preference" />
+	</form>
+	
+	<!-- /TMPL_IF -->
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/parameters/thesaurus.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/parameters/thesaurus.tmpl
@ -0,0 +1,148 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: Thesaurus Management
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<!-- TMPL_IF name="detail_form" -->
+<table>
+	<caption>Thesaurus management</caption>
+	<tr>
+		<td>Values related to <!-- TMPL_VAR name="stdlib" --> (<!-- TMPL_VAR name="category" -->)</td>
+	</tr>
+	</table>
+
+	<table>
+	<tr>
+		<th>Other forms</th>
+		<th>&nbsp;</th>
+		<th>&nbsp;</th>
+	</tr>
+	<!-- TMPL_LOOP name="loop" -->
+	<tr>
+		<td><!-- TMPL_VAR name="freelib" --></td>
+		<td><a href="<!-- TMPL_VAR name="edit" -->">Edit</a></td>
+		<td><a href="<!-- TMPL_VAR name="delete" -->">Delete</a></td>
+	</tr>
+	<!-- /TMPL_LOOP -->
+	<form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+	<input type="hidden" name="op" value="add_form" />
+	</table>
+	<form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+	<input type="hidden" name="op" value="add_form" />
+	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->" />
+	<input type="hidden" name="stdlib" value="<!-- TMPL_VAR name="stdlib" -->" />
+	<input type="submit" value="Add thesaurus entry" />
+	</form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="add_form" -->
+<!-- -->
+
+	<form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
+	<h1><!-- TMPL_IF name="search_category" -->Add<!-- TMPL_ELSE -->Modify<!-- /TMPL_IF --></h1><!-- TMPL_IF name="search_category" -->
+		<input type="hidden" name="op" value="add_validate" />
+	<!-- TMPL_ELSE -->
+		<input type="hidden" name="op" value="mod_validate" />
+	<!-- /TMPL_IF --><table>
+	<tr>
+		<td>Category</td>
+		<td><!-- TMPL_VAR name="category" --></td>
+	</tr>
+	<tr>
+		<td>Authority lib</td>
+		<!-- TMPL_IF name="id" -->
+			<td><!-- TMPL_VAR name="father" --><!-- TMPL_VAR name="stdlib" --><input type="hidden" name="stdlib" value="<!-- TMPL_VAR name="stdlib" -->" /></td>
+		<!-- TMPL_ELSE -->
+			<td><!-- TMPL_VAR name="father" --><input type="text" name="stdlib" value="<!-- TMPL_VAR name="stdlib" escape="HTML" -->" maxlength="80" size="80" /></td>
+		<!-- /TMPL_IF -->
+	</tr>
+	<tr>
+		<td>Other lib</td>
+		<td><!-- TMPL_VAR name="father" --><input type="text" name="freelib" value="<!-- TMPL_VAR name="freelib" escape="HTML" -->" maxlength="80" size="80" /></td>
+	</tr>
+	</table>
+	<p><input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->" />
+			<input type="hidden" name="father" value="<!-- TMPL_VAR name="father" escape="HTML" -->" />
+			<input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" escape="HTML" -->" />
+			<input type="hidden" name="search_category" value="<!-- TMPL_VAR name="search_category" -->" />
+			<input type="hidden" name="searchstring" value="<!-- TMPL_VAR name="searchstring" escape="HTML" -->" />
+			<input type="hidden" name="offset" value="<!-- TMPL_VAR name="offset" -->" />
+			<input type="submit" value="<!-- TMPL_IF name="search_category" -->Add<!-- TMPL_ELSE -->Modify<!-- /TMPL_IF --> Value" /></p></form>
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_IF name="delete_confirm" -->
+<!-- -->
+		<table>
+		<tr>
+			<td>lib</td>
+			<td><!-- TMPL_VAR name="search_category" --></td>
+		</tr>
+		<tr><td>Value</td><td><!-- TMPL_VAR name="Tvalue" --></td></tr>
+		<tr><td>
+			<form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+				<input type="hidden" name="op" value="delete_confirmed" />
+				<input type="hidden" name="id" value="<!-- TMPL_VAR name="id" -->" />
+				<input type="hidden" name="search_category" value="<!-- TMPL_VAR name="search_category" -->" />
+		</tr></td>
+		<tr><td colspan="2">CONFIRM DELETION of this entry and all entries depending on this one</td></tr>
+		<tr><td><input type="submit" value="YES" /></form></td>
+				<td><form action="<!-- TMPL_VAR name="script_name" -->" method="post"><input type="submit" value="NO" /></form></td></tr>
+	</table>
+<!-- /TMPL_IF -->
+
+<!-- -->
+<!-- TMPL_IF name="else" -->
+<h1>Thesaurus management</h1>
+	<p>Manages thesaurus and authorities files.</p>
+	<ul>
+		<li>Dig: see data dependent on this one</li>
+		<li>Related: see other forms of this authority entry</li>
+	</ul>
+	<form action="/cgi-bin/koha/admin/thesaurus.pl" method="post">
+		<!-- TMPL_VAR name="tab_list" -->
+		<input type="text" name="searchstring" value="<!-- TMPL_VAR name="searchstring" -->" />
+		<input type="submit" value="OK" /></form>
+	<form action="/cgi-bin/koha/admin/thesaurus.pl" method="get"><input type="hidden" value="add_form" name="op" /><input type="submit" value="New Category" /></form>
+	
+	<!-- TMPL_LOOP name="hierarchy_loop" -->
+		<a href="thesaurus.pl?branch=<!-- TMPL_VAR name="branch" -->&search_category=<!-- TMPL_VAR name="category" -->"><!-- TMPL_VAR name="string" --></a><br />
+	<!-- /TMPL_LOOP -->
+	
+<!-- TMPL_IF NAME="loop" -->
+<table>
+	<tr>
+		<th>&nbsp;</th>
+		<th>Free form</th>
+		<th>Authority</th>
+		<th>Dig</th>
+		<th>Related</th>
+		<th>Edit</th>
+		<th>Delete</th>
+	</tr>	<!-- TMPL_LOOP name="loop" -->
+
+	<tr>
+		<td>&nbsp;</td>
+		<td><!-- TMPL_VAR name="freelib" --></td>
+		<td><!-- TMPL_VAR name="father" --> <!-- TMPL_VAR name="stdlib" --></td>
+		<td><!-- TMPL_VAR name="dig" -->Dig</a></td>
+		<td><!-- TMPL_VAR name="related" -->Related</a></td>
+		<td><a href="<!-- TMPL_VAR name="edit" -->">Edit</a></td>
+		<td><a href="<!-- TMPL_VAR name="delete" -->">Delete</a></td>
+	</tr>
+	<!-- /TMPL_LOOP -->
+	</table>
+<!-- /TMPL_IF -->
+<p>		<form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+	<input type="hidden" name="op" value="add_form" />
+</p>
+<p><form action="<!-- TMPL_VAR name="script_name" -->" method="post">
+	<input type="hidden" name="op" value="add_form" />
+	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->" />
+	<input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->" />
+	<input type="hidden" name="father" value="<!-- TMPL_VAR name="father" -->" />
+	<input type="submit"  value="Add Thesaurus entry" />
+	</form></p>
+<!-- TMPL_VAR name="previous" --> <!-- TMPL_VAR name="next" -->
+<!-- /TMPL_IF -->
+
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/parameters/z3950servers.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/parameters/z3950servers.tmpl
@ -0,0 +1,269 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- System Administration: <!-- TMPL_IF NAME="else" -->z39.50 Servers<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME=searchfield -->Modify z39.50 Server <!-- TMPL_VAR NAME="searchfield" --><!-- TMPL_ELSE -->Add z39.50 Server<!-- /TMPL_IF --><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="add_validate" -->z39.50 Server Added<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="delete_confirmed" -->z39.50 Server Deleted<!-- /TMPL_IF --><!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_IF NAME="add_form" -->
+        <script language="JavaScript" type="text/javascript">
+        //
+        function isNotNull(f,noalert) {
+                if (f.value.length ==0) {
+                    return false;
+                }
+                return true;
+        }
+        //
+        function toUC(f) {
+                var x=f.value.toUpperCase();
+                f.value=x;
+                return true;
+        }
+        //
+        function isNum(v,maybenull) {
+        var n = new Number(v.value);
+        if (isNaN(n)) {
+                return false;
+                }
+        if (maybenull==0 && v.value=='') {
+                return false;
+        }
+        return true;
+        }
+        //
+        function isDate(f) {
+                var t = Date.parse(f.value);
+                if (isNaN(t)) {
+                       return false;                       
+                }
+        }
+        //
+        function Check(f) {
+                var ok=1;
+                var _alertString="";
+                var alertString2;
+                if (f.searchfield.value.length==0) {
+                        _alertString += "- site name missing\n";
+                }
+                if (f.host.value.length==0) {
+                        _alertString += "- host missing\n";
+                }
+                if (f.port.value.length==0) {
+                        _alertString += "- port missing\n";
+                }
+                if (f.db.value.length==0) {
+                        _alertString += "- database missing\n";
+                }
+                if (isNaN(f.port.value)) {
+                        _alertString += "- port must be a number\n";
+                }
+                if (isNaN(f.rank.value)) {
+                        _alertString += "- rank must be a number\n";
+                }
+                if (isNaN(f.checked.value) || f.checked.value<0 || f.checked.value>1) {
+                        _alertString += "- checked must be 0 or 1\n";
+                }
+                if (_alertString.length==0) {
+                        document.Aform.submit();
+                } else {
+                        alertString2 = "Form not submitted because of the following problem(s)\n";
+                        alertString2 += "------------------------------------------------------------------------------------\n\n";
+                        alertString2 += _alertString;
+                        alert(alertString2);
+                }
+        }
+        </script>
+
+       
+        <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
+        <input type="hidden" name="op" value="add_validate" />
+<!-- TMPL_IF NAME=searchfield -->
+                <h1>Modify Z39.50 Server</h1>
+        <!-- TMPL_ELSE -->
+                <h1>Add Z39.50 Server</h1>
+        <!-- /TMPL_IF -->                
+        <table>
+        <!-- TMPL_IF NAME=searchfield -->
+                <tr>
+                        <th>Z39.50 Server</th>
+                        <td>
+                                <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /><!-- TMPL_VAR NAME="searchfield" -->
+                        </td>
+                </tr>
+        <!-- TMPL_ELSE -->
+                <tr>
+                        <th>Z39.50 Server</th>
+                        <td>
+                                <input type="text" name="searchfield" size="65" maxlength="100" onblur="toUC(this)" />
+                        </td>
+                </tr>
+        <!-- /TMPL_IF -->
+
+		<tr>
+			<th>Hostname</th>
+			<td>
+				<input type="text" name="host" size="30" value="<!-- TMPL_VAR NAME="host" -->" />
+			</td>
+		</tr>
+		<tr>
+			<th>Port</th>
+			<td>
+				<input type="text" name="port" size="5" value="<!-- TMPL_VAR NAME="port" -->" onblur="isNum(this)" />
+			</td>
+		</tr>
+		<tr>
+			<th>Database</th>
+			<td>
+				<input type="text" name="db" value="<!-- TMPL_VAR NAME="db" -->" />
+			</td>
+		</tr>
+		<tr>
+			<th>Userid</th>
+			<td>
+				<input type="text" name="userid" value="<!-- TMPL_VAR NAME="userid" -->" />
+			</td>
+		</tr>
+		<tr>
+			<th>Password</th>
+			<td>
+				<input type="text" name="password" value="<!-- TMPL_VAR NAME="password" -->" />
+			</td>
+		</tr>
+		<tr>
+			<th>Checked (searched by default)</th>
+			<td>
+				<input type="text" size="1" name="checked" value="<!-- TMPL_VAR NAME="checked" -->" onblur="isNum(this)" />  
+		<tr>
+			<th>Rank (display order)</th>
+			<td>
+				<input type="text" name="rank" size="4" value="<!-- TMPL_VAR NAME="rank" -->" onblur="isNum(this)" />
+			</td>
+		</tr>
+				<tr>
+			<th>Syntax (z3950 can send<br>
+			 records in various format. Choose one)</th>
+			<td>
+				<select name="syntax">
+					<option value="USMARC">USMARC</option>
+					<option value="UNIMARC">UNIMARC</option>
+				</select>
+			</td>
+		</tr>
+        </table><input type="button" value="<!-- TMPL_IF NAME=searchfield -->Update Z39.50 Server<!-- TMPL_ELSE -->Add Z39.50 Server<!-- /TMPL_IF -->" onclick="Check(this.form)" />  <input type="button" value="Cancel" onclick="location.href='<!-- TMPL_VAR NAME="script_name" -->';" />
+        </form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="add_validate" -->
+<h3>Z39.50 Server Added</h3>
+<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+        <input type="submit" value="OK" />
+        </form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="delete_confirm" -->
+	<!-- TMPL_VAR NAME="reqsel" -->
+<h3>Confirm Deletion of Server <!-- TMPL_VAR NAME="searchfield" --></h3>	
+        <table>
+                <tr>
+                        <td>Site</td>
+                        <td>
+                                <!-- TMPL_VAR NAME="searchfield" -->
+                        </td>
+                </tr>
+                <tr>
+                        <td>Hostname</td>
+                        <td><!-- TMPL_VAR NAME="host" --></td>
+                </tr>
+                <tr>
+                        <td>Port</td>
+                        <td><!-- TMPL_VAR NAME="port" --></td>
+                </tr>
+                <tr>
+                        <td>Database</td>
+                        <td><!-- TMPL_VAR NAME="db" --></td>
+                </tr>
+                <tr>
+                        <td>Userid</td>
+                        <td><!-- TMPL_VAR NAME="userid" --></td>
+                </tr>
+                <tr>
+                        <td>Password</td>
+                        <td><!-- TMPL_VAR NAME="password" --></td>
+                </tr>
+                <tr>
+                        <td>Checked</td>
+                        <td><!-- TMPL_VAR NAME="checked" --></td>
+                </tr>
+                <tr>
+                        <td>Rank</td>
+                        <td><!-- TMPL_VAR NAME="rank" --></td>
+                </tr>
+                <tr>
+                        <td>                <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+                        <input type="hidden" name="op" value="delete_confirmed" />
+                        <input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" /><input type="submit" value="Delete this Server" /></form> <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post"><input type="submit" value="Do Not Delete" /></form></td>
+                </tr>
+	</table>
+
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="delete_confirmed" -->
+<h3>Z39.50 Server Deleted</h3>
+<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+                <input type="submit" value="OK" />
+</form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME=else -->
+<h3>Z39.50 Servers Admininistration</h3>
+         <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+                <input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->" />
+                <input type="submit" name="search" value="Search" />
+        </form>
+        <!-- TMPL_IF NAME="searchfield" -->
+                You searched for <!-- TMPL_VAR NAME="searchfield" -->
+        <!-- /TMPL_IF -->		
+<table>
+                <tr>
+                        <th>Site</th>
+                        <th>Hostname/Port</th>
+                        <th>Database</th>
+                        <th>Userid</th>
+                        <th>Password</th>
+                        <th>Checked</th>
+                        <th>Rank</th>       
+						<th>Syntax</th>
+                        <th colspan="2">&nbsp;</th>
+                </tr>
+                <!-- TMPL_LOOP NAME=loop -->
+               <!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
+                        <td><!-- TMPL_VAR NAME="name" --></td>
+                        <td><!-- TMPL_VAR NAME="host" -->:<!-- TMPL_VAR NAME="port" --></td>
+                        <td><!-- TMPL_VAR NAME="db" --></td>
+                        <td><!-- TMPL_VAR NAME="userid" --></td>
+                        <td><!-- TMPL_VAR NAME="password" --></td>
+                        <td><!-- TMPL_VAR NAME="checked" --></td>
+                        <td><!-- TMPL_VAR NAME="rank" --></td>
+						<td><!-- TMPL_VAR NAME="syntax" --></td>
+                        <td><form action="<!-- TMPL_VAR name="script_name" -->" method="get"><input type="hidden" name="op" value="add_form" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="name" -->" /><input type="submit" value="Edit" /></form></td>
+                        <td><form action="<!-- TMPL_VAR name="script_name" -->" method="get"><input type="hidden" name="op" value="delete_confirm" /><input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="name" -->" /><input type="submit" value="Delete" /></form></td>                
+			</tr>
+                <!-- /TMPL_LOOP -->
+	</table>
+
+<!-- TMPL_IF NAME="offsetgtzero" --><form action="<!-- TMPL_VAR NAME="script_name" -->" method="get">
+	<input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="prevpage" -->" />
+	<input type="submit" value="&lt;&lt; Prev">
+</form><!-- /TMPL_IF -->
+<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
+        <input type="hidden" name="op" value="add_form" />
+		<input type="submit" value="Add z39.50 Server" />
+</form>
+<!-- TMPL_IF NAME="ltcount" --><form action="<!-- TMPL_VAR NAME="script_name" -->" method="get">
+	<input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="nextpage" -->" />
+	<input type="submit" value="Next &gt;&gt;" />
+</form> <!-- /TMPL_iF -->
+ 
+
+<!-- /TMPL_IF -->
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/search.marc/dictionary.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/search.marc/dictionary.tmpl
@ -0,0 +1,136 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Dictionary Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+	<h1>Dictionary Search</h1>
+<form name="f" method="post" action="/cgi-bin/koha/search.marc/dictionary.pl">
+	<input type="hidden" name="op" value="do_search" />
+				<label for="keyword">Search for keyword(s): </label>
+				<input type="hidden" name="marclist" value="<!-- TMPL_VAR Name="marclist" -->" />
+				<input type="text" name="search" value="<!-- TMPL_VAR Name="search" -->" size="35" />
+				<input type="submit" value="Start search" class="submit" />
+				<input type="hidden" name="type" value="<!-- TMPL_VAR Name="type" -->" />
+				<input type="hidden" name="index" value="<!-- TMPL_VAR Name="anindex" ESCAPE="URL" -->" /></form>
+
+<!-- TMPL_IF Name=search -->
+	<!-- TMPL_IF NAME="authresult" -->
+		
+			<!-- TMPL_IF NAME="displayprev" --> 
+					<a href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&lt;&lt;Previous</a>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_LOOP NAME="numbers" -->
+					<!-- TMPL_IF NAME="highlight" -->
+						<!-- TMPL_VAR NAME="number" -->
+					<!-- TMPL_ELSE --> 
+						<a href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->"><!-- TMPL_VAR NAME="number" --></a>
+					<!-- /TMPL_IF -->
+				<!-- /TMPL_LOOP --> 
+				<!-- TMPL_IF NAME="displaynext" -->
+					<a href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">Next&gt;&gt;</a>
+				<!-- /TMPL_IF -->
+			
+			
+			<!-- TMPL_IF NAME="nbresults" -->
+					Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="nbresults" --> in Authorities<!-- TMPL_ELSE -->No results found.
+			<!-- /TMPL_IF -->
+			
+		
+		
+			<table>
+				<caption>Authority Results</caption>
+				<tr>
+					<th>Summary</th>
+					<th>Used in</th>
+					<th>Select</th>
+				</tr>
+				<!-- TMPL_LOOP NAME="authresult" -->
+					<!-- TMPL_IF NAME="even" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
+					<td>
+							<!-- TMPL_VAR NAME="summary" -->
+						</td>
+						<td>
+							<!-- TMPL_VAR NAME="used" --> records(s)
+						</td>
+							<td>
+							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="mainentry" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,0)">Select</a> | 
+							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="mainentry" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,1)">Sel. &amp; close</a>
+						</td>
+					</tr>
+				<!-- /TMPL_LOOP -->
+			</table>
+		
+		<!-- TMPL_ELSE -->
+			<h3>No results in Authorities</h3>
+	<!-- /TMPL_IF -->
+		
+		
+	<!-- TMPL_IF Name="catresult" -->
+	<h2>Catalog Results</h2>
+			
+			<!-- TMPL_IF NAME="total" -->
+					Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --> in the Catalog<!-- TMPL_ELSE -->No results found.
+			<!-- /TMPL_IF -->
+		
+			<table>
+				<tr>
+					<th>Summary</th>
+					<th>Used in</th>
+					<th>Select</th>
+				</tr>
+				<!-- TMPL_LOOP NAME="catresult" -->
+				<!-- TMPL_IF NAME="even" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
+				<td>
+					<!-- TMPL_IF name="MARC_ON" -->
+									<!-- TMPL_VAR NAME="value" -->
+								<!-- TMPL_ELSE -->
+									<!-- TMPL_VAR NAME="value" -->
+								<!-- /TMPL_IF -->
+					</td>
+					<td>
+						<!-- TMPL_VAR NAME="count" --> records(s)
+					</td>
+					<td>
+							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,0)">Select</a> | 
+							<a  href="javascript:SelectEntry('<!-- TMPL_VAR NAME="value" ESCAPE="URL" -->',<!-- TMPL_VAR NAME="anindex" ESCAPE="URL"  -->,1)">Sel. &amp; close</a>
+					</td>
+				</tr>
+				<!-- /TMPL_LOOP -->
+			</table>
+		
+			<!-- TMPL_IF NAME="displayprev" --> 
+					<a href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL-->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL-->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">&lt;&lt;Previous</a>
+				<!-- /TMPL_IF -->
+				<!-- TMPL_LOOP NAME="numbers" -->
+					<!-- TMPL_IF NAME="highlight" -->
+						<!-- TMPL_VAR NAME="number" -->
+					<!-- TMPL_ELSE --> 
+						<a href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" ESCAPE=URL -->&amp;search=<!-- TMPL_VAR NAME="search" ESCAPE=URL -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->"><!-- TMPL_VAR NAME="number" --></a>
+					<!-- /TMPL_IF -->
+				<!-- /TMPL_LOOP --> 
+				<!-- TMPL_IF NAME="displaynext" -->
+					<a href="dictionary.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;marclist=<!-- TMPL_VAR NAME="marclist" -->&amp;search=<!-- TMPL_VAR NAME="search" -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;index=<!-- TMPL_VAR Name="anindex" -->">Next&gt;&gt;</a>
+				<!-- /TMPL_IF -->
+
+			
+			<!-- TMPL_IF NAME="total" -->
+					Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --> in the Catalog<!-- TMPL_ELSE -->No results found.
+			<!-- /TMPL_IF -->
+			
+		
+	<!-- /TMPL_IF -->
+	<script language="JavaScript" type="text/javascript">
+	function SelectEntry(myentry, myindex, wclose){
+		if (opener.document.f.value[myindex].value!=""){ 
+			opener.document.f.value[myindex].value=opener.document.f.value[myindex].value+" "+myentry
+		} else {
+			opener.document.f.value[myindex].value=myentry
+		}
+		if (wclose == 1) {
+	// 	alert("closing")
+			self.close();
+		}
+	}
+	</script>
+	
+<!-- /TMPL_IF -->
+
+</body>
+</html>
--- a/koha-tmpl/intranet-tmpl/prog/en/search.marc/result.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/search.marc/result.tmpl
@ -0,0 +1,71 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: MARC Search Results<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<!-- TMPL_IF NAME="searchdesc" -->
+    <h3>Results for Search: <!-- TMPL_VAR NAME="searchdesc" --></h3>
+<!-- TMPL_ELSE -->
+  		<h3>You did not specify any search criteria</h3>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="total" --><div id="pages">
+<!-- TMPL_IF NAME="displayprev" -->
+			<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">&lt;&lt;</a> 
+			<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP NAME="numbers" -->
+				<!-- TMPL_IF NAME="highlight" -->
+			 	 <!-- TMPL_VAR NAME="number" -->
+				<!-- TMPL_ELSE -->
+			  	  <a href="search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME="number" --></a>
+				<!-- /TMPL_IF -->
+			<!-- /TMPL_LOOP -->
+			<!-- TMPL_IF NAME="displaynext" -->
+			<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">&gt;&gt;</a>
+				<!-- /TMPL_IF -->
+<!-- TMPL_ELSE --><!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="total" -->Results <!-- TMPL_VAR name="from" --> to <!-- TMPL_VAR name="to" --> of <!-- TMPL_VAR name="total" --> records.<!-- TMPL_ELSE -->No results found.<!-- /TMPL_IF -->
+
+<table>
+	<tr>
+	<th>Title</th>
+	<th>Call No.</th>
+	<th>Copies</th>
+	<th>Location</th>
+	<th>&nbsp;</th>
+	</tr>
+<tbody>
+	<!-- TMPL_LOOP name="result" -->
+		<tr<!-- TMPL_IF NAME="even" --> class="highlight"<!-- /TMPL_IF -->>
+			<td><p><a href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a></p>
+						<p><!-- TMPL_VAR NAME="author" -->
+						<!-- TMPL_IF NAME="publishercode" -->- <!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF NAME="place" --> ; <!-- TMPL_VAR NAME="place" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF NAME="pages" --> - <!-- TMPL_VAR NAME="pages" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF NAME="notes" --> : <!-- TMPL_VAR NAME="notes" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF NAME="size" --> ; <!-- TMPL_VAR NAME="size" --><!-- /TMPL_IF -->
+					</p></td>
+					<td><!-- TMPL_VAR NAME="classification" --></td>
+			<td><!-- TMPL_VAR NAME="totitem" --></td>
+<td><!-- TMPL_LOOP NAME="CN" --><!-- TMPL_VAR NAME="holdingbranch" --><!-- TMPL_IF name="date_due" --> (due <!-- TMPL_VAR NAME="date_due" -->)	<!-- TMPL_ELSE --><!-- TMPL_IF NAME="itemcallnumber" -->(<!-- TMPL_VAR NAME="itemcallnumber" -->)<!-- /TMPL_IF --><!-- /TMPL_IF --><br /><!-- /TMPL_LOOP --></td><td><!-- TMPL_UNLESS name="norequests" --><a href="/cgi-bin/koha/request.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">Reserves</a><!-- TMPL_ELSE -->Not Reservable<!-- /TMPL_UNLESS --></td>
+		</tr>
+	<!-- /TMPL_LOOP -->
+</table>
+
+<!-- TMPL_IF name="total" -->
+<!-- TMPL_IF NAME="displayprev" -->
+			<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">&lt;&lt;</a> 
+			<!-- /TMPL_IF -->
+			<!-- TMPL_LOOP NAME="numbers" -->
+				<!-- TMPL_IF NAME="highlight" -->
+			 	 <!-- TMPL_VAR NAME="number" -->
+				<!-- TMPL_ELSE -->
+			  	  <a href="search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME=number --></a>
+				<!-- /TMPL_IF -->
+			<!-- /TMPL_LOOP -->
+			<!-- TMPL_IF NAME="displaynext" -->
+			<a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">&gt;&gt;</a>
+				<!-- /TMPL_IF -->
+<!-- TMPL_ELSE --><!-- /TMPL_IF -->
+
+
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/search.marc/search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/search.marc/search.tmpl
@ -0,0 +1,204 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Catalog: Advanced MARC Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<h1>Catalog Search</h1>
+<form name="f" method="post" action="search.pl">
+<input type="hidden" name="op" value="do_search" />
+<input type="hidden" name="type" value="intranet" />
+<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
+
+<table>
+<caption>Quick Search</caption>
+					<tr>
+			<th><label for="keyword_main">Any word</label></th>
+			<td><input type="hidden" name="marclist" value="" />
+			<input type="hidden" name="and_or" value="and" />
+			<input type="hidden" name="excluding" value="" />
+			<input type="hidden" name="operator" value="contains" />
+			<input type="text" id="keyword_main" name="value" onchange="sql_update()" size="35" accesskey="w" /></td>
+		</tr>
+		<tr>
+			<th><label for="title">Title</label></th>
+			<td><input type="hidden" name="marclist" value="biblio.title" />
+			<input type="hidden" name="and_or" value="and" />
+			<input type="hidden" name="excluding" value="" />
+			<input type="hidden" name="operator" value="contains" />
+			<input type="text" id="title" name="value" onchange="sql_update()" size="35" accesskey="t" />			<a href="javascript:Dopop('dictionary.pl?marclist=biblio.title&amp;type=intranet&amp;index=1',1)">
+				...
+			</a></td>
+		</tr>
+		<tr>
+			<th><label for="author"><span class="accesskey" title="Access Key a">Author</label></th>
+			<td><input type="hidden" name="marclist" value="biblio.author" />
+			<input type="hidden" name="and_or" value="and" />
+			<input type="hidden" name="excluding" value="" />
+			<input type="hidden" name="operator" value="contains" />
+			<input type="text" id="author" name="value" onchange="sql_update()" size="35" accesskey="a" />			<a href="javascript:Dopop('dictionary.pl?marclist=biblio.author&amp;type=intranet&amp;index=2',2)">
+				...
+			</a></td>
+		</tr>
+		<tr>
+			<th><label for="subject">Subject</label></th>
+			<td><input type="hidden" name="marclist" value="bibliosubject.subject" />
+			<input type="hidden" name="and_or" value="and" />
+			<input type="hidden" name="excluding" value="" />
+			<input type="hidden" name="operator" value="contains" />  
+			<input type="text" id="subject" name="value" onchange="sql_update()" size="35" accesskey="s" />			<a href="javascript:Dopop('dictionary.pl?marclist=bibliosubject.subject&amp;type=intranet&amp;index=3',3)">
+				...
+			</a></td>
+		</tr>
+<tr><th><label for="seriestitle">Series title</label></th><td>			
+			<input type="hidden" name="marclist" value="biblio.seriestitle" />
+			<input type="hidden" name="and_or" value="and" />
+			<input type="hidden" name="excluding" value="" />
+			<input type="hidden" name="operator" value="contains" />
+			<input type="text" id="seriestitle" name="value" size="35"/></td></tr>
+		<tr>
+			<th><label for="itemtype">Item Type</label></th>
+			<td><input type="hidden" name="marclist" value="biblioitems.itemtype" />
+			<input type="hidden" name="and_or" value="and" />
+			<input type="hidden" name="excluding" value="" />
+			<input type="hidden" name="operator" value="=" />
+			<!-- TMPL_VAR name="CGIitemtype" --></td>
+		</tr>
+		<tr>
+				<th><label for="branch">Branch</label></th>
+				<td><input type="hidden" name="marclist" value="items.homebranch" />
+				<input type="hidden" name="and_or" value="and" />
+				<input type="hidden" name="excluding" value="" />
+				<input type="hidden" name="operator" value="=" />  
+				<!-- TMPL_VAR name="CGIbranch" --></td>
+		</tr>
+		<tr>
+				<th><label for="barcode">Item barcode</label></th>
+				<td><input type="hidden" name="marclist" value="items.barcode" />
+				<input type="hidden" name="and_or" value="and" />
+				<input type="hidden" name="excluding" value="" />
+				<input type="hidden" name="operator" value="start" />
+				<input type="text" id="barcode" name="value" onchange="sql_update()" size="14" maxlength="14" accesskey="b" /></td> 
+		</tr>
+		<tr>
+			<th><label for="callno">Call Number</label></th>
+			<td><input type="hidden" name="marclist" value="items.itemcallnumber" />
+			<input type="hidden" name="and_or" value="and" />
+			<input type="hidden" name="excluding" value="" />
+			<input type="hidden" name="operator" value="start" />
+			<input type="text" id="callno" name="value" onchange="sql_update()" size="35"  accesskey="c" /></td>
+		</tr>
+		<tr>
+			<th><label for="isbn">ISBN</label></th>
+			<td><input type="hidden" name="marclist" value="biblioitems.isbn" />
+			<input type="hidden" name="and_or" value="and" />
+			<input type="hidden" name="excluding" value="" />
+			<input type="hidden" name="operator" value="=" />
+			<input type="text" id="isbn" name="value" onchange="sql_update()" size="35"  accesskey="n" /></td>
+		</tr>
+		<tr>
+			<th><label for="publisher">Publisher</label></th>
+			<td><input type="hidden" name="marclist" value="biblioitems.publishercode" />
+			<input type="hidden" name="and_or" value="and" />
+			<input type="hidden" name="excluding" value="" />
+			<input type="hidden" name="operator" value="contains" />
+			<input type="text" id="publisher" name="value" onchange="sql_update()" size="35"  accesskey="p" /></td>
+		</tr>
+		</table>
+
+	<table>
+	<caption>Add MARC Fields to Your Search</caption>
+		<!-- TMPL_LOOP NAME="statements" -->
+			<tr>
+				<td><select name="and_or" size="1" onchange="sql_update()">
+					<option value="and">and</option>
+					<option <!-- TMPL_IF NAME="or" -->selected <!-- /TMPL_IF -->value="or">or</option>
+				</select>
+				<!-- TMPL_VAR NAME="marclist" -->
+				<select name="excluding" size="1" onchange="sql_update()">
+					<option value="0"> </option>
+					<option <!-- TMPL_IF NAME="not" -->selected <!-- /TMPL_IF -->value="1">not</option>
+				</select>
+				<select name="operator" size="1" onchange="sql_update()">
+					<option <!-- TMPL_IF NAME="contains" -->selected<!-- /TMPL_IF --> value="contains">Contains</option>
+					<option <!-- TMPL_IF NAME="eq" -->selected<!-- /TMPL_IF --> value="=">Is equal to</option>
+					<option <!-- TMPL_IF NAME="start" -->selected<!-- /TMPL_IF --> value="start">Starts with</option>
+					<option <!-- TMPL_IF NAME="gt" -->selected<!-- /TMPL_IF --> value=">">Is greater than</option>
+					<option <!-- TMPL_IF NAME="ge" -->selected<!-- /TMPL_IF --> value=">=">Is greater or equal to</option>
+					<option <!-- TMPL_IF NAME="lt" -->selected<!-- /TMPL_IF --> value="<">Is lower than</option>
+					<option <!-- TMPL_IF NAME="le" -->selected<!-- /TMPL_IF --> value="<=">Is lower or equal to</option>
+				</select>
+				<input type="text" name="value" onchange="sql_update();" <!-- TMPL_IF NAME="value" -->value="<!-- TMPL_VAR NAME="value" -->"<!-- /TMPL_IF -->></td>
+			</tr>
+		<!-- /TMPL_LOOP -->
+		<tr>
+		<td><input type="button" value="Add criteria" onclick="AddStatement(); return false;">
+		Warning : the "contains" statement does NOT work if you enter 2 or less letters</td>
+	</tr>
+	<tr>
+			<td><div name="sql">
+				<textarea name="sql" rows="3" cols="55" disabled readonly></textarea>
+			</div></td>
+		</tr>
+		<tr>
+			<td>Results per page :<select align="right" name="resultsperpage" size="1">
+				<option value="20">20</option>
+				<option value="50">50</option>
+				<option value="100">100</option>
+			</select>
+		Ordered by
+			<select name="orderby" size="1">
+				<option value="biblio.title">Title</option>
+				<option value="biblio.author">Author</option>
+				<option value="biblioitems.dewey">Dewey</option>
+				<option value="biblioitems.publicationyear">Publication Year</option>
+				<option value="biblioitems.publishercode">Publisher</option>
+			</select>
+			<select name="desc_or_asc" size="1">
+				<option value="ASC">Ascending</option>
+				<option value="DESC">Descending</option>
+			</select>
+			</td>
+		</tr></table>
+		<p>
+			<input type="submit" value="Start search" />
+			<input type="button" value="Suggest Search Term" onclick="PopupSuggestion(); return false;" />
+		</p>
+		</div>
+	</form>
+
+<script language="javascript" type="text/javascript">
+function sql_update() {
+document.f.sql.value="";
+	for (i=0 ; i<document.f.marclist.length ; i++) {
+		if (document.f.value[i].value.length>0) {
+			document.f.sql.value = document.f.sql.value+
+										document.f.and_or[i].value + ' (' +
+										document.f.excluding[i].value + ' ' +
+										document.f.marclist[i].value + ' ' +
+										document.f.operator[i].value + ' ' +
+										'\''+document.f.value[i].value + '\') ';
+		}
+	}
+}
+
+function AddStatement() {
+
+	document.forms[0].op.value="AddStatement";
+	document.f.submit();
+}
+
+function Dopop(link,i) {
+	var searchstring=document.forms[4].value[i].value;
+	newin=window.open(link+'&amp;search='+searchstring,"popup",'width=700,height=550,toolbar=false,scrollbars=yes');
+}
+
+function PopupSuggestion() {
+    var strQuery="";
+	for (i=0 ; i<document.f.marclist.length ; i++) {
+		if (document.f.value[i].value.length>0) {
+		    strQuery += " "+document.f.value[i].value;
+		}
+	}
+	newin=window.open("suggest.pl?Q="+strQuery,"Suggestions",'width=500,height=400,toolbar=false,scrollbars=yes');
+}
+
+</script>
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--- a/koha-tmpl/intranet-tmpl/prog/en/search.marc/suggest.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/search.marc/suggest.tmpl
@ -0,0 +1,37 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Suggestions<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+		<table>
+		<caption>Catalog Search</caption>
+			<tr>
+				<th>Initial word</th>
+				<th>Suggested</th>
+				<th>Used X times</th>
+			</tr>
+		<!-- TMPL_LOOP NAME="loop" -->
+			<tr>
+				<td><!-- TMPL_VAR NAME="word" --></td>
+				<td><a href="javascript:Import('<!-- TMPL_VAR NAME="word" -->','<!-- TMPL_VAR NAME="suggestion" -->')">
+						<!-- TMPL_VAR NAME="suggestion" -->
+					</a></td>
+				<td><!-- TMPL_VAR NAME="count" --></td>
+			</tr>
+		<!-- /TMPL_LOOP -->
+		</table>
+
+<script language="javascript" type="text/javascript">
+	function Import(Replaced,ReplaceBy) {
+		for (i=0 ; i<opener.document.f.value.length ; i++) {
+				opener.document.forms['f'].value[i].value = opener.document.forms['f'].value[i].value.replace(Replaced,ReplaceBy);
+//			if (document.forms[0].kohafield[i].value == "biblioitems.isbn" && document.forms[0].field_value[i].value.length>0) {
+//				strQuery += "&isbn="+document.forms[0].field_value[i].value;
+//			}
+//			opener.document.location= "../acqui.simple/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR NAME="oldbiblionumber" -->&breedingid="+GetThisOne;
+//			self.close();
+//			return false;
+		}
+	}
+</script>
+
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
+
+