External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 01:57:35 -03:30
Code Issues Packages Projects Releases Wiki Activity

Adjusted width of search widget for smaller screens. Fixed main menu collapse issue.

Browse Source
This commit is contained in:
chouseknecht 2013-09-21 00:24:42 -04:00
parent 1a590c6cf6
commit daebe4b3ef
4 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
awx/ui/static/less/ansible-ui.less
View File

@ -527,7 +527,7 @@ select.field-mini-height {
/* Display list actions next to search widget */
/*
.list-actions {
display: inline-block;
padding-bottom: 22px;
@ -538,6 +538,7 @@ select.field-mini-height {
.list-actions .btn {
margin-right: 3px;
}
*/
.btn-help {
margin-left: 15px;
@ -1014,7 +1015,11 @@ tr td button i {
/* Portrait tablet to landscape and desktop */
@media (min-width: 768px) and (max-width: 979px) {
.list-actions button, .list-actions .checkbox-inline {
margin-top: 10px;
}
}
/* Landscape phone to portrait tablet */
@ -1041,7 +1046,12 @@ tr td button i {
}
td.actions .btn {
width: 75px;
margin-bottom: 5px;
}
width: 75px;
margin-bottom: 5px;
}
.list-actions button, .list-actions .checkbox-inline {
margin-top: 10px;
}
}

4
awx/ui/static/lib/ansible/generator-helpers.js
View File

@ -415,7 +415,7 @@ angular.module('GeneratorHelpers', ['GeneratorHelpers'])
html += "<div class=\"row search-widget\">\n";
html += "<div class=\"";
html += (params.size) ? params.size : "col-lg-4";
html += (params.size) ? params.size : "col-lg-4 col-md-6 col-sm-11 col-xs-11";
html += "\">\n";
html += (label) ? "<label>" + label +"</label>" : "";
html += "<div class=\"input-group";
@ -474,7 +474,7 @@ angular.module('GeneratorHelpers', ['GeneratorHelpers'])
html += "</div><!-- input-group-btn -->\n";
html += "</div><!-- input-group -->\n";
html += "</div><!-- col-lg-x -->\n";
html += "<div class=\"col-lg-1\"><i class=\"icon-spinner icon-spin icon-large\" ng-show=\"" + iterator +
html += "<div class=\"col-lg-1 col-md-1 col-sm-1 col-xs-1\"><i class=\"icon-spinner icon-spin icon-large\" ng-show=\"" + iterator +
"SearchSpin == true\"></i></div>\n";
return html;

4
awx/ui/static/lib/ansible/list-generator.js
View File

@ -166,8 +166,8 @@ angular.module('ListGenerator', ['GeneratorHelpers'])
if (options.mode != 'lookup') {
//actions
var base = $location.path().replace(/^\//,'').split('/')[0];
html += "<div class=\"";
html += (options.id != undefined) ? "col-lg-3" : "col-lg-7";
html += "<div class=\"list-actions ";
html += (options.id != undefined) ? "col-lg-3" : "col-lg-7 col-md-5";
html += "\">\n";
for (action in list.actions) {
if (list.actions[action].mode == 'all' || list.actions[action].mode == options.mode) {

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

@ -115,22 +115,22 @@
<div class="navbar navbar-inverse navbar-fixed-top main-menu" role="navigation">
<div class="container">
<div class="navbar-header">
<a class="navbar-brand" href="#organizations"><img class="logo" src="{{ STATIC_URL }}img/logo.png" /></a>
<a class="navbar-brand" href="#organizations"><img class="logo" src="{{ STATIC_URL }}img/logo.png" /></a>
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
</div>
<div class="nav-collapse navbar-responsive-collapse">
<ul class="nav navbar-nav pull-right">
<li ng-show="current_user.username != null && current_user.username != undefined">
<div class="collapse navbar-collapse navbar-responsive-collapse">
<ul class="nav navbar-nav pull-right">
<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>
<li ng-show="userLoggedIn == true"><a id="main_view_license" href="" ng-click="viewLicense()">View License</a></li>
<li ng-show="userLoggedIn == true"><a id="main_contact_support"
<li ng-show="userLoggedIn == true"><a id="main_view_license" href="" ng-click="viewLicense()">View License</a></li>
<li ng-show="userLoggedIn == true"><a id="main_contact_support"
href="mailto:support@ansibleworks.com?subject=AWX%20Help%20Request">Contact Support</a><li>
<li ng-show="userLoggedIn == true"><a id="main_logout" href="#/logout">Logout</a></li>
</ul>
<li ng-show="userLoggedIn == true"><a id="main_logout" href="#/logout">Logout</a></li>
</ul>
</div><!-- nav-collapse -->
</div>
</div><!-- navbar -->