shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 16:51:11 +03:00
Code Releases Activity

Account menu

Browse Source 
Fixed. It now works much like Amazon's account menu and pretty similar to Gooogle mail.
This commit is contained in:
Chris Houseknecht 2014-06-30 23:11:04 -04:00
parent aab8125fcb
commit fbef7b5f50
3 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/static/js/helpers/Jobs.js
View File

@ -84,10 +84,6 @@ angular.module('JobsHelper', ['Utilities', 'RestServices', 'FormGenerator', 'Job
list = scope.jobs; list = scope.jobs;
} }
job = Find({ list: list, key: 'id', val: id }); job = Find({ list: list, key: 'id', val: id });
<<<<<<< HEAD
=======
// console.log('job type: ' + job.type);
>>>>>>> added functionality for resizing graphs/jobs table, and changed dummy data to better reflect actual expected server response
if (job.type === 'job') { if (job.type === 'job') {
$location.url('/jobs/' + job.id); $location.url('/jobs/' + job.id);
} }

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

@ -68,11 +68,12 @@ body {
display: block; display: block;
} }
} }
#account-menu { #account-menu {
display: none; display: none;
} }
#account-submenu {
margin-left: 20px;
}
#socket-beacon-div { #socket-beacon-div {
display: block; display: block;
position: fixed; position: fixed;

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

@ -194,19 +194,32 @@
<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"><a href="#/login" id="main_login_link" ng-show="!current_user.username">Login</a></li>
<li ng-show="current_user.username" class="collapsed-option">
<a href="" id="account-menu-link">Hello, <span ng-bind="current_user.username"></span> <span class="caret"></span></a>
<ul class="nav navbar-nav" id="account-submenu">
<li><a id="main_view_user" href="" ng-click="viewCurrentUser()">Account Settings</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 class="divider"></li>
<li><a id="main_logout" href="#/logout">Logout</a></li>
</ul>
</li>
</ul>
<!--
<li class="collapsed-option" ng-show="current_user.username != null && current_user.username != undefined"> <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> <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_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_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> <li class="collapsed-option"><a id="main_logout" href="#/logout">Logout</a></li>
</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><a href="#/login" id="main_login_link" ng-show="!current_user.username">Login</a></li>
<a href="" id="account-menu-link" class="dropdown-toggle" data-toggle="dropdown">Account <span class="caret"></span></a> <li class="dropdown" ng-show="current_user.username">
<ul class="dropdown-menu" id="account-submenu"> <a href="" id="account-menu-link" class="dropdown-toggle" data-toggle="dropdown">Hello, <span ng-bind="current_user.username"></span> <span class="caret"></span></a>
<li ng-show="current_user.username != null && current_user.username != undefined"> <ul class="dropdown-menu" role="menu" id="account-submenu">
<a id="main_view_user" href="" ng-click="viewCurrentUser()" ng-bind="'Hello! ' + current_user.username"></a></li> <li><a id="main_view_user" href="" ng-click="viewCurrentUser()">Account Settings</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 class="divider"></li>