Author: kmorin Date: 2011-01-05 22:58:10 +0100 (Wed, 05 Jan 2011) New Revision: 162 Url: http://chorem.org/repositories/revision/bow/162 Log: - change add bookmark call (xhr instead of running a js script) - layout Modified: trunk/src/main/webapp/extensions/bow4chromium.crx trunk/src/main/webapp/extensions/bow4chromium.pem trunk/src/main/webapp/extensions/chromium/css/extension.css trunk/src/main/webapp/extensions/chromium/css/options.css trunk/src/main/webapp/extensions/chromium/options.html trunk/src/main/webapp/extensions/chromium/popup.html Modified: trunk/src/main/webapp/extensions/bow4chromium.crx =================================================================== (Binary files differ) Modified: trunk/src/main/webapp/extensions/bow4chromium.pem =================================================================== --- trunk/src/main/webapp/extensions/bow4chromium.pem 2011-01-05 17:40:08 UTC (rev 161) +++ trunk/src/main/webapp/extensions/bow4chromium.pem 2011-01-05 21:58:10 UTC (rev 162) @@ -1,16 +1,16 @@ -----BEGIN PRIVATE KEY----- -MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAM7n867IJSfHF6egn -sBS5kBR8rCwFbljqraMmTWY8tvZtUk6B7e0gZxMpoZy83NBbztqZMCrg1uu5Sjbes -mfsWXQuXydapl4ROKN85MUsuaHy+TvO27Zso5GjswDo982cShioU3oidYw7ZQC/Pu -FPmlzkzMfrIFqOA8S8lh7+XiZAgMBAAECgYAzFbfnvojV8mUXwSORDqbE2LbYAxHK -DR6YJcyqHBJST8VfyBEhvVKG+bHf3j/XhB9nhxRLMc2j9GGmHdKKN4B/1jsJAR43L -1ByYhp4L9ICjTGXrUz5ldl9bU3uuKIYeLaK6vKkmq+S7nlFKQDSv4X3uXEvCIZec/ -ESLcm9yiIBUQJBAO4r26CLVBTVKsg/Tmx9b7HHosyuUEv2zJzpo/SNztndpo1VOy2 -JVQC5U4IoV1BhI+q6za5oTo3rnIfTjsyoJyUCQQDeZPMEcmroUrDpvy4bhnI2idZZ -F4H1vVmcbcxd/RCmQSYUTa2c9HyZdUxJG/dveExEkC58HP6ZSc2svb+TwrtlAkEAw -8hXvUxrLMjiZ0PrArHGTFzwTdMI/Lj/EAnblh+wJ1XWIJ4sjE01C+hMZlUlGVURAl -bW1wS1dmJ1BQ56d2/O5QJBAM/3LL3a1Rg9w4xCKDa7KfDQQq57ah9HmxXKI1M9BCX -ERHy2CwT8J8xFQToYufD2WLPA9IdBgeAMgRXpNs5RSnUCQEAcKEx37eDto1LJPRh1 -nxyMzcgonNBSP2UtwGZdTeujM2KxBX4YMUuEz0u6fzlB+vD/ZM9af1IxYzDaH0mZc -6c= +MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAMkSF9yn8GdHkNaI2 +fh8b+eGwe/YAia1DjKlf9/G00CZQ+iW893FXLcfm+Oy8pIt1fAiCe7wYJDMd0UIZ/ +RKFVY9b8edA3+aQgKp+6JFOR/Acfc1gIdnpR17tq0sRzku+pdpNjNU6oNJlVMUSbJ +DFD7G4bp8Pk2ICwQzfB2EmhxzAgMBAAECgYBcB3f8erFB1DOqvcBmRy5A3iDt0gRK +CxyQecdpeOs/6eZ3EoBTxP2Go2UKduEnnusImcvKHSNVowAEDLDn0vCoVE2Sl+lz0 +Qv71P5TDycOhi8ih88PeOjfYDQXMapfnymC8Z/pqaQuYx8B17D3T/mgPtRcFp64oi +y48lkCM/+dIQJBAO5iV7TEvNxbucr/VuWh3GDyVkFbP19CoSA8lSwAQbhhyxXmnd4 +gVkEATyQV5ZsSlV9MaxlaYZOSMrmRNnxCHFcCQQDX7d53lvmutburHJaihGed7C5c +oMxiteqUUjET0yjzOYBXhQQF+4FB9LrTd+m71STgoYprXd5cRhAPFV2EP69FAkEAh +dpEgyVBIr6CeYCci34yX2FTm4kf8V5ZWN+Lp1RRkrWesiJ3HGWt6PvCdHGzJjruEr ++3F1pPlewufVITdPwuKwJAEpelvzBdwWBej2Y/xjCWZ2+tskYaMyms0CafmTBmZ0L +9PQv0A7vbLl2vNIQvuP+qVDk0nPgRLGrP+SyCx99f7QJBAJz8/LMTJpZxsesIJFqe +E3fn6XTc7erciuJhsX+iKgKCgpXxe4qXOVUQ0EW2NmOit0ucSAtL7ov0I2vmZ2Qtg +to= -----END PRIVATE KEY----- Modified: trunk/src/main/webapp/extensions/chromium/css/extension.css =================================================================== --- trunk/src/main/webapp/extensions/chromium/css/extension.css 2011-01-05 17:40:08 UTC (rev 161) +++ trunk/src/main/webapp/extensions/chromium/css/extension.css 2011-01-05 21:58:10 UTC (rev 162) @@ -36,7 +36,7 @@ margin-bottom: 20px; } -button { +input[type="button"] { float: right; background: url('/img/fdboutonV.jpg') repeat-x; color: #FFFFFF; @@ -48,14 +48,14 @@ } .labels { - margin-top: 5px; + margin-top: 10px; } .inputs { width: 100%; } -input { +input[type="text"] { width: 100%; } Modified: trunk/src/main/webapp/extensions/chromium/css/options.css =================================================================== --- trunk/src/main/webapp/extensions/chromium/css/options.css 2011-01-05 17:40:08 UTC (rev 161) +++ trunk/src/main/webapp/extensions/chromium/css/options.css 2011-01-05 21:58:10 UTC (rev 162) @@ -23,166 +23,139 @@ */ @charset "utf-8"; /* CSS Document */ -*{ - padding:0; - margin:0; +* { + padding: 0; + margin: 0; } -body{ - font-size:10px; - font-family:Verdana, Arial, Helvetica, sans-serif; +body { + font-size: 10px; + font-family: Verdana, Arial, Helvetica, sans-serif; } -.clearfix{ - height:1%; +#wrap { + clear: both; + float: left; + overflow-x: hidden; + overflow-y: visible; + position: relative; + width: 100%; + background-color: #9EDCF8; } -.clearfix:after{ - content:"."; - height:0; - line-height:0; - display:block; - visibility:hidden; - clear:both; +#footer { + background-color: #804561; + padding-top: 30px; } -#wrap{ - clear:both; - float:left; - overflow-x:hidden; - overflow-y:visible; - position:relative; - width:100%; - background-color:#9EDCF8; +#footer a { + color: #bf8a9c; } -#main div[class="menu clearfix"] h2{ - color:#9edcf8; - font-size:18px; - font-weight:normal; - float:left; +#footer p { + font-size: 14px; + text-align: center; + line-height: 50px; } -#main .menu form{ - float:right; - color:#9edcf8; - font-size:12px; +#header { + background: #FFFFFF url('/img/fondhead.jpg') repeat-x; + width: 100%; + float: left; + height: 100px; + clear: both; + margin: 0 auto; + position: relative; } -#footer{ - background-color:#804561; - padding-top:30px; +#header a.logo { + background: url('/img/logobow.jpg'); + width: 290px; + height: 100px; + text-indent: -99999px; + display: block; } -#footer a{ - color:#bf8a9c; -} - -#footer p{ - font-size:14px; - text-align:center; - line-height:50px; -} - -#header{ - background:#FFFFFF url('/img/fondhead.jpg') repeat-x; - width:100%; - float:left; - height:100px; - clear:both; - margin:0 auto; +#main { + width: 1004px; + margin: 0 auto; position: relative; + clear: both; } -#header a.logo{ - background:url('/img/logobow.jpg'); - width:290px; - height:100px; - text-indent:-99999px; - display:block; -} - -#main{ - width:1004px; - margin:0 auto; - position:relative; - clear:both; -} - -#main .menu{ - margin-top: 25px; -} - #page { - width:100%; - margin:0 auto; - clear:both; + width: 100%; + margin: 0 auto; + clear: both; } -#content{ - width:1004px; - position:relative; - margin:0 auto; - padding-top:20px; +#content { + width: 1004px; + position: relative; + margin: 0 auto; + padding-top: 20px; } -#formFrame{ - width:225px; - height:315px; - background:url('/img/fondconnexion.jpg') no-repeat; - position:relative; - margin:100px auto; - padding:10px 70px; +#formFrame { + width: 225px; + height: 315px; + background: url('/img/fondconnexion.jpg') no-repeat; + position: relative; + margin: 100px auto; + padding: 10px 70px; } -#formFrame h1{ - color:#804561; - width:225px; - position:relative; - margin:15px auto; +#formFrame h1 { + color: #804561; + width: 225px; + position: relative; + margin: 15px auto; } -#formFrame div div{ - color:#804561; - font-size:16px; - font-weight:bold; - width:225px; +#formFrame div div { + color: #804561; + font-size: 16px; + font-weight: bold; + width: 225px; } .label { - margin-top:30px; + margin-top: 30px; } .buttons { - margin-top:30px; + position: absolute; + top: 250px; + text-align: center; } -#formFrame input[type="text"]{ - width:225px; +#formFrame input[type="text"] { + width: 225px; } -#formFrame a{ +#formFrame a { position: absolute; - color:#804561; - left:75px; - font-weight:bold; + color: #804561; + left: 75px; + font-weight: bold; font-size: 12px; } -#formFrame #register{ - bottom:50px; - font-size:14px; +#formFrame .message { + width: 100%; + color: green; + font-size: 12px; + text-align: center; + margin-top: 30px; } -button { - float:right; - margin-top:20px; - background:url('/img/fdboutonV.jpg') repeat-x; - height:31px; - color:#FFFFFF; - font-weight:bold; - border:none; - width:auto; +#formFrame input[type="button"] { + background: url('/img/fdboutonV.jpg') repeat-x; + height: 31px; + color: #FFFFFF; + font-weight: bold; + border: none; + width: auto; padding: 5px; - cursor:pointer; + cursor: pointer; } Modified: trunk/src/main/webapp/extensions/chromium/options.html =================================================================== --- trunk/src/main/webapp/extensions/chromium/options.html 2011-01-05 17:40:08 UTC (rev 161) +++ trunk/src/main/webapp/extensions/chromium/options.html 2011-01-05 21:58:10 UTC (rev 162) @@ -45,10 +45,11 @@ var sessionTokenId = sessionTokenIdInput.value; localStorage["sessionTokenId"] = sessionTokenId; - alert(chrome.i18n.getMessage("optionSavedMessage")); + var formMessage = document.getElementById("formMessage"); + formMessage.innerHTML = chrome.i18n.getMessage("optionSavedMessage"); } - // Restores select box state to saved value from localStorage. + // Restores values from localStorage. function restore_options() { var permanentTokenId = localStorage["permanentTokenId"]; var sessionTokenId = localStorage["sessionTokenId"]; @@ -73,7 +74,7 @@ title.innerHTML = chrome.i18n.getMessage("optionTitle"); var saveOptionButton = document.getElementById("saveOptionButton"); - saveOptionButton.innerHTML = chrome.i18n.getMessage("saveOptionButton"); + saveOptionButton.value = chrome.i18n.getMessage("saveOptionButton"); var licenseLink = document.getElementById("licenseLink"); licenseLink.innerHTML = chrome.i18n.getMessage("licenseLink"); @@ -117,8 +118,9 @@ <input type="text" name="permanentTokenIdInput" id="permanentTokenIdInput" /> </div> <div class="buttons"> - <button type="button" id="saveOptionButton" onclick="save_options()"></button> + <input type="button" id="saveOptionButton" onclick="save_options()" /> </div> + <div class="message" id="formMessage"></div> </div> </div> </div> @@ -126,7 +128,7 @@ </div> <div id="footer"> <p> - <a shape="rect" id="bow_website" href="#">bow</a> + <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" href="http://www.gnu.org/licenses/agpl.html" id="licenseLink"></a> - <span title="Copyright">©2010 - 2011</span> Modified: trunk/src/main/webapp/extensions/chromium/popup.html =================================================================== --- trunk/src/main/webapp/extensions/chromium/popup.html 2011-01-05 17:40:08 UTC (rev 161) +++ trunk/src/main/webapp/extensions/chromium/popup.html 2011-01-05 21:58:10 UTC (rev 162) @@ -54,12 +54,15 @@ var tagsValue = tagsInput.value; //BOW_URL is defined in properties.js - var link = BOW_URL + "/bow?action=addUrl&token=" + tokenId + "&url=" + encodeURIComponent(url) + "&name=" + encodeURIComponent(nameValue) + "&alias=" + encodeURIComponent(aliasValue) + "&tags=" + encodeURIComponent(tagsValue); + var link = BOW_URL + "/bow?action=addUrl&token=" + tokenId + + "&url=" + encodeURIComponent(url) + + "&name=" + encodeURIComponent(nameValue) + + "&alias=" + encodeURIComponent(aliasValue) + + "&tags=" + encodeURIComponent(tagsValue); - var script = document.createElement('script'); - script.src = link; - script.type = 'text/javascript'; - document.body.appendChild(script); + var xhr = new XMLHttpRequest(); + xhr.open("GET", link, true); + xhr.send(); }; function init() { @@ -83,7 +86,7 @@ var sessionTokenId = localStorage["sessionTokenId"]; var sessionTokenButton = document.getElementById("sessionTokenButton"); if (!isEmpty(sessionTokenId)) { - sessionTokenButton.innerHTML = chrome.i18n.getMessage("sessionTokenButton"); + sessionTokenButton.value = chrome.i18n.getMessage("sessionTokenButton"); } else { sessionTokenButton.style.visibility = "hidden"; } @@ -91,7 +94,7 @@ var permanentTokenId = localStorage["permanentTokenId"]; var permanentTokenButton = document.getElementById("permanentTokenButton"); if (!isEmpty(permanentTokenId)) { - permanentTokenButton.innerHTML = chrome.i18n.getMessage("permanentTokenButton"); + permanentTokenButton.value = chrome.i18n.getMessage("permanentTokenButton"); } else { permanentTokenButton.style.visibility = "hidden"; } @@ -132,8 +135,8 @@ <input id="tagsInput" name="tagsInput" type="text" /> </div> <div id="buttons"> - <button id="permanentTokenButton" onclick="bookmarkPermanent()" type="button"></button> - <button id="sessionTokenButton" onclick="bookmarkSession()" type="button"></button> + <input id="permanentTokenButton" onclick="bookmarkPermanent()" type="button" /> + <input id="sessionTokenButton" onclick="bookmarkSession()" type="button" /> </div> </body> </html>