alert.htm

diff --git a/index.py b/index.py
index a62caec..9197d37 100755 (executable)
--- a/index.py
+++ b/index.py
@@ -435,29 +435,40 @@ class MasterHandler(BaseHandler):
         else:
             raise tornado.web.HTTPError(404)
         
-class AlartHandler(UserHandler):
+class AlertHandler(UserHandler):
     def get(self):
         db = self.get_query_argument('db')
         num = self.get_query_argument('num')
         self.table = self.application.db.table(db)
         tb = self.table.get(where('number') == int(num))
         s = self.page(int(num))
-        link = '<p><a href=/{0}{1}#{2}>{0},{2}</a>'.format(db,s,num)
+        jump = '/'+db+s+'#'+num
+        link = '<p><a href={0}>{0}</a>'.format(jump)
         if 'master' in self.application.db.tables():
             time = datetime.now()
-            data = {'comment':tb['raw']+link,'time':time.strftime('%Y/%m/%d')}
-            self.application.db.table('master').insert(data)
-        if s == '':
-            self.redirect('/{0}#{1}'.format(db,num))
+            data = {'comment':tb['comment']+link,'time':time.strftime('%Y/%m/%d'),'link':jump}
+            id = self.application.db.table('master').insert(data)
+        self.render('alert.htm',com=data['comment'],num=id)
+    
+    def post(self):
+        id = int(self.get_argument('num'))
+        table = self.application.db.table('master')
+        tb = table.get(eid=id)
+        link = tb['link']
+        if self.get_argument('cancel','') == 'cancel':
+            table.remove(eids=[id])
         else:
-            self.redirect('/{0}{1}#{2}'.format(db,s,num))
+            com = self.get_argument('com')
+            com += tb['comment']
+            table.update({'comment':com},eids=[id])
+        self.redirect(link)
         
 class Application(tornado.web.Application):    
     def __init__(self):
         self.db = TinyDB(st.json)             
         handlers = [(r'/',NaviHandler),(r'/login',LoginHandler),(r'/logout',LogoutHandler),(r'/title',TitleHandler),
                     (r'/headline/api',HeadlineApi),(r'/read/api/([a-zA-Z0-9_]+)/([0-9]+)',ArticleApi),(r'/write/api/([a-zA-Z0-9_]+)',ArticleApi),
-                    (r'/help',HelpHandler),(r'/master/*',MasterHandler),(r'/alart',AlartHandler),
+                    (r'/help',HelpHandler),(r'/master/*',MasterHandler),(r'/alert',AlertHandler),
                     (r'/([a-zA-Z0-9_]+)',IndexHandler),(r'/([a-zA-Z0-9_]+)/([0-9]+)/*',IndexHandler),
                     (r'/([a-zA-Z0-9_]+)/admin/([0-9]+)/*',AdminHandler),(r'/([a-zA-Z0-9_]+)/admin/([a-z]+)/*',AdminConfHandler),(r'/([a-zA-Z0-9_]+)/userdel',UserHandler),
                     (r'/([a-zA-Z0-9_]+)/search',SearchHandler),(r'/([a-zA-Z0-9_]+)/regist',RegistHandler)]

diff --git a/templates/modules/index.htm b/templates/modules/index.htm
index 73954c0..855c901 100755 (executable)
--- a/templates/modules/index.htm
+++ b/templates/modules/index.htm
@@ -63,7 +63,7 @@
        <section id=date>　Date:<h1>{{record['date']}}</h1></section>
        <p>▽▲▽▲▽▲▽
        <section id=comment>{% raw record['comment'] %}</section>
-       <section id=master style=text-align:end><a href=/alart?db={{db}}&num={{record['number']}}>報告</a></section>
+       <section id=master style=text-align:end><a href=/alert?db={{db}}&num={{record['number']}}>報告</a></section>
        <p>△▼△▼△▼△
        {% end %}
        <a name=article></a>

diff --git a/templates/top.htm b/templates/top.htm
index 107128f..86590d1 100755 (executable)
--- a/templates/top.htm
+++ b/templates/top.htm
@@ -25,6 +25,7 @@
 {% end %}
 <p>[ <a href=/master>master</a> ] <=master
 <div class="fb-like" data-href="http://pybbs.herokuapp.com" data-layout="box_count" data-action="like" data-size="small" data-show-faces="true" data-share="false"></div><footer>
+<p><br>
 <p><a href=/title>タイトル表示</a>
 <p><a href=/help>使い方案内</a>
 <p>PR リンク