From 0d1cece6db13f2f3d3dab48ee04d0a4d8b7a6ec3 Mon Sep 17 00:00:00 2001 From: Qwann Date: Tue, 24 Jan 2017 19:56:58 +0100 Subject: [PATCH 01/13] adding columns features --- kfet/static/kfet/css/index.css | 144 +++++++++++++++++++++++++++++ kfet/templates/kfet/home.html | 161 +++++++++++++++++++++++++++++++++ 2 files changed, 305 insertions(+) diff --git a/kfet/static/kfet/css/index.css b/kfet/static/kfet/css/index.css index 6821a4e4..b1509727 100644 --- a/kfet/static/kfet/css/index.css +++ b/kfet/static/kfet/css/index.css @@ -372,3 +372,147 @@ textarea { .stat-graph { height: 100px; } + +/* + * Responsive Columns + */ + +.column-row { + padding: 15px 20px; +} + +.column-xs-1, +.column-sm-1, +.column-md-1, +.column-lg-1, +.column-xs-2, +.column-sm-2, +.column-md-2, +.column-lg-2, +.column-xs-3, +.column-sm-3, +.column-md-3, +.column-lg-3, +.column-xs-4, +.column-sm-4, +.column-md-4, +.column-lg-4, +.column-xs-5, +.column-sm-5, +.column-md-5, +.column-lg-5 { + -webkit-column-count: 1; /* Chrome, Safari, Opera */ + -moz-column-count: 1; /* Firefox */ + column-count: 1; +} + + +.column-xs-1 { + -webkit-column-count: 1; /* Chrome, Safari, Opera */ + -moz-column-count: 1; /* Firefox */ + column-count: 1; +} +.column-xs-2 { + -webkit-column-count: 2; /* Chrome, Safari, Opera */ + -moz-column-count: 2; /* Firefox */ + column-count: 2; +} +.column-xs-3 { + -webkit-column-count: 3; /* Chrome, Safari, Opera */ + -moz-column-count: 3; /* Firefox */ + column-count: 3; +} +.column-xs-4 { + -webkit-column-count: 4; /* Chrome, Safari, Opera */ + -moz-column-count: 4; /* Firefox */ + column-count: 4; +} +.column-xs-5 { + -webkit-column-count: 5; /* Chrome, Safari, Opera */ + -moz-column-count: 5; /* Firefox */ + column-count: 5; +} + +@media (min-width: 576px) { + .column-sm-1 { + -webkit-column-count: 1; /* Chrome, Safari, Opera */ + -moz-column-count: 1; /* Firefox */ + column-count: 1; + } + .column-sm-2 { + -webkit-column-count: 2; /* Chrome, Safari, Opera */ + -moz-column-count: 2; /* Firefox */ + column-count: 2; + } + .column-sm-3 { + -webkit-column-count: 3; /* Chrome, Safari, Opera */ + -moz-column-count: 3; /* Firefox */ + column-count: 3; + } + .column-sm-4 { + -webkit-column-count: 4; /* Chrome, Safari, Opera */ + -moz-column-count: 4; /* Firefox */ + column-count: 4; + } + .column-sm-5 { + -webkit-column-count: 5; /* Chrome, Safari, Opera */ + -moz-column-count: 5; /* Firefox */ + column-count: 5; + } +} + +@media (min-width: 768px) { + .column-md-1 { + -webkit-column-count: 1; /* Chrome, Safari, Opera */ + -moz-column-count: 1; /* Firefox */ + column-count: 1; + } + .column-md-2 { + -webkit-column-count: 2; /* Chrome, Safari, Opera */ + -moz-column-count: 2; /* Firefox */ + column-count: 2; + } + .column-md-3 { + -webkit-column-count: 3; /* Chrome, Safari, Opera */ + -moz-column-count: 3; /* Firefox */ + column-count: 3; + } + .column-md-4 { + -webkit-column-count: 4; /* Chrome, Safari, Opera */ + -moz-column-count: 4; /* Firefox */ + column-count: 4; + } + .column-md-5 { + -webkit-column-count: 5; /* Chrome, Safari, Opera */ + -moz-column-count: 5; /* Firefox */ + column-count: 5; + } +} + +@media (min-width: 992px) { + .column-lg-1 { + -webkit-column-count: 1; /* Chrome, Safari, Opera */ + -moz-column-count: 1; /* Firefox */ + column-count: 1; + } + .column-lg-2 { + -webkit-column-count: 2; /* Chrome, Safari, Opera */ + -moz-column-count: 2; /* Firefox */ + column-count: 2; + } + .column-lg-3 { + -webkit-column-count: 3; /* Chrome, Safari, Opera */ + -moz-column-count: 3; /* Firefox */ + column-count: 3; + } + .column-lg-4 { + -webkit-column-count: 4; /* Chrome, Safari, Opera */ + -moz-column-count: 4; /* Firefox */ + column-count: 4; + } + .column-lg-5 { + -webkit-column-count: 5; /* Chrome, Safari, Opera */ + -moz-column-count: 5; /* Firefox */ + column-count: 5; + } +} diff --git a/kfet/templates/kfet/home.html b/kfet/templates/kfet/home.html index fb1e78b7..6db833df 100644 --- a/kfet/templates/kfet/home.html +++ b/kfet/templates/kfet/home.html @@ -8,10 +8,171 @@
+
+
+
Trucs
+
à dire
+
+
+ Choix 1 + Choix 2 + Choix 3 +
+
{% include 'kfet/base_messages.html' %} +
+
+

Carte

+
+
+ Inter quos Paulus eminebat notarius ortus in Hispania, glabro quidam sub vultu latens, odorandi vias periculorum occultas perquam sagax. is in Brittanniam missus ut militares quosdam perduceret ausos conspirasse Magnentio, cum reniti non possent, iussa licentius supergressus fluminis modo fortunis conplurium sese repentinus infudit et ferebatur per strages multiplices ac ruinas, vinculis membra ingenuorum adfligens et quosdam obterens manicis, crimina scilicet multa consarcinando a veritate longe discreta. unde admissum est facinus impium, quod Constanti tempus nota inusserat sempiterna. + + Hae duae provinciae bello quondam piratico catervis mixtae praedonum a Servilio pro consule missae sub iugum factae sunt vectigales. et hae quidem regiones velut in prominenti terrarum lingua positae ob orbe eoo monte Amano disparantur. + + Etenim si attendere diligenter, existimare vere de omni hac causa volueritis, sic constituetis, iudices, nec descensurum quemquam ad hanc accusationem fuisse, cui, utrum vellet, liceret, nec, cum descendisset, quicquam habiturum spei fuisse, nisi alicuius intolerabili libidine et nimis acerbo odio niteretur. Sed ego Atratino, humanissimo atque optimo adulescenti meo necessario, ignosco, qui habet excusationem vel pietatis vel necessitatis vel aetatis. Si voluit accusare, pietati tribuo, si iussus est, necessitati, si speravit aliquid, pueritiae. Ceteris non modo nihil ignoscendum, sed etiam acriter est resistendum. + + Post hanc adclinis Libano monti Phoenice, regio plena gratiarum et venustatis, urbibus decorata magnis et pulchris; in quibus amoenitate celebritateque nominum Tyros excellit, Sidon et Berytus isdemque pares Emissa et Damascus saeculis condita priscis. + + Post hanc adclinis Libano monti Phoenice, regio plena gratiarum et venustatis, urbibus decorata magnis et pulchris; in quibus amoenitate celebritateque nominum Tyros excellit, Sidon et Berytus isdemque pares Emissa et Damascus saeculis condita priscis. + + Et Epigonus quidem amictu tenus philosophus, ut apparuit, prece frustra temptata, sulcatis lateribus mortisque metu admoto turpi confessione cogitatorum socium, quae nulla erant, fuisse firmavit cum nec vidisset quicquam nec audisset penitus expers forensium rerum; Eusebius vero obiecta fidentius negans, suspensus in eodem gradu constantiae stetit latrocinium illud esse, non iudicium clamans. + + Sed cautela nimia in peiores haeserat plagas, ut narrabimus postea, aemulis consarcinantibus insidias graves apud Constantium, cetera medium principem sed siquid auribus eius huius modi quivis infudisset ignotus, acerbum et inplacabilem et in hoc causarum titulo dissimilem sui. + + Superatis Tauri montis verticibus qui ad solis ortum sublimius attolluntur, Cilicia spatiis porrigitur late distentis dives bonis omnibus terra, eiusque lateri dextro adnexa Isauria, pari sorte uberi palmite viget et frugibus minutis, quam mediam navigabile flumen Calycadnus interscindit. + + Quid enim tam absurdum quam delectari multis inanimis rebus, ut honore, ut gloria, ut aedificio, ut vestitu cultuque corporis, animante virtute praedito, eo qui vel amare vel, ut ita dicam, redamare possit, non admodum delectari? Nihil est enim remuneratione benevolentiae, nihil vicissitudine studiorum officiorumque iucundius. + + Hac ex causa conlaticia stipe Valerius humatur ille Publicola et subsidiis amicorum mariti inops cum liberis uxor alitur Reguli et dotatur ex aerario filia Scipionis, cum nobilitas florem adultae virginis diuturnum absentia pauperis erubesceret patris. + + Harum trium sententiarum nulli prorsus assentior. Nec enim illa prima vera est, ut, quem ad modum in se quisque sit, sic in amicum sit animatus. Quam multa enim, quae nostra causa numquam faceremus, facimus causa amicorum! precari ab indigno, supplicare, tum acerbius in aliquem invehi insectarique vehementius, quae in nostris rebus non satis honeste, in amicorum fiunt honestissime; multaeque res sunt in quibus de suis commodis viri boni multa detrahunt detrahique patiuntur, ut iis amici potius quam ipsi fruantur. + +
+
+
+
{% endblock %} + +{% block extra_head %} + + +{% endblock %} From a63966b2f69298c029db9f4b76a949cbea2e1f82 Mon Sep 17 00:00:00 2001 From: Qwann Date: Wed, 25 Jan 2017 23:41:16 +0100 Subject: [PATCH 02/13] carte styling done --- kfet/static/kfet/css/home.css | 43 +++++++++++++++++++++++++++ kfet/static/kfet/css/index.css | 6 ++++ kfet/templates/kfet/home.html | 54 ++++++++++++++++++++-------------- kfet/urls.py | 2 +- kfet/views.py | 18 +++++++++--- 5 files changed, 96 insertions(+), 27 deletions(-) create mode 100644 kfet/static/kfet/css/home.css diff --git a/kfet/static/kfet/css/home.css b/kfet/static/kfet/css/home.css new file mode 100644 index 00000000..cf584eac --- /dev/null +++ b/kfet/static/kfet/css/home.css @@ -0,0 +1,43 @@ +ul.carte { + width: 100%; + list-style-type: none; + padding-left: 15px; + padding-right: 15px; + display: inline-block; + *display: inline; + zoom: 1; + position: relative; + clip: auto; + overflow: hidden; +} +/* +ul.carte > li { + border-style: none none solid none; + border-width: 1px; + border-color: #DDD; +} +*/ +li.carte-line { + position: relative; + text-align: right; + white-space: nowrap; +} +.filler { + position: absolute; + left: 0; + right: 0; + border-bottom: 3px dotted #333; + height: 70%; +} +.carte-label { + background: white; + float: left; + margin-right: 20px; + padding-right: 4px; + position: relative; +} +.carte-ukf { + background: white; + padding-left: 4px; + position: relative; +} diff --git a/kfet/static/kfet/css/index.css b/kfet/static/kfet/css/index.css index b1509727..2d18e2de 100644 --- a/kfet/static/kfet/css/index.css +++ b/kfet/static/kfet/css/index.css @@ -377,6 +377,12 @@ textarea { * Responsive Columns */ +.unbreakable { + display:inline-block; + width: 100%; +} + + .column-row { padding: 15px 20px; } diff --git a/kfet/templates/kfet/home.html b/kfet/templates/kfet/home.html index 6db833df..d427fe9c 100644 --- a/kfet/templates/kfet/home.html +++ b/kfet/templates/kfet/home.html @@ -1,5 +1,6 @@ {% extends "kfet/base.html" %} {% load staticfiles %} +{% load kfet_tags %} {% block title %}Accueil{% endblock %} {% block content-header-title %}Accueil{% endblock %} @@ -27,28 +28,36 @@

Carte

- Inter quos Paulus eminebat notarius ortus in Hispania, glabro quidam sub vultu latens, odorandi vias periculorum occultas perquam sagax. is in Brittanniam missus ut militares quosdam perduceret ausos conspirasse Magnentio, cum reniti non possent, iussa licentius supergressus fluminis modo fortunis conplurium sese repentinus infudit et ferebatur per strages multiplices ac ruinas, vinculis membra ingenuorum adfligens et quosdam obterens manicis, crimina scilicet multa consarcinando a veritate longe discreta. unde admissum est facinus impium, quod Constanti tempus nota inusserat sempiterna. - - Hae duae provinciae bello quondam piratico catervis mixtae praedonum a Servilio pro consule missae sub iugum factae sunt vectigales. et hae quidem regiones velut in prominenti terrarum lingua positae ob orbe eoo monte Amano disparantur. - - Etenim si attendere diligenter, existimare vere de omni hac causa volueritis, sic constituetis, iudices, nec descensurum quemquam ad hanc accusationem fuisse, cui, utrum vellet, liceret, nec, cum descendisset, quicquam habiturum spei fuisse, nisi alicuius intolerabili libidine et nimis acerbo odio niteretur. Sed ego Atratino, humanissimo atque optimo adulescenti meo necessario, ignosco, qui habet excusationem vel pietatis vel necessitatis vel aetatis. Si voluit accusare, pietati tribuo, si iussus est, necessitati, si speravit aliquid, pueritiae. Ceteris non modo nihil ignoscendum, sed etiam acriter est resistendum. - - Post hanc adclinis Libano monti Phoenice, regio plena gratiarum et venustatis, urbibus decorata magnis et pulchris; in quibus amoenitate celebritateque nominum Tyros excellit, Sidon et Berytus isdemque pares Emissa et Damascus saeculis condita priscis. - - Post hanc adclinis Libano monti Phoenice, regio plena gratiarum et venustatis, urbibus decorata magnis et pulchris; in quibus amoenitate celebritateque nominum Tyros excellit, Sidon et Berytus isdemque pares Emissa et Damascus saeculis condita priscis. - - Et Epigonus quidem amictu tenus philosophus, ut apparuit, prece frustra temptata, sulcatis lateribus mortisque metu admoto turpi confessione cogitatorum socium, quae nulla erant, fuisse firmavit cum nec vidisset quicquam nec audisset penitus expers forensium rerum; Eusebius vero obiecta fidentius negans, suspensus in eodem gradu constantiae stetit latrocinium illud esse, non iudicium clamans. - - Sed cautela nimia in peiores haeserat plagas, ut narrabimus postea, aemulis consarcinantibus insidias graves apud Constantium, cetera medium principem sed siquid auribus eius huius modi quivis infudisset ignotus, acerbum et inplacabilem et in hoc causarum titulo dissimilem sui. - - Superatis Tauri montis verticibus qui ad solis ortum sublimius attolluntur, Cilicia spatiis porrigitur late distentis dives bonis omnibus terra, eiusque lateri dextro adnexa Isauria, pari sorte uberi palmite viget et frugibus minutis, quam mediam navigabile flumen Calycadnus interscindit. - - Quid enim tam absurdum quam delectari multis inanimis rebus, ut honore, ut gloria, ut aedificio, ut vestitu cultuque corporis, animante virtute praedito, eo qui vel amare vel, ut ita dicam, redamare possit, non admodum delectari? Nihil est enim remuneratione benevolentiae, nihil vicissitudine studiorum officiorumque iucundius. - - Hac ex causa conlaticia stipe Valerius humatur ille Publicola et subsidiis amicorum mariti inops cum liberis uxor alitur Reguli et dotatur ex aerario filia Scipionis, cum nobilitas florem adultae virginis diuturnum absentia pauperis erubesceret patris. - - Harum trium sententiarum nulli prorsus assentior. Nec enim illa prima vera est, ut, quem ad modum in se quisque sit, sic in amicum sit animatus. Quam multa enim, quae nostra causa numquam faceremus, facimus causa amicorum! precari ab indigno, supplicare, tum acerbius in aliquem invehi insectarique vehementius, quae in nostris rebus non satis honeste, in amicorum fiunt honestissime; multaeque res sunt in quibus de suis commodis viri boni multa detrahunt detrahique patiuntur, ut iis amici potius quam ipsi fruantur. - +
+

Pressions du moment

+
    + {% for article in pressions.articles.all %} + {% if article.is_sold %} +
  • +
    + {{ article.name }} + {{ article.price | ukf:False}} UKF +
    • + {% endif %} + {% endfor %} +
+
+ {% for category in categories %} +
+

{{ category.name }}

+
    + {% for article in category.articles.all %} + {% if article.is_sold %} +
  • +
    + {{ article.name }} + {{ article.price | ukf:False}} UKF +
    • + {% endif %} + {% endfor %} +
+
+ {% endfor %}
@@ -59,6 +68,7 @@ {% endblock %} {% block extra_head %} + +{% endblock %} + + +{% block content %}
-
Trucs
-
à dire
+
La K-Fêt est Peut-être
+
???????
+
+ Dernière activité il y a + +
+
@@ -67,124 +79,107 @@
-{% endblock %} - -{% block extra_head %} - - + {% endblock %} + diff --git a/kfet/views.py b/kfet/views.py index ac885675..15059ec2 100644 --- a/kfet/views.py +++ b/kfet/views.py @@ -44,10 +44,15 @@ class Home(TemplateView): def get_context_data(self, **kwargs): context = super(TemplateView, self).get_context_data(**kwargs) + # Carte articles = Article.objects.all().filter(is_sold=True, hidden=False) context['pressions'] = articles.filter(category__name='Pression') context['articles'] = (articles.exclude(category__name='Pression') .order_by('category')) + # La K-Fêt est ouverte ? + last_opgroup = OperationGroup.objects.all().order_by('-at').first() + context['last_op'] = last_opgroup.at.isoformat() + # context['dark'] = return context @method_decorator(login_required) @@ -1108,6 +1113,12 @@ def kpsul_perform_operations(request): 'stock': article['stock'] }) consumers.KPsul.group_send('kfet.kpsul', websocket_data) + + # Websocket last operation + websocket_last_op = {} + websocket_last_op['last_op'] = operationgroup.at.isoformat() + consumers.Home.group_send('kfet.home', websocket_last_op) + return JsonResponse(data) @teamkfet_required From a4fdb992679b790c081e82cc4af65e503b6507e8 Mon Sep 17 00:00:00 2001 From: Qwann Date: Wed, 8 Feb 2017 12:42:07 +0100 Subject: [PATCH 07/13] =?UTF-8?q?Revert=20"WS=20:=20quand=20la=20K-F=C3=AA?= =?UTF-8?q?t=20est=20ouverte=20=3F"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ce9f717f0608b981577933cb30da3e94e759b26b. --- kfet/consumers.py | 18 --- kfet/routing.py | 1 - kfet/static/kfet/css/index.css | 20 --- kfet/templates/kfet/home.html | 239 +++++++++++++++++---------------- kfet/views.py | 11 -- 5 files changed, 122 insertions(+), 167 deletions(-) diff --git a/kfet/consumers.py b/kfet/consumers.py index 2525b28f..dcd69bdf 100644 --- a/kfet/consumers.py +++ b/kfet/consumers.py @@ -24,21 +24,3 @@ class KPsul(JsonWebsocketConsumer): def disconnect(self, message, **kwargs): pass - -class Home(JsonWebsocketConsumer): - - # Set to True if you want them, else leave out - strict_ordering = False - slight_ordering = False - - def connection_groups(self, **kwargs): - return ['kfet.home'] - - def connect(self, message, **kwargs): - pass - - def receive(self, content, **kwargs): - pass - - def disconnect(self, message, **kwargs): - pass diff --git a/kfet/routing.py b/kfet/routing.py index 440fb3ce..5ea343cb 100644 --- a/kfet/routing.py +++ b/kfet/routing.py @@ -9,5 +9,4 @@ from kfet import consumers channel_routing = [ route_class(consumers.KPsul, path=r"^/ws/k-fet/k-psul/$"), - route_class(consumers.Home, path=r"^/ws/k-fet/home/$"), ] diff --git a/kfet/static/kfet/css/index.css b/kfet/static/kfet/css/index.css index fb30da5f..2d18e2de 100644 --- a/kfet/static/kfet/css/index.css +++ b/kfet/static/kfet/css/index.css @@ -149,12 +149,6 @@ textarea { line-height:30px; } -.content-left .line-medium { - font-size:20px; - font-weight:bold; - text-align:center; -} - .content-left .line.line-big { font-family:Oswald; font-size:60px; @@ -162,13 +156,6 @@ textarea { text-align:center; } -.content-left .line.line-large { - font-family:Oswald; - font-size:40px; - font-weight:bold; - text-align:center; -} - .content-left .line.line-bigsub { font-size:25px; font-weight:bold; @@ -179,13 +166,6 @@ textarea { font-size:45px; text-align:center; } -/* -.content-left-top .line.to-colorize { - padding-left: 30px; - padding-right: 30px; - margin-left: -30px; - margin-right: -30px; -}*/ .content-right { margin:0 15px; diff --git a/kfet/templates/kfet/home.html b/kfet/templates/kfet/home.html index 1d488847..31feece2 100644 --- a/kfet/templates/kfet/home.html +++ b/kfet/templates/kfet/home.html @@ -5,32 +5,20 @@ {% block title %}Accueil{% endblock %} {% block content-header-title %}Accueil{% endblock %} - -{% block extra_head %} - - -{% endblock %} - - {% block content %} +
-
La K-Fêt est Peut-être
-
???????
-
- Dernière activité il y a - -
+
Trucs
+
à dire
-
@@ -79,107 +67,124 @@
- - {% endblock %} +{% block extra_head %} + + + +{% endblock %} diff --git a/kfet/views.py b/kfet/views.py index 15059ec2..ac885675 100644 --- a/kfet/views.py +++ b/kfet/views.py @@ -44,15 +44,10 @@ class Home(TemplateView): def get_context_data(self, **kwargs): context = super(TemplateView, self).get_context_data(**kwargs) - # Carte articles = Article.objects.all().filter(is_sold=True, hidden=False) context['pressions'] = articles.filter(category__name='Pression') context['articles'] = (articles.exclude(category__name='Pression') .order_by('category')) - # La K-Fêt est ouverte ? - last_opgroup = OperationGroup.objects.all().order_by('-at').first() - context['last_op'] = last_opgroup.at.isoformat() - # context['dark'] = return context @method_decorator(login_required) @@ -1113,12 +1108,6 @@ def kpsul_perform_operations(request): 'stock': article['stock'] }) consumers.KPsul.group_send('kfet.kpsul', websocket_data) - - # Websocket last operation - websocket_last_op = {} - websocket_last_op['last_op'] = operationgroup.at.isoformat() - consumers.Home.group_send('kfet.home', websocket_last_op) - return JsonResponse(data) @teamkfet_required From 6be2adc47a0a7d70511bfce737e995862c4658f5 Mon Sep 17 00:00:00 2001 From: Qwann Date: Wed, 8 Feb 2017 12:47:11 +0100 Subject: [PATCH 08/13] removing "open-Kfet-feature" to keep it for an other merge request --- kfet/templates/kfet/home.html | 128 +--------------------------------- 1 file changed, 2 insertions(+), 126 deletions(-) diff --git a/kfet/templates/kfet/home.html b/kfet/templates/kfet/home.html index 31feece2..f7f3b892 100644 --- a/kfet/templates/kfet/home.html +++ b/kfet/templates/kfet/home.html @@ -11,13 +11,8 @@
-
Trucs
-
à dire
-
-
- Choix 1 - Choix 2 - Choix 3 +
La K-Fêt
+
c'est cool
@@ -69,122 +64,3 @@ {% endblock %} -{% block extra_head %} - - - -{% endblock %} From ef59c115f629279dafd34283d5cca54f13de09de Mon Sep 17 00:00:00 2001 From: Qwann Date: Wed, 8 Feb 2017 15:40:58 +0100 Subject: [PATCH 09/13] avec le css c'est mieux --- kfet/static/kfet/css/home.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kfet/static/kfet/css/home.css b/kfet/static/kfet/css/home.css index eedb9048..718159c3 100644 --- a/kfet/static/kfet/css/home.css +++ b/kfet/static/kfet/css/home.css @@ -32,10 +32,14 @@ li.carte-line { .carte-label { background: white; float: left; - margin-right: 20px; padding-right: 4px; position: relative; + max-width: calc(100% - 40px); + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } + .carte-ukf { background: white; padding-left: 4px; From 9f94262b8251357270f5459c1e517861b93dd897 Mon Sep 17 00:00:00 2001 From: Qwann Date: Sun, 5 Mar 2017 19:43:26 +0100 Subject: [PATCH 10/13] removing inapropriate message --- kfet/templates/kfet/home.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/kfet/templates/kfet/home.html b/kfet/templates/kfet/home.html index f7f3b892..ef0138d1 100644 --- a/kfet/templates/kfet/home.html +++ b/kfet/templates/kfet/home.html @@ -10,10 +10,6 @@
-
-
La K-Fêt
-
c'est cool
-
From 197da2936631b14c17fa62b741de22b9d3e91d7e Mon Sep 17 00:00:00 2001 From: Qwann Date: Sun, 5 Mar 2017 20:05:35 +0100 Subject: [PATCH 11/13] css include added... --- kfet/templates/kfet/home.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kfet/templates/kfet/home.html b/kfet/templates/kfet/home.html index ef0138d1..96d28755 100644 --- a/kfet/templates/kfet/home.html +++ b/kfet/templates/kfet/home.html @@ -4,6 +4,9 @@ {% block title %}Accueil{% endblock %} {% block content-header-title %}Accueil{% endblock %} +{% block extra_head %} + +{% endblock %} {% block content %} From dcc19bd9e8a555fc077b6ec7dea80181e1f8d3b9 Mon Sep 17 00:00:00 2001 From: Qwann Date: Mon, 6 Mar 2017 01:58:33 +0100 Subject: [PATCH 12/13] article.hidden in article & article_read --- kfet/templates/kfet/article.html | 4 +++- kfet/templates/kfet/article_read.html | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/kfet/templates/kfet/article.html b/kfet/templates/kfet/article.html index 1d0a86fd..20d3ed50 100644 --- a/kfet/templates/kfet/article.html +++ b/kfet/templates/kfet/article.html @@ -33,6 +33,7 @@ Prix Stock En vente + Affiché Dernier inventaire @@ -40,7 +41,7 @@ {% for article in articles %} {% ifchanged article.category %} - {{ article.category.name }} + {{ article.category.name }} {% endifchanged %} @@ -53,6 +54,7 @@ {{ article.price }}€ {{ article.stock }} {{ article.is_sold }} + {{ article.hidden | yesno:"Caché,Affiché" }} {{ article.inventory.0.at }} {% endfor %} diff --git a/kfet/templates/kfet/article_read.html b/kfet/templates/kfet/article_read.html index 89a13cba..59481f26 100644 --- a/kfet/templates/kfet/article_read.html +++ b/kfet/templates/kfet/article_read.html @@ -16,6 +16,7 @@
Prix (hors réduc.): {{ article.price }}€
Stock: {{ article.stock }}
En vente: {{ article.is_sold }}
+
Affiché : {{ article.hidden | yesno:"Non,Oui" }}
From ca17e36b5ae2b1b516ae638588a44e4eb3aa1f6a Mon Sep 17 00:00:00 2001 From: Qwann Date: Mon, 6 Mar 2017 02:03:19 +0100 Subject: [PATCH 13/13] clean display for is_sold --- kfet/templates/kfet/article.html | 2 +- kfet/templates/kfet/article_read.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kfet/templates/kfet/article.html b/kfet/templates/kfet/article.html index 20d3ed50..17c831df 100644 --- a/kfet/templates/kfet/article.html +++ b/kfet/templates/kfet/article.html @@ -53,7 +53,7 @@ {{ article.name }} {{ article.price }}€ {{ article.stock }} - {{ article.is_sold }} + {{ article.is_sold | yesno:"En vente,Non vendu"}} {{ article.hidden | yesno:"Caché,Affiché" }} {{ article.inventory.0.at }} diff --git a/kfet/templates/kfet/article_read.html b/kfet/templates/kfet/article_read.html index 59481f26..d4219128 100644 --- a/kfet/templates/kfet/article_read.html +++ b/kfet/templates/kfet/article_read.html @@ -15,8 +15,8 @@
Prix (hors réduc.): {{ article.price }}€
Stock: {{ article.stock }}
-
En vente: {{ article.is_sold }}
-
Affiché : {{ article.hidden | yesno:"Non,Oui" }}
+
En vente: {{ article.is_sold | yesno:"Oui,Non" }}
+
Affiché: {{ article.hidden | yesno:"Non,Oui" }}