From 8fe5bf8b7c828cbcc2e3a47a5b8b110f216a5b6c Mon Sep 17 00:00:00 2001 From: Cédric Bonhomme Date: Sat, 9 Apr 2016 08:19:58 +0200 Subject: Updated Navbar. --- src/web/js/components/MainApp.react.js | 2 -- src/web/static/css/customized-bootstrap.css | 6 ++++ src/web/static/css/one-page-app.css | 2 +- src/web/templates/home.html | 27 ++++----------- src/web/templates/layout.html | 53 ++++++++++++++++------------- 5 files changed, 44 insertions(+), 46 deletions(-) diff --git a/src/web/js/components/MainApp.react.js b/src/web/js/components/MainApp.react.js index ffb14589..6e695b49 100644 --- a/src/web/js/components/MainApp.react.js +++ b/src/web/js/components/MainApp.react.js @@ -2,7 +2,6 @@ var React = require('react'); var Col = require('react-bootstrap/lib/Col'); var Grid = require('react-bootstrap/lib/Grid'); -var JarrNavBar = require('./Navbar.react'); var Menu = require('./Menu.react'); var MiddlePanel = require('./MiddlePanel.react'); var RightPanel = require('./RightPanel.react'); @@ -11,7 +10,6 @@ var RightPanel = require('./RightPanel.react'); var MainApp = React.createClass({ render: function() { return (
- - - - {% block head %} - - - - - JARR{% if head_titles %} - {{ ' - '.join(head_titles) }}{% endif %} - - - +{% extends "layout.html" %} +{% block head %} + {{ super() }} - - - {% endblock %} - - +{% endblock %} +{% block content %}
- - - + +{% endblock %} diff --git a/src/web/templates/layout.html b/src/web/templates/layout.html index 50f96e8f..d863513f 100644 --- a/src/web/templates/layout.html +++ b/src/web/templates/layout.html @@ -9,12 +9,16 @@ JARR{% if head_titles %} - {{ ' - '.join(head_titles) }}{% endif %} - + + + + {% endblock %} + {% block menu %} + {% endblock %}
-
+
{% block messages %} {% with messages = get_flashed_messages(with_categories=true) %} {% if messages %} @@ -112,20 +134,5 @@ - -- cgit