From 1c4e41939e00ba0f1d2579b22d46d865c1bf3a73 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 18 Apr 2008 15:04:31 -0500 Subject: [PATCH] Fix for Bug 2015 ("subscription-renew button is disabled"), other markup corrections; Removing unused popup css declaration from doc-head-close; removing unused popup include file. Signed-off-by: Joshua Ferraro --- .../prog/en/includes/doc-head-close.inc | 1 - .../prog/en/includes/popup-top.inc | 13 ------ .../prog/en/includes/serials-toolbar.inc | 42 +++++++++++++++---- .../en/modules/serials/subscription-add.tmpl | 5 ++- .../modules/serials/subscription-detail.tmpl | 2 +- .../modules/serials/subscription-renew.tmpl | 30 +++++++------ 6 files changed, 55 insertions(+), 38 deletions(-) delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/popup-top.inc diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc index f7d6dc8fc4..9ed1a6d557 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc @@ -35,7 +35,6 @@ -/css/intranet2popup.css" /> /css/login.css" /> /css/wizard.css" /> diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/popup-top.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/popup-top.inc deleted file mode 100644 index 6a5c8643c9..0000000000 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/popup-top.inc +++ /dev/null @@ -1,13 +0,0 @@ - - - -Popup - - -/css/staff.css" /> - - - - - diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc index e79c518df4..cb0ae5ecf9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc @@ -4,6 +4,10 @@ // prepare DOM for YUI Toolbar $(document).ready(function() { + $("#editmenuc").empty(); + $("#duplicate").parent().remove(); + $("#delete").parent().remove(); + $("#renewc").empty(); yuiToolbar(); }); @@ -11,13 +15,35 @@ function yuiToolbar() { + + var editmenu = [ + { text: _("Edit Record"), disabled: true, url: "/cgi-bin/koha/serials/subscription-add.pl?op=mod&subscriptionid=" }, + { text: _("Edit as New (Duplicate)"), disabled: true, url: "/cgi-bin/koha/serials/subscription-add.pl?op=dup&subscriptionid=" }, + { text: _("Delete Record"), disabled: true, onclick: {fn: confirm_deletion }} + ]; + new YAHOO.widget.Button("newsubscription"); - - new YAHOO.widget.Button("edit"); - new YAHOO.widget.Button("duplicate"); + + new YAHOO.widget.Button({ + id: "renew", + type: "link", + href: "#", + label: _("Renew"), + container: "renewc", +onclick: {fn:function(){popup()}} + }); + + new YAHOO.widget.Button({ + type: "menu", + label: _("Edit"), + name: "editmenubutton", + menu: editmenu, + container: "editmenuc", + + }); + new YAHOO.widget.Button("renew"); new YAHOO.widget.Button("receive"); - new YAHOO.widget.Button("delete"); } @@ -27,12 +53,12 @@

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl index 8c080c3c08..5cb7fb5481 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl @@ -853,7 +853,7 @@ window.onload = irregular_order();

Library - @@ -1178,7 +1178,8 @@ window.onload = irregular_order(); - +

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl index df83ea7376..ebbb4fdf5d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl @@ -86,7 +86,7 @@ function confirm_deletion() { } } function popup(subscriptionid) { - newin=window.open("subscription-renew.pl?mode=popup&subscriptionid="+subscriptionid,'popup','width=500,height=400,toolbar=false,scrollbars=yes'); + newin=window.open("subscription-renew.pl?mode=popup&subscriptionid="+subscriptionid,'popup','width=590,height=440,toolbar=false,scrollbars=yes'); } --> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tmpl index 1155e15e6f..faa6e04dfb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tmpl @@ -1,9 +1,13 @@ Koha › Serials Subscription renew # + +

Subscription renewed. @@ -14,23 +18,23 @@ //]]> - -

Subscription renewal for

- +

- + -- 2.39.5