[Xfce4-commits] [www/bugzilla.xfce.org] 01/01: Move navigation outside the main area so it can be positioned correctly.

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

k   n   o   m   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository www/bugzilla.xfce.org.

commit b76bcfabbd8a55aebdfa5731330547105d305cb6
Author: Pasi Lallinaho <pasi at shimmerproject.org>
Date:   Mon Jul 24 13:55:23 2017 +0300

    Move navigation outside the main area so it can be positioned correctly.
---
 template/en/custom/bug/navigate_XFCE.html.tmpl  | 2 +-
 template/en/custom/bug/show_XFCE.html.tmpl      | 4 ++--
 template/en/custom/global/header_XFCE.html.tmpl | 9 ++++++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/template/en/custom/bug/navigate_XFCE.html.tmpl b/template/en/custom/bug/navigate_XFCE.html.tmpl
index dbf2145..f59e216 100644
--- a/template/en/custom/bug/navigate_XFCE.html.tmpl
+++ b/template/en/custom/bug/navigate_XFCE.html.tmpl
@@ -10,7 +10,7 @@
 
 [% SET my_search = user.recent_search_for(bug) %]
 
-<div class="navigation">
+<div class="navigation group">
   [% IF my_search %]
     <div class="nav_left">
       [% SET last_bug_list = my_search.bug_list %]
diff --git a/template/en/custom/bug/show_XFCE.html.tmpl b/template/en/custom/bug/show_XFCE.html.tmpl
index be30805..6c18811 100644
--- a/template/en/custom/bug/show_XFCE.html.tmpl
+++ b/template/en/custom/bug/show_XFCE.html.tmpl
@@ -14,6 +14,8 @@
   [% PROCESS global/header.html.tmpl %]
 [% END %]
 
+[%# PROCESS bug/navigate.html.tmpl %]
+
 [% IF nextbug %]
   <hr>
   <p>
@@ -23,8 +25,6 @@
   <hr>
 [% END %]
 
-[% PROCESS bug/navigate.html.tmpl %]
-
 [% PROCESS bug/edit.html.tmpl %]
 
 [% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/custom/global/header_XFCE.html.tmpl b/template/en/custom/global/header_XFCE.html.tmpl
index a0388fa..a5aae80 100644
--- a/template/en/custom/global/header_XFCE.html.tmpl
+++ b/template/en/custom/global/header_XFCE.html.tmpl
@@ -95,6 +95,8 @@
 
     [% SET yui = yui_resolve_deps(yui, yui_deps) %]
 
+    [%# TODO: Do not include the main CSS files; they only make us do overrides with !important %]
+    [%# We are still however depending on some of the declarations there so it's not trivial to drop this dependency %]
     [% SET css_sets = css_files(style_urls, yui, yui_css) %]
     [% IF constants.CONCATENATE_ASSETS %]
       [% PROCESS format_css_link asset_url = css_sets.unified_standard_skin %]
@@ -133,9 +135,6 @@
       [% PROCESS format_js_link %]
     [% END %]
 
-    <link rel="stylesheet" media="screen" type="text/css" href="/skins/header.css" />
-    <link rel="stylesheet" media="screen" type="text/css" href="/skins/xfce.css" />
-
     <link rel="stylesheet" media="screen" type="text/css" href="https://xfce.org/style/css.php?site=bugzilla" />
 
     <script type="text/javascript" src="/skins/contrib/Xfce/scripts.js"></script>
@@ -234,6 +233,7 @@
 
   <div id="header-wrap">
     <div id="header">
+<!--
       <div id="titles">
         <span id="title">Xfce [% terms.Bugzilla %][% " – $header" IF header %]</span>
 
@@ -245,6 +245,7 @@
           <span id="information" class="header_addl_info">[% header_addl_info %]</span>
         [% END %]
       </div>
+-->
 
       [% USE Bugzilla %]
       [% IF Bugzilla.languages.size > 1 %]
@@ -271,6 +272,8 @@
     </div>
   </div>
 
+  [% PROCESS bug/navigate.html.tmpl %]
+
   <div id="bugzilla-body">
     [% IF Param('announcehtml') %]
       [% Param('announcehtml') FILTER none %]

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.