From: Alex Sadleir Date: Sun, 25 May 2014 11:26:32 +0000 Subject: Merge branch 'master' of git+ssh://maxious.lambdacomplex.org/git/ckanext-datagovau X-Git-Url: https://maxious.lambdacomplex.org/git/?p=ckanext-datagovau.git&a=commitdiff&h=34265c9425b227190cd6dfa0f496299060e83915 --- Merge branch 'master' of git+ssh://maxious.lambdacomplex.org/git/ckanext-datagovau --- --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,21 +3,7 @@ - - - - - - - - - - - + --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,26 +5,32 @@ - + + + + + - - - - - - - + + + + + + + - - + + - + + + - + @@ -85,28 +91,28 @@ - - + + - + - - + + - + - - + + - + @@ -115,7 +121,52 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -129,6 +180,7 @@ + @@ -139,28 +191,30 @@ - @@ -188,7 +242,7 @@ - + @@ -231,7 +285,7 @@ @@ -248,6 +302,10 @@ - + + + + + + + + + + - - - - + + - - + + @@ -486,6 +567,23 @@ + + @@ -507,24 +605,24 @@ - - + + + + - + - + - + - - @@ -572,7 +670,7 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + No facets are configured + + + + + + + + + + + + + + + + + + + + + + ckanext-datagovau + + + + + + + + + + + + + + + + + + + + --- /dev/null +++ b/LICENSE @@ -1,1 +1,686 @@ - +License ++++++++ + +CKAN - Data Catalogue Software +Copyright (C) 2007 Open Knowledge Foundation + +CKAN extensions/plugins +Copyright (C) 2013 Link Digital + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Affero General Public License as +published by the Free Software Foundation, either version 3 of the +License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Affero General Public License for more details. + +You should have received a copy of the GNU Affero General Public License +along with this program. If not, see . + + + + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 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 Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are 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. + + 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. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + 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 Affero 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. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + 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 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 work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero 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 Affero 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 Affero 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 Affero 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. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + 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 AGPL, see +. + --- a/README.rst +++ b/README.rst @@ -2,13 +2,12 @@ It comprises: -* A CKAN Extension "plugin" at ``ckanext/datagovau/plugin.py`` which, when - loaded, overrides various settings in the core ``ini``-file to provide: - * A path to local customisations of the core templates - * A custom Package edit form that defaults to cc-by licence - * A custom n3/rdf output format +* A custom Package edit form that defaults to cc-by licence +* Replaces links with http/https protocol independent versions +* Provides HTML to users to embed data previews on their own website +* A cut down licenses.json file -* A cut down licenses.json file +This extension is complemented by ckanext-agls for AGLS metadata, ckanext-googleanalytics for Google Analytics tracking of API usage and ckanext-dga-stats for the customised site statistics page. Installation ============ --- /dev/null +++ b/admin/autoupdate.py @@ -1,1 +1,75 @@ +import requests +import ckanapi +import csv +import sys +import psycopg2 +import json +from subprocess import Popen, PIPE +def updateresource(resource_id, dataset_id): + print ' --- ' + ckan = ckanapi.RemoteCKAN(api_url,api_key) + #ckan = ckanapi.RemoteCKAN('http://demo.ckan.org') + resource = ckan.action.resource_show(id=resource_id) + print 'updating '+resource['name']+'('+resource_id+', '+dataset_id+')' + print resource + url = resource['url'] + #last_modified= 'Mon, 24 Feb 2014 01:48:29 GMT' + #etag='"1393206509.38-638"' + headers={} + if 'etag' in resource: + headers['If-None-Match'] = resource['etag'] + if 'file_last_modified' in resource: + headers["If-Modified-Since"] = resource['file_last_modified'] + print headers + r = requests.head(url, headers=headers) + if r.status_code == 304: + print 'not modified' + return + else: + print r.status_code + print r.headers + if 'last-modified' in r.headers: + resource['file_last_modified'] = r.headers['last-modified'] + if 'etag' in r.headers: + resource['etag'] = r.headers['etag'] + #save updated resource + print resource + result = ckan.call_action('resource_update',resource) + if resource['format'].lower() == 'shp' or resource['format'].lower() == 'kml': + print "geoingest!" + pargs= ['dga-spatialingestor.py', db_settings_json, api_url, api_key, dataset_id] + print pargs + p = Popen(pargs)#, stdout=PIPE, stderr=PIPE) + p.communicate() + else: + print "datapusher!" + # https://github.com/ckan/ckan/blob/master/ckanext/datapusher/logic/action.py#L19 + ckan.action.datapusher_submit(resource_id=resource_id) + +if len(sys.argv) != 4: + print "autoupdate ingester. command line: postgis_url api_url api_key" + sys.exit(-1) +else: + (path, db_settings_json, api_url, api_key) = sys.argv + db_settings = json.loads(db_settings_json) + datastore_db_settings = dict(db_settings) + datastore_db_settings['dbname'] = db_settings['datastore_dbname'] + datastore_db_settings_json = json.dumps(datastore_db_settings) + +try: + conn = psycopg2.connect(dbname=db_settings['dbname'], user=db_settings['user'], password=db_settings['password'], host=db_settings['host']) +except: + failure("I am unable to connect to the database.") +# Open a cursor to perform database operations +cur = conn.cursor() +conn.set_isolation_level(0) +cur.execute('select resource.id resource_id, package.id dataset_id from resource inner join resource_group on resource.resource_group_id = resource_group.id inner join package on resource_group.package_id = package.id where resource.extras like \'%"autoupdate": "active"%\';') +row = cur.fetchone() +while row is not None: + updateresource(row[0],row[1]) + # process + row = cur.fetchone() +cur.close() +conn.close() + --- a/admin/data.gov.au +++ b/admin/data.gov.au @@ -19,6 +19,11 @@ ExpiresDefault "access plus 1 week" +AddType application/octet-stream .woff + + SetEnvIf Origin "^http(s)?://(.+\.)?(data.gov.au)$" origin_is=$0 + Header set Access-Control-Allow-Origin %{origin_is}e env=origin_is + Options FollowSymLinks --- a/admin/default.vcl +++ b/admin/default.vcl @@ -8,45 +8,147 @@ .host = "127.0.0.1"; .port = "8080"; } +backend geoserver { + .host = "172.31.18.207"; + .port = "8983"; +} sub vcl_fetch { set beresp.grace = 1h; - - if (beresp.http.content-type ~ "(text|application)") { + unset beresp.http.Server; + # These status codes should always pass through and never cache. + if ( beresp.status >= 500 ) { + set beresp.ttl = 0s; + } + if (beresp.http.content-type ~ "(text|javascript|json|xml|html)") { set beresp.do_gzip = true; } + # CKAN cache headers are used by Varnish cache, but should not be propagated to + # the Internet. Tell browsers and proxies not to cache. This means Varnish always + # gets the responsibility to server the right content at all times. + if (beresp.http.Cache-Control ~ "max-age") { + unset beresp.http.set-cookie; + set beresp.http.Cache-Control = "no-cache"; + } + + # Encourage assets to be cached by proxies and browsers + # JS and CSS may be gzipped depending on headers + # see https://developers.google.com/speed/docs/best-practices/caching + if (req.url ~ "\.(css|js)") { + set beresp.http.Vary = "Accept-Encoding"; + } + + # Encourage assets to be cached by proxies and browsers for 1 day + if (req.url ~ "\.(png|gif|jpg|swf|css|js)") { + unset beresp.http.set-cookie; + set beresp.http.Cache-Control = "public, max-age=86400"; + set beresp.ttl = 1d; + } + + # Encourage CKAN vendor assets (which are versioned) to be cached by + # by proxies and browsers for 1 year + if (req.url ~ "^/scripts/vendor/") { + unset beresp.http.set-cookie; + set beresp.http.Cache-Control = "public, max-age=31536000"; + set beresp.ttl = 12m; + } +} +sub vcl_recv { + if (req.http.user-agent ~ "Ezooms" || req.http.user-agent ~ "Ahrefs") { + error 403; + } +if (req.url ~ "^/geoserver/") { + set req.backend = geoserver; + } else { + set req.backend = default; + #redirect secure traffic to https + if ( (req.http.Cookie ~ "auth_tkt" || req.http.Cookie ~ "ckan" || req.url ~ "user/(reset|login)") && req.http.X-Forwarded-Proto !~ "(?i)https") { + set req.http.x-Redir-Url = "https://data.gov.au" + req.url; + error 753 req.http.x-Redir-Url; + } + # remove locale links + if (req.url ~ "/((?!js)..|.._..|sr_Latn)/") { + set req.http.x-Redir-Url = regsub(req.url, "/((?!js)..|.._..|sr_Latn)/", "/"); + error 751 req.http.x-Redir-Url; + } + # rewrite broken resources + if (req.url ~ "leaflet") { + set req.url = regsub(req.url, "fanstatic/ckanext-spatial/:version:2013-09-13T02:32:17.87/:bundle:js/vendor/leaflet/images", "js/vendor/leaflet/images"); + } + # remove old hostnames + if (req.http.host ~ "data.australia.gov.au") { + set req.http.x-Redir-Url = "http://data.gov.au" + req.url; + error 751 req.http.x-Redir-Url; + } + + if (req.url ~ "^/_tracking") { + // exclude web spiders from statistics + if (req.http.user-agent ~ "Googlebot" || req.http.user-agent ~ "baidu" || req.http.user-agent ~ "bing") { + error 200; + } else { + return (pass); + } + } if (req.url ~ "\.(png|gif|jpg|jpeg|swf|css|js|woff|eot)$") { - unset beresp.http.set-cookie; + //Varnish to deliver content from cache even if the request othervise indicates that the request should be passed + return(lookup); } } -sub vcl_recv { - if (req.url ~ "^/_tracking") { - return (pass); - } - if (req.url ~ "\.(png|gif|jpg|jpeg|swf|css|js|woff|eot)$") { - return(lookup); - } + // Remove has_js and Google Analytics cookies. Evan added sharethis cookies + set req.http.Cookie = regsuball(req.http.Cookie, "(^|;\s*)(__[a-z]+|has_js|cookie-agreed-en|_csoot|_csuid|_chartbeat2)=[^;]*", ""); + + // Remove a ";" prefix, if present. + set req.http.Cookie = regsub(req.http.Cookie, "^;\s*", ""); + // Remove empty cookies. + if (req.http.Cookie ~ "^\s*$") { + unset req.http.Cookie; + } + + remove req.http.X-Forwarded-For; + set req.http.X-Forwarded-For = req.http.X-Real-IP; +} +sub vcl_hash { + # http://serverfault.com/questions/112531/ignoring-get-parameters-in-varnish-vcl + set req.url = regsub(req.url, "(?:(.com|.au))/((?!js)..|.._..|sr_Latn)/", "/"); + hash_data(req.url); + if (req.http.host) { + hash_data(req.http.host); + } else { + hash_data(server.ip); + } if (req.http.Cookie) { - set req.http.Cookie = regsuball(req.http.Cookie, "(^|; ) *__utm.=[^;]+;? *", "\1"); # removes all cookies named __utm? (utma, utmb...) - tracking thing - - if (req.http.Cookie == "") { - remove req.http.Cookie; - } - } -} + hash_data(req.http.Cookie); +} +} sub vcl_deliver { if (!resp.http.Vary) { set resp.http.Vary = "Accept-Encoding"; } else if (resp.http.Vary !~ "(?i)Accept-Encoding") { set resp.http.Vary = resp.http.Vary + ",Accept-Encoding"; } - if (obj.hits > 0) { - set resp.http.X-Cache = "HIT"; - } else { - set resp.http.X-Cache = "MISS"; - } + remove resp.http.X-Varnish; + remove resp.http.Via; + remove resp.http.Age; + remove resp.http.X-Powered-By; +if (req.url ~ "^/geoserver/") { + set resp.http.Access-Control-Allow-Origin = "*"; + set resp.http.Access-Control-Allow-Methods = "GET, POST, PUT, DELETE"; + set resp.http.Access-Control-Allow-Headers = "Origin, X-Requested-With, Content-Type, Accept"; +} } - +sub vcl_error { + remove obj.http.Server; + if (obj.status == 751) { + set obj.http.Location = obj.response; + set obj.status = 301; + return (deliver); + } + if (obj.status == 753) { + set obj.http.Location = obj.response; + set obj.status = 301; + return (deliver); + } +} # # Below is a commented-out copy of the default VCL logic. If you # redefine any of these subroutines, the built-in logic will be --- /dev/null +++ b/admin/development.ini @@ -1,1 +1,365 @@ - +# +# ckan - Pylons configuration +# +# The %(here)s variable will be replaced with the parent directory of this file +# +[DEFAULT] + +# Change debug to true when doing CKAN development, it enables Pylons' +# interactive debugging tool, makes Fanstatic serve unminified JS and CSS +# files, and enables CKAN templates' debugging features. +# +# WARNING: *THIS SETTING MUST BE SET TO FALSE ON A PRODUCTION ENVIRONMENT* +# Debug mode will enable the interactive debugging tool, allowing ANYONE to +# execute malicious code after an exception is raised. +debug = False + +email_to = ddg@alert.links.com.au +error_email_from = data.gov@finance.gov.au + +# The SMTP server to connect to when sending emails to users, with optional +# port (default: 25). For example: lavabit.com, or smtp.gmail.com:587. To +# connect to a local sendmail process enter 'localhost'. +#smtp.server = localhost +smtp.server = smtp.gmail.com:587 + +# Whether or not to use STARTTLS when connecting to the SMTP server. +#smtp.starttls = False +smtp.starttls = True + +# The username and password to use to authenticate with the SMTP server. +# Optional, if these are left commented-out then CKAN will try to send email +# to the SMTP server without logging in first. +#smtp.user = your_username@gmail.com +#smtp.password = your_password +smtp.user = datagovau@gmail.com +smtp.password = *** +googleanalytics.id = *** +# The email address that emails sent by CKAN to users should appear to come +# from. Optional (default: None, note that the SMTP server may insert its own +# from address). +smtp.mail_from = data.gov@finance.gov.au + +[server:main] +use = egg:Paste#http +host = 0.0.0.0 +port = 5000 + +[app:main] +use = egg:ckan +ckan.tracking_enabled = true +full_stack = true +cache_dir = %(here)s/data +beaker.session.key = ckan +beaker.session.secret = *** +app_instance_uuid = *** +# Auth + +ckan.auth.anon_create_dataset = false +ckan.auth.create_unowned_dataset = false +ckan.auth.create_dataset_if_not_in_organization = false +ckan.auth.user_create_organizations = false +ckan.auth.user_delete_organizations = true +ckan.auth.user_create_groups = false +ckan.auth.user_delete_groups = true +ckan.auth.create_user_via_api = true + +# List the names of CKAN extensions to activate. +# Note: This line is required to be here for packaging, even if it is empty. +# Note: Add ``pdf_preview`` to enable the resource preview for PDFs +# Add the ``resource_proxy`` plugin to enable resorce proxying and get around the same origin policy +# Add ``datastore`` to enable the CKAN DataStore extension +ckan.plugins = qa disqus stats json_preview recline_preview datastore datastorer googleanalytics resource_proxy wms_preview kml_preview geojson_preview datagovau + +disqus.name = datagovau + +# If you'd like to fine-tune the individual locations of the cache data dirs +# for the Cache data, or the Session saves, un-comment the desired settings +# here: +#beaker.cache.data_dir = %(here)s/data/cache +#beaker.session.data_dir = %(here)s/data/sessions + +# Specify the database for SQLAlchemy to use: +# * Postgres is currently required for a production CKAN deployment +# * Sqlite (memory or file) can be used as a quick alternative for testing +#sqlalchemy.url = postgresql://ckanuser:pass@localhost/ckantest +sqlalchemy.url = *** +#sqlalchemy.url = sqlite:/// +#sqlalchemy.url = sqlite:///%(here)s/somedb.db + +# Un-comment and specify the URLs for the DataStore database. +# * Postgres is required +#ckan.datastore.write_url = postgresql://ckanuser:pass@localhost/datastore +#ckan.datastore.read_url = postgresql://readonlyuser:pass@localhost/datastore +ckan.datastore.write_url = *** +ckan.datastore.read_url = *** + +# repoze.who config +who.config_file = %(here)s/who.ini +who.log_level = warning +who.log_file = %(cache_dir)s/who_log.ini + +# Location of RDF versions of datasets +#rdf_packages = http://semantic.ckan.net/record/ + +# Location of licenses group (defaults to cached local version of ckan group) +#licenses_group_url = http://licenses.opendefinition.org/licenses/groups/ckan.json +licenses_group_url = file://%(here)s/licenses.json + +# Dataset form to use +package_form = standard + +# Hide certain extras fields from dataset read form: +# package_hide_extras = for_search_index_only + +# API configuration +#apikey_header_name = X-CKAN-API-Key + +## extra places to look for templates and public files (comma separated lists) +## any templates/files found will override correspondingly named ones in +## ckan/templates/ and ckan/public +## (e.g. to override main layout template layout.html or add extra css files) +# extra_template_paths = %(here)s/my-templates +# extra_public_paths = %(here)s/my-public + +# Dataset form integration +#package_edit_return_url = http://another.frontend/dataset/ +#package_new_return_url = http://another.frontend/dataset/ + + +# Turn on messaging with carrot, default to false +#ckan.async_notifier = true +# Messaging module used by carrot: +# * pyamqplib - AMQP (e.g. for RabbitMQ) +# * queue - native Python Queue (debugging and tests only) +#carrot_messaging_library = pyamqplib + +## Perform search just using database (rather than use e.g. solr). +## In this setup search is crude and limited .e.g no full-text search, no faceting ... +## However, very useful for getting up and running quickly with CKAN +# ckan.simple_search = 1 + +## Title of site (using in several places including templates and tag +ckan.site_title = data.gov.au + +## Logo image to use on the home page +ckan.site_logo = /base/images/ckan-logo.png + +## Site tagline / description (used on front page) +ckan.site_description = Australian Government Open Data Catalogue + +## Used in creating some absolute urls (such as rss feeds, css files) and +## dump filenames +ckan.site_url = http://data.gov.au + +## Favicon (default is the CKAN software favicon) +ckan.favicon = /images/icons/ckan.ico + +## The gravatar default to use. This can be any of the pre-defined strings +## as defined on http://en.gravatar.com/site/implement/images/ (e.g. "identicon" +## or "mm"). Or it can be a url, e.g. "http://example.com/images/avatar.jpg" +ckan.gravatar_default = identicon + +## Solr support +solr_url = http://solr.data.gov.au:8983/solr + +## Automatic indexing. Make all changes immediately available via the search +## after editing or creating a dataset. Default is true. If for some reason +## you need the indexing to occur asynchronously, set this option to 0. +# ckan.search.automatic_indexing = 1 + +## An 'id' for the site (using, for example, when creating entries in a common search index) +## If not specified derived from the site_url +ckan.site_id = data.gov.au + +## API url to use (e.g. in AJAX callbacks) +## Enable if the API is at a different domain +# ckan.api_url = http://www.ckan.net + +## html content to be inserted just before </head> tag (e.g. extra stylesheet) +## NB: can use html e.g. <strong>blah</strong> +## NB: can have multiline strings just indent following lines +# ckan.template_head_end = <link rel="stylesheet" href="http://mysite.org/css/custom.css" type="text/css"> + +## html content to be inserted just before </body> tag (e.g. google analytics code) +## NB: can use html e.g. <strong>blah</strong> +## NB: can have multiline strings just indent following lines +# ckan.template_footer_end = + +# These three settings (ckan.log_dir, ckan.dump_dir and ckan.backup_dir) are +# all used in cron jobs, not in CKAN itself. CKAN logging is configured +# in the logging configuration below +# Directory for logs (produced by cron scripts associated with ckan) +ckan.log_dir = %(here)s/log +# Directory for JSON/CSV dumps (must match setting in apache config) +ckan.dump_dir = %(here)s/dump +# Directory for SQL database backups +ckan.backup_dir = %(here)s/backup + +# Default authorizations for new domain objects +#ckan.default_roles.Package = {"visitor": ["reader"], "logged_in": ["reader"]} +#ckan.default_roles.Group = {"visitor": ["reader"], "logged_in": ["reader"]} +#ckan.default_roles.System = {"visitor": ["reader"], "logged_in": ["editor"]} +#ckan.default_roles.AuthorizationGroup = {"visitor": ["reader"], "logged_in": ["reader"]} + +## Ckan public and private recaptcha keys [localhost] +#ckan.recaptcha.publickey = 6LcL-94SAAAAAKCHKLIgCYNJczalehF4a3GHlPyR +#ckan.recaptcha.privatekey = 6LcL-94SAAAAADCsq995yBsNl7lHEgJ3Ukqf4Ykq + +# Locale/languages +ckan.locale_default = en_GB +ckan.locales_offered = en_GB +# Languages are grouped by percentage of strings in CKAN 1.8 translated +# (those with 100% first, then those with >=80%, then >=50%, then <50%) and +# within these groups roughly sorted by number of worldwide native speakers +# according to Wikipedia. +ckan.locale_order = en_GB pt_BR ja it cs_CZ ca es fr el sv sr sr@latin no sk fi ru de pl nl bg ko_KR hu sa sl lv +ckan.locales_filtered_out = en + +## Atom Feeds +# +# Settings for customising the metadata provided in +# atom feeds. +# +# These settings are used to generate the <id> tags for both feeds +# and entries. The unique <id>s are created following the method +# outlined in http://www.taguri.org/ ie - they generate tagURIs, as specified +# in http://tools.ietf.org/html/rfc4151#section-2.1 : +# +# <id>tag:thedatahub.org,2012:/feeds/group/933f3857-79fd-4beb-a835-c0349e31ce76</id> +# +# Each component has the corresponding settings: +# +# "thedatahub.org" is ckan.feeds.authority_name +# "2012" is ckan.feeds.date +# + +# Leave blank to use the ckan.site_url config value, otherwise set to a +# domain or email address that you own. e.g. thedatahub.org or +# admin@thedatahub.org +ckan.feeds.authority_name = + +# Pick a date of the form "yyyy[-mm[-dd]]" during which the above domain was +# owned by you. +ckan.feeds.date = 2012 + +# If not set, then the value in `ckan.site_id` is used. +ckan.feeds.author_name = + +# If not set, then the value in `ckan.site_url` is used. +ckan.feeds.author_link = + +## File Store +# +# CKAN allows users to upload files directly to file storage either on the local +# file system or to online ‘cloud’ storage like Amazon S3 or Google Storage. +# +# If you are using local file storage, remember to set ckan.site_url. +# +# To enable cloud storage (Google or S3), first run: pip install boto +# +# @see http://docs.ckan.org/en/latest/filestore.html + +# 'Bucket' to use for file storage +ckan.storage.bucket = ckandga + +# To enable local file storage: +ofs.impl = pairtree +ofs.storage_dir = /srv/ckan/dga + +# To enable Google cloud storage: +#ofs.impl = google +#ofs.gs_access_key_id = +#ofs.gs_secret_access_key = + +# To enable S3 cloud storage: +#ofs.impl = s3 +#ofs.aws_access_key_id = .... +#ofs.aws_secret_access_key = .... + + +## Previews +# +# Set the file types that should be previewed inline (e.g. images) or directly in an iframe. + +ckan.preview.direct = png jpg gif +ckan.preview.loadable = html htm rdf+xml owl+xml xml n3 n-triples turtle plain atom csv tsv rss txt json + + +# Activity Streams +# +# Default maximum number of activities to show in an activity stream. +# ckan.activity_list_limit = 31 + + +# Activity Streams Email Notifications +# +# Uncomment this line to enable activity streams email notifications. +# You also need to setup a cron job to send the emails, see the documentation. +#ckan.activity_streams_email_notifications = True + +# Email notifications for events older than this time delta will not be sent. +# Accepted formats: '2 days', '14 days', '4:35:00' (hours, minutes, seconds), +# '7 days, 3:23:34', etc. +# ckan.email_notifications_since = 2 days + +ckan.cache_expires = 2592000 +#ckan.page_cache_enabled = True +ckan.static_max_age = 2592000 +ckan.cache_enabled = True +# DEBUGGING + +# ckan.debug_supress_header This option can be set to suppress the debug +# information showing the controller and action recieving the request being +# shown in the header. Note: This info only shows if debug is set to true. +ckan.debug_supress_header = false + +## =================================== +## Extensions + +## Config option to enable the (1 day) cache for stats +## Default (if not defined) is True as stats computations are intensive +# ckanext.stats.cache_enabled = True + +# Logging configuration +[loggers] +keys = root, ckan, ckanext + +[handlers] +keys = console, file + +[formatters] +keys = generic + +[logger_root] +level = WARNING +handlers = console, file + +[logger_ckan] +level = ERROR +handlers = console, file +qualname = ckan +propagate = 0 + +[logger_ckanext] +level = WARNING +handlers = console, file +qualname = ckanext +propagate = 0 + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[handler_file] +class = logging.handlers.RotatingFileHandler +formatter = generic +level = NOTSET +#args = ("ckan.log", "a", 20000000, 9) +args = ("/var/log/ckan/dga/ckan.log", "a", 20000000, 9) + +[formatter_generic] +format = %(asctime)s %(levelname)-5.5s [%(name)s] %(message)s + --- /dev/null +++ b/admin/reset.sh @@ -1,1 +1,17 @@ +paster --plugin=ckan db clean --config=development.ini +echo "drop extension postgis cascade;" | psql -d ckantest +paster --plugin=ckan db clean --config=development.ini +#to initiate for first time instead of load from dump +#paster --plugin=ckan db init --config=development.in +#paster --plugin=ckan user add maxious password=snmc email=maxious@gmail.com +#paster --plugin=ckan sysadmin add maxious +#paster --plugin=ckan db dump dump.db + +#paster --plugin=ckan db load --config=development.ini dump.db +paster --plugin=ckan db load --config=development.ini dump.harvest.db +echo "create extension postgis;" | psql -d ckantest +#sleep 2 +paster --plugin=ckan search-index rebuild --config=development.ini +#rm -r /tmp/pairtree_* + --- /dev/null +++ b/admin/start.sh @@ -1,1 +1,6 @@ +export NEW_RELIC_CONFIG_FILE="newrelic.ini" +export VIRTUAL_ENV="/var/lib/ckan/dga/pyenv" +export PATH="/var/lib/ckan/dga/pyenv:/var/lib/ckan/dga/pyenv/bin:$PATH" +cd /var/lib/ckan/dga/pyenv/src/ckan +newrelic-admin run-program paster serve development.ini --- a/ckanext/datagovau/plugin.py +++ b/ckanext/datagovau/plugin.py @@ -7,27 +7,29 @@ import ckan.model as model from pylons import config -#parse the activity feed for last active non-system user -def get_last_active_user(id): - system_user = lib.helpers.get_action('user_show',{'id': config.get('ckan.site_id', 'ckan_site_user')}) - user_list = [x for x in lib.helpers.get_action('package_activity_list',{'id':id}) if x['user_id'] != system_user['id']] - user = None - if len(user_list) > 0: - user = user_list[0].get('user_id', None) - if user is None: - return system_user - else: - return lib.helpers.get_action('user_show',{'id':user}) +from sqlalchemy import orm +import ckan.model # get user created datasets and those they have edited def get_user_datasets(user_dict): created_datasets_list = user_dict['datasets'] active_datasets_list = [x['data']['package'] for x in lib.helpers.get_action('user_activity_list',{'id':user_dict['id']}) if x['data'].get('package')] - return created_datasets_list + active_datasets_list + raw_list = created_datasets_list + active_datasets_list + filtered_dict = {} + for dataset in raw_list: + if dataset['id'] not in filtered_dict.keys(): + filtered_dict[dataset['id']] = dataset + return filtered_dict.values() +def get_related_dataset(related_id): + result = model.Session.execute("select dataset_id from related_dataset where related_id =\'"+related_id+"\' limit 1;").first()[0] + return result -class ExampleIDatasetFormPlugin(plugins.SingletonPlugin, +def related_create(context, data_dict=None): + return {'success': False, 'msg': 'No one is allowed to create related items'} + +class DataGovAuPlugin(plugins.SingletonPlugin, tk.DefaultDatasetForm): '''An example IDatasetForm CKAN plugin. @@ -35,20 +37,11 @@ ''' plugins.implements(plugins.IConfigurer, inherit=False) - plugins.implements(plugins.IDatasetForm, inherit=False) plugins.implements(plugins.ITemplateHelpers, inherit=False) + plugins.implements(plugins.IAuthFunctions) - # These record how many times methods that this plugin's methods are - # called, for testing purposes. - num_times_new_template_called = 0 - num_times_read_template_called = 0 - num_times_edit_template_called = 0 - num_times_search_template_called = 0 - num_times_history_template_called = 0 - num_times_package_form_called = 0 - num_times_check_data_dict_called = 0 - num_times_setup_template_variables_called = 0 - + def get_auth_functions(self): + return {'related_create': related_create} def update_config(self, config): # Add this plugin's templates dir to CKAN's extra_template_paths, so @@ -62,112 +55,6 @@ # config['licenses_group_url'] = 'http://%(ckan.site_url)/licenses.json' def get_helpers(self): - return {'get_last_active_user': get_last_active_user, 'get_user_datasets': get_user_datasets} - - def is_fallback(self): - # Return True to register this plugin as the default handler for - # package types not handled by any other IDatasetForm plugin. - return True - - def package_types(self): - # This plugin doesn't handle any special package types, it just - # registers itself as the default (above). - return [] + return {'get_user_datasets': get_user_datasets, 'get_related_dataset': get_related_dataset} - def create_package_schema(self): - schema = super(ExampleIDatasetFormPlugin, self).create_package_schema() - schema = self._modify_package_schema(schema) - return schema - - def update_package_schema(self): - schema = super(ExampleIDatasetFormPlugin, self).update_package_schema() - schema = self._modify_package_schema(schema) - return schema - - def show_package_schema(self): - schema = super(ExampleIDatasetFormPlugin, self).show_package_schema() - - # Don't show vocab tags mixed in with normal 'free' tags - # (e.g. on dataset pages, or on the search page) - schema['tags']['__extras'].append(tk.get_converter('free_tags_only')) - - # Add our custom_text field to the dataset schema. - # ignore_missing == optional - # ignore_empty == mandatory but not for viewing - # !!! always convert_from_extras first - schema.update({ - 'agency_program': [tk.get_converter('convert_from_extras'), - tk.get_validator('ignore_missing')], - 'contact_point': [tk.get_converter('convert_from_extras'), - tk.get_validator('ignore_empty')], - 'spatial_coverage': [tk.get_converter('convert_from_extras'), - tk.get_validator('ignore_empty')], - 'granularity': [tk.get_converter('convert_from_extras'), - tk.get_validator('ignore_empty')], - 'jurisdiction': [tk.get_converter('convert_from_extras'), - tk.get_validator('ignore_empty')], - 'temporal_coverage': [tk.get_converter('convert_from_extras'), - tk.get_validator('ignore_empty')], - 'data_state': [tk.get_converter('convert_from_extras'), - tk.get_validator('ignore_empty')], - 'update_freq': [tk.get_converter('convert_from_extras'), - tk.get_validator('ignore_empty')] - }) - return schema - - def _modify_package_schema(self, schema): - # Add our custom_test metadata field to the schema, this one will use - # convert_to_extras instead of convert_to_tags. - # ignore_missing == optional - # not_empty == mandatory, enforced here while modifying - - schema.update({ - 'agency_program': [tk.get_validator('ignore_missing'), - tk.get_converter('convert_to_extras')], - 'contact_point': [tk.get_converter('convert_to_extras'), - tk.get_validator('not_empty')], - 'spatial_coverage': [tk.get_converter('convert_to_extras'), - tk.get_validator('not_empty')], - 'granularity': [tk.get_converter('convert_to_extras'), - tk.get_validator('not_empty')], - 'jurisdiction': [tk.get_converter('convert_to_extras'), - tk.get_validator('not_empty')], - 'temporal_coverage': [tk.get_converter('convert_to_extras'), - tk.get_validator('not_empty')], - 'data_state': [tk.get_converter('convert_to_extras'), - tk.get_validator('not_empty')], - 'update_freq': [tk.get_converter('convert_to_extras'), - tk.get_validator('not_empty')] - }) - return schema - - # These methods just record how many times they're called, for testing - # purposes. - # TODO: It might be better to test that custom templates returned by - # these methods are actually used, not just that the methods get - # called. - - def setup_template_variables(self, context, data_dict): - return super(ExampleIDatasetFormPlugin, self).setup_template_variables( - context, data_dict) - - def new_template(self): - return super(ExampleIDatasetFormPlugin, self).new_template() - - def read_template(self): - return super(ExampleIDatasetFormPlugin, self).read_template() - - def edit_template(self): - return super(ExampleIDatasetFormPlugin, self).edit_template() - - def search_template(self): - return super(ExampleIDatasetFormPlugin, self).search_template() - - def history_template(self): - return super(ExampleIDatasetFormPlugin, self).history_template() - - def package_form(self): - return super(ExampleIDatasetFormPlugin, self).package_form() - - --- /dev/null +++ b/ckanext/datagovau/templates/base.html @@ -1,1 +1,7 @@ +{% ckan_extends %} + {% block meta %} + {{ super() }} +<meta name="google-site-verification" content="B8scmW2_LMm4IW_ogXK9lojznO57GBpYlWrFjfGz3X8" /> + {% endblock %} + --- /dev/null +++ b/ckanext/datagovau/templates/dataviewer/base.html @@ -1,1 +1,11 @@ +{% ckan_extends %} +{% block scripts %} + {{ super() }} + <script> + preload_resource.url = preload_resource.url.replace("https:","").replace("http:",""); + preload_resource.original_url = preload_resource.original_url.replace("https:","").replace("http:",""); + </script> +{% endblock %} + + --- /dev/null +++ b/ckanext/datagovau/templates/dataviewer/snippets/data_preview.html @@ -1,1 +1,32 @@ +<div class="module-content ckanext-datapreview"> + {% if embed %} + {# images can be embedded directly #} + <img src="{{ resource_url }}"></img> + {% else %} + <div class="data-viewer-error js-hide"> + <p class="text-error"> + <i class="icon-info-sign"></i> + {{ _('This resource can not be previewed at the moment.') }} + <a href="#" data-toggle="collapse" data-target="#data-view-error"> + {{ _('Click here for more information.') }} + </a> + </p> + <p id="data-view-error" class="collapse"></p> + <p> + <a href="{{ raw_resource_url }}" class="btn btn-large resource-url-analytics" target="_blank"> + <i class="icon-large icon-download"></i> + {{ _('Download resource') }} + </a> + </p> + </div> + <iframe src="{{ resource_url }}" frameborder="0" width="100%" data-module="data-viewer"> + <p>{{ _('Your browser does not support iframes.') }}</p> + </iframe> + {% endif %} +</div> +<div class="embedhint" style="padding-left: 15px;"> +<h4>Embed this visualisation in your own website...</h4> +Copy the HTML in the box below and you can display this visualisation on your own website.<br/> +<textarea style="width:97%"><iframe src="{{ resource_url }}" frameborder="0" width="100%" height="600px"></iframe></textarea> +</div> --- /dev/null +++ b/ckanext/datagovau/templates/header.html @@ -1,1 +1,19 @@ +{% ckan_extends %} +{% block header_site_navigation %} + <nav class="section navigation"> + <ul class="nav nav-pills"> + {% block header_site_navigation_tabs %} + {{ h.build_nav_main( + ('search', _('Datasets')), + ('organizations_index', _('Organizations')), + ('about', _('About')), + ('stats', _('Site Statistics')) + ) }} + <li><a href="/related">Use Cases</a></li> + <li><a href="https://datagovau.ideascale.com/">Feedback/Request Data</a></li> + {% endblock %} + </ul> + </nav> +{% endblock %} + --- /dev/null +++ b/ckanext/datagovau/templates/home/index.html @@ -1,1 +1,47 @@ +{% ckan_extends %} +{% block home_secondary_content %} +<script type="text/javascript" src="//www.google.com/jsapi"> +</script> +<script type="text/javascript"> +google.load("feeds", "1") //Load Google Ajax Feed API (version 1) +</script> + <div id="feeddiv"></div> + +<script type="text/javascript"> + +var feedcontainer=document.getElementById("feeddiv") +var feedurl="http://www.finance.gov.au/taxonomy/term/1274/feed" +var feedlimit=3 +var rssoutput="<div class='module module-shallow module-narrow module-dark info box' style='color:black'><h2>Latest data.gov.au News</h2><i class='ckan-icon ckan-icon-feed'></i><a href='http://www.finance.gov.au/taxonomy/term/1274/feed/'> Subscribe to the blog </a></div>" + + +function rssfeedsetup(){ +var feedpointer=new google.feeds.Feed(feedurl) //Google Feed API method +feedpointer.setNumEntries(feedlimit) //Google Feed API method +feedpointer.load(displayfeed) //Google Feed API method +} + +function displayfeed(result){ +if (!result.error){ +var thefeeds=result.feed.entries +for (var i=0; i<thefeeds.length; i++) { +rssoutput+="<div class='module module-shallow module-narrow module-dark info box'><h3><a href='" + thefeeds[i].link + "'>" + thefeeds[i].title + "</a></h3>" +rssoutput+= " <font color='black'>Posted on " + new Date(thefeeds[i].publishedDate).toDateString() + "</font></div>" +} +rssoutput+="" +feedcontainer.innerHTML=rssoutput +} +else +alert("Error fetching feeds!") +} + +window.onload=function(){ +rssfeedsetup() +} + +</script> + +{{ super() }} + {% endblock %} + --- /dev/null +++ b/ckanext/datagovau/templates/home/snippets/promoted.html @@ -1,1 +1,17 @@ +{% set intro = g.site_intro_text %} +<div class="module-content box"> + <header> + {% if intro %} + {{ h.render_markdown(intro) }} + {% else %} + <h1 class="page-heading">{{ _("Welcome to CKAN") }}</h1> + <p> + {% trans %}This is a nice introductory paragraph about CKAN or the site + in general. We don't have any copy to go here yet but soon we will + {% endtrans %} + </p> + {% endif %} + </header> +</div> + --- /dev/null +++ b/ckanext/datagovau/templates/home/snippets/stats.html @@ -1,1 +1,78 @@ +{% set stats = h.get_site_statistics() %} + +<div class="box stats"> + <div class="inner"> + <h3>{{ _('{0} statistics').format(g.site_title) }}</h3> + <ul> + <li> + <a href="{{ h.url_for(controller='package', action='search') }}"> + <b>{{ h.SI_number_span(stats.dataset_count) }}</b> + {{ _('dataset') if stats.dataset_count == 1 else _('datasets') }} + </a> + </li> + <li> + <a href="{{ h.url_for(controller='organization', action='index') }}"> + <b>{{ h.SI_number_span(stats.organization_count) }}</b> + {{ _('organisation') if stats.organization_count == 1 else _('organisations') }} + </a> + </li> + <li> + <a href="{{ h.url_for(controller='group', action='index') }}"> + <b>{{ h.SI_number_span(stats.group_count) }}</b> + {{ _('group') if stats.group_count == 1 else _('groups') }} + </a> + </li> + <!--<li> + <a href="{{ h.url_for(controller='related', action='dashboard') }}"> + <b>{{ h.SI_number_span(stats.related_count) }}</b> + {{ _('related item') if stats.related_count == 1 else _('related items') }} + </a> + </li>--> + </ul> + </div> +</div> + + <div id="feeddiv"> +</div> + +<script type="text/javascript" src="//www.google.com/jsapi"> +</script> +<script type="text/javascript"> +google.load("feeds", "1") //Load Google Ajax Feed API (version 1) +</script> + +<script type="text/javascript"> + +var feedcontainer=document.getElementById("feeddiv") +var feedurl="http://www.finance.gov.au/taxonomy/term/1274/feed" +var feedlimit=4 +var rssoutput="<div class='module module-shallow module-narrow module-dark info box' style='color:black'><h2>Latest data.gov.au News</h2><i class='ckan-icon ckan-icon-feed'></i><a href='http://www.finance.gov.au/taxonomy/term/1274/feed/'> Subscribe to the blog </a></div>" + + +function rssfeedsetup(){ +var feedpointer=new google.feeds.Feed(feedurl) //Google Feed API method +feedpointer.setNumEntries(feedlimit) //Google Feed API method +feedpointer.load(displayfeed) //Google Feed API method +} + +function displayfeed(result){ +if (!result.error){ +var thefeeds=result.feed.entries +for (var i=0; i<thefeeds.length; i++) { +rssoutput+="<div class='module module-shallow module-narrow module-dark info box'><h3><a href='" + thefeeds[i].link + "'>" + thefeeds[i].title + "</a></h3>" +rssoutput+= " <font color='black'>Posted on " + new Date(thefeeds[i].publishedDate).toDateString() + "</font></div>" +} +rssoutput+="" +feedcontainer.innerHTML=rssoutput +} +else +alert("Error fetching feeds!") +} + +window.onload=function(){ +rssfeedsetup() +} + +</script> + --- a/ckanext/datagovau/templates/package/read.html +++ b/ckanext/datagovau/templates/package/read.html @@ -1,167 +1,18 @@ {% ckan_extends %} +{% block primary_content_inner %} +{{ super() }} +<div class="module-content"> + {{ h.disqus_comments() }} +</div> +{% endblock %} -{% block package_additional_info %} -<section class="additional-info" xmlns:dcat="http://www.w3.org/ns/dcat#" - xmlns:dcam="http://purl.org/dc/dcam/" - xmlns:aglsterms="http://www.agls.gov.au/agls/terms/" - xmlns:agentterms="http://www.agls.gov.au/agls/agentterms/" - xmlns:availterms="http://www.agls.gov.au/agls/availterms/" - xmlns:adminterms="http://www.agls.gov.au/agls/adminterms/" - xmlns:dct="http://purl.org/dc/terms/"> - <h3>{{ _('Additional Info') }}</h3> - <table class="table table-striped table-bordered table-condensed"> - <thead> - <tr> - <th scope="col">{{ _('Field') }}</th> - <th scope="col">{{ _('Value') }}</th> - </tr> - </thead> - <tbody> +{% block secondary_content %} + {{ super() }} - - {# Add our custom field to the dataset read page. #} - {% if pkg.get('metadata_created') %} - <tr> - <th scope="row" class="dataset-label">Date Published</th> - <td class="dataset-details" property="dct:issued">{{ pkg.metadata_created.split("T")[0] }}</td> - </tr> - {% endif %} - {% if pkg.get('metadata_updated') %} - <tr> - <th scope="row" class="dataset-label">Date Updated</th> - <td class="dataset-details" property="dct:updated">{{ pkg.metadata_updated.split("T")[0] }}</td> - </tr> - {% endif %} - {% if pkg.get('agency_program') %} - <tr> - <th scope="row" class="dataset-label">Agency Program</th> - <td class="dataset-details"> {{ pkg.agency_program }}</td> - </tr> - {% endif %} - {% if pkg.get('Agency Program') %} - <tr> - <th scope="row" class="dataset-label">Agency Program</th> - <td class="dataset-details"> {{ pkg.get('Agency Program') }}</td> - </tr> - {% endif %} - {% if h.get_pkg_dict_extra(pkg,'DCTERMS.Source.URI') %} - <tr> - <th scope="row" class="dataset-label">{{ _('Source') }}</th> - <td class="dataset-details" property="dct:source">{{ h.link_to(h.get_pkg_dict_extra(pkg,'DCTERMS.Source.URI'), - h.get_pkg_dict_extra(pkg,'DCTERMS.Source.URI'), rel='dct:source', target='_blank') }} - </td> - </tr> - {% endif %} - - {% if pkg.get('contact_point') %} - <tr> - <th scope="row" class="dataset-label">Contact Point</th> - <td class="dataset-details" property="dcat:contactPoint"> {{ h.mail_to(email_address=pkg.contact_point, - name=pkg.contact_point) }}</td> - </tr> - {% endif %} - {% if pkg.get('spatial_coverage') %} - - <tr> - <th scope="row" class="dataset-label">Geospatial Coverage</th> - <td class="dataset-details" property="dct:spatial"> {{ pkg.spatial_coverage }}</td> - </tr> - {% endif %} - {% if h.get_pkg_dict_extra(pkg,'Geospatial Coverage') %} - - <tr> - <th scope="row" class="dataset-label">Geospatial Coverage</th> - <td class="dataset-details" property="dct:spatial"> {{ h.get_pkg_dict_extra(pkg,'Geospatial Coverage') }}</td> - </tr> - {% endif %} - {% if pkg.get('granularity') %} - - <tr> - <th scope="row" class="dataset-label">Data Granularity</th> - <td class="dataset-details"> {{ pkg.granularity }}</td> - </tr> - {% endif %} - {% if h.get_pkg_dict_extra(pkg,'Granularity') %} - - <tr> - <th scope="row" class="dataset-label">Data Granularity</th> - <td class="dataset-details"> {{ h.get_pkg_dict_extra(pkg,'Granularity') }}</td> - </tr> - {% endif %} - {% if pkg.get('jurisdiction') %} - - <tr> - <th scope="row" class="dataset-label">Government Jurisdiction</th> - <td class="dataset-details" property="aglsterms:AglsJuri"> {{ pkg.jurisdiction }}</td> - </tr> - {% endif %} - {% if h.get_pkg_dict_extra(pkg,'AGLSTERMS.Jurisdiction') %} - - <tr> - <th scope="row" class="dataset-label">Government Jurisdiction</th> - <td class="dataset-details" property="aglsterms:AglsJuri"> {{ h.get_pkg_dict_extra(pkg,'AGLSTERMS.Jurisdiction') }}</td> - </tr> - {% endif %} - {% if pkg.get('temporal_coverage') %} - - <tr> - <th scope="row" class="dataset-label">Temporal Coverage</th> - <td class="dataset-details" property="dct:temporal"> {{ pkg.temporal_coverage }}</td> - </tr> - {% endif %} - {% if h.get_pkg_dict_extra(pkg,'Temporal Coverage') %} - - <tr> - <th scope="row" class="dataset-label">Temporal Coverage</th> - <td class="dataset-details" property="dct:temporal"> {{ h.get_pkg_dict_extra(pkg,'Temporal Coverage') }}</td> - </tr> - {% endif %} - {% if pkg.get('data_state') %} - - <tr> - <th scope="row" class="dataset-label">Data State</th> - <td class="dataset-details"> {{ pkg.data_state }}</td> - </tr> - {% endif %} - {% if pkg.get('update_freq') %} - - <tr> - <th scope="row" class="dataset-label">Update Frequency</th> - <td class="dataset-details"> {{ pkg.update_freq }}</td> - </tr> - {% endif %} - {% if h.get_pkg_dict_extra(pkg,'Update Frequency') %} - <tr> - <th scope="row" class="dataset-label">Update Frequency</th> - <td class="dataset-details"> {{ h.get_pkg_dict_extra(pkg,'Update Frequency') }}</td> - </tr> - {% endif %} - -{% set email =h.get_last_active_user(c.pkg_dict['id']).get('email','') %} - <tr> - <th scope="row" class="dataset-label">{{ _('Maintainer') }}</th> - <td class="dataset-details" property="dc:contributor">{{ - h.mail_to(email_address=(email or ' '), name=h.get_last_active_user(c.pkg_dict['id']).get("display_name",'')) }} - </td> - </tr> - <tr> - <th scope="row" class="dataset-label">Publisher/Agency</th> - <td class="dataset-details" property="dc:publisher">{{ c.pkg_dict['organization']['title']}} - </td> - </tr> - <tr> - <th scope="row" class="dataset-label">Type</th> - <td class="dataset-details" property="dc:type">Dataset</td> - </tr> - <tr> - <th scope="row" class="dataset-label">Language</th> - <td class="dataset-details" property="dc:language">English</td> - </tr> - - </tbody> - </table> -</section> - + {% set dataset_extent = h.get_pkg_dict_extra(c.pkg_dict, 'spatial', '') %} + {% if dataset_extent %} + {% snippet "spatial/snippets/dataset_map_sidebar.html", extent=dataset_extent %} + {% endif %} {% endblock %} --- a/ckanext/datagovau/templates/package/read.n3 +++ /dev/null @@ -1,45 +1,1 @@ -@prefix : <http://www.w3.org/2000/01/rdf-schema#> . -@prefix dcat: <http://www.w3.org/ns/dcat#> . -@prefix dct: <http://purl.org/dc/terms/> . -@prefix foaf: <http://xmlns.com/foaf/0.1/> . -@prefix owl: <http://www.w3.org/2002/07/owl#> . -@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . -<${ h.url_for(controller='package',action='read',id=c.pkg_dict['name'], qualified=True)}> -a dcat:Dataset; - dct:description "${c.pkg_dict['notes']}"; - dct:identifier "${c.pkg_dict['name']}"; - dct:relation [ - rdf:value ""; - :label "change_note" ], - [ - rdf:value ""; - :label "definition_note" ], - [ - rdf:value ""; - :label "editorial_note" ], - [ - rdf:value ""; - :label "example_note" ], - [ - rdf:value ""; - :label "history_note" ], - [ - rdf:value ""; - :label "scope_note" ], - [ - rdf:value ""; - :label "skos_note" ], - [ - rdf:value ""; - :label "temporal_granularity" ], - [ - rdf:value ""; - :label "type_of_dataset" ], - [ - rdf:value ""; - :label "update_frequency" ]; - dct:title "${c.pkg_dict['title']}"; - :label "${c.pkg_dict['name']}"; - = <urn:uuid:${c.pkg_dict['id']}>; - foaf:homepage <http://127.0.0.1:5000/dataset/testt> . --- a/ckanext/datagovau/templates/package/read.rdf +++ /dev/null @@ -1,157 +1,1 @@ -<?xml version="1.0" encoding="utf-8"?> -<rdf:RDF - xmlns:py="http://genshi.edgewall.org/" - xmlns:foaf="http://xmlns.com/foaf/0.1/" - xmlns:owl="http://www.w3.org/2002/07/owl#" - xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:dcat="http://www.w3.org/ns/dcat#" - xmlns:dcam="http://purl.org/dc/dcam/" - xmlns:aglsterms="http://www.agls.gov.au/agls/terms/" - xmlns:agentterms="http://www.agls.gov.au/agls/agentterms/" - xmlns:availterms="http://www.agls.gov.au/agls/availterms/" - xmlns:adminterms="http://www.agls.gov.au/agls/adminterms/" - xmlns:dct="http://purl.org/dc/terms/" - > - <dcat:Dataset rdf:about="${ h.url_for(controller='package',action='read',id=c.pkg_dict['name'], qualified=True)}"> - <dct:identifier>${c.pkg_dict['name']}</dct:identifier> - <dct:title>${c.pkg_dict['title']}</dct:title> - <dct:landingPage - rdf:resource="${ h.url_for(controller='package',action='read',id=c.pkg_dict['name'], qualified=True) }"/> - <owl:sameAs rdf:resource="urn:uuid:${c.pkg_dict['id']}"/> - <dct:type>Dataset</dct:type> - <dct:description>${c.pkg_dict['notes']}</dct:description> - <dct:issued>${c.pkg_dict['metadata_created']}</dct:issued> - <dct:modified>${c.pkg_dict['metadata_modified']}</dct:modified> - <dct:language>en</dct:language> -<py:choose> - <py:when test="c.pkg_dict.get('license_url',None)"> - <dct:license>${c.pkg_dict['license_url']}</dct:license> - <dct:rights rdf:resource="${c.pkg_dict['license_url']}"/> - </py:when> - <py:otherwise> - <dct:license>${c.pkg_dict['license_id']}</dct:license> - <dct:rights rdf:resource="${c.pkg_dict['license_id']}"/> - </py:otherwise> -</py:choose> - <py:for each="tag_dict in c.pkg_dict.get('tags',[])"> - <dcat:keyword>${ tag_dict["name"] }</dcat:keyword> - </py:for> - <py:for each="group_dict in c.pkg_dict.get('groups',[])"> - <dcat:theme>${ group_dict["title"] }</dcat:theme> - </py:for> - - <foaf:homepage - rdf:resource="${ h.url_for(controller='package',action='read',id=c.pkg_dict['name'], qualified=True)}"/> - <rdfs:label>${c.pkg_dict['name']}</rdfs:label> - - - <py:for each="rsc_dict in c.pkg_dict['resources']"> - <dcat:distribution> - <dcat:Distribution> - <dct:title>${rsc_dict.get('name')}</dct:title> - <owl:sameAs rdf:resource="urn:uuid:${rsc_dict.get('id')}"/> - <dct:description>${rsc_dict.get('description')}</dct:description> - <dcat:accessURL rdf:resource="${ rsc_dict.get('url') }"/> - <dct:created>${rsc_dict.get('created')}</dct:created> - <dct:modified>${rsc_dict.get('revision_timestamp')}</dct:modified> - <dcat:byteSize py:if="rsc_dict.get('size')">${rsc_dict.get('size')}</dcat:byteSize> - <dcat:mediaType py:if="rsc_dict.get('mimetype')">${rsc_dict.get('mimetype')}</dcat:mediaType> - <dct:extent py:if="rsc_dict.get('size')">${rsc_dict.get('size')} bytes</dct:extent> - <dct:format py:if="rsc_dict.get('format')"> - <dct:IMT> - <rdf:value>${rsc_dict.get('format')}</rdf:value> - <rdfs:label>${rsc_dict.get('format')}</rdfs:label> - </dct:IMT> - </dct:format> - <dct:title py:if="rsc_dict.get('name')">${rsc_dict.get('name')}</dct:title> - </dcat:Distribution> - </dcat:distribution> - </py:for> - <dct:publisher py:if="c.pkg_dict.get('organization', None)"> - <rdf:Description> - <foaf:name>${ c.pkg_dict['organization']['title'] }</foaf:name> - </rdf:Description> - </dct:publisher> - <dct:creator py:if="c.pkg_dict.get('organization', None)"> - <rdf:Description> - <foaf:name>${ c.pkg_dict['organization']['title'] }</foaf:name> - </rdf:Description> - </dct:creator> - <dct:contributor> - <rdf:Description> - <foaf:name>${h.get_last_active_user(c.pkg_dict['id'])["display_name"]}</foaf:name> - <foaf:mbox py:if="h.get_last_active_user(c.pkg_dict['id']).get('email', None)" - rdf:resource="mailto:${h.get_last_active_user(c.pkg_dict['id'])['email']}"/> - </rdf:Description> - </dct:contributor> - - - <foaf:homepage py:if="h.get_pkg_dict_extra(c.pkg_dict,'DCTERMS.Source.URI')">${h.get_pkg_dict_extra(c.pkg_dict,'DCTERMS.Source.URI') } - </foaf:homepage> - - <dcat:contactPoint py:if="c.pkg_dict.get('contact_point')">${c.pkg_dict.contact_point }</dcat:contactPoint> - <dct:spatial py:if="c.pkg_dict.get('spatial_coverage')">${ c.pkg_dict.spatial_coverage }</dct:spatial> - <dct:spatial py:if="h.get_pkg_dict_extra(c.pkg_dict,'Geospatial Coverage')">${ h.get_pkg_dict_extra(c.pkg_dict,'Geospatial Coverage') }</dct:spatial> - <aglsterms:AglsJuri py:if="c.pkg_dict.get('jurisdiction')">${ c.pkg_dict.jurisdiction }</aglsterms:AglsJuri> - <aglsterms:AglsJuri py:if="h.get_pkg_dict_extra(c.pkg_dict,'AGLSTERMS.Jurisdiction')">${ h.get_pkg_dict_extra(c.pkg_dict,'AGLSTERMS.Jurisdiction') }</aglsterms:AglsJuri> - <dct:temporal py:if="c.pkg_dict.get('temporal_coverage')">${ c.pkg_dict.get('temporal_coverage') }</dct:temporal> - <dct:temporal py:if="h.get_pkg_dict_extra(c.pkg_dict,'Temporal Coverage')">${ h.get_pkg_dict_extra(c.pkg_dict,'Temporal Coverage') }</dct:temporal> - <dct:relation py:if="c.pkg_dict.get('data_state')"> - <rdf:Description> - <rdfs:label>Data State</rdfs:label> - <rdf:value>${ c.pkg_dict.get('data_state') }</rdf:value> - </rdf:Description> - </dct:relation> - - <dct:relation py:if="c.pkg_dict.get('update_freq')"> - <rdf:Description> - <rdfs:label>Update Frequency</rdfs:label> - <rdf:value>${ c.pkg_dict.get('update_freq') }</rdf:value> - </rdf:Description> - </dct:relation> - <dct:relation py:if="h.get_pkg_dict_extra(c.pkg_dict,'Update Frequency')"> - <rdf:Description> - <rdfs:label>Update Frequency</rdfs:label> - <rdf:value>${ h.get_pkg_dict_extra(c.pkg_dict,'Update Frequency') }</rdf:value> - </rdf:Description> - </dct:relation> - - <dct:relation py:if="h.get_pkg_dict_extra(c.pkg_dict,'Agency Program')"> - <rdf:Description> - <rdfs:label>Agency Program</rdfs:label> - <rdf:value>${ h.get_pkg_dict_extra(c.pkg_dict,'Agency Program') }</rdf:value> - </rdf:Description> - </dct:relation> - <dct:relation py:if="c.pkg_dict.get('agency_program')"> - <rdf:Description> - <rdfs:label>Agency Program</rdfs:label> - <rdf:value>${ c.pkg_dict.get('agency_program') }</rdf:value> - </rdf:Description> - </dct:relation> - - <dct:relation py:if="h.get_pkg_dict_extra(c.pkg_dict,'Granularity')"> - <rdf:Description> - <rdfs:label>Data Granularity</rdfs:label> - <rdf:value>${ h.get_pkg_dict_extra(c.pkg_dict,'Granularity') }</rdf:value> - </rdf:Description> - </dct:relation> - <dct:relation py:if="c.pkg_dict.get('granularity')"> - <rdf:Description> - <rdfs:label>Data Granularity</rdfs:label> - <rdf:value>${ c.pkg_dict.get('granularity') }</rdf:value> - </rdf:Description> - </dct:relation> - - <py:for each="extra_dict in c.pkg_dict.get('extras',[])"> - <dct:relation> - <rdf:Description> - <rdfs:label>${extra_dict.get('key','')}</rdfs:label> - <rdf:value>${extra_dict.get('value','')}</rdf:value> - </rdf:Description> - </dct:relation> - </py:for> - </dcat:Dataset> -</rdf:RDF> - --- a/ckanext/datagovau/templates/package/read_base.html +++ b/ckanext/datagovau/templates/package/read_base.html @@ -1,47 +1,10 @@ {% ckan_extends %} -{% block links -%} -{{ super() }} -<link rel="schema.DCTERMS" href="http://purl.org/dc/terms/" /> -<link rel="schema.AGLSTERMS" href="http://www.agls.gov.au/agls/terms/" /> - -{% endblock -%} - -{% block head_extras -%} -{{ super() }} -<meta name="DCTERMS.Language" scheme="RFC3066" content="en" /> -<meta name="DCTERMS.Type" scheme="AGLSTERMS.Document" content="dataset" /> -<meta name="DCTERMS.Creator" scheme="AGLSTERMS.AglsAgent" content="{{ pkg['organization']['title'] }}" /> -<meta name="DCTERMS.Modified" scheme="DCTERMS.ISO8601" content="{{pkg['metadata_modified']}}" /> -<meta name="DCTERMS.Published" scheme="DCTERMS.ISO8601" content="{{pkg['metadata_created']}}" /> -{% if h.get_pkg_dict_extra(pkg,'DCTERMS.Source.URI') %}<meta name="DCTERMS.Source.URI" content="{{h.get_pkg_dict_extra(pkg,'DCTERMS.Source.URI')}}" />{% endif %} -<meta name="DCTERMS.License" content="{{pkg['license_url']}}" /> -<meta name="DCTERMS.Coverage.Temporal" content="{{pkg.temporal_coverage or h.get_pkg_dict_extra(pkg,'Temporal Coverage')}}" /> -<meta name="DCTERMS.Coverage.Spatial" content="{{pkg.spatial_coverage or h.get_pkg_dict_extra(pkg,'Geospatial Coverage')}}" /> -<meta name="AGLSTERMS.Jurisdiction" scheme="AGLSTERMS.AglsJuri" content="{{pkg.jurisdiction or h.get_pkg_dict_extra(pkg,'AGLSTERMS.Jurisdiction')}}" /> -<meta name="DCAT.Theme" scheme="VO" content="{% for x in pkg.groups %}{{x['title']}},{% endfor %}" /> -<meta name="DCTERMS.Identifier" content="{{h.url_for(controller='package',action='read',id=c.pkg_dict['name'], qualified=True)}}" /> -<meta name="DCTERMS.Title" content="{{pkg['title']}}" /> -<meta name="DCTERMS.Description" scheme="" content="{{pkg['notes']}}" /> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - -{% endblock -%} - -{% block package_info %} -<div class="module context-info"> - <div class="module-content"> - <h1 class="heading" property="dct:title">{{ pkg.title or pkg.name }}</h1> - <div class="nums"> - <dl> - <dt>{{ _('Followers') }}</dt> - <dd>{{ h.SI_number_span(h.get_action('dataset_follower_count', {'id': pkg.id})) }}</dd> - </dl> - </div> - <div class="follow_button"> - {{ h.follow_button('dataset', pkg.name) }} - </div> - </div> -</div> +{% block content_primary_nav %} + {{ h.build_nav_icon('dataset_read', _('Dataset'), id=pkg.name) }} + {{ h.build_nav_icon('dataset_groups', _('Groups'), id=pkg.name) }} + {{ h.build_nav_icon('dataset_activity', _('Activity Stream'), id=pkg.name) }} + {{ h.build_nav_icon('related_list', _('Use Cases'), id=pkg.name) }} {% endblock %} --- a/ckanext/datagovau/templates/package/resource_read.html +++ /dev/null @@ -1,36 +1,1 @@ -{% ckan_extends %} -{% block links -%} -{{ super() }} -<link rel="schema.DCTERMS" href="http://purl.org/dc/terms/" /> -<link rel="schema.AGLSTERMS" href="http://www.agls.gov.au/agls/terms/" /> - -{% endblock -%} - -{% block head_extras -%} -{{ super() }} -<meta name="DCTERMS.Language" scheme="RFC3066" content="en" /> -<meta name="DCTERMS.Type" scheme="AGLSTERMS.Document" content="dataset" /> -<meta name="DCTERMS.Creator" scheme="AGLSTERMS.AglsAgent" content="{{ pkg['organization']['title'] }}" /> -<meta name="DCTERMS.Modified" scheme="DCTERMS.ISO8601" content="{{res['revision_timestamp']}}" /> -<meta name="DCTERMS.Published" scheme="DCTERMS.ISO8601" content="{{res['created']}}" /> -{% if h.get_pkg_dict_extra(pkg,'DCTERMS.Source.URI') %}<meta name="DCTERMS.Source.URI" content="{{h.get_pkg_dict_extra(pkg,'DCTERMS.Source.URI')}}" />{% endif %} -<meta name="DCTERMS.License" content="{{pkg['license_url']}}" /> -<meta name="DCTERMS.Coverage.Temporal" content="{{pkg.temporal_coverage or h.get_pkg_dict_extra(pkg,'Temporal Coverage')}}" /> -<meta name="DCTERMS.Coverage.Spatial" content="{{pkg.spatial_coverage or h.get_pkg_dict_extra(pkg,'Geospatial Coverage')}}" /> -<meta name="AGLSTERMS.Jurisdiction" scheme="AGLSTERMS.AglsJuri" content="{{pkg.jurisdiction or h.get_pkg_dict_extra(pkg,'AGLSTERMS.Jurisdiction')}}" /> -<meta name="DCAT.Theme" scheme="VO" content="{% for x in pkg.groups %}{{x['title']}},{% endfor %}" /> -<meta name="DCAT.byteSize" content="{{res.get('size')}}" /> -<meta name="DCAT.mediaType" content="{{res.get('mimetype')}}" /> -<meta name="DCTERMS.Identifier" content="{{res.get('url')}}" /> -<meta name="DCTERMS.Title" content="{{res['name']}}" /> -<meta name="DCTERMS.Description" scheme="" content="{{res['description']}}" /> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - -<meta name="DCTERMS.Format" content="{{res.format}}" /> -<meta name="DCTERMS.File.Size" content="{{res.size}}" /> - -{% endblock -%} - - - --- /dev/null +++ b/ckanext/datagovau/templates/package/search.html @@ -1,1 +1,7 @@ +{% ckan_extends %} +{% block secondary_content %} +{{ super() }} + {% snippet "spatial/snippets/spatial_query.html", default_extent="[[-11, 114], [-42, 154]]" %} +{% endblock %} + --- a/ckanext/datagovau/templates/package/snippets/package_basic_fields.html +++ b/ckanext/datagovau/templates/package/snippets/package_basic_fields.html @@ -1,41 +1,4 @@ {% ckan_extends %} - -{% block package_basic_fields_org %} - -{{ super() }} - -{{ form.input('agency_program', label=_('Agency Program'), id='field-agency_program', -placeholder=_('Name of the Agency Program that generated the data if relevant'), -value=data.agency_program, error=errors.agency_program, classes=['control-medium']) }} - -{{ form.input('contact_point', label=_('Contact Point'), id='field-contact_point', -placeholder=_('Email address for questions about content of dataset'), -value=data.contact_point, error=errors.contact_point, classes=['control-medium']) }} - -{{ form.input('spatial_coverage', label=_('Geospatial Coverage'), id='field-spatial_coverage', -placeholder=_('The geographical area covered by the data. Eg: Whole of Australia, New South Wales, Canberra'), -value=data.spatial_coverage, error=errors.spatial_coverage, classes=['control-medium']) }} - -{{ form.input('granularity', label=_('Data Granularity'), id='field-granularity', -placeholder=_('Granularity in time, place etc. Eg: incidents reports on daily basis by location.'), -value=data.granularity, error=errors.granularity, classes=['control-medium']) }} - -{{ form.input('jurisdiction', label=_('Government Jurisdiction'), id='field-jurisdiction', -placeholder=_('New South Wales, Glenorchy City Council, Federal'), -value=data.jurisdiction, error=errors.jurisdiction, classes=['control-medium']) }} - -{{ form.input('temporal_coverage', label=_('Temporal Coverage'), id='field-temporal_coverage', -placeholder=_('The timespan the dataset relates to: Current, 2008, 2008-2012, Jan 2012'), -value=data.temporal_coverage, error=errors.temporal_coverage, classes=['control-medium']) }} - -{{ form.select('data_state', label=_('Data State'), options= [{'value': 'active', 'text': 'Active'}, {'value': 'inactive', 'text': 'Inactive'}], -selected='Active', error=errors.data_state) }} - -{{ form.input('update_freq', label=_('Update Frequency'), id='field-update_freq', -placeholder=_('How often the dataset is updated. Eg: Daily, Weekly, Never'), -value=data.update_freq, error=errors.update_freq, classes=['control-medium']) }} - -{% endblock %} {% block package_basic_fields_license %} @@ -60,3 +23,4 @@ </div> </div> {% endblock %} + --- a/ckanext/datagovau/templates/package/snippets/package_metadata_fields.html +++ b/ckanext/datagovau/templates/package/snippets/package_metadata_fields.html @@ -8,19 +8,6 @@ {% endblock %} {# https://github.com/okfn/ckan/blob/master/ckan/templates/macros/form.html documents the macros for fields #} - -{% block package_metadata_fields %} - - -{{ super() }} - -{% endblock %} - -{% block package_metadata_author %} -{% endblock %} - -{% block package_metadata_fields_maintainer %} -{% endblock %} {% block dataset_fields %} {% if data.groups %} @@ -40,3 +27,4 @@ {% set group_attrs = {'data-module': 'autocomplete', 'data-module-source': '/api/2/util/group/autocomplete?q=?', 'data-module-key': 'id', 'data-module-label': 'title'} %} {{ form.input(group_name, label=_('Add Group/Theme'), id="field-group", value=data[group_name], classes=['control-medium'], attrs=group_attrs) }} {% endblock %} + --- /dev/null +++ b/ckanext/datagovau/templates/package/snippets/resource_form.html @@ -1,1 +1,43 @@ +{% ckan_extends %} + {% block basic_fields_url %} + {% set is_upload = (data.url_type == 'upload') %} + {% set field_url='url' %} + {% set field_upload='upload' %} + {% set field_clear='clear_upload' %} + {% set is_upload_enabled=h.uploads_enabled() %} + {% set is_url=data.url and not is_upload %} + {% set upload_label=_('File') %} + {% set url_label=_('URL') %} + + {% set placeholder = placeholder if placeholder else _('http://example.com/my-image.jpg') %} + {% set url_label = url_label or _('Image URL') %} + {% set upload_label = upload_label or _('Image') %} + + {% if is_upload_enabled %} + <div class="image-upload" data-module="image-upload" data-module-is_url="{{ 'true' if is_url else 'false' }}" data-module-is_upload="{{ 'true' if is_upload else 'false' }}" + data-module-field_url="{{ field_url }}" data-module-field_upload="{{ field_upload }}" data-module-field_clear="{{ field_clear }}" data-module-upload_label="{{ upload_label }}"> + {% endif %} + + {% call form.input(field_url, label=url_label, id='field-image-url', placeholder=placeholder, value=data.get(field_url), error=errors.get(field_url), classes=['control-full']) %} +<span id="autoupdate_form"> + {% call form.select('autoupdate', label=_('Generate API from this Link'), options= [{'value': 'active', 'text': 'Active'}, {'value': 'inactive', 'text': 'Inactive'}], selected='Active', error=errors.autoupdate) %} +<br/> +Where a file is compatible with either CKAN or GeoServer we will attempt to make a functional end-point for this resource. The link provided above will also be checked for a new version based on the update frequency as set at the dataset level. +</span> +{% endcall %} +{% endcall %} + + {% if is_upload_enabled %} + {{ form.input(field_upload, label=upload_label, id='field-image-upload', type='file', placeholder='', value='', error='', classes=['control-full']) }} + {% if is_upload %} + {{form.checkbox(field_clear, label=_('Clear Upload'), id='field-clear-upload', value='true', error='', classes=['control-full']) }} + {% endif %} + {% endif %} + + {% if is_upload_enabled %}</div>{% endif %} + + + {% endblock %} + + --- /dev/null +++ b/ckanext/datagovau/templates/related/dashboard.html @@ -1,1 +1,100 @@ +{% extends "page.html" %} +{% set page = c.page %} +{% set item_count = c.page.item_count %} + +{% block subtitle %}{{ _('Government Data Use Cases') }}{% endblock %} + +{% block breadcrumb_content %} + <li>{{ _('Government Data Use Cases') }}</li> +{% endblock %} + +{% block primary_content %} + <article class="module"> + <div class="module-content"> + <h1 class="page-heading"> + {% block page_heading %}{{ _('Government Data Use Cases') }}{% endblock %} + </h1> + + {% block related_items %} + {% if item_count %} + {% trans first=page.first_item, last=page.last_item, item_count=item_count %} + <p>Showing items <strong>{{ first }} - {{ last }}</strong> of <strong>{{ item_count }}</strong> use cases found</p> + {% endtrans %} + {% elif c.filters.type %} + {% trans item_count=item_count %} + <p><strong>{{ item_count }}</strong> use cases found</p> + {% endtrans %} + {% else %} + <p class="empty">{{ _('There have been no use cases submitted yet.') }} + {% endif %} + {% endblock %} + + {% block related_list %} + {% if page.items %} + {% snippet "related/snippets/related_list.html", related_items=page.items %} + {% endif %} + {% endblock %} + </div> + + {% block page_pagination %} + {{ page.pager() }} + {% endblock %} + </article> +{% endblock %} + +{% block secondary_content %} + <section class="module module-narrow module-shallow"> + <h2 class="module-heading">{{ _('What are use cases?') }}</h2> + <div class="module-content"> + {% trans %} + <p>Use Cases are any apps, articles, visualisations or ideas using datasets.</p> + + <p>For example, it could be a custom visualisation, pictograph + or bar chart, an app using all or part of the data or even a news story + that references datasets from this site.</p> + + <p> Send your ideas to <a href="mailto:data.gov@finance.gov.au">data.gov@finance.gov.au</a> with Title; Description; URL; Image URL; and Type: [API|Applications|Idea|News Article|Paper|Post|Visualisation]</p> + {% endtrans %} + </div> + </section> + + <section class="module module-narrow module-shallow"> + <h2 class="module-heading">{{ _('Filter Results') }}</h2> + <form action="" method="get" class="module-content form-inline form-narrow"> + <input type='hidden' name='page' value='1'/> + + <div class="control-group"> + <label for="field-type">{{ _('Filter by type') }}</label> + <select id="field-type" name="type"> + <option value="">{{ _('All') }}</option> + {% for option in c.type_options %} + <option value="{{ option.value }}"{% if c.filters.type == option.value %} selected="selected"{% endif %}>{{ option.text or option.value }}</option> + {% endfor %} + </select> + </div> + + <div class="control-group"> + <label for="field-sort">{{ _('Sort by') }}</label> + <select id="field-sort" name="sort"> + <option value="">{{ _('Default') }}</option> + {% for option in c.sort_options %} + <option value="{{ option.value }}"{% if c.filters.sort == option.value %} selected="selected"{% endif %}>{{ option.text or option.value }}</option> + {% endfor %} + </select> + </div> + + <div class="control-group"> + <label for="field-featured" class="checkbox"> + <input type="checkbox" id="field-featured" name="featured" {% if c.filters.get('featured') == 'on' %} checked="checked"{% endif %}></input> + {{ _('Only show featured items') }} + </label> + </div> + + <div class="form-actions"> + <button class="btn btn-primary">{{ _('Apply') }}</button> + </div> + </form> + </section> +{% endblock %} + --- /dev/null +++ b/ckanext/datagovau/templates/related/snippets/related_item.html @@ -1,1 +1,48 @@ +{# +Displays a single related item. +related - The related item dict. +pkg_id - The id of the owner package. If present the edit button will be + displayed. + +Example: + + + +#} +{% set placeholder_map = { +'application': h.url_for_static('/base/images/placeholder-application.png') +} %} +{% set tooltip = _('Go to {related_item_type}').format(related_item_type=related.type|replace('_', ' ')|title) %} +<li class="related-item media-item" data-module="related-item"> + <img src="{{ related.image_url or placeholder_map[related.type] or h.url_for_static('/base/images/placeholder-image.png') }}" alt="{{ related.title }}" class="media-image"> + <h3 class="media-heading">{{ related.title }}</h3> + {% if related.description %} + <div class="prose"> +{{ h.render_markdown(related.description) }} +</div> + {% endif %} + {% if h.check_access('package_show',{"id":h.get_related_dataset(related.id)}) %} +<small>Using dataset: {{ h.get_action('package_show',{"id":h.get_related_dataset(related.id)}).title }}</small> + {% endif %} + + <a class="media-view" href="{{ related.url }}" target="_blank" title="{{ tooltip }}"> + <span>{{ tooltip }}</span> + <span class="banner"> + {%- if related.type == 'application' -%} + app + {%- elif related.type == 'visualization' -%} + viz + {%- else -%} + {{ related.type | replace('news_', '') }} + {%- endif -%} + </span> + </a> + {% if pkg_id %} + {{ h.nav_link(_('Edit'), controller='related', action='edit', id=pkg_id, related_id=related.id, class_='btn btn-primary btn-small media-edit') }} + {% endif %} +</li> +{% if position is divisibleby 3 %} + <li class="clearfix js-hide"></li> +{% endif %} + --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ entry_points=\ """ [ckan.plugins] - datagovau=ckanext.datagovau.plugin:ExampleIDatasetFormPlugin + datagovau=ckanext.datagovau.plugin:DataGovAuPlugin """, )