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

website restyling, minor fixes

Browse Source
This commit is contained in:
Arthur Gerbaud
2016-08-13 16:40:43 +02:00
parent 8bac5d8bd4
commit 46b807ec1e
36 changed files with 390 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/decorators.py
+6
View File
@@ -14,6 +14,10 @@ def webpage(**options):
except KeyError: ajax = False
try: permissions = options.pop('permissions')
except KeyError: permissions = []
try: app_menu = options.pop('app_menu')
except KeyError: app_menu = []
try: app_name = options.pop('app_name')
except KeyError: app_name = None
new_bases = []
if ajax:
@@ -27,6 +31,8 @@ def webpage(**options):
_insert_bases(cls, new_bases)
if permissions:
cls.permissions = permissions
cls.app_menu = app_menu
cls.app_name = app_name
return cls
return update_class
website/mixins.py
+11 -8
View File
@@ -50,6 +50,7 @@ class WebsiteTemplateMixin(TemplateResponseMixin):
"""
base_template = "base_site.html"
content_template = None
app_name = None
class Configuration:
stylesheets = ['base.css']
@@ -76,14 +77,16 @@ class WebsiteTemplateMixin(TemplateResponseMixin):
self.content_template = self.template_name
return self.content_template
def get_active_app(self, app_name=None):
if not app_name:
app_name = self.__class__.__module__.split(".")[0]
return apps.get_app_config(app_name)
def get_active_app(self):
if not self.app_name:
self.app_name = self.__class__.__module__.split(".")[0]
return apps.get_app_config(self.app_name)
def get_panels(self):
""" Panneaux """
return None
def get_menu(self):
""" Renvoie la liste des templates utilisés comme menu pour l'application
active
"""
return self.app_menu
def get_prochaine_maraude_for_user(self):
""" Retourne le prochain objet Maraude auquel
@@ -119,7 +122,7 @@ class WebsiteTemplateMixin(TemplateResponseMixin):
context['active_app'] = self.get_active_app()
context['content_template'] = self.get_content_template()
context['panels'] = self.get_panels()
context['app_menu'] = self.get_menu()
context['prochaine_maraude_abs'] = self.get_prochaine_maraude()
context['prochaine_maraude'] = self.get_prochaine_maraude_for_user()
website/static/base.css
+4 -19
View File
@@ -1,28 +1,13 @@
#menu {
border-bottom: 4px solid #f47f02;
/*;#980300*/
padding-bottom: 0px;
margin-bottom: 0px;
border: none;
border-right: 4px solid #f47f02;
}
.navbar-inverse {
padding:0px;
}
#menu a {
border-bottom: 1px solid transparent;
font-size: 120%;
font-weight: bold;
font-variant: small-caps;
}
#app-menu {
max-height: 40px;
margin:0px;
padding-top:0;
background: #f47f02;
.app-menu {
background-color: #121212;
}
#sidebar {
website/static/bootstrap/config.json
+13 -13
View File
@@ -6,12 +6,12 @@
"@gray": "lighten(@gray-base, 33.5%)",
"@gray-light": "lighten(@gray-base, 46.7%)",
"@gray-lighter": "lighten(@gray-base, 93.5%)",
"@brand-primary": "darken(#428bca, 6.5%)",
"@brand-primary": "#980300",
"@brand-success": "#5cb85c",
"@brand-info": "#5bc0de",
"@brand-info": "lighten(@brand-primary, 6.5%)",
"@brand-warning": "#f47f02",
"@brand-danger": "#d9534f",
"@body-bg": "#fff",
"@body-bg": "@gray-lighter",
"@text-color": "@gray-dark",
"@link-color": "@brand-primary",
"@link-hover-color": "lighten(@link-color, 15%)",
@@ -68,19 +68,19 @@
"@btn-default-border": "#ccc",
"@btn-primary-color": "#fff",
"@btn-primary-bg": "@brand-primary",
"@btn-primary-border": "lighten(@btn-primary-bg, 5%)",
"@btn-primary-border": "darken(@btn-primary-bg, 5%)",
"@btn-success-color": "#fff",
"@btn-success-bg": "@brand-success",
"@btn-success-border": "lighten(@btn-success-bg, 5%)",
"@btn-success-border": "darken(@btn-success-bg, 5%)",
"@btn-info-color": "#fff",
"@btn-info-bg": "@brand-info",
"@btn-info-border": "lighten(@btn-info-bg, 5%)",
"@btn-info-border": "darken(@btn-info-bg, 5%)",
"@btn-warning-color": "#fff",
"@btn-warning-bg": "@brand-warning",
"@btn-warning-border": "lighten(@btn-warning-bg, 5%)",
"@btn-warning-border": "darken(@btn-warning-bg, 5%)",
"@btn-danger-color": "#fff",
"@btn-danger-bg": "@brand-danger",
"@btn-danger-border": "lighten(@btn-danger-bg, 5%)",
"@btn-danger-border": "darken(@btn-danger-bg, 5%)",
"@btn-link-disabled-color": "@gray-light",
"@btn-border-radius-base": "@border-radius-base",
"@btn-border-radius-large": "@border-radius-large",
@@ -177,7 +177,7 @@
"@navbar-inverse-brand-hover-bg": "transparent",
"@navbar-inverse-toggle-hover-bg": "#333",
"@navbar-inverse-toggle-icon-bar-bg": "#fff",
"@navbar-inverse-toggle-border-color": "#f47f02",
"@navbar-inverse-toggle-border-color": "#333",
"@nav-link-padding": "10px 15px",
"@nav-link-hover-bg": "@gray-lighter",
"@nav-disabled-link-color": "@gray-light",
@@ -221,7 +221,7 @@
"@state-success-bg": "#dff0d8",
"@state-success-border": "darken(spin(@state-success-bg, -10), 5%)",
"@state-info-text": "#31708f",
"@state-info-bg": "#d9edf7",
"@state-info-bg": "#f7d9d9",
"@state-info-border": "darken(spin(@state-info-bg, -10), 7%)",
"@state-warning-text": "#8a6d3b",
"@state-warning-bg": "#fcf8e3",
@@ -376,10 +376,10 @@
"@blockquote-small-color": "@gray-light",
"@blockquote-font-size": "(@font-size-base * 1.25)",
"@blockquote-border-color": "@gray-lighter",
"@page-header-border-color": "@gray-lighter",
"@page-header-border-color": "@hr-border",
"@dl-horizontal-offset": "@component-offset-horizontal",
"@dl-horizontal-breakpoint": "@grid-float-breakpoint",
"@hr-border": "@gray-lighter"
"@hr-border": "@gray-light"
},
"css": [
"print.less",
@@ -431,5 +431,5 @@
"scrollspy.js",
"transition.js"
],
"customizerUrl": "http://getbootstrap.com/customize/?id=d99309626f40df9865729816f248efe7"
"customizerUrl": "http://getbootstrap.com/customize/?id=3e0cac7da17e620f3ce026228727422b"
}
website/static/bootstrap/css/bootstrap-theme.css
Vendored
+48 -48
View File
@@ -5,8 +5,8 @@
*/
/*!
* Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=d99309626f40df9865729816f248efe7)
* Config saved to config.json and https://gist.github.com/d99309626f40df9865729816f248efe7
* Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=3e0cac7da17e620f3ce026228727422b)
* Config saved to config.json and https://gist.github.com/3e0cac7da17e620f3ce026228727422b
*/
/*!
* Bootstrap v3.3.7 (http://getbootstrap.com)
@@ -115,24 +115,24 @@ fieldset[disabled] .btn-default.active {
background-image: none;
}
.btn-primary {
background-image: -webkit-linear-gradient(top, #337ab7 0%, #265a88 100%);
background-image: -o-linear-gradient(top, #337ab7 0%, #265a88 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#265a88));
background-image: linear-gradient(to bottom, #337ab7 0%, #265a88 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff265a88', GradientType=0);
background-image: -webkit-linear-gradient(top, #980300 0%, #5b0200 100%);
background-image: -o-linear-gradient(top, #980300 0%, #5b0200 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#980300), to(#5b0200));
background-image: linear-gradient(to bottom, #980300 0%, #5b0200 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff980300', endColorstr='#ff5b0200', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
background-repeat: repeat-x;
border-color: #245580;
border-color: #510200;
}
.btn-primary:hover,
.btn-primary:focus {
background-color: #265a88;
background-color: #5b0200;
background-position: 0 -15px;
}
.btn-primary:active,
.btn-primary.active {
background-color: #265a88;
border-color: #245580;
background-color: #5b0200;
border-color: #510200;
}
.btn-primary.disabled,
.btn-primary[disabled],
@@ -152,7 +152,7 @@ fieldset[disabled] .btn-primary:active,
.btn-primary.disabled.active,
.btn-primary[disabled].active,
fieldset[disabled] .btn-primary.active {
background-color: #265a88;
background-color: #5b0200;
background-image: none;
}
.btn-success {
@@ -197,24 +197,24 @@ fieldset[disabled] .btn-success.active {
background-image: none;
}
.btn-info {
background-image: -webkit-linear-gradient(top, #5bc0de 0%, #2aabd2 100%);
background-image: -o-linear-gradient(top, #5bc0de 0%, #2aabd2 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#5bc0de), to(#2aabd2));
background-image: linear-gradient(to bottom, #5bc0de 0%, #2aabd2 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);
background-image: -webkit-linear-gradient(top, #b90400 0%, #7c0200 100%);
background-image: -o-linear-gradient(top, #b90400 0%, #7c0200 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#b90400), to(#7c0200));
background-image: linear-gradient(to bottom, #b90400 0%, #7c0200 100%);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffb90400', endColorstr='#ff7c0200', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
background-repeat: repeat-x;
border-color: #28a4c9;
border-color: #720200;
}
.btn-info:hover,
.btn-info:focus {
background-color: #2aabd2;
background-color: #7c0200;
background-position: 0 -15px;
}
.btn-info:active,
.btn-info.active {
background-color: #2aabd2;
border-color: #28a4c9;
background-color: #7c0200;
border-color: #720200;
}
.btn-info.disabled,
.btn-info[disabled],
@@ -234,7 +234,7 @@ fieldset[disabled] .btn-info:active,
.btn-info.disabled.active,
.btn-info[disabled].active,
fieldset[disabled] .btn-info.active {
background-color: #2aabd2;
background-color: #7c0200;
background-image: none;
}
.btn-warning {
@@ -430,13 +430,13 @@ fieldset[disabled] .btn-danger.active {
border-color: #b2dba1;
}
.alert-info {
background-image: -webkit-linear-gradient(top, #d9edf7 0%, #b9def0 100%);
background-image: -o-linear-gradient(top, #d9edf7 0%, #b9def0 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#d9edf7), to(#b9def0));
background-image: linear-gradient(to bottom, #d9edf7 0%, #b9def0 100%);
background-image: -webkit-linear-gradient(top, #f7d9d9 0%, #f0b9b9 100%);
background-image: -o-linear-gradient(top, #f7d9d9 0%, #f0b9b9 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#f7d9d9), to(#f0b9b9));
background-image: linear-gradient(to bottom, #f7d9d9 0%, #f0b9b9 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);
border-color: #9acfea;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff7d9d9', endColorstr='#fff0b9b9', GradientType=0);
border-color: #ea9a9a;
}
.alert-warning {
background-image: -webkit-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%);
@@ -465,12 +465,12 @@ fieldset[disabled] .btn-danger.active {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0);
}
.progress-bar {
background-image: -webkit-linear-gradient(top, #337ab7 0%, #286090 100%);
background-image: -o-linear-gradient(top, #337ab7 0%, #286090 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#286090));
background-image: linear-gradient(to bottom, #337ab7 0%, #286090 100%);
background-image: -webkit-linear-gradient(top, #980300 0%, #650200 100%);
background-image: -o-linear-gradient(top, #980300 0%, #650200 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#980300), to(#650200));
background-image: linear-gradient(to bottom, #980300 0%, #650200 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff286090', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff980300', endColorstr='#ff650200', GradientType=0);
}
.progress-bar-success {
background-image: -webkit-linear-gradient(top, #5cb85c 0%, #449d44 100%);
@@ -481,12 +481,12 @@ fieldset[disabled] .btn-danger.active {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);
}
.progress-bar-info {
background-image: -webkit-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
background-image: -o-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#5bc0de), to(#31b0d5));
background-image: linear-gradient(to bottom, #5bc0de 0%, #31b0d5 100%);
background-image: -webkit-linear-gradient(top, #b90400 0%, #860300 100%);
background-image: -o-linear-gradient(top, #b90400 0%, #860300 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#b90400), to(#860300));
background-image: linear-gradient(to bottom, #b90400 0%, #860300 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffb90400', endColorstr='#ff860300', GradientType=0);
}
.progress-bar-warning {
background-image: -webkit-linear-gradient(top, #f47f02 0%, #c16502 100%);
@@ -544,12 +544,12 @@ fieldset[disabled] .btn-danger.active {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
}
.panel-primary > .panel-heading {
background-image: -webkit-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
background-image: -o-linear-gradient(top, #337ab7 0%, #2e6da4 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#337ab7), to(#2e6da4));
background-image: linear-gradient(to bottom, #337ab7 0%, #2e6da4 100%);
background-image: -webkit-linear-gradient(top, #980300 0%, #7f0200 100%);
background-image: -o-linear-gradient(top, #980300 0%, #7f0200 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#980300), to(#7f0200));
background-image: linear-gradient(to bottom, #980300 0%, #7f0200 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff980300', endColorstr='#ff7f0200', GradientType=0);
}
.panel-success > .panel-heading {
background-image: -webkit-linear-gradient(top, #dff0d8 0%, #d0e9c6 100%);
@@ -560,12 +560,12 @@ fieldset[disabled] .btn-danger.active {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0);
}
.panel-info > .panel-heading {
background-image: -webkit-linear-gradient(top, #d9edf7 0%, #c4e3f3 100%);
background-image: -o-linear-gradient(top, #d9edf7 0%, #c4e3f3 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#d9edf7), to(#c4e3f3));
background-image: linear-gradient(to bottom, #d9edf7 0%, #c4e3f3 100%);
background-image: -webkit-linear-gradient(top, #f7d9d9 0%, #f3c4c4 100%);
background-image: -o-linear-gradient(top, #f7d9d9 0%, #f3c4c4 100%);
background-image: -webkit-gradient(linear, left top, left bottom, from(#f7d9d9), to(#f3c4c4));
background-image: linear-gradient(to bottom, #f7d9d9 0%, #f3c4c4 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff7d9d9', endColorstr='#fff3c4c4', GradientType=0);
}
.panel-warning > .panel-heading {
background-image: -webkit-linear-gradient(top, #fcf8e3 0%, #faf2cc 100%);
website/static/bootstrap/css/bootstrap-theme.min.css
Vendored
+3 -3
View File
File diff suppressed because one or more lines are too long
website/static/bootstrap/css/bootstrap.css
Vendored
+98 -98
View File
@@ -5,8 +5,8 @@
*/
/*!
* Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=d99309626f40df9865729816f248efe7)
* Config saved to config.json and https://gist.github.com/d99309626f40df9865729816f248efe7
* Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=3e0cac7da17e620f3ce026228727422b)
* Config saved to config.json and https://gist.github.com/3e0cac7da17e620f3ce026228727422b
*/
/*!
* Bootstrap v3.3.7 (http://getbootstrap.com)
@@ -1092,7 +1092,7 @@ body {
font-size: 14px;
line-height: 1.42857143;
color: #333333;
background-color: #ffffff;
background-color: #eeeeee;
}
input,
button,
@@ -1103,12 +1103,12 @@ textarea {
line-height: inherit;
}
a {
color: #337ab7;
color: #980300;
text-decoration: none;
}
a:hover,
a:focus {
color: #64a0d3;
color: #e40500;
text-decoration: underline;
}
a:focus {
@@ -1136,7 +1136,7 @@ img {
.img-thumbnail {
padding: 4px;
line-height: 1.42857143;
background-color: #ffffff;
background-color: #eeeeee;
border: 1px solid #dddddd;
border-radius: 4px;
-webkit-transition: all 0.2s ease-in-out;
@@ -1153,7 +1153,7 @@ hr {
margin-top: 20px;
margin-bottom: 20px;
border: 0;
border-top: 1px solid #eeeeee;
border-top: 1px solid #777777;
}
.sr-only {
position: absolute;
@@ -1343,11 +1343,11 @@ mark,
color: #777777;
}
.text-primary {
color: #337ab7;
color: #980300;
}
a.text-primary:hover,
a.text-primary:focus {
color: #286090;
color: #650200;
}
.text-success {
color: #3c763d;
@@ -1379,11 +1379,11 @@ a.text-danger:focus {
}
.bg-primary {
color: #fff;
background-color: #337ab7;
background-color: #980300;
}
a.bg-primary:hover,
a.bg-primary:focus {
background-color: #286090;
background-color: #650200;
}
.bg-success {
background-color: #dff0d8;
@@ -1393,11 +1393,11 @@ a.bg-success:focus {
background-color: #c1e2b3;
}
.bg-info {
background-color: #d9edf7;
background-color: #f7d9d9;
}
a.bg-info:hover,
a.bg-info:focus {
background-color: #afd9ee;
background-color: #eeafaf;
}
.bg-warning {
background-color: #fcf8e3;
@@ -1416,7 +1416,7 @@ a.bg-danger:focus {
.page-header {
padding-bottom: 9px;
margin: 40px 0 20px;
border-bottom: 1px solid #eeeeee;
border-bottom: 1px solid #777777;
}
ul,
ol {
@@ -2298,7 +2298,7 @@ th {
border-top: 2px solid #dddddd;
}
.table .table {
background-color: #ffffff;
background-color: #eeeeee;
}
.table-condensed > thead > tr > th,
.table-condensed > tbody > tr > th,
@@ -2394,14 +2394,14 @@ table th[class*="col-"] {
.table > thead > tr.info > th,
.table > tbody > tr.info > th,
.table > tfoot > tr.info > th {
background-color: #d9edf7;
background-color: #f7d9d9;
}
.table-hover > tbody > tr > td.info:hover,
.table-hover > tbody > tr > th.info:hover,
.table-hover > tbody > tr.info:hover > td,
.table-hover > tbody > tr:hover > .info,
.table-hover > tbody > tr.info:hover > th {
background-color: #c4e3f3;
background-color: #f3c4c4;
}
.table > thead > tr > td.warning,
.table > tbody > tr > td.warning,
@@ -3121,26 +3121,26 @@ fieldset[disabled] .btn-default.focus {
}
.btn-primary {
color: #ffffff;
background-color: #337ab7;
border-color: #3c87c8;
background-color: #980300;
border-color: #7f0200;
}
.btn-primary:focus,
.btn-primary.focus {
color: #ffffff;
background-color: #286090;
border-color: #1d4568;
background-color: #650200;
border-color: #000000;
}
.btn-primary:hover {
color: #ffffff;
background-color: #286090;
border-color: #2c689c;
background-color: #650200;
border-color: #410100;
}
.btn-primary:active,
.btn-primary.active,
.open > .dropdown-toggle.btn-primary {
color: #ffffff;
background-color: #286090;
border-color: #2c689c;
background-color: #650200;
border-color: #410100;
}
.btn-primary:active:hover,
.btn-primary.active:hover,
@@ -3152,8 +3152,8 @@ fieldset[disabled] .btn-default.focus {
.btn-primary.active.focus,
.open > .dropdown-toggle.btn-primary.focus {
color: #ffffff;
background-color: #204d74;
border-color: #1d4568;
background-color: #410100;
border-color: #000000;
}
.btn-primary:active,
.btn-primary.active,
@@ -3169,35 +3169,35 @@ fieldset[disabled] .btn-primary:focus,
.btn-primary.disabled.focus,
.btn-primary[disabled].focus,
fieldset[disabled] .btn-primary.focus {
background-color: #337ab7;
border-color: #3c87c8;
background-color: #980300;
border-color: #7f0200;
}
.btn-primary .badge {
color: #337ab7;
color: #980300;
background-color: #ffffff;
}
.btn-success {
color: #ffffff;
background-color: #5cb85c;
border-color: #6ec06e;
border-color: #4cae4c;
}
.btn-success:focus,
.btn-success.focus {
color: #ffffff;
background-color: #449d44;
border-color: #357935;
border-color: #255625;
}
.btn-success:hover {
color: #ffffff;
background-color: #449d44;
border-color: #49a749;
border-color: #398439;
}
.btn-success:active,
.btn-success.active,
.open > .dropdown-toggle.btn-success {
color: #ffffff;
background-color: #449d44;
border-color: #49a749;
border-color: #398439;
}
.btn-success:active:hover,
.btn-success.active:hover,
@@ -3210,7 +3210,7 @@ fieldset[disabled] .btn-primary.focus {
.open > .dropdown-toggle.btn-success.focus {
color: #ffffff;
background-color: #398439;
border-color: #357935;
border-color: #255625;
}
.btn-success:active,
.btn-success.active,
@@ -3227,7 +3227,7 @@ fieldset[disabled] .btn-success:focus,
.btn-success[disabled].focus,
fieldset[disabled] .btn-success.focus {
background-color: #5cb85c;
border-color: #6ec06e;
border-color: #4cae4c;
}
.btn-success .badge {
color: #5cb85c;
@@ -3235,26 +3235,26 @@ fieldset[disabled] .btn-success.focus {
}
.btn-info {
color: #ffffff;
background-color: #5bc0de;
border-color: #70c8e2;
background-color: #b90400;
border-color: #a00300;
}
.btn-info:focus,
.btn-info.focus {
color: #ffffff;
background-color: #31b0d5;
border-color: #2390b0;
background-color: #860300;
border-color: #200100;
}
.btn-info:hover {
color: #ffffff;
background-color: #31b0d5;
border-color: #3db5d8;
background-color: #860300;
border-color: #620200;
}
.btn-info:active,
.btn-info.active,
.open > .dropdown-toggle.btn-info {
color: #ffffff;
background-color: #31b0d5;
border-color: #3db5d8;
background-color: #860300;
border-color: #620200;
}
.btn-info:active:hover,
.btn-info.active:hover,
@@ -3266,8 +3266,8 @@ fieldset[disabled] .btn-success.focus {
.btn-info.active.focus,
.open > .dropdown-toggle.btn-info.focus {
color: #ffffff;
background-color: #269abc;
border-color: #2390b0;
background-color: #620200;
border-color: #200100;
}
.btn-info:active,
.btn-info.active,
@@ -3283,35 +3283,35 @@ fieldset[disabled] .btn-info:focus,
.btn-info.disabled.focus,
.btn-info[disabled].focus,
fieldset[disabled] .btn-info.focus {
background-color: #5bc0de;
border-color: #70c8e2;
background-color: #b90400;
border-color: #a00300;
}
.btn-info .badge {
color: #5bc0de;
color: #b90400;
background-color: #ffffff;
}
.btn-warning {
color: #ffffff;
background-color: #f47f02;
border-color: #fd8c12;
border-color: #db7202;
}
.btn-warning:focus,
.btn-warning.focus {
color: #ffffff;
background-color: #c16502;
border-color: #8f4a01;
border-color: #5c3001;
}
.btn-warning:hover {
color: #ffffff;
background-color: #c16502;
border-color: #d16d02;
border-color: #9e5201;
}
.btn-warning:active,
.btn-warning.active,
.open > .dropdown-toggle.btn-warning {
color: #ffffff;
background-color: #c16502;
border-color: #d16d02;
border-color: #9e5201;
}
.btn-warning:active:hover,
.btn-warning.active:hover,
@@ -3324,7 +3324,7 @@ fieldset[disabled] .btn-info.focus {
.open > .dropdown-toggle.btn-warning.focus {
color: #ffffff;
background-color: #9e5201;
border-color: #8f4a01;
border-color: #5c3001;
}
.btn-warning:active,
.btn-warning.active,
@@ -3341,7 +3341,7 @@ fieldset[disabled] .btn-warning:focus,
.btn-warning[disabled].focus,
fieldset[disabled] .btn-warning.focus {
background-color: #f47f02;
border-color: #fd8c12;
border-color: #db7202;
}
.btn-warning .badge {
color: #f47f02;
@@ -3350,25 +3350,25 @@ fieldset[disabled] .btn-warning.focus {
.btn-danger {
color: #ffffff;
background-color: #d9534f;
border-color: #de6764;
border-color: #d43f3a;
}
.btn-danger:focus,
.btn-danger.focus {
color: #ffffff;
background-color: #c9302c;
border-color: #a02622;
border-color: #761c19;
}
.btn-danger:hover {
color: #ffffff;
background-color: #c9302c;
border-color: #d33632;
border-color: #ac2925;
}
.btn-danger:active,
.btn-danger.active,
.open > .dropdown-toggle.btn-danger {
color: #ffffff;
background-color: #c9302c;
border-color: #d33632;
border-color: #ac2925;
}
.btn-danger:active:hover,
.btn-danger.active:hover,
@@ -3381,7 +3381,7 @@ fieldset[disabled] .btn-warning.focus {
.open > .dropdown-toggle.btn-danger.focus {
color: #ffffff;
background-color: #ac2925;
border-color: #a02622;
border-color: #761c19;
}
.btn-danger:active,
.btn-danger.active,
@@ -3398,14 +3398,14 @@ fieldset[disabled] .btn-danger:focus,
.btn-danger[disabled].focus,
fieldset[disabled] .btn-danger.focus {
background-color: #d9534f;
border-color: #de6764;
border-color: #d43f3a;
}
.btn-danger .badge {
color: #d9534f;
background-color: #ffffff;
}
.btn-link {
color: #337ab7;
color: #980300;
font-weight: normal;
border-radius: 0;
}
@@ -3426,7 +3426,7 @@ fieldset[disabled] .btn-link {
}
.btn-link:hover,
.btn-link:focus {
color: #64a0d3;
color: #e40500;
text-decoration: underline;
background-color: transparent;
}
@@ -4010,7 +4010,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.nav .open > a:hover,
.nav .open > a:focus {
background-color: #eeeeee;
border-color: #337ab7;
border-color: #980300;
}
.nav .nav-divider {
height: 1px;
@@ -4041,7 +4041,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.nav-tabs > li.active > a:hover,
.nav-tabs > li.active > a:focus {
color: #555555;
background-color: #ffffff;
background-color: #eeeeee;
border: 1px solid #dddddd;
border-bottom-color: transparent;
cursor: default;
@@ -4087,7 +4087,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.nav-tabs.nav-justified > .active > a,
.nav-tabs.nav-justified > .active > a:hover,
.nav-tabs.nav-justified > .active > a:focus {
border-bottom-color: #ffffff;
border-bottom-color: #eeeeee;
}
}
.nav-pills > li {
@@ -4155,7 +4155,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.nav-tabs-justified > .active > a,
.nav-tabs-justified > .active > a:hover,
.nav-tabs-justified > .active > a:focus {
border-bottom-color: #ffffff;
border-bottom-color: #eeeeee;
}
}
.tab-content > .tab-pane {
@@ -4630,7 +4630,7 @@ fieldset[disabled] .navbar-default .btn-link:focus {
background-color: transparent;
}
.navbar-inverse .navbar-toggle {
border-color: #f47f02;
border-color: #333333;
}
.navbar-inverse .navbar-toggle:hover,
.navbar-inverse .navbar-toggle:focus {
@@ -4730,7 +4730,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
padding: 6px 12px;
line-height: 1.42857143;
text-decoration: none;
color: #337ab7;
color: #980300;
background-color: #ffffff;
border: 1px solid #dddddd;
margin-left: -1px;
@@ -4751,7 +4751,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
.pagination > li > a:focus,
.pagination > li > span:focus {
z-index: 2;
color: #64a0d3;
color: #e40500;
background-color: #eeeeee;
border-color: #dddddd;
}
@@ -4763,8 +4763,8 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
.pagination > .active > span:focus {
z-index: 3;
color: #ffffff;
background-color: #337ab7;
border-color: #337ab7;
background-color: #980300;
border-color: #980300;
cursor: default;
}
.pagination > .disabled > span,
@@ -4881,11 +4881,11 @@ a.label:focus {
background-color: #5e5e5e;
}
.label-primary {
background-color: #337ab7;
background-color: #980300;
}
.label-primary[href]:hover,
.label-primary[href]:focus {
background-color: #286090;
background-color: #650200;
}
.label-success {
background-color: #5cb85c;
@@ -4895,11 +4895,11 @@ a.label:focus {
background-color: #449d44;
}
.label-info {
background-color: #5bc0de;
background-color: #b90400;
}
.label-info[href]:hover,
.label-info[href]:focus {
background-color: #31b0d5;
background-color: #860300;
}
.label-warning {
background-color: #f47f02;
@@ -4949,7 +4949,7 @@ a.badge:focus {
}
.list-group-item.active > .badge,
.nav-pills > .active > a > .badge {
color: #337ab7;
color: #980300;
background-color: #ffffff;
}
.list-group-item > .badge {
@@ -5009,7 +5009,7 @@ a.badge:focus {
padding: 4px;
margin-bottom: 20px;
line-height: 1.42857143;
background-color: #ffffff;
background-color: #eeeeee;
border: 1px solid #dddddd;
border-radius: 4px;
-webkit-transition: border 0.2s ease-in-out;
@@ -5024,7 +5024,7 @@ a.badge:focus {
a.thumbnail:hover,
a.thumbnail:focus,
a.thumbnail.active {
border-color: #337ab7;
border-color: #980300;
}
.thumbnail .caption {
padding: 9px;
@@ -5073,12 +5073,12 @@ a.thumbnail.active {
color: #2b542c;
}
.alert-info {
background-color: #d9edf7;
border-color: #bce8f1;
background-color: #f7d9d9;
border-color: #f1bcc4;
color: #31708f;
}
.alert-info hr {
border-top-color: #a6e1ec;
border-top-color: #eca6b2;
}
.alert-info .alert-link {
color: #245269;
@@ -5146,7 +5146,7 @@ a.thumbnail.active {
line-height: 20px;
color: #ffffff;
text-align: center;
background-color: #337ab7;
background-color: #980300;
-webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-webkit-transition: width 0.6s ease;
@@ -5176,7 +5176,7 @@ a.thumbnail.active {
background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
}
.progress-bar-info {
background-color: #5bc0de;
background-color: #b90400;
}
.progress-striped .progress-bar-info {
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
@@ -5360,7 +5360,7 @@ button.list-group-item-success.active:focus {
}
.list-group-item-info {
color: #31708f;
background-color: #d9edf7;
background-color: #f7d9d9;
}
a.list-group-item-info,
button.list-group-item-info {
@@ -5375,7 +5375,7 @@ button.list-group-item-info:hover,
a.list-group-item-info:focus,
button.list-group-item-info:focus {
color: #31708f;
background-color: #c4e3f3;
background-color: #f3c4c4;
}
a.list-group-item-info.active,
button.list-group-item-info.active,
@@ -5707,22 +5707,22 @@ button.list-group-item-danger.active:focus {
border-bottom-color: #dddddd;
}
.panel-primary {
border-color: #337ab7;
border-color: #980300;
}
.panel-primary > .panel-heading {
color: #ffffff;
background-color: #337ab7;
border-color: #337ab7;
background-color: #980300;
border-color: #980300;
}
.panel-primary > .panel-heading + .panel-collapse > .panel-body {
border-top-color: #337ab7;
border-top-color: #980300;
}
.panel-primary > .panel-heading .badge {
color: #337ab7;
color: #980300;
background-color: #ffffff;
}
.panel-primary > .panel-footer + .panel-collapse > .panel-body {
border-bottom-color: #337ab7;
border-bottom-color: #980300;
}
.panel-success {
border-color: #d6e9c6;
@@ -5743,22 +5743,22 @@ button.list-group-item-danger.active:focus {
border-bottom-color: #d6e9c6;
}
.panel-info {
border-color: #bce8f1;
border-color: #f1bcc4;
}
.panel-info > .panel-heading {
color: #31708f;
background-color: #d9edf7;
border-color: #bce8f1;
background-color: #f7d9d9;
border-color: #f1bcc4;
}
.panel-info > .panel-heading + .panel-collapse > .panel-body {
border-top-color: #bce8f1;
border-top-color: #f1bcc4;
}
.panel-info > .panel-heading .badge {
color: #d9edf7;
color: #f7d9d9;
background-color: #31708f;
}
.panel-info > .panel-footer + .panel-collapse > .panel-body {
border-bottom-color: #bce8f1;
border-bottom-color: #f1bcc4;
}
.panel-warning {
border-color: #faebcc;
website/static/bootstrap/css/bootstrap.min.css
Vendored
+3 -3
View File
File diff suppressed because one or more lines are too long
website/static/bootstrap/js/bootstrap.js
Vendored
+2 -2
View File
@@ -5,8 +5,8 @@
*/
/*!
* Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=d99309626f40df9865729816f248efe7)
* Config saved to config.json and https://gist.github.com/d99309626f40df9865729816f248efe7
* Generated using the Bootstrap Customizer (http://getbootstrap.com/customize/?id=3e0cac7da17e620f3ce026228727422b)
* Config saved to config.json and https://gist.github.com/3e0cac7da17e620f3ce026228727422b
*/
if (typeof jQuery === 'undefined') {
throw new Error('Bootstrap\'s JavaScript requires jQuery')
website/static/bootstrap/js/bootstrap.min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
website/static/bootstrap/navbar-fixed-side.css
+1
View File
@@ -0,0 +1 @@
@media (max-width: 768px){.navbar-fixed-side{margin-left:-15px;margin-right:-15px}}@media (min-width: 768px){.navbar-fixed-side{position:fixed;margin:0 -15px;height:100vh;width:inherit;overflow:auto;border-top-width:0;border-bottom-width:0;border-radius:0}.navbar-fixed-side .container,.navbar-fixed-side .container-fluid{width:auto;padding-left:0;padding-right:0}.navbar-fixed-side .navbar-header{float:none}.navbar-fixed-side .navbar-brand{height:auto}.navbar-fixed-side>.container .navbar-brand,.navbar-fixed-side>.container-fluid .navbar-brand{margin-left:0}.navbar-fixed-side .navbar-collapse{width:100%;border-top:1px solid #e7e7e7}.navbar-fixed-side .navbar-nav{float:none;margin:0 -15px}.navbar-fixed-side .navbar-nav>li{float:none}.navbar-fixed-side .navbar-nav>li>a{padding-top:10px;padding-bottom:10px;border-bottom:1px solid #e7e7e7}.navbar-fixed-side .navbar-form{margin:0;margin-left:-15px;margin-right:-15px;padding:10px 15px;border-bottom:1px solid #e7e7e7}.navbar-fixed-side .navbar-text{float:none;margin-left:0;margin-right:0}.navbar-fixed-side .navbar-left,.navbar-fixed-side .navbar-right{float:none !important}.navbar-fixed-side .navbar-nav .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;box-shadow:none;border-bottom:1px solid #e7e7e7}.navbar-fixed-side .navbar-nav .dropdown-menu>li>a,.navbar-fixed-side .navbar-nav .dropdown-menu .dropdown-header{padding:5px 15px 5px 25px}.navbar-fixed-side .navbar-nav .dropdown-menu>li>a{line-height:20px;color:#777}.navbar-fixed-side .navbar-nav .dropdown-menu>li>a:hover,.navbar-fixed-side .navbar-nav .dropdown-menu>li>a:focus{background-image:none}.navbar-fixed-side .navbar-nav .dropdown-menu>.active>a{background-color:#e7e7e7;color:#555}.navbar-fixed-side .navbar-nav>li>a:hover,.navbar-fixed-side .navbar-nav>li>a:focus,.navbar-fixed-side .navbar-nav .dropdown-menu>li>a:hover,.navbar-fixed-side .navbar-nav .dropdown-menu>li>a:focus{background-color:#f0f0f0;color:#333}.navbar-fixed-side .dropdown>.dropdown-toggle,.navbar-fixed-side .dropdown-menu>.dropdown-header{background-color:transparent !important;color:#9d9d9d !important;cursor:default;font-size:0.8em;text-transform:uppercase;border-bottom:none;padding-bottom:0}.navbar-fixed-side .dropdown-toggle .caret{display:none}.navbar-fixed-side .dropdown-menu{display:block}.navbar-fixed-side.navbar-inverse .navbar-collapse,.navbar-fixed-side.navbar-inverse .navbar-nav>li>a,.navbar-fixed-side.navbar-inverse .navbar-form,.navbar-fixed-side.navbar-inverse .navbar-nav .dropdown-menu{border-color:#363636}.navbar-fixed-side.navbar-inverse .divider{background-color:#363636}.navbar-fixed-side.navbar-inverse .navbar-nav .dropdown-menu>li>a{color:#9d9d9d}.navbar-fixed-side.navbar-inverse .navbar-nav .dropdown-menu>.active>a{background-color:#090909;color:#fff}.navbar-fixed-side.navbar-inverse .navbar-nav>li:not(.active)>a:hover,.navbar-fixed-side.navbar-inverse .navbar-nav>li:not(.active)>a:focus,.navbar-fixed-side.navbar-inverse .navbar-nav .dropdown-menu>li:not(.active)>a:hover,.navbar-fixed-side.navbar-inverse .navbar-nav .dropdown-menu>li:not(.active)>a:focus{background-color:#2f2f2f;color:#fff}.navbar-fixed-side.navbar-inverse .dropdown>.dropdown-toggle{color:#777777 !important}}
website/templates/base.html
+7 -8
View File
@@ -5,19 +5,18 @@
<title>{% block title %}La maraude{% endblock %}</title>
{% if stylesheets %}{% for stylesheet in stylesheets %}<link rel="stylesheet" type="text/css" href="{% static stylesheet %}" />{% endfor %}{% endif %}
{# Load CSS and JavaScript #}{% bootstrap_css %}{% bootstrap_javascript %}
<link href="/static/bootstrap/navbar-fixed-side.css" rel="stylesheet" />
</head>
<body>
{% block globalnav %}{% endblock %}
<div class="container">
<div class="container-fluid">
<div class="row">
{% if panels %}<div class="col-md-8">{% else %}<div class="col-md-12">{% endif %}
{% bootstrap_messages %}
<div class="page-header"><h1>{% block page_header %}Header{% endblock %}</h1></div>
<div class="col-sm-4 col-md-4 col-lg-2">
{% include "navbar.html" %}
</div>
<div class="col-sm-8 col-md-8 col-lg-10">
<h1 class="page-header">{% block page_header %}{% endblock %}</h1>
{% block content %}{% endblock %}
</div>
{% if panels %}<div class="col-md-4" id="sidebar">
{% block panels %}{% endblock %}
</div>{% endif %}
</div>
</div>
</body>
website/templates/base_site.html
-7
View File
@@ -3,13 +3,6 @@
{% block title %}{{ page_title }}{% endblock %}
{% block page_header %}{{ page_header }} <small>{{ page_header_small }}</small>{% endblock %}
{% block globalnav %}
<div class="row">
<div class="col-md-12">
{% include "navbar.html" %}
</div>
</div>
{% endblock %}
{% block content %}{% include content_template %}{% endblock %}
website/templates/login.html
-7
View File
@@ -5,13 +5,6 @@
{# Tweak columns layout for login box %}
{% block panels %}<div class="col-md-8 col-md-offset-2">{% endblock %}
{% block page_header %}
<div class="jumbotron bg-warning">
<h2>ALSA - Projet Maraude</h2>
<p>Description de la maraude...</p>
</div>
{% endblock %}
{% block content %}
<div class="panel panel-primary">
<div class="panel-heading"><h3 class="panel-title">Connexion</h3></div>
website/templates/main.html
+10 -36
View File
@@ -1,38 +1,12 @@
{% load bootstrap3 %}
<div class="col-md-12 col-lg-6">
<div class="jumbotron">
<h2>Objectifs</h2>
<p>Description de la maraude à destination des visiteurs, partenaires, etc...</p>
<h2>Nous rencontrer</h2>
{% block content %}
{% bootstrap_messages %}
<div class="panel panel-default">
<div class="panel-heading"><h3 class="panel-title">Maraude ALSA</h3></div>
<div class="panel-body text-center">
{% if user.is_authenticated %}
<p>Bienvenue {{ user }} !</p>
<div class="btn-group">
<a href="{% url 'maraudes:index' %}" class="btn btn-primary">Entrer</a>
{% if user.is_superuser %}
<a href="admin/" class="btn btn-warning">Administration</a>
{% endif %}
<p>Les maraudeurs arpentent les rues de Mulhouse les <b>lundis</b>, <b>mardis</b> et <b>jeudis</b> en soirée,
et les <b>vendredis</b> en fin d'après-midi.
</p>
<p>Ils sont reconnaissables à leur vestes oranges, n'hésitez pas à les interpeller.</p>
</div>
{% else %}
{% if form.errors %}
<p>Your username and password didn't match. Please try again.</p>
{% endif %}
{% if next %}
{% if user.is_authenticated %}
<div class="alert alert-warning"><p>Your account doesn't have access to this page. To proceed,
please login with an account that has access.</p></div>
{% else %}
<div class="alert alert-danger"><p>Veuillez vous connecter pour accéder à cette page.</p></div>
{% endif %}
{% endif %}
<form method="post" action="{% url 'django.contrib.auth.views.login' %}">
{% csrf_token %}
{% bootstrap_form form %}
{% bootstrap_button "Connexion" button_type="submit" button_class="btn-lg btn-primary" %}
<input type="hidden" name="next" value="{{ next|default:'maraudes/' }}" />
</form>
{% endif %}
</div>
<div class="panel-footer"><p>version: 0.01</p></div>
</div>
{% endblock %}
</div>
website/templates/navbar.html
+41 -21
View File
@@ -1,25 +1,45 @@
{% load bootstrap3 %}{% load staticfiles %}
<nav class="navbar navbar-inverse navbar-static-top" role="navigation" id="menu">
<nav class="navbar navbar-inverse navbar-fixed-side" role="navigation" id="menu">
<div class="container">
<ul class="nav navbar-nav navbar-left">{% for app in apps %}
<li {% if app == active_app %} class="active" {%endif%}>
<a href="/{{app.label}}/">{{ app.name|title }}</a>
</li>{%endfor%}
</ul>
{% if prochaine_maraude_abs %}<p class="navbar-text">{% bootstrap_icon "calendar" %} <b>Prochaine maraude :</b>
{% if prochaine_maraude_abs.date == now.date %} Aujourd'hui {% else %} {{ prochaine_maraude_abs.date }} {% endif %}
- {{ prochaine_maraude_abs.heure_debut.hour }}h</p>{%endif%}
<!-- Navbar Right Aligned elements -->
<ul class="nav navbar-nav navbar-right">
<li class="dropdown">
<a id="UserMenu" href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
{% bootstrap_icon "user" %} {{user}} <span class="caret"></span></a>
<ul class="dropdown-menu" aria-labelledby="UserMenu">
{% if user.is_authenticated %}{% if user.is_superuser %}<li><a href="/admin/">Administration</a></li>
<li role="separator" class="divider"></li>{% endif %}
<li><a href="{% url 'logout' %}">Déconnecter</a></li>{% endif %}
</ul>
</li>
</ul>
<div class="navbar-header">
<button class="navbar-toggle" data-target=".navbar-collapse" data-toggle="collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="{% url 'index' %}">La Maraude ALSA</a>
</div>{% if user.is_authenticated %}
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav">{% for app in apps %}
<li {% if app == active_app %} class="active" {%endif%}>
<a href="/{{app.label}}/"><strong style="color:#fff;">{{ app.name|title }}</strong></a>
</li>
{% if app == active_app %}{% for t in app_menu %}{% include t %}{% endfor %}{% endif %}
{%endfor%}
</ul>
<ul class="nav navbar-nav navbar-right">
<li class="dropdown">
<a id="UserMenu" href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
{% bootstrap_icon "user" %} {{user}} <span class="caret"></span></a>
<ul class="dropdown-menu" aria-labelledby="UserMenu">
{% if user.is_superuser %}<li><a href="/admin/">Administration {% bootstrap_icon "new-window" %} </a></li>{% endif %}
<li><a href="{% url 'logout' %}">Déconnecter {% bootstrap_icon "log-out" %}</a></li>
</ul>
</li>
</ul>
</div>
{% else %}
<div class="collapse navbar-collapse">
<div class="text-center navbar-text"><h4 style="color:#fff;">Connexion</h4></div>
<form class="navbar-form navbar-left" method="post" action="{% url 'login' %}">
<div class="form-group text-center">{% csrf_token %}
<input autofocus="" class="form-control" id="id_username" maxlength="254" name="username" placeholder="Nom d&#39;utilisateur" title="" type="text" required />
<input class="form-control" id="id_password" name="password" placeholder="Mot de passe" title="" type="password" required />
<input type="hidden" name="next" value="{{ next|default:'/maraudes/' }}" /><br />
<button class="btn btn-default" type="submit">Se connecter</button>
</div>
</form>
</div>{% endif %}
</div>
</nav>
website/urls.py
+2 -2
View File
@@ -2,13 +2,13 @@ from django.conf.urls import include, url
from django.contrib.auth import views as auth_views
from .views import index_view
from .views import Index
from maraudes import urls as maraudes_urls
from suivi import urls as suivi_urls
from sujets import urls as sujets_urls
urlpatterns = [
url('^$', index_view, name="index"),
url('^$', Index.as_view(), name="index"),
# Applications
url(r'^maraudes/', include(maraudes_urls, namespace="maraudes")),
url(r'^suivi/', include(suivi_urls, namespace="suivi")),
website/views.py
+19 -5
View File
@@ -1,7 +1,21 @@
from django.shortcuts import redirect
from django import views
from .mixins import WebsiteTemplateMixin
class Index(WebsiteTemplateMixin, views.generic.TemplateView):
template_name = "main.html"
app_menu = [] #TODO: fix this !
class PageInfo:
title = "La maraude ALSA"
header = "La Maraude ALSA"
header_small = "informations"
def get(self, request, *args, **kwargs):
if not request.user.is_authenticated():
return super().get(request, *args, **kwargs)
else:
return redirect('maraudes:index')
def index_view(request):
if not request.user.is_authenticated():
return redirect('login')
else:
return redirect('maraudes:index')