Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

This commit is contained in:
Jan Steemann 2013-07-30 18:48:40 +02:00
parent f16466c447 89725730a8
commit d07ba2e2f5
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
html/admin/js/templates/collectionsView.ejs
View File

@ -3,8 +3,7 @@
<!-- /btn-group -->
<div class="btn-group pull-right">
<button class="btn btn-inverse btn-small disabledHover">Filter:</button>
<button data-toggle="dropdown" class="btn btn-inverse btn-small dropdown-toggle"><span class="caret"></span></button>
<button data-toggle="dropdown" class="btn btn-inverse btn-small dropdown-toggle">Filter <span class="caret"></span></button>
<ul class="dropdown-menu">
<li class="nav-header">Type</li>
@ -46,6 +45,7 @@
</label>
</a></li>
<li class="divider"></li>
<li class="nav-header">Sorting</li>
<li><a href="#">

6
html/admin/js/templates/dashboardView.ejs
View File

@ -7,8 +7,7 @@
<!-- /btn-group -->
<div class="btn-group pull-right">
<button class="btn btn-inverse btn-small disabledHover">Filter:</button>
<button data-toggle="dropdown" class="btn btn-inverse btn-small dropdown-toggle"><span class="caret"></span></button>
<button data-toggle="dropdown" class="btn btn-inverse btn-small dropdown-toggle">Filter <span class="caret"></span></button>
<ul class="dropdown-menu dashboard-dropdown" id="menuGroups">
</ul>
@ -17,8 +16,7 @@
<!-- /btn-group update interval-->
<div class="btn-group pull-right">
<button class="btn btn-inverse btn-small disabledHover">Interval:</button>
<button data-toggle="dropdown" class="btn btn-inverse btn-small dropdown-toggle"><span class="caret"></span></button>
<button data-toggle="dropdown" class="btn btn-inverse btn-small dropdown-toggle">Interval <span class="caret"></span></button>
<ul class="dropdown-menu interval-dropdown">
<li class="nav-header">Update every:</li>