2DU 8 anni fa
parent
commit
f7ffb44c7f
3 ha cambiato i file con 9 aggiunte e 22 eliminazioni
  1. 4 21
      app.py
  2. 1 1
      mark.py
  3. 4 0
      views/css/style.css

+ 4 - 21
app.py

@@ -65,35 +65,18 @@ except:
 
 conn.commit()
 
-'''
-@route('/upload', method=['POST', 'GET'])
+'''@route('/upload', method=['POST', 'GET'])
 def upload():
     return(
         template(
             'index', 
             imp = ['파일 올리기', wiki_set(1), wiki_set(3), login_check(), custom_css(), custom_js(), 0],
-            data = '<form method="post"> \
-                        <input style="width: 100%;" type="text" name="name" value="' + name_d[0][0] + '"> \
-                        <br> \
-                        <br> \
-                        <input style="width: 100%;" type="text" name="frontpage" value="' + frontpage_d[0][0] + '"> \
-                        <br> \
-                        <br> \
-                        <input style="width: 100%;" type="text" name="license" value="' + license_d[0][0] + '"> \
-                        <br> \
-                        <br> \
-                        <input style="width: 100%;" type="text" name="upload" value="' + upload_d[0][0] + '"> \
-                        <br> \
-                        <br> \
-                        <span>차례대로 위키 이름, 시작 페이지, 라이선스, 파일 올리기 최대 크기 입니다.</span> \
-                        <br> \
-                        <br> \
-                        <button class="btn btn-primary" type="submit">저장</button> \
+            data = '<form method="post" enctype="multipart/form-data"> \
+                        <input type="file" name="upload" /> <input type="submit" value="올리기" />\
                     </form>',
             menu = [['other', '기타']]
         )
-    )
-'''
+    )'''
 
 @route('/setup', method=['GET', 'POST'])
 def setup():

+ 1 - 1
mark.py

@@ -429,7 +429,7 @@ def toc_pas(data, title):
             d = c
             c = re.sub("\[\[(([^|]*)\|)?(?P<in>[^\]]*)\]\]", "\g<in>", c)
 
-            data = re.sub('(={1,6})\s?([^=]*)\s?(?:={1,6})(?:\s+)?\n', '<tablenobr><h' + str(wiki) + ' id="' + c + '"><a href="#toc" id="s-' + toc + '">' + toc + '.</a> ' + d + ' <span style="font-size:11px;">[<a href="/edit/' + url_pas(title) + '/section/' + str(i[0]) + '">편집</a>]</span></h' + str(wiki) + '>', data, 1)
+            data = re.sub('(={1,6})\s?([^=]*)\s?(?:={1,6})(?:\s+)?\n', '<tablenobr><h' + str(wiki) + ' id="' + c + '" style="margin-top: 30px;"><a href="#toc" id="s-' + toc + '">' + toc + '.</a> ' + d + ' <span style="font-size:11px;">[<a href="/edit/' + url_pas(title) + '/section/' + str(i[0]) + '">편집</a>]</span></h' + str(wiki) + '><hr style="margin-top: -5px;">', data, 1)
         else:
             rtoc += '</div>'
             

+ 4 - 0
views/css/style.css

@@ -22,6 +22,10 @@
     margin-top: 10px;
 }
 
+#last {
+    margin-top: 30px;
+}
+
 #log:hover, #log:focus {
     color: #B2DFEA;
 }