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
2cc1f678
authored
Mar 04, 2013
by
tarokkk
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
ssh://giccero.cloud.ik.bme.hu/cloud
parents
696d4d85
048906e2
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
66 additions
and
2 deletions
+66
-2
one/static/script/cloud.js
+0
-0
one/static/style/box.less
+10
-1
one/templates/box/file/box.html
+5
-0
one/templates/box/template/box.html
+5
-0
one/templates/box/vm/box.html
+6
-1
school/templates/box/group/box.html
+20
-0
school/templates/box/person/box.html
+20
-0
No files found.
one/static/script/cloud.js
View file @
2cc1f678
This diff is collapsed.
Click to expand it.
one/static/style/box.less
View file @
2cc1f678
...
...
@@ -645,13 +645,22 @@ table {
margin:20px;
display: none;
}
&
:hover .boxhelp-box {
.help
:hover .boxhelp-box {
display: block;
}
.help {
img {
cursor: default;
}
}
.icon {
display: block;
float: right;
}
img {
margin: 3px;
cursor: pointer;
}
}
#new-owner-autocomplete {
...
...
one/templates/box/file/box.html
View file @
2cc1f678
...
...
@@ -9,6 +9,7 @@
{% endblock title %}
{% block boxhelp %}
<div
class=
"boxhelp"
>
<div
class=
"help"
>
<div
class=
"icon"
>
<img
src=
"{% static "
icons
/
information-frame
.
png
"
%}"
alt=
"{% trans "
Help
"
%}"
/>
</div>
...
...
@@ -25,6 +26,10 @@
WinSCP) to access your files at {{serv}}. You will need to register a
public key bellow.{% endblocktrans %}
</p>
</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>
{% endblock %}
...
...
one/templates/box/template/box.html
View file @
2cc1f678
...
...
@@ -10,6 +10,7 @@
{% block boxhelp %}
<div
class=
"boxhelp"
>
<div
class=
"help"
>
<div
class=
"icon"
>
<img
src=
"{% static "
icons
/
information-frame
.
png
"
%}"
alt=
"{% trans "
Help
"
%}"
/>
</div>
...
...
@@ -20,6 +21,10 @@
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=
"templates"
id=
"toggle-box-templates"
/>
</div>
</div>
{% endblock %}
...
...
one/templates/box/vm/box.html
View file @
2cc1f678
...
...
@@ -10,8 +10,9 @@
{% block boxhelp %}
<div
class=
"boxhelp"
>
<div
class=
"help"
>
<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
class=
"boxhelp-box"
>
<p>
{% blocktrans %}This is the list of your running virtual machines.{% endblocktrans %}
</p>
...
...
@@ -20,6 +21,10 @@
<p>
{% blocktrans %}Please note, that users and shares both have a limit
of launchable instances.{% endblocktrans %}
</p>
</div>
</div>
<div
class=
"icon"
>
<img
src=
""
alt=
"{% trans "
Show
/
hide
box
"
%}"
class=
"toggle-box"
data-id=
"vms"
id=
"toggle-box-vms"
/>
</div>
</div>
{% endblock %}
...
...
school/templates/box/group/box.html
View file @
2cc1f678
...
...
@@ -3,6 +3,26 @@
{% load l10n %}
{% 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 %}
{% trans "My Groups" %}
{% endblock title %}
...
...
school/templates/box/person/box.html
View file @
2cc1f678
...
...
@@ -3,6 +3,26 @@
{% load l10n %}
{% 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 %}
{% trans "Members of" %}: {{group.name}}
{% endblock title %}
...
...
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