Skip to content

Fukász Rómeó Ervin / cloud

Go to a project

A prog2-höz tartozó friss repo anyagok itt elérhetőek: https://git.iit.bme.hu/

Commit 9fabdf4b by Kálmán Viktor
Options

dashboard: minor design fixis for files

parent a9a27ccc
Showing with 24 additions and 10 deletions
circle/circle/settings/base.py
...@@ -452,5 +452,5 @@ STORE_SETTINGS = { ...@@ -452,5 +452,5 @@ STORE_SETTINGS = {
"store_client_user": "admin", "store_client_user": "admin",
"store_client_key": "/opt/webadmin/cloud/client.key", "store_client_key": "/opt/webadmin/cloud/client.key",
"store_client_cert": "/opt/webadmin/cloud/client.crt", "store_client_cert": "/opt/webadmin/cloud/client.crt",
"store_url": "http://pc3.szgt.uni-miskolc.hu:14505", "store_url": "http://pc3.szgt.uni-miskolc.hu:17719",
} }
circle/dashboard/static/dashboard/dashboard.css
...@@ -780,3 +780,15 @@ textarea[name="list-new-namelist"] { ...@@ -780,3 +780,15 @@ textarea[name="list-new-namelist"] {
.store-list-item-icon-directory { .store-list-item-icon-directory {
color: #ff8c00; color: #ff8c00;
} }
#dashboard-files-toplist div.list-group-item {
color: #555;
}
#dashboard-files-toplist div.list-group-item:hover {
background: #eee;
}
.no-hover:hover {
background: none !important;
}
circle/dashboard/store_api.py
...@@ -225,12 +225,12 @@ def process_list(content): ...@@ -225,12 +225,12 @@ def process_list(content):
"directory" if d['TYPE'] == "D" else "directory" if d['TYPE'] == "D" else
filesizeformat(float(d['SIZE']))) filesizeformat(float(d['SIZE'])))
d['path'] = d['DIR'] if len(d['DIR']) == 1 and d['DIR'][0] == ".":
if len(d['path']) == 1 and d['path'][0] == ".": d['directory'] = "/"
d['path'] = "/"
else: else:
d['path'] = "/" + d['path'] + "/" d['directory'] = "/" + d['DIR'] + "/"
d['path'] = d['directory']
d['path'] += d['NAME'] d['path'] += d['NAME']
if d['TYPE'] == "D": if d['TYPE'] == "D":
d['path'] += "/" d['path'] += "/"
......
circle/dashboard/templates/dashboard/store/index-files.html
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<h3 class="no-margin"><i class="icon-briefcase"></i> Files <h3 class="no-margin"><i class="icon-briefcase"></i> Files
</h3> </h3>
</div> </div>
<div class="list-group" id="vm-list-view"> <div class="list-group" id="dashboard-files-toplist">
{% for t in toplist %} {% for t in toplist %}
{% if t.TYPE == "F" %} {% if t.TYPE == "F" %}
<div class="list-group-item"> <div class="list-group-item">
...@@ -18,6 +18,10 @@ ...@@ -18,6 +18,10 @@
class="pull-right btn btn-xs" style="color: black;"> class="pull-right btn btn-xs" style="color: black;">
<i class="icon-cloud-download" title="{% trans "Download" %}"></i> <i class="icon-cloud-download" title="{% trans "Download" %}"></i>
</a> </a>
<a href="{% url "dashboard.views.store-list" %}?directory={{ t.directory }}"
class="pull-right btn btn-xs" style="color: black;">
<i class="icon-folder-open" title="{% trans "Show in directory" %}"></i>
</a>
</div> </div>
{% else %} {% else %}
<a href="{% url "dashboard.views.store-list" %}?directory={{ t.path }}" class="list-group-item"> <a href="{% url "dashboard.views.store-list" %}?directory={{ t.path }}" class="list-group-item">
...@@ -25,8 +29,7 @@ ...@@ -25,8 +29,7 @@
</a> </a>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
<div class="list-group-item list-group-footer text-right"> <div class="list-group-item text-right no-hover">
<p>
<form class="pull-left" method="POST" action="{% url "dashboard.views.store-refresh-toplist" %}"> <form class="pull-left" method="POST" action="{% url "dashboard.views.store-refresh-toplist" %}">
{% csrf_token %} {% csrf_token %}
<button class="btn btn-success btn-xs" type="submit" title="{% trans "Refresh" %}"/> <button class="btn btn-success btn-xs" type="submit" title="{% trans "Refresh" %}"/>
...@@ -37,9 +40,8 @@ ...@@ -37,9 +40,8 @@
<i class="icon-chevron-sign-right"></i> {% trans "show my files" %} <i class="icon-chevron-sign-right"></i> {% trans "show my files" %}
</a> </a>
<a href="{% url "dashboard.views.store-upload" %}" class="btn btn-success btn-xs"> <a href="{% url "dashboard.views.store-upload" %}" class="btn btn-success btn-xs">
<i class="icon-upload-alt"></i> {% trans "upload" %} <i class="icon-cloud-upload"></i> {% trans "upload" %}
</a> </a>
</p>
</div> </div>
</div> </div>
</div> </div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment