External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-20 07:17:40 -02:30
Code Issues Packages Projects Releases Wiki Activity

Help icon is now the same everywhere. In some places it was an 'i' and in others a '?'. Same with the color. We had two different flavors of blue. Also streamlined the code. Now all help html is genereated from one place.

Browse Source
This commit is contained in:
chouseknecht
2013-07-13 05:56:49 -04:00
parent 7d6507ec0d
commit 44f7ce42cc
6 changed files with 240 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,7 @@ angular.module('GeneratorHelpers', ['GeneratorHelpers'])
.factory('Attr', function() {
return function(obj, key) {
var result;
var value = (typeof obj[key] === "string") ? obj[key].replace(/\'/g, '"') : obj[key];
var value = (typeof obj[key] === "string") ? obj[key].replace(/[\'\"]/g, '"') : obj[key];
switch(key) {
case 'ngClick':
result = "ng-click=\"" + value + "\" ";
@@ -48,7 +48,13 @@ angular.module('GeneratorHelpers', ['GeneratorHelpers'])
result = "aw-tool-tip=\"" + value + "\" ";
break;
case 'awPopOver':
result = "aw-pop-over='" + value + "' ";
// construct the entire help link
result = "<a href=\"\" aw-pop-over=\"" + value + "\" ";
result += (obj.dataTitle) ? "data-title=\"" + obj['dataTitle'].replace(/[\'\"]/g, '&quot;') + "\" " : "";
result += (obj.dataPlacement) ? "data-placement=\"" + obj['dataPlacement'].replace(/[\'\"]/g, '&quot;') + "\" " : "";
result += (obj.dataContainer) ? "data-container=\"" + obj['dataContainer'].replace(/[\'\"]/g, '&quot;') + "\" " : "";
result += "class=\"help-link\" ";
result += "><i class=\"icon-question-sign\"></i></a> ";
break;
case 'dataTitle':
result = "data-title=\"" + value + "\" ";