Merge branch 'master' into 'master'
웹툰 담기에서 daum/naver div를 나눔. 접기 펼치기추가 view 조금 수정했습니다. See merge request !3
Showing
2 changed files
with
65 additions
and
2 deletions
public/images/basket.png
0 → 100644
192 KB
... | @@ -12,18 +12,28 @@ | ... | @@ -12,18 +12,28 @@ |
12 | <h1>내툰</h1> | 12 | <h1>내툰</h1> |
13 | <p>추가하거나 제거할 웹툰을 선택해주세요.</p> | 13 | <p>추가하거나 제거할 웹툰을 선택해주세요.</p> |
14 | <a href="/mytoons">뒤로</a> | 14 | <a href="/mytoons">뒤로</a> |
15 | +<br> | ||
16 | + | ||
17 | + <a onclick="daumtoons.style.display=(daumtoons.style.display=='none')?'block':'none';" href="javascript:void(0)"> | ||
18 | + <img src ='/images/daumicon.png' width="83" height="90" onclick="daum_click" /> | ||
19 | +</a> | ||
20 | +<div id="daumtoons" style="display:none"> | ||
21 | + | ||
15 | <table> | 22 | <table> |
16 | <% | 23 | <% |
17 | var current = ""; | 24 | var current = ""; |
18 | for(webtoon in alltoons){ | 25 | for(webtoon in alltoons){ |
26 | + if(alltoons[webtoon].site == "daum") | ||
27 | + { | ||
19 | if(current!=alltoons[webtoon].week){ | 28 | if(current!=alltoons[webtoon].week){ |
20 | if(current!=""){ | 29 | if(current!=""){ |
21 | %> | 30 | %> |
22 | </tr> | 31 | </tr> |
23 | <% } %> | 32 | <% } %> |
24 | <tr> | 33 | <tr> |
25 | - <th><%= alltoons[webtoon].week %></th> | 34 | + <th><%= alltoons[webtoon].week %></th> |
26 | <% } %> | 35 | <% } %> |
36 | + | ||
27 | <td class="<% | 37 | <td class="<% |
28 | for(i=0;i<mytoons.length;i++){ | 38 | for(i=0;i<mytoons.length;i++){ |
29 | if(mytoons[i].name == alltoons[webtoon].name){ | 39 | if(mytoons[i].name == alltoons[webtoon].name){ |
... | @@ -46,14 +56,67 @@ | ... | @@ -46,14 +56,67 @@ |
46 | <% | 56 | <% |
47 | } | 57 | } |
48 | } | 58 | } |
59 | + } | ||
49 | %> | 60 | %> |
50 | </tr> | 61 | </tr> |
51 | 62 | ||
52 | </table> | 63 | </table> |
53 | </form> | 64 | </form> |
65 | +</div> | ||
54 | </br> | 66 | </br> |
67 | +<br> | ||
68 | +<br> | ||
69 | + | ||
70 | + <a onclick="navertoons.style.display=(navertoons.style.display=='none')?'block':'none';" href="javascript:void(0)"> | ||
71 | + <img src ='/images/navericon.png' width="83" height="90"/> | ||
72 | +</a> | ||
73 | +<div id="navertoons" style="display:none"> | ||
74 | + | ||
75 | +<table> | ||
76 | + <% | ||
77 | + var current = ""; | ||
78 | + for(webtoon in alltoons){ | ||
79 | + if(alltoons[webtoon].site == "naver") | ||
80 | + { | ||
81 | + if(current!=alltoons[webtoon].week){ | ||
82 | + if(current!=""){ | ||
83 | + %> | ||
84 | + </tr> | ||
85 | + <% } %> | ||
86 | + <tr> | ||
87 | + <th><%= alltoons[webtoon].week %></th> | ||
88 | + <% } %> | ||
55 | 89 | ||
90 | + <td class="<% | ||
91 | + for(i=0;i<mytoons.length;i++){ | ||
92 | + if(mytoons[i].name == alltoons[webtoon].name){ | ||
93 | + %>registered<% | ||
94 | + break; | ||
95 | + } | ||
96 | + } | ||
97 | + %>"> | ||
98 | + <form method="post" action="/setting/toggle_toon"> | ||
99 | + <input type="hidden" name="toon_index" value="<%= alltoons[webtoon].toon_index %>"> | ||
100 | + <input TYPE="IMAGE" src="<%= alltoons[webtoon].thum_link %>" name="Submit" value="Submit" align="absmiddle"> | ||
101 | + </form> | ||
102 | + <%= alltoons[webtoon].name; %> | ||
103 | + </td> | ||
104 | + <% | ||
105 | + if(current!=alltoons[webtoon].week) { | ||
106 | + current = alltoons[webtoon].week; | ||
107 | + %> | ||
108 | + | ||
109 | + <% | ||
110 | + } | ||
111 | + } | ||
112 | + } | ||
113 | + %> | ||
114 | + </tr> | ||
115 | + | ||
116 | +</table> | ||
117 | +</form> | ||
118 | +</div> | ||
56 | <body> | 119 | <body> |
57 | 120 | ||
58 | </body> | 121 | </body> |
59 | -</html> | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
122 | +</html> | ... | ... |
-
Please register or login to post a comment