diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-18 18:48:24 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-18 18:48:24 +0000 |
| commit | ac124f28fa1f2ffc3c737899e1e1ef8cc56b003f (patch) | |
| tree | a6de958f37f9017b804506b031242bb05aca0cd9 | |
| parent | dc687f02e1f36c86fce069c488d68f1b15e8d10b (diff) | |
| download | chromium_src-ac124f28fa1f2ffc3c737899e1e1ef8cc56b003f.zip chromium_src-ac124f28fa1f2ffc3c737899e1e1ef8cc56b003f.tar.gz chromium_src-ac124f28fa1f2ffc3c737899e1e1ef8cc56b003f.tar.bz2 | |
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
4 files changed, 48 insertions, 20 deletions
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 @@ </head> <body onload="main();"> - <table border="0" cellpadding="0" cellspacing="0"> + + <table border="0" cellpadding="0" cellspacing="0" width="100%"> <tr> - <td width="75" rowspan="2"> + <td width="80" rowspan="2"> <img src="feed-icon-64x64.png" alt="feed-icon" align="absmiddle" /> </td> - <td height="60" valign="bottom"> - <b><span id="title"></span></b><br> - <span>Subscribe to this feed using:</span> - <select id="readerDropdown" onChange="onSelectChanged()"></select> - </td> - <td valign="bottom"> - <button onclick="navigate();">Subscribe Now</button> - </td> + <td height="40" valign="bottom"><b><span id="title"></span></b></td> </tr> <tr> - <td align="right" valign="top"> - <a id="editLink" class="editLinks" href="javascript:void()" - onclick="showDialog()">Edit</a> - <a id="removeLink" class="editLinks" href="javascript:void()" - onclick="removeEntry()">Remove</a> - </td> <td> + <table border="0" cellpadding="0" cellspacing="0"> + <tr> + <td align="right" valign="top"> + <div> + <span style="white-space: nowrap" + >Subscribe to this feed using:</span> + <select id="readerDropdown" onChange="onSelectChanged()"></select> + </div> + <div style="margin-top:-6px; margin-right: -2px"> + <a id="editLink" class="editLinks" href="javascript:void()" + onclick="showDialog()">Edit</a> + <a id="removeLink" class="editLinks" href="javascript:void()" + onclick="removeEntry()">Remove</a> + </div> + </td> + <td valign="top"> + <button onclick="navigate();">Subscribe Now</button> + </td> + </tr> + </table> </td> </tr> </table> @@ -94,7 +102,14 @@ </div> <div> </div> - <div class="splitter"><b>Feed preview</b></div><br> + <div class="splitter"> + <span class="feedUrlSpan" id="feedUrlSpan"> + <span class="feedUrl" + >[ <a id="feedUrl" class="feedUrl" + title="The feed page currently being previewed." + >Feed</a> ]</span></span> + <span><b>Feed preview</b></span> + </div> <div id="items"></div> </body> </html> 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. |