Merge remote-tracking branch 'origin/rebrand' into rebrand

www/common/common-ui-elements.js

@@ -2111,13 +2111,8 @@ define([
 
         var origin = privateData.origin;
         var createHelper = function (href, text) {
-            var q = h('a.cp-creation-help.fa.fa-question-circle', {
+            var q = UI.createHelper(origin + href, text);
-                'data-cptippy-html': true,
+            $(q).addClass('cp-creation-help');
-                title: text,
-                href: origin + href,
-                target: "_blank",
-                'data-tippy-placement': "right"
-            });
             return q;
         };
 

www/common/drive-ui.js

@@ -2473,15 +2473,7 @@ define([
         // Get the upload options
         var addSharedFolderModal = function (cb) {
             var createHelper = function (href, text) {
-                var q = h('a.fa.fa-question-circle', {
+                return UI.createHelper(APP.origin + href, text);
-                    style: 'text-decoration: none !important;',
-                    'data-cptippy-html': true,
-                    title: text,
-                    href: APP.origin + href,
-                    target: "_blank",
-                    'data-tippy-placement': "right"
-                });
-                return q;
             };
 
             // Ask for name, password and owner

www/common/sframe-common.js

@@ -551,8 +551,11 @@ define([
 
     funcs.gotoURL = function (url) { ctx.sframeChan.event('EV_GOTO_URL', url); };
     funcs.openURL = function (url) { ctx.sframeChan.event('EV_OPEN_URL', url); };
+    funcs.getBounceURL = function (url) {
+        return window.location.origin + '/bounce/#' + encodeURIComponent(url);
+    };
     funcs.openUnsafeURL = function (url) {
-        var bounceHref = window.location.origin + '/bounce/#' + encodeURIComponent(url);
+        var bounceHref = getBounceURL(url);
         window.open(bounceHref);
     };