Self hosted FLOSS fitness/workout, nutrition and weight tracker
Remove hard coded CC license
Roland Geider6ec08a5a5eb2
diff --git a/CC-BY-SA.txt b/CC-BY-SA.txtdeleted file mode 100644index c7249198f..000000000--- a/CC-BY-SA.txt+++ /dev/null@@ -1,370 +0,0 @@- Creative Commons Legal Code--- Attribution-ShareAlike 3.0 Unported-- CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE- LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN- ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS- INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO- WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS- LIABILITY FOR DAMAGES RESULTING FROM ITS USE.--- /License/--THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE-COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY-COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS-AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.--BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE-TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY-BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS-CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND-CONDITIONS.--*1. Definitions*-- 1. *"Adaptation"* means a work based upon the Work, or upon the Work- and other pre-existing works, such as a translation, adaptation,- derivative work, arrangement of music or other alterations of a- literary or artistic work, or phonogram or performance and includes- cinematographic adaptations or any other form in which the Work may- be recast, transformed, or adapted including in any form- recognizably derived from the original, except that a work that- constitutes a Collection will not be considered an Adaptation for- the purpose of this License. For the avoidance of doubt, where the- Work is a musical work, performance or phonogram, the- synchronization of the Work in timed-relation with a moving image- ("synching") will be considered an Adaptation for the purpose of- this License.- 2. *"Collection"* means a collection of literary or artistic works,- such as encyclopedias and anthologies, or performances, phonograms- or broadcasts, or other works or subject matter other than works- listed in Section 1(f) below, which, by reason of the selection and- arrangement of their contents, constitute intellectual creations, in- which the Work is included in its entirety in unmodified form along- with one or more other contributions, each constituting separate and- independent works in themselves, which together are assembled into a- collective whole. A work that constitutes a Collection will not be- considered an Adaptation (as defined below) for the purposes of this- License.- 3. *"Creative Commons Compatible License"* means a license that is- listed at http://creativecommons.org/compatiblelicenses that has- been approved by Creative Commons as being essentially equivalent to- this License, including, at a minimum, because that license: (i)- contains terms that have the same purpose, meaning and effect as the- License Elements of this License; and, (ii) explicitly permits the- relicensing of adaptations of works made available under that- license under this License or a Creative Commons jurisdiction- license with the same License Elements as this License.- 4. *"Distribute"* means to make available to the public the original- and copies of the Work or Adaptation, as appropriate, through sale- or other transfer of ownership.- 5. *"License Elements"* means the following high-level license- attributes as selected by Licensor and indicated in the title of- this License: Attribution, ShareAlike.- 6. *"Licensor"* means the individual, individuals, entity or entities- that offer(s) the Work under the terms of this License.- 7. *"Original Author"* means, in the case of a literary or artistic- work, the individual, individuals, entity or entities who created- the Work or if no individual or entity can be identified, the- publisher; and in addition (i) in the case of a performance the- actors, singers, musicians, dancers, and other persons who act,- sing, deliver, declaim, play in, interpret or otherwise perform- literary or artistic works or expressions of folklore; (ii) in the- case of a phonogram the producer being the person or legal entity- who first fixes the sounds of a performance or other sounds; and,- (iii) in the case of broadcasts, the organization that transmits the- broadcast.- 8. *"Work"* means the literary and/or artistic work offered under the- terms of this License including without limitation any production in- the literary, scientific and artistic domain, whatever may be the- mode or form of its expression including digital form, such as a- book, pamphlet and other writing; a lecture, address, sermon or- other work of the same nature; a dramatic or dramatico-musical work;- a choreographic work or entertainment in dumb show; a musical- composition with or without words; a cinematographic work to which- are assimilated works expressed by a process analogous to- cinematography; a work of drawing, painting, architecture,- sculpture, engraving or lithography; a photographic work to which- are assimilated works expressed by a process analogous to- photography; a work of applied art; an illustration, map, plan,- sketch or three-dimensional work relative to geography, topography,- architecture or science; a performance; a broadcast; a phonogram; a- compilation of data to the extent it is protected as a copyrightable- work; or a work performed by a variety or circus performer to the- extent it is not otherwise considered a literary or artistic work.- 9. *"You"* means an individual or entity exercising rights under this- License who has not previously violated the terms of this License- with respect to the Work, or who has received express permission- from the Licensor to exercise rights under this License despite a- previous violation.-10. *"Publicly Perform"* means to perform public recitations of the Work- and to communicate to the public those public recitations, by any- means or process, including by wire or wireless means or public- digital performances; to make available to the public Works in such- a way that members of the public may access these Works from a place- and at a place individually chosen by them; to perform the Work to- the public by any means or process and the communication to the- public of the performances of the Work, including by public digital- performance; to broadcast and rebroadcast the Work by any means- including signs, sounds or images.-11. *"Reproduce"* means to make copies of the Work by any means- including without limitation by sound or visual recordings and the- right of fixation and reproducing fixations of the Work, including- storage of a protected performance or phonogram in digital form or- other electronic medium.--*2. Fair Dealing Rights.* Nothing in this License is intended to reduce,-limit, or restrict any uses free from copyright or rights arising from-limitations or exceptions that are provided for in connection with the-copyright protection under copyright law or other applicable laws.--*3. License Grant.* Subject to the terms and conditions of this License,-Licensor hereby grants You a worldwide, royalty-free, non-exclusive,-perpetual (for the duration of the applicable copyright) license to-exercise the rights in the Work as stated below:-- 1. to Reproduce the Work, to incorporate the Work into one or more- Collections, and to Reproduce the Work as incorporated in the- Collections;- 2. to create and Reproduce Adaptations provided that any such- Adaptation, including any translation in any medium, takes- reasonable steps to clearly label, demarcate or otherwise identify- that changes were made to the original Work. For example, a- translation could be marked "The original work was translated from- English to Spanish," or a modification could indicate "The original- work has been modified.";- 3. to Distribute and Publicly Perform the Work including as- incorporated in Collections; and,- 4. to Distribute and Publicly Perform Adaptations.- 5.-- For the avoidance of doubt:-- 1. *Non-waivable Compulsory License Schemes*. In those- jurisdictions in which the right to collect royalties through- any statutory or compulsory licensing scheme cannot be waived,- the Licensor reserves the exclusive right to collect such- royalties for any exercise by You of the rights granted under- this License;- 2. *Waivable Compulsory License Schemes*. In those jurisdictions in- which the right to collect royalties through any statutory or- compulsory licensing scheme can be waived, the Licensor waives- the exclusive right to collect such royalties for any exercise- by You of the rights granted under this License; and,- 3. *Voluntary License Schemes*. The Licensor waives the right to- collect royalties, whether individually or, in the event that- the Licensor is a member of a collecting society that- administers voluntary licensing schemes, via that society, from- any exercise by You of the rights granted under this License.--The above rights may be exercised in all media and formats whether now-known or hereafter devised. The above rights include the right to make-such modifications as are technically necessary to exercise the rights-in other media and formats. Subject to Section 8(f), all rights not-expressly granted by Licensor are hereby reserved.--*4. Restrictions.* The license granted in Section 3 above is expressly-made subject to and limited by the following restrictions:-- 1. You may Distribute or Publicly Perform the Work only under the terms- of this License. You must include a copy of, or the Uniform Resource- Identifier (URI) for, this License with every copy of the Work You- Distribute or Publicly Perform. You may not offer or impose any- terms on the Work that restrict the terms of this License or the- ability of the recipient of the Work to exercise the rights granted- to that recipient under the terms of the License. You may not- sublicense the Work. You must keep intact all notices that refer to- this License and to the disclaimer of warranties with every copy of- the Work You Distribute or Publicly Perform. When You Distribute or- Publicly Perform the Work, You may not impose any effective- technological measures on the Work that restrict the ability of a- recipient of the Work from You to exercise the rights granted to- that recipient under the terms of the License. This Section 4(a)- applies to the Work as incorporated in a Collection, but this does- not require the Collection apart from the Work itself to be made- subject to the terms of this License. If You create a Collection,- upon notice from any Licensor You must, to the extent practicable,- remove from the Collection any credit as required by Section 4(c),- as requested. If You create an Adaptation, upon notice from any- Licensor You must, to the extent practicable, remove from the- Adaptation any credit as required by Section 4(c), as requested.- 2. You may Distribute or Publicly Perform an Adaptation only under the- terms of: (i) this License; (ii) a later version of this License- with the same License Elements as this License; (iii) a Creative- Commons jurisdiction license (either this or a later license- version) that contains the same License Elements as this License- (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons- Compatible License. If you license the Adaptation under one of the- licenses mentioned in (iv), you must comply with the terms of that- license. If you license the Adaptation under the terms of any of the- licenses mentioned in (i), (ii) or (iii) (the "Applicable License"),- you must comply with the terms of the Applicable License generally- and the following provisions: (I) You must include a copy of, or the- URI for, the Applicable License with every copy of each Adaptation- You Distribute or Publicly Perform; (II) You may not offer or impose- any terms on the Adaptation that restrict the terms of the- Applicable License or the ability of the recipient of the Adaptation- to exercise the rights granted to that recipient under the terms of- the Applicable License; (III) You must keep intact all notices that- refer to the Applicable License and to the disclaimer of warranties- with every copy of the Work as included in the Adaptation You- Distribute or Publicly Perform; (IV) when You Distribute or Publicly- Perform the Adaptation, You may not impose any effective- technological measures on the Adaptation that restrict the ability- of a recipient of the Adaptation from You to exercise the rights- granted to that recipient under the terms of the Applicable License.- This Section 4(b) applies to the Adaptation as incorporated in a- Collection, but this does not require the Collection apart from the- Adaptation itself to be made subject to the terms of the Applicable- License.- 3. If You Distribute, or Publicly Perform the Work or any Adaptations- or Collections, You must, unless a request has been made pursuant to- Section 4(a), keep intact all copyright notices for the Work and- provide, reasonable to the medium or means You are utilizing: (i)- the name of the Original Author (or pseudonym, if applicable) if- supplied, and/or if the Original Author and/or Licensor designate- another party or parties (e.g., a sponsor institute, publishing- entity, journal) for attribution ("Attribution Parties") in- Licensor's copyright notice, terms of service or by other reasonable- means, the name of such party or parties; (ii) the title of the Work- if supplied; (iii) to the extent reasonably practicable, the URI, if- any, that Licensor specifies to be associated with the Work, unless- such URI does not refer to the copyright notice or licensing- information for the Work; and (iv) , consistent with Ssection 3(b),- in the case of an Adaptation, a credit identifying the use of the- Work in the Adaptation (e.g., "French translation of the Work by- Original Author," or "Screenplay based on original Work by Original- Author"). The credit required by this Section 4(c) may be- implemented in any reasonable manner; provided, however, that in the- case of a Adaptation or Collection, at a minimum such credit will- appear, if a credit for all contributing authors of the Adaptation- or Collection appears, then as part of these credits and in a manner- at least as prominent as the credits for the other contributing- authors. For the avoidance of doubt, You may only use the credit- required by this Section for the purpose of attribution in the- manner set out above and, by exercising Your rights under this- License, You may not implicitly or explicitly assert or imply any- connection with, sponsorship or endorsement by the Original Author,- Licensor and/or Attribution Parties, as appropriate, of You or Your- use of the Work, without the separate, express prior written- permission of the Original Author, Licensor and/or Attribution Parties.- 4. Except as otherwise agreed in writing by the Licensor or as may be- otherwise permitted by applicable law, if You Reproduce, Distribute- or Publicly Perform the Work either by itself or as part of any- Adaptations or Collections, You must not distort, mutilate, modify- or take other derogatory action in relation to the Work which would- be prejudicial to the Original Author's honor or reputation.- Licensor agrees that in those jurisdictions (e.g. Japan), in which- any exercise of the right granted in Section 3(b) of this License- (the right to make Adaptations) would be deemed to be a distortion,- mutilation, modification or other derogatory action prejudicial to- the Original Author's honor and reputation, the Licensor will waive- or not assert, as appropriate, this Section, to the fullest extent- permitted by the applicable national law, to enable You to- reasonably exercise Your right under Section 3(b) of this License- (right to make Adaptations) but not otherwise.--*5. Representations, Warranties and Disclaimer*--UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR-OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY-KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,-INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,-FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF-LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS,-WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE-EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.--*6. Limitation on Liability.* EXCEPT TO THE EXTENT REQUIRED BY-APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL-THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY-DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF-LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.--*7. Termination*-- 1. This License and the rights granted hereunder will terminate- automatically upon any breach by You of the terms of this License.- Individuals or entities who have received Adaptations or Collections- from You under this License, however, will not have their licenses- terminated provided such individuals or entities remain in full- compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will- survive any termination of this License.- 2. Subject to the above terms and conditions, the license granted here- is perpetual (for the duration of the applicable copyright in the- Work). Notwithstanding the above, Licensor reserves the right to- release the Work under different license terms or to stop- distributing the Work at any time; provided, however that any such- election will not serve to withdraw this License (or any other- license that has been, or is required to be, granted under the terms- of this License), and this License will continue in full force and- effect unless terminated as stated above.--*8. Miscellaneous*-- 1. Each time You Distribute or Publicly Perform the Work or a- Collection, the Licensor offers to the recipient a license to the- Work on the same terms and conditions as the license granted to You- under this License.- 2. Each time You Distribute or Publicly Perform an Adaptation, Licensor- offers to the recipient a license to the original Work on the same- terms and conditions as the license granted to You under this License.- 3. If any provision of this License is invalid or unenforceable under- applicable law, it shall not affect the validity or enforceability- of the remainder of the terms of this License, and without further- action by the parties to this agreement, such provision shall be- reformed to the minimum extent necessary to make such provision- valid and enforceable.- 4. No term or provision of this License shall be deemed waived and no- breach consented to unless such waiver or consent shall be in- writing and signed by the party to be charged with such waiver or- consent.- 5. This License constitutes the entire agreement between the parties- with respect to the Work licensed here. There are no understandings,- agreements or representations with respect to the Work not specified- here. Licensor shall not be bound by any additional provisions that- may appear in any communication from You. This License may not be- modified without the mutual written agreement of the Licensor and You.- 6. The rights granted under, and the subject matter referenced, in this- License were drafted utilizing the terminology of the Berne- Convention for the Protection of Literary and Artistic Works (as- amended on September 28, 1979), the Rome Convention of 1961, the- WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms- Treaty of 1996 and the Universal Copyright Convention (as revised on- July 24, 1971). These rights and subject matter take effect in the- relevant jurisdiction in which the License terms are sought to be- enforced according to the corresponding provisions of the- implementation of those treaty provisions in the applicable national- law. If the standard suite of rights granted under applicable- copyright law includes additional rights not granted under this- License, such additional rights are deemed to be included in the- License; this License is not intended to restrict the license of any- rights under applicable law.--- Creative Commons Notice-- Creative Commons is not a party to this License, and makes no- warranty whatsoever in connection with the Work. Creative Commons- will not be liable to You or any party on any legal theory for any- damages whatsoever, including without limitation any general,- special, incidental or consequential damages arising in connection- to this license. Notwithstanding the foregoing two (2) sentences, if- Creative Commons has expressly identified itself as the Licensor- hereunder, it shall have all rights and obligations of Licensor.-- Except for the limited purpose of indicating to the public that the- Work is licensed under the CCPL, Creative Commons does not authorize- the use by either party of the trademark "Creative Commons" or any- related trademark or logo of Creative Commons without the prior- written consent of Creative Commons. Any permitted use will be in- compliance with Creative Commons' then-current trademark usage- guidelines, as may be published on its website or otherwise made- available upon request from time to time. For the avoidance of- doubt, this trademark restriction does not form part of the License.-- Creative Commons may be contacted at http://creativecommons.org/.diff --git a/AGPL.txt b/LICENSE.txtsimilarity index 100%rename from AGPL.txtrename to LICENSE.txtdiff --git a/README.rst b/README.rstindex c5750825f..4df4a26b5 100644--- a/README.rst+++ b/README.rst@@ -135,8 +135,8 @@ LicenceThe application is licenced under the Affero GNU General Public License 3 orlater (AGPL 3+).-The initial exercise and ingredient data is licensed additionally under a-Creative Commons Attribution Share-Alike 3.0 (CC-BY-SA 3.0)+The initial exercise and ingredient data is licensed additionally under one of+the Creative Commons licenses, see the individual exercises for more details.The documentation is released under a CC-BY-SA either version 4 of the License,or (at your option) any later version.diff --git a/wger/core/static/images/SOURCES b/wger/core/static/images/SOURCESindex 30f3d47ff..bff894427 100644--- a/wger/core/static/images/SOURCES+++ b/wger/core/static/images/SOURCES@@ -1,4 +1,3 @@loader.svg: http://jorgecardoso.eu/htmlblog/2012-10-07-Scalable%20Ajax%20Loading%20Indicator%20in%20SVG.htmlagpl-v3.svg: https://www.gnu.org/graphics/license-logos-cc-by-sa.svg: https://creativecommons.org/about/downloadsbmi.svg https://commons.wikimedia.org/wiki/File:BodyMassIndex.svgdiff --git a/wger/core/static/images/cc-by-sa.svg b/wger/core/static/images/cc-by-sa.svgdeleted file mode 100644index 60b44e315..000000000--- a/wger/core/static/images/cc-by-sa.svg+++ /dev/null@@ -1,74 +0,0 @@-<?xml version="1.0" encoding="UTF-8" standalone="no"?>-<!-- Created with Inkscape (http://www.inkscape.org/) -->-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://web.resource.org/cc/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="120" height="42" id="svg2759" sodipodi:version="0.32" inkscape:version="0.45+devel" version="1.0" sodipodi:docname="by-sa.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape">- <defs id="defs2761"/>- <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#8b8b8b" borderopacity="1" gridtolerance="10000" guidetolerance="10" objecttolerance="10" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1" inkscape:cx="179" inkscape:cy="89.569904" inkscape:document-units="px" inkscape:current-layer="layer1" width="120px" height="42px" inkscape:showpageshadow="false" inkscape:window-width="1198" inkscape:window-height="624" inkscape:window-x="488" inkscape:window-y="401"/>- <metadata id="metadata2764">- <rdf:RDF>- <cc:Work rdf:about="">- <dc:format>image/svg+xml</dc:format>- <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>- </cc:Work>- </rdf:RDF>- </metadata>- <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1">- <g transform="matrix(0.9937807,0,0,0.9936694,-177.69409,-74.436409)" id="g287" inkscape:export-filename="/mnt/hgfs/Bov/Documents/Work/2007/cc/identity/srr buttons/big/by-sa.png" inkscape:export-xdpi="300.23013" inkscape:export-ydpi="300.23013">- <path id="path3817_2_" nodetypes="ccccccc" d="M 182.23532,75.39014 L 296.29928,75.59326 C 297.89303,75.59326 299.31686,75.35644 299.31686,78.77344 L 299.17721,116.34033 L 179.3569,116.34033 L 179.3569,78.63379 C 179.3569,76.94922 179.51999,75.39014 182.23532,75.39014 z" style="fill:#aab2ab"/>-- <g id="g5908_2_" transform="matrix(0.872921,0,0,0.872921,50.12536,143.2144)">-- <path id="path5906_2_" cx="296.35416" ry="22.939548" cy="264.3577" type="arc" rx="22.939548" d="M 187.20944,-55.6792 C 187.21502,-46.99896 180.18158,-39.95825 171.50134,-39.95212 C 162.82113,-39.94708 155.77929,-46.97998 155.77426,-55.66016 C 155.77426,-55.66687 155.77426,-55.67249 155.77426,-55.6792 C 155.76922,-64.36054 162.80209,-71.40125 171.48233,-71.40631 C 180.16367,-71.41193 187.20441,-64.37842 187.20944,-55.69824 C 187.20944,-55.69263 187.20944,-55.68591 187.20944,-55.6792 z" style="fill:#ffffff"/>-- <g id="g5706_2_" transform="translate(-289.6157,99.0653)">- <path id="path5708_2_" d="M 473.88455,-167.54724 C 477.36996,-164.06128 479.11294,-159.79333 479.11294,-154.74451 C 479.11294,-149.69513 477.40014,-145.47303 473.9746,-142.07715 C 470.33929,-138.50055 466.04281,-136.71283 461.08513,-136.71283 C 456.18736,-136.71283 451.96526,-138.48544 448.42003,-142.03238 C 444.87419,-145.57819 443.10158,-149.81537 443.10158,-154.74451 C 443.10158,-159.6731 444.87419,-163.94049 448.42003,-167.54724 C 451.87523,-171.03375 456.09728,-172.77618 461.08513,-172.77618 C 466.13342,-172.77618 470.39914,-171.03375 473.88455,-167.54724 z M 450.76657,-165.20239 C 447.81982,-162.22601 446.34701,-158.7395 446.34701,-154.74005 C 446.34701,-150.7417 447.80529,-147.28485 450.72125,-144.36938 C 453.63778,-141.45288 457.10974,-139.99462 461.1383,-139.99462 C 465.16683,-139.99462 468.66848,-141.46743 471.64486,-144.41363 C 474.47076,-147.14947 475.88427,-150.59069 475.88427,-154.74005 C 475.88427,-158.85809 474.44781,-162.35297 471.57659,-165.22479 C 468.70595,-168.09546 465.22671,-169.53131 461.1383,-169.53131 C 457.04993,-169.53131 453.59192,-168.08813 450.76657,-165.20239 z M 458.52106,-156.49927 C 458.07074,-157.4809 457.39673,-157.9715 456.49781,-157.9715 C 454.90867,-157.9715 454.11439,-156.90198 454.11439,-154.763 C 454.11439,-152.62341 454.90867,-151.55389 456.49781,-151.55389 C 457.54719,-151.55389 458.29676,-152.07519 458.74647,-153.11901 L 460.94923,-151.94598 C 459.8993,-150.0805 458.32417,-149.14697 456.22374,-149.14697 C 454.60384,-149.14697 453.30611,-149.64367 452.33168,-150.63653 C 451.35561,-151.62994 450.86894,-152.99926 450.86894,-154.7445 C 450.86894,-156.46008 451.37123,-157.82159 452.37642,-158.83013 C 453.38161,-159.83806 454.63347,-160.34264 456.13423,-160.34264 C 458.35435,-160.34264 459.94407,-159.46776 460.90504,-157.71978 L 458.52106,-156.49927 z M 468.8844,-156.49927 C 468.43353,-157.4809 467.77292,-157.9715 466.90201,-157.9715 C 465.28095,-157.9715 464.46988,-156.90198 464.46988,-154.763 C 464.46988,-152.62341 465.28095,-151.55389 466.90201,-151.55389 C 467.95304,-151.55389 468.68918,-152.07519 469.10925,-153.11901 L 471.36126,-151.94598 C 470.31301,-150.0805 468.74007,-149.14697 466.64358,-149.14697 C 465.02587,-149.14697 463.73095,-149.64367 462.75711,-150.63653 C 461.78494,-151.62994 461.29773,-152.99926 461.29773,-154.7445 C 461.29773,-156.46008 461.79221,-157.82159 462.78061,-158.83013 C 463.76843,-159.83806 465.02588,-160.34264 466.55408,-160.34264 C 468.77027,-160.34264 470.35776,-159.46776 471.3154,-157.71978 L 468.8844,-156.49927 z"/>-- </g>-- </g>-- <path d="M 297.29639,74.91064 L 181.06688,74.91064 C 179.8203,74.91064 178.80614,75.92529 178.80614,77.17187 L 178.80614,116.66748 C 178.80614,116.94922 179.03466,117.17822 179.31639,117.17822 L 299.04639,117.17822 C 299.32813,117.17822 299.55713,116.94922 299.55713,116.66748 L 299.55713,77.17188 C 299.55713,75.92529 298.54297,74.91064 297.29639,74.91064 z M 181.06688,75.93213 L 297.29639,75.93213 C 297.97998,75.93213 298.53565,76.48828 298.53565,77.17188 C 298.53565,77.17188 298.53565,93.09131 298.53565,104.59034 L 215.4619,104.59034 C 212.41698,110.09571 206.55077,113.83399 199.81835,113.83399 C 193.083,113.83399 187.21825,110.09913 184.1748,104.59034 L 179.82666,104.59034 C 179.82666,93.09132 179.82666,77.17188 179.82666,77.17188 C 179.82664,76.48828 180.38329,75.93213 181.06688,75.93213 z" id="path294"/>-- <g enable-background="new " id="g296">- <path d="M 265.60986,112.8833 C 265.68994,113.03906 265.79736,113.16504 265.93115,113.26172 C 266.06494,113.35791 266.22119,113.42969 266.40088,113.47608 C 266.58154,113.52296 266.76807,113.54639 266.96045,113.54639 C 267.09033,113.54639 267.22998,113.53565 267.3794,113.51368 C 267.52784,113.4922 267.66749,113.44972 267.79835,113.3877 C 267.92823,113.32569 268.03761,113.23975 268.12355,113.13086 C 268.21144,113.02197 268.25441,112.88379 268.25441,112.71533 C 268.25441,112.53515 268.19679,112.38916 268.08156,112.27685 C 267.9673,112.16455 267.81594,112.07177 267.62941,111.99658 C 267.44386,111.92236 267.23195,111.85693 266.9966,111.80078 C 266.76027,111.74463 266.52101,111.68262 266.27883,111.61377 C 266.02981,111.55176 265.78762,111.47559 265.55129,111.38525 C 265.31594,111.29541 265.10402,111.17822 264.9175,111.03515 C 264.73098,110.89208 264.58059,110.71337 264.46535,110.49853 C 264.35109,110.28369 264.29347,110.02392 264.29347,109.71923 C 264.29347,109.37646 264.36671,109.07958 264.51222,108.82763 C 264.6587,108.57568 264.85011,108.36572 265.08644,108.19726 C 265.32179,108.02929 265.58937,107.90478 265.8882,107.82372 C 266.18605,107.74315 266.48488,107.70263 266.78273,107.70263 C 267.13136,107.70263 267.46535,107.74169 267.78566,107.81982 C 268.105,107.89746 268.39015,108.02392 268.6382,108.19824 C 268.88722,108.37256 269.08449,108.59521 269.23097,108.86621 C 269.37648,109.13721 269.44972,109.46582 269.44972,109.85156 L 268.02784,109.85156 C 268.01514,109.65234 267.97315,109.4873 267.90284,109.35693 C 267.83155,109.22607 267.73682,109.12353 267.61964,109.04834 C 267.50148,108.97412 267.36671,108.9209 267.21534,108.89014 C 267.063,108.85889 266.89796,108.84326 266.71827,108.84326 C 266.60108,108.84326 266.48292,108.85596 266.36573,108.88037 C 266.24757,108.90576 266.14112,108.94922 266.04542,109.01123 C 265.94874,109.07373 265.86964,109.15137 265.80812,109.24463 C 265.7466,109.33838 265.71535,109.45654 265.71535,109.59961 C 265.71535,109.73047 265.73976,109.83643 265.78957,109.91699 C 265.83937,109.99804 265.93801,110.07275 266.08352,110.14111 C 266.22903,110.20947 266.43118,110.27832 266.68899,110.34668 C 266.9468,110.41504 267.28372,110.50244 267.70071,110.60791 C 267.82473,110.63281 267.99661,110.67822 268.21731,110.74365 C 268.43801,110.80908 268.65676,110.91308 268.87454,111.05615 C 269.09231,111.1997 269.27981,111.39111 269.43899,111.63037 C 269.59719,111.87012 269.67629,112.17676 269.67629,112.55029 C 269.67629,112.85547 269.61672,113.13867 269.49856,113.3999 C 269.3804,113.66162 269.20461,113.8872 268.97122,114.07666 C 268.73782,114.26709 268.44876,114.41455 268.10403,114.52051 C 267.75833,114.62647 267.35794,114.6792 266.90481,114.6792 C 266.53762,114.6792 266.18118,114.63379 265.83547,114.54346 C 265.49074,114.45313 265.18508,114.31104 264.92043,114.11768 C 264.65676,113.92432 264.4468,113.67774 264.29055,113.37891 C 264.13528,113.07959 264.06106,112.7251 264.06692,112.31397 L 265.4888,112.31397 C 265.48877,112.53809 265.52881,112.72803 265.60986,112.8833 z" id="path298" style="fill:#ffffff"/>-- <path d="M 273.8667,107.8667 L 276.35986,114.53076 L 274.8374,114.53076 L 274.33349,113.04638 L 271.84033,113.04638 L 271.31787,114.53076 L 269.84326,114.53076 L 272.36377,107.8667 L 273.8667,107.8667 z M 273.95068,111.95264 L 273.11084,109.50928 L 273.09229,109.50928 L 272.22315,111.95264 L 273.95068,111.95264 z" id="path300" style="fill:#ffffff"/>-- </g>-- <g enable-background="new " id="g302">- <path d="M 239.17821,107.8667 C 239.49559,107.8667 239.78563,107.89502 240.04735,107.95068 C 240.30907,108.00683 240.53368,108.09863 240.72118,108.22607 C 240.9077,108.35351 241.05321,108.52295 241.15575,108.73437 C 241.25829,108.94579 241.31005,109.20703 241.31005,109.51806 C 241.31005,109.854 241.23388,110.13329 241.08056,110.35742 C 240.92822,110.58154 240.70165,110.76465 240.40283,110.90771 C 240.81494,111.02587 241.12256,111.23291 241.32568,111.5288 C 241.5288,111.82469 241.63037,112.18114 241.63037,112.59814 C 241.63037,112.93408 241.56494,113.22509 241.43408,113.47119 C 241.30322,113.7168 241.12646,113.91748 240.90576,114.07324 C 240.68408,114.229 240.43115,114.34424 240.14795,114.41845 C 239.86377,114.49365 239.57275,114.53075 239.27295,114.53075 L 236.03662,114.53075 L 236.03662,107.86669 L 239.17821,107.86669 L 239.17821,107.8667 z M 238.99071,110.56201 C 239.25243,110.56201 239.46727,110.5 239.63622,110.37597 C 239.80419,110.25146 239.88817,110.05029 239.88817,109.77099 C 239.88817,109.61572 239.85985,109.48828 239.80419,109.38915 C 239.74755,109.28954 239.67333,109.21239 239.57958,109.15624 C 239.48583,109.10058 239.37841,109.06151 239.25731,109.04003 C 239.13524,109.01806 239.00926,109.00732 238.8784,109.00732 L 237.50535,109.00732 L 237.50535,110.56201 L 238.99071,110.56201 z M 239.07664,113.39014 C 239.22019,113.39014 239.35691,113.37647 239.48777,113.34815 C 239.61863,113.32032 239.73484,113.27344 239.83445,113.2085 C 239.93406,113.14307 240.01316,113.0542 240.07273,112.94239 C 240.1323,112.83058 240.1616,112.68751 240.1616,112.51319 C 240.1616,112.17139 240.06492,111.92725 239.87156,111.78126 C 239.6782,111.63527 239.42234,111.56202 239.10496,111.56202 L 237.50535,111.56202 L 237.50535,113.39014 L 239.07664,113.39014 z" id="path304" style="fill:#ffffff"/>-- <path d="M 241.88914,107.8667 L 243.53269,107.8667 L 245.09324,110.49854 L 246.64402,107.8667 L 248.27781,107.8667 L 245.80418,111.97315 L 245.80418,114.53077 L 244.33543,114.53077 L 244.33543,111.93604 L 241.88914,107.8667 z" id="path306" style="fill:#ffffff"/>-- </g>-- <g id="g6316_1_" transform="matrix(0.624995,0,0,0.624995,391.2294,176.9332)">-- <path id="path6318_1_" cx="475.97119" ry="29.209877" cy="252.08646" type="arc" rx="29.209877" d="M -175.0083,-139.1153 C -175.00204,-129.7035 -182.62555,-122.06751 -192.03812,-122.06049 C -201.44913,-122.05341 -209.08512,-129.67774 -209.09293,-139.09028 C -209.09293,-139.09809 -209.09293,-139.10749 -209.09293,-139.1153 C -209.09919,-148.52784 -201.47413,-156.1623 -192.06311,-156.17011 C -182.65054,-156.17713 -175.01456,-148.55207 -175.0083,-139.14026 C -175.0083,-139.13092 -175.0083,-139.1239 -175.0083,-139.1153 z" style="fill:#ffffff"/>-- <g id="g6320_1_" transform="translate(-23.9521,-89.72962)">- <path id="path6322_1_" d="M -168.2204,-68.05536 C -173.39234,-68.05536 -177.76892,-66.25067 -181.35175,-62.64203 C -185.02836,-58.90759 -186.86588,-54.48883 -186.86588,-49.38568 C -186.86588,-44.28253 -185.02836,-39.89416 -181.35175,-36.22308 C -177.67673,-32.55114 -173.29859,-30.71521 -168.2204,-30.71521 C -163.07974,-30.71521 -158.62503,-32.56677 -154.85312,-36.26996 C -151.30307,-39.78558 -149.52652,-44.15827 -149.52652,-49.38568 C -149.52652,-54.6123 -151.33432,-59.03265 -154.94843,-62.64203 C -158.5625,-66.25067 -162.98599,-68.05536 -168.2204,-68.05536 z M -168.17352,-64.69519 C -163.936,-64.69519 -160.33752,-63.20221 -157.37655,-60.21466 C -154.38748,-57.25836 -152.89214,-53.64899 -152.89214,-49.38568 C -152.89214,-45.09186 -154.35466,-41.52856 -157.28438,-38.69653 C -160.36876,-35.64727 -163.99849,-34.12304 -168.17351,-34.12304 C -172.34856,-34.12304 -175.94701,-35.63244 -178.96892,-38.64965 C -181.9908,-41.66918 -183.50176,-45.24657 -183.50176,-49.38567 C -183.50176,-53.52398 -181.97518,-57.13414 -178.92205,-60.21465 C -175.9939,-63.20221 -172.41107,-64.69519 -168.17352,-64.69519 z"/>-- <path id="path6324_1_" d="M -176.49548,-52.02087 C -175.75171,-56.71856 -172.44387,-59.22949 -168.30008,-59.22949 C -162.33911,-59.22949 -158.70783,-54.90448 -158.70783,-49.1372 C -158.70783,-43.50982 -162.57194,-39.13793 -168.39383,-39.13793 C -172.39856,-39.13793 -175.98297,-41.60277 -176.63611,-46.43877 L -171.93292,-46.43877 C -171.7923,-43.92778 -170.1626,-43.04418 -167.83447,-43.04418 C -165.1813,-43.04418 -163.4563,-45.50908 -163.4563,-49.27709 C -163.4563,-53.22942 -164.94693,-55.32244 -167.74228,-55.32244 C -169.79074,-55.32244 -171.55948,-54.57787 -171.93292,-52.02087 L -170.56418,-52.02789 L -174.26734,-48.32629 L -177.96894,-52.02789 L -176.49548,-52.02087 z"/>-- </g>-- </g>-- <g id="g313">- <circle cx="242.56226" cy="90.224609" r="10.8064" id="circle315" sodipodi:cx="242.56226" sodipodi:cy="90.224609" sodipodi:rx="10.8064" sodipodi:ry="10.8064" style="fill:#ffffff"/>-- <g id="g317">- <path d="M 245.68994,87.09766 C 245.68994,86.68116 245.35205,86.34424 244.93603,86.34424 L 240.16357,86.34424 C 239.74755,86.34424 239.40966,86.68115 239.40966,87.09766 L 239.40966,91.87061 L 240.74071,91.87061 L 240.74071,97.52295 L 244.3579,97.52295 L 244.3579,91.87061 L 245.68993,91.87061 L 245.68993,87.09766 L 245.68994,87.09766 z" id="path319"/>-- <circle cx="242.5498" cy="84.083008" r="1.63232" id="circle321" sodipodi:cx="242.5498" sodipodi:cy="84.083008" sodipodi:rx="1.63232" sodipodi:ry="1.63232"/>-- </g>-- <path clip-rule="evenodd" d="M 242.53467,78.31836 C 239.30322,78.31836 236.56641,79.4458 234.32715,81.70215 C 232.0293,84.03516 230.88086,86.79736 230.88086,89.98633 C 230.88086,93.1753 232.0293,95.91846 234.32715,98.21338 C 236.625,100.50781 239.36133,101.65527 242.53467,101.65527 C 245.74756,101.65527 248.53272,100.49853 250.88819,98.18359 C 253.10889,95.98681 254.21827,93.2539 254.21827,89.98632 C 254.21827,86.71874 253.08936,83.95751 250.83057,81.70214 C 248.57178,79.4458 245.80615,78.31836 242.53467,78.31836 z M 242.56396,80.41797 C 245.2124,80.41797 247.46142,81.35156 249.31103,83.21875 C 251.18115,85.06592 252.11572,87.32227 252.11572,89.98633 C 252.11572,92.66992 251.20068,94.89746 249.36963,96.66699 C 247.4419,98.57275 245.17334,99.52539 242.56397,99.52539 C 239.9546,99.52539 237.70557,98.58252 235.81739,96.6958 C 233.92774,94.80957 232.98389,92.57324 232.98389,89.98633 C 232.98389,87.3999 233.93799,85.14404 235.84619,83.21875 C 237.67676,81.35156 239.9165,80.41797 242.56396,80.41797 z" id="path323" style="fill-rule:evenodd"/>-- </g>--</g>- </g>-</svg>\ No newline at end of filediff --git a/wger/software/templates/changelog.html b/wger/software/templates/changelog.htmlindex 2095b3c3d..87c849018 100644--- a/wger/software/templates/changelog.html+++ b/wger/software/templates/changelog.html@@ -7,6 +7,16 @@{% block title %}{% trans "Changelog" %}{% endblock %}{% block content %}+<h3>1.8 - IN DEVELOPMENT</h3>+<h4>2016-XX-XX</h4>+<ul>+ <li>+ Remove hard-coded CC licence from documentation and website+ <a href="https://github.com/rolandgeider/wger/issues/247">#247</a>+ </li>+</ul>++<h3>1.7</h3><h4>2016-02-28</h4>diff --git a/wger/software/templates/license.html b/wger/software/templates/license.htmlindex afbab593d..2eaebcf71 100644--- a/wger/software/templates/license.html+++ b/wger/software/templates/license.html@@ -27,26 +27,8 @@ without restrictions.{% endblocktrans %}</p></div></div>-<div class="row">- <div class="col-md-2">- <img src="{% static 'images/cc-by-sa.svg' %}"- width="88"- height="31"- alt="{% trans 'CC-BY-SA' %}"- title="{% trans 'CC-BY-SA' %}"- class="pull-left">- </div>- <div class="col-md-10">- <p>{% blocktrans %}The data fixtures with the exercise and ingredient lists are-released additionally under a <strong>Creative Commons Attribution Share Alike 3-(CC-BY-SA)</strong> license.{% endblocktrans %}</p>- </div>-</div>--<p>{% blocktrans %}A copy of both licenses is contained in every wger Workout-Manager release and can be read in the-<a href='https://github.com/rolandgeider/wger/blob/master/AGPL.txt'>AGPL.txt</a>-or <a href='https://github.com/rolandgeider/wger/blob/master/CC-BY-SA.txt'>CC-BY-SA.txt</a>-files in the source code repository.{% endblocktrans %}</p>+<p>{% blocktrans %}A copy the license text is contained in every wger Workout+Manager release (LICENSE.txt) and can be read online on the website of+<a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>the GNU project</a>.{% endblocktrans %}</p>{% endblock %}