메인 CSS로 일부 분리

app.py

@@ -489,12 +489,7 @@ def setting(num = 0):
             if d_list[8]:
                 ch_2 = 'checked="checked"'
             
-            div2 = ''
-            for skin_data in os.listdir(os.path.abspath('views')):
-                if d_list[5] == skin_data:
-                    div2 = '<option value="' + skin_data + '">' + skin_data + '</option>' + div2
-                else:
-                    div2 += '<option value="' + skin_data + '">' + skin_data + '</option>'
+            div2 = load_skin(d_list[5])
 
             div3 =''
             if d_list[12] == 'stable':
@@ -2602,25 +2597,10 @@ def change_password():
         else:
             email = ''
 
-        div2 = ''
-
-        curs.execute('select data from user_set where name = "skin" and id = ?', [ip])
-        data = curs.fetchall()
-        for skin_data in os.listdir(os.path.abspath('views')):
-            if not data:
-                curs.execute('select data from other where name = "skin"')
-                sql_data = curs.fetchall()
-                if sql_data and sql_data[0][0] == skin_data:
-                    div2 = '<option value="' + skin_data + '">' + skin_data + '</option>' + div2
-                else:
-                    div2 += '<option value="' + skin_data + '">' + skin_data + '</option>'
-            elif data[0][0] == skin_data:
-                div2 = '<option value="' + skin_data + '">' + skin_data + '</option>' + div2
-            else:
-                div2 += '<option value="' + skin_data + '">' + skin_data + '</option>'
+        div2 = load_skin()
 
         return css_html_js_minify.html_minify(flask.render_template(skin_check(),    
-            imp = [load_lang('my_info') + ' ' + load_lang('edit'), wiki_set(), custom(), other2([0, 0])],
+            imp = [load_lang('user') + ' ' + load_lang('setting') + ' ' + load_lang('edit'), wiki_set(), custom(), other2([0, 0])],
             data =  '''
                     <form method="post">
                         <span>ID : ''' + ip + '''</span>
@@ -3665,7 +3645,7 @@ def user_info():
     if custom()[2] != 0:
         ip_user = '<a href="/w/user:' + ip + '">' + ip + '</a>'
         
-        plus = '<li><a href="/logout">' + load_lang('logout') + '</a></li><li><a href="/change">' + load_lang('my_info') + ' ' + load_lang('edit') + '</a></li>'
+        plus = '<li><a href="/logout">' + load_lang('logout') + '</a></li><li><a href="/change">' + load_lang('user') + ' ' + load_lang('setting') + ' ' + load_lang('edit') + '</a></li>'
         
         curs.execute('select name from alarm where name = ? limit 1', [ip_check()])
         if curs.fetchall():

func.py

@@ -396,6 +396,37 @@ def custom():
 
     return ['', '', user_icon, user_head, email, user_name]
 
+def load_skin(data = ''):
+    div2 = ''
+
+    if data == '':
+        ip = ip_check()
+
+        curs.execute('select data from user_set where name = "skin" and id = ?', [ip])
+        data = curs.fetchall()
+        for skin_data in os.listdir(os.path.abspath('views')):
+            if not skin_data == 'main_css':
+                if not data:
+                    curs.execute('select data from other where name = "skin"')
+                    sql_data = curs.fetchall()
+                    if sql_data and sql_data[0][0] == skin_data:
+                        div2 = '<option value="' + skin_data + '">' + skin_data + '</option>' + div2
+                    else:
+                        div2 += '<option value="' + skin_data + '">' + skin_data + '</option>'
+                elif data[0][0] == skin_data:
+                    div2 = '<option value="' + skin_data + '">' + skin_data + '</option>' + div2
+                else:
+                    div2 += '<option value="' + skin_data + '">' + skin_data + '</option>'
+    else:
+        for skin_data in os.listdir(os.path.abspath('views')):
+            if not skin_data == 'main_css':
+                if data == skin_data:
+                    div2 = '<option value="' + skin_data + '">' + skin_data + '</option>' + div2
+                else:
+                    div2 += '<option value="' + skin_data + '">' + skin_data + '</option>'
+
+    return div2
+
 def acl_check(name):
     ip = ip_check()
 

language/en-US.json

@@ -47,7 +47,7 @@
     "license" : "License",
     "interwiki" : "Inter Wiki",
     "update" : "Update",
-    "setting" : "Setting",
+    "setting" : "Set",
     "create" : "Create",
     "editor" : "Editor",
     "hour" : "Hour",
@@ -69,7 +69,7 @@
     "alarm" : "Alarm",
     "preview" : "Preview",
     "watchlist" : "Watching List",
-    "my_info" : "About Me",
+    "my_info" : "User set",
     "state" : "State",
     "recent" : "Recent",
     "discussion" : "Debates",

views/acme/css/style-responsive.css

@@ -151,10 +151,6 @@ input {
     }
 }
 
-a:link {
-    color: #0093FF;
-}
-
 button {
     border: 1px solid deepskyblue;
     border-radius: 0.25rem;
@@ -197,13 +193,6 @@ input#searchInput:focus {
     word-break: break-all;
 }
 
-#in {
-    margin-left: 20px;
-}
-
-#out {
-    margin-left: 5px;
-}
 
 input {
     max-width: 100%;
@@ -368,20 +357,6 @@ td {
     margin-bottom: 20px;
 }
 
-#toc-name {
-    font-size: 18px;
-}
-
-s, strike, del {
-    color: gray;
-}
-
-s:hover, strike:hover, del:hover {
-    color: #666;
-    background-color: #eee;
-    text-decoration: none;
-}
-
 .scroll-buttons a:link, .scroll-buttons a:visited {
     color: white;
 }
@@ -449,26 +424,6 @@ div.scroll-buttons a {
     text-align: center;
 }
 
-#toron {
-    width: 100%;
-}
-
-#toron_color_green {
-    background-color: #B0D3AD;
-}
-
-#toron_color_red {
-    background-color: #f3c2c2;
-}
-
-#toron_color_blue {
-    background: #c1ebff;
-}
-
-#toron_color {
-    background-color: #d5d5d5;
-}
-
 @media (max-width: 768px) {
     table {
         min-width: 100%;
@@ -479,22 +434,6 @@ textarea {
     width: 100%;
 }
 
-#not_thing {
-    color: #bf4c4c;
-}
-
-#out_link {
-    color: #008000;
-}
-
-#out_link::before {
-    padding: 0px;
-    background: transparent;
-    color: green;
-    content: "\f14c";
-    font-family: FontAwesome;
-}
-
 h1, h2, h3, h4, h5, h6 {
     margin-bottom: 10px;
     margin-top: 10px;
@@ -552,4 +491,4 @@ ul#redirect {
 html, body { 
     max-width: 100%; 
     overflow-x: hidden; 
-} 
+}

views/main_css/main.css

@@ -0,0 +1,29 @@
+textarea { width: 100%; }
+input { width: 100%; }
+hr#last { margin-top: 30px; }
+div#toc { border: 1px solid; padding: 20px; width: fit-content; width: -moz-fit-content; margin-top: 10px; }
+#toc-name { font-size: 18px; }
+table { border-collapse: collapse; }
+td { border: 1px solid; padding: 5px; }
+a { text-decoration: none; }
+#not_thing { color: red; }
+#inside, #out_link, #open { color: green; }
+#out_link::before { background: green; color: white; content: "E"; }
+input[type="checkbox"] { width: auto; }
+.popup { position: fixed; bottom: 0; padding: 10px; left: 0; background: lightgray; width: 100%; }
+ul#list { padding: 10px; }
+td#toron_color_green { background: darkseagreen; }
+td#toron_color_blue { background: skyblue; }
+div#cate { border: 1px solid; padding: 5px; }
+td#toron_color_red { background: indianred; }
+#toron { width: 100%; }
+@media (max-width: 768px) { table { min-width: 100%; } }
+@media (min-width: 1024px) { body { width: 80%; margin: auto; padding: 10px; border: 1px solid; } }
+@media (min-width: 1920px) { body { width: 60%; } }
+blockquote { border: 1px solid; padding: 15px; margin: 0; margin-top: 10px; }
+img, iframe { max-width: 100%; }
+pre { border: 1px solid; padding: 10px; white-space: pre-wrap; }
+#in { margin-left: 20px; }
+#out { margin-left: 5px; }
+s, strike, del { color: gray; }
+s:hover, strike:hover, del:hover { color: #666; background-color: #eee; text-decoration: none; }