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

Fixed menu bar height. After TB upgrade it was fixed at 50px. Moved back to 0 and let image height be dominant. Pulled in angular-codemirror overlay fix.

Browse Source
This commit is contained in:
Chris Houseknecht
2014-02-17 15:04:17 -05:00
parent 0b0140e385
commit 84f79d4342
5 changed files with 16 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/ui/static/lib/angular-codemirror/.bower.json
View File

@@ -1,6 +1,6 @@
{
"name": "angular-codemirror",
"version": "1.0.1",
"version": "1.0.2",
"dependencies": {
"angular": "latest",
"angular-route": "latest",
@@ -13,11 +13,11 @@
"codemirror": "latest"
},
"homepage": "https://github.com/chouseknecht/angular-codemirror",
"_release": "1.0.1",
"_release": "1.0.2",
"_resolution": {
"type": "version",
"tag": "v1.0.1",
"commit": "9a3d595de6b18faeb0834074f73bde476e4af9ec"
"tag": "v1.0.2",
"commit": "94b7aac548b036f4fbd94e56129ed9574e472616"
},
"_source": "git://github.com/chouseknecht/angular-codemirror.git",
"_target": "~1.0.0",

15
awx/ui/static/lib/angular-codemirror/lib/AngularCodeMirror.js vendored
View File

@@ -72,13 +72,20 @@ angular.module('AngularCodeMirrorModule', [])
}
],
open: function() {
// fix buttons- make them more twittery
$('.ui-dialog[aria-describedby="af-code-editor-modal"]').find('.ui-dialog-titlebar button')
.empty().attr({'class': 'close'}).text('x');
var self = $('.ui-dialog[aria-describedby="af-code-editor-modal"]'),
idx, options;
// bring the overlay up to just below the new window
idx = self.css('z-index');
$('.ui-widget-overlay').css({ 'z-index': idx - 1});
// fix buttons- make them more twittery
self.find('.ui-dialog-titlebar button').empty().attr({'class': 'close'}).text('x');
$('#af-code-edit-cancel').attr({ "class": "btn btn-default" }).empty().html("<i class=\"fa fa-times\"></i> Cancel");
$('#af-code-edit-ok').attr({ "class": "btn btn-primary" }).empty().html("<i class=\"fa fa-check\"></i> Save");
var options = modes[mode];
// initialize CodeMirror
options = modes[mode];
options.value = scope[model];
myCodeMirror = CodeMirror(document.getElementById('af-code'), options);
}