2du 4 năm trước cách đây
mục cha
commit
20aec77877
4 tập tin đã thay đổi với 81 bổ sung9 xóa
  1. 2 2
      readme-en.md
  2. 1 1
      readme.md
  3. 47 1
      views/ringo/css/main.css
  4. 31 5
      views/ringo/index.html

+ 2 - 2
readme-en.md

@@ -1,7 +1,7 @@
-[(en-US)](./readme-en.md) | [(ko-KR)](./readme.md)
+[(en-US)](./readme-en.md) | [(ko-KR)](./readme.md)
 
 # openNAMU
-[![Up to Python 3.6](https://img.shields.io/badge/python->=%203.6-blue.svg)](https://python.org)
+[![Up to Python 3.7](https://img.shields.io/badge/python->=%203.7-blue.svg)](https://python.org)
 [![LICENSE](https://img.shields.io/badge/license-BSD%203--Clause-lightgrey.svg)](./LICENSE)
 
 ![](https://raw.githubusercontent.com/openNAMU/openNAMU/beta/.github/logo.png)

+ 1 - 1
readme.md

@@ -1,7 +1,7 @@
 [(en-US)](./readme-en.md) | [(ko-KR)](./readme.md)
 
 # 오픈나무
-[![Python 3.6 이상](https://img.shields.io/badge/python->=%203.6-blue.svg)](https://python.org)
+[![Python 3.7 이상](https://img.shields.io/badge/python->=%203.7-blue.svg)](https://python.org)
 [![라이선스](https://img.shields.io/badge/license-BSD%203--Clause-lightgrey.svg)](./LICENSE)
 
 ![](https://raw.githubusercontent.com/openNAMU/openNAMU/beta/.github/logo.png)

+ 47 - 1
views/ringo/css/main.css

@@ -3,6 +3,7 @@ body {
 }
 
 html {
+    font-family: "나눔바른고딕", "나눔고딕", "맑은고딕", "Sans-Serif";
     background: #eee;
 }
 
@@ -35,6 +36,19 @@ header#main form.not_mobile {
     display: inline-block;
 }
 
+div#menu {
+    margin-top: 10px;
+}
+
+.menu_item {
+    border: 0;
+    background-color: white;
+    
+    padding: 10px;
+    
+    display: inline-block;
+}
+
 input.search {
     height: 35px;
     
@@ -101,6 +115,30 @@ aside button {
     width: 25%;
 }
 
+aside .side_button {
+    border: 0;
+    background-color: white;
+    
+    padding: 10px;
+}
+
+aside .side_button:hover {
+    background-color: #eee;
+}
+
+#side_button_2 {
+    border-left: 0;
+    border-right: 0;
+}
+
+#side_button_3 {
+    border-right: 0;
+}
+
+#side_content {
+    margin-top: 20px;
+}
+
 section {
     width: calc(100% - (250px + 40px));
     
@@ -129,7 +167,7 @@ article.main {
     margin: auto;
 }
 
-article.main#content {
+article.main#main_data {
     padding-top: 20px;
     
     min-height: 400px;
@@ -183,4 +221,12 @@ footer {
 
 footer.only_mobile {
     margin-top: 0px;
+}
+
+#main_data input, #main_data textarea, #main_data button, #main_data select {
+    border: 1px solid #aaa;
+    
+    padding: 10px;
+    
+    background-color: white;
 }

+ 31 - 5
views/ringo/index.html

@@ -77,9 +77,32 @@
             <header id="section">
                 <article class="main" id="title">
                     <h1><span class="change_space">{{imp[0]}}</span></h1>
+                    {% if menu != 0 %}
+                        <div id="menu">
+                            {% for menu_data in menu %}<!--
+                             --><div class="menu_item">
+                                    {% if menu[0] == 1 %}
+                                        {% set menu_data_2 = menu_data[0] %}
+                                    {% else %}
+                                        {% set menu_data_2 = '/' + menu_data[0] %}
+                                    {% endif %}
+                                    
+                                    {% if menu_data|length > 2 and menu_data[2] == 1 %}
+                                        {% set menu_topic = 'topic_color' %}
+                                    {% else %}
+                                        {% set menu_topic = '' %}
+                                    {% endif %}
+                                    
+                                    <a class="menu_item_link" href="{{menu_data_2}}" id="{{menu_topic}}">
+                                        {{menu_data[1]}}
+                                    </a>
+                                </div><!--
+                         -->{% endfor %}
+                        </div>
+                    {% endif %}
                 </article>
             </header>
-            <article class="main" id="content">
+            <article class="main" id="main_data">
                 {{data|safe}}
             </article>
             <footer class="not_mobile">
@@ -92,10 +115,13 @@
             </footer>
         </section>
         <aside>
-            <button class="side_button selected">A</button><!--
-         --><button class="side_button">B</button><!--
-         --><button class="side_button">C</button><!--
-         --><button class="side_button">D</button>
+            <button id="side_button_1" class="side_button selected">변경</button><!--
+         --><button id="side_button_2" class="side_button">토론</button><!--
+         --><button id="side_button_3" class="side_button">목차</button><!--
+         --><button id="side_button_4" class="side_button">각주</button>
+            <div id="side_content">
+                Loading...
+            </div>
         </aside>
         <footer class="only_mobile">
             {{imp[1][1]|safe}}