introduce structure

2 files changed, 11 insertions, 6 deletions

diff --git a/common/header.j2.inc b/common/header.j2.inc
index 3e7a7274..c7cd0e5d 100644
--- a/common/header.j2.inc
+++ b/common/header.j2.inc
@@ -38,11 +38,11 @@
     <!-- Bootstrap core CSS -->
     <link href="{{ url('dist/css/bootstrap.min.css') }}" rel="stylesheet">
     <!-- Custom styles for this template -->
-    <link href="{{ url('styles.css') }}" rel="stylesheet">
+    <link href="{{ url('static/styles.css') }}" rel="stylesheet">
 
     <script src="{{ url('dist/js/jquery-1.11.1.min.js') }}"></script>
     <script src="{{ url('dist/js/bootstrap.min.js') }}"></script>
-    <link href="{{ url('navbar.css') }}" rel="stylesheet">
+    <link href="{{ url('static/navbar.css') }}" rel="stylesheet">
 
     <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
@@ -50,4 +50,9 @@
       <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
     <![endif]-->
     <!-- font awesome, for team page -->
-    <link href="{{ url('dist/font-awesome/css/all.css') }}" rel="stylesheet">
\ No newline at end of file
+    <link href="{{ url('dist/font-awesome/css/all.css') }}" rel="stylesheet">
+
+    <!-- rss and atom, WIP
+    <link rel="alternate" type="application/rss+xml" href="{{ url('feed.rss') }} title="RSS feed for gnunet.org">
+    <link rel="alternate" type="application/atom+xml" href="{{ url('feed.atom') }} title="Atom feed for gnunet.org">
+    -->
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index fe496667..a109714a 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -13,8 +13,8 @@
          TODO: imo this is bad in the navbar. a readable "gnunet" font-logo would
          be better for orientation.
       -->
-    <img src="../images/gnunet-icon.png" alt="" />
-    <!-- <img width="70%" height="70%" src="../images/gnunet-logo-dark-only-text.svg" alt="" /> -->
+    <img src="{{ url('static/images/gnunet-icon.png') }}" alt="" />
+    <!-- <img width="70%" height="70%" src="../static/images/gnunet-logo-dark-only-text.svg" alt="" /> -->
   </a>
   <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarMain" aria-controls="navbarMain" aria-expanded="false" aria-label="Toggle navigation">
     <span class="navbar-toggler-icon"></span>
@@ -55,7 +55,7 @@
     <ul class="navbar-nav navbar-right">
       <li class="nav-item dropdown">
         <!--<button class="btn btn-dark dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-          <img src="{{ url('images/languageicon.svg') }}" height="15" alt="[{{lang}}]" /> {{ lang_full }} [{{ lang }}] 
+          <img src="{{ url('static/images/languageicon.svg') }}" height="15" alt="[{{lang}}]" /> {{ lang_full }} [{{ lang }}] 
         </button> -->
         <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ lang_full }} [{{ lang }}]</a>
         <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarMain">