Author: kmorin Date: 2011-01-05 13:59:32 +0100 (Wed, 05 Jan 2011) New Revision: 158 Url: http://chorem.org/repositories/revision/bow/158 Log: - extract bow website url to be able to change it more easily - put files in repertories Added: trunk/src/main/webapp/extensions/chromium/css/ trunk/src/main/webapp/extensions/chromium/css/extension.css trunk/src/main/webapp/extensions/chromium/css/options.css trunk/src/main/webapp/extensions/chromium/img/ trunk/src/main/webapp/extensions/chromium/img/favicon.png trunk/src/main/webapp/extensions/chromium/img/fdboutonV.jpg trunk/src/main/webapp/extensions/chromium/img/fondconnexion.jpg trunk/src/main/webapp/extensions/chromium/img/fondhead.jpg trunk/src/main/webapp/extensions/chromium/img/logobow.jpg trunk/src/main/webapp/extensions/chromium/img/moyen-livre.jpg trunk/src/main/webapp/extensions/chromium/img/ptit-livre.jpg trunk/src/main/webapp/extensions/chromium/properties.js Removed: trunk/src/main/webapp/extensions/chromium/bow.crx trunk/src/main/webapp/extensions/chromium/favicon.png trunk/src/main/webapp/extensions/chromium/fdboutonV.jpg trunk/src/main/webapp/extensions/chromium/fondconnexion.jpg trunk/src/main/webapp/extensions/chromium/fondhead.jpg trunk/src/main/webapp/extensions/chromium/logobow.jpg trunk/src/main/webapp/extensions/chromium/moyen-livre.jpg trunk/src/main/webapp/extensions/chromium/options.css trunk/src/main/webapp/extensions/chromium/ptit-livre.jpg Modified: trunk/src/main/webapp/extensions/chromium/manifest.json trunk/src/main/webapp/extensions/chromium/options.html trunk/src/main/webapp/extensions/chromium/popup.html Deleted: trunk/src/main/webapp/extensions/chromium/bow.crx =================================================================== (Binary files differ) Added: trunk/src/main/webapp/extensions/chromium/css/extension.css =================================================================== --- trunk/src/main/webapp/extensions/chromium/css/extension.css (rev 0) +++ trunk/src/main/webapp/extensions/chromium/css/extension.css 2011-01-05 12:59:32 UTC (rev 158) @@ -0,0 +1,66 @@ +/* + * #%L + * bow + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +body { + width: 300px; + font-size:14px; + font-family:Verdana, Arial, Helvetica, sans-serif; + font-weight:bold; + background-color:#9EDCF8; + color:#804561; + padding: 5px 10px 5px 10px; +} + +h1 { + font-size:18px; + width: 100%; + text-align: center; +} + +button { + float:right; + background:url('/img/fdboutonV.jpg') repeat-x; + color:#FFFFFF; + font-weight:bold; + border:none; + width:auto; + padding: 5px; + cursor: pointer; +} + +.labels { + margin-top: 5px; +} + +.inputs { + width: 100%; +} + +input { + width: 100%; +} + +#buttons { + width: 100%; + margin-top: 10px; + height: 30px; + text-align: center; + text-color: red; +} Added: trunk/src/main/webapp/extensions/chromium/css/options.css =================================================================== --- trunk/src/main/webapp/extensions/chromium/css/options.css (rev 0) +++ trunk/src/main/webapp/extensions/chromium/css/options.css 2011-01-05 12:59:32 UTC (rev 158) @@ -0,0 +1,188 @@ +/* + * #%L + * bow + * + * $Id: options.css 144 2010-12-23 10:24:48Z bpoussin $ + * $HeadURL: http://svn.chorem.org/svn/bow/trunk/src/main/webapp/extensions/chromium/opti... $ + * %% + * Copyright (C) 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +@charset "utf-8"; +/* CSS Document */ +*{ + padding:0; + margin:0; +} + +body{ + font-size:10px; + font-family:Verdana, Arial, Helvetica, sans-serif; +} + +.clearfix{ + height:1%; +} + +.clearfix:after{ + content:"."; + height:0; + line-height:0; + display:block; + visibility:hidden; + clear:both; +} + +#wrap{ + clear:both; + float:left; + overflow-x:hidden; + overflow-y:visible; + position:relative; + width:100%; + background-color:#9EDCF8; +} + +#main div[class="menu clearfix"] h2{ + color:#9edcf8; + font-size:18px; + font-weight:normal; + float:left; +} + +#main .menu form{ + float:right; + color:#9edcf8; + font-size:12px; +} + +#footer{ + background-color:#804561; + padding-top:30px; +} + +#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; + position: relative; +} + +#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; +} + +#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 h1{ + color:#804561; + width:225px; + position:relative; + margin:15px auto; +} + +#formFrame div div{ + color:#804561; + font-size:16px; + font-weight:bold; + width:225px; +} + +.label { + margin-top:30px; +} + +.buttons { + margin-top:30px; +} + +#formFrame input[type="text"]{ + width:225px; +} + +#formFrame a{ + position: absolute; + color:#804561; + left:75px; + font-weight:bold; + font-size: 12px; +} + +#formFrame #register{ + bottom:50px; + font-size:14px; +} + +button { + float:right; + margin-top:20px; + background:url('/img/fdboutonV.jpg') repeat-x; + height:31px; + color:#FFFFFF; + font-weight:bold; + border:none; + width:auto; + padding: 5px; + cursor:pointer; +} Deleted: trunk/src/main/webapp/extensions/chromium/favicon.png =================================================================== (Binary files differ) Deleted: trunk/src/main/webapp/extensions/chromium/fdboutonV.jpg =================================================================== (Binary files differ) Deleted: trunk/src/main/webapp/extensions/chromium/fondconnexion.jpg =================================================================== (Binary files differ) Deleted: trunk/src/main/webapp/extensions/chromium/fondhead.jpg =================================================================== (Binary files differ) Added: trunk/src/main/webapp/extensions/chromium/img/favicon.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/extensions/chromium/img/favicon.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/extensions/chromium/img/fdboutonV.jpg =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/extensions/chromium/img/fdboutonV.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/extensions/chromium/img/fondconnexion.jpg =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/extensions/chromium/img/fondconnexion.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/extensions/chromium/img/fondhead.jpg =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/extensions/chromium/img/fondhead.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/extensions/chromium/img/logobow.jpg =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/extensions/chromium/img/logobow.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/extensions/chromium/img/moyen-livre.jpg =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/extensions/chromium/img/moyen-livre.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/extensions/chromium/img/ptit-livre.jpg =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/extensions/chromium/img/ptit-livre.jpg ___________________________________________________________________ Added: svn:executable + * Added: svn:mime-type + application/octet-stream Deleted: trunk/src/main/webapp/extensions/chromium/logobow.jpg =================================================================== (Binary files differ) Modified: trunk/src/main/webapp/extensions/chromium/manifest.json =================================================================== --- trunk/src/main/webapp/extensions/chromium/manifest.json 2011-01-03 10:17:10 UTC (rev 157) +++ trunk/src/main/webapp/extensions/chromium/manifest.json 2011-01-05 12:59:32 UTC (rev 158) @@ -4,13 +4,13 @@ "default_locale": "en", "description": "__MSG_extensionDescription__", - "icons": { "16": "ptit-livre.jpg", - "48": "moyen-livre.jpg", - "128": "moyen-livre.jpg" }, + "icons": { "16": "img/ptit-livre.jpg", + "48": "img/moyen-livre.jpg", + "128": "img/moyen-livre.jpg" }, "page_action": { "default_title": "__MSG_actionTitle__", - "default_icon": "favicon.png", + "default_icon": "img/favicon.png", "default_popup": "popup.html" }, @@ -18,6 +18,6 @@ "options_page": "options.html", "homepage_url": "http://www.codelutin.com", "permissions": [ - "tabs", "http://*/*", "https://*/*" + "tabs", "http://bow.chorem.org/bow/*" ] } Deleted: trunk/src/main/webapp/extensions/chromium/moyen-livre.jpg =================================================================== (Binary files differ) Deleted: trunk/src/main/webapp/extensions/chromium/options.css =================================================================== --- trunk/src/main/webapp/extensions/chromium/options.css 2011-01-03 10:17:10 UTC (rev 157) +++ trunk/src/main/webapp/extensions/chromium/options.css 2011-01-05 12:59:32 UTC (rev 158) @@ -1,188 +0,0 @@ -/* - * #%L - * bow - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -@charset "utf-8"; -/* CSS Document */ -*{ - padding:0; - margin:0; -} - -body{ - font-size:10px; - font-family:Verdana, Arial, Helvetica, sans-serif; -} - -.clearfix{ - height:1%; -} - -.clearfix:after{ - content:"."; - height:0; - line-height:0; - display:block; - visibility:hidden; - clear:both; -} - -#wrap{ - clear:both; - float:left; - overflow-x:hidden; - overflow-y:visible; - position:relative; - width:100%; - background-color:#9EDCF8; -} - -#main div[class="menu clearfix"] h2{ - color:#9edcf8; - font-size:18px; - font-weight:normal; - float:left; -} - -#main .menu form{ - float:right; - color:#9edcf8; - font-size:12px; -} - -#footer{ - background-color:#804561; - padding-top:30px; -} - -#footer a{ - color:#bf8a9c; -} - -#footer p{ - font-size:14px; - text-align:center; - line-height:50px; -} - -#header{ - background:#FFFFFF url('fondhead.jpg') repeat-x; - width:100%; - float:left; - height:100px; - clear:both; - margin:0 auto; - position: relative; -} - -#header a.logo{ - background:url(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; -} - -#content{ - width:1004px; - position:relative; - margin:0 auto; - padding-top:20px; -} - -#formFrame{ - width:225px; - height:315px; - background:url('fondconnexion.jpg') no-repeat; - position:relative; - margin:100px auto; - padding:10px 70px; -} - -#formFrame h1{ - color:#804561; - width:225px; - position:relative; - margin:15px auto; -} - -#formFrame div div{ - color:#804561; - font-size:16px; - font-weight:bold; - width:225px; -} - -.label { - margin-top:30px; -} - -.buttons { - margin-top:30px; -} - -#formFrame input[type="text"]{ - width:225px; -} - -#formFrame a{ - position: absolute; - color:#804561; - left:75px; - font-weight:bold; - font-size: 12px; -} - -#formFrame #register{ - bottom:50px; - font-size:14px; -} - -button { - float:right; - margin-top:20px; - background:url('fdboutonV.jpg') repeat-x; - height:31px; - color:#FFFFFF; - font-weight:bold; - border:none; - width:auto; - padding: 5px; - cursor:pointer; -} Modified: trunk/src/main/webapp/extensions/chromium/options.html =================================================================== --- trunk/src/main/webapp/extensions/chromium/options.html 2011-01-03 10:17:10 UTC (rev 157) +++ trunk/src/main/webapp/extensions/chromium/options.html 2011-01-05 12:59:32 UTC (rev 158) @@ -26,9 +26,13 @@ <head> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> <meta name="description" content="Bookmarks On the Web" /> + <title>BOW Extension Options</title> - <link rel="icon" type="image/png" href="favicon.png" /> - <link rel="stylesheet" type="text/css" href="options.css" /> + + <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. @@ -80,6 +84,8 @@ var userSupport = document.getElementById("userSupport"); userSupport.innerHTML = chrome.i18n.getMessage("userSupport"); + var bow_website_link = document.links["bow_website"]; + bow_website_link.href = BOW_URL; } //--> </script> @@ -117,10 +123,10 @@ </div> <div id="footer"> <p> - <a shape="rect" href="http://localhost:8080/bow/bow">bow</a> + <a shape="rect" id="bow_website" href="#">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</span> + <span title="Copyright">©2010 - 2011</span> <a shape="rect" href="http://www.codelutin.com">Code Lutin</a> - <a shape="rect" href="http://www.chorem.org/projects/bow/issues" id="bugReport"></a> - <a shape="rect" href="http://list.chorem.org/cgi-bin/mailman/listinfo/bow-users" id="userSupport"></a> Modified: trunk/src/main/webapp/extensions/chromium/popup.html =================================================================== --- trunk/src/main/webapp/extensions/chromium/popup.html 2011-01-03 10:17:10 UTC (rev 157) +++ trunk/src/main/webapp/extensions/chromium/popup.html 2011-01-05 12:59:32 UTC (rev 158) @@ -23,6 +23,7 @@ --> <html> <head> + <script type="text/javascript" src="properties.js"></script> <script> function bookmarkPermanent() { @@ -52,11 +53,12 @@ var tagsInput = document.getElementById("tagsInput"); var tagsValue = tagsInput.value; - var link = "http://bow.chorem.org/bow/bow?action=addUrl&token=" + tokenId + "&url=" + encodeURIComponent(url) + "&name=" + encodeURIComponent(nameValue) + "&alias=" + encodeURIComponent(aliasValue) + "&tags=" + encodeURIComponent(tagsValue); + //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 script=document.createElement('script'); - script.src=link; - script.type='text/javascript'; + var script = document.createElement('script'); + script.src = link; + script.type = 'text/javascript'; document.body.appendChild(script); }; @@ -105,55 +107,9 @@ } </script> - <style> - body { - width: 300px; - font-size:14px; - font-family:Verdana, Arial, Helvetica, sans-serif; - font-weight:bold; - background-color:#9EDCF8; - color:#804561; - padding: 5px 10px 5px 10px; - } - - h1 { - font-size:18px; - width: 100%; - text-align: center; - } - - button { - float:right; - background:url('fdboutonV.jpg') repeat-x; - color:#FFFFFF; - font-weight:bold; - border:none; - width:auto; - padding: 5px; - cursor: pointer; - } - - .labels { - margin-top: 5px; - } - - .inputs { - width: 100%; - } - - input { - width: 100%; - } - - #buttons { - width: 100%; - margin-top: 10px; - height: 30px; - text-align: center; - text-color: red; - } - - </style> + + <link rel="stylesheet" type="text/css" href="css/extension.css" /> + </head> <body onLoad="init()"> <h1 id="title"></h1> Added: trunk/src/main/webapp/extensions/chromium/properties.js =================================================================== --- trunk/src/main/webapp/extensions/chromium/properties.js (rev 0) +++ trunk/src/main/webapp/extensions/chromium/properties.js 2011-01-05 12:59:32 UTC (rev 158) @@ -0,0 +1 @@ +var BOW_URL = "http://bow.chorem.org/bow"; Deleted: trunk/src/main/webapp/extensions/chromium/ptit-livre.jpg =================================================================== (Binary files differ)