From ac124f28fa1f2ffc3c737899e1e1ef8cc56b003f Mon Sep 17 00:00:00 2001 From: "finnur@chromium.org" Date: Fri, 18 Dec 2009 18:48:24 +0000 Subject: Fix issue with url not being encoded before passing to it Google Reader (issue 29929). Also, a little bit more UI polish: Make sure really long titles don't destroy the layout of the subscribe page. Move the Edit/Remove links closer to the combo box. Add a link to the feed page so that people with desktop feed readers can get at the url. BUG=http://crbug.com/29929 TEST=See bug 29929. Review URL: http://codereview.chromium.org/500131 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34966 0039d316-1c4b-4281-b951-d872f2087c98 --- .../extensions/subscribe_page_action/manifest.json | 2 +- .../extensions/subscribe_page_action/subscribe.css | 12 +++++- .../subscribe_page_action/subscribe.html | 49 ++++++++++++++-------- .../extensions/subscribe_page_action/subscribe.js | 5 ++- 4 files changed, 48 insertions(+), 20 deletions(-) (limited to 'chrome/test') diff --git a/chrome/test/data/extensions/subscribe_page_action/manifest.json b/chrome/test/data/extensions/subscribe_page_action/manifest.json index ee54f55..55cdd2f 100644 --- a/chrome/test/data/extensions/subscribe_page_action/manifest.json +++ b/chrome/test/data/extensions/subscribe_page_action/manifest.json @@ -1,7 +1,7 @@ { "name": "RSS Subscription Extension (by Google)", "description": "Adds one-click subscription to your toolbar.", - "version": "1.8.2", + "version": "1.8.3", "permissions": [ "tabs", "http://*/*", diff --git a/chrome/test/data/extensions/subscribe_page_action/subscribe.css b/chrome/test/data/extensions/subscribe_page_action/subscribe.css index 708fe92e..ec03890 100644 --- a/chrome/test/data/extensions/subscribe_page_action/subscribe.css +++ b/chrome/test/data/extensions/subscribe_page_action/subscribe.css @@ -23,7 +23,8 @@ iframe { border-top: solid 1px #9CC2EF; background: #EBEFF9; font-size: 13px; - font-weight:bold; + font-weight: bold; + display: block; } .editLinks { @@ -116,3 +117,12 @@ iframe { .status { background-color: #FFF18A; } + +.feedUrlSpan { + float: right; +} + +.feedUrl { + font-size: 8pt; + color: #AAAAAA; +} diff --git a/chrome/test/data/extensions/subscribe_page_action/subscribe.html b/chrome/test/data/extensions/subscribe_page_action/subscribe.html index b51dd5c..8965790 100644 --- a/chrome/test/data/extensions/subscribe_page_action/subscribe.html +++ b/chrome/test/data/extensions/subscribe_page_action/subscribe.html @@ -12,28 +12,36 @@ - + +

- - - + -

-
- Subscribe to this feed using: - -

- -

- Edit - Remove -

+ + + + + +

+ Subscribe to this feed using: + +

+ Edit + Remove +

+ +

@@ -94,7 +102,14 @@

Feed preview

+ + [ Feed ] + Feed preview +

diff --git a/chrome/test/data/extensions/subscribe_page_action/subscribe.js b/chrome/test/data/extensions/subscribe_page_action/subscribe.js index 1205d10..7417259 100644 --- a/chrome/test/data/extensions/subscribe_page_action/subscribe.js +++ b/chrome/test/data/extensions/subscribe_page_action/subscribe.js @@ -46,7 +46,8 @@ var storageEnabled = window.localStorage != null; function navigate() { var select = document.getElementById('readerDropdown'); var url = - feedReaderList[select.selectedIndex].url.replace("%s", escape(feedUrl)); + feedReaderList[select.selectedIndex].url.replace( + "%s", escape(encodeURI(feedUrl))); document.location = url; } @@ -116,6 +117,8 @@ function main() { req.onerror = handleError; req.open("GET", feedUrl, !synchronousRequest); req.send(null); + + document.getElementById('feedUrl').href = feedUrl; } // Sets the title for the feed. -- cgit v1.1