diff --git a/README.md b/README.md index 533c681..49db5d8 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,9 @@ # send2cgeo -Script for Mozilla Firefox and Google Chrome browser to send geocaches directly from your browser to c:geo on your phone. +Script for Mozilla Firefox and Google Chrome browser to [send geocaches directly from your browser to c:geo](http://www.cgeo.org/send2cgeo.html) on your phone. ## Version management -Changes should be based on the `master` branch. -Once the changes are validated and ready to release, the changes should be merged to the `release` branch. This merge has to include a raise of the script version number. +Changes must be done on the `master` branch. Once the changes are validated and ready to release, they can be merged to the `release` branch. The script version number needs to be raised within that merge. -The script download link on the c:geo homepage directly targets the raw script on the `release` branch, which means after merging the changes to `release` users will get the update. +The script download link on the [c:geo homepage](http://cgeo.org) directly targets the raw script on the `release` branch, which means after merging the changes to `release` users will see the update. diff --git a/chrome-extension/manifest.json b/chrome-extension/manifest.json deleted file mode 100644 index 95ef37f..0000000 --- a/chrome-extension/manifest.json +++ /dev/null @@ -1,17 +0,0 @@ -{ -"manifest_version": 2, - "content_scripts": [ { - "exclude_globs": [ ], - "exclude_matches": [ ], - "include_globs": [ "*" ], - "js": [ "send2cgeo.user.js" ], - "matches": [ "http://www.geocaching.com/seek/cache_details*", "https://www.geocaching.com/map/*", "http://www.geocaching.com/geocache/*", "http://www.geocaching.com/my/recentlyviewedcaches*", "http://www.geocaching.com/seek/nearest*"], - "run_at": "document_idle" - } ], - "converted_from_user_script": true, - "description": "Add button \"Send to c:geo\" to geocaching.com", - "key": "cJNjvsbX8OJfu/rUgwp/ZB7itpC5X0700m0HNcUDsLE=", - "name": "Send to c:geo", - "icons": { "64": "send2cgeo.64.png", "48": "send2cgeo.48.png" }, - "version": "0.30" -} diff --git a/chrome-extension/send2cgeo.48.png b/chrome-extension/send2cgeo.48.png deleted file mode 100644 index 585c6a5..0000000 Binary files a/chrome-extension/send2cgeo.48.png and /dev/null differ diff --git a/chrome-extension/send2cgeo.64.png b/chrome-extension/send2cgeo.64.png deleted file mode 100644 index 646e5c6..0000000 Binary files a/chrome-extension/send2cgeo.64.png and /dev/null differ diff --git a/chrome-extension/send2cgeo.user.js b/chrome-extension/send2cgeo.user.js deleted file mode 100644 index bba0f3b..0000000 --- a/chrome-extension/send2cgeo.user.js +++ /dev/null @@ -1,107 +0,0 @@ -// ==UserScript== -// @name Send to c:geo -// @namespace http://send2.cgeo.org/ -// @description Add button "Send to c:geo" to geocaching.com -// @grant none -// @include http://www.geocaching.com/seek/cache_details* -// @include https://www.geocaching.com/map/* -// @include http://www.geocaching.com/geocache/* -// @include http://www.geocaching.com/my/recentlyviewedcaches* -// @include http://www.geocaching.com/seek/nearest* -// @icon http://send2.cgeo.org/content/images/logo.png -// @downloadURL https://send2.cgeo.org/send2cgeo.user.js -// @updateURL https://send2.cgeo.org/send2cgeo.user.js -// @version 0.30 -// ==/UserScript== - -// Inserts javascript that will be called by the s2cgeo button. The closure -// look strange, but avoids having to escape the code. Almost everything -// is put into that script element so that geocaching.com's jQuery may be -// accessed. - -var s = document.createElement('script'); -s.type = 'text/javascript'; -s.textContent = '(' + function() { - // function that handles the actual sending ////////////////////////////////// - - window.s2geo = function(code) { - // show the box and the "please wait" text - $('#send2cgeo, #send2cgeo div').fadeIn(); - // hide iframe for now and wait for page to be loaded - $('#send2cgeo iframe') - .hide() - .unbind('load') - .attr('src', 'https://send2.cgeo.org/add.html?cache='+code) - .load(function() { - // hide "please wait text" and show iframe - $('#send2cgeo div').hide(); - // hide box after 3 seconds - $(this).css('display', 'block').parent().delay(3000).fadeOut(); - }); - }; - - - // Defines the elements to insert into the page ////////////////////////////// - var boxWidth = 20, - boxHeight = 7; - - var boxStyle = 'display:none; background:#1D1D1D; z-index:1000; left:50%;' - + 'box-shadow:0 0 0.5em #000; padding:0; border:0; ' - + 'position:fixed; top:0.5em; text-align:center; ' - + 'margin-left:-'+(boxWidth/2)+'em; line-height:'+boxHeight+'em;' - + 'width:'+boxWidth+'em; height:'+boxHeight+'em; color: #fff'; - var waitStyle = 'width: '+boxWidth+'em; color: #fff'; - var iframeStyle = 'border:0; width:'+boxWidth+'em; height: '+boxHeight+'em'; - - $('body').append('
' - + '
Please wait…
' - + '' - + '
'); - - - // Append to send2cgeo links/buttons ///////////////////////////////////////// - var map = document.getElementById('cacheDetailsTemplate'); - - if(map !== null) { - // geocaching.com map view - var html = 'Log Visit' - + '' - + ' ' - + 'Send to c:geo'; - - map.innerHTML = map.innerHTML.replace('Log Visit', html); - } else if(document.getElementById('ctl00_ContentBody_CoordInfoLinkControl1_uxCoordInfoCode') != null){ - // geocaching.com cache detail page - var GCCode = $('#ctl00_ContentBody_CoordInfoLinkControl1_uxCoordInfoCode') - .html(); - - var html = ''; - - $('#Download p:last').append(html); - $('#Download dd:last').append(html); - } else { - // geocaching.com recentlyviewed - $('img[src="/images/icons/16/send_to_gps.png"]').each(function(){ - $(this).attr('alt', "Send to c:geo").attr('title', "Send to c:geo"); - }); - $('a[title="Send to GPS"]').each(function(){ - var text = $(this).parent().parent().find(".Merge").last().find(".small").first().text().split("|"); - var GCCode = text[text.length - 2].trim(); - this.href="javascript:window.s2geo('"+GCCode+"')"; - this.title = "Send to c:geo"; - }); - - } -} + ')();'; - -// Inject Script. Can't use jQuery yet, because the page is not -// accessible from Tampermonkey -document.getElementsByTagName("head")[0].appendChild(s); \ No newline at end of file diff --git a/firefox-addon/send2cgeo/data/LICENSE b/firefox-addon/send2cgeo/data/LICENSE deleted file mode 100644 index d645695..0000000 --- a/firefox-addon/send2cgeo/data/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/firefox-addon/send2cgeo/data/NOTICE b/firefox-addon/send2cgeo/data/NOTICE deleted file mode 100644 index d37863d..0000000 --- a/firefox-addon/send2cgeo/data/NOTICE +++ /dev/null @@ -1,10 +0,0 @@ - c:geo - Copyright 2011-2013 c:geo contributors - - This product includes software developed by - the c:geo team and contributors. See main/res/values/strings_not_translatable.xml - for details. - - Portions of this software were developed elsewhere. See the files in main/thirdparty - and the notices therein and the references in main/res/values/strings_not_translatable.xml - for details. diff --git a/firefox-addon/send2cgeo/data/send2cgeo.48.png b/firefox-addon/send2cgeo/data/send2cgeo.48.png deleted file mode 100644 index 585c6a5..0000000 Binary files a/firefox-addon/send2cgeo/data/send2cgeo.48.png and /dev/null differ diff --git a/firefox-addon/send2cgeo/data/send2cgeo.64.png b/firefox-addon/send2cgeo/data/send2cgeo.64.png deleted file mode 100644 index 646e5c6..0000000 Binary files a/firefox-addon/send2cgeo/data/send2cgeo.64.png and /dev/null differ diff --git a/firefox-addon/send2cgeo/data/send2cgeo.user.js b/firefox-addon/send2cgeo/data/send2cgeo.user.js deleted file mode 100644 index 1e1f91e..0000000 --- a/firefox-addon/send2cgeo/data/send2cgeo.user.js +++ /dev/null @@ -1 +0,0 @@ -../../../send2cgeo.user.js \ No newline at end of file diff --git a/firefox-addon/send2cgeo/lib/main.js b/firefox-addon/send2cgeo/lib/main.js deleted file mode 100644 index 82eb508..0000000 --- a/firefox-addon/send2cgeo/lib/main.js +++ /dev/null @@ -1,8 +0,0 @@ -var pageMod = require("sdk/page-mod"); -var data = require("sdk/self").data; - -pageMod.PageMod({ - include: ["http://www.geocaching.com/seek/cache_details*", "http://www.geocaching.com/geocache/*", "http://www.geocaching.com/map/*"], - contentScriptWhen: "end", - contentScriptFile: data.url("send2cgeo.user.js") -}); \ No newline at end of file diff --git a/firefox-addon/send2cgeo/package.json b/firefox-addon/send2cgeo/package.json deleted file mode 100644 index ee7da8a..0000000 --- a/firefox-addon/send2cgeo/package.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "description": "This is a small wrapper around the send2cgeo Greasemonkey script.\n\nCredit goes to the developers of send2cgeo.user.js", - "contributors": [], - "dependencies": ["api-utils", "addon-kit"], - "fullName": "send2cgeo", - "id": "jid0-XabGAJzXPgqYfMo6BeiN59yek1k", - "lib": "lib", - "license": "Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)", - "icon": "data/send2cgeo.48.png", - "icon64": "data/send2cgeo.64.png", - "author": "JavaJens", - "url": "", - "name": "send2cgeo", - "version": "0.1a", - "main": "main", - "homepage": "http://send2.cgeo.org/" -} diff --git a/send2cgeo.user.js b/send2cgeo.user.js index 9c17d59..230394e 100644 --- a/send2cgeo.user.js +++ b/send2cgeo.user.js @@ -5,14 +5,18 @@ // @grant none // @include https://www.geocaching.com/play/search/* // @include http://www.geocaching.com/seek/cache_details* +// @include https://www.geocaching.com/seek/cache_details* // @include https://www.geocaching.com/map/* // @include http://www.geocaching.com/geocache/* +// @include https://www.geocaching.com/geocache/* // @include http://www.geocaching.com/my/recentlyviewedcaches* +// @include https://www.geocaching.com/my/recentlyviewedcaches* // @include http://www.geocaching.com/seek/nearest* +// @include https://www.geocaching.com/seek/nearest* // @icon https://send2.cgeo.org/send2cgeo.png // @downloadURL https://github.com/cgeo/send2cgeo/raw/release/send2cgeo.user.js // @updateURL https://github.com/cgeo/send2cgeo/raw/release/send2cgeo.user.js -// @version 0.32 +// @version 0.33 // ==/UserScript== // Inserts javascript that will be called by the s2cgeo button. The closure