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
A prog2-höz tartozó friss repo anyagok itt elérhetőek:
https://git.iit.bme.hu/
Commit
6474d40a
authored
Jul 21, 2014
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: fix new template button on vm list
Closes
#209
parent
d0891d38
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
5 deletions
+7
-5
circle/dashboard/static/dashboard/dashboard.js
+0
-2
circle/dashboard/templates/dashboard/_template-choose.html
+5
-1
circle/dashboard/templates/dashboard/template-list.html
+2
-2
No files found.
circle/dashboard/static/dashboard/dashboard.js
View file @
6474d40a
...
@@ -56,8 +56,6 @@ $(function () {
...
@@ -56,8 +56,6 @@ $(function () {
url
:
'/dashboard/template/choose/'
,
url
:
'/dashboard/template/choose/'
,
success
:
function
(
data
)
{
success
:
function
(
data
)
{
$
(
'body'
).
append
(
data
);
$
(
'body'
).
append
(
data
);
vmCreateLoaded
();
addSliderMiscs
();
$
(
'#create-modal'
).
modal
(
'show'
);
$
(
'#create-modal'
).
modal
(
'show'
);
$
(
'#create-modal'
).
on
(
'hidden.bs.modal'
,
function
()
{
$
(
'#create-modal'
).
on
(
'hidden.bs.modal'
,
function
()
{
$
(
'#create-modal'
).
remove
();
$
(
'#create-modal'
).
remove
();
...
...
circle/dashboard/templates/dashboard/_template-choose.html
View file @
6474d40a
{% load i18n %}
{% load i18n %}
<div
class=
"alert alert-info"
id=
"template-choose-alert"
>
<div
class=
"alert alert-info"
id=
"template-choose-alert"
>
{% trans "Customize an existing template or create a brand new one from scratch!" %}
{% if perms.vm.create_base_template %}
{% trans "Customize an existing template or create a brand new one from scratch." %}
{% else %}
{% trans "Customize an existing template." %}
{% endif %}
</div>
</div>
<form
action=
"{% url "
dashboard
.
views
.
template-choose
"
%}"
method=
"POST"
<form
action=
"{% url "
dashboard
.
views
.
template-choose
"
%}"
method=
"POST"
...
...
circle/dashboard/templates/dashboard/template-list.html
View file @
6474d40a
...
@@ -10,8 +10,8 @@
...
@@ -10,8 +10,8 @@
<div
class=
"col-md-12"
>
<div
class=
"col-md-12"
>
<div
class=
"panel panel-default"
>
<div
class=
"panel panel-default"
>
<div
class=
"panel-heading"
>
<div
class=
"panel-heading"
>
<a
href=
"{% url "
dashboard
.
views
.
template-c
reate
"
%}"
class=
"pull-right btn btn-success btn-xs
"
>
<a
href=
"{% url "
dashboard
.
views
.
template-c
hoose
"
%}"
class=
"pull-right btn btn-success btn-xs template-choose
"
>
<i
class=
"fa fa-plus"
></i>
{% trans "new
base vm
" %}
<i
class=
"fa fa-plus"
></i>
{% trans "new
template
" %}
</a>
</a>
<h3
class=
"no-margin"
><i
class=
"fa fa-puzzle-piece"
></i>
{% trans "Templates" %}
</h3>
<h3
class=
"no-margin"
><i
class=
"fa fa-puzzle-piece"
></i>
{% trans "Templates" %}
</h3>
</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