diff --git a/.hgtags b/.hgtags new file mode 100644 --- /dev/null +++ b/.hgtags @@ -0,0 +1,3 @@ +11bc9e2ddf0107cfdc15a78ccb3e4b73fe891184 v5.2.0 +0c40b177d129979e0436ddb48ac6d80792ae825c v5.2.1 +1e9bc98a5eec8bf73ebb4019d612828807775cf3 v5.3.0 diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + {project} Copyright (C) {year} {fullname} + This program comes with ABSOLUTELY NO WARRANTY; for details type 'show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type 'show c' for details. + +The hypothetical commands 'show w' and 'show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/README.rst b/README.rst new file mode 100644 --- /dev/null +++ b/README.rst @@ -0,0 +1,116 @@ +========= +Ënnstatus +========= + +Ënnstatus is a web application written in Python_ Flask_, to provide viewers +with vital information about the organisation and Tor_ servers of `Frënn vun +der Ënn A.S.B.L.`_ + +.. _Python: https://python.org +.. _Flask: http://flask.pooco.org +.. _Tor: https://torproject.lu +.. _Frënn vun der Ënn A.S.B.L.: https://enn.lu + +TOC +=== + +- Contribute_ + + - Versioning_ + - Repository_ + + - `Branch Structure`_ + - `Feature Requests`_ + - `Pull Requests`_ + +- Authors_ + + - `Development Lead`_ + - `Contributors`_ + +.. _Contribute: + +Contibute +========= + +Versioning +---------- + +This project uses the `Semantic Versioning`_ system. + +.. _Repository: + +Repository +---------- + +.. _Branch Structure: + +Branch Structure +++++++++++++++++ + +The branch structure of this project is very similiar to the `git-flow`_ +branching model, but with some modifications (we don't have release branches). + +Description of the branches: + +- **default**: This is the stable branch. +- **dev**: This is the main development branch. +- **hotfix-***: These branches branch off from the default branch and are used to + fix bugs which are in the stable version. They will be merged back into + *default* and *dev*. After the bug is fixed, the *PATCH* number must be + increased! +- **feature-***: In these branches, we will implement new features. These will + branch off from the *dev* branch and merged back into the *dev* branch, if + the feature is completed! + +.. _Semantic Versioning: http://semver.org/ +.. _git-flow: http://nvie.com/posts/a-successful-git-branching-model/ + +.. _Feature Requests: + +Feature Requests +++++++++++++++++ + +We welcome feature requests. Please make sure they are within scope of Ënnstatus +goals and submit them in `Bitbucket Issues`_ with the *proposal* kind selected. +The more complete and compelling the request, the more likely it will be +implemented. Gathering community support will help as well! + +.. _Pull Requests: + +Pull Requests ++++++++++++++ + +1. Please check to make sure your plans fall within Ënnstatus scope +2. Fork Ënnstatus +3. Branch off the *dev* branch +4. Implement your changes +5. Submit a Pull Request + +Pull Requests will not be accepted without adhering to the following: + +1. Conform to existing coding styles +2. Serve a single atomic purpose (add one feature or fix one bug) +3. Introduce only changes that further the PR's singular purpose + +.. _Bitbucket Issues: https://bitbucket.org/fvde/ennstatus-relaunched/issues + +.. _Authors: + +Authors +======= + +Ënnstatus is written and maintained by Dennis Fink. + +.. _Development Lead: + +Development Lead +---------------- + +- Dennis Fink + +Contributors +------------ + +- virii +- kahpa diff --git a/dev-requirements.txt b/dev-requirements.txt --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -14,6 +14,6 @@ jinja2==2.8 # via flask, s markupsafe==0.23 # via jinja2 pip-tools==1.1.3 pygments==2.0.2 # via sphinx -six==1.9.0 # via pip-tools +six==1.10.0 # via pip-tools Sphinx==1.2.3 werkzeug==0.10.4 # via flask diff --git a/ennstatus/__init__.py b/ennstatus/__init__.py --- a/ennstatus/__init__.py +++ b/ennstatus/__init__.py @@ -1,3 +1,19 @@ +# Ënnstatus +# Copyright (C) 2015 Dennis Fink +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public License +# along with this program. If not, see . + import os.path import json @@ -66,7 +82,10 @@ def create_app(): app.register_blueprint(status_page, url_prefix='/status') from .statistics.views import statistics_page - app.register_blueprint(statistics_page, url_prefix='/stats') + app.register_blueprint(statistics_page, url_prefix='/statistics') + + from .data.views import data_page + app.register_blueprint(data_page, url_prefix='/data') from .log import init_logging init_logging(app) diff --git a/ennstatus/api/__init__.py b/ennstatus/api/__init__.py --- a/ennstatus/api/__init__.py +++ b/ennstatus/api/__init__.py @@ -0,0 +1,16 @@ +# Ënnstatus +# Copyright (C) 2015 Dennis Fink +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public License +# along with this program. If not, see . + diff --git a/ennstatus/api/auth.py b/ennstatus/api/auth.py --- a/ennstatus/api/auth.py +++ b/ennstatus/api/auth.py @@ -1,3 +1,19 @@ +# Ënnstatus +# Copyright (C) 2015 Dennis Fink +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public License +# along with this program. If not, see . + from flask import current_app from flask.ext.httpauth import HTTPDigestAuth diff --git a/ennstatus/api/model.py b/ennstatus/api/model.py --- a/ennstatus/api/model.py +++ b/ennstatus/api/model.py @@ -1,3 +1,19 @@ +# Ënnstatus +# Copyright (C) 2015 Dennis Fink +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public License +# along with this program. If not, see . + import ipaddress import json import functools diff --git a/ennstatus/api/views.py b/ennstatus/api/views.py --- a/ennstatus/api/views.py +++ b/ennstatus/api/views.py @@ -1,3 +1,19 @@ +# Ënnstatus +# Copyright (C) 2015 Dennis Fink +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public License +# along with this program. If not, see . + import ipaddress import json diff --git a/ennstatus/cli/__init__.py b/ennstatus/cli/__init__.py --- a/ennstatus/cli/__init__.py +++ b/ennstatus/cli/__init__.py @@ -1,3 +1,19 @@ +# Ënnstatus +# Copyright (C) 2015 Dennis Fink +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public License +# along with this program. If not, see . + import pathlib import importlib import operator diff --git a/ennstatus/cli/commands/__init__.py b/ennstatus/cli/commands/__init__.py --- a/ennstatus/cli/commands/__init__.py +++ b/ennstatus/cli/commands/__init__.py @@ -1,3 +1,19 @@ +# Ënnstatus +# Copyright (C) 2015 Dennis Fink +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public License +# along with this program. If not, see . + from .config import config from .stats import stats diff --git a/ennstatus/cli/commands/config.py b/ennstatus/cli/commands/config.py --- a/ennstatus/cli/commands/config.py +++ b/ennstatus/cli/commands/config.py @@ -1,3 +1,19 @@ +# Ënnstatus +# Copyright (C) 2015 Dennis Fink +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public License +# along with this program. If not, see . + import json import ipaddress import subprocess diff --git a/ennstatus/config.py b/ennstatus/config.py --- a/ennstatus/config.py +++ b/ennstatus/config.py @@ -1,3 +1,19 @@ +# Ënnstatus +# Copyright (C) 2015 Dennis Fink +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public License +# along with this program. If not, see . + import os import base64 diff --git a/ennstatus/data/__init__.py b/ennstatus/data/__init__.py new file mode 100644 --- /dev/null +++ b/ennstatus/data/__init__.py @@ -0,0 +1,16 @@ +# Ënnstatus +# Copyright (C) 2015 Dennis Fink +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public License +# along with this program. If not, see . + diff --git a/ennstatus/data/views.py b/ennstatus/data/views.py new file mode 100644 --- /dev/null +++ b/ennstatus/data/views.py @@ -0,0 +1,42 @@ +# Ënnstatus +# Copyright (C) 2015 Dennis Fink +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public License +# along with this program. If not, see . + +from collections import defaultdict + +from flask import Blueprint, jsonify + +from ennstatus.status.functions import split_all_servers_to_types + +data_page = Blueprint('data', __name__) + + +@data_page.route('/worldmap') +def worldmap(): + servers = split_all_servers_to_types() + countries = {} + + for key, value in servers.items(): + for server in value: + if server.country not in countries: + countries[server.country] = defaultdict(int) + countries[server.country][server.type] += 1 + countries[server.country]['total'] += 1 + + maximum = max(i['total'] for i in countries.values()) + + countries['max'] = maximum + + return jsonify(countries) diff --git a/ennstatus/donate/__init__.py b/ennstatus/donate/__init__.py --- a/ennstatus/donate/__init__.py +++ b/ennstatus/donate/__init__.py @@ -0,0 +1,16 @@ +# Ënnstatus +# Copyright (C) 2015 Dennis Fink +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public License +# along with this program. If not, see . + diff --git a/ennstatus/donate/forms.py b/ennstatus/donate/forms.py --- a/ennstatus/donate/forms.py +++ b/ennstatus/donate/forms.py @@ -1,3 +1,19 @@ +# Ënnstatus +# Copyright (C) 2015 Dennis Fink +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public License +# along with this program. If not, see . + from flask_wtf import Form from wtforms import SelectField, SubmitField from wtforms.validators import DataRequired diff --git a/ennstatus/donate/functions.py b/ennstatus/donate/functions.py --- a/ennstatus/donate/functions.py +++ b/ennstatus/donate/functions.py @@ -1,3 +1,19 @@ +# Ënnstatus +# Copyright (C) 2015 Dennis Fink +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public License +# along with this program. If not, see . + import os import os.path import csv diff --git a/ennstatus/donate/views.py b/ennstatus/donate/views.py --- a/ennstatus/donate/views.py +++ b/ennstatus/donate/views.py @@ -1,6 +1,24 @@ +# Ënnstatus +# Copyright (C) 2015 Dennis Fink +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public License +# along with this program. If not, see . + from flask import (Blueprint, render_template, request, redirect, url_for, current_app) +from babel.numbers import parse_decimal, format_decimal + from ennstatus.donate.forms import DateForm from ennstatus.donate.functions import load_csv, get_choices @@ -60,7 +78,7 @@ def received(): current_app.logger.warn('No donations found!') return render_template('donate/received.html', form=form, csv_file=None, - year=None, month=None) + year=None, month=None, total=None) if request.method == 'POST': current_app.logger.debug('Validating form') @@ -82,7 +100,7 @@ def received(): current_app.logger.warn('Date %s not found' % filename) return render_template('donate/received.html', form=form, csv_file=None, - year=year, month=month) + year=year, month=month, total=None) else: filename = files[-1] current_app.logger.info('Showing last date %s' % filename) @@ -91,7 +109,15 @@ def received(): form.month.data = '{:02d}'.format(int(month)) csv_file = load_csv(filename) + total = format_decimal( + sum( + parse_decimal(row[2], locale='de') for row in csv_file + ), + locale='de' + ) + csv_file = load_csv(filename) + current_app.logger.info('Return result') return render_template('donate/received.html', form=form, csv_file=csv_file, - year=year, month=month) + year=year, month=month, total=total) diff --git a/ennstatus/log.py b/ennstatus/log.py --- a/ennstatus/log.py +++ b/ennstatus/log.py @@ -1,3 +1,19 @@ +# Ënnstatus +# Copyright (C) 2015 Dennis Fink +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public License +# along with this program. If not, see . + import logging import logging.handlers diff --git a/ennstatus/root/__init__.py b/ennstatus/root/__init__.py --- a/ennstatus/root/__init__.py +++ b/ennstatus/root/__init__.py @@ -0,0 +1,16 @@ +# Ënnstatus +# Copyright (C) 2015 Dennis Fink +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public License +# along with this program. If not, see . + diff --git a/ennstatus/root/constants.py b/ennstatus/root/constants.py --- a/ennstatus/root/constants.py +++ b/ennstatus/root/constants.py @@ -1,3 +1,19 @@ +# Ënnstatus +# Copyright (C) 2015 Dennis Fink +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public License +# along with this program. If not, see . + BPM_ADDRESSES = { 'germany': { diff --git a/ennstatus/root/forms.py b/ennstatus/root/forms.py --- a/ennstatus/root/forms.py +++ b/ennstatus/root/forms.py @@ -1,3 +1,19 @@ +# Ënnstatus +# Copyright (C) 2015 Dennis Fink +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public License +# along with this program. If not, see . + from flask_wtf import Form from wtforms import (SelectField, StringField, diff --git a/ennstatus/root/functions.py b/ennstatus/root/functions.py --- a/ennstatus/root/functions.py +++ b/ennstatus/root/functions.py @@ -1,3 +1,19 @@ +# Ënnstatus +# Copyright (C) 2015 Dennis Fink +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public License +# along with this program. If not, see . + from flask import render_template, current_app, flash from flask_mail import Mail, Message diff --git a/ennstatus/root/views.py b/ennstatus/root/views.py --- a/ennstatus/root/views.py +++ b/ennstatus/root/views.py @@ -1,3 +1,19 @@ +# Ënnstatus +# Copyright (C) 2015 Dennis Fink +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public License +# along with this program. If not, see . + from flask import (Blueprint, render_template, current_app, request, redirect, url_for, flash) diff --git a/ennstatus/static/css/ennstatus.css b/ennstatus/static/css/ennstatus.css --- a/ennstatus/static/css/ennstatus.css +++ b/ennstatus/static/css/ennstatus.css @@ -1,3 +1,20 @@ +/* Ënnstatus + Copyright (C) 2015 Dennis Fink + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public License + along with this program. If not, see . +*/ + blockquote { border: none; } diff --git a/ennstatus/static/css/flags/flags.gif.css b/ennstatus/static/css/flags/flags.gif.css --- a/ennstatus/static/css/flags/flags.gif.css +++ b/ennstatus/static/css/flags/flags.gif.css @@ -1,3 +1,20 @@ +/* Ënnstatus + Copyright (C) 2015 Dennis Fink + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public License + along with this program. If not, see . +*/ + [class^="flag-"], [class*=" flag-"] { display: inline-block; diff --git a/ennstatus/static/css/flags/flags.gif.min.css b/ennstatus/static/css/flags/flags.gif.min.css --- a/ennstatus/static/css/flags/flags.gif.min.css +++ b/ennstatus/static/css/flags/flags.gif.min.css @@ -1,1 +1,18 @@ +/* Ënnstatus + Copyright (C) 2015 Dennis Fink + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public License + along with this program. If not, see . +*/ + [class^="flag-"],[class*=" flag-"]{display:inline-block;width:16px;height:11px;margin-top:1px;*margin-right:.3em;line-height:16px;vertical-align:baseline;background-repeat:no-repeat}.flag-andorra,.flag-ad,.flag-and{background-image:url("img/gif/ad.gif")}.flag-united-arab-emirates,.flag-ae,.flag-are{background-image:url("img/gif/ae.gif")}.flag-afghanistan,.flag-af,.flag-afg{background-image:url("img/gif/af.gif")}.flag-antigua-and-barbuda,.flag-ag,.flag-atg{background-image:url("img/gif/ag.gif")}.flag-anguilla,.flag-ai,.flag-aia{background-image:url("img/gif/ai.gif")}.flag-albania,.flag-al,.flag-alb{background-image:url("img/gif/al.gif")}.flag-armenia,.flag-am,.flag-arm{background-image:url("img/gif/am.gif")}.flag-angola,.flag-ao,.flag-ago{background-image:url("img/gif/ao.gif")}.flag-antarctica,.flag-aq,.flag-ata{background-image:url("img/gif/aq.gif")}.flag-argentina,.flag-ar,.flag-arg{background-image:url("img/gif/ar.gif")}.flag-american-samoa,.flag-as,.flag-asm{background-image:url("img/gif/as.gif")}.flag-austria,.flag-at,.flag-aut{background-image:url("img/gif/at.gif")}.flag-australia,.flag-au,.flag-aus{background-image:url("img/gif/au.gif")}.flag-aruba,.flag-aw,.flag-abw{background-image:url("img/gif/aw.gif")}.flag-aland-islands,.flag-ax,.flag-ala{background-image:url("img/gif/ax.gif")}.flag-azerbaijan,.flag-az,.flag-aze{background-image:url("img/gif/az.gif")}.flag-bosnia-and-herzegovina,.flag-ba,.flag-bih{background-image:url("img/gif/ba.gif")}.flag-barbados,.flag-bb,.flag-brb{background-image:url("img/gif/bb.gif")}.flag-bangladesh,.flag-bd,.flag-bgd{background-image:url("img/gif/bd.gif")}.flag-belgium,.flag-be,.flag-bel{background-image:url("img/gif/be.gif")}.flag-burkina-faso,.flag-bf,.flag-bfa{background-image:url("img/gif/bf.gif")}.flag-bulgaria,.flag-bg,.flag-bgr{background-image:url("img/gif/bg.gif")}.flag-bahrain,.flag-bh,.flag-bhr{background-image:url("img/gif/bh.gif")}.flag-burundi,.flag-bi,.flag-bdi{background-image:url("img/gif/bi.gif")}.flag-benin,.flag-bj,.flag-ben{background-image:url("img/gif/bj.gif")}.flag-saint-barthelemy,.flag-bl,.flag-blm{background-image:url("img/gif/bl.gif")}.flag-bermuda,.flag-bm,.flag-bmu{background-image:url("img/gif/bm.gif")}.flag-brunei-darussalam,.flag-brunei,.flag-bn,.flag-brn{background-image:url("img/gif/bn.gif")}.flag-bolivia,.flag-plurinational-state-of-bolivia,.flag-bo,.flag-bol{background-image:url("img/gif/bo.gif")}.flag-bonaire-sint-eustatius-and-saba,.flag-bq,.flag-bes{background-image:url("img/gif/bq.gif")}.flag-brazil,.flag-br,.flag-bra{background-image:url("img/gif/br.gif")}.flag-bahamas,.flag-bs,.flag-bhs{background-image:url("img/gif/bs.gif")}.flag-bhutan,.flag-bt,.flag-btn{background-image:url("img/gif/bt.gif")}.flag-bouvet-island,.flag-bv,.flag-bvt{background-image:url("img/gif/bv.gif")}.flag-botswana,.flag-bw,.flag-bwa{background-image:url("img/gif/bw.gif")}.flag-belarus,.flag-by,.flag-blr{background-image:url("img/gif/by.gif")}.flag-beliza,.flag-bz,.flag-blz{background-image:url("img/gif/bz.gif")}.flag-canada,.flag-ca,.flag-can{background-image:url("img/gif/ca.gif")}.flag-cocos-islands,.flag-cc,.flag-cck{background-image:url("img/gif/cc.gif")}.flag-democratic-republic-of-the-congo,.flag-cd,.flag-cod{background-image:url("img/gif/cd.gif")}.flag-central-african-republic,.flag-cf,.flag-caf{background-image:url("img/gif/cf.gif")}.flag-congo,.flag-cg,.flag-cog{background-image:url("img/gif/cg.gif")}.flag-switzerland,.flag-ch,.flag-che{width:11px background-image:url("img/gif/ch.gif")}.flag-cote-divoire,.flag-ci,.flag-civ{background-image:url("img/gif/ci.gif")}.flag-cook-islands,.flag-ck,.flag-cok{background-image:url("img/gif/ck.gif")}.flag-chile,.flag-cl,.flag-chl{background-image:url("img/gif/cl.gif")}.flag-cameroon,.flag-cm,.flag-cmr{background-image:url("img/gif/cm.gif")}.flag-china,.flag-cn,.flag-chn{background-image:url("img/gif/cn.gif")}.flag-colombia,.flag-co,.flag-col{background-image:url("img/gif/co.gif")}.flag-costa-rica,.flag-cr,.flag-cri{background-image:url("img/gif/cr.gif")}.flag-cuba,.flag-cu,.flag-cub{background-image:url("img/gif/cu.gif")}.flag-cape-verde,.flag-cv,.flag-cpv{background-image:url("img/gif/cv.gif")}.flag-curacao,.flag-cw,.flag-cuw{background-image:url("img/gif/cw.gif")}.flag-christmas-island,.flag-cx,.falg-cxr{background-image:url("img/gif/cx.gif")}.flag-cyprus,.flag-cy,.flag-cyp{background-image:url("img/gif/cy.gif")}.flag-czech-republic,.flag-cz,.flag-cze{background-image:url("img/gif/cz.gif")}.flag-germany,.flag-de,.flag-deu{background-image:url("img/gif/de.gif")}.flag-djibouti,.flag-dj,.flag-dji{background-image:url("img/gif/dj.gif")}.flag-denmark,.flag-dk,.flag-dnk{background-image:url("img/gif/dk.gif")}.flag-dominica,.flag-dm,.flag-dma{background-image:url("img/gif/dm.gif")}.flag-dominican-republic,.flag-do,.flag-dom{background-image:url("img/gif/do.gif")}.flag-algeria,.flag-dz,.flag-dza{background-image:url("img/gif/dz.gif")}.flag-ecuador,.flag-ec,.flag-ecu{background-image:url("img/gif/ec.gif")}.flag-estonia,.flag-ee,.flag-est{background-image:url("img/gif/ee.gif")}.flag-egypt,.flag-eg,.flag-egy{background-image:url("img/gif/eg.gif")}.flag-western-sahara,.flag-eh,.flag-esh{background-image:url("img/gif/eh.gif")}.flag-eritrea,.flag-er,.flag-eri{background-image:url("img/gif/er.gif")}.flag-spain,.flag-es,.flag-esp{background-image:url("img/gif/es.gif")}.flag-ethiopia,.flag-et,.flag-eth{background-image:url("img/gif/et.gif")}.flag-finland,.flag-fi,.flag-fin{background-image:url("img/gif/fi.gif")}.flag-fiji,.flag-fj,.flag-fji{background-image:url("img/gif/fj.gif")}.flag-falkland-islands,.flag-fk,.flag-flk{background-image:url("img/gif/fk.gif")}.flag-federated-states-of-micronesia,.flag-fm,.flag-fsm{background-image:url("img/gif/fm.gif")}.flag-faroe-islands,.flag-fo,.flag-fro{background-image:url("img/gif/fo.gif")}.flag-france,.flag-fr,.flag-fra{background-image:url("img/gif/fr.gif")}.flag-gabon,.flag-ga,.flag-gab{background-image:url("img/gif/ga.gif")}.flag-united-kingdom,.flag-great-britain,.flag-united-kingdom-of-great-britain-and-northern-ireland,.flag-gb,.flag-uk,.flag-gbr{background-image:url("img/gif/gb.gif")}.flag-grenada,.flag-gd,.flag-grd{background-image:url("img/gif/gd.gif")}.flag-georgia,.flag-ge,.flag-geo{background-image:url("img/gif/ge.gif")}.flag-french-guiana,.flag-gf,.flag-guf{background-image:url("img/gif/gf.gif")}.flag-guernsey,.flag-gg,.flag-ggy{background-image:url("img/gif/gg.gif")}.flag-ghana,.flag-gh,.flag-gha{background-image:url("img/gif/gh.gif")}.flag-gibraltar,.flag-gi,.flag-gib{background-image:url("img/gif/gi.gif")}.flag-greenland,.flag-gl,.flag-grl{background-image:url("img/gif/gl.gif")}.flag-gambia,.flag-gm,.flag-gmb{background-image:url("img/gif/gm.gif")}.flag-guinea,.flag-gn,.flag-gin{background-image:url("img/gif/gn.gif")}.flag-guadeloupe,.flag-gp,.flag-glp{background-image:url("img/gif/gp.gif")}.flag-equatorial-guinea,.flag-gq,.flag-gnq{background-image:url("img/gif/gq.gif")}.flag-greece,.flag-gr,.flag-grc{background-image:url("img/gif/gr.gif")}.flag-south-georgia-and-the-south-sandwich-islands,.flag-gs,.flag-sgs{background-image:url("img/gif/gs.gif")}.flag-guatemala,.flag-gt,.flag-gtm{background-image:url("img/gif/gt.gif")}.flag-guam,.flag-gu,.flag-gum{background-image:url("img/gif/gu.gif")}.flag-guinea-bissau,.flag-gw,.flag-gnb{background-image:url("img/gif/gw.gif")}.flag-guyana,.flag-gy,.flag-guy{background-image:url("img/gif/gy.gif")}.flag-hong-kong,.flag-hk,.flag-hkg{background-image:url("img/gif/hk.gif")}.flag-heard-island-and-mcdonald-islands,.flag-hm,.flag-hmd{background-image:url("img/gif/hm.gif")}.flag-honduras,.flag-hn,.flag-hnd{background-image:url("img/gif/hn.gif")}.flag-croatia,.flag-hr,.flag-hrv{background-image:url("img/gif/hr.gif")}.flag-haiti,.flag-ht,.flag-hti{background-image:url("img/gif/ht.gif")}.flag-hungary,.flag-hu,.flag-hun{background-image:url("img/gif/hu.gif")}.flag-indonesia,.flag-id,.flag-idn{background-image:url("img/gif/id.gif")}.flag-ireland,.flag-ie,.flag-irl{background-image:url("img/gif/ie.gif")}.flag-israel,.flag-il,.flag-isr{background-image:url("img/gif/il.gif")}.flag-isle-of-man,.flag-im,.flag-imn{background-image:url("img/gif/im.gif")}.flag-india,.flag-in,.flag-ind{background-image:url("img/gif/in.gif")}.flag-british-indian-ocean-territory,.flag-io,.flag-iot{background-image:url("img/gif/io.gif")}.flag-iraq,.flag-iq,.flag-irq{background-image:url("img/gif/iq.gif")}.flag-islamic-republic-of-iran,.flag-iran,.flag-ir,.flag-irn{background-image:url("img/gif/ir.gif")}.flag-iceland,.flag-is,.flag-isl{background-image:url("img/gif/is.gif")}.flag-italy,.flag-it,.flag-ita{background-image:url("img/gif/it.gif")}.flag-jersey,.flag-je,.flag-jey{background-image:url("img/gif/je.gif")}.flag-jamaica,.flag-jm,.flag-jam{background-image:url("img/gif/jm.gif")}.flag-jordan,.flag-jo,.flag-jor{background-image:url("img/gif/jo.gif")}.flag-japan,.flag-jp,.flag-jpn{background-image:url("img/gif/jp.gif")}.flag-kenya,.flag-ke,.flag-ken{background-image:url("img/gif/ke.gif")}.flag-kyrgyzstan,.flag-kg,.flag-kgz{background-image:url("img/gif/kg.gif")}.flag-cambodia,.flag-kh,.flag-khm{background-image:url("img/gif/kh.gif")}.flag-kiribati,.flag-ki,.flag-kir{background-image:url("img/gif/ki.gif")}.flag-comoros,.flag-km,.flag-com{background-image:url("img/gif/km.gif")}.flag-saint-kitts-and-nevis,.flag-kn,.flag-kna{background-image:url("img/gif/kn.gif")}.flag-democratic-peoples-republic-of-korea,.flag-north-korea,.flag-kp,.flag-pbk{background-image:url("img/gif/kp.gif")}.flag-republic-of-korea,.flag-south-korea,.flag-kr,.flag-kor{background-image:url("img/gif/kr.gif")}.flag-kuwait,.flag-kw,.flag-kwt{background-image:url("img/gif/kw.gif")}.flag-cayman-islands,.flag-ky,.flag-cym{background-image:url("img/gif/ky.gif")}.flag-kazakhstan,.flag-kz,.flag-kaz{background-image:url("img/gif/kz.gif")}.flag-lao-peoples-democratic-republic,.flag-laos,.flag-la,.flag-lao{background-image:url("img/gif/la.gif")}.flag-lebanon,.flag-lb,.flag-lbn{background-image:url("img/gif/lb.gif")}.flag-saint-lucia,.flag-lc,.flag-lca{background-image:url("img/gif/lb.gif")}.flag-liechtenstein,.flag-li,.flag-lie{background-image:url("img/gif/li.gif")}.flag-sri-lanka,.flag-lk,.flag-lka{background-image:url("img/gif/lk.gif")}.flag-liberia,.flag-lr,.flag-lbr{background-image:url("img/gif/lr.gif")}.flag-lesotho,.flag-ls,.flag-lso{background-image:url("img/gif/ls.gif")}.flag-lithuania,.flag-lt,.flag-ltu{background-image:url("img/gif/lt.gif")}.flag-luxembourg,.flag-lu,.flag-lux{background-image:url("img/gif/lu.gif")}.flag-latvia,.flag-lv,.flag-lva{background-image:url("img/gif/lu.gif")}.flag-libya,.flag-ly,.flag-lby{background-image:url("img/gif/ly.gif")}.flag-morocco,.flag-ma,.flag-mar{background-image:url("img/gif/ma.gif")}.flag-monaco,.flag-mc,.flag-mco{background-image:url("img/gif/mc.gif")}.flag-republic-of-moldova,.flag-moldova,.flag-md,.flag-mda{background-image:url("img/gif/md.gif")}.flag-montenegro,.flag-me,.flag-mne{background-image:url("img/gif/me.gif");height:12px}.flag-saint-martin,.flag-mf,.flag-maf{background-image:url("img/gif/mf.gif")}.flag-madagascar,.flag-mg,.flag-mdg{background-image:url("img/gif/mg.gif")}.flag-marshall-islands,.flag-mh,.flag-mhl{background-image:url("img/gif/mh.gif")}.flag-macedonia,.flag-former-yugoslav-republic-of-macedonia,.flag-republic-of-macedonia,.flag-mk,.flag-mkd{background-image:url("img/gif/mk.gif")}.flag-mali,.flag-ml,.flag-mli{background-image:url("img/gif/ml.gif")}.flag-myanmar,.flag-mm,.flag-mmr{background-image:url("img/gif/mm.gif")}.flag-mongolia,.flag-mn,.flag-mng{background-image:url("img/gif/mn.gif")}.flag-macao,.flag-mo,.flag-mac{background-image:url("img/gif/mo.gif")}.flag-northern-mariana-islands,.flag-mp,.flag-mnp{background-image:url("img/gif/mp.gif")}.flag-martinique,.flag-mq,.flag-mtq{background-image:url("img/gif/mq.gif")}.flag-mauritania,.flag-mr,.flag-mrt{background-image:url("img/gif/mr.gif")}.flag-montserrat,.flag-ms,.flag-msr{background-image:url("img/gif/ms.gif")}.flag-malta,.flag-mt,.flag-mlt{background-image:url("img/gif/mt.gif")}.flag-mauritius,.flag-mu,.flag-mus{background-image:url("img/gif/mu.gif")}.flag-maldives,.flag-mv,.flag-mdv{background-image:url("img/gif/mv.gif")}.flag-malawi,.flag-mw,.flag-mwi{background-image:url("img/gif/mw.gif")}.flag-mexico,.flag-mx,.flag-mex{background-image:url("img/gif/mx.gif")}.flag-malaysia,.flag-my,.flag-mys{background-image:url("img/gif/my.gif")}.flag-mozambique,.flag-mz,.flag-mz{background-image:url("img/gif/mz.gif")}.flag-namibia,.flag-na,.flag-nam{background-image:url("img/gif/na.gif")}.flag-new-caledonia,.flag-nc,.flag-ncl{background-image:url("img/gif/nc.gif")}.flag-niger,.flag-ne,.flag-ner{background-image:url("img/gif/ne.gif")}.flag-norfolk-island,.flag-nf,.flag-nfk{background-image:url("img/gif/nf.gif")}.flag-nigeria,.flag-ng,.flag-nga{background-image:url("img/gif/ng.gif")}.flag-nicaragua,.flag-ni,.flag-nic{background-image:url("img/gif/ni.gif")}.flag-netherlands,.flag-nl,.flag-nld{background-image:url("img/gif/nl.gif")}.flag-norway,.flag-no,.flag-nor{background-image:url("img/gif/no.gif")}.flag-nepal,.flag-np,.flag-npl{background-image:url("img/gif/np.gif");width:9px}.flag-nauru,.flag-nr,.flag-nru{background-image:url("img/gif/nr.gif")}.flag-niue,.flag-nu,.flag-niu{background-image:url("img/gif/nu.gif")}.flag-new-zealand,.flag-nz,.flag-nzl{background-image:url("img/gif/nz.gif")}.flag-oman,.flag-om,.flag-omn{background-image:url("img/gif/om.gif")}.flag-panama,.flag-pa,.flag-pan{background-image:url("img/gif/pa.gif")}.flag-peru,.flag-pe,.flag-per{background-image:url("img/gif/pe.gif")}.flag-french-polynesia,.flag-pf,.flag-pyf{background-image:url("img/gif/pf.gif")}.flag-papua-new-guinea,.flag-pg,.flag-gif{background-image:url("img/gif/pg.gif")}.flag-philippines,.flag-ph,.flag-phl{background-image:url("img/gif/ph.gif")}.flag-pakistan,.flag-pk,.flag-pak{background-image:url("img/gif/pk.gif")}.flag-poland,.flag-pl,.flag-pol{background-image:url("img/gif/pl.gif")}.flag-saint-pierre-and-miquelong,.flag-pm,.flag-spm{background-image:url("img/gif/pm.gif")}.flag-pitcairn,.flag-pn,.flag-pcn{background-image:url("img/gif/pn.gif")}.flag-puerto-rico,.flag-pr,.flag-pri{background-image:url("img/gif/pr.gif")}.flag-state-of-palestine,.flag-ps,.flag-pse{background-image:url("img/gif/ps.gif")}.flag-portugal,.flag-pt,.flag-prt{background-image:url("img/gif/pt.gif")}.flag-palau,.flag-pw,.flag-plw{background-image:url("img/gif/pw.gif")}.flag-paraguay .flag-py,.flag-pry{background-image:url("img/gif/py.gif")}.flag-qatar,.flag-qa,.flag-qat{background-image:url("img/gif/qa.gif")}.flag-reunion,.flag-re,.flag-reu{background-image:url("img/gif/re.gif")}.flag-romania,.flag-ro,.flag-rou{background-image:url("img/gif/ro.gif")}.flag-serbia,.flag-rs,.flag-srb{background-image:url("img/gif/rs.gif")}.flag-russia,.flag-russian-federation,.flag-ru,.flag-rus{background-image:url("img/gif/ru.gif")}.flag-rwanda,.flag-rw,.flag-rwa{background-image:url("img/gif/rw.gif")}.flag-saudia-arabia,.flag-sa,.flag-sau{background-image:url("img/gif/sa.gif")}.flag-solomon-islands,.flag-sb,.flag-slb{background-image:url("img/gif/sb.gif")}.flag-seychelles,.flag-sc,.flag-syc{background-image:url("img/gif/sc.gif")}.flag-sudan,.flag-sd,.flag-sdn{background-image:url("img/gif/sd.gif")}.flag-sweden,.flag-se,.flag-swe{background-image:url("img/gif/se.gif")}.flag-singapore,.flag-sg,.flag-sgp{background-image:url("img/gif/sg.gif")}.flag-ascension-and-tristan-da-cunha-saint-helena,.flag-sh,.flag-shn{background-image:url("img/gif/sh.gif")}.flag-slovenia,.flag-si .flag-svn{background-image:url("img/gif/si.gif")}.flag-svalbard-and-jan-mayen,.flag-sj .flag-sjm{background-image:url("img/gif/sj.gif")}.flag-slovakia,.flag-sk,.flag-svk{background-image:url("img/gif/sk.gif")}.flag-sierra-leone,.flag-sl,.flag-sle{background-image:url("img/gif/sl.gif")}.flag-san-marino,.flag-sm,.flag-smr{background-image:url("img/gif/sm.gif")}.flag-senegal,.flag-sn,.flag-sen{background-image:url("img/gif/sn.gif")}.flag-somalia,.flag-so,.flag-som{background-image:url("img/gif/so.gif")}.flag-suriname,.flag-sr,.flag-sur{background-image:url("img/gif/sr.gif")}.flag-south-sudan,.flag-ss,.flag-ssd{background-image:url("img/gif/ss.gif")}.flag-sao-tome-and-principe,.flag-st,.flag-stp{background-image:url("img/gif/st.gif")}.flag-el-salvador,.flag-sv .flag-slv{background-image:url("img/gif/sv.gif")}.flag-sint-maarten,.flag-sx,.flag-sxm{background-image:url("img/gif/sx.gif")}.flag-syrian-arab-republic,.flag-syria,.flag-sy,.flag-syr{background-image:url("img/gif/sy.gif")}.flag-swaziland,.flag-sz,.flag-swz{background-image:url("img/gif/sz.gif")}.flag-turks-and-caicos-islands,.flag-tc,.flag-tca{background-image:url("img/gif/tc.gif")}.flag-chad,.flag-td,.flag-tcd{background-image:url("img/gif/td.gif")}.flag-french-southern-territories,.flag-tf,.flag-atf{background-image:url("img/gif/tf.gif")}.flag-togo,.flag-tg,.flag-tgo{background-image:url("img/gif/tg.gif")}.flag-thailand,.flag-th,.flag-tha{background-image:url("img/gif/th.gif")}.flag-tajikistan,.flag-tj,.flag-tjk{background-image:url("img/gif/tj.gif")}.flag-tokelau,.flag-tk,.flag-tkl{background-image:url("img/gif/tk.gif")}.flag-timor-leste,.flag-tl,.flag-tls{background-image:url("img/gif/tl.gif")}.flag-turkmenistan,.flag-tm,.flag-tkm{background-image:url("img/gif/tm.gif")}.flag-tunisia,.flag-tn,.flag-tun{background-image:url("img/gif/tn.gif")}.flag-tonga,.flag-to,.flag-ton{background-image:url("img/gif/to.gif")}.flag-turkey,.flag-tr,.flag-tur{background-image:url("img/gif/tr.gif")}.flag-trinidad-and-tobago,.flag-tt,.flag-tto{background-image:url("img/gif/tt.gif")}.flag-tuvalu,.flag-tv,.flag-tuv{background-image:url("img/gif/tv.gif")}.flag-taiwan,.flag-taiwan-province-of-china,.flag-tw,.flag-twn{background-image:url("img/gif/tw.gif")}.flag-tanzania,.flag-united-republic-of-tanzania,.flag-tz,.flag-tza{background-image:url("img/gif/tz.gif")}.flag-ukraine,.flag-ua,.flag-ukr{background-image:url("img/gif/ua.gif")}.flag-uganda,.flag-ug,.flag-uga{background-image:url("img/gif/ug.gif")}.flag-united-states-minor-outlying-islands,.flag-um,.flag-umi{background-image:url("img/gif/um.gif")}.flag-united-states,.flag-united-states-of-america,.flag-us,.flag-usa{background-image:url("img/gif/us.gif")}.flag-uruguay,.flag-uy,.flag-ury{background-image:url("img/gif/uy.gif")}.flag-uzbekistan,.flag-uz,.flag-uzb{background-image:url("img/gif/uz.gif")}.flag-holy-see,.flag-vatican,.flag-holy-see-vatican-city-state,.flag-vatican-city-state,.flag-va,.flag-vat{background-image:url("img/gif/va.gif")}.flag-saint-vincent-and-the-grenadines,.flag-vc,.flag-vct{background-image:url("img/gif/vc.gif")}.flag-venezuela,.flag-bolivarian-republic-of-venezuela,.flag-ve,.flag-ven{background-image:url("img/gif/ve.gif")}.flag-biritsh-virgin-islands,.flag-vg,.flag-vgb{background-image:url("img/gif/vg.gif")}.flag-us-virgin-islands,.flag-vi,.flag-vir{background-image:url("img/gif/vi.gif")}.flag-vietnam,.flag-viet-nam,.flag-vn,.flag-vnm{background-image:url("img/gif/vn.gif")}.flag-vanuatu,.flag-vu,.flag-vut{background-image:url("img/gif/vu.gif")}.flag-wallis-and-futuna,.flag-wf,.flag-wlf{background-image:url("img/gif/wf.gif")}.flag-samoa,.flag-ws,.flag-wsm{background-image:url("img/gif/ws.gif")}.flag-yemem,.flag-ye,.flag-yem{background-image:url("img/gif/ye.gif")}.flag-mayotte,.flag-yt,.flag-myt{background-image:url("img/gif/yt.gif")}.flag-south-africa,.flag-za,.flag-zaf{background-image:url("img/gif/za.gif")}.flag-zambia,.flag-zm,.flag-zmb{background-image:url("img/gif/zm.gif")}.flag-zimbabwe,.flag-zw,.flag-zwe{background-image:url("img/gif/zw.gif")}.flag-catalonia,.flat-cat{background-image:url("img/gif/catalonia.gif")}.flag-england .flag-en{background-image:url("img/gif/england.gif")}.flag-european-union,.flag-eu,.flag-europe{background-image:url("img/gif/europeanunion.gif")}.flag-scotland{background-image:url("img/gif/scotland.gif")}.flag-wales{background-image:url("img/gif/wales.gif")} diff --git a/ennstatus/static/css/flags/flags.png.css b/ennstatus/static/css/flags/flags.png.css --- a/ennstatus/static/css/flags/flags.png.css +++ b/ennstatus/static/css/flags/flags.png.css @@ -1,3 +1,20 @@ +/* Ënnstatus + Copyright (C) 2015 Dennis Fink + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public License + along with this program. If not, see . +*/ + [class^="flag-"], [class*=" flag-"] { display: inline-block; diff --git a/ennstatus/static/css/flags/flags.png.min.css b/ennstatus/static/css/flags/flags.png.min.css --- a/ennstatus/static/css/flags/flags.png.min.css +++ b/ennstatus/static/css/flags/flags.png.min.css @@ -1,1 +1,18 @@ +/* Ënnstatus + Copyright (C) 2015 Dennis Fink + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public License + along with this program. If not, see . +*/ + [class^="flag-"],[class*=" flag-"]{display:inline-block;width:16px;height:11px;margin-top:1px;*margin-right:.3em;line-height:16px;vertical-align:baseline;background-repeat:no-repeat}.flag-andorra,.flag-ad,.flag-and{background-image:url("img/png/ad.png")}.flag-united-arab-emirates,.flag-ae,.flag-are{background-image:url("img/png/ae.png")}.flag-afghanistan,.flag-af,.flag-afg{background-image:url("img/png/af.png")}.flag-antigua-and-barbuda,.flag-ag,.flag-atg{background-image:url("img/png/ag.png")}.flag-anguilla,.flag-ai,.flag-aia{background-image:url("img/png/ai.png")}.flag-albania,.flag-al,.flag-alb{background-image:url("img/png/al.png")}.flag-armenia,.flag-am,.flag-arm{background-image:url("img/png/am.png")}.flag-angola,.flag-ao,.flag-ago{background-image:url("img/png/ao.png")}.flag-antarctica,.flag-aq,.flag-ata{background-image:url("img/png/aq.png")}.flag-argentina,.flag-ar,.flag-arg{background-image:url("img/png/ar.png")}.flag-american-samoa,.flag-as,.flag-asm{background-image:url("img/png/as.png")}.flag-austria,.flag-at,.flag-aut{background-image:url("img/png/at.png")}.flag-australia,.flag-au,.flag-aus{background-image:url("img/png/au.png")}.flag-aruba,.flag-aw,.flag-abw{background-image:url("img/png/aw.png")}.flag-aland-islands,.flag-ax,.flag-ala{background-image:url("img/png/ax.png")}.flag-azerbaijan,.flag-az,.flag-aze{background-image:url("img/png/az.png")}.flag-bosnia-and-herzegovina,.flag-ba,.flag-bih{background-image:url("img/png/ba.png")}.flag-barbados,.flag-bb,.flag-brb{background-image:url("img/png/bb.png")}.flag-bangladesh,.flag-bd,.flag-bgd{background-image:url("img/png/bd.png")}.flag-belgium,.flag-be,.flag-bel{background-image:url("img/png/be.png")}.flag-burkina-faso,.flag-bf,.flag-bfa{background-image:url("img/png/bf.png")}.flag-bulgaria,.flag-bg,.flag-bgr{background-image:url("img/png/bg.png")}.flag-bahrain,.flag-bh,.flag-bhr{background-image:url("img/png/bh.png")}.flag-burundi,.flag-bi,.flag-bdi{background-image:url("img/png/bi.png")}.flag-benin,.flag-bj,.flag-ben{background-image:url("img/png/bj.png")}.flag-saint-barthelemy,.flag-bl,.flag-blm{background-image:url("img/png/bl.png")}.flag-bermuda,.flag-bm,.flag-bmu{background-image:url("img/png/bm.png")}.flag-brunei-darussalam,.flag-brunei,.flag-bn,.flag-brn{background-image:url("img/png/bn.png")}.flag-bolivia,.flag-plurinational-state-of-bolivia,.flag-bo,.flag-bol{background-image:url("img/png/bo.png")}.flag-bonaire-sint-eustatius-and-saba,.flag-bq,.flag-bes{background-image:url("img/png/bq.png")}.flag-brazil,.flag-br,.flag-bra{background-image:url("img/png/br.png")}.flag-bahamas,.flag-bs,.flag-bhs{background-image:url("img/png/bs.png")}.flag-bhutan,.flag-bt,.flag-btn{background-image:url("img/png/bt.png")}.flag-bouvet-island,.flag-bv,.flag-bvt{background-image:url("img/png/bv.png")}.flag-botswana,.flag-bw,.flag-bwa{background-image:url("img/png/bw.png")}.flag-belarus,.flag-by,.flag-blr{background-image:url("img/png/by.png")}.flag-beliza,.flag-bz,.flag-blz{background-image:url("img/png/bz.png")}.flag-canada,.flag-ca,.flag-can{background-image:url("img/png/ca.png")}.flag-cocos-islands,.flag-cc,.flag-cck{background-image:url("img/png/cc.png")}.flag-democratic-republic-of-the-congo,.flag-cd,.flag-cod{background-image:url("img/png/cd.png")}.flag-central-african-republic,.flag-cf,.flag-caf{background-image:url("img/png/cf.png")}.flag-congo,.flag-cg,.flag-cog{background-image:url("img/png/cg.png")}.flag-switzerland,.flag-ch,.flag-che{width:11px;background-image:url("img/png/ch.png")}.flag-cote-divoire,.flag-ci,.flag-civ{background-image:url("img/png/ci.png")}.flag-cook-islands,.flag-ck,.flag-cok{background-image:url("img/png/ck.png")}.flag-chile,.flag-cl,.flag-chl{background-image:url("img/png/cl.png")}.flag-cameroon,.flag-cm,.flag-cmr{background-image:url("img/png/cm.png")}.flag-china,.flag-cn,.flag-chn{background-image:url("img/png/cn.png")}.flag-colombia,.flag-co,.flag-col{background-image:url("img/png/co.png")}.flag-costa-rica,.flag-cr,.flag-cri{background-image:url("img/png/cr.png")}.flag-cuba,.flag-cu,.flag-cub{background-image:url("img/png/cu.png")}.flag-cape-verde,.flag-cv,.flag-cpv{background-image:url("img/png/cv.png")}.flag-curacao,.flag-cw,.flag-cuw{background-image:url("img/png/cw.png")}.flag-christmas-island,.flag-cx,.falg-cxr{background-image:url("img/png/cx.png")}.flag-cyprus,.flag-cy,.flag-cyp{background-image:url("img/png/cy.png")}.flag-czech-republic,.flag-cz,.flag-cze{background-image:url("img/png/cz.png")}.flag-germany,.flag-de,.flag-deu{background-image:url("img/png/de.png")}.flag-djibouti,.flag-dj,.flag-dji{background-image:url("img/png/dj.png")}.flag-denmark,.flag-dk,.flag-dnk{background-image:url("img/png/dk.png")}.flag-dominica,.flag-dm,.flag-dma{background-image:url("img/png/dm.png")}.flag-dominican-republic,.flag-do,.flag-dom{background-image:url("img/png/do.png")}.flag-algeria,.flag-dz,.flag-dza{background-image:url("img/png/dz.png")}.flag-ecuador,.flag-ec,.flag-ecu{background-image:url("img/png/ec.png")}.flag-estonia,.flag-ee,.flag-est{background-image:url("img/png/ee.png")}.flag-egypt,.flag-eg,.flag-egy{background-image:url("img/png/eg.png")}.flag-western-sahara,.flag-eh,.flag-esh{background-image:url("img/png/eh.png")}.flag-eritrea,.flag-er,.flag-eri{background-image:url("img/png/er.png")}.flag-spain,.flag-es,.flag-esp{background-image:url("img/png/es.png")}.flag-ethiopia,.flag-et,.flag-eth{background-image:url("img/png/et.png")}.flag-finland,.flag-fi,.flag-fin{background-image:url("img/png/fi.png")}.flag-fiji,.flag-fj,.flag-fji{background-image:url("img/png/fj.png")}.flag-falkland-islands,.flag-fk,.flag-flk{background-image:url("img/png/fk.png")}.flag-federated-states-of-micronesia,.flag-fm,.flag-fsm{background-image:url("img/png/fm.png")}.flag-faroe-islands,.flag-fo,.flag-fro{background-image:url("img/png/fo.png")}.flag-france,.flag-fr,.flag-fra{background-image:url("img/png/fr.png")}.flag-gabon,.flag-ga,.flag-gab{background-image:url("img/png/ga.png")}.flag-united-kingdom,.flag-great-britain,.flag-united-kingdom-of-great-britain-and-northern-ireland,.flag-gb,.flag-uk,.flag-gbr{background-image:url("img/png/gb.png")}.flag-grenada,.flag-gd,.flag-grd{background-image:url("img/png/gd.png")}.flag-georgia,.flag-ge,.flag-geo{background-image:url("img/png/ge.png")}.flag-french-guiana,.flag-gf,.flag-guf{background-image:url("img/png/gf.png")}.flag-guernsey,.flag-gg,.flag-ggy{background-image:url("img/png/gg.png")}.flag-ghana,.flag-gh,.flag-gha{background-image:url("img/png/gh.png")}.flag-gibraltar,.flag-gi,.flag-gib{background-image:url("img/png/gi.png")}.flag-greenland,.flag-gl,.flag-grl{background-image:url("img/png/gl.png")}.flag-gambia,.flag-gm,.flag-gmb{background-image:url("img/png/gm.png")}.flag-guinea,.flag-gn,.flag-gin{background-image:url("img/png/gn.png")}.flag-guadeloupe,.flag-gp,.flag-glp{background-image:url("img/png/gp.png")}.flag-equatorial-guinea,.flag-gq,.flag-gnq{background-image:url("img/png/gq.png")}.flag-greece,.flag-gr,.flag-grc{background-image:url("img/png/gr.png")}.flag-south-georgia-and-the-south-sandwich-islands,.flag-gs,.flag-sgs{background-image:url("img/png/gs.png")}.flag-guatemala,.flag-gt,.flag-gtm{background-image:url("img/png/gt.png")}.flag-guam,.flag-gu,.flag-gum{background-image:url("img/png/gu.png")}.flag-guinea-bissau,.flag-gw,.flag-gnb{background-image:url("img/png/gw.png")}.flag-guyana,.flag-gy,.flag-guy{background-image:url("img/png/gy.png")}.flag-hong-kong,.flag-hk,.flag-hkg{background-image:url("img/png/hk.png")}.flag-heard-island-and-mcdonald-islands,.flag-hm,.flag-hmd{background-image:url("img/png/hm.png")}.flag-honduras,.flag-hn,.flag-hnd{background-image:url("img/png/hn.png")}.flag-croatia,.flag-hr,.flag-hrv{background-image:url("img/png/hr.png")}.flag-haiti,.flag-ht,.flag-hti{background-image:url("img/png/ht.png")}.flag-hungary,.flag-hu,.flag-hun{background-image:url("img/png/hu.png")}.flag-indonesia,.flag-id,.flag-idn{background-image:url("img/png/id.png")}.flag-ireland,.flag-ie,.flag-irl{background-image:url("img/png/ie.png")}.flag-israel,.flag-il,.flag-isr{background-image:url("img/png/il.png")}.flag-isle-of-man,.flag-im,.flag-imn{background-image:url("img/png/im.png")}.flag-india,.flag-in,.flag-ind{background-image:url("img/png/in.png")}.flag-british-indian-ocean-territory,.flag-io,.flag-iot{background-image:url("img/png/io.png")}.flag-iraq,.flag-iq,.flag-irq{background-image:url("img/png/iq.png")}.flag-islamic-republic-of-iran,.flag-iran,.flag-ir,.flag-irn{background-image:url("img/png/ir.png")}.flag-iceland,.flag-is,.flag-isl{background-image:url("img/png/is.png")}.flag-italy,.flag-it,.flag-ita{background-image:url("img/png/it.png")}.flag-jersey,.flag-je,.flag-jey{background-image:url("img/png/je.png")}.flag-jamaica,.flag-jm,.flag-jam{background-image:url("img/png/jm.png")}.flag-jordan,.flag-jo,.flag-jor{background-image:url("img/png/jo.png")}.flag-japan,.flag-jp,.flag-jpn{background-image:url("img/png/jp.png")}.flag-kenya,.flag-ke,.flag-ken{background-image:url("img/png/ke.png")}.flag-kyrgyzstan,.flag-kg,.flag-kgz{background-image:url("img/png/kg.png")}.flag-cambodia,.flag-kh,.flag-khm{background-image:url("img/png/kh.png")}.flag-kiribati,.flag-ki,.flag-kir{background-image:url("img/png/ki.png")}.flag-comoros,.flag-km,.flag-com{background-image:url("img/png/km.png")}.flag-saint-kitts-and-nevis,.flag-kn,.flag-kna{background-image:url("img/png/kn.png")}.flag-democratic-peoples-republic-of-korea,.flag-north-korea,.flag-kp,.flag-pbk{background-image:url("img/png/kp.png")}.flag-republic-of-korea,.flag-south-korea,.flag-kr,.flag-kor{background-image:url("img/png/kr.png")}.flag-kuwait,.flag-kw,.flag-kwt{background-image:url("img/png/kw.png")}.flag-cayman-islands,.flag-ky,.flag-cym{background-image:url("img/png/ky.png")}.flag-kazakhstan,.flag-kz,.flag-kaz{background-image:url("img/png/kz.png")}.flag-lao-peoples-democratic-republic,.flag-laos,.flag-la,.flag-lao{background-image:url("img/png/la.png")}.flag-lebanon,.flag-lb,.flag-lbn{background-image:url("img/png/lb.png")}.flag-saint-lucia,.flag-lc,.flag-lca{background-image:url("img/png/lb.png")}.flag-liechtenstein,.flag-li,.flag-lie{background-image:url("img/png/li.png")}.flag-sri-lanka,.flag-lk,.flag-lka{background-image:url("img/png/lk.png")}.flag-liberia,.flag-lr,.flag-lbr{background-image:url("img/png/lr.png")}.flag-lesotho,.flag-ls,.flag-lso{background-image:url("img/png/ls.png")}.flag-lithuania,.flag-lt,.flag-ltu{background-image:url("img/png/lt.png")}.flag-luxembourg,.flag-lu,.flag-lux{background-image:url("img/png/lu.png")}.flag-latvia,.flag-lv,.flag-lva{background-image:url("img/png/lu.png")}.flag-libya,.flag-ly,.flag-lby{background-image:url("img/png/ly.png")}.flag-morocco,.flag-ma,.flag-mar{background-image:url("img/png/ma.png")}.flag-monaco,.flag-mc,.flag-mco{background-image:url("img/png/mc.png")}.flag-republic-of-moldova,.flag-moldova,.flag-md,.flag-mda{background-image:url("img/png/md.png")}.flag-montenegro,.flag-me,.flag-mne{background-image:url("img/png/me.png");height:12px}.flag-saint-martin,.flag-mf,.flag-maf{background-image:url("img/png/mf.png")}.flag-madagascar,.flag-mg,.flag-mdg{background-image:url("img/png/mg.png")}.flag-marshall-islands,.flag-mh,.flag-mhl{background-image:url("img/png/mh.png")}.flag-macedonia,.flag-former-yugoslav-republic-of-macedonia,.flag-republic-of-macedonia,.flag-mk,.flag-mkd{background-image:url("img/png/mk.png")}.flag-mali,.flag-ml,.flag-mli{background-image:url("img/png/ml.png")}.flag-myanmar,.flag-mm,.flag-mmr{background-image:url("img/png/mm.png")}.flag-mongolia,.flag-mn,.flag-mng{background-image:url("img/png/mn.png")}.flag-macao,.flag-mo,.flag-mac{background-image:url("img/png/mo.png")}.flag-northern-mariana-islands,.flag-mp,.flag-mnp{background-image:url("img/png/mp.png")}.flag-martinique,.flag-mq,.flag-mtq{background-image:url("img/png/mq.png")}.flag-mauritania,.flag-mr,.flag-mrt{background-image:url("img/png/mr.png")}.flag-montserrat,.flag-ms,.flag-msr{background-image:url("img/png/ms.png")}.flag-malta,.flag-mt,.flag-mlt{background-image:url("img/png/mt.png")}.flag-mauritius,.flag-mu,.flag-mus{background-image:url("img/png/mu.png")}.flag-maldives,.flag-mv,.flag-mdv{background-image:url("img/png/mv.png")}.flag-malawi,.flag-mw,.flag-mwi{background-image:url("img/png/mw.png")}.flag-mexico,.flag-mx,.flag-mex{background-image:url("img/png/mx.png")}.flag-malaysia,.flag-my,.flag-mys{background-image:url("img/png/my.png")}.flag-mozambique,.flag-mz,.flag-mz{background-image:url("img/png/mz.png")}.flag-namibia,.flag-na,.flag-nam{background-image:url("img/png/na.png")}.flag-new-caledonia,.flag-nc,.flag-ncl{background-image:url("img/png/nc.png")}.flag-niger,.flag-ne,.flag-ner{background-image:url("img/png/ne.png")}.flag-norfolk-island,.flag-nf,.flag-nfk{background-image:url("img/png/nf.png")}.flag-nigeria,.flag-ng,.flag-nga{background-image:url("img/png/ng.png")}.flag-nicaragua,.flag-ni,.flag-nic{background-image:url("img/png/ni.png")}.flag-netherlands,.flag-nl,.flag-nld{background-image:url("img/png/nl.png")}.flag-norway,.flag-no,.flag-nor{background-image:url("img/png/no.png")}.flag-nepal,.flag-np,.flag-npl{background-image:url("img/png/np.png");width:9px}.flag-nauru,.flag-nr,.flag-nru{background-image:url("img/png/nr.png")}.flag-niue,.flag-nu,.flag-niu{background-image:url("img/png/nu.png")}.flag-new-zealand,.flag-nz,.flag-nzl{background-image:url("img/png/nz.png")}.flag-oman,.flag-om,.flag-omn{background-image:url("img/png/om.png")}.flag-panama,.flag-pa,.flag-pan{background-image:url("img/png/pa.png")}.flag-peru,.flag-pe,.flag-per{background-image:url("img/png/pe.png")}.flag-french-polynesia,.flag-pf,.flag-pyf{background-image:url("img/png/pf.png")}.flag-papua-new-guinea,.flag-pg,.flag-png{background-image:url("img/png/pg.png")}.flag-philippines,.flag-ph,.flag-phl{background-image:url("img/png/ph.png")}.flag-pakistan,.flag-pk,.flag-pak{background-image:url("img/png/pk.png")}.flag-poland,.flag-pl,.flag-pol{background-image:url("img/png/pl.png")}.flag-saint-pierre-and-miquelong,.flag-pm,.flag-spm{background-image:url("img/png/pm.png")}.flag-pitcairn,.flag-pn,.flag-pcn{background-image:url("img/png/pn.png")}.flag-puerto-rico,.flag-pr,.flag-pri{background-image:url("img/png/pr.png")}.flag-state-of-palestine,.flag-ps,.flag-pse{background-image:url("img/png/ps.png")}.flag-portugal,.flag-pt,.flag-prt{background-image:url("img/png/pt.png")}.flag-palau,.flag-pw,.flag-plw{background-image:url("img/png/pw.png")}.flag-paraguay .flag-py,.flag-pry{background-image:url("img/png/py.png")}.flag-qatar,.flag-qa,.flag-qat{background-image:url("img/png/qa.png")}.flag-reunion,.flag-re,.flag-reu{background-image:url("img/png/re.png")}.flag-romania,.flag-ro,.flag-rou{background-image:url("img/png/ro.png")}.flag-serbia,.flag-rs,.flag-srb{background-image:url("img/png/rs.png")}.flag-russia,.flag-russian-federation,.flag-ru,.flag-rus{background-image:url("img/png/ru.png")}.flag-rwanda,.flag-rw,.flag-rwa{background-image:url("img/png/rw.png")}.flag-saudia-arabia,.flag-sa,.flag-sau{background-image:url("img/png/sa.png")}.flag-solomon-islands,.flag-sb,.flag-slb{background-image:url("img/png/sb.png")}.flag-seychelles,.flag-sc,.flag-syc{background-image:url("img/png/sc.png")}.flag-sudan,.flag-sd,.flag-sdn{background-image:url("img/png/sd.png")}.flag-sweden,.flag-se,.flag-swe{background-image:url("img/png/se.png")}.flag-singapore,.flag-sg,.flag-sgp{background-image:url("img/png/sg.png")}.flag-ascension-and-tristan-da-cunha-saint-helena,.flag-sh,.flag-shn{background-image:url("img/png/sh.png")}.flag-slovenia,.flag-si .flag-svn{background-image:url("img/png/si.png")}.flag-svalbard-and-jan-mayen,.flag-sj .flag-sjm{background-image:url("img/png/sj.png")}.flag-slovakia,.flag-sk,.flag-svk{background-image:url("img/png/sk.png")}.flag-sierra-leone,.flag-sl,.flag-sle{background-image:url("img/png/sl.png")}.flag-san-marino,.flag-sm,.flag-smr{background-image:url("img/png/sm.png")}.flag-senegal,.flag-sn,.flag-sen{background-image:url("img/png/sn.png")}.flag-somalia,.flag-so,.flag-som{background-image:url("img/png/so.png")}.flag-suriname,.flag-sr,.flag-sur{background-image:url("img/png/sr.png")}.flag-south-sudan,.flag-ss,.flag-ssd{background-image:url("img/png/ss.png")}.flag-sao-tome-and-principe,.flag-st,.flag-stp{background-image:url("img/png/st.png")}.flag-el-salvador,.flag-sv .flag-slv{background-image:url("img/png/sv.png")}.flag-sint-maarten,.flag-sx,.flag-sxm{background-image:url("img/png/sx.png")}.flag-syrian-arab-republic,.flag-syria,.flag-sy,.flag-syr{background-image:url("img/png/sy.png")}.flag-swaziland,.flag-sz,.flag-swz{background-image:url("img/png/sz.png")}.flag-turks-and-caicos-islands,.flag-tc,.flag-tca{background-image:url("img/png/tc.png")}.flag-chad,.flag-td,.flag-tcd{background-image:url("img/png/td.png")}.flag-french-southern-territories,.flag-tf,.flag-atf{background-image:url("img/png/tf.png")}.flag-togo,.flag-tg,.flag-tgo{background-image:url("img/png/tg.png")}.flag-thailand,.flag-th,.flag-tha{background-image:url("img/png/th.png")}.flag-tajikistan,.flag-tj,.flag-tjk{background-image:url("img/png/tj.png")}.flag-tokelau,.flag-tk,.flag-tkl{background-image:url("img/png/tk.png")}.flag-timor-leste,.flag-tl,.flag-tls{background-image:url("img/png/tl.png")}.flag-turkmenistan,.flag-tm,.flag-tkm{background-image:url("img/png/tm.png")}.flag-tunisia,.flag-tn,.flag-tun{background-image:url("img/png/tn.png")}.flag-tonga,.flag-to,.flag-ton{background-image:url("img/png/to.png")}.flag-turkey,.flag-tr,.flag-tur{background-image:url("img/png/tr.png")}.flag-trinidad-and-tobago,.flag-tt,.flag-tto{background-image:url("img/png/tt.png")}.flag-tuvalu,.flag-tv,.flag-tuv{background-image:url("img/png/tv.png")}.flag-taiwan,.flag-taiwan-province-of-china,.flag-tw,.flag-twn{background-image:url("img/png/tw.png")}.flag-tanzania,.flag-united-republic-of-tanzania,.flag-tz,.flag-tza{background-image:url("img/png/tz.png")}.flag-ukraine,.flag-ua,.flag-ukr{background-image:url("img/png/ua.png")}.flag-uganda,.flag-ug,.flag-uga{background-image:url("img/png/ug.png")}.flag-united-states-minor-outlying-islands,.flag-um,.flag-umi{background-image:url("img/png/um.png")}.flag-united-states,.flag-united-states-of-america,.flag-us,.flag-usa{background-image:url("img/png/us.png")}.flag-uruguay,.flag-uy,.flag-ury{background-image:url("img/png/uy.png")}.flag-uzbekistan,.flag-uz,.flag-uzb{background-image:url("img/png/uz.png")}.flag-holy-see,.flag-vatican,.flag-holy-see-vatican-city-state,.flag-vatican-city-state,.flag-va,.flag-vat{background-image:url("img/png/va.png")}.flag-saint-vincent-and-the-grenadines,.flag-vc,.flag-vct{background-image:url("img/png/vc.png")}.flag-venezuela,.flag-bolivarian-republic-of-venezuela,.flag-ve,.flag-ven{background-image:url("img/png/ve.png")}.flag-biritsh-virgin-islands,.flag-vg,.flag-vgb{background-image:url("img/png/vg.png")}.flag-us-virgin-islands,.flag-vi,.flag-vir{background-image:url("img/png/vi.png")}.flag-vietnam,.flag-viet-nam,.flag-vn,.flag-vnm{background-image:url("img/png/vn.png")}.flag-vanuatu,.flag-vu,.flag-vut{background-image:url("img/png/vu.png")}.flag-wallis-and-futuna,.flag-wf,.flag-wlf{background-image:url("img/png/wf.png")}.flag-samoa,.flag-ws,.flag-wsm{background-image:url("img/png/ws.png")}.flag-yemem,.flag-ye,.flag-yem{background-image:url("img/png/ye.png")}.flag-mayotte,.flag-yt,.flag-myt{background-image:url("img/png/yt.png")}.flag-south-africa,.flag-za,.flag-zaf{background-image:url("img/png/za.png")}.flag-zambia,.flag-zm,.flag-zmb{background-image:url("img/png/zm.png")}.flag-zimbabwe,.flag-zw,.flag-zwe{background-image:url("img/png/zw.png")}.flag-catalonia,.flat-cat{background-image:url("img/png/catalonia.png")}.flag-england .flag-en{background-image:url("img/png/england.png")}.flag-european-union,.flag-eu,.flag-europe{background-image:url("img/png/europeanunion.png")}.flag-scotland{background-image:url("img/png/scotland.png")}.flag-wales{background-image:url("img/png/wales.png")} diff --git a/ennstatus/static/css/map.css b/ennstatus/static/css/map.css --- a/ennstatus/static/css/map.css +++ b/ennstatus/static/css/map.css @@ -1,5 +1,33 @@ +/* Ënnstatus + Copyright (C) 2015 Dennis Fink + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public License + along with this program. If not, see . +*/ + .country { stroke: #000; stroke-linejoin: round; stroke-width: 0.1px; } + +.tooltip { + color: #222; + background: #fff; + padding: .5em; + text-shadow: #f5f5f5 0 1px 0; + border-radius: 2px; + box-shadow: 0px 0px 2px 0px #a6a6a6; + opacity: 0.9; + position: absolute; +} diff --git a/ennstatus/static/js/worldmap.js b/ennstatus/static/js/worldmap.js --- a/ennstatus/static/js/worldmap.js +++ b/ennstatus/static/js/worldmap.js @@ -1,3 +1,21 @@ +/* Ënnstatus + Copyright (C) 2015 Dennis Fink + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public License + along with this program. If not, see . +*/ + + d3.select(window).on("resize", throttle); var zoom = d3.behavior.zoom() @@ -17,9 +35,9 @@ setup(width, height); function setup(width, height) { projection = d3.geo.mercator() - .translate([(width / 2), (height / 2)]) - .scale(width / 2 / Math.PI) - + .translate([(width / 2), (height / 2)]) + .scale(width / 2 / Math.PI) + path = d3.geo.path().projection(projection); svg = d3.select("#chart").append("svg") @@ -52,44 +70,60 @@ function draw(topo) { .attr("d", path); var country = g.selectAll(".country").data(topo); - d3.json("/stats/data/worldmap", function(err, data) { + d3.json("/data/worldmap", function(err, data) { - var colorscale = d3.scale.threshold().domain([2, 4, 8, 16, 32, 48]).range(["#f2f0f7", "#dadaeb", "#bcbddc", "#9e9ac8", "#756bb1", "#54278f"]) + var colorscale = d3.scale.threshold().domain(d3.range(1, (data.max+1)/3).map(function(n) { var a=1, b=1, f=1; for(var i = 2; i <= n; i++) { f = a+b; a=b; b=f } return f;})).range([ + "#aeffb9", + "#87ff97", + "#60ff76", + "#38ff54", + "#11ff32", + "#00e920", + "#00c21b", + "#009a15", + "#008713", + "#007310", + "#00600d", + "#004c0a" + ]) country.enter().insert("path") .attr("class", "country") .attr("d", path) .attr("id", function(d, i) { return d.id; }) - .attr("title", function(d, i) { - if (d.properties.name in data) { - return "

" + d.properties.name + "

" + data[d.properties.name]; - } else { - return d.properties.name; - } - }) .style("fill", function(d, i) { if (d.properties.name in data) { - return colorscale(data[d.properties.name]); + return colorscale(data[d.properties.name]['total']); } else { return "#fdf6e3"; } }); - var offsetL = document.getElementById('chart').offsetLet+20; - var offsetT = document.getElementById('chart').offsetTop+10; + var tooltip = d3.select('#chart').append('div') + .attr('class', 'tooltip') country.on("mousemove", function(d, i) { var mouse = d3.mouse(svg.node()).map(function(d) { return parseInt(d); }); tooltip.classed("hidden", false) - .attr("style", "left:"+(mouse[0]+offsetL)+"px;top:"+(mouse[1]+offsetT)+"px") - .html(function(d, i) { + .attr("style", "left:"+(mouse[0]+40)+"px;top:"+mouse[1]+"px") + .html(function() { if (d.properties.name in data) { - return d.properties.name + " " + data[d.properties.name]; + var text = "" + d.properties.name + "" + "
Total servers: " + data[d.properties.name]['total'] + if ('bridge' in data[d.properties.name]) { + text = text + "
Bridge servers: " + data[d.properties.name]['bridge'] + } + if ('exit' in data[d.properties.name]) { + text = text + "
Exit servers: " + data[d.properties.name]['exit'] + } + if ('relay' in data[d.properties.name]) { + text = text + "
Relay server: " + data[d.properties.name]['relay'] + } + return text } else { - return d.properties.name; + return "" + d.properties.name + "" } }) }) diff --git a/ennstatus/statistics/__init__.py b/ennstatus/statistics/__init__.py --- a/ennstatus/statistics/__init__.py +++ b/ennstatus/statistics/__init__.py @@ -0,0 +1,16 @@ +# Ënnstatus +# Copyright (C) 2015 Dennis Fink +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public License +# along with this program. If not, see . + diff --git a/ennstatus/statistics/views.py b/ennstatus/statistics/views.py --- a/ennstatus/statistics/views.py +++ b/ennstatus/statistics/views.py @@ -1,8 +1,20 @@ -from collections import defaultdict +# Ënnstatus +# Copyright (C) 2015 Dennis Fink +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public License +# along with this program. If not, see . -from flask import Blueprint, render_template, current_app, jsonify - -from ennstatus.status.functions import split_all_servers_to_types +from flask import Blueprint, render_template statistics_page = Blueprint('statistics', __name__) @@ -10,19 +22,3 @@ statistics_page = Blueprint('statistics' @statistics_page.route('/worldmap') def worldmap(): return render_template('statistics/worldmap.html') - - -@statistics_page.route('/data/worldmap') -def data_worldmap(): - servers = split_all_servers_to_types() - countries = defaultdict(int) - - for key, value in servers.items(): - for server in value: - countries[server['country']] += 1 - - maximum = max(countries.values()) - - countries['max'] = maximum - - return jsonify(countries) diff --git a/ennstatus/status/__init__.py b/ennstatus/status/__init__.py --- a/ennstatus/status/__init__.py +++ b/ennstatus/status/__init__.py @@ -0,0 +1,16 @@ +# Ënnstatus +# Copyright (C) 2015 Dennis Fink +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public License +# along with this program. If not, see . + diff --git a/ennstatus/status/forms.py b/ennstatus/status/forms.py --- a/ennstatus/status/forms.py +++ b/ennstatus/status/forms.py @@ -1,3 +1,19 @@ +# Ënnstatus +# Copyright (C) 2015 Dennis Fink +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public License +# along with this program. If not, see . + from flask_wtf import Form from wtforms import SelectField, SubmitField from wtforms.validators import DataRequired diff --git a/ennstatus/status/functions.py b/ennstatus/status/functions.py --- a/ennstatus/status/functions.py +++ b/ennstatus/status/functions.py @@ -1,3 +1,19 @@ +# Ënnstatus +# Copyright (C) 2015 Dennis Fink +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public License +# along with this program. If not, see . + import os import os.path import json diff --git a/ennstatus/status/views.py b/ennstatus/status/views.py --- a/ennstatus/status/views.py +++ b/ennstatus/status/views.py @@ -1,3 +1,19 @@ +# Ënnstatus +# Copyright (C) 2015 Dennis Fink +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public License +# along with this program. If not, see . + from flask import (Blueprint, render_template, current_app, diff --git a/ennstatus/templates/base.html b/ennstatus/templates/base.html --- a/ennstatus/templates/base.html +++ b/ennstatus/templates/base.html @@ -1,3 +1,20 @@ +{# Ënnstatus + Copyright (C) 2015 Dennis Fink + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public License + along with this program. If not, see . +#} + {% extends "bootstrap/base.html" %} {% import 'macros.html' as base_macros with context %} @@ -91,6 +108,12 @@
  • Mailing List
    • +
  • + Statistics + +
    • diff --git a/ennstatus/templates/donate/index.html b/ennstatus/templates/donate/index.html --- a/ennstatus/templates/donate/index.html +++ b/ennstatus/templates/donate/index.html @@ -1,3 +1,20 @@ +{# Ënnstatus + Copyright (C) 2015 Dennis Fink + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public License + along with this program. If not, see . +#} + {% extends "base.html" %} {% set title = "Donate" %} @@ -94,63 +111,63 @@

    Bitcoin Address: 1EYZCq2ZL6chWXYYkJoDo7fz39UC7do5cC

    - -
    - -
    - -
    - + + +
    + +
    + +
    -
    -
    - -
    - - +
    + +
    + + +
    -
    - -
    - -
    - + +
    + +
    + +
    @@ -159,24 +176,28 @@

    PayPal high fees

    -

    Use your existing PayPal account or check-out as guest. (Credit cards accepted)

    -
    - - - - -
    -
    +
    +

    Use your existing PayPal account or check-out as guest. (Credit cards accepted)

    +
    + + + + +
    +
    +

    Flattr

    -

    Flattr us!

    - - Flattr this - +
    +

    Flattr us!

    + + Flattr this + +
    @@ -184,8 +205,8 @@

    BPM Points

    -

    For our parcel station and international mail boxes.

    +

    For our parcel station and international mail boxes.

    Send your BPM voucher code to:
    : info@enn.lu GPG: 0x02225522 diff --git a/ennstatus/templates/donate/macros.html b/ennstatus/templates/donate/macros.html --- a/ennstatus/templates/donate/macros.html +++ b/ennstatus/templates/donate/macros.html @@ -1,3 +1,20 @@ +{# Ënnstatus + Copyright (C) 2015 Dennis Fink + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public License + along with this program. If not, see . +#} + {% macro colorize_numbers(number) %} {% if number.startswith('-') %} {% set color = "text-danger" %} @@ -10,7 +27,7 @@ {{ number }} {% endmacro %} -{% macro create_donations_table(csv_file) %} +{% macro create_donations_table(csv_file, total) %}

    @@ -30,6 +47,10 @@ {% endfor %} + + + +
    {{ colorize_numbers(row[2]) }}
    Total:{{ colorize_numbers(total) }}
    diff --git a/ennstatus/templates/donate/received.html b/ennstatus/templates/donate/received.html --- a/ennstatus/templates/donate/received.html +++ b/ennstatus/templates/donate/received.html @@ -1,3 +1,20 @@ +{# Ënnstatus + Copyright (C) 2015 Dennis Fink + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public License + along with this program. If not, see . +#} + {% extends "base.html" %} {% import "donate/macros.html" as macros %} @@ -30,7 +47,7 @@
    {% if csv_file %} - {{ macros.create_donations_table(csv_file) }} + {{ macros.create_donations_table(csv_file, total) }} {% else %} {% if year and month %}

    No donations found for {{ '-'.join([year, month]) }}!

    diff --git a/ennstatus/templates/errorpages/404.html b/ennstatus/templates/errorpages/404.html --- a/ennstatus/templates/errorpages/404.html +++ b/ennstatus/templates/errorpages/404.html @@ -1,3 +1,20 @@ +{# Ënnstatus + Copyright (C) 2015 Dennis Fink + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public License + along with this program. If not, see . +#} + {% extends "base.html" %} {% set title = "404 - Not found" %} diff --git a/ennstatus/templates/macros.html b/ennstatus/templates/macros.html --- a/ennstatus/templates/macros.html +++ b/ennstatus/templates/macros.html @@ -1,3 +1,20 @@ +{# Ënnstatus + Copyright (C) 2015 Dennis Fink + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public License + along with this program. If not, see . +#} + {% set category_colors = {'error': 'alert-danger', 'success': 'alert-success'} %} {% macro get_category_color(category) %} diff --git a/ennstatus/templates/root/about.html b/ennstatus/templates/root/about.html --- a/ennstatus/templates/root/about.html +++ b/ennstatus/templates/root/about.html @@ -1,3 +1,20 @@ +{# Ënnstatus + Copyright (C) 2015 Dennis Fink + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public License + along with this program. If not, see . +#} + {% extends "base.html" %} {% set title = "Who we are" %} diff --git a/ennstatus/templates/root/abuse.html b/ennstatus/templates/root/abuse.html --- a/ennstatus/templates/root/abuse.html +++ b/ennstatus/templates/root/abuse.html @@ -1,3 +1,20 @@ +{# Ënnstatus + Copyright (C) 2015 Dennis Fink + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public License + along with this program. If not, see . +#} + {% extends "base.html" %} {% set title = "Abuse" %} diff --git a/ennstatus/templates/root/bridgeprogram.html b/ennstatus/templates/root/bridgeprogram.html --- a/ennstatus/templates/root/bridgeprogram.html +++ b/ennstatus/templates/root/bridgeprogram.html @@ -1,3 +1,20 @@ +{# Ënnstatus + Copyright (C) 2015 Dennis Fink + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public License + along with this program. If not, see . +#} + {% extends "base.html" %} {% import 'bootstrap/wtf.html' as wtf %} diff --git a/ennstatus/templates/root/contact.html b/ennstatus/templates/root/contact.html --- a/ennstatus/templates/root/contact.html +++ b/ennstatus/templates/root/contact.html @@ -1,3 +1,20 @@ +{# Ënnstatus + Copyright (C) 2015 Dennis Fink + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public License + along with this program. If not, see . +#} + {% extends "base.html" %} {% set title = "Contact" %} @@ -32,22 +49,21 @@
    : info@enn.lu GPG: 0x02225522
    : enn.lu/ or {{ config['ENNSTATUS_ONION_ADDRESS'] }}
    - : +352-691-71-77-44
    - : +352-20-21-18-60 + : {{ config['ENNSTATUS_PHONE_NUMBER'] }}

    Abuse

    For further details about abuse handling, have a look over here.

    : abuse@enn.lu GPG: 0x02225522
    - : +352-691-71-77-44
    + : {{ config['ENNSTATUS_PHONE_NUMBER'] }}

    Press

    Press related inqueries should go to:

    : press@enn.lu GPG: 0x02225522
    - : +352-691-71-77-44
    + : {{ config['ENNSTATUS_PHONE_NUMBER'] }}
    diff --git a/ennstatus/templates/root/ennstatus.html b/ennstatus/templates/root/ennstatus.html --- a/ennstatus/templates/root/ennstatus.html +++ b/ennstatus/templates/root/ennstatus.html @@ -1,3 +1,20 @@ +{# Ënnstatus + Copyright (C) 2015 Dennis Fink + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public License + along with this program. If not, see . +#} + {% extends "base.html" %} {% set title = "About Ënnstatus" %} @@ -26,6 +43,7 @@
  • requests
  • python-gnupg
  • click
    • +
  • Babel
  • video.js

    • Flag icons provided by: famfamfam

    diff --git a/ennstatus/templates/root/index.html b/ennstatus/templates/root/index.html --- a/ennstatus/templates/root/index.html +++ b/ennstatus/templates/root/index.html @@ -1,3 +1,20 @@ +{# Ënnstatus + Copyright (C) 2015 Dennis Fink + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public License + along with this program. If not, see . +#} + {% extends "base.html" %} {% set title = "Index" %} diff --git a/ennstatus/templates/root/member.html b/ennstatus/templates/root/member.html --- a/ennstatus/templates/root/member.html +++ b/ennstatus/templates/root/member.html @@ -1,3 +1,20 @@ +{# Ënnstatus + Copyright (C) 2015 Dennis Fink + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public License + along with this program. If not, see . +#} + {% extends "base.html" %} {% set title = "Member" %} diff --git a/ennstatus/templates/root/membership.html b/ennstatus/templates/root/membership.html --- a/ennstatus/templates/root/membership.html +++ b/ennstatus/templates/root/membership.html @@ -1,3 +1,20 @@ +{# Ënnstatus + Copyright (C) 2015 Dennis Fink + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public License + along with this program. If not, see . +#} + {% extends 'base.html' %} {% import 'bootstrap/wtf.html' as wtf %} diff --git a/ennstatus/templates/root/mirrors.html b/ennstatus/templates/root/mirrors.html --- a/ennstatus/templates/root/mirrors.html +++ b/ennstatus/templates/root/mirrors.html @@ -1,3 +1,20 @@ +{# Ënnstatus + Copyright (C) 2015 Dennis Fink + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public License + along with this program. If not, see . +#} + {% extends "base.html" %} {% set title = "Partners" %} diff --git a/ennstatus/templates/root/partners.html b/ennstatus/templates/root/partners.html --- a/ennstatus/templates/root/partners.html +++ b/ennstatus/templates/root/partners.html @@ -1,3 +1,20 @@ +{# Ënnstatus + Copyright (C) 2015 Dennis Fink + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public License + along with this program. If not, see . +#} + {% extends "base.html" %} {% set title = "Partners" %} diff --git a/ennstatus/templates/statistics/worldmap.html b/ennstatus/templates/statistics/worldmap.html --- a/ennstatus/templates/statistics/worldmap.html +++ b/ennstatus/templates/statistics/worldmap.html @@ -1,3 +1,20 @@ +{# Ënnstatus + Copyright (C) 2015 Dennis Fink + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public License + along with this program. If not, see . +#} + {% extends "base.html"%} {% set title = "index" %} @@ -9,6 +26,7 @@ {% block content %}
    +

    Worldmap

    diff --git a/ennstatus/templates/status/index.html b/ennstatus/templates/status/index.html --- a/ennstatus/templates/status/index.html +++ b/ennstatus/templates/status/index.html @@ -1,3 +1,20 @@ +{# Ënnstatus + Copyright (C) 2015 Dennis Fink + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public License + along with this program. If not, see . +#} + {% extends "base.html" %} {% import "status/macros.html" as macros with context%} diff --git a/ennstatus/templates/status/macros.html b/ennstatus/templates/status/macros.html --- a/ennstatus/templates/status/macros.html +++ b/ennstatus/templates/status/macros.html @@ -1,3 +1,20 @@ +{# Ënnstatus + Copyright (C) 2015 Dennis Fink + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU 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 General Public License + along with this program. If not, see . +#} + {% macro colorize_status(status) %} {% if status %} {% set color = "text-success" %} diff --git a/ennstatus/utils.py b/ennstatus/utils.py --- a/ennstatus/utils.py +++ b/ennstatus/utils.py @@ -1,3 +1,19 @@ +# Ënnstatus +# Copyright (C) 2015 Dennis Fink +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public License +# along with this program. If not, see . + def check_ip(ipaddress): return not any({ diff --git a/requirements.in b/requirements.in --- a/requirements.in +++ b/requirements.in @@ -1,3 +1,4 @@ +Babel==2.1.1 click==5.1 Flask-Bootstrap==3.3.5.6 Flask-HTTPAuth==2.6.0 diff --git a/requirements.txt b/requirements.txt --- a/requirements.txt +++ b/requirements.txt @@ -4,9 +4,10 @@ # # pip-compile requirements.in # +Babel==2.1.1 blinker==1.4 # via flask-mail click==5.1 -dominate==2.1.12 # via flask-bootstrap +dominate==2.1.16 # via flask-bootstrap Flask-Bootstrap==3.3.5.6 Flask-HTTPAuth==2.6.0 Flask-Mail==0.9.1 @@ -19,6 +20,7 @@ jsonschema==2.5.1 markupsafe==0.23 # via jinja2 pygeoip==0.3.2 python-gnupg==0.3.7 +pytz==2015.7 # via babel requests==2.7.0 strict-rfc3339==0.5 werkzeug==0.10.4 # via flask, flask-wtf diff --git a/setup.py b/setup.py --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ def _get_requirements(): setup(name='Ennstatus', - version='5.1.0-dev', + version='5.4.0-dev', description=('Ennstatus provides the user with vital information about ' 'the status of the organizations Tor servers.'), author='Frënn vun der Ënn',