From 661e5cda16f2743ef146c3356e5086b8251b26e5 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 20 Feb 2013 08:38:20 -0500 Subject: [PATCH] [SIGNED-OFF] Bug 9672 - Replace YUI buttons on MARC editor page with Bootstrap This patch converts the buttons on the MARC editor page to Bootstrap, replacing YUI button and menu code with Bootstrap markup. Various workflows must be tested to confirm that functionality remains unchanged: - Edit existing record. Clicking the "save" button should redirect you to the default "view" page for that record. - Create a new record. Clicking the "save" button should redirect you to the add/edit items screen. - When creating or editing a record, test the dropdown menu attached to the "save" button. Each function should work correctly. - Test using a user who does not have "edit items" permission. There should be no menu attached to the "save" button. - Test using fast cataloging through circulation. A single save button should appear, redirecting to items. In all cases validation should proceed before saving. Leave a required field empty to test. Testers should also confirm that Z39.50 button works as expected and changing frameworks still works as usual. Signed-off-by: Bernardo Gonzalez Kriegel Comment: All workflows tested, with resticted and super user. All buttons worked as expected. No errors. --- koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css | 41 ++-- .../intranet-tmpl/prog/en/css/staff-global.css | 4 + .../prog/en/modules/cataloguing/addbiblio.tt | 202 ++++++++------------ 3 files changed, 114 insertions(+), 133 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css b/koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css index 79ceb48..7bab186 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css @@ -20,22 +20,6 @@ a.expandfield { text-decoration : none; } -#yui-cms-loading { - background : #FFFFFF; - color : #333333; - display : none; -} - -#yui-cms-loading #yui-cms-float { - text-align : center; - font-size : 175%; - background-image : url(../../img/loading.gif); - background-repeat : no-repeat; - background-position : top; - padding-top : 50px; -} - - #authoritytabs { margin-top : 1em; margin-bottom : 1em; @@ -155,6 +139,7 @@ a.tagnum { .floating { -webkit-box-shadow: 0px 3px 2px 0px rgba(0, 0, 0, .5); box-shadow: 0px 3px 2px 0px rgba(0, 0, 0, .5); + margin-top: 0; } tr.active td { @@ -163,4 +148,28 @@ tr.active td { tr.active.highlight td { background-color: #FEF4B4; +} + +#loading { + background-color: #FFF; + cursor: wait; + height: 100%; + left: 0; + opacity: .7; + position: fixed; + top: 0; + width: 100%; + z-index: 1000; +} +#loading div { + background : transparent url(../../img/loading.gif) top left no-repeat; + font-size : 175%; + font-weight: bold; + height: 2em; + left: 50%; + margin: -1em 0 0 -2.5em; + padding-left : 50px; + position: absolute; + top: 50%; + width: 15em; } \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css index e95c60f..46df574 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -2548,3 +2548,7 @@ a.disabled { .modal-header .closebtn{margin-top:2px;} .closebtn{float:right;font-size:20px;font-weight:bold;line-height:20px;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20);}.closebtn:hover{color:#000000;text-decoration:none;cursor:pointer;opacity:0.4;filter:alpha(opacity=40);} button.closebtn{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none;} +.btn-group label, +.btn-group select { + font-size: 13px; +} \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt index 415c65f..7e439bf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt @@ -1,12 +1,13 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Cataloging › [% IF ( biblionumber ) %]Editing [% title |html %] (Record number [% biblionumber %])[% ELSE %]Add MARC record[% END %] [% INCLUDE 'doc-head-close.inc' %] - - + +
+
Loading, please wait...
+
+ [% INCLUDE 'header.inc' %] @@ -317,108 +345,48 @@ function Changefwk(FwkList) { [% END %] - -
- - - -
    -
  • - [% UNLESS (circborrowernumber) %][%# Hide in fast cataloging %] -
  • -
  • - -
  • - [% END %] -
+ [% UNLESS (circborrowernumber) %][%# Hide in fast cataloging %] + +
+ + +
+ [% END %]
[% IF ( popup ) %] -- 1.7.9.5