All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit db11f836 authored by Leigh B Stoller's avatar Leigh B Stoller

A few UI tweaks to profile lists, making use of bootstrap glyph icons

and tooltips.
parent b2f758db
......@@ -134,7 +134,7 @@ $(function ()
});
var table = $('#experiments_table')
.tablesorter({
theme : 'blue',
theme : 'green',
});
}
var xmlthing = sup.CallServerMethod(null,
......@@ -171,7 +171,7 @@ $(function ()
});
var table = $('#classic_experiments_content .tablesorter')
.tablesorter({
theme : 'blue',
theme : 'green',
});
};
var xmlthing = sup.CallServerMethod(null,
......@@ -207,6 +207,11 @@ $(function ()
$(this).html(moment($(this).html()).format("ll"));
}
});
// This activates the tooltip subsystem.
$('[data-toggle="tooltip"]').tooltip({
delay: {"hide" : 500, "show" : 500},
placement: 'auto',
});
// Display the topo.
$('.showtopo_modal_button').click(function (event) {
event.preventDefault();
......@@ -215,7 +220,7 @@ $(function ()
var table = $('#profiles_table')
.tablesorter({
theme : 'blue',
theme : 'green',
widgets: ["filter"],
widgetOptions: {
// include child row content while filtering, if true
......@@ -268,7 +273,7 @@ $(function ()
});
var table = $('#classic_profiles_content .tablesorter')
.tablesorter({
theme : 'blue',
theme : 'green',
});
};
var xmlthing = sup.CallServerMethod(null,
......@@ -356,7 +361,7 @@ $(function ()
var table = $('#members_table')
.tablesorter({
theme : 'blue',
theme : 'green',
});
// Do this after converting table.
......@@ -472,7 +477,7 @@ $(function ()
var table = $('#groups_table')
.tablesorter({
theme : 'blue',
theme : 'green',
});
}
var xmlthing = sup.CallServerMethod(null,
......@@ -537,7 +542,7 @@ $(function ()
});
var table = $('#datasets_content .tablesorter')
.tablesorter({
theme : 'blue',
theme : 'green',
});
}
var xmlthing =
......@@ -576,7 +581,7 @@ $(function ()
});
var table = $('#classic_datasets_content .tablesorter')
.tablesorter({
theme : 'blue',
theme : 'green',
});
};
var xmlthing =
......
......@@ -234,6 +234,11 @@ $(function ()
$(this).html(moment($(this).html()).format("ll"));
}
});
// This activates the tooltip subsystem.
$('[data-toggle="tooltip"]').tooltip({
delay: {"hide" : 500, "show" : 500},
placement: 'auto',
});
// Display the topo.
$('.showtopo_modal_button').click(function (event) {
event.preventDefault();
......
......@@ -53,7 +53,7 @@ $emulablink = "$TBBASE/showproject.php3?project=" . $project->pid();
$canapprove = $project->AccessCheck($this_user, $TB_PROJECT_ADDUSER) ? 1 : 0;
echo "<link rel='stylesheet'
href='css/tablesorter-blue.css'>\n";
href='css/tablesorter.css'>\n";
echo "<script type='text/javascript'>\n";
echo " window.ISADMIN = $isadmin;\n";
......
......@@ -5,7 +5,7 @@
<thead>
<tr>
<th>Name</th>
<th>&nbsp</th>
<th class="sorter-false">&nbsp</th>
<% if (showCreator) { %>
<th>Creator</th>
<% } %>
......@@ -21,10 +21,24 @@
<tbody>
<% _.each(profiles, function(value, name) { %>
<tr>
<td style='text-align:center'><%= value.link %></td>
<td style='text-align:center'>
<button class='btn btn-primary btn-xs showtopo_modal_button'
data-profile=<%= value.profile_uuid %>>Topo</button></td>
<td><%= value.link %></td>
<td style='white-space: nowrap;'>
<a href="instantiate.php?profile=<%- value.profile_uuid %>"
<span class='glyphicon glyphicon-play'
data-toggle='tooltip'
data-container="body"
data-trigger="hover"
title='Instantiate this profile'></span>
</a>
<a class='showtopo_modal_button'
data-profile=<%= value.profile_uuid %>>
<span class='glyphicon glyphicon-modal-window'
data-toggle='tooltip'
data-container="body"
data-trigger="hover"
title='Show topology'></span>
</a>
</td>
<% if (showCreator) { %>
<td><%= value.creator %></td>
<% } %>
......
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 to comment