From a993bd3843fdfcf3a7f2df916299b32d4601b879 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Wed, 27 Mar 2019 17:36:35 +0000 Subject: [PATCH] Revert "Bug 22399: Improve responsive behavior of the basic marc editor" This reverts commit b5a742c62f016969dabad9b786a7fe2d75cca760. Style changes broke other features of rancor. Reverting to restore functionality Signed-off-by: Nick Clemens --- .../intranet-tmpl/prog/css/addbiblio.css | 48 ++++++++++++++++--- .../prog/en/modules/cataloguing/addbiblio.tt | 38 ++++++--------- 2 files changed, 56 insertions(+), 30 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/addbiblio.css b/koha-tmpl/intranet-tmpl/prog/css/addbiblio.css index 15169afdb4..03dd04bb8f 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/addbiblio.css +++ b/koha-tmpl/intranet-tmpl/prog/css/addbiblio.css @@ -40,21 +40,24 @@ a.expandfield { .tag { border-bottom: 2px solid #D5E6E9; + clear: both; padding: .7em 0; } -.tag .row { - margin-left: 0; - margin-right: 0; -} - div.subfield_line { padding-bottom: .3em; + float: left; + clear: left; + width: 100%; } div.subfield_line label { font-size:89%; + float: left; + padding-right : .4em; + width: 16em; text-align: left; + clear:left; } .subfieldcode img { @@ -83,12 +86,23 @@ a.tagnum { .subfield { color : #00698a; + float: left; + width: 10em; text-align:right; } +.subfieldcode { + display: block; + float: left; +} + +.labelsubfield { + float:left; +} + .input_marceditor { - float:left; - width: 70%; + float:left; + width:30em; } .indicator { @@ -249,9 +263,29 @@ tbody tr.active td { } @media (min-width: 768px) { + div.subfield_line label { + width: 20em; + } + .input_marceditor { + width: 50em; + } + + .subfield { + width: 14em; + } } @media (min-width: 1200px) { + div.subfield_line label { + width: 25em; + } + + .input_marceditor { + width: 60em; + } + .subfield { + width: 16em; + } } 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 fd133ba2c5..6b1a95ba01 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt @@ -422,9 +422,7 @@ function Changefwk() { [% INCLUDE 'select2.inc' %] @@ -632,9 +630,8 @@ function Changefwk() { [% END %] [% FOREACH innerloo IN BIG_LOO.innerloop %] [% IF ( innerloo.tag ) %] -
-
-
+
+
[% IF advancedMARCEditor %] [% innerloo.tag | html %] [% ELSE %] @@ -689,22 +686,18 @@ function Changefwk() { -
-
+
+ [% FOREACH subfield_loo IN innerloo.subfield_loop %] -
-
- [% UNLESS advasmedMARCEditor %] + [% UNLESS advancedMARCEditor %] [% IF ( subfield_loo.fixedfield ) %] [% END %] -
-
+ [% SET mv = subfield_loo.marc_value %] [% IF ( mv.type == 'text' ) %] [% IF ( mv.readonly == 1 ) %] - + [% ELSE %] - + [% END %] [% IF ( mv.authtype ) %] Tag editor [% END %] [% ELSIF ( mv.type == 'text_complex' ) %] - + [% IF mv.noclick %] @@ -751,7 +744,7 @@ function Changefwk() { [% mv.javascript | $raw %] [% ELSIF ( mv.type == 'hidden' ) %] - + [% ELSIF ( mv.type == 'textarea' ) %] [% ELSIF ( mv.type == 'select' ) %] @@ -776,13 +769,12 @@ function Changefwk() { [% END %] -
-
-
+ +
[% END %] -
+ [% END %] [% END %] -- 2.39.5