External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-09 13:39:27 -02:30
Code Issues Packages Projects Releases Wiki Activity

2.0 style changes

Browse Source 
Fixed drop-down account menu so that it no longer behaves like a drop-down when the menu collapses on small viewports. On large screens added a right margin to the drop-down menu. Moved Logout to the bottom of the submenu. On large screens the drop-down now includes a divider above the logout option.
This commit is contained in:
Chris Houseknecht
2014-06-25 12:59:58 -04:00
parent 994c87eb0c
commit e4fd79f653
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
awx/ui/static/less/main-layout.less
View File

@@ -36,6 +36,9 @@ body {
.navbar-collapse { .navbar-collapse {
margin-left: 42px; margin-left: 42px;
} }
.collapsed-option {
display: none;
}
} }
#content-container { #content-container {
@@ -54,7 +57,21 @@ body {
display: block; display: block;
} }
#account-submenu {
margin-right: 5px;
}
@media (max-width: 1075px) { @media (max-width: 1075px) {
#main-menu-container {
.collapsed-option {
display: block;
}
}
#account-menu {
display: none;
}
#socket-beacon-div { #socket-beacon-div {
display: block; display: block;
position: fixed; position: fixed;

12
awx/ui/templates/ui/index.html
View File

@@ -193,17 +193,23 @@
<li id="inventories"><a href="#inventories" id="main_inventories_link">Inventories</a></li> <li id="inventories"><a href="#inventories" id="main_inventories_link">Inventories</a></li>
<li id="job_templates"><a href="#job_templates" id="main_job_templates_link">Job Templates</a></li> <li id="job_templates"><a href="#job_templates" id="main_job_templates_link">Job Templates</a></li>
<li id="jobs"><a href="#jobs" id="main_jobs_link">Jobs</a></li> <li id="jobs"><a href="#jobs" id="main_jobs_link">Jobs</a></li>
<li class="collapsed-option" ng-show="current_user.username != null && current_user.username != undefined">
<a id="main_view_user" href="" ng-click="viewCurrentUser()" ng-bind="'Hello! ' + current_user.username"></a></li>
<li class="collapsed-option"><a id="main_view_license" href="" ng-click="viewLicense()">View License</a></li>
<li class="collapsed-option"><a id="main_contact_support" target="_blank" href="https://ansibleworks.zendesk.com/anonymous_requests/new">Contact Support</a></li>
<li class="collapsed-option"><a id="main_logout" href="#/logout">Logout</a></li>
</ul> </ul>
<ul class="nav navbar-nav navbar-right" id="account-menu"> <ul class="nav navbar-nav navbar-right" id="account-menu">
<li id="socket-beacon-li"></li> <li id="socket-beacon-li"></li>
<li class="dropdown"> <li class="dropdown">
<a href="" id="account-menu-link" data-toggle="dropdown">Account <span class="caret"></span></a> <a href="" id="account-menu-link" class="dropdown-toggle" data-toggle="dropdown">Account <span class="caret"></span></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu" id="account-submenu">
<li ng-show="current_user.username != null && current_user.username != undefined"> <li ng-show="current_user.username != null && current_user.username != undefined">
<a id="main_view_user" href="" ng-click="viewCurrentUser()" ng-bind="'Hello! ' + current_user.username"></a></li> <a id="main_view_user" href="" ng-click="viewCurrentUser()" ng-bind="'Hello! ' + current_user.username"></a></li>
<li><a id="main_logout" href="#/logout">Logout</a></li>
<li><a id="main_view_license" href="" ng-click="viewLicense()">View License</a></li> <li><a id="main_view_license" href="" ng-click="viewLicense()">View License</a></li>
<li><a id="main_contact_support" target="_blank" href="https://ansibleworks.zendesk.com/anonymous_requests/new">Contact Support</a></li> <li><a id="main_contact_support" target="_blank" href="https://ansibleworks.zendesk.com/anonymous_requests/new">Contact Support</a></li>
<li class="divider"></li>
<li><a id="main_logout" href="#/logout">Logout</a></li>
</ul> </ul>
</li> </li>
</ul> </ul>