From 6a8153cecb5ccd6a5d8fb27bd778a2aae06867ed Mon Sep 17 00:00:00 2001 From: Phuoc CAO Date: Fri, 9 Dec 2022 14:51:46 +0100 Subject: [PATCH] version 1.0 + dropdown menu --- cao_blogr.sqlite | Bin 28672 -> 28672 bytes cao_blogr/static/theme.css | 26 ++++++++++++-------- cao_blogr/templates/layout.jinja2 | 39 +++++++++++++++--------------- cao_blogr/views/default.py | 3 +-- setup.py | 3 ++- 5 files changed, 39 insertions(+), 32 deletions(-) diff --git a/cao_blogr.sqlite b/cao_blogr.sqlite index 97fdc7d86e9748374d7d4df9e0ed0bee71974ff3..b37c3522c7d84311982f0acd40fd129a23d41608 100644 GIT binary patch delta 264 zcmZp8z}WDBae_3X<3t%}M#qf_OZ<75c(yR`Y~jt~+sC(Wv!K8dp2=HcCi9tCnHX9b z8S5FFn;V*#O%9DUtuGHS$j(W0^7GI4jLeIwC{xi(@$v93%L{Q23P}w~@hSK647G5# z40AE5C~)^p^bhmR3`&gj^UT%{N^$ZI$ji;Q&`bBo^G)*Aa}JIO&oa)o4AM6!Ds?U{ z%`Oe7GA;Hfx5#odFfuSQ(ls>FHLz4L1iQl2P|wiN(v;22h=GCe>t_DAKt>h@28IQb zQ{or!F!8@-;Q!A5mj5RIO`z+~@T-WFr4|>Y7J-y-Cgta)Fmp1CGZti&<|i|8FpG00 JrsQVk0RYH=PYVD5 delta 267 zcmV+m0rdWW-~oW(0gxL3I*}Yh0Xnf@q)!Y44730Yv<+$xU=F^s5fG#dleAou4lp`1 zG&(djE;leXG&D7nRb4fIS20O*LPpujbxc+{XKrmbOF?mUHgGpdPjzQ#P&r6rabY-4HcD1+ zXG}0wW-l^hZdoo&aAz(uFfuYNFf=VPF(5EEIyE^uGB7SRH!?8>Ha7qO0JF0XUQq!A zfgJ+}lVo3@3a31MVyX>PL?PhtQ7 diff --git a/cao_blogr/static/theme.css b/cao_blogr/static/theme.css index e9a3590..302815a 100644 --- a/cao_blogr/static/theme.css +++ b/cao_blogr/static/theme.css @@ -102,16 +102,6 @@ h3, h4 { .navbar-default .navbar-toggle { border-color: transparent; } -.open .dropdown-toggle { - color: #fff; - background-color: #555 !important; -} -.dropdown-menu li a { - color: #000 !important; -} -.dropdown-menu li a:hover { - background-color: red !important; -} footer { background-color: #bc2131; color: #f5f5f5; @@ -134,4 +124,20 @@ textarea { content: "*"; color: red; margin-left:2px; +} + +/* Dropdown */ +.open .dropdown-toggle { + color: #fff ; + background-color: #555 !important; +} + +/* Dropdown links */ +.dropdown-menu li a { + color: #000 !important; +} + +/* On hover, the dropdown links will turn red */ +.dropdown-menu li a:hover { + background-color: red !important; } \ No newline at end of file diff --git a/cao_blogr/templates/layout.jinja2 b/cao_blogr/templates/layout.jinja2 index c8fdf7e..ecd8cd7 100644 --- a/cao_blogr/templates/layout.jinja2 +++ b/cao_blogr/templates/layout.jinja2 @@ -10,16 +10,13 @@ {{page_title}} - - + + + + - - @@ -36,15 +33,24 @@ @@ -88,12 +94,7 @@

© 2017 - Phuoc Cao -  | A propos - - {% if request.authenticated_userid == 'admin' %} -  | Utilisateurs - {% endif %} - +  | A propos

diff --git a/cao_blogr/views/default.py b/cao_blogr/views/default.py index 352b157..a422d4b 100644 --- a/cao_blogr/views/default.py +++ b/cao_blogr/views/default.py @@ -77,8 +77,7 @@ def users(request): } -@view_config(route_name='user_add', - renderer='cao_blogr:templates/user_add.jinja2', permission='manage') +@view_config(route_name='user_add', renderer='cao_blogr:templates/user_add.jinja2', permission='manage') def user_add(request): name = request.matchdict['name'] diff --git a/setup.py b/setup.py index 8b2525b..7a5861c 100644 --- a/setup.py +++ b/setup.py @@ -16,6 +16,7 @@ requires = [ 'waitress', 'alembic', 'pyramid_retry', + 'pyramid_layout', 'pyramid_tm', 'SQLAlchemy', 'transaction', @@ -34,7 +35,7 @@ tests_require = [ setup( name='cao_blogr', - version='0.1', + version='1.0', description='cao_blogr', long_description=README + '\n\n' + CHANGES, classifiers=[