External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-07-08 06:48:04 -02: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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -527,7 +527,7 @@ select.field-mini-height {
/* Display list actions next to search widget */ /* Display list actions next to search widget */
/*
.list-actions { .list-actions {
display: inline-block; display: inline-block;
padding-bottom: 22px; padding-bottom: 22px;
@@ -538,6 +538,7 @@ select.field-mini-height {
.list-actions .btn { .list-actions .btn {
margin-right: 3px; margin-right: 3px;
} }
*/
.btn-help { .btn-help {
margin-left: 15px; margin-left: 15px;
@@ -1015,6 +1016,10 @@ tr td button i {
@media (min-width: 768px) and (max-width: 979px) { @media (min-width: 768px) and (max-width: 979px) {
.list-actions button, .list-actions .checkbox-inline {
margin-top: 10px;
}
} }
/* Landscape phone to portrait tablet */ /* Landscape phone to portrait tablet */
@@ -1044,4 +1049,9 @@ tr td button i {
width: 75px; width: 75px;
margin-bottom: 5px; 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=\"row search-widget\">\n";
html += "<div class=\""; 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 += "\">\n";
html += (label) ? "<label>" + label +"</label>" : ""; html += (label) ? "<label>" + label +"</label>" : "";
html += "<div class=\"input-group"; html += "<div class=\"input-group";
@@ -474,7 +474,7 @@ angular.module('GeneratorHelpers', ['GeneratorHelpers'])
html += "</div><!-- input-group-btn -->\n"; html += "</div><!-- input-group-btn -->\n";
html += "</div><!-- input-group -->\n"; html += "</div><!-- input-group -->\n";
html += "</div><!-- col-lg-x -->\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"; "SearchSpin == true\"></i></div>\n";
return html; 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') { if (options.mode != 'lookup') {
//actions //actions
var base = $location.path().replace(/^\//,'').split('/')[0]; var base = $location.path().replace(/^\//,'').split('/')[0];
html += "<div class=\""; html += "<div class=\"list-actions ";
html += (options.id != undefined) ? "col-lg-3" : "col-lg-7"; html += (options.id != undefined) ? "col-lg-3" : "col-lg-7 col-md-5";
html += "\">\n"; html += "\">\n";
for (action in list.actions) { for (action in list.actions) {
if (list.actions[action].mode == 'all' || list.actions[action].mode == options.mode) { if (list.actions[action].mode == 'all' || list.actions[action].mode == options.mode) {

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

@@ -122,7 +122,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
</div> </div>
<div class="nav-collapse navbar-responsive-collapse"> <div class="collapse navbar-collapse navbar-responsive-collapse">
<ul class="nav navbar-nav pull-right"> <ul class="nav navbar-nav pull-right">
<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>