gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup classsources.pl and .tmpl 

Relatively minor cleaning.
Remove unused javascript.  Add row highlighting to both tables.  Remove conditionals where the
behavior is the same for both possibilities.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
This commit is contained in:
Joe Atzberger 2009-06-10 16:53:27 -05:00 committed by Galen Charlton
parent 7d4a962a18
commit 8db0cc330b
2 changed files with 84 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
admin/classsources.pl
View File

@ -19,6 +19,7 @@
#
use strict;
# use warnings; FIXME
use CGI;
use C4::Auth;
use C4::Context;
@ -30,9 +31,9 @@ use C4::ClassSortRoutine;
my $script_name = "/cgi-bin/koha/admin/classsources.pl";
my $input = new CGI;
my $op = $input->param('op');
my $op = $input->param('op') || '';
my $source_code = $input->param('class_source');
my $rule_code = $input->param('sort_rule');
my $rule_code = $input->param('sort_rule');
my ($template, $loggedinuser, $cookie)
= get_template_and_user({template_name => "admin/classsources.tmpl",
@ -43,11 +44,8 @@ my ($template, $loggedinuser, $cookie)
debug => 1,
});
if ($op) {
$template->param(script_name => $script_name, $op => 1);
} else {
$template->param(script_name => $script_name);
}
$template->param(script_name => $script_name);
$template->param($op => 1) if $op;
my $display_lists = 0;
if ($op eq "add_source") {
@ -151,7 +149,7 @@ sub delete_class_source_form {
my ($template) = @_;
$template->param(
delete_class_source_form => 1,
confirm_op => "delete_source_confirmed",
confirm_op => "delete_source_confirmed",
class_source => $source_code,
);
}
@ -170,12 +168,11 @@ sub get_sort_rule_codes {
my @sort_rules = ();
foreach my $sort_rule (sort keys %$sort_rules) {
my $sort_rule = $sort_rules->{$sort_rule};
push @sort_rules,
{
push @sort_rules, {
rule => $sort_rule->{'class_sort_rule'},
description => $sort_rule->{'description'},
selected => $sort_rule->{'class_sort_rule'} eq $current_rule ? 1 : 0
}
selected => $sort_rule->{'class_sort_rule'} eq $current_rule ? 1 : 0
};
}
$template->param(rules_dropdown => \@sort_rules);
@ -204,7 +201,7 @@ sub delete_sort_rule_form {
$template->param(
delete_sort_rule_form => 1,
confirm_op => "delete_sort_rule_confirmed",
sort_rule => $rule_code,
sort_rule => $rule_code,
);
} else {
$template->param(
@ -227,9 +224,9 @@ sub edit_class_sort_rule_form {
$template->param(
sort_rule_form => 1,
edit_sort_rule => 1,
confirm_op => "edit_sort_rule_confirmed",
sort_rule => $rule_code,
description => $rule->{'description'},
confirm_op => "edit_sort_rule_confirmed",
sort_rule => $rule_code,
description => $rule->{'description'},
sort_routine => $rule->{'sort_routine'}
);
@ -244,11 +241,10 @@ sub get_class_sort_routines {
my @sort_form = ();
foreach my $sort_routine (sort @sort_routines) {
push @sort_form,
{
push @sort_form, {
routine => $sort_routine,
selected => $sort_routine eq $current_routine ? 1 : 0
}
};
}
$template->param(routines_dropdown => \@sort_form);
@ -267,13 +263,12 @@ sub class_source_list {
my @sources = ();
foreach my $cn_source (sort keys %$sources) {
my $source = $sources->{$cn_source};
push @sources,
{
push @sources, {
code => $source->{'cn_source'},
description => $source->{'description'},
used => $source->{'used'},
used => $source->{'used'},
sortrule => $source->{'class_sort_rule'}
}
};
}
$template->param(class_sources => \@sources);
}
@ -286,12 +281,11 @@ sub class_sort_rule_list {
my @sort_rules = ();
foreach my $sort_rule (sort keys %$sort_rules) {
my $sort_rule = $sort_rules->{$sort_rule};
push @sort_rules,
{
push @sort_rules, {
rule => $sort_rule->{'class_sort_rule'},
description => $sort_rule->{'description'},
sort_routine => $sort_rule->{'sort_routine'}
}
};
}
$template->param(class_sort_rules => \@sort_rules);
}

150
koha-tmpl/intranet-tmpl/prog/en/modules/admin/classsources.tmpl
View File

@ -1,26 +1,18 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
<title>Koha &rsaquo; Administration &rsaquo; Classification Sources
<!-- TMPL_IF name="class_source_form" -->
<!-- TMPL_IF name="edit_class_source" -->
&rsaquo; Modify classification source
<!-- TMPL_ELSE -->
&rsaquo; Add classification source
<!-- /TMPL_IF -->
&rsaquo;
<!-- TMPL_IF name="edit_class_source" -->Modify classification source<!-- TMPL_ELSE -->Add classification source<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
<!-- TMPL_IF name="sort_rule_form" -->
<!-- TMPL_IF name="edit_sort_rule" -->
&rsaquo; Modify filing rule
<!-- TMPL_ELSE -->
&rsaquo; Add filing rule
<!-- /TMPL_IF -->
&rsaquo;
<!-- TMPL_IF name="edit_sort_rule" -->Modify filing rule<!-- TMPL_ELSE -->Add filing rule<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
<!-- TMPL_IF name="delete_class_source_form" -->
&rsaquo; Confirm deletion of classification source <!-- TMPL_VAR name="class_source" -->
<!-- /TMPL_IF -->
<!-- TMPL_IF name="delete_sort_rule_form" -->
<!-- TMPL_ELSIF name="delete_sort_rule_form" -->
&rsaquo; Confirm deletion of filing rule <!-- TMPL_VAR name="sort_rule" -->
<!-- /TMPL_IF -->
<!-- TMPL_IF name="delete_sort_rule_impossible" -->
<!-- TMPL_ELSIF name="delete_sort_rule_impossible" -->
&rsaquo; Cannot delete filing rule <!-- TMPL_VAR name="sort_rule" -->
<!-- /TMPL_IF -->
</title>
@ -30,7 +22,6 @@
//<![CDATA[
function CheckSourceForm(f) {
var ok=1;
var _alertString="";
var alertString2;
if (f.class_source.value.length==0) {
@ -53,7 +44,6 @@ function CheckSourceForm(f) {
}
function CheckRuleForm(f) {
var ok=1;
var _alertString="";
var alertString2;
if (f.sort_rule.value.length==0) {
@ -75,6 +65,11 @@ function CheckRuleForm(f) {
}
}
$(document).ready(function() {
new YAHOO.widget.Button("newsource");
new YAHOO.widget.Button("newrule");
});
//]]>
</script>
</head>
@ -82,37 +77,29 @@ function CheckRuleForm(f) {
<!-- TMPL_INCLUDE NAME="header.inc" -->
<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF name="display_lists" -->Classification Sources<!-- TMPL_ELSE --><a href="/cgi-bin/koha/admin/classsources.pl">Classification Sources</a><!-- /TMPL_IF -->
<div id="breadcrumbs">
<a href="/cgi-bin/koha/mainpage.pl">Home</a>
&rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
&rsaquo; <a href="/cgi-bin/koha/admin/classsources.pl">Classification Sources</a>
<!-- TMPL_IF name="class_source_form" -->
<!-- TMPL_IF name="edit_class_source" -->
&rsaquo; Modify classification source
<!-- TMPL_ELSE -->
&rsaquo; Add classification source
<!-- /TMPL_IF -->
&rsaquo; <!-- TMPL_IF name="edit_class_source" -->Modify classification source<!-- TMPL_ELSE -->Add classification source<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
<!-- TMPL_IF name="sort_rule_form" -->
<!-- TMPL_IF name="edit_sort_rule" -->
&rsaquo; Modify filing rule
<!-- TMPL_ELSE -->
&rsaquo; Add filing rule
<!-- /TMPL_IF -->
&rsaquo; <!-- TMPL_IF name="edit_sort_rule" -->Modify filing rule<!-- TMPL_ELSE -->Add filing rule<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
<!-- TMPL_IF name="delete_class_source_form" -->
&rsaquo; Confirm deletion of classification source <span class="ex">'<!-- TMPL_VAR name="class_source" -->'</span>
<!-- /TMPL_IF -->
<!-- TMPL_IF name="delete_sort_rule_form" -->
&rsaquo; Confirm deletion of filing rule <span class="ex">'<!-- TMPL_VAR name="sort_rule" -->'</span>
<!-- /TMPL_IF -->
<!-- TMPL_IF name="delete_sort_rule_impossible" -->
&rsaquo; Cannot delete filing rule <span class="ex">'<!-- TMPL_VAR name="sort_rule" -->'</span>
<!-- TMPL_IF name="delete_class_source_form" -->
&rsaquo; Confirm deletion of classification source <span class="ex">'<!-- TMPL_VAR name="class_source" -->'</span>
<!-- TMPL_ELSIF name="delete_sort_rule_form" -->
&rsaquo; Confirm deletion of filing rule <span class="ex">'<!-- TMPL_VAR name="sort_rule" -->'</span>
<!-- TMPL_ELSIF name="delete_sort_rule_impossible" -->
&rsaquo; Cannot delete filing rule <span class="ex">'<!-- TMPL_VAR name="sort_rule" -->'</span>
<!-- /TMPL_IF -->
</div>
<div id="doc3" class="yui-t2">
<div id="bd">
<div id="bd">
<div id="yui-main">
<div class="yui-b">
<div class="yui-b">
<!-- TMPL_IF name="class_source_form" -->
<!-- TMPL_IF name="edit_class_source" -->
@ -156,13 +143,7 @@ function CheckRuleForm(f) {
</ol>
</fieldset>
<fieldset class="action">
<!-- TMPL_IF name="edit_class_source" -->
<input type="button" value="Save"
onclick="CheckSourceForm(this.form)" />
<!-- TMPL_ELSE -->
<input type="button" value="Save"
onclick="CheckSourceForm(this.form)" />
<!-- /TMPL_IF-->
<input type="button" value="Save" onclick="CheckSourceForm(this.form)" />
<a class="cancel" href="/cgi-bin/koha/admin/classsources.pl">Cancel</a>
</fieldset>
</form>
@ -205,64 +186,53 @@ function CheckRuleForm(f) {
</li>
</ol>
</fieldset>
<fieldset class="action">
<!-- TMPL_IF name="edit_sort_rule" -->
<input type="button" value="Save"
onclick="CheckRuleForm(this.form)" />
<!-- TMPL_ELSE -->
<input type="button" value="Save"
onclick="CheckRuleForm(this.form)" /> <!-- /TMPL_IF-->
<a class="cancel" href="/cgi-bin/koha/admin/classsources.pl">Cancel</a>
</fieldset>
<fieldset class="action">
<input type="button" value="Save" onclick="CheckRuleForm(this.form)" />
<a class="cancel" href="/cgi-bin/koha/admin/classsources.pl">Cancel</a>
</fieldset>
</form>
<!-- /TMPL_IF -->
<!-- TMPL_IF name="delete_class_source_form" -->
<div class="dialog alert"><h3>Confirm deletion of classification source <span class="ex">'<!-- TMPL_VAR name="class_source" -->'</span>?</h3>
<form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
<input type="hidden" name="op" value="<!-- TMPL_VAR name="confirm_op"-->" />
<input type="hidden" name="class_source" value="<!-- TMPL_VAR name="class_source" -->" />
<input type="submit" value="Delete classification source" class="approve" /></form>
<form action="<!-- TMPL_VAR name="script_name" -->" method="get"><input type="submit" value="No, Do Not Delete" class="deny" />
</form>
<form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
<input type="hidden" name="op" value="<!-- TMPL_VAR name="confirm_op"-->" />
<input type="hidden" name="class_source" value="<!-- TMPL_VAR name="class_source" -->" />
<input type="submit" value="Delete classification source" class="approve" />
</form>
<form action="<!-- TMPL_VAR name="script_name" -->" method="get">
<input type="submit" value="No, Do Not Delete" class="deny" />
</form>
</div>
<!-- /TMPL_IF -->
<!-- TMPL_IF name="delete_sort_rule_form" -->
<div class="dialog alert"><h3>Confirm deletion of filing rule <span class="ex">'<!-- TMPL_VAR name="sort_rule" -->'</span>?</h3>
<form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
<input type="hidden" name="op" value="<!-- TMPL_VAR name="confirm_op"-->" />
<input type="hidden" name="sort_rule" value="<!-- TMPL_VAR name="sort_rule" -->" />
<input type="submit" value="Delete filing rule" class="approve" />
</form>
<form action="<!-- TMPL_VAR name="script_name" -->" method="get"> <input type="submit" value="No, Do Not Delete" class="deny" /></form></div>
<form action="<!-- TMPL_VAR name="script_name" -->" name="Aform" method="post">
<input type="hidden" name="op" value="<!-- TMPL_VAR name="confirm_op"-->" />
<input type="hidden" name="sort_rule" value="<!-- TMPL_VAR name="sort_rule" -->" />
<input type="submit" value="Delete filing rule" class="approve" />
</form>
<form action="<!-- TMPL_VAR name="script_name" -->" method="get">
<input type="submit" value="No, Do Not Delete" class="deny" />
</form>
</div>
<!-- /TMPL_IF -->
<!-- TMPL_IF name="delete_sort_rule_impossible" -->
<div class="dialog message"><h3>Cannot delete filing rule <span class="ex">'<!-- TMPL_VAR name="sort_rule" -->'</span></h3>
<p>The filing rule <!-- TMPL_VAR name="sort_rule" --> is used by at least one classification source. Please
remove it from all classification source definitions before trying again.
</p>
<form action="<!-- TMPL_VAR name="script_name" -->" method="get">
<input type="button" value="OK" class="approve" /></form>
<p>The filing rule <!-- TMPL_VAR name="sort_rule" --> is used by at least one classification source. Please
remove it from all classification source definitions before trying again.
</p>
<form action="<!-- TMPL_VAR name="script_name" -->" method="get">
<input type="button" value="OK" class="approve" />
</form>
</div>
<!-- /TMPL_IF -->
<!-- TMPL_IF name="display_lists" -->
<div id="toolbar">
<script type="text/javascript">
//<![CDATA[
// prepare DOM for YUI Toolbar
$(document).ready(function() {
yuiToolbar();
});
// YUI Toolbar Functions
function yuiToolbar() {
new YAHOO.widget.Button("newsource");
new YAHOO.widget.Button("newrule");
} //]]>
</script>
<ul class="toolbar">
<li><a id="newsource" href="<!-- TMPL_VAR name="script_name" -->?op=add_source">New Classification Source</a></li>
<li><a id="newrule" href="<!-- TMPL_VAR name="script_name" -->?op=add_sort_rule">New Filing Rules</a></li>
@ -287,7 +257,11 @@ remove it from all classification source definitions before trying again.
<th>Actions</th>
</tr>
<!-- TMPL_LOOP name="class_sources" -->
<!-- TMPL_IF name="__odd__" -->
<tr>
<!-- TMPL_ELSE -->
<tr class="highlight">
<!-- /TMPL_IF -->
<td><!-- TMPL_VAR name="code" --></td>
<td><!-- TMPL_VAR name="description" --></td>
<td><!-- TMPL_IF name="used" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
@ -321,7 +295,11 @@ remove it from all classification source definitions before trying again.
<th>Actions</th>
</tr>
<!-- TMPL_LOOP name="class_sort_rules" -->
<!-- TMPL_IF name="__odd__" -->
<tr>
<!-- TMPL_ELSE -->
<tr class="highlight">
<!-- /TMPL_IF -->
<td><!-- TMPL_VAR name="rule" --></td>
<td><!-- TMPL_VAR name="description" --></td>
<td><!-- TMPL_VAR name="sort_routine" --></td>
@ -336,10 +314,10 @@ remove it from all classification source definitions before trying again.
<!-- /TMPL_IF -->
</div>
</div>
</div>
</div>
<div class="yui-b">
<!-- TMPL_INCLUDE NAME="admin-menu.inc" -->
</div>
</div>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->