Skip to content

Gelencsér Szabolcs / cloud

Go to a project
Commit 132cabb2 by Dányi Bence
Options

webui: static files separated

parent 142531fe
Showing with 66 additions and 66 deletions
one/static/base.less → one/static/style/base.less
......@@ -3,7 +3,7 @@ body
min-height:100%;
font-family: 'Titillium Web', sans-serif;
font-size:.9em;
background:#dadada url(site_bgr.png) repeat-x;
background:#dadada url(/static/image/site_bgr.png) repeat-x;
background-position:80px 0;
margin:0;
padding:0;
......@@ -32,7 +32,7 @@ body
h2
{
background-color:#000;
background-image:url(hexabar.png);
background-image:url(/static/image/hexabar.png);
background-position:right center;
background-repeat:no-repeat;
border-radius:4px;
......@@ -73,28 +73,28 @@ ul.messagelist li
display:block;
border-bottom:1px solid #ddd;
color:#666;
background:#ffc url(admin/img/icon_success.gif) 5px .3em no-repeat;
background:#ffc url(/static/admin/img/icon_success.gif) 5px .3em no-repeat;
margin:0 0 3px;
padding:4px 5px 4px 25px;
}
ul.messagelist li.warning
{
background-image:url(admin/img/icon_alert.gif);
background-image:url(/static/admin/img/icon_alert.gif);
}
ul.messagelist li.error
{
background-image:url(admin/img/icon_error.gif);
background-image:url(/static/admin/img/icon_error.gif);
}
input.validated {
padding-right: 15px;
background-image: url(admin/img/icon_success.gif);
background-image: url(/static/admin/img/icon_success.gif);
background-repeat: no-repeat;
background-position: right center;
&.error
{
background:#fcc url(admin/img/icon_error.gif) right center no-repeat;
background:#fcc url(/static/admin/img/icon_error.gif) right center no-repeat;
padding-right: 15px;
}
}
......@@ -105,7 +105,7 @@ input.validated {
display:block;
border:1px solid red;
color:red;
background:#ffc url(admin/img/icon_error.gif) 5px .3em no-repeat;
background:#ffc url(/static/admin/img/icon_error.gif) 5px .3em no-repeat;
margin:0 0 3px;
padding:4px 5px 4px 25px;
}
......@@ -116,7 +116,7 @@ input.validated {
display:block;
border:1px solid red;
color:#FFF;
background:red url(admin/img/icon_alert.gif) 5px .3em no-repeat;
background:red url(/static/admin/img/icon_alert.gif) 5px .3em no-repeat;
margin:0 0 3px;
padding:4px 5px 4px 25px;
}
......@@ -153,7 +153,7 @@ div.system-message
div.system-message p.system-message-title
{
color:red;
background:#ffc url(admin/img/icon_error.gif) 5px .3em no-repeat;
background:#ffc url(/static/admin/img/icon_error.gif) 5px .3em no-repeat;
margin:0;
padding:4px 5px 4px 25px;
}
......@@ -228,11 +228,11 @@ textarea {
.hidden-password {
padding-right: 25px;
background-image: url(icons/eye-half.png);
background-image: url(/static/icons/eye-half.png);
background-repeat: no-repeat;
background-position: right center;
cursor: pointer;
&.shown {
background-image: url(icons/eye.png);
background-image: url(/static/icons/eye.png);
}
}
one/static/box.less → one/static/style/box.less
......@@ -7,7 +7,7 @@
.box
{
background-color:#000;
background-image:url(hexa.png);
background-image:url(/static/image/hexa.png);
background-position:center 30%;
background-repeat:no-repeat;
color:#fff;
......@@ -131,12 +131,12 @@
transition: background-color 0.3s;
&.unfinished{
background-color: rgb(252, 252, 108);
background-image: url(constr.png);
background-image: url(/static/image/constr.png);
background-position: right top;
background-repeat: no-repeat;
&:hover{
background-color: rgb(236, 236, 106);
background-image: url(constr.png);
background-image: url(/static/image/constr.png);
}
}
&.selected-summary{
......@@ -271,31 +271,31 @@
}
.name{
float: none;
background-image: url(icons/computer.png);
background-image: url(/static/icons/computer.png);
}
.os-win{
background-image: url(icons/windows.png)
background-image: url(/static/icons/windows.png)
}
.os-linux{
background-image: url(icons/animal-penguin.png)
background-image: url(/static/icons/animal-penguin.png)
}
.template{
background-image: url(icons/document-template.png)
background-image: url(/static/icons/document-template.png)
}
.type{
background-image: url(icons/box-share.png)
background-image: url(/static/icons/box-share.png)
}
.date{
background-image: url(icons/calendar-day.png)
background-image: url(/static/icons/calendar-day.png)
}
.cpu{
background-image: url(icons/processor.png)
background-image: url(/static/icons/processor.png)
}
.memory{
background-image: url(icons/memory.png)
background-image: url(/static/icons/memory.png)
}
.count{
background-image: url(icons/documents-stack.png)
background-image: url(/static/icons/documents-stack.png)
}
.value{
float: right;
......@@ -304,7 +304,7 @@
}
.description{
font-size: inherit;
background-image: url(icons/document-snippet.png);
background-image: url(/static/icons/document-snippet.png);
.value{
font-size: 0.8em;
word-spacing: 3px;
......@@ -313,7 +313,7 @@
}
}
&.new .name{
background-image: url(icons/computer--plus.png);
background-image: url(/static/icons/computer--plus.png);
}
}
#new-share .type-summary, .share-type .value {
......@@ -326,10 +326,10 @@
background-repeat: no-repeat;
padding-left: 18px;
&.suspend{
background-image: url(icons/control-pause.png)
background-image: url(/static/icons/control-pause.png)
}
&.delete{
background-image: url(icons/minus-circle.png)
background-image: url(/static/icons/minus-circle.png)
}
}
}
......@@ -343,13 +343,13 @@
background-repeat: no-repeat;
padding-left: 18px;
&.cpu{
background-image: url(icons/processor.png)
background-image: url(/static/icons/processor.png)
}
&.memory{
background-image: url(icons/memory.png)
background-image: url(/static/icons/memory.png)
}
&.credit{
background-image: url(icons/point.png)
background-image: url(/static/icons/point.png)
}
}
}
......@@ -398,74 +398,74 @@
}
}
.filetype-c {
background-image: url(icons/document-visual-studio.png);
background-image: url(/static/icons/document-visual-studio.png);
}
.filetype-text {
background-image: url(icons/document.png);
background-image: url(/static/icons/document.png);
}
.filetype-image {
background-image: url(icons/document-image.png);
background-image: url(/static/icons/document-image.png);
}
.filetype-zip {
background-image: url(icons/folder-zipper.png);
background-image: url(/static/icons/folder-zipper.png);
}
.filetype-pdf {
background-image: url(icons/document-pdf.png);
background-image: url(/static/icons/document-pdf.png);
}
.filetype-doc {
background-image: url(icons/document-word.png);
background-image: url(/static/icons/document-word.png);
}
.filetype-excel {
background-image: url(icons/document-excel.png);
background-image: url(/static/icons/document-excel.png);
}
.filetype-csv {
background-image: url(icons/document-excel-csv.png);
background-image: url(/static/icons/document-excel-csv.png);
}
.filetype-php {
background-image: url(icons/document-php.png);
background-image: url(/static/icons/document-php.png);
}
.filetype-tex {
background-image: url(icons/document-tex.png);
background-image: url(/static/icons/document-tex.png);
}
.filetype-ppt {
background-image: url(icons/document-powerpoint.png);
background-image: url(/static/icons/document-powerpoint.png);
}
.filetype-music {
background-image: url(icons/document-music.png);
background-image: url(/static/icons/document-music.png);
}
.filetype-movie {
background-image: url(icons/document-film.png);
background-image: url(/static/icons/document-film.png);
}
.filetype-folder {
background-image: url(icons/folder.png);
background-image: url(/static/icons/folder.png);
}
.toplist {
background-image: url(icons/arrow-circle-double.png);
background-image: url(/static/icons/arrow-circle-double.png);
}
.filetype-up {
background-image: url(icons/upload-cloud.png);
background-image: url(/static/icons/upload-cloud.png);
}
.filetype-new-folder {
background-image: url(icons/folder--plus.png);
background-image: url(/static/icons/folder--plus.png);
}
.filetype-jump-out {
background-image: url(icons/arrow-curve-090.png);
background-image: url(/static/icons/arrow-curve-090.png);
}
.vm-on{
background-image: url(icons/computer-cloud.png);
background-image: url(/static/icons/computer-cloud.png);
}
.vm-off{
background-image: url(icons/computer-off.png);
background-image: url(/static/icons/computer-off.png);
}
#template .wm .summary .name{
background-image: url(icons/document-template.png)
background-image: url(/static/icons/document-template.png)
}
#template .wm .public-template .name{
background-image: url(icons/blue-document-share.png)
background-image: url(/static/icons/blue-document-share.png)
}
#new-template-button .name{
background-image: url(icons/document--plus.png) !important
background-image: url(/static/icons/document--plus.png) !important
}
.wm-list.modal{
border-radius: 4px;
......@@ -536,31 +536,31 @@ table {
.entry {
.summary {
.name {
background-image: url(icons/users.png);
background-image: url(/static/icons/users.png);
}
}
}
#new-group {
.summary .name {
background-image: url(icons/user--plus.png);
background-image: url(/static/icons/user--plus.png);
}
}
#show-hidden-groups .summary .name {
background-image: url(icons/eye.png);
background-image: url(/static/icons/eye.png);
}
}
#group-members, #group-owners {
.summary .name {
background-image: url(icons/user.png);
background-image: url(/static/icons/user.png);
float: left;
}
}
#new-member, #new-owner {
.name {
background-image: url(icons/user--plus.png) !important;
background-image: url(/static/icons/user--plus.png) !important;
float: left;
}
#new-member-form, #new-owner-form {
......
one/static/head.less → one/static/style/head.less
#header {
height:80px;
background-color:#072c61;
background-image:url(bme_feher2.png);
background-image:url(/static/image/bme_feher2.png);
background-repeat:no-repeat;
background-position:20px 18px;
border-bottom:3px solid #0B4599;
......@@ -25,7 +25,7 @@
right:0;
top:0;
background-color:#000;
background-image:url(hexabar.png);
background-image:url(/static/image/hexabar.png);
background-position:center center;
border-radius:0 0 0 10px;
color:#fff;
......
one/templates/base.html
......@@ -6,17 +6,17 @@
<title>{% block title %}IK Cloud{% endblock %}</title>
<link href="https://fonts.googleapis.com/css?family=Titillium+Web&amp;subset=latin,latin-ext" rel="stylesheet" type="text/css">
<link rel="icon" type="image/png" href="/static/favicon.png" />
<link rel="stylesheet/less" href="/static/style.less" />
<link rel="stylesheet/less" href="/static/style/style.less" />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<script src="/static/jquery.min.js"></script>
<script src="/static/script/jquery.min.js"></script>
<script type="text/javascript" src="{% url django.views.i18n.javascript_catalog %}"></script>
<script type="text/javascript">
//window.localStorage.clear();
var current_user={{user.id}};
</script>
<script src="/static/less.min.js"></script>
<script src="/static/knockout.min.js"></script>
<script type="text/javascript" src="/static/cloud.js"></script>
<script src="/static/script/less.min.js"></script>
<script src="/static/script/knockout.min.js"></script>
<script type="text/javascript" src="/static/script/cloud.js"></script>
{{ form.media }}
{% block js %}{% endblock %}
</head>
......
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