From fcecd1f819713674c3db78cf0512ae43eab4e1aa Mon Sep 17 00:00:00 2001 From: Phuoc CAO Date: Sat, 7 May 2022 10:33:00 +0200 Subject: [PATCH] added confirmation to deleting --- cao_blogr.sqlite | Bin 245760 -> 245760 bytes cao_blogr/static/theme.css | 12 +++------ cao_blogr/templates/blog_edit.jinja2 | 29 ++++++++++++++++++++-- cao_blogr/templates/layout.jinja2 | 19 ++++++--------- cao_blogr/templates/settings.jinja2 | 7 +++--- cao_blogr/templates/topic.jinja2 | 4 +-- cao_blogr/templates/user_add.jinja2 | 2 -- cao_blogr/templates/user_pwd.jinja2 | 35 +++++++++++++++++++++++---- 8 files changed, 73 insertions(+), 35 deletions(-) diff --git a/cao_blogr.sqlite b/cao_blogr.sqlite index d5a11ea445cadaaaae6b7238d3e261ff85b87ff3..a48b3d842eba210c42825b4cca4a99fbf9dcbe82 100644 GIT binary patch delta 380 zcmZo@;BRQ)pCHXxGf~Ewv1Vh!ntT>MY2Jp-f&xXnlbdR1)-y0LEM-t^tabEC%uOv; zaLUh1Q87~~$}i1JDYi8;H8U_UP)QAqC@yp_D0ECrcJ;|kaaJ*R@~X_tb_pxZbji<( zNcJ}@Dy=HWtt`(qF-gqwu`CP>bMbME49Q51^bc`OOEJsy4Gna5E;0x+N-D`K&oDIg z3=Or+&MD4!Q;RCi^e=O_NGmHTHZU?UGSW3L)ip3zFfg|=GP5!<&@(hOH!?Nae4tLB zQ4uI?YGnu%w$L*$F*h}_-8uks7_$#qFF%`WyStyD>N%Pc6iG)zkiObRJ0 zvCIz)PA|F3OGSW3L(KWPGFtD^TF|jf<(6cl#Fg7*Ze4tLB zQPEVvzyc^{WooWxXk=_@ZpH<4HxvI`2LA8-Z~1TX-voN=3_q_(S!!`XY7q-ik~69K zW&ie<{fq_)j8lNJwR~(`sl~;KneB7`F>asxkEx)Mam&VuE7|;m#Kj#Qg(Z2xvS0$@ z8dF^ZQw2kFE1-i6jP;C6O-u~UP-P5FtxSycOpJ_8EiK%F3{z5_5{px}v$Zq-vH$?v CWOE1r diff --git a/cao_blogr/static/theme.css b/cao_blogr/static/theme.css index 0734b27..6888cb5 100644 --- a/cao_blogr/static/theme.css +++ b/cao_blogr/static/theme.css @@ -69,15 +69,10 @@ h5 { color: #555; } -.modal-header, .close { - background-color: #333; - color: #fff !important; - text-align: center; - font-size: 30px; -} -.modal-header, .modal-body { - padding: 40px 50px; +.modal-dialog { + top:7%; } + .nav-tabs li a { color: #777; } @@ -94,7 +89,6 @@ h5 { border-bottom: 1px solid black; border-radius: 0; font-size: 14px !important; - letter-spacing: 4px; min-height: 82px; opacity: 0.9; } diff --git a/cao_blogr/templates/blog_edit.jinja2 b/cao_blogr/templates/blog_edit.jinja2 index cc82354..3dd172e 100644 --- a/cao_blogr/templates/blog_edit.jinja2 +++ b/cao_blogr/templates/blog_edit.jinja2 @@ -41,8 +41,8 @@ {% if blog_id != '0' %} - + {% endif %} @@ -50,4 +50,29 @@ + + + {% endblock %} diff --git a/cao_blogr/templates/layout.jinja2 b/cao_blogr/templates/layout.jinja2 index f406d95..d9c12ec 100644 --- a/cao_blogr/templates/layout.jinja2 +++ b/cao_blogr/templates/layout.jinja2 @@ -11,14 +11,13 @@ + + + + - - @@ -40,7 +39,7 @@ {% if request.authenticated_userid %}
  • -  {{request.authenticated_userid}}
  • + {{request.authenticated_userid}}  {% else %}
  • @@ -56,6 +55,7 @@ {% if page_title %}

    {{ page_title }}

    +
    {% endif %}
    @@ -90,16 +90,11 @@

    © 2022 - Méditation SUNYATA Paris -  | Mentions légales +  | Mentions légales

    - - - - diff --git a/cao_blogr/templates/settings.jinja2 b/cao_blogr/templates/settings.jinja2 index 27c7706..9ecff1f 100644 --- a/cao_blogr/templates/settings.jinja2 +++ b/cao_blogr/templates/settings.jinja2 @@ -19,9 +19,10 @@

    Pages Paramètres

    {% if request.authenticated_userid %} -

    - [Nouveau post] -

    +

    + + Nouvelle page +

    {% endif%}
      diff --git a/cao_blogr/templates/topic.jinja2 b/cao_blogr/templates/topic.jinja2 index 60a432d..bc15406 100644 --- a/cao_blogr/templates/topic.jinja2 +++ b/cao_blogr/templates/topic.jinja2 @@ -3,8 +3,8 @@ {% block content %} {% if request.authenticated_userid %} -

      - [Nouveau post] +

      + Nouvelle page

      {% endif%} diff --git a/cao_blogr/templates/user_add.jinja2 b/cao_blogr/templates/user_add.jinja2 index 1dda899..739b677 100644 --- a/cao_blogr/templates/user_add.jinja2 +++ b/cao_blogr/templates/user_add.jinja2 @@ -2,7 +2,6 @@ {% block content %} -
      {% for error in form.username.errors %} @@ -31,6 +30,5 @@
      -
      {% endblock %} diff --git a/cao_blogr/templates/user_pwd.jinja2 b/cao_blogr/templates/user_pwd.jinja2 index c62f4f6..ae85747 100644 --- a/cao_blogr/templates/user_pwd.jinja2 +++ b/cao_blogr/templates/user_pwd.jinja2 @@ -1,19 +1,19 @@ {% extends "cao_blogr:templates/layout.jinja2" %} {% block content %} -
      - +
      Dernière connexion : - {{ entry.last_logged.strftime("%d-%m-%Y - %H:%M") }}
      + {{ entry.last_logged.strftime("%d-%m-%Y - %H:%M") }} +
      @@ -21,11 +21,36 @@ {% if name != 'new' %} - {% endif %}
      - + + + + {% endblock %}