MAAS

Merge ~ya-bo-ng/maas:add-version-to-usabilla into maas:master

  1. Git
  2. lp:~ya-bo-ng/maas
  3. add-version-to-usabilla
  4. Merge into master
Proposed by Anthony Dillon
Status: Merged
Approved by: Anthony Dillon
Approved revision: 8dc8a775e930a42e77fbb1524ed88943686d2cb0
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~ya-bo-ng/maas:add-version-to-usabilla
Merge into: maas:master
Diff against target: 30 lines (+10/-4)
1 file modified
src/maasserver/templates/maasserver/footer.html (+10/-4)
Reviewer Review Type Date Requested Status
Steve Rydz (community) Approve
Lilyana Videnova (community) Approve
Review via email: mp+371743@code.launchpad.net

Commit message

Add version as custom data when submitting Usabilla

Description of the change

Add a custom variable of the version to identify the version of the application the person is giving feedback on.

To post a comment you must log in.
Revision history for this message
Lilyana Videnova (lilyanavidenova) wrote :

LGTM!

review: Approve
Revision history for this message
Steve Rydz (steverydz) wrote :

LGTM +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/templates/maasserver/footer.html b/src/maasserver/templates/maasserver/footer.html
2index f05591f..d151d5b 100644
3--- a/src/maasserver/templates/maasserver/footer.html
4+++ b/src/maasserver/templates/maasserver/footer.html
5@@ -28,15 +28,21 @@
6 <script type="text/javascript">/*{literal}<![CDATA[*/window.lightningjs||function(c){function g(b,d){d&&(d+=(/\?/.test(d)?"&":"?")+"lv=1");c[b]||function(){var i=window,h=document,j=b,g=h.location.protocol,l="load",k=0;(function(){function b(){a.P(l);a.w=1;c[j]("_load")}c[j]=function(){function m(){m.id=e;return c[j].apply(m,arguments)}var b,e=++k;b=this&&this!=i?this.id||0:0;(a.s=a.s||[]).push([e,b,arguments]);m.then=function(b,c,h){var d=a.fh[e]=a.fh[e]||[],j=a.eh[e]=a.eh[e]||[],f=a.ph[e]=a.ph[e]||[];b&&d.push(b);c&&j.push(c);h&&f.push(h);return m};return m};var a=c[j]._={};a.fh={};a.eh={};a.ph={};a.l=d?d.replace(/^\/\//,(g=="https:"?g:"http:")+"//"):d;a.p={0:+new Date};a.P=function(b){a.p[b]=new Date-a.p[0]};a.w&&b();i.addEventListener?i.addEventListener(l,b,!1):i.attachEvent("on"+l,b);var q=function(){function b(){return["<head></head><",c,' onload="var d=',n,";d.getElementsByTagName('head')[0].",d,"(d.",g,"('script')).",i,"='",a.l,"'\"></",c,">"].join("")}var c="body",e=h[c];if(!e)return setTimeout(q,100);a.P(1);var d="appendChild",g="createElement",i="src",k=h[g]("div"),l=k[d](h[g]("div")),f=h[g]("iframe"),n="document",p;k.style.display="none";e.insertBefore(k,e.firstChild).id=o+"-"+j;f.frameBorder="0";f.id=o+"-frame-"+j;/MSIE[ ]+6/.test(navigator.userAgent)&&(f[i]="javascript:false");f.allowTransparency="true";l[d](f);try{f.contentWindow[n].open()}catch(s){a.domain=h.domain,p="javascript:var d="+n+".open();d.domain='"+h.domain+"';",f[i]=p+"void(0);"}try{var r=f.contentWindow[n];r.write(b());r.close()}catch(t){f[i]=p+'d.write("'+b().replace(/"/g,String.fromCharCode(92)+'"')+'");d.close();'}a.P(2)};a.l&&setTimeout(q,0)})()}();c[b].lv="1";return c[b]}var o="lightningjs",k=window[o]=g(o);k.require=g;k.modules=c}({}); window.usabilla_live = lightningjs.require("usabilla_live", "//w.usabilla.com/7cdd8c574ee4.js"); /*]]>{/literal}*/</script>
7
8 <script>
9- //Hide Usabilla Default button
10- window.usabilla_live("hide");
11+ // Hide Usabilla Default button
12+ window.usabilla_live("hide");
13
14- //Find a Link and open de Usabilla Feedback form when the user clicks on the link
15+ // Find a Link and open de Usabilla Feedback form when the user clicks on the link
16 document.getElementById("usbl-integrated-button").addEventListener("click", function(e) {
17 e.preventDefault();
18 window.usabilla_live("click");
19+ });
20+
21+ // Add MAAS version to the custom data
22+ window.usabilla_live("data", {"custom":
23+ {"MAAS version": "{{version}}" }
24 });
25- </script>
26+
27+ </script>
28 <p class="u-remove-max-width">&copy; {% now "Y" %} Canonical Ltd. Ubuntu and Canonical are registered trademarks of Canonical Ltd.</p>
29 {% endblock %}
30 </div>

Subscribers

People subscribed via source and target branches