From 4f14f7c7af13a7ee29c68302bad1ff8ac12c7fdf Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 11 Mar 2019 13:18:06 +0000
Subject: [PATCH] Bug 21307: (follow-up) QA fixes

This patch corrects a couple of issues discovered by QA: Removed markup
copy-and-paste error; Add some CSS to help the responsive behavior of
the advanced editor controls at smaller browser widths.

To test, apply the patch and open the advanced MARC editor. Test the
appearance of the page at various browser widths. At narrower widths the
status bar and search fields should behave well.

Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 koha-tmpl/intranet-tmpl/prog/css/cateditor.css   | 14 ++++++++++----
 .../prog/en/modules/cataloguing/additem.tt       | 16 +++++-----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/css/cateditor.css b/koha-tmpl/intranet-tmpl/prog/css/cateditor.css
index 989e8dde2a..c2c0e05531 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/cateditor.css
+++ b/koha-tmpl/intranet-tmpl/prog/css/cateditor.css
@@ -197,12 +197,9 @@ body {
 #statusbar {
     background-color: #F4F8F9;
     border: solid 2px #b9d8d9;
-    border-bottom-style: none;
-    border-radius: 6px 6px 0 0;
-    margin-bottom: -32px;
+    border-radius: 6px;
     overflow: auto;
     padding: 4px;
-    padding-bottom: 0;
 }
 
 #statusbar #status-tag-info, #statusbar #status-subfield-info {
@@ -456,3 +453,12 @@ body {
 .CodeMirror-gutter-wrapper {
     position: absolute;
 }
+
+/* Small devices (tablets, 768px and up) */
+@media (min-width: @screen-sm-min) {
+    #statusbar {
+        border-bottom-style: none;
+        border-radius: 6px 6px 0 0;
+        margin-bottom: -32px;
+    }
+}
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
index 2cd658be0a..4782d23977 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
@@ -248,18 +248,12 @@
 
 
     </form>
-                            </div> <!-- /.col-sm-10 -->
-                        </div> <!-- /.row -->
-                    </div> <!-- /div -->
+                            </div> <!-- /#cataloguing_additem_newitem -->
+                        </div> <!-- /.col-sm-10 -->
+                    </div> <!-- /.row -->
                 </div> <!-- /#cataloguing_additem_itemlist -->
             </main>
-        </div> <!-- /.col-sm-10.col-sm-push-2 -->
-
-        <div class="col-sm-2 col-sm-pull-10">
-            <aside>
-                [% INCLUDE 'admin-menu.inc' %]
-            </aside>
-        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
-     </div> <!-- /.row -->
+        </div> <!-- /.col-sm-12 -->
+    </div> <!-- /.row -->
 
 [% INCLUDE 'intranet-bottom.inc' %]
-- 
2.39.5