diff options
Diffstat (limited to 'chimere')
56 files changed, 862 insertions, 66 deletions
diff --git a/chimere/__init__.py b/chimere/__init__.py index e8e07a3..450d4e5 100644 --- a/chimere/__init__.py +++ b/chimere/__init__.py @@ -1,22 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2012 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> -""" -import os -os.environ['DJANGO_SETTINGS_MODULE'] = 'example_project.settings' +# Copyright (C) 2012-2013 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> -from django.utils.translation import ugettext as _ - -try: - # strings to be considered for translation - # templates/chimere/edit.html, templates/chimere/edit_route.html - _(u"Multimedia files") - _(u"Picture files") -except ImportError: - pass -""" - -VERSION = (2, 0) +VERSION = (2, 0, 1) def get_version(): return u'.'.join((unicode(num) for num in VERSION)) diff --git a/chimere/admin.py b/chimere/admin.py index 4b83878..996dfd5 100644 --- a/chimere/admin.py +++ b/chimere/admin.py @@ -210,17 +210,19 @@ class MarkerAdmin(admin.ModelAdmin): }), ) inlines = [MultimediaInline, PictureInline] + has_properties = True def __init__(self, *args, **kwargs): """ Manage properties in fieldsets. """ - main_fields = self.fieldsets[0][1]['fields'] - for pm in PropertyModel.objects.filter(available=True).order_by('order' + if self.has_properties: + main_fields = self.fieldsets[0][1]['fields'] + for pm in PropertyModel.objects.filter(available=True).order_by('order' ).all(): - pm_name = pm.getNamedId() - if pm_name not in main_fields: - main_fields.append(pm_name) + pm_name = pm.getNamedId() + if pm_name not in main_fields: + main_fields.append(pm_name) super(MarkerAdmin, self).__init__(*args, **kwargs) def queryset(self, request): @@ -286,6 +288,7 @@ class RouteAdmin(MarkerAdmin): }), ) inlines = [] + has_properties = False def queryset(self, request): qs = self.model._default_manager.get_query_set() diff --git a/chimere/default_settings.py b/chimere/default_settings.py deleted file mode 100644 index 049520f..0000000 --- a/chimere/default_settings.py +++ /dev/null @@ -1,36 +0,0 @@ -# -*- coding: utf-8 -*- -""" -Here are the default settings for the Chimere app. -Feel free to set these settings in your project, they will override these defaults. -""" -# The height and width of the POI icons -CHIMERE_ICON_HEIGHT = 20 -CHIMERE_ICON_WIDTH = 20 -# The offset of the POI icons -CHIMERE_ICON_OFFSET_X = 0 -CHIMERE_ICON_OFFSET_Y = 0 - -# default center of the map -CHIMERE_DEFAULT_CENTER = (2.49, 48.7) -# Default zoom level -CHIMERE_DEFAULT_ZOOM = 10 -# projection used by the main map -# most public map providers use spherical mercator : 900913 -CHIMERE_EPSG_PROJECTION = 900913 -# projection displayed to the end user by openlayers -# chimere use the same projection to save its data in the database -CHIMERE_EPSG_DISPLAY_PROJECTION = 4326 -# display of shortcuts for areas -CHIMERE_DISPLAY_AREAS = True -# number of day before an event to display -# if equal to 0: disable event management -# if you change this value from 0 to a value in a production environnement -# don't forget to run the upgrade.py script to create appropriate fields in -# the database -CHIMERE_DAYS_BEFORE_EVENT = 30 - -# JS definition of the main map cf. OpenLayers documentation for more details -CHIMERE_DEFAULT_MAP_LAYER = "new OpenLayers.Layer.OSM.Mapnik('Mapnik')" # OSM mapnik map - -# display picture inside the description by default or inside a galery? -CHIMERE_MINIATURE_BY_DEFAULT = True diff --git a/chimere/static/bsmSelect/GPL-LICENSE.txt b/chimere/static/bsmSelect/GPL-LICENSE.txt new file mode 100644 index 0000000..76927f5 --- /dev/null +++ b/chimere/static/bsmSelect/GPL-LICENSE.txt @@ -0,0 +1,278 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +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 +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the 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 a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE 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.
\ No newline at end of file diff --git a/chimere/static/bsmSelect/MIT-LICENSE.txt b/chimere/static/bsmSelect/MIT-LICENSE.txt new file mode 100644 index 0000000..908016b --- /dev/null +++ b/chimere/static/bsmSelect/MIT-LICENSE.txt @@ -0,0 +1,21 @@ +Copyright (c) 2008 by Ryan Cramer, http://www.ryancramer.com +Copyright (c) 2010 by Victor Berchet + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file diff --git a/chimere/static/bsmSelect/README.md b/chimere/static/bsmSelect/README.md new file mode 100644 index 0000000..bd14c6a --- /dev/null +++ b/chimere/static/bsmSelect/README.md @@ -0,0 +1,191 @@ +# bsmSelect - Better Select Multiple # + +based on asmSelect - Alternate Select Multiple by Ryan Cramer + + * [Google code project](http://code.google.com/p/jquery-asmselect/) + * [Github page](http://github.com/ryancramerdesign/jquery-asmSelect) + * [Ryan's article about asmSelect](http://www.ryancramer.com/journal/entries/select_multiple/) + * the original README can be found in the project root folder + +## Demo ## + +[bsmSelect demo](http://www.suumit.com/projects/bsmSelect/examples/index.html) + +## Usage ## + +Include jquery, bsmSelect, and css in document head: + + <script type="text/javascript" src="jquery.js"></script> + <script type="text/javascript" src="jquery.bsmselect.js"></script> + <link rel="stylesheet" type="text/css" href="jquery.bsmselect.css" /> + +Use a jQuery selector in your document ready function: + + jQuery(function($) { + $("select[multiple]").bsmSelect(); + }); + +If desired, you can specify options when you call the plugin: + + jQuery(function($) { + $("select[multiple]").bsmSelect({ + addItemTarget: 'top' + }); + }); + +The newly created select default option is the original select title attribute: + + <select name="cities" multiple="multiple" title="Please select a city"> + ... + </select> + +## Requirements ## + +* jQuery 1.4+ (you might need a newer version for IE9 compatibility) + +## Options ## + +### Primary Options ### + +* listType: + + * Specify what list will be created or used as part of the bsmSelect. + * Can accept a callback that accepts the original <select> as an argument and returns a jQuery object with a single list. + * Allowed values: + * 'ol' + * 'ul' + * function(originalSelect) { // your code; return $('<ul>'); } + * Default: 'ol' + +* highlightEffect: + + * Show a quick highlight of what item was added or removed? + * Allowed values: + * an animation function + * Default: $.noop (no effect) + +* showEffect: + + * Animate the addition of an item to the list + * Allowed values: + * an animation function + * Default: $.bsmSelect.effects.show + +* hideEffect: + + * Animate the removal of an items from the list + * Allowed values: + * an animation function + * Default: $.bsmSelect.effects.remove + +* hideWhenAdded: + + * Stop showing in select after item has been added? + * Allowed values: true or false + * Default: false + * Note: Only functional in Firefox 3 at this time. + +* addItemTarget: + + * Where to place new selected items that are added to the list. + * Allowed values: 'top' or 'bottom' or 'original' to keep the original select sort order + * Default: 'bottom' + * Note: When using the 'original' mode, the sort order can be overriden by setting the 'bsm-order' data on each option. + +* debugMode: + + * Keeps original select multiple visible so that you can monitor live changes made to it when debugging. + * Default: false + +* extractLabel: + + * A function to compute the list element name from the option object + * Default: extract the option html + +* plugins + + * An array of plugins objects to enable (they only are required to have an `init` method which is called on init with the Bsmselect instance as single argument). + * Default: an empty array (no plugin enabled by default) + +### Text Labels ### + +* title + + * Text used for the default select label (when original select title attribute is not set) + * Default: 'Select...' + +* removeLabel: + + * Text used for the remove link of each list item. + * Default: 'remove' + +* highlightAddedLabel: + + * Text that precedes highlight of item added. + * Default: 'Added: ' + +* highlightRemovedLabel: + + * Text that precedes highlight of item removed. + * Default: 'Removed: ' + +### Modifiable CSS Classes ### + +* containerClass: + + * Class for container that wraps the entire bsmSelect. + * Default: 'bsmContainer' + +* selectClass: + + * Class for the newly created <select>. + * Default: 'bsmSelect' + +* listClass: + + * Class for the newly created list of listType (ol or ul). + * Default: 'bsmList' + +* listSortableClass: + + * Another class given to the list when sortable is active. + * Default: 'bsmListSortable' + +* listItemClass: + + * Class given to the <li> list items. + * Default: 'bsmListItem' + +* listItemLabelClass: + + * Class for the label text that appears in list items. + * Default: 'bsmListItemLabel' + +* removeClass: + + * Class given to the remove link in each list item. + * Any element found in the <li> with this class will remove it. + * If you give the <li> this class, clicking anywhere on the <li> will remove it. + * Default: 'bsmListItemRemove' + +* highlightClass: + + * Class given to the highlight <span>. + * Default: 'bsmHighlight' + +## Authors and contributors ## + + * [Ryan Cramer](http://www.ryancramer.com/) is the author of the original asmSelect + * [Victor Berchet](http://github.com/vicb) is the author of bsmSelect + * [Andy Fowler](http://github.com/andyfowler) has contributed many enhancements + * [Cracky](https://github.com/Cracky) + * [Marc Busqué](https://github.com/laMarciana) has contributed to fix [issue #21](https://github.com/vicb/bsmSelect/issues/21) and with minimal CSS + +## History ## + +see [history.md](history.md). + +## Related Projects ## + + * [Chosen](https://github.com/harvesthq/chosen/) + diff --git a/chimere/static/chimere/js/jquery/bsmSelect/css/jquery.bsmselect.css b/chimere/static/bsmSelect/css/jquery.bsmselect.css index ad770d0..ad770d0 100644 --- a/chimere/static/chimere/js/jquery/bsmSelect/css/jquery.bsmselect.css +++ b/chimere/static/bsmSelect/css/jquery.bsmselect.css diff --git a/chimere/static/chimere/js/jquery/bsmSelect/css/jquery.bsmselect.custom.css b/chimere/static/bsmSelect/css/jquery.bsmselect.custom.css index 8c48aeb..8c48aeb 100644 --- a/chimere/static/chimere/js/jquery/bsmSelect/css/jquery.bsmselect.custom.css +++ b/chimere/static/bsmSelect/css/jquery.bsmselect.custom.css diff --git a/chimere/static/chimere/js/jquery/bsmSelect/js/jquery.bsmselect.compatibility.js b/chimere/static/bsmSelect/js/jquery.bsmselect.compatibility.js index a743a07..a743a07 100644 --- a/chimere/static/chimere/js/jquery/bsmSelect/js/jquery.bsmselect.compatibility.js +++ b/chimere/static/bsmSelect/js/jquery.bsmselect.compatibility.js diff --git a/chimere/static/chimere/js/jquery/bsmSelect/js/jquery.bsmselect.js b/chimere/static/bsmSelect/js/jquery.bsmselect.js index 25527c6..25527c6 100644 --- a/chimere/static/chimere/js/jquery/bsmSelect/js/jquery.bsmselect.js +++ b/chimere/static/bsmSelect/js/jquery.bsmselect.js diff --git a/chimere/static/chimere/js/jquery/bsmSelect/js/jquery.bsmselect.sortable.js b/chimere/static/bsmSelect/js/jquery.bsmselect.sortable.js index 3e4b9f8..3e4b9f8 100644 --- a/chimere/static/chimere/js/jquery/bsmSelect/js/jquery.bsmselect.sortable.js +++ b/chimere/static/bsmSelect/js/jquery.bsmselect.sortable.js diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css index 88f1b5e..c30d259 100644 --- a/chimere/static/chimere/css/styles.css +++ b/chimere/static/chimere/css/styles.css @@ -879,3 +879,8 @@ div.pp_default .pp_expand{ left:10px; background-position: -15px -80px; } + +.olControlAttribution{ + left:6px; + bottom:5px; +} diff --git a/chimere/static/chimere/img/cloud-popup-relative.png b/chimere/static/chimere/img/cloud-popup-relative.png Binary files differindex 1215a36..1215a36 100755..100644 --- a/chimere/static/chimere/img/cloud-popup-relative.png +++ b/chimere/static/chimere/img/cloud-popup-relative.png diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js index 3168c24..dbf820c 100644 --- a/chimere/static/chimere/js/jquery.chimere.js +++ b/chimere/static/chimere/js/jquery.chimere.js @@ -61,6 +61,7 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, { dynamic_categories: false, display_submited: false, display_feature: null, + display_route: null, area_id: null, checked_categories: [], zoom: null, @@ -122,6 +123,8 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, { /* Create map object */ settings.map = map = new OpenLayers.Map(map_element, map_options); + map.addControl(new OpenLayers.Control.Attribution()); + /* Manage permalink */ if (!settings.edition){ if (settings.permalink == null && !settings.edition) { @@ -433,8 +436,10 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, { if (settings.display_feature == feature.pk){ _popup(feature); methods.display_feature_detail(feature.pk); - settings.map.setCenter(feature.lonlat, 16); - methods.loadCategories(); + if (!settings.display_route){ + settings.map.setCenter(feature.lonlat, 16); + methods.loadCategories(); + } } return feature; }, @@ -461,6 +466,11 @@ OpenLayers.Layer.MapQuestOSM = OpenLayers.Class(OpenLayers.Layer.XYZ, { settings.current_feature.style = style; settings.current_feature.geometry = linestring; settings.layerVectors.addFeatures([settings.current_feature]); + if (settings.display_route && settings.display_route == route.properties.pk){ + var dataExtent = settings.current_feature.geometry.getBounds(); + map.zoomToExtent(dataExtent, closest=true); + methods.loadCategories(); + } }, display_feature_detail: function (pk) { /* diff --git a/chimere/static/jme/GPL-LICENSE-2.txt b/chimere/static/jme/GPL-LICENSE-2.txt new file mode 100644 index 0000000..3c993fd --- /dev/null +++ b/chimere/static/jme/GPL-LICENSE-2.txt @@ -0,0 +1,278 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +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 +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the 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 a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE 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.
\ No newline at end of file diff --git a/chimere/static/jme/MIT-LICENSE.txt b/chimere/static/jme/MIT-LICENSE.txt new file mode 100644 index 0000000..e197885 --- /dev/null +++ b/chimere/static/jme/MIT-LICENSE.txt @@ -0,0 +1,20 @@ +Copyright (c) 2010 Alexander Farkas, http://protofunc.com/ + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file diff --git a/chimere/static/chimere/js/OpenLayers.js b/chimere/static/openlayers/OpenLayers.js index d94ff5b..d94ff5b 100644 --- a/chimere/static/chimere/js/OpenLayers.js +++ b/chimere/static/openlayers/OpenLayers.js diff --git a/chimere/static/chimere/js/SimplePanZoom.js b/chimere/static/openlayers/SimplePanZoom.js index 45619c3..45619c3 100644 --- a/chimere/static/chimere/js/SimplePanZoom.js +++ b/chimere/static/openlayers/SimplePanZoom.js diff --git a/chimere/static/prettyPhoto/README b/chimere/static/prettyPhoto/README new file mode 100755 index 0000000..1e56842 --- /dev/null +++ b/chimere/static/prettyPhoto/README @@ -0,0 +1,30 @@ +prettyPhoto v3.1.4 +© Copyright, Stephane Caron +http://www.no-margin-for-errors.com + + +============================= Released under ============================= + +Creative Commons 2.5 +http://creativecommons.org/licenses/by/2.5/ + +OR + +GPLV2 license +http://www.gnu.org/licenses/gpl-2.0.html + +You are free to use prettyPhoto in commercial projects as long as the +copyright header is left intact. + +============================ More information ============================ +http://www.no-margin-for-errors.com/projects/prettyPhoto/ + + +============================== Description =============================== + +prettyPhoto is a jQuery based lightbox clone. Not only does it support images, +it also add support for videos, flash, YouTube, iFrame. It's a full blown +media modal box. + +Please refer to http://www.no-margin-for-errors.com/projects/prettyPhoto/ +for all the details on how to use. diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnNext.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnNext.png Binary files differindex b28c1ef..b28c1ef 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnNext.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnNext.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnPrevious.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnPrevious.png Binary files differindex e0cd9c4..e0cd9c4 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnPrevious.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/btnPrevious.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/contentPattern.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/contentPattern.png Binary files differindex e5a047c..e5a047c 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/contentPattern.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/contentPattern.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/default_thumbnail.gif b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/default_thumbnail.gif Binary files differindex 2b1280f..2b1280f 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/default_thumbnail.gif +++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/default_thumbnail.gif diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/loader.gif b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/loader.gif Binary files differindex 50820ee..50820ee 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/loader.gif +++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/loader.gif diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/sprite.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/sprite.png Binary files differindex fb8c0f8..fb8c0f8 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/sprite.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_rounded/sprite.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnNext.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnNext.png Binary files differindex b28c1ef..b28c1ef 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnNext.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnNext.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnPrevious.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnPrevious.png Binary files differindex e0cd9c4..e0cd9c4 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnPrevious.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/btnPrevious.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/contentPattern.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/contentPattern.png Binary files differindex 7b50aff..7b50aff 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/contentPattern.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/contentPattern.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/default_thumbnail.gif b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/default_thumbnail.gif Binary files differindex 2b1280f..2b1280f 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/default_thumbnail.gif +++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/default_thumbnail.gif diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/loader.gif b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/loader.gif Binary files differindex 50820ee..50820ee 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/loader.gif +++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/loader.gif diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/sprite.png b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/sprite.png Binary files differindex 4fe3547..4fe3547 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/sprite.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/dark_square/sprite.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnNext.png b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnNext.png Binary files differindex e809c3b..e809c3b 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnNext.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnNext.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnPrevious.png b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnPrevious.png Binary files differindex 0812542..0812542 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnPrevious.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/btnPrevious.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternBottom.png b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternBottom.png Binary files differindex a9be3b2..a9be3b2 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternBottom.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternBottom.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternLeft.png b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternLeft.png Binary files differindex 277c87a..277c87a 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternLeft.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternLeft.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternRight.png b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternRight.png Binary files differindex 76e50d0..76e50d0 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternRight.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternRight.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternTop.png b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternTop.png Binary files differindex 8b110ba..8b110ba 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternTop.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/contentPatternTop.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/default_thumbnail.gif b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/default_thumbnail.gif Binary files differindex 2b1280f..2b1280f 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/default_thumbnail.gif +++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/default_thumbnail.gif diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/loader.gif b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/loader.gif Binary files differindex 7ac990c..7ac990c 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/loader.gif +++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/loader.gif diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/sprite.png b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/sprite.png Binary files differindex 660a254..660a254 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/facebook/sprite.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/facebook/sprite.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnNext.png b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnNext.png Binary files differindex b28c1ef..b28c1ef 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnNext.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnNext.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnPrevious.png b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnPrevious.png Binary files differindex e0cd9c4..e0cd9c4 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnPrevious.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/btnPrevious.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/default_thumbnail.gif b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/default_thumbnail.gif Binary files differindex 2b1280f..2b1280f 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/default_thumbnail.gif +++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/default_thumbnail.gif diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/loader.gif b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/loader.gif Binary files differindex 7ac990c..7ac990c 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/loader.gif +++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/loader.gif diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/sprite.png b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/sprite.png Binary files differindex 7f28379..7f28379 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/sprite.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_rounded/sprite.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnNext.png b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnNext.png Binary files differindex b28c1ef..b28c1ef 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnNext.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnNext.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnPrevious.png b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnPrevious.png Binary files differindex e0cd9c4..e0cd9c4 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnPrevious.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/btnPrevious.png diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/default_thumbnail.gif b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/default_thumbnail.gif Binary files differindex 2b1280f..2b1280f 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/default_thumbnail.gif +++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/default_thumbnail.gif diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/loader.gif b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/loader.gif Binary files differindex 7ac990c..7ac990c 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/loader.gif +++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/loader.gif diff --git a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/sprite.png b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/sprite.png Binary files differindex 4fe3547..4fe3547 100755..100644 --- a/chimere/static/prettyPhoto/images/prettyPhoto/light_square/sprite.png +++ b/chimere/static/prettyPhoto/images/prettyPhoto/light_square/sprite.png diff --git a/chimere/templates/chimere/blocks/map.html b/chimere/templates/chimere/blocks/map.html index 886c50b..9788528 100644 --- a/chimere/templates/chimere/blocks/map.html +++ b/chimere/templates/chimere/blocks/map.html @@ -31,8 +31,9 @@ chimere_init_options["checked_categories"] = {{ p_checked_categories }}; {% if area_id %}chimere_init_options['area_id'] = "{{area_id}}";{% endif %} {% if p_current_feature %} - chimere_init_options["display_feature"] = {{ p_current_feature }}; - {% endif %} + chimere_init_options["display_feature"] = {{ p_current_feature }};{% endif %} + {% if p_current_route %} + chimere_init_options["display_route"] = {{ p_current_route }};{% endif %} {% if restricted_extent %}{{ restricted_extent }} chimere_init_options["restricted_extent"] = bounds; {% endif %} diff --git a/chimere/templatetags/chimere_tags.py b/chimere/templatetags/chimere_tags.py index 0182b66..0490c2d 100644 --- a/chimere/templatetags/chimere_tags.py +++ b/chimere/templatetags/chimere_tags.py @@ -185,6 +185,7 @@ bounds.extend(new OpenLayers.LonLat(%f, %f)); return context_data request = context['request'] # Default values + context_data['p_current_route'] = context.get('current_route') if request.GET: for key in ('zoom', 'lon', 'lat', 'display_submited', 'current_feature'): diff --git a/chimere/tests/data_license b/chimere/tests/data_license deleted file mode 100644 index bee3231..0000000 --- a/chimere/tests/data_license +++ /dev/null @@ -1 +0,0 @@ -eqs7day-M5.xml is a georss feed from the website http://www.usgs.gov/ published under the US public domain diff --git a/chimere/utils.py b/chimere/utils.py index d1ea851..a82d88b 100644 --- a/chimere/utils.py +++ b/chimere/utils.py @@ -46,6 +46,8 @@ from chimere import get_version from external_utils import OsmApi def unicode_normalize(string): + if type(string) == str: + string = unicode(string.decode('utf-8')) return ''.join( (c for c in unicodedata.normalize('NFD', string) if unicodedata.category(c) != 'Mn')) diff --git a/chimere/views.py b/chimere/views.py index b49da6e..22bd50a 100644 --- a/chimere/views.py +++ b/chimere/views.py @@ -123,6 +123,13 @@ def index(request, area_name=None, default_area=None, simple=False): if request.GET and 'lat' in request.GET \ and 'lon' in request.GET: zoomout = None + if request.GET and 'current_feature' in request.GET: + try: + m = Marker.objects.get(pk=request.GET['current_feature']) + if m.route: + response_dct['current_route'] = m.route.pk + except: + pass response_dct.update({ 'actions':actions, 'action_selected':('view',), 'error_message':'', diff --git a/chimere/widgets.py b/chimere/widgets.py index 4cccf32..b60a661 100644 --- a/chimere/widgets.py +++ b/chimere/widgets.py @@ -576,13 +576,13 @@ class AreaField(forms.MultiValueField): class MultiSelectWidget(forms.SelectMultiple): class Media: css = {'all': list(settings.JQUERY_CSS_URLS) + [ - settings.STATIC_URL + 'chimere/js/jquery/bsmSelect/css/jquery.bsmselect.css', - settings.STATIC_URL + 'chimere/js/jquery/bsmSelect/css/jquery.bsmselect.custom.css', + settings.STATIC_URL + 'bsmSelect/css/jquery.bsmselect.css', + settings.STATIC_URL + 'bsmSelect/css/jquery.bsmselect.custom.css', ] } js = list(settings.JQUERY_JS_URLS) + [ - settings.STATIC_URL + 'chimere/js/jquery/bsmSelect/js/jquery.bsmselect.js', - settings.STATIC_URL + 'chimere/js/jquery/bsmSelect/js/jquery.bsmselect.compatibility.js', + settings.STATIC_URL + 'bsmSelect/js/jquery.bsmselect.js', + settings.STATIC_URL + 'bsmSelect/js/jquery.bsmselect.compatibility.js', ] def render(self, name, value, attrs=None): |
