OSDN Git Service

不安と楽しみ
authoryamat0jp <terukohietori@gmail.com>
Fri, 7 Feb 2020 04:46:26 +0000 (13:46 +0900)
committeryamat0jp <terukohietori@gmail.com>
Fri, 7 Feb 2020 04:46:26 +0000 (13:46 +0900)
pybbs.py
static/css/main.css
templates/modules/index.htm

index ccd6213..a2cd5bd 100644 (file)
--- a/pybbs.py
+++ b/pybbs.py
@@ -73,7 +73,7 @@ class IndexHandler(BaseHandler):
         else:
             self.render_admin(dbname)
 
-    def render_admin(self,dbname,title='',com='',er='',img='',ch='checked'):
+    def render_admin(self,dbname,title='',com='',er='',img='',ch='checked',pw=''):
         t = self.get_argument('img','')
         params = self.application.db['params'].find_one({'app':'bbs'})
         if self.current_user == b'admin':
@@ -81,7 +81,7 @@ class IndexHandler(BaseHandler):
         else:
             s = '<input type=hidden>'
         self.render('modules/index.htm',position=self.pos,records=self.rec,data=params,username=self.na,title=title,
-            comment=com,db=dbname,aikotoba=self.rule,error=er+img,check=ch,admin=s)
+            comment=com,db=dbname,aikotoba=self.rule,error=er+img,ch=ch,admin=s,pw=pw)
 
 class LoginHandler(BaseHandler):
     def get(self):
@@ -290,7 +290,7 @@ class RegistHandler(IndexHandler):
         self.na = na
         self.rule = rule
         self.pos = 0
-        self.render_admin(dbname,title=sub,com=com,er=error,ch=ch,img=img)
+        self.render_admin(dbname,title=sub,com=com,er=error,ch=ch,img=img,pw=pw)
 
     def link(self,command,database):
         i = 0
index db13fe1..4266787 100755 (executable)
@@ -43,15 +43,6 @@ header p {
     display:inline\r
 }\r
 \r
-input[type=password] {\r
-    width:55px\r
-}\r
-\r
-form#search input {\r
-    height:22px;\r
-    width:55px\r
-}\r
-\r
 span {\r
     color:#ff0000\r
 }\r
index bb2b6ae..a069da8 100755 (executable)
     {% block style %}
     <link rel="stylesheet" href={{static_url('css/main.css')}}>
        {% end %}
-               <script type=text/javascript src={{static_url('js/jquery-live-preview.js')}}></script>
+       <script type=text/javascript src=//ajax.googleapis.com/ajax/libs/jquery/1.8.1/jquery.min.js></script>
+       <script type=text/javascript src={{static_url('js/jquery-live-preview.js')}}></script>
        <link rel=stylesheet href={{static_url('css/livepreview-demo.css')}}>
-       <script src=//cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js></script>
+         <script src=//cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js></script>
   <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
   </head> 
   <body>
     <a name=top></a>
     <form action=/{{db}}/regist method="post">
     {% module xsrf_form_html() %}
-      <table>
-        <tr><td>
-          <label><p>お名前</p><input name="name" class=name value={{username}}></label>
-          <label><p>タイトル</p><input name="title" class=title value="{{title}}" placeholder="タイトルなし."></label>
-          <input type="submit" value="送信">
-        </td></tr>
-        <tr><td>
-          <label><p>本文<span>必須</span><br></p>
-            <textarea style="font-size:1.75em" name="comment" cols=30
-                      required placeholder="コメントなどを入力してください.">{{comment}}</textarea></label>
-        </td></tr>
-        <tr><td>
-          <label><p>パスワード</p><input name="password" type="password" placeholder="削除用">
-          </label> / <input type="checkbox" name="show" value="true" {{check}}><p>プレビュー</p>
-        <tr><td>
-          <label><p>合言葉をひらがなで入力してください: genki <input name=aikotoba type=text value={{aikotoba}}></label>
-        </td></tr>
-        <tr><td>
-          {% raw admin %}
-        </td></tr>
-      </table>
+      <p><br></p>
+      <div class="row justify-content-center"><div class="col-10">
+      <div class="container">
+        <div class="form-row">
+        <div class="form-inline p-3">
+          <div class="input-group col-6">
+          <div class=input-group-prepend><span class=input-group-text>お名前</span></div>
+            <input name="name" id=name1 class="form-control mr-50" value={{username}}>
+          </div>
+          <div class="input-group col-6">
+          <div class=input-group-prepend><span class=input-group-text>タイトル</span></div>
+            <input name="title" id=title1 class=form-control placeholder="タイトルなし." value={{title}}>
+          <input class="btn btn-primary ml-3" type="submit" value="送信">
+          </div>
+        </div>
+        </div>
+        <div class="form-row">
+          <div class="form-group align-self-center w-100">
+          <label for=text1>本文<span style=color:red>必須</span></label>
+          <textarea id=text1 style="font-size:1.75em" name="comment" rows=4
+                class="form-control w-100 sjadpw-lg" required placeholder="コメントなどを入力してください.">{{comment}}</textarea>
+          </div>
+        </div>
+        <div class="form-row">
+          <div class="form-inline w-50">
+            <div class=input-group>
+            <div class=input-group-prepend><span class=input-group-text>パスワード</span></div>
+            <input id=password1 name="password" class="form-control col-4" type="password" placeholder="削除用" value={{pw}}>
+            </div>
+          </div>
+          <div class="form-group w-50">
+            <div class="custom-control custom-checkbox">
+            <input type="checkbox" id=check1 name="show" class=custom-control-input value="true" {{ch}}>
+            <label class=custom-control-label for=check1>プレビュー</label>
+            </div>
+          </div>
+        </div>
+        <div class="form-row justify-content-end">
+          <div class="form-inline">
+          <label for=aikotoba1>合言葉をひらがなで入力してください: genki </label><input name=aikotoba id=aikotoba1 class="form-control col-2" type=text value={{aikotoba}}>
+          </div>
+        </div>
+      </div>
+      </div></div>
     </form>
-    </header>
+    </header>   
     {% raw error %}
-    <hr size="1" width="100%">
-    <form action=/{{db}}/userdel method="post" id=search>
-      {% module xsrf_form_html() %}
-      <label><p>記事No</p><input name="number"></label>
-      <label><p>Pass</p><input type="password" name="password"></label>
-      <input type="submit" value="削除">
-    </form>
-    <form action=/{{db}}/userdel method=post id=search>
+
+    <div class="container pt-5">
+      <button class="btn shadow" data-toggle=collapse data-target=.item1
+        aria-expanded=false aria-controls="item1-a item1-b">
+      ひらく</button>
+      <div class="container pt-3">
+      <div class="row col-5 p-0">
+        <div class="col-4 p-0">
+      <div class="collapse item1" id=item1-a><div class="card card-body">
+      <form action=/{{db}}/userdel method="post" id=search>
+        {% module xsrf_form_html() %}      
+        <label for=id1>記事No</label><input id=id1 class="form-control" name="number">
+        <label for=pass1>Pass</label><input id=pass1 class="form-control mb-3" type="password" name="password">
+        <button type="submit">削除</button>
+      </form>
+      </div></div>
+        </div>
+        <div class="col-8">
+      <div class="collapse item1" id=item1-b><div class="card card-body">
+      <form action=/{{db}}/userdel method=post id=search>
       {% module xsrf_form_html() %}
-      <label><p>記事No</p><input name=number></label>
-      <input type=submit value=移動>
-    </form>
-    <p><a href=/{{db}}/search>検索ページ</a></p>
-    <p style=text-align:center>{{db}}</p>
+        <div class="input-group">
+        <div class=input-group-prepend><span class=input-group-text>記事No</span></div>
+        <input id=number1 class="form-control" name=number>
+        <div class=input-group-append><button type=submit>移動</button></div>
+        </div>
+      </form>
+      </div></div>
+        </div>
+      </div>
+      </div>
+        </div>
+      <p><br></p>
+      <p><a href=/{{db}}/search>検索ページ</a></p>
+      <p style=text-align:center>{{db}}</p>
+
   {% module Footer(position,'/'+db,'#top') %}
   {% end %}
   {% block body %}