From 9462483fa5e365790116b088be12563ad8f9f9bb Mon Sep 17 00:00:00 2001 From: Phuoc CAO Date: Thu, 30 Apr 2020 17:43:50 +0200 Subject: [PATCH] refonte de doc_list et doc_view --- caotek_mesavoirs/models/members.py | 5 ++ caotek_mesavoirs/routes.py | 5 +- caotek_mesavoirs/static/css/style.less | 6 +- caotek_mesavoirs/templates/archives.pt | 20 ++++++ caotek_mesavoirs/templates/doc_list.pt | 39 ----------- caotek_mesavoirs/templates/doc_view.pt | 21 +++--- caotek_mesavoirs/templates/home.pt | 16 +++-- .../templates/layouts/global_layout.pt | 8 ++- .../templates/members/changer_mdp.pt | 57 --------------- .../templates/members/preferences.pt | 70 +++++++++++++++++++ .../templates/panels/dropdown_menu_panel.pt | 2 +- caotek_mesavoirs/views/default.py | 29 +++++--- caotek_mesavoirs/views/members.py | 14 ++-- 13 files changed, 156 insertions(+), 136 deletions(-) create mode 100644 caotek_mesavoirs/templates/archives.pt delete mode 100644 caotek_mesavoirs/templates/doc_list.pt delete mode 100644 caotek_mesavoirs/templates/members/changer_mdp.pt create mode 100644 caotek_mesavoirs/templates/members/preferences.pt diff --git a/caotek_mesavoirs/models/members.py b/caotek_mesavoirs/models/members.py index eff482b..d2f112e 100644 --- a/caotek_mesavoirs/models/members.py +++ b/caotek_mesavoirs/models/members.py @@ -47,6 +47,11 @@ def update_membre_mdp(request, login, password): query = "UPDATE members SET mdp = SHA1(:password), mdp_oublie=NULL, mdp_oublie_date=NULL WHERE email=:login;" execute_query(request, query, {'login': login, 'password': password}) +def update_membre_photo(request, login, photo_instagram): + """Update photo_instagram for member login""" + query = "UPDATE members SET photo_instagram = :photo_instagram WHERE email=:login;" + execute_query(request, query, {'login': login, 'photo_instagram': photo_instagram}) + def update_last_connection(request, login): """Update last connection for login """ query = "UPDATE members SET dern_cnx_le=NOW() WHERE email=:login;" diff --git a/caotek_mesavoirs/routes.py b/caotek_mesavoirs/routes.py index a0b5811..562c45a 100644 --- a/caotek_mesavoirs/routes.py +++ b/caotek_mesavoirs/routes.py @@ -1,9 +1,10 @@ def includeme(config): config.add_static_view('static', 'static', cache_max_age=3600) config.add_route('home', '/') + config.add_route('archives', '/archives/{theme}') config.add_route('doc_edit', '/doc_edit/{doc_id}') - config.add_route('doc_list', '/doc_list') config.add_route('doc_view', '/doc_view/{doc_id}') + config.add_route('memo_view', '/memo_view/{doc_id}') # actifs config.add_route('actif_edit', '/actif_edit/{no_id}') config.add_route('actif2_edit', '/actif2_edit/{no_id}') @@ -12,7 +13,7 @@ def includeme(config): config.add_route('histo_edit', '/histo_edit/{no_id}') config.add_route('portfolio', '/portfolio') # members - config.add_route('changer_mdp', '/changer_mdp') + config.add_route('preferences', '/preferences') config.add_route('envoyer_mdp', '/envoyer_mdp') config.add_route('login', '/login') config.add_route('logout', '/logout') diff --git a/caotek_mesavoirs/static/css/style.less b/caotek_mesavoirs/static/css/style.less index 1497aae..cc5bff7 100644 --- a/caotek_mesavoirs/static/css/style.less +++ b/caotek_mesavoirs/static/css/style.less @@ -2,15 +2,15 @@ @error: #b94a48; .navbar { - margin-bottom: 0; color: #000000 !important; background-color: #ffffff !important; - border: 0; + border-bottom: 1px solid black; border-radius: 0; + min-height: 70px; font-size: 20px !important; } -.navbar li a, .navbar .navbar-brand { +.navbar li a, .navbar { color: #000000 !important; font-size: 14px !important; } diff --git a/caotek_mesavoirs/templates/archives.pt b/caotek_mesavoirs/templates/archives.pt new file mode 100644 index 0000000..d97894d --- /dev/null +++ b/caotek_mesavoirs/templates/archives.pt @@ -0,0 +1,20 @@ + +
+ +
+ + + + + + + +
${ligne.intitule}${ligne.tag1}${ligne.cree_le.strftime("%d-%m-%Y")}${ligne.modif_le.strftime("%d-%m-%Y")}
+
+ +
+
+
+ + + diff --git a/caotek_mesavoirs/templates/doc_list.pt b/caotek_mesavoirs/templates/doc_list.pt deleted file mode 100644 index 7f0567f..0000000 --- a/caotek_mesavoirs/templates/doc_list.pt +++ /dev/null @@ -1,39 +0,0 @@ - -
- -
-

- -   - Créér une nouvelle doc -

-
- - - - - - - - -
MEMOS
${ligne.intitule}
-
-
- - - - - - - - -
DOCUMENTS
${ligne.intitule}
-
-
- -
-
-
- - - diff --git a/caotek_mesavoirs/templates/doc_view.pt b/caotek_mesavoirs/templates/doc_view.pt index 136157d..a645d5b 100644 --- a/caotek_mesavoirs/templates/doc_view.pt +++ b/caotek_mesavoirs/templates/doc_view.pt @@ -1,19 +1,14 @@
-
- -  Fermer - -  Modifier -
-
-
- Page text goes here. -
-
-
-
+ [ Fermer ] + [ Modifier ] +
+
+
+ Page text goes here. +
+


diff --git a/caotek_mesavoirs/templates/home.pt b/caotek_mesavoirs/templates/home.pt index d2400b3..317d7bb 100644 --- a/caotek_mesavoirs/templates/home.pt +++ b/caotek_mesavoirs/templates/home.pt @@ -1,9 +1,13 @@
-

Blog

+ + +

Derniers posts

- Créer un nouveau post + Voir les archives | Créer un nouveau post

@@ -11,7 +15,7 @@ ${ligne.cree_le.strftime("%Y")} ${ligne.cree_le.strftime("%d %b")} - ${ligne.intitule} + ${ligne.intitule}
@@ -21,9 +25,13 @@

EPARGNE

- +

MEMOS

+
+ +

ARTICLES

+
diff --git a/caotek_mesavoirs/templates/layouts/global_layout.pt b/caotek_mesavoirs/templates/layouts/global_layout.pt index ec960ba..b3b972c 100644 --- a/caotek_mesavoirs/templates/layouts/global_layout.pt +++ b/caotek_mesavoirs/templates/layouts/global_layout.pt @@ -64,7 +64,7 @@


-
+

${page_title}

@@ -81,9 +81,11 @@
-
-
+
+
+
+