From afd4be5ddc322a91877ec2564bde518d1dc4a4fa Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Thu, 3 Jun 2004 10:22:22 +0000
Subject: [PATCH] * frameworks and itemtypes are independant * bugfixes in
 authority types & framework management (mainly deletion)

---
 .../default/en/parameters/admin-home.tmpl     |   4 +-
 .../parameters/auth_subfields_structure.tmpl  |  40 ++---
 .../default/en/parameters/authtypes.tmpl      |  31 ++--
 .../en/parameters/biblio_framework.tmpl       | 141 ++++++++++++++++++
 .../parameters/marc_subfields_structure.tmpl  |   4 +-
 .../en/parameters/marctagstructure.tmpl       |  26 ++--
 6 files changed, 185 insertions(+), 61 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl

diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl
index 5a6979bc63..1b53da975b 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl
@@ -41,8 +41,8 @@
 	<td>Define categories and thesaurus/authority MARC structure.</td>
 </tr>
 <tr>
-	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/marctagstructure.pl>MARC tag structure</a></td>
-	<td>MARC structure: tags then subfields.</td>
+	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/biblio_framework.pl>Biblio framework (MARC structure)</a></td>
+	<td>the frameworks defined for the MARC editor. Create frameworks, then define the MARC structure (fields & subfields)</td>
 </tr>
 <tr>
 	<td valign="top" width="25%"><a href=/cgi-bin/koha/admin/koha2marclinks.pl>Links Koha - MARC DB</a></td>
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl
index 72bc92d430..dc3f4cc02c 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/auth_subfields_structure.tmpl
@@ -57,41 +57,25 @@
 
 <!-- TMPL_IF name="delete_confirm" -->
 <!---------------------------------------------------------------------------->
-<table>
-	<tr>
-		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b>Subfield</b></td>
-		<td background="<!-- TMPL_VAR NAME='themelang' -->/images/background-mem.gif"><b><!-- TMPL_VAR name="tagsubfield" --></b></td>
-	</tr>
-	<tr><td>&nbsp;</td><td><!-- TMPL_VAR name="liblibrarian" --></td></tr>
+<div id="bloc25">
+	<h2 class="parameters">
+		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" -->'>
-		<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="hidden" name="tagfield" value="<!-- TMPL_VAR name="tagfield" -->">
-					<input type=submit value=NO>
-				</form>
-			</td>
-		</tr>
-<!-- /TMPL_IF -->
-
-<!-- TMPL_IF name="delete_confirmed" -->
-<!---------------------------------------------------------------------------->
-	Data deleted
+		<input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="authtypecode" -->">
+		<p>CONFIRM DELETION</p>
+		<input type=submit value='YES' class="button parameters">
+	</form>
 	<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
 		<input type="hidden" name="tagfield" value="<!-- TMPL_VAR name="tagfield" -->">
-		<input type=submit value=OK>
+		<input type=submit value="NO" class="button parameters">
 	</form>
+</div>
 <!-- /TMPL_IF -->
 
 <!---------------------------------------------------------------------------->
@@ -140,7 +124,7 @@
 <!-- TMPL_VAR name="edit" -->
 	<img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0>
 </a>
-<a href="marctagstructure.pl?searchfield=<!-- TMPL_VAR name="tagfield" -->">
+<a href="auth_tag_structure.pl?searchfield=<!-- TMPL_VAR name="tagfield" -->&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" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl
index ad3c1807ff..20a9183dbc 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/authtypes.tmpl
@@ -84,26 +84,25 @@ function Check(f) {
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="delete_confirm" -->
-		<p><label>Authority type</label><!-- TMPL_VAR name="authtypecode" --></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" -->'>
-	<p><label>Description</label><!-- TMPL_VAR name="authtypetext" --></p>
+<div id="bloc25">
+	<h2 class="parameters">Authority structure definition for <!-- TMPL_VAR name="authtypetext" --> (<!-- TMPL_VAR name="authtypecode" -->)</h2>
 	<!-- TMPL_IF name="total" -->
 		<p>
-			<b>This record is used <!-- TMPL_VAR name="total" --> times. Deletion not possible</b>
-		</p>
-		<p>
-			</form>
-			<form action='<!-- TMPL_VAR name="script_name" -->' method=post><input type=submit value="OK" class="button parameters"></form>
-		</p>
-	<!-- TMPL_ELSE -->
-		<p>CONFIRM DELETION</p>
-		<p>
-			<input type=submit value='YES' class="button parameters"></form>
-			<form action='<!-- TMPL_VAR name="script_name" -->' method=post><input type=submit value=NO class="button parameters"></form>
+			<b>This record is used <!-- TMPL_VAR name="total" --> times</b>
 		</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" class="button parameters">
+		</form>
+		<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
+			<input type=submit value="NO" class="button parameters">
+		</form>
+	</p>
+</div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="else" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl
new file mode 100644
index 0000000000..fd7f0a4982
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/biblio_framework.tmpl
@@ -0,0 +1,141 @@
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
+
+<script>
+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>
+<div id="mainbloc">
+<!-- TMPL_IF name="add_form" -->
+	<!-- TMPL_IF name="frameworkcode" -->
+		<h1>Modify framework text</h1>
+	<!-- TMPL_ELSE -->
+		<h1>Add framework</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>
+			<!-- TMPL_IF name="frameworkcode" -->
+				<p><label class="label100">Framework type<label><input type=hidden name=frameworkcode value=<!-- TMPL_VAR name="frameworkcode" -->><!-- TMPL_VAR name="frameworkcode" --></p>
+			<!-- TMPL_ELSE -->
+				<p><label class="label100">Framework type<label><input type=text name=frameworkcode size=6 maxlength=4 onBlur="toUC(this)"></p>
+			<!-- /TMPL_IF -->
+			<p>
+				<label class="label100">Description</label>
+				<input type=text name="frameworktext" size=40 maxlength=80 value='<!-- TMPL_VAR name="frameworktext" escape=HTML -->'>
+			</p>
+			<p>
+				<INPUT type=button value='OK'class="button parameters" onClick='Check(this.form)'>
+			</p>
+	</form>
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF name="delete_confirm" -->
+<div id="bloc25">
+	<h2 class="parameters">Framework for <!-- TMPL_VAR name="frameworktext" --> (<!-- TMPL_VAR name="frameworkcode" -->)</h2>
+	<!-- TMPL_IF name="total" -->
+		<p>
+			<b>This record is used <!-- TMPL_VAR name="total" --> times</b>
+		</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=frameworkcode value='<!-- TMPL_VAR name="frameworkcode" -->'>
+			<input type=submit value='YES' class="button parameters">
+		</form>
+		<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
+			<input type="submit" value="NO" class="button parameters">
+		</form>
+	</p>
+</div>
+<!-- /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 class="parameters">Code</th>
+		<th class="parameters">Description</th>
+		<th class="parameters">&nbsp;</th>
+		<th class="parameters">Edit</th>
+		<th class="parameters">Delete</th>
+	</tr>
+	<tr>
+		<td>&nbsp;</td>
+		<td>Default framework</td>
+		<td><a href="marctagstructure.pl?frameworkcode=<!-- TMPL_VAR name="frameworkcode" -->" class="button parameters">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" -->" class="button parameters" >MARC structure</a></td>
+			<td><a href="<!-- TMPL_VAR name="script_name" -->?op=add_form&authtypecode=<!-- TMPL_VAR name="frameworkcode" escape="HTML" -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width=32 hspace=0 vspace=0 border=0></a></td>
+			<td><a href="<!-- TMPL_VAR name="script_name" -->?op=delete_confirm&frameworkcode=<!-- TMPL_VAR name="frameworkcode" escape="HTML" -->"><img src="<!-- TMPL_VAR NAME='interface' -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png" width=32 hspace=0 vspace=0 border=0></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" class="button" value="Add framework" title="Add framework" alt="Add framework" >
+	<td width=33%><!-- TMPL_IF name="previous" --><a href="<!-- TMPL_VAR 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 --></td>
+	<td width=33%><!-- TMPL_IF name="next" --><a href="<!-- 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 --></td>
+</form>
+</div>
+<!-- /TMPL_IF -->
+<!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl
index b64ac624f5..de43e47426 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl
@@ -12,7 +12,7 @@
 	</H1>
 	<form action='<!-- TMPL_VAR name="script_name" -->' name=Aform method=post>
 	<input type=hidden name=op value='add_validate'>
-	<input type="hidden" name="itemtype" value="<!-- TMPL_VAR name="itemtype" -->">
+	<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR name="frameworkcode" -->">
 	<table>
 	<!-- TMPL_LOOP name="loop" -->
 		<tr bgcolor='<!-- TMPL_VAR name="bgcolor" -->'>
@@ -84,7 +84,7 @@
 
 <!---------------------------------------------------------------------------->
 <!-- TMPL_IF name="else" -->
-<h1>MARC subfield structure admin for <!-- TMPL_VAR name="tagfield" --> (framework <!--TMPL_VAR name="itemtype" -->)</h1>
+<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 <b>Koha field</b> 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>
 
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl
index ee2ab39228..c3638e73c3 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 
 <div id="mainbloc">
-<h1 class="parameters">MARC tag structure admin for <!-- TMPL_IF name="itemtype" --><!-- TMPL_VAR name="itemtype" --><!-- TMPL_ELSE -->default MARC framework<!-- /TMPL_IF --></h1>
+<h1 class="parameters">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>
 	function _(s) { return s } // dummy function for gettext
 	/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -64,7 +64,7 @@
 	</h1>
 	<form action='<!-- TMPL_VAR name="script_name" -->' name="Aform" method="post">
 		<input type=hidden name=op value='add_validate'>
-		<input type="hidden" name="itemtype" value="<!-- TMPL_VAR name="itemtype" -->">
+		<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR name="frameworkcode" -->">
 		<p><label>Tag<label><!-- TMPL_VAR name="searchfield" --></p>
 		<p><label>Lib for librarians</label><input type="text" name="liblibrarian" value='<!-- TMPL_VAR name="liblibrarian" escape=HTML -->' size=80 maxlength=100></p>
 		<p><label>Lib for opac</label><input type="text" name="libopac" value='<!-- TMPL_VAR name="libopac" escape=HTML -->' size=80 maxlength=100></p>
@@ -96,16 +96,16 @@
 	<input type=submit value=OK>
 	</form>
 <!-- /TMPL_IF -->
-<!-- TMPL_IF name="itemtype_create" -->
+<!-- TMPL_IF name="framework_create" -->
 <!---------------------------------------------------------------------------->
 	<form action='<!-- TMPL_VAR name="script_name" -->' method=post>
-		<input type="hidden" name="op" value="itemtype_create_confirm">
-		<input type="hidden" name="itemtype" value="<!-- TMPL_VAR name="itemtype" -->">
-		Create itemtype framework for <!-- TMPL_VAR name="itemtype" --> (<!-- TMPL_VAR name="ITdescription" -->) using
-		<select name="existingitemtype">
+		<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="existingfarmeworkcode">
 			<option value="">Default</option>
-		<!-- TMPL_LOOP name="existingitemtypeloop" -->
-			<option value="<!-- TMPL_VAR name="value" -->"><!-- TMPL_VAR name="description" --></option>
+		<!-- TMPL_LOOP name="existingframeworkloop" -->
+			<option value="<!-- TMPL_VAR name="value" -->"><!-- TMPL_VAR name="frameworktext" --></option>
 		<!-- /TMPL_LOOP -->
 		</select>
 		<input type=submit value="OK" class="button">
@@ -115,12 +115,12 @@
 <!---------------------------------------------------------------------------->
 <!-- TMPL_IF name="else" -->
 <div id="bloc25">
-<h2 class="parameters">Select an itemtype</h2>
+<h2 class="parameters">Select a framework</h2>
 <form action='<!-- TMPL_VAR name="script_name" -->' method=post>
-	<select name="itemtype">
+	<select name="frameworkcode">
 		<option value="">Default</option>
-	<!-- TMPL_LOOP name="itemtypeloop" -->
-		<option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="description" --></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>
 	<input type=text name=searchfield value="<!-- TMPL_VAR name="searchfield" -->">
-- 
2.39.5