From 9372a68f891fabd46c25572ca4f11c1ee051b845 Mon Sep 17 00:00:00 2001 From: chouseknecht Date: Tue, 9 Jul 2013 15:40:33 -0400 Subject: [PATCH] Added tool-tips to Inventory tree buttons. --- awx/ui/static/js/awx-min.js | 31 +++++++++++---------- awx/ui/static/lib/ansible/form-generator.js | 10 +++++-- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/awx/ui/static/js/awx-min.js b/awx/ui/static/js/awx-min.js index 1f7b3a9801..c98ecf834f 100644 --- a/awx/ui/static/js/awx-min.js +++ b/awx/ui/static/js/awx-min.js @@ -4,7 +4,7 @@ * * awx-min.js * - * master-aa780ad, Tue Jul 9 14:48:58 2013 -0400 + * master-9bbee34, Tue Jul 9 15:25:41 2013 -0400 * */ var urlPrefix="/static/"; @@ -329,20 +329,21 @@ this.buildField(b,d,c));a+="\x3c!-- column 2 --\x3e\n";a+="\x3c!-- i '
\n';a+=g({iterator:this.form.items[itm].iterator,template:this.form.items[itm],mini:!1,label:"Filter Events"});a+='
Viewing {{ '+this.form.items[itm].iterator+"Page + 1 }} of {{ "+this.form.items[itm].iterator+"Count }}
\n";a+="
\n";a+='\n";a+='
\n';for(b in this.form.items[itm].fields)d=this.form.items[itm].fields[b],a+=this.buildField(b,d,c);a+="
\n";a+='\n";a+="
\x3c!-- well --\x3e\n"}"inventory"==this.form.name&&"edit"==c.mode?a+=this.buildTree(c):!this.modal&&(c.related&&this.form.related)&&(a+=this.buildCollections(c)); -return a},buildTree:function(f){var a=1,d=this.form;html='
\n';html+="

Inventory Content

\n";html+="
\n";for(var b in d.related){if("tree"==d.related[b].type)html+='
',html+='
',html+='',html+='', -html+='',html+="
\n",html+='
\n',html+='
\n',html+="
\n";else{html+='
\n'; -html+='
\n';html+='

'+d.related[b].title+"

\n";html+=g({iterator:d.related[b].iterator,template:d.related[b],mini:!0});html+='
\n';for(var h in d.related[b].actions)html+='\n";html+="
\n";html+='
\n';html+='\n'; -html+="\n";html+="\n";html+="\n";for(var k in d.related[b].fields)html+='\n";var m=1,p=d.related[b].base?d.related[b].base:b,p=p.replace(/^\//,"");for(k in d.related[b].fields)m++,html+=e({list:d.related[b],fld:k,options:f,base:p});html+='";html+="\n";html+='\n';html+='\n'; -html+="\n";html+='\n';html+='\n';html+="\n";html+="\n";html+="
#"+d.related[b].fields[k].label,html+=' \n';html+="{{ $index + ("+d.related[b].iterator+"Page * "+d.related[b].iterator+"PageSize) + 1 }}.';for(h in d.related[b].fieldActions)html+=' ";html+="
No records matched your search.
Loading...
\n";html+="
\n";html+="
\n";html+=c({set:b,iterator:d.related[b].iterator,mini:!0})}a++}html+="
\n";return html+="
\n"},buildCollections:function(f){var a=1,d=this.form;html='
\n';for(var b in d.related)if("collection"== -d.related[b].type){html+="

"+d.related[b].title+"

\n";html+="
\n";d.related[b].instructions&&(html+='
\n',html+='\n',html+="Hint: "+d.related[b].instructions+"\n",html+="
\n");html+='
\n';html+=g({iterator:d.related[b].iterator,template:d.related[b],mini:!0});html+='
\n';for(var h in d.related[b].actions){var k= -d.related[b].actions[h];html+='\n"}html+="
\n";html+='
\n';html+='\n';html+= -"\n";html+="\n";html+=void 0==d.related[b].index||!1!==d.related[b].index?"\n":"";for(var m in d.related[b].fields)html+='\n";html+='\n';if(void 0==d.related[b].index||!1!==d.related[b].index)html+="\n";var p=1,k=d.related[b].base?d.related[b].base:b,k=k.replace(/^\//,"");for(m in d.related[b].fields)p++,html+=e({list:d.related[b],fld:m,options:f,base:k});html+='\n'; -html+="\n";html+='\n';html+='\n';html+="\n";html+="\n";html+="
#"+d.related[b].fields[m].label,html+=' ";html+="
{{ $index + ("+d.related[b].iterator+"Page * "+d.related[b].iterator+"PageSize) + 1 }}.';for(h in d.related[b].fieldActions)k=d.related[b].fieldActions[h], -html+='
No records matched your search.
Loading...
\n";html+="
\n";html+="
\n";html+=c({set:b,iterator:d.related[b].iterator,mini:!0});html+="
\n";a++}html+="

\n";return html+="

\n"}}}]);angular.module("GeneratorHelpers",["GeneratorHelpers"]).factory("Attr",function(){return function(h,m){var k;k="string"===typeof h[m]?h[m].replace(/\'/g,"""):h[m];switch(m){case "ngClick":k='ng-click="'+k+'" ';break;case "ngOptions":k='ng-options="'+k+'" ';break;case "ngClass":k='ng-class="'+k+'" ';break;case "ngChange":k='ng-change="'+k+'" ';break;case "ngDisabled":k='ng-disabled="'+k+'" ';break;case "ngShow":k='ng-show="'+k+'" ';break;case "ngHide":k='ng-hide="'+k+'" ';break;case "ngBind":k= +return a},buildTree:function(f){var a=1,d=this.form;html='
\n';html+="

Inventory Content

\n";html+="
\n";for(var b in d.related){if("tree"==d.related[b].type)html+='
',html+='
',html+='', +html+='',html+='',html+="
\n",html+='
\n', +html+='
\n',html+="
\n";else{html+='
\n';html+='
\n';html+='

'+d.related[b].title+"

\n";html+=g({iterator:d.related[b].iterator,template:d.related[b],mini:!0});html+='
\n'; +for(var h in d.related[b].actions)html+='\n";html+="
\n";html+='
\n';html+='\n';html+="\n";html+="\n";html+="\n";for(var k in d.related[b].fields)html+='\n";var m=1,p=d.related[b].base?d.related[b].base:b,p=p.replace(/^\//, +"");for(k in d.related[b].fields)m++,html+=e({list:d.related[b],fld:k,options:f,base:p});html+='";html+="\n";html+='\n';html+='\n';html+="\n";html+='\n';html+='\n';html+="\n"; +html+="\n";html+="
#"+d.related[b].fields[k].label,html+=' \n';html+="{{ $index + ("+d.related[b].iterator+"Page * "+d.related[b].iterator+"PageSize) + 1 }}.';for(h in d.related[b].fieldActions)html+=' ";html+="
No records matched your search.
Loading...
\n";html+="
\n";html+="
\n";html+=c({set:b,iterator:d.related[b].iterator,mini:!0})}a++}html+="
\n";return html+="
\n"},buildCollections:function(f){var a=1,d=this.form;html='
\n';for(var b in d.related)if("collection"==d.related[b].type){html+="

"+d.related[b].title+"

\n";html+="
\n";d.related[b].instructions&&(html+='
\n',html+= +'\n',html+="Hint: "+d.related[b].instructions+"\n",html+="
\n");html+='
\n';html+=g({iterator:d.related[b].iterator,template:d.related[b],mini:!0});html+='
\n';for(var h in d.related[b].actions){var k=d.related[b].actions[h];html+='\n"}html+="
\n";html+='
\n';html+='\n';html+="\n";html+="\n";html+=void 0==d.related[b].index||!1!==d.related[b].index?"\n":"";for(var m in d.related[b].fields)html+='\n";var p=1,k=d.related[b].base?d.related[b].base:b,k=k.replace(/^\//,"");for(m in d.related[b].fields)p++,html+=e({list:d.related[b],fld:m,options:f,base:k});html+='\n';html+="\n";html+='\n';html+='\n'; +html+="\n";html+="\n";html+="
#"+d.related[b].fields[m].label,html+=' \n';if(void 0==d.related[b].index||!1!==d.related[b].index)html+="{{ $index + ("+ +d.related[b].iterator+"Page * "+d.related[b].iterator+"PageSize) + 1 }}.';for(h in d.related[b].fieldActions)k=d.related[b].fieldActions[h],html+='
No records matched your search.
Loading...
\n";html+="
\n";html+="
\n";html+=c({set:b,iterator:d.related[b].iterator,mini:!0});html+="
\n";a++}html+="

\n";return html+="

\n"}}}]);angular.module("GeneratorHelpers",["GeneratorHelpers"]).factory("Attr",function(){return function(h,m){var k;k="string"===typeof h[m]?h[m].replace(/\'/g,"""):h[m];switch(m){case "ngClick":k='ng-click="'+k+'" ';break;case "ngOptions":k='ng-options="'+k+'" ';break;case "ngClass":k='ng-class="'+k+'" ';break;case "ngChange":k='ng-change="'+k+'" ';break;case "ngDisabled":k='ng-disabled="'+k+'" ';break;case "ngShow":k='ng-show="'+k+'" ';break;case "ngHide":k='ng-hide="'+k+'" ';break;case "ngBind":k= 'ng-bind="'+k+'" ';break;case "trueValue":k='ng-true-value="'+k+'" ';break;case "falseValue":k='ng-false-value="'+k+'" ';break;case "awToolTip":k='aw-tool-tip="'+k+'" ';break;case "awPopOver":k="aw-pop-over='"+k+"' ";break;case "dataTitle":k='data-title="'+k+'" ';break;case "dataPlacement":k='data-placement="'+k+'" ';break;case "dataContainer":k='data-container="'+k+'" ';break;default:k=m+'="'+k+'" '}return k}}).factory("Icon",function(){return function(h){return' '}}).factory("Column", ["Attr","Icon",function(h,m){return function(k){var g=k.list,c=k.fld,p=k.options;k=k.base;var f=g.fields[c],e;e="\n";e+=f.ngShow?"":"";g.hasChildren&&f.hasChildren&&(e+=' "); if((f.key||f.link||f.linkTo||f.ngClick)&&"lookup"!=p.mode&&"select"!=p.mode)if(f.linkTo)e+='';else if(f.ngClick)e+='';else if(void 0==f.link||f.link)e+='';f.ngShowIcon?e+=' ':f.icon&&(e+=m(f.icon)+" ");if(void 0==f.showValue||!0==f.showValue)e=f.ngBind?e+("{{ "+f.ngBind+" }}"):e+("{{"+g.iterator+"."+c+"}}");f.text&&(e+=f.text);g.hasChildren&&f.hasChildren&& diff --git a/awx/ui/static/lib/ansible/form-generator.js b/awx/ui/static/lib/ansible/form-generator.js index e53e9594b3..e0b06f81e3 100644 --- a/awx/ui/static/lib/ansible/form-generator.js +++ b/awx/ui/static/lib/ansible/form-generator.js @@ -788,10 +788,14 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies']) html += "
"; html += "
"; html += ""; - html += ""; + html += ""; - html += ""; html += "
\n"; html += "
\n";