Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gyuricska Milán
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
d0f4347b
authored
Oct 27, 2014
by
Bach Dániel
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature-remove-tabs' into 'master'
Feature replace tabs See merge request !260
parents
e00127f9
215b6f56
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
12 additions
and
12 deletions
+12
-12
circle/dashboard/templates/dashboard/confirm/ajax-node-status.html
+2
-2
circle/dashboard/templates/dashboard/confirm/ajax-remove.html
+1
-1
circle/dashboard/templates/dashboard/confirm/node-flush.html
+3
-3
circle/dashboard/templates/dashboard/confirm/node-status.html
+1
-1
circle/dashboard/templates/dashboard/group-list.html
+1
-1
circle/dashboard/templates/dashboard/index-groups.html
+1
-1
circle/dashboard/templates/dashboard/node-add-trait.html
+1
-1
circle/dashboard/templates/dashboard/node-detail/home.html
+2
-2
No files found.
circle/dashboard/templates/dashboard/confirm/ajax-node-status.html
View file @
d0f4347b
...
...
@@ -15,11 +15,11 @@
<form
action=
"{% url "
dashboard
.
views
.
status-node
"
pk=
object.pk
%}"
method=
"POST"
>
{% csrf_token %}
<button
type=
"button"
class=
"btn btn-default"
data-dismiss=
"modal"
>
{% trans "Cancel" %}
</button>
<input
type=
"hidden"
name=
"change_status"
value=
""
/>
<input
type=
"hidden"
name=
"change_status"
value=
""
/>
<button
class=
"btn btn-warning"
>
{% blocktrans with status=status %}Yes, {{status}}{% endblocktrans %}
</button>
</form>
</div>
<div
class=
"clearfix"
></div>
<div
class=
"clearfix"
></div>
</div>
</div>
<!-- /.modal-content -->
...
...
circle/dashboard/templates/dashboard/confirm/ajax-remove.html
View file @
d0f4347b
...
...
@@ -7,7 +7,7 @@
{{ text }}
{% else %}
{%blocktrans with object=object%}
Are you sure you want to remove
<strong>
{{ member }}
</strong>
from
<strong>
{{ object }}
</strong>
?
Are you sure you want to remove
<strong>
{{ member }}
</strong>
from
<strong>
{{ object }}
</strong>
?
{%endblocktrans%}
{% endif %}
<br
/>
...
...
circle/dashboard/templates/dashboard/confirm/node-flush.html
View file @
d0f4347b
...
...
@@ -23,9 +23,9 @@
<div
class=
"pull-right"
>
<form
action=
""
method=
"POST"
>
{% csrf_token %}
<a
class=
"btn btn-default"
>
{% trans "Back" %}
</a>
<input
type=
"hidden"
name=
"flush"
value=
""
/>
<button
class=
"btn btn-warning"
>
{% trans "Yes" %}
</button>
<a
class=
"btn btn-default"
>
{% trans "Back" %}
</a>
<input
type=
"hidden"
name=
"flush"
value=
""
/>
<button
class=
"btn btn-warning"
>
{% trans "Yes" %}
</button>
</form>
</div>
</div>
...
...
circle/dashboard/templates/dashboard/confirm/node-status.html
View file @
d0f4347b
...
...
@@ -26,7 +26,7 @@
{% csrf_token %}
<a
class=
"btn btn-default"
>
{% trans "Cancel" %}
</a>
<button
type=
"button"
class=
"btn btn-default"
data-dismiss=
"modal"
></button>
<input
type=
"hidden"
name=
"change_status"
value=
""
/>
<input
type=
"hidden"
name=
"change_status"
value=
""
/>
<button
class=
"btn btn-warning"
>
{% blocktrans with status=status %}Yes, {{status}}{% endblocktrans %}
</button>
</form>
</div>
...
...
circle/dashboard/templates/dashboard/group-list.html
View file @
d0f4347b
...
...
@@ -13,7 +13,7 @@
<h3
class=
"no-margin"
><i
class=
"fa fa-group"
></i>
{% trans "Groups" %}
</h3>
</div>
<div
class=
"panel-body"
>
<div
id=
"table_container"
>
<div
id=
"table_container"
>
<div
id=
"rendered_table"
class=
"panel-body"
>
{% render_table table %}
</div>
...
...
circle/dashboard/templates/dashboard/index-groups.html
View file @
d0f4347b
...
...
@@ -26,7 +26,7 @@
<div
class=
"col-sm-6 text-right"
>
<a
class=
"btn btn-primary btn-xs"
href=
"{% url "
dashboard
.
views
.
group-list
"
%}"
>
<i
class=
"fa fa-chevron-circle-right"
></i>
{% if more_groups > 0 %}
{% if more_groups > 0 %}
{% blocktrans count more=more_groups %}
<strong>
{{ more }}
</strong>
more
{% plural %}
...
...
circle/dashboard/templates/dashboard/node-add-trait.html
View file @
d0f4347b
...
...
@@ -16,7 +16,7 @@
<div
class=
"col-md-12"
>
<div
class=
"panel panel-default"
>
<div
class=
"panel-heading"
>
<h3
class=
"no-margin"
><i
class=
"fa fa-plus"
></i>
{% trans "Add Trait" %}
</h3>
<h3
class=
"no-margin"
><i
class=
"fa fa-plus"
></i>
{% trans "Add Trait" %}
</h3>
</div>
<div
class=
"panel-body"
>
{% with form=form %}
...
...
circle/dashboard/templates/dashboard/node-detail/home.html
View file @
d0f4347b
...
...
@@ -8,11 +8,11 @@
{% for t in node.traits.all %}
<div
class=
"label label-success label-tag"
style=
"display: inline-block"
>
{{ t }}
<a
data-trait-pk=
"{{ t.pk }}"
href=
"#"
class=
"node-details-remove-trait"
><i
class=
"fa fa-times"
></i></a>
<a
data-trait-pk=
"{{ t.pk }}"
href=
"#"
class=
"node-details-remove-trait"
><i
class=
"fa fa-times"
></i></a>
</div>
{% endfor %}
{% else %}
<small>
{% trans "No trait added!" %}
</small>
<small>
{% trans "No trait added!" %}
</small>
{% endif %}
</div>
{% load crispy_forms_tags %}
...
...
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