From a6a433807c246e29e09939c9863caaa6209c25f2 Mon Sep 17 00:00:00 2001
From: Phuoc CAO <phuoc@caotek.fr>
Date: Tue, 26 Apr 2022 07:56:47 +0200
Subject: [PATCH] added red asterix to required input field

---
 cao_blogr.sqlite                     | Bin 28672 -> 28672 bytes
 cao_blogr/forms.py                   |   4 ++--
 cao_blogr/models/blog_record.py      |   4 ++--
 cao_blogr/static/theme.css           |   5 +++++
 cao_blogr/templates/blog_edit.jinja2 |   8 ++++----
 cao_blogr/templates/user_add.jinja2  |   4 ++--
 cao_blogr/templates/user_pwd.jinja2  |   2 +-
 cao_blogr/views/blog.py              |   5 ++++-
 8 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/cao_blogr.sqlite b/cao_blogr.sqlite
index 3b7184e472522b14fa6ece83bcc3f47d6cdb458d..4f6e422876b6264f85fa4bd72453d4a3835d9b22 100644
GIT binary patch
delta 285
zcmZp8z}WDBae_3X?nD`9M%|4GOZ<6QctaWZrt+Kee&Y?@EGXd0Ti+<h!p0!kSnF7p
zT3nD?q++I0lwX>cQfzBxYGz<ypb{3592l5drRQ2y=I7*6s;^R(mK7C|mgksOWuEC)
z>~545P;6Xm9+v9m<zk>$6%g$0;^Q5hVr;BmlILWWRG#fpk?0nlo$v1AQ<-U*Qlekz
zmlf<{lpg7nVHRd#q?BZq6zWpqV_;-pWTb0gqHAQPU|?!xY;I*_p=WMjU~Xc%`CF_W
zqaaY&+{(ZZD5Ga=XlQO=G}$!%JP!;1O$Pq&{7?Ab^4|pd=On*67qcWI#49Wu%%Y4*
b`FSbKoXp~k1sSFJ$xIx~;+%;oxtVzY;V4qD

delta 107
zcmZp8z}WDBae_3X_Cy(HM(vFWOZ>T*dA~96P31S`{kB<9;05pIZ?Sreg2oDlhE@g!
zR;I>!h8Cs<2Bwou<Ii(3^FLwW|IYt}|1D7IHGUZmW>LnZ{Ja!qPG)h&f{fDqWF`(~
Lan8h)+{`=x?<F4<

diff --git a/cao_blogr/forms.py b/cao_blogr/forms.py
index 189fd42..8ad68ec 100644
--- a/cao_blogr/forms.py
+++ b/cao_blogr/forms.py
@@ -23,7 +23,7 @@ class BlogSearchForm(Form):
                         filters=[strip_filter])
 
 class UserCreateForm(Form):
-    username = StringField('Nom', [validators.required(), validators.Length(min=1, max=255)],
+    username = StringField('Nom', validators=[InputRequired(), Length(min=1, max=255)],
                            filters=[strip_filter])
-    password = PasswordField('Mot de passe', validators.required(), [validators.Length(min=6)])
+    password = PasswordField('Mot de passe', validators=[InputRequired(), Length(min=6)])
 
diff --git a/cao_blogr/models/blog_record.py b/cao_blogr/models/blog_record.py
index cdb7251..978306e 100644
--- a/cao_blogr/models/blog_record.py
+++ b/cao_blogr/models/blog_record.py
@@ -17,8 +17,8 @@ class BlogRecord(Base):
     title = Column(Unicode(255), unique=True, nullable=False)
     body = Column(UnicodeText, default=u'')
     body_html = Column(UnicodeText, default=u'')
-    tag = Column(Unicode, default=u'pyramid')
-    topic = Column(Unicode, default=u'blog')
+    tag = Column(Unicode, default='pyramid')
+    topic = Column(Unicode, default='blog')
     created = Column(DateTime, default=datetime.datetime.utcnow)
     edited = Column(DateTime, default=datetime.datetime.utcnow)
 
diff --git a/cao_blogr/static/theme.css b/cao_blogr/static/theme.css
index 04217fb..e9a3590 100644
--- a/cao_blogr/static/theme.css
+++ b/cao_blogr/static/theme.css
@@ -129,4 +129,9 @@ footer a:hover {
 }
 textarea {
   resize: none;
+}
+.required-field::after  {
+  content: "*";
+  color: red;
+  margin-left:2px;
 }
\ No newline at end of file
diff --git a/cao_blogr/templates/blog_edit.jinja2 b/cao_blogr/templates/blog_edit.jinja2
index c0aabcb..9256505 100644
--- a/cao_blogr/templates/blog_edit.jinja2
+++ b/cao_blogr/templates/blog_edit.jinja2
@@ -7,7 +7,7 @@
             <div class="error">{{ error }}</div>
         {% endfor %}
         <div class="form-group">
-            <label for="title">{{ form.title.label }}</label>
+            <label class="required-field" for="title">{{ form.title.label }}</label>
             {{ form.title(class_='form-control') }}
         </div>
 
@@ -15,7 +15,7 @@
             <div class="error">{{ error }}</div>
         {% endfor %}
         <div class="form-group">
-            <label for="body">{{ form.body.label }}</label>
+            <label class="required-field" for="body">{{ form.body.label }}</label>
             {{ form.body(class_='form-control', cols="35", rows="20") }}
         </div>
 
@@ -23,7 +23,7 @@
             <div class="error">{{ error }}</div>
         {% endfor %}
         <div class="form-group">
-            <label for="title">{{ form.topic.label }}</label>
+            <label class="required-field" for="topic">{{ form.topic.label }}</label>
             {{ form.topic(class_='form-control') }}
         </div>
 
@@ -31,7 +31,7 @@
             <div class="text-danger">{{ error }}</div>
         {% endfor %}
         <div class="form-group">
-            <label for="title">{{ form.tag.label }}</label>
+            <label class="required-field" for="tag">{{ form.tag.label }}</label>
             {{ form.tag(class_='form-control') }}
         </div>
 
diff --git a/cao_blogr/templates/user_add.jinja2 b/cao_blogr/templates/user_add.jinja2
index b6e082b..739b677 100644
--- a/cao_blogr/templates/user_add.jinja2
+++ b/cao_blogr/templates/user_add.jinja2
@@ -9,7 +9,7 @@
         {% endfor %}
 
         <div class="form-group">
-            <label for="title">{{form.username.label}}</label>
+            <label class="required-field" for="username">{{form.username.label}}</label>
             {{form.username(class_='form-control')}}
         </div>
 
@@ -18,7 +18,7 @@
         {% endfor %}
 
         <div class="form-group">
-            <label for="body">{{form.password.label}}</label>
+            <label class="required-field" for="password">{{form.password.label}}</label>
             {{form.password(class_='form-control')}}
         </div>
 
diff --git a/cao_blogr/templates/user_pwd.jinja2 b/cao_blogr/templates/user_pwd.jinja2
index fb7df81..935c272 100644
--- a/cao_blogr/templates/user_pwd.jinja2
+++ b/cao_blogr/templates/user_pwd.jinja2
@@ -6,7 +6,7 @@
 
         <div class="form-group">
             <label for="password">Nouveau mot de passe</label></label>
-            <input type="password" name="new_password" class="form-control">
+            <input type="password" name="new_password" class="form-control" placeholder="Optionel">
         </div>
 
         <div class="form-group">
diff --git a/cao_blogr/views/blog.py b/cao_blogr/views/blog.py
index 6d06344..0e89e72 100644
--- a/cao_blogr/views/blog.py
+++ b/cao_blogr/views/blog.py
@@ -36,7 +36,10 @@ def blog_edit(request):
     if blog_id == '0':
         # create a new post
         entry = BlogRecord()
-        form = BlogCreateForm(request.POST)
+        # set default values
+        entry.tag = 'pyramid'
+        entry.topic = 'blog'
+        form = BlogCreateForm(request.POST, entry)
     else:
         # modify post
         entry = BlogRecordService.by_id(request, blog_id)