2019-1-OpenSourceSW / YTMT

Go to a project
Toggle navigation Toggle navigation pinning
윤혜원
d86f1224 2 parents 5e84039d 07546ee3

Merge branch 'master' into 'master' 

div 나누고, 이미지아이콘 추가. div접기기능

프론트조금

See merge request !1
Inline Side-by-side
Showing 3 changed files with 82 additions and 2 deletions
...@@ -3,19 +3,90 @@ ...@@ -3,19 +3,90 @@
3 <head> 3 <head>
4 <title><%= title %></title> 4 <title><%= title %></title>
5 <link rel='stylesheet' href='/stylesheets/style.css' /> 5 <link rel='stylesheet' href='/stylesheets/style.css' />
6 - <script src="http://developers.kakao.com/sdk/js/kakao.min.js"></script> 6 + <script src="http://developers.kakao.com/sdk/js/kakao.min.js">
7 + function daum_click()
8 + {
9 + if(Daum_webtoons.display == "none")
10 + Daum_webtoons.display == "block"
11 + if(Daum_webtoons.display = "block")
12 + Daum_webtoons.display == "none"
13 + }
14 + </script>
7 </head> 15 </head>
8 <h1><%= title %></h1> 16 <h1><%= title %></h1>
9 <p>웹툰 리스트</p> 17 <p>웹툰 리스트</p>
10 18
11 <a href="/auth/login/kakao" class="btn btn-block btn-lg btn-warning btn_login">로그인</a> 19 <a href="/auth/login/kakao" class="btn btn-block btn-lg btn-warning btn_login">로그인</a>
12 20
21 + <br>
22 + <br>
23 + <br>
24 + <br>
25 + <font size = 60>
26 + 다음 웹툰
27 + </font>
28 +
29 +
30 + <a onclick="Daum_webtoons.style.display=(Daum_webtoons.style.display=='none')?'block':'none';" href="javascript:void(0)">
31 + <img src ='/images/daumicon.png' width="83" height="90" onclick="daum_click" />
32 +</a>
33 +<div style="display:none" id="Daum_webtoons">
34 + <table>
35 + <%
36 + var current = "";
37 + for(webtoon in list){
38 +
39 + if(current!=list[webtoon].week && list[webtoon].site == 'daum'){
40 + if(current!=""){
41 + %>
42 + </tr>
43 + <% } %>
44 + <tr>
45 + <th><%= list[webtoon].week %></th>
46 + <% } %>
47 + <%
48 + if(list[webtoon].site == 'daum')
49 + {
50 + %>
51 + <td>
52 + <a href="<%= list[webtoon].webtoon_link %>">
53 + <img alt="img" width="83" height="90" src="<%= list[webtoon].thum_link %>"/>
54 + </a>
55 + <%= list[webtoon].name %>
56 + </td>
57 + <%
58 + }
59 + %>
60 +
61 + <%
62 + if(current!=list[webtoon].week) {
63 + current = list[webtoon].week;
64 + %>
65 +
66 + <%
67 + }
68 + }
69 + %>
70 + </tr>
71 + </table>
72 + </br>
73 + </div>
74 +<br>
75 +
76 + <font size = 60>
77 + 네이버 웹툰
78 + </font>
79 + <a onclick="Naver_webtoons.style.display=(Naver_webtoons.style.display=='none')?'block':'none';" href="javascript:void(0)">
80 + <img src ='/images/navericon.png' width="83" height="90"/>
81 + </a>
82 + <div id="Naver_webtoons" style = "display:none">
83 +
13 <table> 84 <table>
14 <% 85 <%
15 var current = ""; 86 var current = "";
16 for(webtoon in list){ 87 for(webtoon in list){
17 88
18 - if(current!=list[webtoon].week){ 89 + if(current!=list[webtoon].week && list[webtoon].site == 'naver'){
19 if(current!=""){ 90 if(current!=""){
20 %> 91 %>
21 </tr> 92 </tr>
...@@ -23,6 +94,10 @@ ...@@ -23,6 +94,10 @@
23 <tr> 94 <tr>
24 <th><%= list[webtoon].week %></th> 95 <th><%= list[webtoon].week %></th>
25 <% } %> 96 <% } %>
97 + <%
98 + if(list[webtoon].site == 'naver')
99 + {
100 + %>
26 <td> 101 <td>
27 <a href="<%= list[webtoon].webtoon_link %>"> 102 <a href="<%= list[webtoon].webtoon_link %>">
28 <img alt="img" width="83" height="90" src="<%= list[webtoon].thum_link %>"/> 103 <img alt="img" width="83" height="90" src="<%= list[webtoon].thum_link %>"/>
...@@ -30,6 +105,10 @@ ...@@ -30,6 +105,10 @@
30 <%= list[webtoon].name %> 105 <%= list[webtoon].name %>
31 </td> 106 </td>
32 <% 107 <%
108 + }
109 + %>
110 +
111 + <%
33 if(current!=list[webtoon].week) { 112 if(current!=list[webtoon].week) {
34 current = list[webtoon].week; 113 current = list[webtoon].week;
35 %> 114 %>
...@@ -42,6 +121,7 @@ ...@@ -42,6 +121,7 @@
42 </table> 121 </table>
43 </br> 122 </br>
44 123
124 + </div>
45 125
46 </body> 126 </body>
47 127
......