Author: sletellier Date: 2011-05-12 13:59:51 +0200 (Thu, 12 May 2011) New Revision: 281 Url: http://chorem.org/repositories/revision/bow/281 Log: - #368 Allows to use chromium extension with differents servers instances Modified: trunk/bow-extension-chromium/src/main/webapp/_locales/en/messages.json trunk/bow-extension-chromium/src/main/webapp/_locales/fr/messages.json trunk/bow-extension-chromium/src/main/webapp/manifest.json trunk/bow-extension-chromium/src/main/webapp/options.html trunk/bow-extension-chromium/src/main/webapp/popup.html trunk/bow-extension-chromium/src/main/webapp/properties.js Modified: trunk/bow-extension-chromium/src/main/webapp/_locales/en/messages.json =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/_locales/en/messages.json 2011-05-05 09:32:39 UTC (rev 280) +++ trunk/bow-extension-chromium/src/main/webapp/_locales/en/messages.json 2011-05-12 11:59:51 UTC (rev 281) @@ -86,6 +86,11 @@ "message": "Permanent token ID:", "description": "label for permanent token ID input" }, + + "bowUrlInputLabel" : { + "message" : "Bow url :", + "description" : "Url of Bow" + }, "saveOptionButton": { "message": "Save", Modified: trunk/bow-extension-chromium/src/main/webapp/_locales/fr/messages.json =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/_locales/fr/messages.json 2011-05-05 09:32:39 UTC (rev 280) +++ trunk/bow-extension-chromium/src/main/webapp/_locales/fr/messages.json 2011-05-12 11:59:51 UTC (rev 281) @@ -61,7 +61,7 @@ "message": "Token de session", "description": "bouton pour bookmarker la page avec le token de session" }, - + "noTokenMessage": { "message": "Vous devez renseigner votre identifiant de token permanent ou de token de session pour pouvoir bookmarker cette page dans BOW.", "description": "message affiché à la place des boutons quand l'utilisateur n'a pas entré ses token ids" @@ -81,7 +81,12 @@ "message" : "Id du token permanent :", "description" : "label pour l'input de l'id du token permanent" }, - + + "bowUrlInputLabel" : { + "message" : "Url de Bow :", + "description" : "Url de l'instance de Bow" + }, + "saveOptionButton" : { "message" : "Enregistrer", "description" : "bouton d'enregistrement des options" Modified: trunk/bow-extension-chromium/src/main/webapp/manifest.json =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/manifest.json 2011-05-05 09:32:39 UTC (rev 280) +++ trunk/bow-extension-chromium/src/main/webapp/manifest.json 2011-05-12 11:59:51 UTC (rev 281) @@ -41,6 +41,6 @@ "options_page": "options.html", "homepage_url": "http://www.codelutin.com", "permissions": [ - "tabs", "http://bow.chorem.org/bow/*" + "tabs", "http://*" ] } Modified: trunk/bow-extension-chromium/src/main/webapp/options.html =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/options.html 2011-05-05 09:32:39 UTC (rev 280) +++ trunk/bow-extension-chromium/src/main/webapp/options.html 2011-05-12 11:59:51 UTC (rev 281) @@ -31,20 +31,21 @@ <link rel="icon" type="image/png" href="img/favicon.png" /> <link rel="stylesheet" type="text/css" href="css/options.css" /> - + <script type="text/javascript" src="properties.js"></script> <script type="text/javascript"> <!-- // Saves options to localStorage. function save_options() { var permanentTokenIdInput = document.getElementById("permanentTokenIdInput"); - var permanentTokenId = permanentTokenIdInput.value; - localStorage["permanentTokenId"] = permanentTokenId; + localStorage["permanentTokenId"] = permanentTokenIdInput.value; var sessionTokenIdInput = document.getElementById("sessionTokenIdInput"); - var sessionTokenId = sessionTokenIdInput.value; - localStorage["sessionTokenId"] = sessionTokenId; + localStorage["sessionTokenId"] = sessionTokenIdInput.value; + var bowUrlInput = document.getElementById("bowUrlInput"); + localStorage["bowUrl"] = bowUrlInput.value; + var formMessage = document.getElementById("formMessage"); formMessage.innerHTML = chrome.i18n.getMessage("optionSavedMessage"); } @@ -53,7 +54,7 @@ function restore_options() { var permanentTokenId = localStorage["permanentTokenId"]; var sessionTokenId = localStorage["sessionTokenId"]; - + var permanentTokenIdInputLabel = document.getElementById("permanentTokenIdInputLabel"); permanentTokenIdInputLabel.innerHTML = chrome.i18n.getMessage("permanentTokenIdInputLabel"); @@ -69,6 +70,12 @@ var sessionTokenIdInput = document.getElementById("sessionTokenIdInput"); sessionTokenIdInput.value = sessionTokenId; } + + var bowUrlInputLabel = document.getElementById("bowUrlInputLabel"); + bowUrlInputLabel.innerHTML = chrome.i18n.getMessage("bowUrlInputLabel"); + + var bowUrlInput = document.getElementById("bowUrlInput"); + bowUrlInput.value = getBowURl(); var title = document.getElementById("title"); title.innerHTML = chrome.i18n.getMessage("optionTitle"); @@ -117,6 +124,12 @@ <div class="inputs"> <input type="text" name="permanentTokenIdInput" id="permanentTokenIdInput" /> </div> + <div class="label"> + <label for="bowUrlInput" id="bowUrlInputLabel"></label> + </div> + <div class="inputs"> + <input type="text" name="bowUrlInput" id="bowUrlInput" /> + </div> <div class="buttons"> <input type="button" id="saveOptionButton" onclick="save_options()" /> </div> @@ -128,8 +141,7 @@ </div> <div id="footer"> <p> - <a shape="rect" id="bow_website" href="#" target="_blank">bow</a> - <a shape="rect" href="http://www.chorem.org/projects/list_files/bow">0.3-SNAPSHOT</a> - + <a shape="rect" id="bow_website" href="http://www.chorem.org/projects/show/bow" target="_blank">bow</a> <a shape="rect" href="http://www.gnu.org/licenses/agpl.html" id="licenseLink"></a> - <span title="Copyright">©2010 - 2011</span> <a shape="rect" href="http://www.codelutin.com">Code Lutin</a> - Modified: trunk/bow-extension-chromium/src/main/webapp/popup.html =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/popup.html 2011-05-05 09:32:39 UTC (rev 280) +++ trunk/bow-extension-chromium/src/main/webapp/popup.html 2011-05-12 11:59:51 UTC (rev 281) @@ -39,7 +39,7 @@ bookmark(tokenId); } } - + function bookmark(tokenId) { var tabInfos = chrome.extension.getBackgroundPage().getTabInfos(); var url = tabInfos["url"]; @@ -52,9 +52,8 @@ var tagsInput = document.getElementById("tagsInput"); var tagsValue = tagsInput.value; - - //BOW_URL is defined in properties.js - var link = BOW_URL + "/addUrl?token=" + tokenId + + var link = getBowURl() + "/addUrl.action?token=" + tokenId + "&link=" + encodeURIComponent(url) + "&name=" + encodeURIComponent(nameValue) + "&privateAlias=" + encodeURIComponent(aliasValue) @@ -63,7 +62,9 @@ var xhr = new XMLHttpRequest(); xhr.open("GET", link, true); xhr.send(); - }; + close(); + self.close(); + } function init() { var tabInfos = chrome.extension.getBackgroundPage().getTabInfos(); @@ -103,7 +104,7 @@ var buttons = document.getElementById("buttons"); buttons.innerHTML = chrome.i18n.getMessage("noTokenMessage"); } - }; + } function isEmpty(string) { return (string == null || string == ""); @@ -135,7 +136,7 @@ <input id="tagsInput" name="tagsInput" type="text" /> </div> <div id="buttons"> - <input id="permanentTokenButton" onclick="bookmarkPermanent()" type="button" /> + <input id="permanentTokenButton" onclick="bookmarkPermanent();" type="button" /> <input id="sessionTokenButton" onclick="bookmarkSession()" type="button" /> </div> </body> Modified: trunk/bow-extension-chromium/src/main/webapp/properties.js =================================================================== --- trunk/bow-extension-chromium/src/main/webapp/properties.js 2011-05-05 09:32:39 UTC (rev 280) +++ trunk/bow-extension-chromium/src/main/webapp/properties.js 2011-05-12 11:59:51 UTC (rev 281) @@ -22,3 +22,12 @@ * #L% */ var BOW_URL = "http://bow.chorem.org/bow"; + +function getBowURl() { + var bowUrl = localStorage["bowUrl"]; + if (!bowUrl) { + bowUrl = BOW_URL; + } + return bowUrl +} +