이승윤 / OpenSource-MyCookBook

Go to a project
Toggle navigation Toggle navigation pinning
송근영
6349bb24 2 parents e170968d dfb427e2

Merge branch 'style/styles' into 'develop' 

Style/styles



See merge request !12
Inline Side-by-side
Showing 3 changed files with 24 additions and 49 deletions
1 <% include ../includes/header.ejs %> 1 <% include ../includes/header.ejs %>
2 <table class="table table-bordered table-hover"> 2 <table class="table table-bordered table-hover">
3 <tr> 3 <tr>
4 - <th width="100px" style="text-align: center;">카테고리명</th> 4 + <th width="80px" style="text-align: center;">카테고리명</th>
5 - <th style="text-align: center;">개설 날짜</th> 5 + <th width="50px" style="text-align: center;">개설 날짜</th>
6 - <th>내용</th> 6 + <th width="350px" style="text-align: center;">내용</th>
7 - <th>사용자명</th> 7 + <th width="30px" style="text-align: center;">사용자명</th>
8 - <th>삭제</th> 8 + <th width="30px" style="text-align: center;">삭제</th>
9 </tr> 9 </tr>
10 <%categories.forEach(function(product){%> 10 <%categories.forEach(function(product){%>
11 <tr> 11 <tr>
12 - <td> 12 + <td style="text-align: center;">
13 <a href="/categori/products/detail/<%=product.id%>"><%=product.title%></a> 13 <a href="/categori/products/detail/<%=product.id%>"><%=product.title%></a>
14 </td> 14 </td>
15 - <td> 15 + <td style="text-align: center;" >
16 <%=product.getDate.year%> - 16 <%=product.getDate.year%> -
17 <%=product.getDate.month%> - 17 <%=product.getDate.month%> -
18 <%=product.getDate.day%> 18 <%=product.getDate.day%>
19 </td> 19 </td>
20 - <td> 20 + <td style="text-align: center;">
21 - <%=product.description%> - 21 + <%=product.description%>
22 </td> 22 </td>
23 - <td> 23 + <td style="text-align: center;">
24 - <%=product.username%> - 24 + <%=product.username%>
25 </td> 25 </td>
26 - <td> 26 + <td style="text-align: center;">
27 <a href="/categori/products/delete/<%=product.id%>" class="btn btn-danger" onclick="return confirm('삭제하시겠습니까?')">삭제</a> 27 <a href="/categori/products/delete/<%=product.id%>" class="btn btn-danger" onclick="return confirm('삭제하시겠습니까?')">삭제</a>
28 </td> 28 </td>
29 </tr> 29 </tr>
......
1 <% include ../includes/header.ejs %> 1 <% include ../includes/header.ejs %>
2 <div class="panel panel-default"> 2 <div class="panel panel-default">
3 <div class="panel-heading"> 3 <div class="panel-heading">
4 - <%=product.title%> 4 + 　<%=product.title%>
5 </div> 5 </div>
6 <div style="padding-bottom: 10px"> 6 <div style="padding-bottom: 10px">
7 - 작성일 : 7 + <br>　　작성일 :
8 <%=product.getDate.year%> - 8 <%=product.getDate.year%> -
9 <%=product.getDate.month%> - 9 <%=product.getDate.month%> -
10 <%=product.getDate.day%> 10 <%=product.getDate.day%>
11 </div> 11 </div>
12 <div> 12 <div>
13 <% var count=0; %> 13 <% var count=0; %>
14 - 보유중인 영상 14 + 　　※ 보유중인 영상<br><br>
15 <% for (var i in items[0]) { %> 15 <% for (var i in items[0]) { %>
16 <div> 16 <div>
17 - <%=items[0][i]%> 17 + 　　<%=items[0][i]%>
18 </div> 18 </div>
19 <%count++;};%> 19 <%count++;};%>
20 </div> 20 </div>
21 <div> 21 <div>
22 - 설명 : <%=product.description%> 22 + <br>　　설명 : <%=product.description%><br><br>
23 </div> 23 </div>
24 <form method="get" action=""> 24 <form method="get" action="">
25 <div class="input-group"> 25 <div class="input-group">
...@@ -48,24 +48,8 @@ ...@@ -48,24 +48,8 @@
48 <button class="btn btn-primary" style="margin-top: 10px; margin-left: 15px;" >영상담기</button> 48 <button class="btn btn-primary" style="margin-top: 10px; margin-left: 15px;" >영상담기</button>
49 </form> 49 </form>
50 <div class="panel-body"> 50 <div class="panel-body">
51 - <!-- 댓글영역 --> 51 + <div>
52 - <div>
53 - 댓글작성하기
54 - <form id="commentForm" action="" method="post">
55 - <input type="hidden" name="product_id" value="<%=product.id%>" />
56 - <textarea class="form-control" name="content"></textarea>
57 - <button class="btn btn-primary" style="margin-top: 10px" type="submit">댓글작성</button>
58 - </form>
59 - </div>
60 - <!-- 댓글영역 -->
61 <hr /> 52 <hr />
62 - <div id="comment_area">
63 - <% comments.forEach(function(comment){ %>
64 - <div>
65 - <%=comment.content%>
66 - ( <a class='comment_delete' comment_id='<%=comment._id%>'>삭제</a> )
67 - </div>
68 - <% }); %>
69 </div> 53 </div>
70 </div> 54 </div>
71 </div> 55 </div>
......
1 <% include ./includes/header.ejs %> 1 <% include ./includes/header.ejs %>
2 - <div id="masonry_container"> 2 + <div style="background-color:lavenderblush">
3 <% var count = 0; %> 3 <% var count = 0; %>
4 + <center>
4 <% for (var i in video) { %> 5 <% for (var i in video) { %>
5 - <div> 6 + <div style ="color:gray; font-weight:bold; font-size:2.0em;">
6 <%=video[i].category.title%> 7 <%=video[i].category.title%>
7 </div> 8 </div>
8 <% for (var j in video[i].videos) { %> 9 <% for (var j in video[i].videos) { %>
9 - <div id="<%=count%>" vid="<%=video[i].videos[j].video_id%>"> 10 + <div id="<%=count%>" vid="<%=video[i].videos[j].video_id%>">
10 - </div> 11 + </div>
11 <%count++;};};%> 12 <%count++;};};%>
13 + </center>
12 </div> 14 </div>
13 15
14 <style type="text/css"> 16 <style type="text/css">
...@@ -48,19 +50,8 @@ ...@@ -48,19 +50,8 @@
48 height: '360', 50 height: '360',
49 width: '640', 51 width: '640',
50 videoId: videoIds[i], 52 videoId: videoIds[i],
51 - events: {
52 - // 'onReady': onPlayerReady,
53 - // 'onStateChange': onPlayerStateChange
54 - }
55 }); 53 });
56 } 54 }
57 } 55 }
58 -
59 - // function onPlayerReady(event) {
60 - // }
61 - // function onPlayerStateChange(event) {
62 - // }
63 - // function stopVideo() {
64 - // }
65 </script> 56 </script>
66 <% include ./includes/footer.ejs %> 57 <% include ./includes/footer.ejs %>
...\ No newline at end of file ...\ No newline at end of file
......