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
df469739
authored
Apr 29, 2014
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: display sorting message when sorting table
parent
4a4014ed
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
1 deletions
+10
-1
circle/dashboard/static/dashboard/dashboard.css
+4
-0
circle/dashboard/static/dashboard/vm-list.js
+2
-1
circle/dashboard/templates/dashboard/vm-list.html
+4
-0
No files found.
circle/dashboard/static/dashboard/dashboard.css
View file @
df469739
...
@@ -495,3 +495,7 @@ footer a, footer a:hover, footer a:visited {
...
@@ -495,3 +495,7 @@ footer a, footer a:hover, footer a:visited {
.vm-list-table
th
i
{
.vm-list-table
th
i
{
margin-top
:
3px
;
margin-top
:
3px
;
}
}
.table-sorting
{
display
:
none
;
}
circle/dashboard/static/dashboard/vm-list.js
View file @
df469739
...
@@ -161,12 +161,13 @@ $(function() {
...
@@ -161,12 +161,13 @@ $(function() {
var
table
=
$
(
".vm-list-table"
).
stupidtable
();
var
table
=
$
(
".vm-list-table"
).
stupidtable
();
table
.
on
(
"beforetablesort"
,
function
(
event
,
data
)
{
table
.
on
(
"beforetablesort"
,
function
(
event
,
data
)
{
return
false
;
$
(
".table-sorting"
).
show
()
;
});
});
table
.
on
(
"aftertablesort"
,
function
(
event
,
data
)
{
table
.
on
(
"aftertablesort"
,
function
(
event
,
data
)
{
// this didn't work ;;
// this didn't work ;;
// var th = $("this").find("th");
// var th = $("this").find("th");
$
(
".table-sorting"
).
hide
();
$
(
".vm-list-table thead th i"
).
remove
();
$
(
".vm-list-table thead th i"
).
remove
();
...
...
circle/dashboard/templates/dashboard/vm-list.html
View file @
df469739
...
@@ -9,6 +9,10 @@
...
@@ -9,6 +9,10 @@
<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"
>
<div
class=
"pull-right table-sorting"
>
{% trans "Sorting ... " %}
<!--<i class="icon-refresh icon-spin icon-2x"></i>-->
</div>
<h3
class=
"no-margin"
><i
class=
"icon-desktop"
></i>
{% trans "Virtual machines" %}
</h3>
<h3
class=
"no-margin"
><i
class=
"icon-desktop"
></i>
{% trans "Virtual machines" %}
</h3>
</div>
</div>
<div
class=
"pull-right"
style=
"max-width: 250px; margin-top: 15px; margin-right: 15px;"
>
<div
class=
"pull-right"
style=
"max-width: 250px; margin-top: 15px; margin-right: 15px;"
>
...
...
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