Skip to content

Fukász Rómeó Ervin / cloud

Go to a project
Commit 2cc1f678 by tarokkk
Options

Merge branch 'master' of ssh://giccero.cloud.ik.bme.hu/cloud

parents 696d4d85 048906e2
Showing with 66 additions and 2 deletions
one/static/style/box.less
...@@ -645,13 +645,22 @@ table { ...@@ -645,13 +645,22 @@ table {
margin:20px; margin:20px;
display: none; display: none;
} }
&:hover .boxhelp-box { .help:hover .boxhelp-box {
display: block; display: block;
} }
.help {
img {
cursor: default;
}
}
.icon { .icon {
display: block; display: block;
float: right; float: right;
} }
img {
margin: 3px;
cursor: pointer;
}
} }
#new-owner-autocomplete { #new-owner-autocomplete {
......
one/templates/box/file/box.html
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
{% endblock title %} {% endblock title %}
{% block boxhelp %} {% block boxhelp %}
<div class="boxhelp"> <div class="boxhelp">
<div class="help">
<div class="icon"> <div class="icon">
<img src="{% static "icons/information-frame.png" %}" alt="{% trans "Help" %}" /> <img src="{% static "icons/information-frame.png" %}" alt="{% trans "Help" %}" />
</div> </div>
...@@ -25,6 +26,10 @@ ...@@ -25,6 +26,10 @@
WinSCP) to access your files at {{serv}}. You will need to register a WinSCP) to access your files at {{serv}}. You will need to register a
public key bellow.{% endblocktrans %}</p> public key bellow.{% endblocktrans %}</p>
</div> </div>
</div>
<div class="icon">
<img src="" alt="toggle" title="{% trans "Show/hide box" %}" class="toggle-box" data-id="files" id="toggle-box-files"/>
</div>
</div> </div>
{% endblock %} {% endblock %}
......
one/templates/box/template/box.html
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
{% block boxhelp %} {% block boxhelp %}
<div class="boxhelp"> <div class="boxhelp">
<div class="help">
<div class="icon"> <div class="icon">
<img src="{% static "icons/information-frame.png" %}" alt="{% trans "Help" %}" /> <img src="{% static "icons/information-frame.png" %}" alt="{% trans "Help" %}" />
</div> </div>
...@@ -20,6 +21,10 @@ ...@@ -20,6 +21,10 @@
machine, and it will be ready to run by your students in minutes. machine, and it will be ready to run by your students in minutes.
{% endblocktrans %}</p> {% endblocktrans %}</p>
</div> </div>
</div>
<div class="icon">
<img src="" alt="toggle" title="{% trans "Show/hide box" %}" class="toggle-box" data-id="templates" id="toggle-box-templates"/>
</div>
</div> </div>
{% endblock %} {% endblock %}
......
one/templates/box/vm/box.html
...@@ -10,8 +10,9 @@ ...@@ -10,8 +10,9 @@
{% block boxhelp %} {% block boxhelp %}
<div class="boxhelp"> <div class="boxhelp">
<div class="help">
<div class="icon"> <div class="icon">
<img src="{% static "icons/information-frame.png" %}" alt="{% trans "Help" %}" /> <img class="help" src="{% static "icons/information-frame.png" %}" alt="{% trans "Help" %}" />
</div> </div>
<div class="boxhelp-box"> <div class="boxhelp-box">
<p>{% blocktrans %}This is the list of your running virtual machines.{% endblocktrans %}</p> <p>{% blocktrans %}This is the list of your running virtual machines.{% endblocktrans %}</p>
...@@ -20,6 +21,10 @@ ...@@ -20,6 +21,10 @@
<p>{% blocktrans %}Please note, that users and shares both have a limit <p>{% blocktrans %}Please note, that users and shares both have a limit
of launchable instances.{% endblocktrans %}</p> of launchable instances.{% endblocktrans %}</p>
</div> </div>
</div>
<div class="icon">
<img src="" alt="{% trans "Show/hide box" %}" class="toggle-box" data-id="vms" id="toggle-box-vms"/>
</div>
</div> </div>
{% endblock %} {% endblock %}
......
school/templates/box/group/box.html
...@@ -3,6 +3,26 @@ ...@@ -3,6 +3,26 @@
{% load l10n %} {% load l10n %}
{% get_current_language as LANGUAGE_CODE %} {% get_current_language as LANGUAGE_CODE %}
{% block boxhelp %}
<div class="boxhelp">
<div class="help">
<div class="icon">
<img src="{% static "icons/information-frame.png" %}" alt="{% trans "Help" %}" />
</div>
<div class="boxhelp-box">
<p>{% blocktrans %}This is the list of your own templates.{% endblocktrans %}</p>
<p>{% blocktrans %}Templates are customized versions of the base images.{% endblocktrans %}</p>
<p>{% blocktrans %}You can install all the needed software on a master
machine, and it will be ready to run by your students in minutes.
{% endblocktrans %}</p>
</div>
</div>
<div class="icon">
<img src="" alt="toggle" title="{% trans "Show/hide box" %}" class="toggle-box" data-id="groups" id="toggle-box-groups"/>
</div>
</div>
{% endblock %}
{% block title %} {% block title %}
{% trans "My Groups" %} {% trans "My Groups" %}
{% endblock title %} {% endblock title %}
......
school/templates/box/person/box.html
...@@ -3,6 +3,26 @@ ...@@ -3,6 +3,26 @@
{% load l10n %} {% load l10n %}
{% get_current_language as LANGUAGE_CODE %} {% get_current_language as LANGUAGE_CODE %}
{% block boxhelp %}
<div class="boxhelp">
<div class="help">
<div class="icon">
<img src="{% static "icons/information-frame.png" %}" alt="{% trans "Help" %}" />
</div>
<div class="boxhelp-box">
<p>{% blocktrans %}This is the list of your own templates.{% endblocktrans %}</p>
<p>{% blocktrans %}Templates are customized versions of the base images.{% endblocktrans %}</p>
<p>{% blocktrans %}You can install all the needed software on a master
machine, and it will be ready to run by your students in minutes.
{% endblocktrans %}</p>
</div>
</div>
<div class="icon">
<img src="" alt="eye" title="{% trans "Show/hide box" %}" class="toggle-box" data-id="members" id="toggle-box-members"/>
</div>
</div>
{% endblock %}
{% block title %} {% block title %}
{% trans "Members of" %}: {{group.name}} {% trans "Members of" %}: {{group.name}}
{% endblock title %} {% endblock title %}
......
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