Update patches and copyright index and base

Debian · Jun 16, 2016 · 0519e76 · 0519e76
1 parent 8dbbd4b
commit 0519e76
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 38 deletions.
diff --git a/debsources/app/copyright/templates/copyright/base.html b/debsources/app/copyright/templates/copyright/base.html
@@ -10,10 +10,8 @@
 {% endblock %}
 
 {% block nav %}
-  <ul>
-    <li><a href="{{ url_for('copyright.index') }}">Home</a></li>
-    <li><a href="{{ url_for('copyright.doc') }}">Documentation</a></li>
-    {#<li><a href="{{ url_for('copyright.stats') }}">Stats</a></li>#}
-    <li><a href="{{ url_for('copyright.about') }}">About</a></li>
-  </ul>
+{{ macros.render_navbar({
+  'Home': 'copyright.index',
+  'Documentation': 'copyright.doc',
+  'About': 'copyright.about'}) }}
 {% endblock %}
diff --git a/debsources/app/copyright/templates/copyright/index.html b/debsources/app/copyright/templates/copyright/index.html
@@ -62,7 +62,7 @@ <h3 class="hidden-xs">
 {# show the background debian image #}
 {% block bg_wrapper %}
   {{ super() }}
-  <p style="display: none;" id="bg-url"
+  <p id="bg-url"
      data-url="{{ url_for('static', filename='img/debsources.png') }}">
   </p>
 {% endblock %}
diff --git a/debsources/app/patches/templates/patches/base.html b/debsources/app/patches/templates/patches/base.html
@@ -10,10 +10,8 @@
 {% endblock %}
 
 {% block nav %}
-  <ul>
-    <li><a href="{{ url_for('patches.index') }}">Home</a></li>
-    <li><a href="{{ url_for('patches.doc') }}">Documentation</a></li>
-    {#<li><a href="{{ url_for('patches.stats') }}">Stats</a></li>#}
-    <li><a href="{{ url_for('patches.about') }}">About</a></li>
-  </ul>
+{{ macros.render_navbar({
+  'Home': 'patches.index',
+  'Documentation': 'patches.doc',
+  'About': 'patches.about'}) }}
 {% endblock %}
diff --git a/debsources/app/patches/templates/patches/index.html b/debsources/app/patches/templates/patches/index.html
@@ -15,30 +15,39 @@
 
 <div id="indexmenu">
 
-<h1 class="h1mainpage">{{ self.title() }}</h1>
-<h3><em>All Debian patch are belong to us</em> &emsp;
-  <small>&mdash; Anonymous</small>
-  <sup><a href="https://en.wikipedia.org/wiki/All_your_base_are_belong_to_us"><span style="font-family: monospace; color: black;">[^]</span></a></sup>
-</h3>
-<p>Browse through the patches applied in
-  <a href="https://www.debian.org">Debian</a> packages.
-  <a href="{{ url_for('doc.doc_overview') }}">Read more…</a></p>
-<table>
-  <tr>
-    <td id="browse">
+  <div class="row">
+    <h1 class="h1mainpage">{{ self.title() }}</h1>
+    <h3 class="hidden-xs">
+      <em>All Debian patch are belong to us</em> &emsp;
+      <small>&mdash; Anonymous</small>
+      <sup>
+        <a href="https://en.wikipedia.org/wiki/All_your_base_are_belong_to_us">
+          <span style="font-family: monospace; color: black;">[^]</span>
+        </a>
+      </sup>
+    </h3>
+
+    <div class="col-xs-2"></div>
+    <div class="col-xs-8"></div>
+      <p>Browse through the patches applied in
+      <a href="https://www.debian.org">Debian</a> packages.
+      <a href="{{ url_for('doc.doc_overview') }}">Read more…</a></p>
+    </div>
+  </div>
+  <div id="sources-nav" class="row">
+    <div class="col-xs-12 col-sm-6" id="browse">
       <p><strong>Browse</strong> by prefix</p>
       <p>{{ macros.render_packages_prefixes(packages_prefixes, request) }}</p>
-    </td>
-    <td id="search">
+    </div>
+    <div class="col-xs-12 col-sm-6" id="search">
       <p><strong>Search</strong></p>
       <ul style="list-style-type: none">
-  <li>by <em>package name</em>:<br />
-	  {{ macros.searchform(searchform, request, value=query, display="inline", size="25", autofocus=True, id="query-2") }}
-	</li>
+        <li>by <em>package name</em>:<br />
+	      {{ macros.searchform(searchform, request, value=query, display="inline", size="25", autofocus=True, id="query-2") }}
+	    </li>
       </ul>
-    </td>
-  </tr>
-</table>
+    </div>
+  </div>
 
 </div>
 
@@ -48,8 +57,7 @@ <h3><em>All Debian patch are belong to us</em> &emsp;
 
 {# show the background debian image #}
 {% block bg_wrapper %}
-<div id="bg-wrapper" style="background-image: url('{{ url_for('static', filename='img/debsources.png') }}');">
-  <div id="content">{{ self.content() }}</div>
-  <footer id="footer">{{ self.footer() }}</footer>
-</div>
+  {{ super() }}
+  <p id="bg-url" data-url="{{ url_for('static', filename='img/debsources.png') }}">
+  </p>
 {% endblock %}
diff --git a/debsources/app/sources/templates/sources/index.html b/debsources/app/sources/templates/sources/index.html
@@ -71,7 +71,7 @@ <h3 class="hidden-xs">
 {% block bg_wrapper %}
   {{ super() }}
 
-  <p style="display: none;" id="bg-url"
+  <p id="bg-url"
      data-url="{{ url_for('static', filename='img/debsources.png') }}">
   </p>
 {% endblock %}
diff --git a/debsources/app/static/css/base.css b/debsources/app/static/css/base.css
@@ -238,4 +238,7 @@ hr.doc{
     margin-bottom: 0;
 }
 
-#sources-nav
+#bg-url {
+    display: none;
+}
+