Attachment 19812 Details for Bug 10516 – Bug 10516 - Improve titles, breadcrumbs, and confirmation messages for Z39.50 server adds and updates

[patch] Bug 10516 - Improve titles, breadcrumbs, and confirmation messages for Z39.50 server adds and updates

Bug-10516---Improve-titles-breadcrumbs-and-confirm.patch (text/plain), 4.56 KB, created by Liz Rea on 2013-07-19 21:19:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Liz Rea

Created: 2013-07-19 21:19:47 UTC

Size: 4.56 KB

patch

obsolete

>From c6731d00875a08aecfbcbc44ab98037d51b6b54f Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Fri, 28 Jun 2013 15:10:14 -0400
>Subject: [PATCH] Bug 10516 - Improve titles, breadcrumbs, and confirmation
> messages for Z39.50 server adds and updates
>
>The template for adding/editing Z39.50 servers shows the same title,
>breadcrumbs, etc. for add and edit operations. This patch creates
>separate text for each case.
>
>To test, try both adding and editing a Z39.50 server. The page title,
>breadcrumb, and heading should correctly reflect the operation you
>perform.
>
>Signed-off-by: Liz Rea <wizzyrea@gmail.com>
>---
> admin/z3950servers.pl                                    |  3 ++-
> .../intranet-tmpl/prog/en/modules/admin/z3950servers.tt  | 16 +++++++++++++---
> 2 files changed, 15 insertions(+), 4 deletions(-)
>
>diff --git a/admin/z3950servers.pl b/admin/z3950servers.pl
>index 92cc3e5..87711c1 100755
>--- a/admin/z3950servers.pl
>+++ b/admin/z3950servers.pl
>@@ -104,12 +104,12 @@ if ($op eq 'add_form') {
> ################## ADD_VALIDATE ##################################
> # called by add_form, used to insert/modify data in DB
> } elsif ($op eq 'add_validate') {
>-	$template->param(add_validate => 1);
> 	my $dbh=C4::Context->dbh;
> 	my $sth=$dbh->prepare("select * from z3950servers where name=?");
> 	$sth->execute($input->param('searchfield'));
> 	my $checked = $input->param('checked') ? 1 : 0;
> 	if ($sth->rows) {
>+        $template->param(confirm_update => 1);
> 		$sth=$dbh->prepare("update z3950servers set host=?, port=?, db=?, userid=?, password=?, name=?, checked=?, rank=?,syntax=?,encoding=?,timeout=? where name=?");
> 		$sth->execute($input->param('host'),
> 		      $input->param('port'),
>@@ -126,6 +126,7 @@ if ($op eq 'add_form') {
> 		      );
> 	} 
> 	else {
>+        $template->param(confirm_add => 1);
> 		$sth=$dbh->prepare(
> 		  "INSERT INTO z3950servers " .
> 		  "(host,port,db,userid,password,name,checked,rank,syntax,encoding,timeout) " .
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
>index 18f92fc..fa61123 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
>@@ -2,7 +2,8 @@
> <title>Koha &rsaquo; Administration &rsaquo; [% IF ( else ) %]Z39.50 servers[% END %]
> [% IF ( add_form ) %] Z39.50 servers &rsaquo; [% IF ( searchfield ) %]Modify Z39.50 server [% searchfield %][% ELSE %]New Z39.50 server[% END %][% END %]
> [% IF ( delete_confirm ) %]Z39.50 servers &rsaquo; Confirm deletion[% END %]
>-[% IF ( add_validate ) %]Z39.50 servers &rsaquo; Z39.50 server added[% END %]
>+[% IF ( confirm_add ) %] Z39.50 servers &rsaquo; Z39.50 server added[% END %]
>+[% IF ( confirm_update ) %] Z39.50 servers &rsaquo; Z39.50 server updated[% END %]
> [% IF ( delete_confirmed ) %]Z39.50 servers &rsaquo; Z39.50 server deleted[% END %]</title>
> [% INCLUDE 'doc-head-close.inc' %]
> [% IF ( else ) %]
>@@ -94,7 +95,9 @@
> <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; [% IF ( else ) %]Z39.50 servers[% END %]
> [% IF ( add_form ) %] <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 servers</a> &rsaquo; [% IF ( searchfield ) %]Modify Z39.50 server [% searchfield %][% ELSE %]New Z39.50 server[% END %][% END %]
> [% IF ( delete_confirm ) %] <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 servers</a> &rsaquo; Confirm deletion[% END %]
>-[% IF ( add_validate ) %] <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 servers</a> &rsaquo; Z39.50 server added[% END %]
>+[% IF ( confirm_add ) %] <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 servers</a> &rsaquo; Z39.50 server added[% END %]
>+[% IF ( confirm_update ) %] <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 servers</a> &rsaquo; Z39.50 server updated[% END %]
>+
> [% IF ( delete_confirmed ) %] <a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50 servers</a> &rsaquo; Z39.50 server deleted[% END %]</div>
> 
> <div id="doc3" class="yui-t2">
>@@ -244,13 +247,20 @@
>         </form>
> [% END %]
> 
>-[% IF ( add_validate ) %]
>+[% IF ( confirm_add ) %]
> <h3>Z39.50 server added</h3>
> <form action="[% script_name %]" method="post">
>         <input type="submit" value="OK" />
>         </form>
> [% END %]
> 
>+[% IF ( confirm_update ) %]
>+<h3>Z39.50 server updated</h3>
>+<form action="[% script_name %]" method="post">
>+        <input type="submit" value="OK" />
>+        </form>
>+[% END %]
>+
> [% IF ( delete_confirm ) %]
> 	[% reqsel %]
> <h3>Confirm deletion of server [% searchfield %]</h3>
>-- 
>1.8.1.2

Actions: View | Diff | Splinter Review

Attachments on bug 10516: 19807 | 19812 | 19832 | 19833 | 19842