From 5b7db9398abaacea241d9fcce7885457c562d7fa Mon Sep 17 00:00:00 2001
From: François Schmidts <francois.schmidts@gmail.com>
Date: Sun, 11 Oct 2015 12:18:07 +0200
Subject: a bit of cleaning, putting code where it belongs

---
 src/web/templates/layout.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/web/templates/layout.html')

diff --git a/src/web/templates/layout.html b/src/web/templates/layout.html
index 15cf3e97..cf2498e2 100644
--- a/src/web/templates/layout.html
+++ b/src/web/templates/layout.html
@@ -71,8 +71,8 @@
                         <li><a href="{{ url_for("feeds.update", action="read", nb_days="5") }}">{{ gettext('Mark all as read older than %(days)s days', days=5) }}</a></li>
                         <li><a href="{{ url_for("feeds.update", action="read", nb_days="10") }}">{{ gettext('Mark all as read older than %(days)s days', days=10) }}</a></li>
                         <li role="presentation" class="divider"></li>
-                        <li><a href="{{ url_for("inactives") }}">{{ _('Inactive') }}</a></li>
-                        <li><a href="{{ url_for("history") }}">{{ _('History') }}</a></li>
+                        <li><a href="{{ url_for("feeds.inactives") }}">{{ _('Inactive') }}</a></li>
+                        <li><a href="{{ url_for("articles.history") }}">{{ _('History') }}</a></li>
                         <li><a href="{{ url_for("feeds.feeds") }}">{{ _('All') }}</a></li>
                     </ul>
                 </li>
-- 
cgit 


From 5f66e6465d3822b150898de2a7fb8df39ed7fdc6 Mon Sep 17 00:00:00 2001
From: François Schmidts <francois.schmidts@gmail.com>
Date: Sun, 11 Oct 2015 23:34:33 +0200
Subject: removing misplaced stuffs from views, more controllers use

---
 src/web/templates/layout.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/web/templates/layout.html')

diff --git a/src/web/templates/layout.html b/src/web/templates/layout.html
index cf2498e2..eb213ca5 100644
--- a/src/web/templates/layout.html
+++ b/src/web/templates/layout.html
@@ -81,12 +81,12 @@
                         <div><span class="glyphicon glyphicon-user"></span>&nbsp;<b class="caret"></b></div>
                     </a>
                     <ul class="dropdown-menu">
-                        <li><a href="{{ url_for("profile") }}"><span class="glyphicon glyphicon-user"></span> {{ _('Profile') }}</a></li>
-                        <li><a href="{{ url_for("management") }}"><span class="glyphicon glyphicon-cog"></span> {{ _('Your data') }}</a></li>
+                        <li><a href="{{ url_for("user.profile") }}"><span class="glyphicon glyphicon-user"></span> {{ _('Profile') }}</a></li>
+                        <li><a href="{{ url_for("user.management") }}"><span class="glyphicon glyphicon-cog"></span> {{ _('Your data') }}</a></li>
                         <li><a href="{{ url_for("about") }}"><span class="glyphicon glyphicon-question-sign"></span> {{ _('About') }}</a></li>
                         {% if g.user.is_admin() %}
                         <li role="presentation" class="divider"></li>
-                        <li><a href="{{ url_for("dashboard") }}"><span class="glyphicon glyphicon-dashboard"></span> {{ _('Dashboard') }}</a></li>
+                        <li><a href="{{ url_for("admin.dashboard") }}"><span class="glyphicon glyphicon-dashboard"></span> {{ _('Dashboard') }}</a></li>
                         <li role="presentation" class="divider"></li>
                         {% endif %}
                         <li><a href="{{ url_for("logout") }}"><span class="glyphicon glyphicon-log-out"></span> {{ _('Logout') }}</a></li>
-- 
cgit 


From 2c0e17cb977a1e8782799b337df8b1583d019906 Mon Sep 17 00:00:00 2001
From: François Schmidts <francois.schmidts@gmail.com>
Date: Mon, 12 Oct 2015 22:36:01 +0200
Subject: bootstraping react

---
 src/web/templates/layout.html | 53 +++++++++++++++----------------------------
 1 file changed, 18 insertions(+), 35 deletions(-)

(limited to 'src/web/templates/layout.html')

diff --git a/src/web/templates/layout.html b/src/web/templates/layout.html
index eb213ca5..db5b6589 100644
--- a/src/web/templates/layout.html
+++ b/src/web/templates/layout.html
@@ -7,12 +7,12 @@
     <meta name="description" content="JARR is a web-based news aggregator." />
     <meta name="author" content="" />
     <title>JARR{% if head_titles %} - {{ ' - '.join(head_titles) }}{% endif %}</title>
-    <link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.png') }}" />
+    <link rel="shortcut icon" href="{{ url_for("static", filename="img/favicon.png") }}" />
     <!-- Bootstrap core CSS -->
-    <link href="{{ url_for('static', filename='css/bootstrap.css') }}" rel="stylesheet" media="screen" />
+    <link href="{{ url_for("static", filename="css/bootstrap.min.css") }}" rel="stylesheet" media="screen" />
     <!-- Add custom CSS here -->
-    <link href="{{ url_for('static', filename='css/customized-bootstrap.css') }}" rel="stylesheet" media="screen" />
-    <link href="{{ url_for('static', filename='css/side-nav.css') }}" rel="stylesheet" media="screen" />
+    <link href="{{ url_for("static", filename="css/customized-bootstrap.css") }}" rel="stylesheet" media="screen" />
+    <link href="{{ url_for("static", filename="css/side-nav.css") }}" rel="stylesheet" media="screen" />
   {% endblock %}
   </head>
   <body>
@@ -125,42 +125,25 @@
     <br />
 
     <div class="container not-at-home">
-        {% block messages %}
-            {% with messages = get_flashed_messages(with_categories=true) %}
-                {% if messages %}
-                    {% for category, message in messages %}
-                        <div class="alert alert-{{category}}">
-                            <button type="button" class="close" data-dismiss="alert">&times;</button>
-                            {{ message }}
-                        </div>
-                    {% endfor %}
-                {% endif %}
-            {% endwith %}
-        {% endblock %}
+    {% block messages %}
+        {% with messages = get_flashed_messages(with_categories=true) %}
+            {% if messages %}
+                {% for category, message in messages %}
+                    <div class="alert alert-{{category}}">
+                        <button type="button" class="close" data-dismiss="alert">&times;</button>
+                        {{ message }}
+                    </div>
+                {% endfor %}
+            {% endif %}
+        {% endwith %}
+    {% endblock %}
     </div>
 
     {% block content %}{% endblock %}
 
     <!-- Bootstrap core JavaScript -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script type="text/javascript" src="{{ url_for('static', filename = 'js/jquery.js') }}"></script>
-    <script type="text/javascript" src="{{ url_for('static', filename = 'js/bootstrap.js') }}"></script>
-    <script type="text/javascript" src="{{ url_for('static', filename = 'js/articles.js') }}"></script>
-    <script type="text/javascript" src="{{ url_for('static', filename = 'js/feed.js') }}"></script>
-    <script type="text/javascript" class="source">
-        var filter_ = {% if filter_ %}"{{ filter_ }}"{% else %}undefined{% endif %};
-        if (filter_ == undefined) {
-            if (window.location.href.indexOf("filter_=all") > -1){
-                filter_ = 'all';
-            }
-            else if (window.location.href.indexOf("filter_=unread") > -1) {
-                filter_ = 'unread';
-            }
-            else if (window.location.href.indexOf("filter_=read") > -1) {
-                filter_ = 'read';
-            }
-        }
-        $("#tab-" + filter_).attr('class', "active");
-    </script>
+    <script type="text/javascript" src="{{ url_for("static", filename="js/jquery.js") }}"></script>
+    <script type="text/javascript" src="{{ url_for("static", filename="js/bootstrap.min.js") }}"></script>
   </body>
 </html>
-- 
cgit 


From 41aea41aaff0886fd6c211f03db2b54863a97165 Mon Sep 17 00:00:00 2001
From: François Schmidts <francois.schmidts@gmail.com>
Date: Thu, 21 Jan 2016 13:48:06 +0100
Subject: filters are working !

---
 src/web/templates/layout.html | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'src/web/templates/layout.html')

diff --git a/src/web/templates/layout.html b/src/web/templates/layout.html
index db5b6589..0b2f371d 100644
--- a/src/web/templates/layout.html
+++ b/src/web/templates/layout.html
@@ -140,10 +140,5 @@
     </div>
 
     {% block content %}{% endblock %}
-
-    <!-- Bootstrap core JavaScript -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script type="text/javascript" src="{{ url_for("static", filename="js/jquery.js") }}"></script>
-    <script type="text/javascript" src="{{ url_for("static", filename="js/bootstrap.min.js") }}"></script>
   </body>
 </html>
-- 
cgit 


From c542f58b99e0bd625f52e1ac9c3d2ad7d9ee4bd5 Mon Sep 17 00:00:00 2001
From: François Schmidts <francois.schmidts@gmail.com>
Date: Fri, 22 Jan 2016 17:26:56 +0100
Subject: adding basic bootstrap

---
 src/web/templates/layout.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/web/templates/layout.html')

diff --git a/src/web/templates/layout.html b/src/web/templates/layout.html
index 0b2f371d..02eb3473 100644
--- a/src/web/templates/layout.html
+++ b/src/web/templates/layout.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
   <head>
     {% block head %}
     <meta charset="utf-8">
-- 
cgit 


From 228006ea5de5a9f9a60a4f5176620428e551c55b Mon Sep 17 00:00:00 2001
From: François Schmidts <francois.schmidts@gmail.com>
Date: Tue, 26 Jan 2016 18:22:39 +0100
Subject: ressucitating old js

---
 src/web/templates/layout.html | 50 +++++++++++++++++++------------------------
 1 file changed, 22 insertions(+), 28 deletions(-)

(limited to 'src/web/templates/layout.html')

diff --git a/src/web/templates/layout.html b/src/web/templates/layout.html
index 02eb3473..4b9f1a4c 100644
--- a/src/web/templates/layout.html
+++ b/src/web/templates/layout.html
@@ -55,11 +55,6 @@
                         </li>
                     </ul>
                 </li>
-                {% if page_to_render == "favorites" %}
-                <li><a href="{{ url_for("home") }}"><span class="glyphicon glyphicon-home"></span> {{ _('Home') }}</a></li>
-                {% else %}
-                <li><a href="{{ url_for("favorites") }}"><span class="glyphicon glyphicon-star"></span> {{ _('Favorites') }}</a></li>
-                {% endif %}
                 {% if conf.CRAWLING_METHOD == "classic" and (not conf.ON_HEROKU or g.user.is_admin()) %}
                 <li><a href="/fetch"><span class="glyphicon glyphicon-import"></span> {{ _('Fetch') }}</a></li>
                 {% endif %}
@@ -92,29 +87,6 @@
                         <li><a href="{{ url_for("logout") }}"><span class="glyphicon glyphicon-log-out"></span> {{ _('Logout') }}</a></li>
                     </ul>
                 </li>
-
-                <li class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                        <div><span class="glyphicon glyphicon-search"></span>&nbsp;<b class="caret"></b></div>
-                    </a>
-                    <ul class="dropdown-menu">
-                        <li>
-                            <form class="navbar-form" method=get action="{{ url_for("search") }}" role="search">
-                                <div class="input-group">
-                                    {% if filter_ %}<input type="hidden" name="filter_" value="{{ filter_ }}" />{% endif %}
-                                    {% if limit %}<input type="hidden" name="limit" value="{{ limit }}" />{% endif %}
-                                    {% if feed_id %}<input type="hidden" name="feed_id" value="{{ feed_id }}" />{% endif %}
-                                    <label for="search_title">{{ _("Title") }}</label>
-                                    <input type="checkbox" name="search_title" {% if search_title == 'on' or not (search_title == 'on' or search_content == 'on') %}checked{%endif%}/>
-                                    <br />
-                                    <label for="search_content">{{ _("Content") }}</label>
-                                    <input type="checkbox" name="search_content" {% if search_content == 'on' %}checked{%endif%}/>
-                                    <input type="text" class="form-control" name="query" placeholder="{{ _("Search") }}" {% if search_query %} value="{{ search_query }}"{% endif %} />
-                                </div>
-                            </form>
-                        </li>
-                    </ul>
-                </li>
             {% else %}
                 <li><a href="{{ url_for("about") }}"><span class="glyphicon glyphicon-question-sign"></span>&nbsp;{{ _('About') }}</a></li>
             {% endif %}
@@ -140,5 +112,27 @@
     </div>
 
     {% block content %}{% endblock %}
+
+    <!-- Bootstrap core JavaScript -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <script type="text/javascript" src="{{ url_for('static', filename = 'js/jquery.js') }}"></script>
+    <script type="text/javascript" src="{{ url_for('static', filename = 'js/bootstrap.js') }}"></script>
+    <script type="text/javascript" src="{{ url_for('static', filename = 'js/articles.js') }}"></script>
+    <script type="text/javascript" src="{{ url_for('static', filename = 'js/feed.js') }}"></script>
+    <script type="text/javascript" class="source">
+        var filter_ = {% if filter_ %}"{{ filter_ }}"{% else %}undefined{% endif %};
+        if (filter_ == undefined) {
+            if (window.location.href.indexOf("filter_=all") > -1){
+                filter_ = 'all';
+            }
+            else if (window.location.href.indexOf("filter_=unread") > -1) {
+                filter_ = 'unread';
+            }
+            else if (window.location.href.indexOf("filter_=read") > -1) {
+                filter_ = 'read';
+            }
+        }
+        $("#tab-" + filter_).attr('class', "active");
+    </script>
   </body>
 </html>
-- 
cgit 


From c3d6c25e52e37d772286f293f94a5dd7e1059529 Mon Sep 17 00:00:00 2001
From: François Schmidts <francois.schmidts@gmail.com>
Date: Wed, 27 Jan 2016 17:14:23 +0100
Subject: redoing UI and finishing up sidebar

---
 src/web/templates/layout.html | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/web/templates/layout.html')

diff --git a/src/web/templates/layout.html b/src/web/templates/layout.html
index 4b9f1a4c..ac943d54 100644
--- a/src/web/templates/layout.html
+++ b/src/web/templates/layout.html
@@ -12,7 +12,6 @@
     <link href="{{ url_for("static", filename="css/bootstrap.min.css") }}" rel="stylesheet" media="screen" />
     <!-- Add custom CSS here -->
     <link href="{{ url_for("static", filename="css/customized-bootstrap.css") }}" rel="stylesheet" media="screen" />
-    <link href="{{ url_for("static", filename="css/side-nav.css") }}" rel="stylesheet" media="screen" />
   {% endblock %}
   </head>
   <body>
-- 
cgit 


From 5949bd6787f2a7fa910dea6036df0315e119b457 Mon Sep 17 00:00:00 2001
From: François Schmidts <francois.schmidts@gmail.com>
Date: Sun, 31 Jan 2016 18:02:52 +0100
Subject: modal from nav

---
 src/web/templates/layout.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/web/templates/layout.html')

diff --git a/src/web/templates/layout.html b/src/web/templates/layout.html
index ac943d54..feb370e3 100644
--- a/src/web/templates/layout.html
+++ b/src/web/templates/layout.html
@@ -15,7 +15,7 @@
   {% endblock %}
   </head>
   <body>
-    <nav class="navbar navbar-inverse navbar-fixed-top navbar-custom" role="navigation">
+    <nav id="jarrnav" class="navbar navbar-inverse navbar-fixed-top" role="navigation">
       <div class="container-fluid">
         <div class="navbar-header">
           <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
-- 
cgit