허진호 / cloud_computing_fileshell

Go to a project
Toggle navigation Toggle navigation pinning
허진호
57940c07 1 parent 5c0b1dfa

Merge branch 'dev' of https://github.com/jh8579/fileshell_cloudcomputing into dev 

# Conflicts:
#	fileshell/models.py
#	fileshell/settings.py
#	fileshell/urls.py
#	fileshell/views.py
#	templates/base.html
Inline Side-by-side
Showing 1 changed file with 3 additions and 3 deletions
{% extends 'base.html'%}
{% load staticfiles %}
{% block content %}
<div class="frame">
<div class="frame_home">
<!-- //header -->
<div class="container">
<!-- //nav -->
......@@ -9,7 +9,7 @@
<div class = "shiftleft">
<h2>즐겨찾기</h2>
</div>
<table id="hor-minimalist-b" width = 1000px>
<table id="hor-minimalist-b">
<thead>
<tr>
<td width=300><p>제목</p></td>
......@@ -65,7 +65,7 @@
{% else %}
<td width=100><a href="/changeFavor/{{ fileRow.bucketPath }}/{{ fileRow.title }}" align=center><img class = 'star_icon' src= "{% static 'resources/gray_star.png' %}" width="50" height="50"/></a></td>
{% endif %}
<td width=100><p href="">{{ fileRow.fileSize }}</p></td>
<td width=100><p href="">{{ fileRow.fileSize}}</p></td>
<td width=100><a href="/delete/{{ fileRow.bucketPath }}{{ fileRow.title }}//{{ fileRow.title }}//{{ fileRow.bucketPath }}" align=center><img class = 'trash_icon' src= "{% static 'resources/trashcan.png' %}" width="50" height="50"/></a></td>
</tr>
{% endfor %}
......