koha-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Koha-cvs] koha admin/auth_subfields_structure.pl admin/au... [rel_3_0]


From: paul poulain
Subject: [Koha-cvs] koha admin/auth_subfields_structure.pl admin/au... [rel_3_0]
Date: Wed, 01 Nov 2006 20:15:01 +0000

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     paul poulain <tipaul>   06/11/01 20:15:01

Modified files:
        admin          : auth_subfields_structure.pl 
                         auth_tag_structure.pl checkmarc.pl 
        koha-tmpl/intranet-tmpl/prog/en/admin: 
                                               auth_subfields_structure.tmpl 
                                               auth_tag_structure.tmpl 
                                               biblio_framework.tmpl 
                                               checkmarc.tmpl 
                                               marc_subfields_structure.tmpl 
                                               marctagstructure.tmpl 

Log message:
        many html fixes (coding rules & some spelling errors)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/admin/auth_subfields_structure.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.7.2.1&r2=1.7.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/admin/auth_tag_structure.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.6&r2=1.6.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/admin/checkmarc.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.9&r2=1.9.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/auth_subfields_structure.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2&r2=1.2.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.2&r2=1.2.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/checkmarc.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1&r2=1.1.2.1

Patches:
Index: admin/auth_subfields_structure.pl
===================================================================
RCS file: /sources/koha/koha/admin/auth_subfields_structure.pl,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -b -r1.7.2.1 -r1.7.2.2
--- admin/auth_subfields_structure.pl   1 Sep 2006 13:13:33 -0000       1.7.2.1
+++ admin/auth_subfields_structure.pl   1 Nov 2006 20:15:01 -0000       1.7.2.2
@@ -176,7 +176,7 @@
                                        -labels => {'0'=>'Show','1'=>'Show 
Collapsed',
                                                                        '2' 
=>'Hide',
                                                                        },
-                                       -default=>substr($data->{'hidden'},2,1),
+                                       -default=>substr($data->{'hidden'}."  
",2,1),
                                        -size=>1,
                                        -multiple=>0,
                                        );

Index: admin/auth_tag_structure.pl
===================================================================
RCS file: /sources/koha/koha/admin/auth_tag_structure.pl,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -b -r1.6 -r1.6.2.1
--- admin/auth_tag_structure.pl 4 Jul 2006 14:36:51 -0000       1.6
+++ admin/auth_tag_structure.pl 1 Nov 2006 20:15:01 -0000       1.6.2.1
@@ -135,8 +135,8 @@
        $template->param('use-heading-flags-p' => 1);
        $template->param(liblibrarian => $data->{'liblibrarian'},
                                                        libopac => 
$data->{'libopac'},
-                                                       repeatable => 
CGI::checkbox('repeatable',$data->{'repeatable'}?'checked':'',1,''),
-                                                       mandatory => 
CGI::checkbox('mandatory',$data->{'mandatory'}?'checked':'',1,''),
+                                                       repeatable => 
"".$data->{'repeatable'},
+                                                       mandatory => 
"".$data->{'mandatory'},
                                                        authorised_value => 
$authorised_value,
                                                        authtypecode => 
$authtypecode,
                                                        );

Index: admin/checkmarc.pl
===================================================================
RCS file: /sources/koha/koha/admin/checkmarc.pl,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -b -r1.9 -r1.9.2.1
--- admin/checkmarc.pl  4 Jul 2006 14:36:51 -0000       1.9
+++ admin/checkmarc.pl  1 Nov 2006 20:15:01 -0000       1.9.2.1
@@ -60,7 +60,7 @@
 $sth = $dbh->prepare("select tagfield,tab from marc_subfield_structure where 
kohafield=\"biblioitems.biblioitemnumber\"");
 $sth->execute;
 my ($res2,$tab2) = $sth->fetchrow;
-if ($res && $res2 && ($res eq $res2) && $tab==-1 && $tab2==-1) {
+if ($res && $res2) {
        $template->param(biblionumber => 0);
 } else {
        $template->param(biblionumber => 1);

Index: koha-tmpl/intranet-tmpl/prog/en/admin/auth_subfields_structure.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/auth_subfields_structure.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -b -r1.2 -r1.2.2.1
--- koha-tmpl/intranet-tmpl/prog/en/admin/auth_subfields_structure.tmpl 19 May 
2006 17:30:07 -0000      1.2
+++ koha-tmpl/intranet-tmpl/prog/en/admin/auth_subfields_structure.tmpl 1 Nov 
2006 20:15:01 -0000       1.2.2.1
@@ -4,42 +4,33 @@
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
-!-- TMPL_IF NAME="add_form" -->
+<!-- TMPL_IF NAME="add_form" -->
 
-       <h1><!-- TMPL_IF NAME="use-heading-flags-p" -->
+       <h><!-- 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="authtypecode" value="<!-- TMPL_VAR 
NAME="authtypecode" -->" />
        <!-- 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> Opac:<!-- TMPL_VAR name="ohidden" -->  
Intranet:<!-- TMPL_VAR name="ihidden" --> Editor:<!-- TMPL_VAR name="ehidden" 
--> (see online help)</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 for="link<!-- TMPL_VAR NAME="row" -->">Is a Linking 
field: </label></th><td><!-- TMPL_VAR NAME="link" --> (if checked, it means 
that the subfield is used for linking authorities</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="authtypecode" --></li>
-       <li>Plugin: <!-- TMPL_VAR NAME="value_builder" --></li>
-</ul>
-</td></tr>      
-               </table>
+       <div class="data <!-- TMPL_VAR NAME="toggle" -->">
+          <h2>Tag <!-- TMPL_VAR NAME="tagfield" -->, Subfield <!-- TMPL_VAR 
NAME="tagsubfield" --></h2>
+          <p><label for="repeatable<!-- TMPL_VAR NAME="row" 
-->">Repeatable:</label><!-- TMPL_VAR NAME="repeatable" -->&nbsp;</p>
+          <p><label for="mandatory<!-- TMPL_VAR NAME="row" 
-->">Mandatory:</label><!-- TMPL_VAR NAME="mandatory" -->&nbsp;</p>
+          <p><label for="seealso<!-- TMPL_VAR NAME="row" -->">Search 
also:</label><input type="text" id="seealso<!-- TMPL_VAR NAME="row" -->" 
name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size="20" /> (example 
for 200a: '200c','200d','200e'...)</p>
+          <p><label for="liblibrarian<!-- TMPL_VAR NAME="row" -->">Text for 
librarian:</label><input id="liblibrarian<!-- TMPL_VAR NAME="row" -->" 
type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" 
size="40" maxlength="80" /></p>
+          <p><label for="libopac<!-- TMPL_VAR NAME="row" -->">Text for 
OPAC:</label><input type="text" id="libopac<!-- TMPL_VAR NAME="row" -->" 
name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" 
maxlength="80" /></p>
+          <p><label for="tab<!-- TMPL_VAR NAME="row" -->">Managed in 
tab</label><!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield is NOT 
managed by Koha)</p>
+          <p><label for="hidden<!-- TMPL_VAR NAME="row" -->">Hidden</label> 
Opac:<!-- TMPL_VAR name="ohidden" -->  Intranet:<!-- TMPL_VAR name="ihidden" 
--> Editor:<!-- TMPL_VAR name="ehidden" --> (see online help)</p>
+          <p><label for="isurl<!-- TMPL_VAR NAME="row" -->">Is a URL 
</label><!-- TMPL_VAR NAME="isurl" --> (if checked, it means that the subfield 
is an URL and can be clicked)</p>
+          <p><label for="link<!-- TMPL_VAR NAME="row" -->">Is a Linking field 
</label><!-- TMPL_VAR NAME="link" --> (if checked, it means that the subfield 
is used for linking authorities)</p>
+        <p><label>Default Options: <p>(choose one)</p></label>
+        <ul>
+            <li>Authorized Value <!-- TMPL_VAR NAME="authorised_value" --></li>
+            <li>Thesaurus <!-- TMPL_VAR NAME="authtypecode" --></li>
+            <li>Plugin <!-- TMPL_VAR NAME="value_builder" --></li>
+        </ul>
+        </p>    
                </div>
        <!-- /TMPL_LOOP -->
        <input type="submit" class="submit" value="Save Changes" />
@@ -60,7 +51,7 @@
                <th>Subfield</th>
                <td><!-- TMPL_VAR NAME="tagsubfield" --></td>
        </tr>
-       <tr><th>Description</th><td><!-- TMPL_VAR NAME="liblibrarian" 
--></td></tr>
+       <p>Description<!-- TMPL_VAR NAME="liblibrarian" --></p>
 </table></div>
                        <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" -->" />
@@ -120,7 +111,10 @@
 </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="authtypecode" value="<!-- TMPL_VAR 
NAME="edit_authtypecode" -->" /><input type="submit" class="submit" value="Edit 
Subfields" /></form> <form class="inline" action="auth_tag_structure.pl" 
method="get"><input type="hidden" name="searchfield" value="<!-- TMPL_VAR 
NAME="tagfield" -->" /><input type="hidden" name="authtypecode" value="<!-- 
TMPL_VAR NAME="authtypecode" -->" /><input type="submit" class="submit" 
value="Return to Auth Structure" /></form>
+<div id="action">
+    <a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&tagfield=<!-- 
TMPL_VAR name="edit_tagfield" -->&authtypecode=<!-- TMPL_VAR 
name="edit_authtypecode" -->">Edit subfields</a>
+    <a href="auth_tag_structure.pl?searchfield=<!-- TMPl_VAR name="tagfield" 
-->&authtypecode=<!-- TMPL_VAR name="authtypecode"-->">Return to Auth 
Structure</a>
+</div>
 <!-- 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 -->

Index: koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -b -r1.2 -r1.2.2.1
--- koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl       19 May 
2006 17:35:53 -0000      1.2
+++ koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl       1 Nov 
2006 20:15:01 -0000       1.2.2.1
@@ -10,7 +10,7 @@
        
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
        function isNotNull(f,noalert) {
                if (f.value.length ==0) {
-   return false;
+return false;
                }
                return true;
        }
@@ -59,20 +59,34 @@
 
 <!-- TMPL_IF NAME="add_form" -->
 
-       <h1>
+    <h2>
        <!-- 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>
+    </h2>
        <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>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="40" maxlength="100" /></p>
+        <p><label>Text for opac</label><input type="text" name="libopac" 
value="<!-- TMPL_VAR NAME="libopac" escape=HTML -->" size="40" maxlength="100" 
/></p>
+        <p><label for="repeatable">Repeatable</label>
+            <!-- TMPL_IF NAME="repeatable" -->
+                <input type="checkbox" name="repeatable" id="repeatable" 
value="1" checked/>
+            <!-- TMPL_ELSE -->
+                <input type="checkbox" name="repeatable" id="repeatable" 
value="0"/>
+            <!-- /TMPL_IF -->
+            &nbsp;
+        </p>
+        <p><label for="mandatory">Mandatory</label>
+            <!-- TMPL_IF NAME="mandatory" -->
+                <input type="checkbox" name="mandatory" id="mandatory" 
value="1" checked/>
+            <!-- TMPL_ELSE -->
+                <input type="checkbox" name="mandatory" id="mandatory" 
value="0"/>
+            <!-- /TMPL_IF -->
+            &nbsp;
+            </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" 
class="button" onclick="Check(this.form)" /></p>
        </form>

Index: koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/Attic/biblio_framework.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl 24 Feb 2006 
11:18:17 -0000      1.1
+++ koha-tmpl/intranet-tmpl/prog/en/admin/biblio_framework.tmpl 1 Nov 2006 
20:15:01 -0000       1.1.2.1
@@ -60,22 +60,17 @@
 </script>
 
 <!-- TMPL_IF NAME="add_form" -->
+    <h1><!-- TMPL_IF NAME="frameworkcode" -->Modify framework text<!-- 
TMPL_ELSE -->Add framework<!-- /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="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>
+            <p><label for="frameworkcode">Framework Code</label><input 
type="hidden" id="frameworkcode" name="frameworkcode" value="<!-- TMPL_VAR 
NAME="frameworkcode" -->" /><!-- TMPL_VAR NAME="frameworkcode" --></p>
                        <!-- 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>
+            <p><label for="frameworkcode">Framework Code</label><input 
type="text" id="frameworkcode" name="frameworkcode" size="4" maxlength="4" 
onblur="toUC(this)" /></p>
                        <!-- /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><label for="description">Description</label>
+        <input type="text" name="frameworktext" size="40" maxlength="80" 
value="<!-- TMPL_VAR NAME="frameworktext" escape=HTML -->" /></p>
                        <p>     <input type="button" 
value="Submit"class="submit" onclick="Check(this.form)" /></p>
        </form>
 <!-- /TMPL_IF -->

Index: koha-tmpl/intranet-tmpl/prog/en/admin/checkmarc.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/checkmarc.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- koha-tmpl/intranet-tmpl/prog/en/admin/checkmarc.tmpl        24 Feb 2006 
11:18:17 -0000      1.1
+++ koha-tmpl/intranet-tmpl/prog/en/admin/checkmarc.tmpl        1 Nov 2006 
20:15:01 -0000       1.1.2.1
@@ -5,7 +5,7 @@
 <!-- TMPL_INCLUDE NAME="menus.inc" -->
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
-<h1>MARC Checks</h1>
+<h1>MARC Checking</h1>
 <table>
        <tr>
                <th>Test</th>
@@ -47,7 +47,7 @@
        <!-- TMPL_ELSE -->
                <tr>
                        <td>OK</td>
-                       <td><i>Only 1 MARC tag mapped to items</i></td>
+            <td>Only 1 MARC tag mapped to items</td>
                </tr>
        <!-- /TMPL_IF -->
        <!--  -->
@@ -96,10 +96,7 @@
 <!-- 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>
+        <td>The biblio.biblionumber and biblioitems.biblioitemnumber fields be 
mapped to a MARC subfield,</td>
        </tr>
 <!-- TMPL_ELSE -->
        <tr>
@@ -119,7 +116,7 @@
        <!-- TMPL_ELSE -->
                <tr>
                        <td>OK</td>
-                       <td><i>no NULL value in frameworkcode</i></td>
+            <td>no NULL value in frameworkcode</td>
                </tr>
        <!-- /TMPL_IF -->
 
@@ -132,7 +129,7 @@
 </table>
 <!-- TMPL_ELSE -->
        </table>
-               <p>Configuration OK, you don't have errors in your MARC 
parameters table</p>
+        <p><b>Configuration OK, you don't have errors in your MARC parameters 
table</b></p>
 <!-- /TMPL_IF -->
 
 

Index: koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/Attic/marc_subfields_structure.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl 24 Feb 
2006 11:18:17 -0000      1.1
+++ koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl 1 Nov 
2006 20:15:01 -0000       1.1.2.1
@@ -7,47 +7,38 @@
 <!-- TMPL_INCLUDE NAME="menu-admin.inc" -->
 
 <!-- TMPL_IF NAME="add_form" -->
-
-       <h1><!-- TMPL_IF NAME="use-heading-flags-p" -->
+    <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>
+        <!-- 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>
-               
+    <div class="data <!-- TMPL_VAR NAME="toggle" -->">
+    <h2>Tag <!-- TMPL_VAR NAME="tagfield" -->, Subfield <!-- TMPL_VAR 
NAME="tagsubfield" --></h2>
+    <h3>MARC constraints</h3>
+    <p><label for="repeatable<!-- TMPL_VAR NAME="row" 
-->">Repeatable</label><!-- TMPL_VAR NAME="repeatable" -->&nbsp;</p>
+    <p><label for="mandatory<!-- TMPL_VAR NAME="row" 
-->">Mandatory</label><!-- TMPL_VAR NAME="mandatory" -->&nbsp;</p>
+    <p><label for="seealso<!-- TMPL_VAR NAME="row" -->">Search 
also</label><input type="text" id="seealso<!-- TMPL_VAR NAME="row" -->" 
name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size="20" /> (example 
for 200a: '200c','200d','200e'...)</p>
+    <p><label for="kohafield<!-- TMPL_VAR NAME="row" -->">Koha 
link</label><!-- TMPL_VAR NAME="kohafield" --></p>
+    <h3>Editor constaints</h3>
+    <p><label for="liblibrarian<!-- TMPL_VAR NAME="row" -->">Text for 
librarian</label><input id="liblibrarian<!-- TMPL_VAR NAME="row" -->" 
type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" 
size="40" maxlength="80" /></p>
+    <p><label for="libopac<!-- TMPL_VAR NAME="row" -->">Text for 
OPAC</label><input type="text" id="libopac<!-- TMPL_VAR NAME="row" -->" 
name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" 
maxlength="80" /></p>
+    <p><label for="tab<!-- TMPL_VAR NAME="row" -->">Managed in tab</label><!-- 
TMPL_VAR NAME="tab" --> (ignore means that the subfield is NOT managed by 
Koha)</p>
+    <p><label for="hidden<!-- TMPL_VAR NAME="row" -->">Hidden</label><!-- 
TMPL_VAR NAME="hidden" --> (subfield is managed, but hidden. -should be filled 
by a plugin or thesaurus-)</p>
+    <p><label for="isurl<!-- TMPL_VAR NAME="row" -->">Is a URL</label><!-- 
TMPL_VAR NAME="isurl" --> (if checked, it means that the subfield is an URL and 
can be clicked</p>
+    <p><label>Link</label><input type="text" name="link" value="<!-- TMPL_VAR 
NAME="link" -->" size="10" maxlength="5" /> (exemple:200b)</p>
+    <p><label>Others Options: <p>(choose one)</p></label>
+        <p><label>Authorized Value</label><!-- TMPL_VAR 
NAME="authorised_value" --></p>
+        <p><label>Thesaurus</label><!-- TMPL_VAR NAME="authtypes" --></p>
+        <p><label>Plugin</label><!-- TMPL_VAR NAME="value_builder" --></p>
+    </p>        
        <!-- /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 -->
 
@@ -59,7 +50,7 @@
                <th>Subfield</th>
                <td><!-- TMPL_VAR NAME="tagsubfield" --></td>
        </tr>
-       <tr><th>Description</th><td><!-- TMPL_VAR NAME="liblibrarian" 
--></td></tr>
+    <p>Description<!-- TMPL_VAR NAME="liblibrarian" --></p>
 </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" -->" />

Index: koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/admin/Attic/marctagstructure.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl 24 Feb 2006 
11:18:17 -0000      1.1
+++ koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl 1 Nov 2006 
20:15:01 -0000       1.1.2.1
@@ -14,7 +14,7 @@
        
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
        function isNotNull(f,noalert) {
                if (f.value.length ==0) {
-   return false;
+return false;
                }
                return true;
        }
@@ -66,17 +66,17 @@
        <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>
+        <h2><!-- 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 --></h2>
+    <p><label>Tag</label><!-- TMPL_VAR NAME="searchfield" -->&nbsp;</p>
+    <p><label for="liblibrarian">Label for lib</label><input type="text" 
id="liblibrarian" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" 
escape=HTML -->" size="40" maxlength="100"></p>
+    <p><label for="libopac">Label for opac</label><input type="text" 
id="libopac" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape=HTML 
-->" size="40" maxlength="100"></p>
+    <p><label for="repeatable">Repeatable</label><!-- TMPL_VAR 
NAME="repeatable" -->&nbsp;</p>
+    <p><label for="mandatory">Mandatory</label><!-- TMPL_VAR NAME="mandatory" 
-->&nbsp;</p>
+    <p><label for="authorised_value">Authorized 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>
+            <input type="submit" value="Save Changes" 
onclick="Check(this.form)" />
+            <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 -->
 
@@ -85,8 +85,8 @@
 <!-- ------------------------------------------------------------------------ 
-->
 <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>
+    <p>Tag: <!-- TMPL_VAR NAME="searchfield" --></p>
+    <p>Description: <!-- TMPL_VAR NAME="liblibrarian" --></p>
        </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 -->
@@ -118,18 +118,25 @@
 <!-- TMPL_IF NAME="else" -->
 
 <form name="f" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-<label for="frameworkcode">Select a framework: </label>
+    <p><label for="frameworkcode">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>
+    </p>
+    <p>
+        <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>
                        <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();" />
+        <!-- TMPL_IF Name="select_display"-->
+            <label for="select_display">Display only used 
Tags/Subfields</label> <input type="checkbox" name="select_display" 
id="select_display" value="True" checked="checked"  
onchange="this.form.submit();" />
+        <!-- TMPL_ELSE -->
+            <label for="select_display">Display only used 
Tags/Subfields</label> <input type="checkbox" name="select_display" 
id="select_display" value="True" onchange="this.form.submit();" />
+        <!--/TMPL_IF -->
                </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>
@@ -178,7 +185,7 @@
                <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="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>




reply via email to

[Prev in Thread] Current Thread [Next in Thread]