Explorar o código

Merge pull request #486 from Seriumium/master

Modifyed :P
Surplus_Up (2DU) %!s(int64=8) %!d(string=hai) anos
pai
achega
8381761914
Modificáronse 66 ficheiros con 362 adicións e 173 borrados
  1. 0 0
      dump/acme/css/bootstrap.min.css
  2. 0 0
      dump/acme/css/font-awesome/HELP-US-OUT.txt
  3. 0 0
      dump/acme/css/font-awesome/css/font-awesome.css
  4. 0 0
      dump/acme/css/font-awesome/css/font-awesome.min.css
  5. 0 0
      dump/acme/css/font-awesome/fonts/FontAwesome.otf
  6. 0 0
      dump/acme/css/font-awesome/fonts/fontawesome-webfont.eot
  7. 0 0
      dump/acme/css/font-awesome/fonts/fontawesome-webfont.svg
  8. 0 0
      dump/acme/css/font-awesome/fonts/fontawesome-webfont.ttf
  9. 0 0
      dump/acme/css/font-awesome/fonts/fontawesome-webfont.woff
  10. 0 0
      dump/acme/css/font-awesome/fonts/fontawesome-webfont.woff2
  11. 0 0
      dump/acme/css/font-awesome/less/animated.less
  12. 0 0
      dump/acme/css/font-awesome/less/bordered-pulled.less
  13. 0 0
      dump/acme/css/font-awesome/less/core.less
  14. 0 0
      dump/acme/css/font-awesome/less/fixed-width.less
  15. 0 0
      dump/acme/css/font-awesome/less/font-awesome.less
  16. 0 0
      dump/acme/css/font-awesome/less/icons.less
  17. 0 0
      dump/acme/css/font-awesome/less/larger.less
  18. 0 0
      dump/acme/css/font-awesome/less/list.less
  19. 0 0
      dump/acme/css/font-awesome/less/mixins.less
  20. 0 0
      dump/acme/css/font-awesome/less/path.less
  21. 0 0
      dump/acme/css/font-awesome/less/rotated-flipped.less
  22. 0 0
      dump/acme/css/font-awesome/less/screen-reader.less
  23. 0 0
      dump/acme/css/font-awesome/less/stacked.less
  24. 0 0
      dump/acme/css/font-awesome/less/variables.less
  25. 0 0
      dump/acme/css/font-awesome/scss/_animated.scss
  26. 0 0
      dump/acme/css/font-awesome/scss/_bordered-pulled.scss
  27. 0 0
      dump/acme/css/font-awesome/scss/_core.scss
  28. 0 0
      dump/acme/css/font-awesome/scss/_fixed-width.scss
  29. 0 0
      dump/acme/css/font-awesome/scss/_icons.scss
  30. 0 0
      dump/acme/css/font-awesome/scss/_larger.scss
  31. 0 0
      dump/acme/css/font-awesome/scss/_list.scss
  32. 0 0
      dump/acme/css/font-awesome/scss/_mixins.scss
  33. 0 0
      dump/acme/css/font-awesome/scss/_path.scss
  34. 0 0
      dump/acme/css/font-awesome/scss/_rotated-flipped.scss
  35. 0 0
      dump/acme/css/font-awesome/scss/_screen-reader.scss
  36. 0 0
      dump/acme/css/font-awesome/scss/_stacked.scss
  37. 0 0
      dump/acme/css/font-awesome/scss/_variables.scss
  38. 0 0
      dump/acme/css/font-awesome/scss/font-awesome.scss
  39. 0 0
      dump/acme/css/style-responsive.css
  40. 0 0
      dump/acme/css/style.css
  41. 0 0
      dump/acme/img/Thumbs.db
  42. 0 0
      dump/acme/img/on.ico
  43. 0 0
      dump/acme/img/on2.png
  44. 0 0
      dump/acme/img/or-on2.png
  45. 0 0
      dump/acme/img/quote.png
  46. 0 0
      dump/acme/img/search-icon.jpg
  47. 167 0
      dump/acme/index.html
  48. 0 0
      dump/acme/js/bootstrap.min.js
  49. 0 0
      dump/acme/js/jquery.min.js
  50. 5 0
      dump/acme/license.md
  51. 2 0
      dump/acme/list.html
  52. 2 0
      dump/acme/readme.md
  53. 31 31
      language/en-US.json
  54. 105 106
      language/ko-KR.json
  55. 18 19
      readme.md
  56. 4 0
      views/acme/assets/css/bootstrap.min.css
  57. 3 0
      views/acme/assets/css/font-awesome.min.css
  58. 0 0
      views/acme/assets/css/style-responsive.min.css
  59. 0 0
      views/acme/assets/css/style.min.css
  60. BIN=BIN
      views/acme/assets/img/on.ico
  61. BIN=BIN
      views/acme/assets/img/on2.png
  62. BIN=BIN
      views/acme/assets/img/or-on2.png
  63. BIN=BIN
      views/acme/assets/img/quote.png
  64. BIN=BIN
      views/acme/assets/img/search-icon.jpg
  65. 5 0
      views/acme/assets/js/bootstrap.min.js
  66. 20 17
      views/acme/index.html

+ 0 - 0
views/acme/css/bootstrap.min.css → dump/acme/css/bootstrap.min.css


+ 0 - 0
views/acme/css/font-awesome/HELP-US-OUT.txt → dump/acme/css/font-awesome/HELP-US-OUT.txt


+ 0 - 0
views/acme/css/font-awesome/css/font-awesome.css → dump/acme/css/font-awesome/css/font-awesome.css


+ 0 - 0
views/acme/css/font-awesome/css/font-awesome.min.css → dump/acme/css/font-awesome/css/font-awesome.min.css


+ 0 - 0
views/acme/css/font-awesome/fonts/FontAwesome.otf → dump/acme/css/font-awesome/fonts/FontAwesome.otf


+ 0 - 0
views/acme/css/font-awesome/fonts/fontawesome-webfont.eot → dump/acme/css/font-awesome/fonts/fontawesome-webfont.eot


+ 0 - 0
views/acme/css/font-awesome/fonts/fontawesome-webfont.svg → dump/acme/css/font-awesome/fonts/fontawesome-webfont.svg


+ 0 - 0
views/acme/css/font-awesome/fonts/fontawesome-webfont.ttf → dump/acme/css/font-awesome/fonts/fontawesome-webfont.ttf


+ 0 - 0
views/acme/css/font-awesome/fonts/fontawesome-webfont.woff → dump/acme/css/font-awesome/fonts/fontawesome-webfont.woff


+ 0 - 0
views/acme/css/font-awesome/fonts/fontawesome-webfont.woff2 → dump/acme/css/font-awesome/fonts/fontawesome-webfont.woff2


+ 0 - 0
views/acme/css/font-awesome/less/animated.less → dump/acme/css/font-awesome/less/animated.less


+ 0 - 0
views/acme/css/font-awesome/less/bordered-pulled.less → dump/acme/css/font-awesome/less/bordered-pulled.less


+ 0 - 0
views/acme/css/font-awesome/less/core.less → dump/acme/css/font-awesome/less/core.less


+ 0 - 0
views/acme/css/font-awesome/less/fixed-width.less → dump/acme/css/font-awesome/less/fixed-width.less


+ 0 - 0
views/acme/css/font-awesome/less/font-awesome.less → dump/acme/css/font-awesome/less/font-awesome.less


+ 0 - 0
views/acme/css/font-awesome/less/icons.less → dump/acme/css/font-awesome/less/icons.less


+ 0 - 0
views/acme/css/font-awesome/less/larger.less → dump/acme/css/font-awesome/less/larger.less


+ 0 - 0
views/acme/css/font-awesome/less/list.less → dump/acme/css/font-awesome/less/list.less


+ 0 - 0
views/acme/css/font-awesome/less/mixins.less → dump/acme/css/font-awesome/less/mixins.less


+ 0 - 0
views/acme/css/font-awesome/less/path.less → dump/acme/css/font-awesome/less/path.less


+ 0 - 0
views/acme/css/font-awesome/less/rotated-flipped.less → dump/acme/css/font-awesome/less/rotated-flipped.less


+ 0 - 0
views/acme/css/font-awesome/less/screen-reader.less → dump/acme/css/font-awesome/less/screen-reader.less


+ 0 - 0
views/acme/css/font-awesome/less/stacked.less → dump/acme/css/font-awesome/less/stacked.less


+ 0 - 0
views/acme/css/font-awesome/less/variables.less → dump/acme/css/font-awesome/less/variables.less


+ 0 - 0
views/acme/css/font-awesome/scss/_animated.scss → dump/acme/css/font-awesome/scss/_animated.scss


+ 0 - 0
views/acme/css/font-awesome/scss/_bordered-pulled.scss → dump/acme/css/font-awesome/scss/_bordered-pulled.scss


+ 0 - 0
views/acme/css/font-awesome/scss/_core.scss → dump/acme/css/font-awesome/scss/_core.scss


+ 0 - 0
views/acme/css/font-awesome/scss/_fixed-width.scss → dump/acme/css/font-awesome/scss/_fixed-width.scss


+ 0 - 0
views/acme/css/font-awesome/scss/_icons.scss → dump/acme/css/font-awesome/scss/_icons.scss


+ 0 - 0
views/acme/css/font-awesome/scss/_larger.scss → dump/acme/css/font-awesome/scss/_larger.scss


+ 0 - 0
views/acme/css/font-awesome/scss/_list.scss → dump/acme/css/font-awesome/scss/_list.scss


+ 0 - 0
views/acme/css/font-awesome/scss/_mixins.scss → dump/acme/css/font-awesome/scss/_mixins.scss


+ 0 - 0
views/acme/css/font-awesome/scss/_path.scss → dump/acme/css/font-awesome/scss/_path.scss


+ 0 - 0
views/acme/css/font-awesome/scss/_rotated-flipped.scss → dump/acme/css/font-awesome/scss/_rotated-flipped.scss


+ 0 - 0
views/acme/css/font-awesome/scss/_screen-reader.scss → dump/acme/css/font-awesome/scss/_screen-reader.scss


+ 0 - 0
views/acme/css/font-awesome/scss/_stacked.scss → dump/acme/css/font-awesome/scss/_stacked.scss


+ 0 - 0
views/acme/css/font-awesome/scss/_variables.scss → dump/acme/css/font-awesome/scss/_variables.scss


+ 0 - 0
views/acme/css/font-awesome/scss/font-awesome.scss → dump/acme/css/font-awesome/scss/font-awesome.scss


+ 0 - 0
views/acme/css/style-responsive.css → dump/acme/css/style-responsive.css


+ 0 - 0
views/acme/css/style.css → dump/acme/css/style.css


+ 0 - 0
views/acme/img/Thumbs.db → dump/acme/img/Thumbs.db


+ 0 - 0
views/acme/img/on.ico → dump/acme/img/on.ico


+ 0 - 0
views/acme/img/on2.png → dump/acme/img/on2.png


+ 0 - 0
views/acme/img/or-on2.png → dump/acme/img/or-on2.png


+ 0 - 0
views/acme/img/quote.png → dump/acme/img/quote.png


+ 0 - 0
views/acme/img/search-icon.jpg → dump/acme/img/search-icon.jpg


+ 167 - 0
dump/acme/index.html

@@ -0,0 +1,167 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="utf-8">
+        <title>{{imp[0]}} - {{imp[1][0]}}</title>
+        <link rel="stylesheet" href="/views/acme/css/bootstrap.min.css">
+        <link rel="stylesheet" href="/views/acme/css/style.css">
+        <link rel="stylesheet" href="/views/acme/css/style-responsive.css">
+        <script src="/views/acme/js/jquery.min.js"></script>
+        <script src="/views/acme/js/bootstrap.min.js"></script>
+        <link rel="stylesheet" href="/views/acme/css/font-awesome/css/font-awesome.min.css">
+        {{imp[1][5]|safe}}
+        {{imp[2][3]|safe}}
+        <meta name="twitter:creator" content="@{{imp[1][0]}}">
+        <meta name="twitter:title" content="{{imp[0]}}">
+        <meta name="twitter:site" content="@{{imp[1][0]}}">
+        <meta name="twitter:card" content="summary">
+        <link rel="shortcut icon" href="/views/acme/img/on.ico">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+    </head>
+    <body>
+        <header class="head-section">
+            <div class="navbar navbar-default navbar-static-top container">
+                <div class="navbar-header">
+                    <button class="navbar-toggle" data-target=".navbar-collapse" data-toggle="collapse" type="button">
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                    </button>
+                    <a class="navbar-brand" href="/" style="margin-top: 30px;">
+                        {{imp[1][4]|safe}}
+                    </a>
+                </div>
+                <div class="navbar-collapse collapse">
+                    <ul class="nav navbar-nav">
+                        <li id="right-search">
+                            <form method="post" action="/search" id="searchform" role="search">
+                                <input style="display: inline-block;" class="form-control search" type="search" name="search" placeholder="Search" id="searchInput" autocomplete="off">
+                            </form>                
+                        </li>
+                        <li class="dropdown">
+                            <a class="dropdown-toggle" data-close-others="false" data-delay="0" data-hover="dropdown" data-toggle="dropdown" href="javascript:void(0);">
+                                <i class="fa fa-plus-circle" aria-hidden="true"></i>
+                                {{'recent'|load_lang}}
+                                <i class="fa fa-angle-down"></i>
+                            </a>
+                            <ul role="menu" class="dropdown-menu">
+                                <li>
+                                    <a href="/recent_changes">
+                                        <i class="fa fa-refresh" aria-hidden="true"></i>
+                                        {{'change'|load_lang}}
+                                    </a>
+                                </li>
+                                <li>
+                                    <a href="/recent_discuss">
+                                        <i class="fa fa-comment" aria-hidden="true"></i>
+                                        {{'discussion'|load_lang}}
+                                    </a>
+                                </li>
+                            </ul>
+                        </li>
+                        <li class="dropdown">
+                            <a class="dropdown-toggle" data-close-others="false" data-delay="0" data-hover="dropdown" data-toggle="dropdown" href="javascript:void(0);">
+                                <i class="fa fa-plus-circle" aria-hidden="true"></i>
+                                {{'other'|load_lang}}
+                                <i class="fa fa-angle-down"></i>
+                            </a>
+                            <ul role="menu" class="dropdown-menu">
+                                <li>
+                                    <a href="/random">
+                                        <i class="fa fa-random" aria-hidden="true"></i>
+                                        {{'random'|load_lang}}
+                                    </a>
+                                </li>
+                                <li>
+                                    <a href="/other">
+                                        <i class="fa fa-cogs" aria-hidden="true"></i>
+                                        {{'tool'|load_lang}}
+                                    </a>
+                                </li>
+                            </ul>
+                        </li>       
+                        <li>
+                            <a href="/user">
+                                {% if imp[2][2] == 1 %}
+                                    <i class="fa fa-user" aria-hidden="true"></i>
+                                {% elif imp[2][2] == 0 %}
+                                    <i class="fa fa-user-times" aria-hidden="true"></i>
+                                {% else %}
+                                    <i class="fa fa-user-secret" aria-hidden="true"></i>
+                                {% endif %}
+                                {% if imp[2][4] != '' %}
+                                    <img src="https://www.gravatar.com/avatar/{{imp[2][4]|md5_replace}}?s=30">
+                                {% else %}
+                                    {{imp[2][5]}}
+                                {% endif %}
+                            </a>
+                        </li>  
+                    </ul>
+                </div>
+            </div>
+        </header>
+        <section id="body">
+            <div class="breadcrumbs">
+                <div class="container">
+                    <div class="row">
+                        <div class="col-lg-4 col-sm-4">
+                            <h1>
+                                {{imp[0]}}
+                                {% if imp[3][0] != 0 %}
+                                    <sub>{{imp[3][0]}}</sub>
+                                {% endif %}
+                            </h1>
+                        </div>
+                        <div class="col-lg-8 col-sm-8">
+                            <ol class="breadcrumb pull-right">   
+                                <li style="margin: 0;">
+                                    {% if menu != 0 %}
+                                        {% for sub_d in menu %}
+                                            <a class="menu-item" href="/{{sub_d[0]}}">{{sub_d[1]}}</a>
+                                            {% if menu[loop.index] %}
+                                                ㆍ
+                                            {% endif %}
+                                        {% endfor %}
+                                    {% endif %}
+                                </li>
+                            </ol>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="container">
+                <div class="row">
+                    <div class="col-md-10 col-md-offset-1 mar-b-30">
+                        {{data|safe}}
+                    </div>
+                </div>
+            </div>
+        </section>
+        <div class="scroll-buttons">
+            <a class="scroll-toc" href="#toc">
+                <i class="fa fa-list-alt" aria-hidden="true"></i>
+            </a>
+            <a class="scroll-button" href="#">
+                <i class="fa fa-arrow-up" aria-hidden="true"></i>
+            </a>
+            <a class="scroll-bottom" href="#footer">
+                <i class="fa fa-arrow-down" aria-hidden="true"></i>
+            </a>
+        </div>
+        <footer class="footer-small" id="footer">
+            <div class="container">
+                <div class="row">
+                    <div class="copyright">
+                        {{imp[1][1]|safe}}
+                        <span id="left_end" class="pull-right">
+                            <a href="https://github.com/2DU/openNAMU">
+                                <img src="/views/acme/img/on2.png" alt="opennamu" style="width: 100px;">
+                            </a>
+                            <a href="/views/acme/list.html">Contributor</a>
+                        </span>    
+                    </div>
+                </div>
+            </div>
+        </footer>
+    </body>
+</html>

+ 0 - 0
views/acme/js/bootstrap.min.js → dump/acme/js/bootstrap.min.js


+ 0 - 0
views/acme/js/jquery.min.js → dump/acme/js/jquery.min.js


+ 5 - 0
dump/acme/license.md

@@ -0,0 +1,5 @@
+## Free License Terms
+ * You may download free templates from Shapebootstrap.net and use them in any personal or business project without any charge. Keeping the developer credits on the footer is appreciated but not mandatory.
+ * You may not offer those templates, modified or unmodified, for redistribution or resale. You cannot include the template with a website offered for sale or distributed for free.
+ * You may be permitted to convert a template to a CMS theme to sell or distribute for free, but the copyright holder's permission (preferably written) is required.
+ * We don’t provide any support for the items displayed on Shapebootstrap.net. Please contact with the respective template author for rearranged license terms and supports if required.

+ 2 - 0
dump/acme/list.html

@@ -0,0 +1,2 @@
+<li><a href="https://github.com/Oriwiki">김동동</a></li>
+<li><a href="https://themehunt.com/">themehunt</a></li>

+ 2 - 0
dump/acme/readme.md

@@ -0,0 +1,2 @@
+# 공지
+[오픈나무](https://github.com/2DU/openNAMU)에 기본으로 탑재 되었습니다.

+ 31 - 31
language/en-US.json

@@ -1,22 +1,22 @@
 {
+    "__comment__": "Translate was modifyed by GitHub@Seriumium. Please add comment to merge request or repository(Seriumium/openNAMU-se) about failed translations.",
     "edit" : "Edit",
     "history" : "History",
     "delete" : "Delete",
-    "easy" : "Easy",
-    "server" : "Server",
+    "bulk_delete" : "Bulk Delete",
     "edit_filter" : "Edit Filtering",
     "template" : "Template",
     "move" : "Move",
     "hide" : "Hide",
     "list" : "List",
-    "out" : "out",
+    "out" : "Outside",
     "revert" : "Undo",
     "version" : " Ver",
     "normal_version" : "Version",
     "new" : "New",
     "document" : "Documents",
     "all" : "Everything",
-    "ban" : "Ban",
+    "ban" : "Block",
     "release" : "Release",
     "save" : "Save",
     "other" : "Others",
@@ -24,8 +24,8 @@
     "plus" : "Add",
     "open" : "Open",
     "search" : "Search",
-    "need" : "Needful",
-    "upload" : "File Upload",
+    "need" : "Required",
+    "upload" : "Upload files",
     "record" : "Record",
     "name" : "Name",
     "license" : "License",
@@ -41,9 +41,9 @@
     "restart" : "Restart",
     "agreement" : "Agreement",
     "backlink" : "Back Link",
-    "why" : "Why",
+    "why" : "Reason",
     "random" : "Random",
-    "authority" : "Authority",
+    "authority" : "Permissions",
     "file" : "File",
     "change" : "Changes",
     "compare" : "Compare",
@@ -57,17 +57,17 @@
     "state" : "State",
     "recent" : "Recent",
     "discussion" : "Debates",
-    "login" : "Login",
-    "logout" : "Logout",
-    "register" : "Register",
-    "no_alarm" : "There is no alram available",
+    "login" : "Log in",
+    "logout" : "Sign out",
+    "register" : "Sign Up",
+    "no_alarm" : "There is no alram available.",
     "able" : "Able",
     "year" : "Year",
     "month" : "Month",
     "day" : "Day",
     "normal" : "Normal",
-    "subscriber" : "Registor",
-    "admin" : "Admin",
+    "subscriber" : "Member",
+    "admin" : "Administrator",
     "next" : "Next",
     "previous" : "Previous",
     "owner" : "Owner",
@@ -77,31 +77,31 @@
     "now" : "Now",
     "blocked" : "Blocked",
     "band" : "Band",
-    "notice" : "Notice",
-    "writer" : "Writer",
-    "upper" : "Upper",
-    "under" : "Under",
+    "notice" : "Annoncements",
+    "writer" : "Author",
+    "upper" : "Upper possition",
+    "under" : "Lower possition",
     "pass" : "Pass",
     "category" : "Category",
     "user_css_warring" : "User's CSS will deleted if you close the browser or when you are editting as guest",
-    "http_warring" : "Warning : If you are not on HTTPS connection, your information can be leaked. We won't response to that.",
-    "no_login_warring" : "Non-login status. IP is logged when working with non-login.",
+    "http_warring" : "Warning : Please confirm you are on HTTPS connection, we won't respone to leak of your informations on HTTP connections.",
+    "no_login_warring" : "You IP can be logged when you are not logged in.",
     "authority_error" : "Insufficient privileges.",
-    "no_login_error" : "Non-login status.",
-    "no_exist_user_error" : "Account does not exist.",
-    "no_admin_block_error" : "Administrators can not block, check.",
+    "no_login_error" : "You are not logged in.",
+    "no_exist_user_error" : "The account does not exists on this server.",
+    "no_admin_block_error" : "Administrators cannot be blocked or scanned.",
     "same_id_exist_error" : "There are users with the same ID.",
     "long_id_error" : "ID must be shorter than 20 characters.",
-    "id_char_error" : "Only hangul, alphabet and space are allowed for ID.",
+    "id_char_error" : "Only Korean, alphabet and space are allowed for ID.",
     "file_exist_error" : "File does not exist.",
-    "password_error" : "The password is different.",
-    "recaptcha_error" : "Go through the reCAPTCHA.",
-    "file_extension_error" : "Only jpg, gif, jpeg, png, webp is possible.",
+    "password_error" : "The password does not match.",
+    "recaptcha_error" : "Please go through the reCAPTCHA.",
+    "file_extension_error" : "Only jpg, gif, jpeg, png, webp formats are available.",
     "edit_record_error" : "Edit record can not be more than 500 characters.",
     "same_file_error" : "A file with the same name exists.",
     "file_capacity_error" : "Maximum file capacity (MB) :",
-    "decument_exist_error" : "The document already exists where you want to move it.",
-    "password_diffrent_error" : "Reconfirm password and input password are different.",
-    "edit_filter_error" : "Censored by edit filter.",
-    "file_name_error" : "Only alphabet, hangul, space, underscore, and minus signs are allowed for file names."
+    "decument_exist_error" : "The document already exists where you want to move.",
+    "password_diffrent_error" : "Confirm again password and input password are different.",
+    "edit_filter_error" : "Censored by edit filtering.",
+    "file_name_error" : "Only alphabet, Korean, space, underscore and minus signs are allowed for file names."
 }

+ 105 - 106
language/ko-KR.json

@@ -1,108 +1,107 @@
 {
-    "edit" : "편집",
-    "history" : "역사",
-    "easy" : "간단",
-    "delete" : "삭제",
-    "server" : "서버",
-    "edit_filter" : "편집 필터",
-    "move" : "이동",
-    "hide" : "숨김",
-    "list" : "목록",
-    "revert" : "되돌리기",
-    "version" : "판",
-    "normal_version" : "버전",
-    "document" : "문서",
-    "all" : "모든",
-    "ban" : "차단",
-    "release" : "해제",
-    "save" : "저장",
-    "other" : "기타",
-    "tool" : "도구",
-    "plus" : "추가",
-    "open" : "열린",
-    "search" : "검색",
-    "user" : "사용자",
-    "alarm" : "알림",
-    "watchlist" : "주시 문서",
-    "my_info" : "내 정보",
-    "recent" : "최근",
-    "recent_changes" : "최근 변경",
-    "discussion" : "토론",
-    "login" : "로그인",
-    "logout" : "로그아웃",
-    "register" : "회원가입",
-    "no_alarm" : " 알림이 없습니다.",
-    "able" : "가능",
-    "year" : "년",
-    "month" : "월",
-    "day" : "일",
-    "normal" : "일반",
-    "subscriber" : "가입자",
-    "admin" : "관리자",
-    "owner" : "소유자",
-    "admin_group" : "관리 그룹",
-    "user_css_warring" : "비 로그인의 경우에는 사용자 CSS가 로그인하거나 브라우저 닫으면 날아갑니다.",
-    "http_warring" : "주의 : 만약 HTTPS 연결이 아닌 경우 데이터가 유출될 가능성이 있습니다. 이에 대해 책임지지 않습니다.",
-    "new" : "새",
-    "need" : "필요한",
-    "upload" : "파일 올리기",
-    "record" : "기록",
-    "name" : "이름",
-    "license" : "라이선스",
-    "interwiki" : "인터위키",
-    "update" : "업데이트",
-    "setting" : "설정",
-    "create" : "생성",
-    "editor" : "수정자",
-    "hour" : "시간",
-    "time" : "시각",
-    "close" : "닫기",
-    "stop" : "정지",
-    "restart" : "재시작",
-    "agreement" : "합의",
-    "backlink" : "역링크",
-    "why" : "사유",
-    "random" : "무작위",
-    "authority" : "권한",
-    "file" : "파일",
-    "change" : "변경",
-    "compare" : "비교",
-    "count" : "횟수",
-    "check" : "검사",
-    "preview" : "미리보기",
-    "next" : "다음",
-    "previous" : "이전",
-    "no_login_warring" : "비 로그인 상태로 진행 시 IP가 기록될 수 있습니다.",
-    "state" : "상태",
-    "limitless" : "무기한",
-    "period" : "기간",
-    "now" : "현재",
-    "blocked" : "차단자",
-    "band" : "대역",
-    "notice" : "공지",
-    "writer" : "작성자",
-    "upper" : "상위",
-    "under" : "하위",
-    "pass" : "통과",
-    "category" : "분류",
-    "authority_error" : "권한이 부족합니다.",
-    "no_login_error" : "비 로그인 상태 입니다.",
-    "no_exist_user_error" : "계정이 없습니다.",
-    "no_admin_block_error" : "관리자는 차단, 검사 할 수 없습니다.",
-    "same_id_exist_error" : "동일한 아이디의 사용자가 있습니다.",
-    "long_id_error" : "아이디는 20글자보다 짧아야 합니다.",
-    "id_char_error" : "아이디에는 한글과 알파벳과 공백만 허용 됩니다.",
-    "file_exist_error" : "파일이 없습니다.",
-    "password_error" : "비밀번호가 다릅니다.",
-    "recaptcha_error" : "리캡차를 통과하세요.",
-    "file_extension_error" : "jpg, gif, jpeg, png, webp만 가능 합니다.",
-    "edit_record_error" : "편집 기록은 500자를 넘을 수 없습니다.",
-    "same_file_error" : "동일한 이름의 파일이 있습니다.",
-    "file_capacity_error" : "파일 최대 용량 (MB) :",
-    "decument_exist_error" : "내용이 원래 문서와 동일 합니다.",
-    "password_diffrent_error" : "재 확인 비밀번호와 입력 비밀번호가 다릅니다.",
-    "edit_filter_error" : "편집 필터에 의해 검열 되었습니다.",
-    "file_name_error" : "파일 이름은 알파벳, 한글, 띄어쓰기, 언더바, 빼기표만 허용 됩니다.",
-    "template" : "틀",
-    "out" : "외부"
+    "edit": "편집",
+    "history": "역사",
+    "delete": "삭제",
+    "bulk_delete": "대량 삭제",
+    "edit_filter": "편집 필터",
+    "move": "이동",
+    "hide": "숨김",
+    "list": "목록",
+    "revert": "되돌리기",
+    "version": "판",
+    "normal_version": "버전",
+    "document": "문서",
+    "all": "모든",
+    "ban": "차단",
+    "release": "해제",
+    "save": "저장",
+    "other": "기타",
+    "tool": "도구",
+    "plus": "추가",
+    "open": "열린",
+    "search": "검색",
+    "user": "사용자",
+    "alarm": "알림",
+    "watchlist": "주시 문서",
+    "my_info": "내 정보",
+    "recent": "최근",
+    "recent_changes": "최근 변경",
+    "discussion": "토론",
+    "login": "로그인",
+    "logout": "로그아웃",
+    "register": "회원가입",
+    "no_alarm": " 알림이 없습니다.",
+    "able": "가능",
+    "year": "년",
+    "month": "월",
+    "day": "일",
+    "normal": "일반",
+    "subscriber": "가입자",
+    "admin": "관리자",
+    "owner": "소유자",
+    "admin_group": "관리 그룹",
+    "user_css_warring": "비 로그인의 경우에는 사용자 CSS가 로그인하거나 브라우저 닫으면 날아갑니다.",
+    "http_warring": "주의 : 만약 HTTPS 연결이 아닌 경우 데이터가 유출될 가능성이 있습니다. 이에 대해 책임지지 않습니다.",
+    "new": "새",
+    "need": "필요한",
+    "upload": "파일 올리기",
+    "record": "기록",
+    "name": "이름",
+    "license": "라이선스",
+    "interwiki": "인터위키",
+    "update": "업데이트",
+    "setting": "설정",
+    "create": "생성",
+    "editor": "수정자",
+    "hour": "시간",
+    "time": "시각",
+    "close": "닫기",
+    "stop": "정지",
+    "restart": "재시작",
+    "agreement": "합의",
+    "backlink": "역링크",
+    "why": "사유",
+    "random": "무작위",
+    "authority": "권한",
+    "file": "파일",
+    "change": "변경",
+    "compare": "비교",
+    "count": "횟수",
+    "check": "검사",
+    "preview": "미리보기",
+    "next": "다음",
+    "previous": "이전",
+    "no_login_warring": "비 로그인 상태로 진행 시 IP가 기록될 수 있습니다.",
+    "state": "상태",
+    "limitless": "무기한",
+    "period": "기간",
+    "now": "현재",
+    "blocked": "차단자",
+    "band": "대역",
+    "notice": "공지",
+    "writer": "작성자",
+    "upper": "상위",
+    "under": "하위",
+    "pass": "통과",
+    "category": "분류",
+    "authority_error": "권한이 부족합니다.",
+    "no_login_error": "비 로그인 상태 입니다.",
+    "no_exist_user_error": "계정이 없습니다.",
+    "no_admin_block_error": "관리자는 차단, 검사 할 수 없습니다.",
+    "same_id_exist_error": "동일한 아이디의 사용자가 있습니다.",
+    "long_id_error": "아이디는 20글자보다 짧아야 합니다.",
+    "id_char_error": "아이디에는 한글과 알파벳과 공백만 허용 됩니다.",
+    "file_exist_error": "파일이 없습니다.",
+    "password_error": "비밀번호가 다릅니다.",
+    "recaptcha_error": "리캡차를 통과하세요.",
+    "file_extension_error": "jpg, gif, jpeg, png, webp만 가능 합니다.",
+    "edit_record_error": "편집 기록은 500자를 넘을 수 없습니다.",
+    "same_file_error": "동일한 이름의 파일이 있습니다.",
+    "file_capacity_error": "파일 최대 용량 (MB) :",
+    "decument_exist_error": "내용이 원래 문서와 동일 합니다.",
+    "password_diffrent_error": "재 확인 비밀번호와 입력 비밀번호가 다릅니다.",
+    "edit_filter_error": "편집 필터에 의해 검열 되었습니다.",
+    "file_name_error": "파일 이름은 알파벳, 한글, 띄어쓰기, 언더바, 빼기표만 허용 됩니다.",
+    "template": "틀",
+    "out": "외부"
 }

+ 18 - 19
readme.md

@@ -1,21 +1,20 @@
-## Intro
+## Introduction
 NamuMark based wiki engine returns to Python. (3.5 and above)
 
-## Clone command
-### Stable
- * git clone https://github.com/2DU/openNAMU.git
-
-### Master
- * git clone -b master https://github.com/2DU/openNAMU.git
-
-## Install
- * [Reference](http://namu.ml/w/openNAMU/Install)
- 
-## set.json Explanation
- * db = Database Name
-
-You can create a new set.json by deleting it.
-
-## Other
- * [Test Server (Ko)](http://namu.ml/)
- * The first registor is granted owner privileges.
+## Commands for cloning
+### openNAMU:stable
+```text
+git clone https://github.com/2DU/openNAMU.git
+```
+### openNAMU:master
+```text
+git clone -b master https://github.com/2DU/openNAMU.git
+```
+### Installations
+[Documentations and references are here](https://namu.ml/w/openNAMU/Install)
+### What is the 'set.json'?
+The file 'set.json' is the file for setting the database name for openNAMU.
+<br>You can create the new file with deleting the file.
+### ETC
+[Open demo site (Korean)](https://namu.ml)
+<br>The member who signed up first will become a owner.

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 4 - 0
views/acme/assets/css/bootstrap.min.css


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 3 - 0
views/acme/assets/css/font-awesome.min.css


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
views/acme/assets/css/style-responsive.min.css


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
views/acme/assets/css/style.min.css


BIN=BIN
views/acme/assets/img/on.ico


BIN=BIN
views/acme/assets/img/on2.png


BIN=BIN
views/acme/assets/img/or-on2.png


BIN=BIN
views/acme/assets/img/quote.png


BIN=BIN
views/acme/assets/img/search-icon.jpg


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 5 - 0
views/acme/assets/js/bootstrap.min.js


+ 20 - 17
views/acme/index.html

@@ -2,21 +2,24 @@
 <html>
     <head>
         <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
         <title>{{imp[0]}} - {{imp[1][0]}}</title>
-        <link rel="stylesheet" href="/views/acme/css/bootstrap.min.css">
-        <link rel="stylesheet" href="/views/acme/css/style.css">
-        <link rel="stylesheet" href="/views/acme/css/style-responsive.css">
-        <script src="/views/acme/js/jquery.min.js"></script>
-        <script src="/views/acme/js/bootstrap.min.js"></script>
-        <link rel="stylesheet" href="/views/acme/css/font-awesome/css/font-awesome.min.css">
-        {{imp[1][5]|safe}}
-        {{imp[2][3]|safe}}
         <meta name="twitter:creator" content="@{{imp[1][0]}}">
         <meta name="twitter:title" content="{{imp[0]}}">
         <meta name="twitter:site" content="@{{imp[1][0]}}">
         <meta name="twitter:card" content="summary">
-        <link rel="shortcut icon" href="/views/acme/img/on.ico">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <link rel="stylesheet" href="/views/acme/assets/css/bootstrap.min.css">
+        <link rel="stylesheet" href="/views/acme/assets/css/style.min.css">
+        <link rel="stylesheet" href="/views/acme/assets/css/style-responsive.min.css">
+        <script
+          src="https://code.jquery.com/jquery-3.1.1.min.js"
+          integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8="
+          crossorigin="anonymous"></script>
+        <script src="/views/acme/assets/js/bootstrap.min.js"></script>
+        <link rel="stylesheet" href="/views/acme/assets/css/font-awesome.min.css">
+        {{imp[1][5]|safe}}
+        {{imp[2][3]|safe}}
+        <link rel="shortcut icon" href="/views/acme/assets/img/on.ico">
     </head>
     <body>
         <header class="head-section">
@@ -36,7 +39,7 @@
                         <li id="right-search">
                             <form method="post" action="/search" id="searchform" role="search">
                                 <input style="display: inline-block;" class="form-control search" type="search" name="search" placeholder="Search" id="searchInput" autocomplete="off">
-                            </form>                
+                            </form>
                         </li>
                         <li class="dropdown">
                             <a class="dropdown-toggle" data-close-others="false" data-delay="0" data-hover="dropdown" data-toggle="dropdown" href="javascript:void(0);">
@@ -79,7 +82,7 @@
                                     </a>
                                 </li>
                             </ul>
-                        </li>       
+                        </li>
                         <li>
                             <a href="/user">
                                 {% if imp[2][2] == 1 %}
@@ -95,7 +98,7 @@
                                     {{imp[2][5]}}
                                 {% endif %}
                             </a>
-                        </li>  
+                        </li>
                     </ul>
                 </div>
             </div>
@@ -113,7 +116,7 @@
                             </h1>
                         </div>
                         <div class="col-lg-8 col-sm-8">
-                            <ol class="breadcrumb pull-right">   
+                            <ol class="breadcrumb pull-right">
                                 <li style="margin: 0;">
                                     {% if menu != 0 %}
                                         {% for sub_d in menu %}
@@ -155,10 +158,10 @@
                         {{imp[1][1]|safe}}
                         <span id="left_end" class="pull-right">
                             <a href="https://github.com/2DU/openNAMU">
-                                <img src="/views/acme/img/on2.png" alt="opennamu" style="width: 100px;">
+                                <img src="/views/acme/assets/img/on2.png" alt="opennamu" style="width: 100px;">
                             </a>
-                            <a href="/views/acme/list.html">Contributor</a>
-                        </span>    
+                            <a href="/views/acme/assets/list.html">기여자</a>
+                        </span>
                     </div>
                 </div>
             </div>

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio