diff --git a/circle/dashboard/static/dashboard/dashboard.css b/circle/dashboard/static/dashboard/dashboard.css index 353f035..e170ceb 100644 --- a/circle/dashboard/static/dashboard/dashboard.css +++ b/circle/dashboard/static/dashboard/dashboard.css @@ -303,31 +303,25 @@ a.hover-black { } -.dropdown-menu +.nojs-dropdown-menu { - - position:absolute; - display:none; - z-index: 1; + position:absolute; + display:none; + z-index: 1; } -.dropdown-toggle:focus + .dropdown-menu +.nojs-dropdown-toggle:focus + .nojs-dropdown-menu { - - display: block; - + display: block; } -.dropdown-toggle:focus +.nojs-dropdown-toggle:focus { - - outline:none; - + outline:none; } -.dropdown-menu:hover{ - - display: block; - +.nojs-dropdown-menu:hover +{ + display: block; } diff --git a/circle/dashboard/templates/dashboard/group-detail.html b/circle/dashboard/templates/dashboard/group-detail.html index 1c4d368..3b19a12 100644 --- a/circle/dashboard/templates/dashboard/group-detail.html +++ b/circle/dashboard/templates/dashboard/group-detail.html @@ -21,8 +21,8 @@ <div class="col-md-4" id="group-info-pane"> <div class="big"> <div class="btn-group"> - <button type="button" class="btn btn-warning dropdown-toggle" data-toggle="dropdown">Action <i class="icon-caret-down"></i></button> - <ul class="dropdown-menu" role="menu"> + <button type="button" class="btn btn-warning nojs-dropdown-toogle dropdown-toggle" data-toggle="dropdown">Action <i class="icon-caret-down"></i></button> + <ul class="nojs-dropdown-menu dropdown-menu" role="menu"> <li><a href="#" class="group-details-rename-button"><i class="icon-pencil"></i> Rename</a></li> <li><a data-group-pk="{{ group.pk }}" class="group-delete" href="{% url "dashboard.views.delete-group" pk=group.pk %}"><i class="icon-remove"></i> Discard</a></li> </ul> diff --git a/circle/dashboard/templates/dashboard/group-list/test-one.html b/circle/dashboard/templates/dashboard/group-list/test-one.html index 6603d48..696d33e 100644 --- a/circle/dashboard/templates/dashboard/group-list/test-one.html +++ b/circle/dashboard/templates/dashboard/group-list/test-one.html @@ -39,8 +39,8 @@ </td> <td> <div class="btn-group"> - <button type="button" class="btn btn-xs btn-warning dropdown-toggle" data-toggle="dropdown">Action <i class="icon-caret-down"></i></button> - <ul class="dropdown-menu" role="menu"> + <button type="button" class="btn btn-xs btn-warning nojs-dropdown-toogle dropdown-toggle" data-toggle="dropdown">Action <i class="icon-caret-down"></i></button> + <ul class="nojs-dropdown-menu dropdown-menu" role="menu"> <li><a href="#"><i class="icon-refresh"></i> Reboot</a></li> <li><a href="#"><i class="icon-off"></i> Shutdown</a></li> <li><a href="#"><i class="icon-remove"></i> Discard</a></li> diff --git a/circle/dashboard/templates/dashboard/node-list/column-actions.html b/circle/dashboard/templates/dashboard/node-list/column-actions.html index edf225f..d855b33 100644 --- a/circle/dashboard/templates/dashboard/node-list/column-actions.html +++ b/circle/dashboard/templates/dashboard/node-list/column-actions.html @@ -1,7 +1,7 @@ <div class="btn-group"> - <button type="button" class="btn {{ btn_size }} btn-warning dropdown-toggle" data-toggle="dropdown">Action <i class="icon-caret-down"></i></button> - <ul class="dropdown-menu" role="menu"> + <button type="button" class="btn {{ btn_size }} btn-warning nojs-dropdown-toogle dropdown-toggle" data-toggle="dropdown">Action <i class="icon-caret-down"></i></button> + <ul class="dropdown-menu nojs-dropdown-toogle" role="menu"> <li><a href="#"><i class="icon-cloud-upload"></i> Flush</a></li> {% if record.enabled %} <li><a style="display:none" data-status="enable" data-node-pk="{{ record.pk }}" class="real-link node-enable" href="{% url "dashboard.views.status-node" pk=record.pk %}?next={{ request.path }}&status=enable"><i class="icon-check"></i> Enable</a> diff --git a/circle/dashboard/templates/dashboard/node-list/test-one.html b/circle/dashboard/templates/dashboard/node-list/test-one.html index 6603d48..696d33e 100644 --- a/circle/dashboard/templates/dashboard/node-list/test-one.html +++ b/circle/dashboard/templates/dashboard/node-list/test-one.html @@ -39,8 +39,8 @@ </td> <td> <div class="btn-group"> - <button type="button" class="btn btn-xs btn-warning dropdown-toggle" data-toggle="dropdown">Action <i class="icon-caret-down"></i></button> - <ul class="dropdown-menu" role="menu"> + <button type="button" class="btn btn-xs btn-warning nojs-dropdown-toogle dropdown-toggle" data-toggle="dropdown">Action <i class="icon-caret-down"></i></button> + <ul class="nojs-dropdown-menu dropdown-menu" role="menu"> <li><a href="#"><i class="icon-refresh"></i> Reboot</a></li> <li><a href="#"><i class="icon-off"></i> Shutdown</a></li> <li><a href="#"><i class="icon-remove"></i> Discard</a></li> diff --git a/circle/dashboard/templates/dashboard/vm-detail.html b/circle/dashboard/templates/dashboard/vm-detail.html index 1f25834..9b27c57 100644 --- a/circle/dashboard/templates/dashboard/vm-detail.html +++ b/circle/dashboard/templates/dashboard/vm-detail.html @@ -53,8 +53,8 @@ <div class="big"> <span id="vm-details-state" class="label label-success">{{ instance.state }}</span> <div class="btn-group"> - <button type="button" class="btn btn-warning dropdown-toggle" data-toggle="dropdown">Action <i class="icon-caret-down"></i></button> - <ul class="dropdown-menu" role="menu"> + <button type="button" class="btn btn-warning nojs-dropdown-toogle dropdown-toggle" data-toggle="dropdown">Action <i class="icon-caret-down"></i></button> + <ul class="nojs-dropdown-menu dropdown-menu" role="menu"> <li><a href="#" class="vm-details-rename-button"><i class="icon-pencil"></i> {% trans "Rename" %}</a></li> <li><a data-vm-pk="{{ instance.pk }}" href="#" class="vm-details-save-as-button"><i class="icon-save"></i> {% trans "Save as" %}</a></li> <li><a href="#"><i class="icon-refresh"></i> {% trans "Reboot" %}</a></li> diff --git a/circle/dashboard/templates/dashboard/vm-list/column-actions.html b/circle/dashboard/templates/dashboard/vm-list/column-actions.html index 014f392..a32b0cd 100644 --- a/circle/dashboard/templates/dashboard/vm-list/column-actions.html +++ b/circle/dashboard/templates/dashboard/vm-list/column-actions.html @@ -1,7 +1,7 @@ <div class="btn-group"> - <button type="button" class="btn btn-xs btn-warning dropdown-toggle" data-toggle="dropdown">Action <i class="icon-caret-down"></i></button> - <ul class="dropdown-menu" role="menu"> + <button type="button" class="btn btn-xs btn-warning nojs-dropdown-toogle dropdown-toggle" data-toggle="dropdown">Action <i class="icon-caret-down"></i></button> + <ul class="nojs-dropdown-toogle dropdown-menu" role="menu"> <li><a href="#"><i class="icon-refresh"></i> Reboot</a></li> <li><a href="#"><i class="icon-off"></i> Shutdown</a></li> <li><a data-vm-pk="{{ record.pk }}" class="real-link vm-delete" href="{% url "dashboard.views.delete-vm" pk=record.pk %}?next={{ request.path }}"><i class="icon-remove"></i> Discard</a></li> diff --git a/circle/dashboard/templates/dashboard/vm-list/test-one.html b/circle/dashboard/templates/dashboard/vm-list/test-one.html index 6603d48..696d33e 100644 --- a/circle/dashboard/templates/dashboard/vm-list/test-one.html +++ b/circle/dashboard/templates/dashboard/vm-list/test-one.html @@ -39,8 +39,8 @@ </td> <td> <div class="btn-group"> - <button type="button" class="btn btn-xs btn-warning dropdown-toggle" data-toggle="dropdown">Action <i class="icon-caret-down"></i></button> - <ul class="dropdown-menu" role="menu"> + <button type="button" class="btn btn-xs btn-warning nojs-dropdown-toogle dropdown-toggle" data-toggle="dropdown">Action <i class="icon-caret-down"></i></button> + <ul class="nojs-dropdown-menu dropdown-menu" role="menu"> <li><a href="#"><i class="icon-refresh"></i> Reboot</a></li> <li><a href="#"><i class="icon-off"></i> Shutdown</a></li> <li><a href="#"><i class="icon-remove"></i> Discard</a></li>