From a71f7aefbb8cf1677236db58019053a4303f3161 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Fri, 3 Feb 2017 19:00:55 +0100 Subject: [PATCH 1/3] Bugfix: frio - the tabbar should be hidden if it is in the section element --- view/theme/frio/css/style.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 74eb25d08b..7f74ed55f6 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -1719,6 +1719,12 @@ img.acpopup-img { } /* Menubar Tabs */ +section > ul.tabbar { +/* The tabbar shouldn't' be visibile inside +the section element. Only after we have +moved it to the nav through js */ + display: none !important; +} #tabmenu, .tabbar, .tabbar > li { From c12850250d5794c648ffefa01df413281c62b8b6 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Fri, 3 Feb 2017 19:18:10 +0100 Subject: [PATCH 2/3] Bugfix: frio - move tabs to the top of the contacts-template --- view/theme/frio/templates/contacts-template.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/view/theme/frio/templates/contacts-template.tpl b/view/theme/frio/templates/contacts-template.tpl index 9a5109e871..d51298038b 100644 --- a/view/theme/frio/templates/contacts-template.tpl +++ b/view/theme/frio/templates/contacts-template.tpl @@ -1,8 +1,8 @@ +{{$tabs}} +
- {{$tabs}} - {{* The page heading with it's contacts counter *}}

{{$header}} {{if $total}} ({{$total}}) {{/if}}

From 7f1acdb8e9204f6e899ebab60d7a401f9a09da04 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Fri, 3 Feb 2017 19:37:47 +0100 Subject: [PATCH 3/3] frio - append tabbar to nav only if it's a direct child of section --- view/theme/frio/js/theme.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/view/theme/frio/js/theme.js b/view/theme/frio/js/theme.js index 51e390b34c..c149271804 100644 --- a/view/theme/frio/js/theme.js +++ b/view/theme/frio/js/theme.js @@ -40,9 +40,7 @@ $(document).ready(function(){ $(".field.select > select, .field.custom > select").addClass("form-control"); // move the tabbar to the second nav bar - if( $("ul.tabbar").length ) { - $("ul.tabbar").appendTo("#topbar-second > .container > #tabmenu"); - } + $("section ul.tabbar").first().appendTo("#topbar-second > .container > #tabmenu"); // add mask css url to the logo-img container //