[Koha-cvs] koha admin/marctagstructure.pl koha-tmpl/intran... [rel_3_0]
paul poulain
paul at koha-fr.org
Thu Jan 25 11:42:05 CET 2007
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: paul poulain <tipaul> 07/01/25 10:42:05
Modified files:
admin : marctagstructure.pl
koha-tmpl/intranet-tmpl/prog/en/admin:
marc_subfields_structure.tmpl
Log message:
- bugfix in color toggle when display only used tag is set
- grouping subfield by subfield
- few html cleaning
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/admin/marctagstructure.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.32.2.3&r2=1.32.2.4
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.2.2&r2=1.1.2.3
Patches:
Index: admin/marctagstructure.pl
===================================================================
RCS file: /sources/koha/koha/admin/Attic/marctagstructure.pl,v
retrieving revision 1.32.2.3
retrieving revision 1.32.2.4
diff -u -b -r1.32.2.3 -r1.32.2.4
--- admin/marctagstructure.pl 18 Dec 2006 16:35:17 -0000 1.32.2.3
+++ admin/marctagstructure.pl 25 Jan 2007 10:42:05 -0000 1.32.2.4
@@ -225,7 +225,16 @@
my $env;
$searchfield=~ s/\'/\\\'/g;
my @data=split(' ',$searchfield);
- my $sth=$dbh->prepare("Select marc_tag_structure.tagfield as mts_tagfield,marc_tag_structure.liblibrarian as mts_liblibrarian,marc_tag_structure.libopac as mts_libopac,marc_tag_structure.repeatable as mts_repeatable,marc_tag_structure.mandatory as mts_mandatory,marc_tag_structure.authorised_value as mts_authorized_value,marc_subfield_structure.* from marc_tag_structure LEFT JOIN marc_subfield_structure ON (marc_tag_structure.tagfield=marc_subfield_structure.tagfield AND marc_tag_structure.frameworkcode=marc_subfield_structure.frameworkcode) where (marc_tag_structure.tagfield >= ? and marc_tag_structure.frameworkcode=?) AND marc_subfield_structure.tab>=0 order by marc_tag_structure.tagfield,marc_subfield_structure.tagsubfield");
+ my $sth=$dbh->prepare("
+ SELECT marc_tag_structure.tagfield AS mts_tagfield,
+ marc_tag_structure.liblibrarian as mts_liblibrarian,
+ marc_tag_structure.libopac as mts_libopac,
+ marc_tag_structure.repeatable as mts_repeatable,
+ marc_tag_structure.mandatory as mts_mandatory,
+ marc_tag_structure.authorised_value as mts_authorized_value,
+ marc_subfield_structure.*
+ FROM marc_tag_structure
+ LEFT JOIN marc_subfield_structure ON (marc_tag_structure.tagfield=marc_subfield_structure.tagfield AND marc_tag_structure.frameworkcode=marc_subfield_structure.frameworkcode) WHERE (marc_tag_structure.tagfield >= ? and marc_tag_structure.frameworkcode=?) AND marc_subfield_structure.tab>=0 ORDER BY marc_tag_structure.tagfield,marc_subfield_structure.tagsubfield");
#could be ordoned by tab
$sth->execute($data[0], $frameworkcode);
my @results = ();
@@ -258,11 +267,6 @@
$j=$i;
my @internal_loop = ();
while (($results[$i]->{'tagfield'}==$results[$j]->{'tagfield'}) and ($j< ($offset+$pagesize<$cnt?$offset+$pagesize:$cnt))) {
- if ($toggle eq 0) {
- $toggle=1;
- } else {
- $toggle=0;
- }
my %subfield_data;
$subfield_data{tagsubfield} = $results[$j]->{'tagsubfield'};
$subfield_data{liblibrarian} = $results[$j]->{'liblibrarian'};
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.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl 15 Nov 2006 17:21:27 -0000 1.1.2.2
+++ koha-tmpl/intranet-tmpl/prog/en/admin/marc_subfields_structure.tmpl 25 Jan 2007 10:42:05 -0000 1.1.2.3
@@ -19,7 +19,8 @@
<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>
+ <fieldset>
+ <legend>Tag <!-- TMPL_VAR NAME="tagfield" -->, Subfield <!-- TMPL_VAR NAME="tagsubfield" --></legend>
<h3>MARC constraints</h3>
<p><label for="repeatable<!-- TMPL_VAR NAME="row" -->">Repeatable</label><!-- TMPL_VAR NAME="repeatable" --> </p>
<p><label for="mandatory<!-- TMPL_VAR NAME="row" -->">Mandatory</label><!-- TMPL_VAR NAME="mandatory" --> </p>
@@ -37,6 +38,7 @@
<p><label>Thesaurus</label><!-- TMPL_VAR NAME="authtypes" --></p>
<p><label>Plugin</label><!-- TMPL_VAR NAME="value_builder" --></p>
</p>
+ </fieldset>
<!-- /TMPL_LOOP -->
<input type="submit" value="Save Changes" />
</form>
@@ -110,7 +112,17 @@
</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>
+<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 -->
More information about the Koha-cvs
mailing list