diff options
| author | Byron Jones <glob@mozilla.com> | 2015-06-15 06:58:51 +0200 |
|---|---|---|
| committer | Byron Jones <glob@mozilla.com> | 2015-06-15 06:58:51 +0200 |
| commit | aff954b93e8f47628c3910c0765f1749511affa7 (patch) | |
| tree | a29ef1e746e4d694ce6719220f56828b122c7d6a /extensions/Bitly/template/en/default/hook | |
| parent | c290f3ecabec75b741d375e6130af9060255c274 (diff) | |
| download | bugzilla-aff954b93e8f47628c3910c0765f1749511affa7.tar.gz bugzilla-aff954b93e8f47628c3910c0765f1749511affa7.tar.xz | |
Bug 1173771: "Share a link to this list of bugs" doesn't work for saved searches
Diffstat (limited to 'extensions/Bitly/template/en/default/hook')
| -rw-r--r-- | extensions/Bitly/template/en/default/hook/global/header-start.html.tmpl | 12 | ||||
| -rw-r--r-- | extensions/Bitly/template/en/default/hook/list/list-links.html.tmpl | 17 |
2 files changed, 16 insertions, 13 deletions
diff --git a/extensions/Bitly/template/en/default/hook/global/header-start.html.tmpl b/extensions/Bitly/template/en/default/hook/global/header-start.html.tmpl index ba698aa2c..d41320b29 100644 --- a/extensions/Bitly/template/en/default/hook/global/header-start.html.tmpl +++ b/extensions/Bitly/template/en/default/hook/global/header-start.html.tmpl @@ -6,8 +6,10 @@ # defined by the Mozilla Public License, v. 2.0. #%] -[% RETURN UNLESS template.name == 'list/list.html.tmpl' %] - -[% style_urls.push('extensions/Bitly/web/styles/bitly.css') %] -[% javascript_urls.push('extensions/Bitly/web/js/bitly.js') %] -[% yui.push('container', 'connection', 'json') %] +[% + RETURN UNLESS template.name == 'list/list.html.tmpl'; + jquery.push('bPopup'); + style_urls.push('extensions/Bitly/web/styles/bitly.css'); + javascript_urls.push('extensions/Bitly/web/js/bitly.js'); + generate_api_token = 1; +%] diff --git a/extensions/Bitly/template/en/default/hook/list/list-links.html.tmpl b/extensions/Bitly/template/en/default/hook/list/list-links.html.tmpl index 836c017ed..e0dcdc708 100644 --- a/extensions/Bitly/template/en/default/hook/list/list-links.html.tmpl +++ b/extensions/Bitly/template/en/default/hook/list/list-links.html.tmpl @@ -8,17 +8,18 @@ [% RETURN UNLESS user.id && Bugzilla.params.bitly_token %] -<div id="bitly_overlay"> - <div class="bd"> - <select id="bitly_type" onchange="YAHOO.bitly.execute()"> +<div id="bitly-overlay"> + <div> + <select id="bitly-type"> <option value="shorten">Share a link to this search</option> <option value="list">Share a link to this list of [% terms.bugs %]</option> </select> - <input id="bitly_url" readonly placeholder="Generating short link..."> - </div> - <div class="ft"> - <button id="bitly_close" class="notransition">Close</button> + <input id="bitly-url" readonly placeholder="Generating short link..."> </div> + <button id="bitly-close" class="notransition">Close</button> </div> -<a id="bitly_shorten" href="#" onclick="YAHOO.bitly.toggle();return false">Short URL</a> +<a id="bitly-shorten" href="#" + data-url="[% urlbase _ "buglist.cgi?" _ + cgi.new(urlquerypart).canonicalise_query('list_id','query_format') FILTER html %]" +>Short URL</a> | [%# using nbsp because tt always trims trailing whitespace from templates %] |