Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
CIRCLE
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
94
Merge Requests
10
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
9fabdf4b
authored
Jul 10, 2014
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: minor design fixis for files
parent
a9a27ccc
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
10 deletions
+24
-10
circle/circle/settings/base.py
+1
-1
circle/dashboard/static/dashboard/dashboard.css
+12
-0
circle/dashboard/store_api.py
+4
-4
circle/dashboard/templates/dashboard/store/index-files.html
+7
-5
No files found.
circle/circle/settings/base.py
View file @
9fabdf4b
...
...
@@ -452,5 +452,5 @@ STORE_SETTINGS = {
"store_client_user"
:
"admin"
,
"store_client_key"
:
"/opt/webadmin/cloud/client.key"
,
"store_client_cert"
:
"/opt/webadmin/cloud/client.crt"
,
"store_url"
:
"http://pc3.szgt.uni-miskolc.hu:1
4505
"
,
"store_url"
:
"http://pc3.szgt.uni-miskolc.hu:1
7719
"
,
}
circle/dashboard/static/dashboard/dashboard.css
View file @
9fabdf4b
...
...
@@ -780,3 +780,15 @@ textarea[name="list-new-namelist"] {
.store-list-item-icon-directory
{
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
View file @
9fabdf4b
...
...
@@ -225,12 +225,12 @@ def process_list(content):
"directory"
if
d
[
'TYPE'
]
==
"D"
else
filesizeformat
(
float
(
d
[
'SIZE'
])))
d
[
'path'
]
=
d
[
'DIR'
]
if
len
(
d
[
'path'
])
==
1
and
d
[
'path'
][
0
]
==
"."
:
d
[
'path'
]
=
"/"
if
len
(
d
[
'DIR'
])
==
1
and
d
[
'DIR'
][
0
]
==
"."
:
d
[
'directory'
]
=
"/"
else
:
d
[
'
path'
]
=
"/"
+
d
[
'path
'
]
+
"/"
d
[
'
directory'
]
=
"/"
+
d
[
'DIR
'
]
+
"/"
d
[
'path'
]
=
d
[
'directory'
]
d
[
'path'
]
+=
d
[
'NAME'
]
if
d
[
'TYPE'
]
==
"D"
:
d
[
'path'
]
+=
"/"
...
...
circle/dashboard/templates/dashboard/store/index-files.html
View file @
9fabdf4b
...
...
@@ -9,7 +9,7 @@
<h3
class=
"no-margin"
><i
class=
"icon-briefcase"
></i>
Files
</h3>
</div>
<div
class=
"list-group"
id=
"
vm-list-view
"
>
<div
class=
"list-group"
id=
"
dashboard-files-toplist
"
>
{% for t in toplist %}
{% if t.TYPE == "F" %}
<div
class=
"list-group-item"
>
...
...
@@ -18,6 +18,10 @@
class=
"pull-right btn btn-xs"
style=
"color: black;"
>
<i
class=
"icon-cloud-download"
title=
"{% trans "
Download
"
%}"
></i>
</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>
{% else %}
<a
href=
"{% url "
dashboard
.
views
.
store-list
"
%}?
directory=
{{
t
.
path
}}"
class=
"list-group-item"
>
...
...
@@ -25,8 +29,7 @@
</a>
{% endif %}
{% endfor %}
<div
class=
"list-group-item list-group-footer text-right"
>
<p>
<div
class=
"list-group-item text-right no-hover"
>
<form
class=
"pull-left"
method=
"POST"
action=
"{% url "
dashboard
.
views
.
store-refresh-toplist
"
%}"
>
{% csrf_token %}
<button
class=
"btn btn-success btn-xs"
type=
"submit"
title=
"{% trans "
Refresh
"
%}"
/>
...
...
@@ -37,9 +40,8 @@
<i
class=
"icon-chevron-sign-right"
></i>
{% trans "show my files" %}
</a>
<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>
</p>
</div>
</div>
</div>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment