Skip to content

CIRCLE / cloud

Go to a project
Commit 3a9b29a3 by Őry Máté
Options

one: more unique contentblocks

parent 8ef85758
Showing with 51 additions and 97 deletions
one/static/box.less
...@@ -252,6 +252,9 @@ ...@@ -252,6 +252,9 @@
.os-linux{ .os-linux{
background-image: url(icons/animal-penguin.png) background-image: url(icons/animal-penguin.png)
} }
.template{
background-image: url(icons/document-template.png)
}
.type{ .type{
background-image: url(icons/box-share.png) background-image: url(icons/box-share.png)
} }
...@@ -286,23 +289,22 @@ ...@@ -286,23 +289,22 @@
background-image: url(icons/computer--plus.png); background-image: url(icons/computer--plus.png);
} }
} }
#template-wizard { #template-wizard .size-summary, .type .value {
&.size-summary {
.size-summary {
font-size: .8em; font-size: .8em;
text-align: right; text-align: right;
}
span { span {
background-position: left center; background-position: left center;
background-repeat: no-repeat; background-repeat: no-repeat;
padding-left: 18px; padding-left: 18px;
} &.cpu{
.cpu{
background-image: url(icons/processor.png) background-image: url(icons/processor.png)
} }
.memory{ &.memory{
background-image: url(icons/memory.png) background-image: url(icons/memory.png)
} }
.credit{ &.credit{
background-image: url(icons/documents-stack.png) /* TODO */ background-image: url(icons/documents-stack.png) /* TODO */
} }
} }
......
one/templates/box-grouplist.html
...@@ -55,10 +55,10 @@ ...@@ -55,10 +55,10 @@
<div id="new-wm-tooltip"> <div id="new-wm-tooltip">
<div id="new-wm-tooltip-container"> <div id="new-wm-tooltip-container">
<p> <p>
{% trans "You have no groups" %} {% trans "You have no groups." %}
</p> </p>
<p> <p>
{% trans "Create a new one, and add your students to the new group" %} {% trans "Create a new one, and add your students to the new group." %}
</p> </p>
<div id="new-wm-tooltip-tail"></div> <div id="new-wm-tooltip-tail"></div>
</div> </div>
......
one/templates/box-templatelist.html
...@@ -3,19 +3,13 @@ ...@@ -3,19 +3,13 @@
<div class="contentblock" id="template"> <div class="contentblock" id="template">
<h2>{% trans "My templates" %}</h2> <h2>{% trans "My templates" %}</h2>
<ul class="wm-list"> <ul class="wm-list">
<!-- ----- -->
{% for t in mytemplates %} {% for t in mytemplates %}
<li class="wm">{{t.name}}</li>
{% endfor %}
<li class="wm"> <li class="wm">
<div class="summary"> <div class="summary">
<div class="quota"> <div class="name">{{t.name}}</div>
<div class="used" style="background-color: rgba(0,255,0,0.2); width: 20%"></div> <div class="status">{{t.state}}</div>
</div>
<div class="name">Win7 Matlab</div>
<div class="status">2/10</div>
<div class="actions"> <div class="actions">
<a href="#" title="{% trans "Rename" %}"><img src="/static/icons/pencil.png" alt="{% trans "Rename" %}" /></a> <a href="#" title="{% trans "Edit" %}"><img src="/static/icons/pencil.png" alt="{% trans "Edit" %}" /></a>
<a href="#" title="{% trans "Remove" %}"><img src="/static/icons/minus-circle.png" alt="{% trans "Remove" %}" /></a> <a href="#" title="{% trans "Remove" %}"><img src="/static/icons/minus-circle.png" alt="{% trans "Remove" %}" /></a>
<a href="#" title="{% trans "Share" %}"><img src="static/icons/user-share.png" alt="{% trans "Share" %}" /></a> <a href="#" title="{% trans "Share" %}"><img src="static/icons/user-share.png" alt="{% trans "Share" %}" /></a>
</div> </div>
...@@ -23,83 +17,32 @@ ...@@ -23,83 +17,32 @@
</div> </div>
<div class="details"> <div class="details">
<ul> <ul>
<li class="name">{% trans "System" %}: <span class="value">Windows 7 Desktop</span></li> <li class="name">{% trans "System" %}: <span class="value">{{t.system}}</span><div class="clear"></div></li>
<li class="description">{% trans "Description" %}: <span class="value">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin nibh arcu, cursus et sodales eu, iaculis id metus. Suspendisse et mauris nisi, luctus feugiat nisi. Nullam elementum tincidunt urna a luctus.</span><div class="clear"></div></li> <li class="type">{% trans "Size" %}: <span class="value">{{t.instance_type}}:
<li class="date">{% trans "Created at" %}: <span class="value">2013.01.10. 13:40:22</span></li> <span class="cpu">{{t.instance_type.CPU}}</span>
<li class="date">{% trans "Modified at" %}: <span class="value">2013.01.10. 13:40:22</span></li> <span class="memory">{{t.instance_type.RAM}}</span>
<li class="count">{% trans "Running instances" %}: <span class="value">1</span></li> <span class="credit">{{t.instance_type.credit}}</span>
</ul> </span></li>
</div> <li class="description">{% trans "Description" %}: <span class="value">{{t.description}}</span><div class="clear"></div></li>
</li> <li class="date">{% trans "Created at" %}: <span class="value">{{t.created_at}} ({{t.owner.get_profile}})</span></li>
<li class="wm"> <li class="count">{% trans "Running instances" %}: <span class="value">{{t.instance_set.count}}</span></li>
<div class="summary">
<div class="quota">
<div class="used" style="background-color: rgba(255,128,0,0.2); width: 70%"></div>
</div>
<div class="name">Win7 Matlab</div>
<div class="status">7/10</div>
<div class="actions">
<a href="#" title="Átnevezés"><img src="/static/icons/pencil.png" alt="rename" /></a>
<a href="#" title="Törlés"><img src="/static/icons/minus-circle.png" alt="delete" /></a>
<a href="#" title="Megosztás"><img src="static/icons/user-share.png" alt="share" /></a>
</div>
<div class="clear"></div>
</div>
<div class="details">
<ul>
<li class="name">Rendszer: <span class="value">Windows 7 Desktop</span></li>
<li class="description">Leírás: <span class="value">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin nibh arcu, cursus et sodales eu, iaculis id metus. Suspendisse et mauris nisi, luctus feugiat nisi. Nullam elementum tincidunt urna a luctus.</span><div class="clear"></div></li>
<li class="date">Létrehozva: <span class="value">2013.01.10. 13:40:22</span></li>
<li class="date">Módosítva: <span class="value">2013.01.10. 13:40:22</span></li>
<li class="count">Futó példányok: <span class="value">5 db</span></li>
</ul>
</div>
</li>
<li class="wm">
<div class="summary">
<div class="quota">
<div class="used" style="background-color: rgba(255,0,0,0.2); width: 100%"></div>
</div>
<div class="name">Win7 Matlab</div>
<div class="status">10/10</div>
<div class="actions">
<a href="#" title="Átnevezés"><img src="/static/icons/pencil.png" alt="rename" /></a>
<a href="#" title="Törlés"><img src="/static/icons/minus-circle.png" alt="delete" /></a>
<a href="#" title="Megosztás"><img src="static/icons/user-share.png" alt="share" /></a>
</div>
<div class="clear"></div>
</div>
<div class="details">
<ul>
<li class="name">Rendszer: <span class="value">Windows 7 Desktop</span></li>
<li class="description">Leírás: <span class="value">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin nibh arcu, cursus et sodales eu, iaculis id metus. Suspendisse et mauris nisi, luctus feugiat nisi. Nullam elementum tincidunt urna a luctus.</span><div class="clear"></div></li>
<li class="date">Létrehozva: <span class="value">2013.01.10. 13:40:22</span></li>
<li class="date">Módosítva: <span class="value">2013.01.10. 13:40:22</span></li>
<li class="count">Futó példányok: <span class="value">10 db</span></li>
</ul>
</div>
</li>
<li class="wm">
<div class="summary unfinished">
<div class="name">Win7 Matlab</div>
<div class="status">{% trans "unfinished" %}</div>
<div class="actions">
<a href="#" title="Átnevezés"><img src="/static/icons/pencil.png" alt="rename" /></a>
<a href="#" title="Törlés"><img src="/static/icons/minus-circle.png" alt="delete" /></a>
</div>
<div class="clear"></div>
</div>
<div class="details">
<ul>
<li class="name">Rendszer: <span class="value">Windows 7 Desktop</span></li>
<li class="description">Leírás: <span class="value">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin nibh arcu, cursus et sodales eu, iaculis id metus. Suspendisse et mauris nisi, luctus feugiat nisi. Nullam elementum tincidunt urna a luctus.</span><div class="clear"></div></li>
<li class="date">Létrehozva: <span class="value">2013.01.10. 13:40:22</span></li>
<li class="date">Módosítva: <span class="value">2013.01.10. 13:40:22</span></li>
<li class="count">Futó példányok: <span class="value">8 db</span></li>
</ul> </ul>
</div> </div>
</li> </li>
<!-- ----- --> {% endfor %}
{% if not mytemplates %}
<div id="new-wm-tooltip">
<div id="new-wm-tooltip-container">
<p>
{% trans "You have no own templates." %}
</p>
<p>
{% trans "Create a new one, and share it with your students. Or you can also use a common one." %}
</p>
<div id="new-wm-tooltip-tail"></div>
</div>
</div>
{% endif %}
<li id="new-template-button" class="wm new"> <li id="new-template-button" class="wm new">
<div class="summary"> <div class="summary">
<div class="name">Új Sablon</div> <div class="name">Új Sablon</div>
......
one/templates/box-vmlist.html
...@@ -48,12 +48,21 @@ ...@@ -48,12 +48,21 @@
<div class="details"> <div class="details">
<div class="details-container"> <div class="details-container">
<ul> <ul>
<li class="name">{% trans "Hostname" %}: <span class="value">{{i.name}}</span></li> <li class="name">{% trans "Hostname" %}: <span class="value">{{i.name}}</span><div class="clear"></div></li>
<li class="os-{{i.template.os_type}}">{% trans "System" %}: <span class="value">{{i.template.system}}</span></li> <li class="os-{{i.template.os_type}}">{% trans "System" %}: <span class="value">{{i.template.system}}</span><div class="clear"></div></li>
<li class="tpl">{% trans "Template" %}: <span class="value">{{i.template.name}}</span></li> <li class="template">{% trans "Template" %}: <span class="value">{{i.template.name}}</span><div class="clear"></div></li>
<li class="type">{% trans "Size" %}: <span class="value">{{i.template.instance_type.name}}</span></li> <li class="type">{% trans "Size" %}: <span class="value">{{i.template.instance_type.name}}:
<span class="cpu">{{i.template.instance_type.CPU}}</span>
<span class="memory">{{i.template.instance_type.RAM}}</span>
<span class="credit">{{i.template.instance_type.credit}}</span>
</span></li>
<li class="date">{% trans "Created at" %}: <span class="value">{{i.created_at}}</span></li> <li class="date">{% trans "Created at" %}: <span class="value">{{i.created_at}}</span></li>
<li class="date">{% trans "Expiration" %}: <span class="value"><abbr title="1 nap, 5 óra, 34 perc">1 nap</abbr></span></li> {% if i.time_of_suspend %}
<li class="date">{% trans "time of suspend"|capfirst %}: <span class="value"><abbr title="{{i.time_of_suspend}}">{{i.time_of_suspend|timeuntil}}</abbr></span></li>
{% endif %}
{% if i.time_of_delete %}
<li class="date">{% trans "time of delete"|capfirst %}: <span class="value"><abbr title="{{i.time_of_delete}}">{{i.time_of_delete|timeuntil}}</abbr></span></li>
{% endif %}
<li>&nbsp;<span class="value"><a href="/vm/show/{{i.id}}/" title="{{i.name}}">{% trans "More details" %}</a></span></li> <li>&nbsp;<span class="value"><a href="/vm/show/{{i.id}}/" title="{{i.name}}">{% trans "More details" %}</a></span></li>
</ul> </ul>
</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