python/django-maraudes
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Navbar (#31)

Browse Source 
* started workin on 'navbar' module

* changed bootstrap theme to bootswatch/Simplex

* big work on navbar logic

* starting creating menus using navbar

* converted app views to new Wepage decorator, updated navbar

* reimplemented DernieresMaraudes as a dropdown instead of ContextMixin

* reorganised static files, minor code cleanups

* turned Link.href into lazy-evaluated property

* collapsed 'navbar' module into 'website', dynamic building of ApplicationMenu subclasses

* minor cleanup

* blah blah blah

* added way to add admin/non-admin links

* minor style change : red border for active page instead of all dropdowns

* deleted file

* prepare adding removing menu templates files, being replaced by code

* essayé de généraliser le code pour les modaux bootstrap, non testé git status

* more preparation and thinking on navbar app_menus logic...

* added LinkManager and DropdownManager, getting closer...

* small fix in DropdownManager.__get__

* boosted up work: keep it simple so it can be merged fast, major layout changes

* added month filter on maraudes:liste

* added 'as_icon' filter to display boolean/null values as bootstrap icons

* remove inactive user from planning selection

* removed all unused 'menu' templates

* set up django_select2 to use static files

* small fix after review
This commit is contained in:
artus40
2017-02-11 18:20:13 +01:00
committed by GitHub
parent 288ca2cc20
commit 0be59a61a7
61 changed files with 665 additions and 525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
website/templates/base.html
View File

@@ -1,11 +1,11 @@
<!DOCTYPE html>
{% load staticfiles %} {% load bootstrap3 %}
{% load staticfiles %} {% load bootstrap3 %} {% load navbar %}
<html lang="fr">
<head>
<title>{% block title %}La maraude{% endblock %}</title>
{% bootstrap_css %}{% bootstrap_javascript %}
<!-- Side Navbar from http://www.samrayner.com/bootstrap-side-navbar/inverse.html -->
<link href="/static/bootstrap/navbar-fixed-side.css" rel="stylesheet" />
<link href="/static/css/bootstrap/navbar-fixed-side.css" rel="stylesheet" />
{% if stylesheets %}{% for stylesheet in stylesheets %}
<link rel="stylesheet" type="text/css" href="{% static stylesheet %}" />{% endfor %}{% endif %}
</head>
@@ -13,7 +13,7 @@
<div class="container-fluid">
<div class="row">
<div class="col-md-3 col-lg-2">
{% include "navbar.html" %}
{% navbar %}
</div>
<div class="col-md-9 col-lg-10">
<h1 class="page-header">{% block page_header %}{% endblock %}</h1>