summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--chimere/admin.py66
-rw-r--r--chimere/forms.py4
-rw-r--r--chimere/locale/fr/LC_MESSAGES/django.po422
-rw-r--r--chimere/migrations/0040_remove_excluded_status.py242
-rw-r--r--chimere/migrations/0041_auto__add_field_importer_overwrite.py244
-rw-r--r--chimere/models.py17
-rw-r--r--chimere/static/chimere/js/importer_interface.js11
-rw-r--r--chimere/templates/admin/chimere/marker/change_form.html13
l---------chimere/templates/admin/chimere/route/change_form.html1
-rw-r--r--chimere/tests.py103
-rw-r--r--chimere/utils.py37
-rw-r--r--docs/_build/html/_sources/administration.txt115
-rw-r--r--docs/_build/html/_sources/configuration.txt165
-rw-r--r--docs/_build/html/_sources/customisation.txt24
-rw-r--r--docs/_build/html/_sources/import_export.txt14
-rw-r--r--docs/_build/html/_sources/install-1.x.txt353
-rw-r--r--docs/_build/html/_sources/install.txt274
-rw-r--r--docs/_build/html/_sources/upgrade.txt313
-rw-r--r--docs/_build/html/_static/ajax-loader.gifbin673 -> 0 bytes
-rw-r--r--docs/_build/html/_static/basic.css540
-rw-r--r--docs/_build/html/_static/chimere_admin_00.pngbin5855 -> 0 bytes
-rw-r--r--docs/_build/html/_static/chimere_admin_01.pngbin69448 -> 0 bytes
-rw-r--r--docs/_build/html/_static/chimere_admin_02.pngbin62730 -> 0 bytes
-rw-r--r--docs/_build/html/_static/chimere_admin_03.pngbin65588 -> 0 bytes
-rw-r--r--docs/_build/html/_static/comment-bright.pngbin3500 -> 0 bytes
-rw-r--r--docs/_build/html/_static/comment-close.pngbin3578 -> 0 bytes
-rw-r--r--docs/_build/html/_static/comment.pngbin3445 -> 0 bytes
-rw-r--r--docs/_build/html/_static/default.css256
-rw-r--r--docs/_build/html/_static/doctools.js247
-rw-r--r--docs/_build/html/_static/down-pressed.pngbin368 -> 0 bytes
-rw-r--r--docs/_build/html/_static/down.pngbin363 -> 0 bytes
-rw-r--r--docs/_build/html/_static/file.pngbin392 -> 0 bytes
-rw-r--r--docs/_build/html/_static/jquery.js9404
-rw-r--r--docs/_build/html/_static/minus.pngbin199 -> 0 bytes
-rw-r--r--docs/_build/html/_static/plus.pngbin199 -> 0 bytes
-rw-r--r--docs/_build/html/_static/pygments.css62
-rw-r--r--docs/_build/html/_static/searchtools.js560
-rw-r--r--docs/_build/html/_static/sidebar.js151
-rw-r--r--docs/_build/html/_static/underscore.js807
-rw-r--r--docs/_build/html/_static/up-pressed.pngbin372 -> 0 bytes
-rw-r--r--docs/_build/html/_static/up.pngbin363 -> 0 bytes
-rw-r--r--docs/_build/html/_static/websupport.js808
-rw-r--r--docs/_build/html/administration.html231
-rw-r--r--docs/_build/html/configuration.html309
-rw-r--r--docs/_build/html/customisation.html143
-rw-r--r--docs/_build/html/genindex.html95
-rw-r--r--docs/_build/html/import_export.html116
-rw-r--r--docs/_build/html/index.html143
-rw-r--r--docs/_build/html/install.html389
-rw-r--r--docs/_build/html/objects.invbin230 -> 0 bytes
-rw-r--r--docs/_build/html/search.html99
-rw-r--r--docs/_build/html/searchindex.js1
-rw-r--r--docs/_build/html/upgrade.html424
-rw-r--r--docs/_static/chimere_admin_00.pngbin5855 -> 0 bytes
-rw-r--r--docs/_static/chimere_admin_01.pngbin69448 -> 0 bytes
-rw-r--r--docs/_static/chimere_admin_02.pngbin62730 -> 0 bytes
-rw-r--r--docs/_static/chimere_admin_03.pngbin65588 -> 0 bytes
-rw-r--r--docs/administration.rst116
-rw-r--r--docs/customisation.rst24
-rw-r--r--docs/en/Makefile (renamed from docs/Makefile)2
-rw-r--r--docs/en/administration.rst217
-rw-r--r--docs/en/conf.py (renamed from docs/conf.py)4
-rw-r--r--docs/en/configuration.rst (renamed from docs/configuration.rst)138
-rw-r--r--docs/en/customisation.rst52
-rw-r--r--docs/en/import_export.rst241
-rw-r--r--docs/en/index.rst (renamed from docs/index.rst)2
-rw-r--r--docs/en/install.rst (renamed from docs/install.rst)144
-rw-r--r--docs/en/static/chimere_admin_00.png (renamed from docs/_build/html/_images/chimere_admin_00.png)bin5855 -> 5855 bytes
-rw-r--r--docs/en/static/chimere_admin_01.png (renamed from docs/_build/html/_images/chimere_admin_01.png)bin69448 -> 69448 bytes
-rw-r--r--docs/en/static/chimere_admin_02.png (renamed from docs/_build/html/_images/chimere_admin_02.png)bin62730 -> 62730 bytes
-rw-r--r--docs/en/static/chimere_admin_03.png (renamed from docs/_build/html/_images/chimere_admin_03.png)bin65588 -> 65588 bytes
-rw-r--r--docs/en/static/chimere_admin_import_CSV.pngbin0 -> 16957 bytes
-rw-r--r--docs/en/static/chimere_admin_import_KML.pngbin0 -> 19520 bytes
-rw-r--r--docs/en/static/chimere_admin_import_OSM.pngbin0 -> 127457 bytes
-rw-r--r--docs/en/static/chimere_admin_import_georss.pngbin0 -> 14414 bytes
-rw-r--r--docs/en/static/chimere_admin_import_shapefile.pngbin0 -> 18301 bytes
-rw-r--r--docs/en/static/chimere_admin_modified_management.pngbin0 -> 93852 bytes
-rw-r--r--docs/en/static/chimere_admin_modify_item.pngbin0 -> 109282 bytes
-rw-r--r--docs/en/upgrade.rst (renamed from docs/upgrade.rst)86
-rw-r--r--docs/fr/Makefile130
-rw-r--r--docs/fr/administration.rst241
-rw-r--r--docs/fr/conf.py216
-rw-r--r--docs/fr/configuration.rst202
-rw-r--r--docs/fr/customisation.rst58
-rw-r--r--docs/fr/import_export.rst268
-rw-r--r--docs/fr/index.rst (renamed from docs/_build/html/_sources/index.txt)6
-rw-r--r--docs/fr/install.rst299
-rw-r--r--docs/fr/static/chimere_admin_00.pngbin0 -> 5812 bytes
-rw-r--r--docs/fr/static/chimere_admin_01.pngbin0 -> 59556 bytes
-rw-r--r--docs/fr/static/chimere_admin_02.pngbin0 -> 53533 bytes
-rw-r--r--docs/fr/static/chimere_admin_03.pngbin0 -> 44317 bytes
-rw-r--r--docs/fr/static/chimere_admin_import_CSV.pngbin0 -> 16780 bytes
-rw-r--r--docs/fr/static/chimere_admin_import_KML.pngbin0 -> 20123 bytes
-rw-r--r--docs/fr/static/chimere_admin_import_OSM.pngbin0 -> 126286 bytes
-rw-r--r--docs/fr/static/chimere_admin_import_georss.pngbin0 -> 14208 bytes
-rw-r--r--docs/fr/static/chimere_admin_import_shapefile.pngbin0 -> 18208 bytes
-rw-r--r--docs/fr/static/chimere_admin_modified_management.pngbin0 -> 70257 bytes
-rw-r--r--docs/fr/static/chimere_admin_modify_item.pngbin0 -> 190914 bytes
-rw-r--r--docs/fr/upgrade.rst334
-rw-r--r--docs/import_export.rst14
-rw-r--r--requirements.txt1
102 files changed, 3364 insertions, 16636 deletions
diff --git a/.gitignore b/.gitignore
index 4cfffce..35b0ba8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@ example_project/static/upload/*
example_project/media/*
example_project/local_settings.py
chimere_env/
+docs/en/build/
+docs/fr/build/
diff --git a/chimere/admin.py b/chimere/admin.py
index 833ba9d..3c24de0 100644
--- a/chimere/admin.py
+++ b/chimere/admin.py
@@ -95,39 +95,44 @@ def export_to_csv(modeladmin, request, queryset):
export_to_csv.short_description = _(u"Export to CSV")
def managed_modified(modeladmin, request, queryset):
+ # not very clean... There is must be a better way to do that
+ redirect_url = request.get_full_path().split('admin_modification')[0]
if queryset.count() != 1:
messages.error(request, _(u"Only one item can be managed at a "
u"time."))
- return HttpResponseRedirect(request.get_full_path())
+ return HttpResponseRedirect(redirect_url)
item = queryset.all()[0]
- if not item.status == 'M':
+ if not item.ref_item or item.ref_item == item:
try:
- item = modeladmin.model.objects.get(ref_item=item, status='M')
+ item = modeladmin.model.objects.get(ref_item=item)
except ObjectDoesNotExist:
messages.error(request, _(u"No modified item associated "
u"to the selected item."))
- return HttpResponseRedirect(request.get_full_path())
+ return HttpResponseRedirect(redirect_url)
item_ref = item.ref_item
if request.POST.get('rapprochement'):
couple = [(item, item_ref)]
if hasattr(item, 'associated_marker'):
couple.append((item.associated_marker.all()[0],
item_ref.associated_marker.all()[0]))
- updated_keys = dict(request.POST)
+ updated = dict(request.POST)
# clean
for k in ('action', 'rapprochement', 'index', '_selected_action'):
- if k in updated_keys:
- updated_keys.pop(k)
+ if k in updated:
+ updated.pop(k)
for idx, cpl in enumerate(couple):
it, it_ref = cpl
# don't copy geometry of associated items
if idx:
for k in ('route', 'point'):
- if k in updated_keys:
- updated_keys.pop(k)
+ if k in updated:
+ updated.pop(k)
+ updated_keys = updated.keys()
+ if it.status == 'I':
+ updated_keys.append('import_version')
for k in updated_keys:
- if not request.POST[k]:
+ if k != 'import_version' and not request.POST[k]:
continue
if hasattr(it_ref, k):
c_value = getattr(it_ref, k)
@@ -149,7 +154,7 @@ def managed_modified(modeladmin, request, queryset):
it.delete()
item.delete()
messages.success(request, _(u"Modified item traited."))
- return HttpResponseRedirect(request.get_full_path())
+ return HttpResponseRedirect(redirect_url)
return render_to_response('admin/chimere/managed_modified.html',
{'item':item, 'item_ref':item_ref},
context_instance=RequestContext(request))
@@ -181,7 +186,7 @@ class MarkerAdmin(admin.ModelAdmin):
exclude = ['submiter_session_key', 'import_key', 'import_version',
'available_date', 'ref_item']
readonly_fields = ['submiter_email', 'submiter_comment', 'import_source',
- 'submiter_name', 'ref_item', 'modified_since_import']
+ 'submiter_name', 'ref_item', 'modified_since_import', 'route']
form = MarkerAdminForm
fieldsets = ((None, {
'fields': ['point', 'name', 'status', 'categories',
@@ -194,10 +199,10 @@ class MarkerAdmin(admin.ModelAdmin):
}),
(_(u"Import"), {
'classes':('collapse',),
- 'fields': ('modified_since_import', 'import_source',
- 'origin', 'license')
+ 'fields': ('not_for_osm', 'modified_since_import',
+ 'import_source', 'origin', 'license')
}),
- (_(u"Advanced options"), {
+ (_(u"Associated items"), {
'classes':('collapse',),
'fields': ('ref_item', 'route',)
}),
@@ -229,7 +234,24 @@ class MarkerAdmin(admin.ModelAdmin):
qs = qs.order_by(*ordering)
return qs.distinct()
-class RouteAdmin(admin.ModelAdmin):
+ def admin_modification(self, request, item_id):
+ '''
+ Redirect to the marker modification form
+ '''
+ return managed_modified(self, request,
+ Marker.objects.filter(pk=item_id))
+ def get_urls(self):
+ from django.conf.urls.defaults import *
+ urls = super(MarkerAdmin, self).get_urls()
+ my_urls = patterns('',
+ url(r'^admin_modification/(?P<item_id>\d+)/$',
+ self.admin_site.admin_view(self.admin_modification),
+ name='admin-modification'),
+ )
+ return my_urls + urls
+
+
+class RouteAdmin(MarkerAdmin):
"""
Specialized the Route field.
"""
@@ -238,7 +260,7 @@ class RouteAdmin(admin.ModelAdmin):
list_filter = ('status', 'categories')
exclude = ['height', 'width']
form = RouteAdminForm
- readonly_fields = ('associated_file',)
+ readonly_fields = ('associated_file', 'ref_item', 'has_associated_marker')
actions = [validate, disable, managed_modified, export_to_kml,
export_to_shapefile, export_to_csv]
fieldsets = ((None, {
@@ -255,12 +277,13 @@ class RouteAdmin(admin.ModelAdmin):
'fields': ('modified_since_import', 'import_source',
'origin', 'license')
}),
- (_(u"Advanced options"), {
+ (_(u"Associated items"), {
'classes':('collapse',),
'fields': ('ref_item', 'associated_file',
'has_associated_marker')
}),
)
+ inlines = []
def queryset(self, request):
qs = self.model._default_manager.get_query_set()
@@ -275,6 +298,13 @@ class RouteAdmin(admin.ModelAdmin):
qs = qs.order_by(*ordering)
return qs
+ def admin_modification(self, request, item_id):
+ '''
+ Redirect to the route modification form
+ '''
+ return managed_modified(self, request,
+ Route.objects.filter(pk=item_id))
+
class LayerInline(admin.TabularInline):
model = AreaLayers
extra = 1
diff --git a/chimere/forms.py b/chimere/forms.py
index 200d2f1..1d403c8 100644
--- a/chimere/forms.py
+++ b/chimere/forms.py
@@ -154,11 +154,11 @@ class ImporterAdminForm(forms.ModelForm):
if self.cleaned_data.get('importer_type') == 'OSM' and \
not self.cleaned_data.get('filtr'):
raise forms.ValidationError(_(u"For OSM import you must be "\
- u"provide a filter. Select an area and node/way filter."))
+ u"provide a filter. Select an area and node/way filter."))
if self.cleaned_data.get('importer_type') == 'OSM' and \
not RE_XAPI.match(self.cleaned_data.get('filtr')):
raise forms.ValidationError(_(u"For OSM import you must be "\
- u"provide a filter. Select an area and node/way filter."))
+ u"provide a filter. Select an area and node/way filter."))
if self.cleaned_data.get('importer_type') == 'SHP' and \
not self.cleaned_data.get('zipped'):
raise forms.ValidationError(_(u"Shapefiles must be provided in a "\
diff --git a/chimere/locale/fr/LC_MESSAGES/django.po b/chimere/locale/fr/LC_MESSAGES/django.po
index 77a7d19..d15aa9a 100644
--- a/chimere/locale/fr/LC_MESSAGES/django.po
+++ b/chimere/locale/fr/LC_MESSAGES/django.po
@@ -1,23 +1,24 @@
# Chimère
# Copyright (C) 2008-2012
# This file is distributed under the same license as the Chimère package.
-# Étienne Loks <etienne.loks@peacefrogs.net>, 2008-2012.
+# Étienne Loks <etienne.loks@peacefrogs.net>, 2008-2011.
#
msgid ""
msgstr ""
-"Project-Id-Version: 2.0\n"
+"Project-Id-Version: 0.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-11-26 19:26+0100\n"
+"POT-Creation-Date: 2012-12-13 15:52+0100\n"
+"PO-Revision-Date: 2010-03-20 20:00+0100\n"
"Last-Translator: Étienne Loks <etienne.loks@peacefrogs.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: __init__.py:8 models.py:763
+#: __init__.py:8 models.py:768
msgid "Multimedia files"
msgstr "Fichiers multimedias"
-#: __init__.py:9 models.py:835
+#: __init__.py:9 models.py:840
msgid "Picture files"
msgstr "Fichiers d'image"
@@ -45,95 +46,94 @@ msgstr "Flux RSS"
msgid "Contact us"
msgstr "Nous contacter"
-#: admin.py:59
+#: admin.py:54
msgid "Disable"
msgstr "Désactiver"
-#: admin.py:65 templates/admin/chimere/managed_modified.html:44
+#: admin.py:60 templates/admin/chimere/managed_modified.html:44
#: templates/chimere/feeds/rss.html:70
msgid "Validate"
msgstr "Valider"
-#: admin.py:76
+#: admin.py:71
msgid "Export to KML"
msgstr "Exporter en KML"
-#: admin.py:90
+#: admin.py:85
msgid "Export to Shapefile"
msgstr "Exporter en Shapefile"
-#: admin.py:100
+#: admin.py:95
msgid "Export to CSV"
msgstr "Exporter en CSV"
-#: admin.py:104
+#: admin.py:101
msgid "Only one item can be managed at a time."
msgstr "Seul un élément à la fois peut-être géré."
-#: admin.py:113
+#: admin.py:110
msgid "No modified item associated to the selected item."
msgstr "Pas d'élément modifié associé à l'élément sélectionné."
#: admin.py:156
msgid "Modified item traited."
-msgstr "Modifié depuis le dernier import"
+msgstr "Élément modifié traité."
#: admin.py:161
msgid "Managed modified items"
msgstr "Gérer les éléments modifiés"
-#: admin.py:195 admin.py:253
+#: admin.py:195 admin.py:270
msgid "Submitter"
msgstr "Demandeur"
-#: admin.py:200 admin.py:258 admin.py:301
+#: admin.py:200 admin.py:275 admin.py:326
msgid "Import"
msgstr "Import"
-#: admin.py:205 admin.py:263
-msgid "Advanced options"
-msgstr "Options avancées"
+#: admin.py:205 admin.py:280
+msgid "Associated items"
+msgstr "Éléments associés"
-#: admin.py:307
+#: admin.py:332
msgid "Cancel import"
msgstr "Annuler l'import"
-#: admin.py:313
+#: admin.py:338
msgid "Cancel export"
msgstr "Annuler l'export"
-#: admin.py:317
+#: admin.py:342
msgid "Can manage only one OSM export at a time."
msgstr "Ne peux gérer qu'un seul export OSM à la fois."
-#: admin.py:322
+#: admin.py:347
msgid ""
"You must treat all item with the status \"imported\" before exporting to OSM."
msgstr ""
"Vous devez traiter tous les éléments avec le status « importé » avant "
"d'exporter vers OSM."
-#: admin.py:326
+#: admin.py:351
msgid "Only OSM importer are managed for export."
msgstr "Seul les imports de type OSM peuvent être gérés pour les exports."
-#: admin.py:333
+#: admin.py:358
msgid "No point of interest are concerned by this export."
msgstr "Aucun point d'intérêt n'est concerné par cet export."
-#: admin.py:345
+#: admin.py:370
msgid "Export launched."
msgstr "Export lancé."
-#: admin.py:349
+#: admin.py:374
#, python-format
msgid ""
"%s point(s) of interest concerned by this export before bounding box filter."
msgstr ""
-"%s point(s) d'intérêt concerné par cet export (avant le filtre sur la "
-"zone)"
+"%s point(s) d'intérêt concerné par cet export (avant le filtre sur la zone)"
-#: admin.py:354
+#: admin.py:379
msgid "Export to osm"
msgstr "Exporter vers osm"
@@ -149,50 +149,50 @@ msgstr "Nouveaux points d'intérêt de "
msgid "Last points of interest by area"
msgstr "Nouveaux points d'intérêt par zone"
-#: forms.py:90
+#: forms.py:83
msgid "New submission for"
msgstr "Nouvelle proposition pour"
-#: forms.py:91
+#: forms.py:84
#, python-format
msgid "The new item \"%s\" has been submited in the category: "
msgstr "Le nouvel élément « %s » a été proposé dans la catégorie : "
-#: forms.py:93
+#: forms.py:86
msgid "To valid, precise or unvalid this item: "
msgstr "Pour valider, préciser ou rejeter cet élément : "
-#: forms.py:103
+#: forms.py:96
msgid "Email (optional)"
msgstr "Courriel (optionnel) "
-#: forms.py:104
+#: forms.py:97
msgid "Object"
msgstr "Objet"
-#: forms.py:125
+#: forms.py:117
msgid "OSM user"
msgstr "Utilisateur OSM"
-#: forms.py:126 models.py:1452
+#: forms.py:118 models.py:1457
msgid "Password"
msgstr "Mot de passe"
-#: forms.py:130
+#: forms.py:122
msgid "API"
msgstr "API"
-#: forms.py:133
+#: forms.py:125
#, python-format
msgid "Test API - %s"
msgstr "API de test - %s"
-#: forms.py:135
+#: forms.py:127
#, python-format
msgid "Main API - %s"
msgstr "API principale - %s"
-#: forms.py:165 forms.py:169
+#: forms.py:156 forms.py:160
msgid ""
"For OSM import you must be provide a filter. Select an area and node/way "
"filter."
@@ -200,73 +200,73 @@ msgstr ""
"Pour les imports OSM vous devez fournir un filtre. Sélectionnez une zone et "
"un filtre sur les nœuds/routes."
-#: forms.py:173
+#: forms.py:164
msgid "Shapefiles must be provided in a zipped archive."
msgstr ""
"Les fichiers Shapefiles doivent être fournis regroupés dans une archive zip."
-#: forms.py:177
+#: forms.py:168
msgid "You have to set \"source\" or \"source file\" but not both."
msgstr ""
"Vous devez spécifier le champ « Source » ou « Fichier source » mais pas les "
"deux."
-#: forms.py:182
+#: forms.py:173
msgid "You have to set \"source\" or \"source file\"."
msgstr "Vous devez spécifier le champ « Source » ou « Fichier source »."
-#: forms.py:243
+#: forms.py:234
msgid "End date has been set with no start date"
msgstr "Une date de fin a été donnée sans date de début"
-#: forms.py:247
+#: forms.py:238
msgid "End date can't be before start date"
msgstr "La date de fin ne peut pas être antérieure à la date de début"
-#: forms.py:257
+#: forms.py:248
msgid "This field is mandatory for the selected categories"
msgstr "Ce champ est obligatoire pour les catégories sélectionnées"
-#: forms.py:535
+#: forms.py:499
msgid "File"
msgstr "Fichier"
-#: forms.py:541
+#: forms.py:505
msgid "Bad file format: this must be a GPX or KML file"
msgstr "Mauvais format de fichier : KML et GPX sont supportés"
-#: forms.py:546 models.py:53 models.py:101 models.py:163 models.py:184
-#: models.py:197 models.py:212 models.py:362 models.py:697 models.py:753
-#: models.py:812 models.py:928 models.py:1257 models.py:1269 models.py:1442
-#: utils.py:465 templates/admin/chimere/managed_modified.html:23
+#: forms.py:510 models.py:53 models.py:101 models.py:163 models.py:184
+#: models.py:197 models.py:212 models.py:364 models.py:702 models.py:758
+#: models.py:817 models.py:933 models.py:1262 models.py:1274 models.py:1447
+#: utils.py:470 templates/admin/chimere/managed_modified.html:23
#: templates/chimere/edit.html:39 templates/chimere/edit_route.html:36
#: templates/chimere/blocks/alternate_multimedia.html:39
msgid "Name"
msgstr "Nom"
-#: forms.py:555 models.py:1306
+#: forms.py:519 models.py:1311
msgid "Area"
msgstr "Zone"
-#: forms.py:595
+#: forms.py:559
msgid "No area selected."
msgstr "Pas de zone sélectionnée."
-#: forms.py:602
+#: forms.py:566
#, python-format
msgid "The area \"%s\" has the same order, you need to choose another one."
msgstr ""
"La zone « %s » a le même numéro d'ordre, vous devez un choisir un autre."
-#: forms.py:647
+#: forms.py:611
msgid "Start"
msgstr "Départ"
-#: forms.py:648
+#: forms.py:612
msgid "Finish"
-msgstr "Arrivée :"
+msgstr "Arrivée"
-#: forms.py:649
+#: forms.py:613
msgid "Speed"
msgstr "Vitesse"
@@ -274,13 +274,13 @@ msgstr "Vitesse"
msgid "Mnemonic"
msgstr "Mnémonique"
-#: models.py:56 models.py:102 models.py:185 models.py:213 models.py:373
-#: models.py:701 models.py:1275 models.py:1444 models.py:1485
+#: models.py:56 models.py:102 models.py:185 models.py:213 models.py:375
+#: models.py:706 models.py:1280 models.py:1449 models.py:1490
msgid "Available"
msgstr "Disponible"
-#: models.py:57 models.py:173 models.py:186 models.py:230 models.py:755
-#: models.py:827 models.py:1274 models.py:1431 models.py:1443
+#: models.py:57 models.py:173 models.py:186 models.py:230 models.py:760
+#: models.py:832 models.py:1279 models.py:1436 models.py:1448
msgid "Order"
msgstr "Ordre"
@@ -292,15 +292,15 @@ msgstr "Chemin du patron"
msgid "Page"
msgstr "Page"
-#: models.py:103 models.py:456
+#: models.py:103 models.py:457
msgid "Is front page"
msgstr "Est en page principale"
-#: models.py:105 models.py:1453
+#: models.py:105 models.py:1458
msgid "Date"
msgstr "Date"
-#: models.py:107 models.py:754
+#: models.py:107 models.py:759
msgid "Url"
msgstr "Url"
@@ -337,16 +337,16 @@ msgstr "Couleur"
msgid "Category"
msgstr "Catégorie"
-#: models.py:198 models.py:693 models.py:813 models.py:994
+#: models.py:198 models.py:698 models.py:818 models.py:999
#: templates/chimere/blocks/alternate_multimedia.html:43
msgid "Image"
msgstr "Image"
-#: models.py:200 models.py:815 models.py:996
+#: models.py:200 models.py:820 models.py:1001
msgid "Height"
msgstr "Hauteur"
-#: models.py:201 models.py:816 models.py:997
+#: models.py:201 models.py:821 models.py:1002
msgid "Width"
msgstr "Largeur"
@@ -356,13 +356,13 @@ msgstr "Icône"
#: models.py:214
msgid "Available for submission"
-msgstr "Disponible pour proposition"
+msgstr "Disponible pour soumission"
#: models.py:216
msgid "Marker"
msgstr "Point d'intérêt"
-#: models.py:217 models.py:990 models.py:1007
+#: models.py:217 models.py:995 models.py:1012
#: templates/chimere/edit_route.html:27
msgid "Route"
msgstr "Trajet"
@@ -427,287 +427,287 @@ msgstr "SRID"
msgid "Zipped file"
msgstr "Fichier zippé"
-#: models.py:332 models.py:390
+#: models.py:332
+msgid "Overwrite existing data"
+msgstr "Écraser les données existantes"
+
+#: models.py:334 models.py:391
msgid "Origin"
msgstr "Origine"
-#: models.py:334 models.py:392
+#: models.py:336 models.py:393
msgid "License"
msgstr "Licence"
-#: models.py:337
+#: models.py:339
msgid "Associated subcategories"
msgstr "Sous-catégories associées"
-#: models.py:338 utils.py:469
+#: models.py:340 utils.py:474
msgid "State"
msgstr "État"
-#: models.py:340
+#: models.py:342
msgid "Automatically associate a marker to a way"
msgstr "Associer automatiquement un marqueur à une route"
-#: models.py:344
+#: models.py:346
msgid "Importer"
msgstr "Import"
-#: models.py:364
+#: models.py:366
msgid "Submitter session key"
msgstr "Clé de session du demandeur"
-#: models.py:366
+#: models.py:368
msgid "Submitter name or nickname"
msgstr "Nom ou pseudo du demandeur"
-#: models.py:368
+#: models.py:370
msgid "Submitter email"
msgstr "Courriel du demandeur"
-#: models.py:370
+#: models.py:372
msgid "Submitter comment"
msgstr "Commentaire du demandeur"
-#: models.py:372
+#: models.py:374
msgid "Submited"
msgstr "Soumis"
-#: models.py:374
+#: models.py:376
msgid "Modified"
msgstr "Modifié"
-#: models.py:375
+#: models.py:377
msgid "Disabled"
msgstr "Désactivé"
-#: models.py:376
+#: models.py:378
msgid "Imported"
msgstr "Importé"
-#: models.py:377
-msgid "Excluded"
-msgstr "Exclu"
-
-#: models.py:379
+#: models.py:380
msgid "Status"
msgstr "État"
-#: models.py:380
+#: models.py:381
msgid "Import key"
msgstr "Clé d'import"
-#: models.py:382
+#: models.py:383
msgid "Import version"
msgstr "Version de l'import"
-#: models.py:384
+#: models.py:385
msgid "Source"
msgstr "Source"
-#: models.py:386
+#: models.py:387
msgid "Modified since last import"
msgstr "Modifié depuis le dernier import"
-#: models.py:388
-msgid "Not to be imported inside OSM"
-msgstr "Ne pas importer dans OSM"
+#: models.py:389
+msgid "Not to be exported to OSM"
+msgstr "À ne pas exporter vers OSM"
-#: models.py:394 templates/chimere/edit.html:56
+#: models.py:395 templates/chimere/edit.html:56
#: templates/chimere/edit_route.html:52
msgid "Start date"
msgstr "Date de début"
-#: models.py:395
+#: models.py:396
msgid "Not mandatory. Set it for dated item such as event. Format YYYY-MM-DD"
msgstr ""
"Optionnel. Précisez ce champ pour les éléments datés comme un événement. "
"Format du champ : AAAA-MM-JJ"
-#: models.py:397 templates/chimere/edit.html:62
+#: models.py:398 templates/chimere/edit.html:62
#: templates/chimere/edit_route.html:58
msgid "End date"
msgstr "Date de fin"
-#: models.py:398
+#: models.py:399
msgid ""
"Not mandatory. Set it only if you have a multi-day event. Format YYYY-MM-DD"
msgstr ""
"Optionnel. Précisez ce champ seulement pour des événements durant plusieurs "
"jours. Format du champ : AAAA-MM-JJ"
-#: models.py:448
+#: models.py:449
msgid "Reference marker"
msgstr "Point d'intérêt de référence"
-#: models.py:449 utils.py:471
+#: models.py:450 utils.py:476
msgid "Localisation"
msgstr "Localisation"
-#: models.py:451
+#: models.py:452
msgid "Available Date"
msgstr "Date de mise en disponibilité"
-#: models.py:455 utils.py:470 templates/admin/chimere/managed_modified.html:31
+#: models.py:456 utils.py:475 templates/admin/chimere/managed_modified.html:31
#: templates/chimere/edit.html:49 templates/chimere/edit_route.html:46
msgid "Description"
msgstr "Description"
-#: models.py:523 models.py:1495
+#: models.py:524 models.py:1500
msgid "Point of interest"
msgstr "Point d'intérêt"
-#: models.py:691
+#: models.py:696
msgid "Audio"
msgstr "Audio"
-#: models.py:692
+#: models.py:697
msgid "Video"
msgstr "Vidéo"
-#: models.py:694
+#: models.py:699
msgid "Other"
msgstr "Autre"
-#: models.py:695
+#: models.py:700
msgid "Media type"
msgstr "Type de media"
-#: models.py:698
+#: models.py:703
msgid "Mime type"
msgstr "Type mime"
-#: models.py:700
+#: models.py:705
msgid "Inside an iframe"
msgstr "À l'intérieur d'un iframe"
-#: models.py:704
+#: models.py:709
msgid "Multimedia type"
msgstr "Type de multimedia"
-#: models.py:705
+#: models.py:710
msgid "Multimedia types"
msgstr "Types de multimedia"
-#: models.py:714
+#: models.py:719
msgid "Automatic recognition"
msgstr "Reconnaissance automatique"
-#: models.py:740
+#: models.py:745
msgid "Extension name"
msgstr "Nom de l'extension"
-#: models.py:742
+#: models.py:747
msgid "Associated multimedia type"
msgstr "Type de multimedia associé"
-#: models.py:746
+#: models.py:751
msgid "Multimedia extension"
-msgstr "Extension de fichier multimedia"
+msgstr "Extension multimedia"
-#: models.py:747
+#: models.py:752
msgid "Multimedia extensions"
-msgstr "Extensions de fichier multimedia"
+msgstr "Extensions multimedia"
-#: models.py:757 models.py:817
+#: models.py:762 models.py:822
msgid "Display inside the description?"
msgstr "Apparaît dans la description ?"
-#: models.py:762
+#: models.py:767
msgid "Multimedia file"
msgstr "Fichier multimedia"
-#: models.py:819
+#: models.py:824
msgid "Thumbnail"
msgstr "Miniature"
-#: models.py:823
+#: models.py:828
msgid "Thumbnail height"
msgstr "Hauteur de la miniature"
-#: models.py:825
+#: models.py:830
msgid "Thumbnail width"
msgstr "Largeur de la miniature"
-#: models.py:834
+#: models.py:839
msgid "Picture file"
msgstr "Fichier d'image"
-#: models.py:929
+#: models.py:934
msgid "Raw file (gpx or kml)"
msgstr "Fichier brut (gpx ou kml)"
-#: models.py:931
+#: models.py:936
msgid "Simplified file"
msgstr "Fichier simplifié"
-#: models.py:933
+#: models.py:938
msgid "KML"
msgstr "KML"
-#: models.py:933
+#: models.py:938
msgid "GPX"
msgstr "GPX"
-#: models.py:938
+#: models.py:943
msgid "Route file"
msgstr "Fichier de trajet"
-#: models.py:939
+#: models.py:944
msgid "Route files"
msgstr "Fichiers de trajet"
-#: models.py:989
+#: models.py:994
msgid "Reference route"
msgstr "Trajet de référence"
-#: models.py:993
+#: models.py:998
msgid "Associated file"
msgstr "Fichier associé"
-#: models.py:998
+#: models.py:1003
msgid "Has an associated marker"
msgstr "Dispose d'un marqueur associé"
-#: models.py:1258
+#: models.py:1263
msgid "Layer code"
msgstr "Code pour la couche"
-#: models.py:1264
+#: models.py:1269
msgid "Layer"
msgstr "Couche"
-#: models.py:1270
+#: models.py:1275
msgid "Area urn"
msgstr "Urn de la zone"
-#: models.py:1272 templates/chimere/blocks/welcome.html:3
+#: models.py:1277 templates/chimere/blocks/welcome.html:3
msgid "Welcome message"
msgstr "Message d'accueil"
-#: models.py:1276
+#: models.py:1281
msgid "Upper left corner"
msgstr "Coin en haut à gauche"
-#: models.py:1278
+#: models.py:1283
msgid "Lower right corner"
msgstr "Coin en bas à droite"
-#: models.py:1280
+#: models.py:1285
msgid "Default area"
msgstr "Zone par défaut"
-#: models.py:1281
+#: models.py:1286
msgid "Only one area is set by default"
msgstr "Seule une zone est définie par défaut"
-#: models.py:1285
+#: models.py:1290
msgid "Sub-categories checked by default"
msgstr "Sous-catégories cochées par défaut"
-#: models.py:1287
+#: models.py:1292
msgid "Sub-categories dynamicaly displayed"
msgstr "Sous-categories affichées dynamiquement"
-#: models.py:1288
+#: models.py:1293
msgid ""
"If checked, categories are only displayed in the menu if they are available "
"on the current extent."
@@ -715,72 +715,72 @@ msgstr ""
"Si coché, les catégories sont disponibles sur le menu seulement si elles "
"apparaissent sur la zone affichée."
-#: models.py:1292 models.py:1447
+#: models.py:1297 models.py:1452
msgid "Restricted to theses sub-categories"
msgstr "Restreindre à ces sous-categories"
-#: models.py:1293
+#: models.py:1298
msgid "If no sub-category is set all sub-categories are available"
msgstr ""
"Si aucune sous-catégorie n'est définie toutes les sous-catégories sont "
"disponibles"
-#: models.py:1295
+#: models.py:1300
msgid "Link to an external CSS"
msgstr "Lien vers une feuille de style externe"
-#: models.py:1297
+#: models.py:1302
msgid "Restrict to the area extent"
msgstr "Restreindre à l'étendue de la zone"
-#: models.py:1432 widgets.py:88
+#: models.py:1437 widgets.py:88
msgid "Default layer"
msgstr "Couche par défaut"
-#: models.py:1436 models.py:1437
+#: models.py:1441 models.py:1442
msgid "Layers"
msgstr "Couches"
-#: models.py:1445
+#: models.py:1450
msgid "Mandatory"
msgstr "Obligatoire"
-#: models.py:1448
+#: models.py:1453
msgid ""
"If no sub-category is set all the property applies to all sub-categories"
msgstr ""
"Si aucune sous-catégorie n'est précisée, cette propriété est disponible pour "
"toutes les sous-catégories"
-#: models.py:1450
+#: models.py:1455
msgid "Text"
msgstr "Texte"
-#: models.py:1451
+#: models.py:1456
msgid "Long text"
msgstr "Texte long"
-#: models.py:1454
+#: models.py:1459
msgid "Choices"
msgstr "Choix"
-#: models.py:1462
+#: models.py:1467
msgid "Type"
msgstr "Type"
-#: models.py:1467 models.py:1483 models.py:1497
+#: models.py:1472 models.py:1488 models.py:1502
msgid "Property model"
msgstr "Modèle de propriété"
-#: models.py:1484 models.py:1498
+#: models.py:1489 models.py:1503
msgid "Value"
msgstr "Valeur"
-#: models.py:1490
+#: models.py:1495
msgid "Model property choice"
msgstr "Choix pour les modèles de propriété"
-#: models.py:1509
+#: models.py:1514
msgid "Property"
msgstr "Propriété"
@@ -834,69 +834,69 @@ msgstr "Export échoué"
msgid "Export canceled"
msgstr "Export annulé"
-#: utils.py:130 utils.py:179
+#: utils.py:135 utils.py:184
msgid "Bad zip file"
msgstr "Mauvais fichier zip"
-#: utils.py:182
+#: utils.py:187
msgid "Missing file(s) inside the zip file"
msgstr "Fichier(s) manquant(s) dans l'archive zip"
-#: utils.py:223
+#: utils.py:228
msgid "Bad XML file"
msgstr "Mauvais fichier XML"
-#: utils.py:308
+#: utils.py:313
msgid "Error while reading the data source."
msgstr "Erreur lors de la lecture de la source."
-#: utils.py:326
+#: utils.py:331
#, python-format
msgid "SRID cannot be guessed. The default SRID (%s) has been used."
msgstr "Le SRID n'a pu être trouvé. Le SRID par défaut (%s) a été utilisé."
-#: utils.py:347
+#: utils.py:352
msgid "Type of geographic item of this shapefile is not managed by Chimère."
msgstr ""
"Les types des éléments géographiques de ce fichier Shapefile ne sont pas "
"gérés par Chimère."
-#: utils.py:367
+#: utils.py:372
msgid "Bad Shapefile"
msgstr "Mauvais fichier Shapefile"
-#: utils.py:409
+#: utils.py:414
msgid "Could not create file!"
msgstr "Ne peut pas créer le fichier !"
-#: utils.py:420
+#: utils.py:425
msgid "Failed to create field"
msgstr "Ne peut pas créer un champ"
-#: utils.py:466 templates/admin/chimere/managed_modified.html:25
+#: utils.py:471 templates/admin/chimere/managed_modified.html:25
#: templates/chimere/edit.html:44 templates/chimere/edit_route.html:41
#: templates/chimere/main_map.html:13
#: templates/chimere/main_map_simple.html:10
msgid "Categories"
msgstr "Catégories"
-#: utils.py:499
+#: utils.py:504
msgid "Invalid CSV format"
msgstr "Fichier CSV non valide"
-#: utils.py:574
+#: utils.py:579
msgid "RSS feed is not well formed"
msgstr "Flux RSS non valide"
-#: utils.py:649
+#: utils.py:654
msgid "Nothing to import"
msgstr "Rien à importer"
-#: utils.py:737
+#: utils.py:742
msgid "New items imported - validate them before exporting"
msgstr "Nouveaux éléments importés - valider ceux-ci avant d'exporter"
-#: utils.py:739
+#: utils.py:744
msgid ""
"There are items from a former import not yet validated - validate them "
"before exporting"
@@ -904,19 +904,19 @@ msgstr ""
"Il y a des éléments d'un import précédent pas encore validé - Validez les "
"avant d'exporter"
-#: utils.py:751
+#: utils.py:756
msgid "Bad params - programming error"
msgstr "Mauvais paramètres - erreur de programmation"
-#: utils.py:761
+#: utils.py:766
msgid "Bad param"
msgstr "Mauvais paramètre"
-#: utils.py:776
+#: utils.py:781
msgid "No non ambigious tag is defined in the XAPI request"
-msgstr "Aucun « tag » non ambigu n'est défini dans la requête XAPI"
+msgstr "Pas de tag non ambigü définis dans la requête XAPI"
-#: utils.py:778
+#: utils.py:783
msgid ""
"No bounding box is defined in the XAPI request.If you are sure to manage the "
"entire planet set the bounding box to -180,-90,180,90"
@@ -1190,8 +1190,8 @@ msgid ""
"of what you are doing: DON'T EXPORT TO OSM</strong>!"
msgstr ""
"Vérifiez que toutes les données à exporter vers OSM ont une licence "
-"compatible. Vous pouvez exclure certains points d'intérêt en cochant la "
-"case « Ne pas importer dans OSM » sur le formulaire de point d'intérêt. "
+"compatible. Vous pouvez exclure certains points d'intérêt en cochant la case "
+"« Ne pas importer dans OSM » sur le formulaire de point d'intérêt. "
"<strong>Si vous n'êtes pas sûr de ce que vous êtes entrain de faire : "
"N'IMPORTEZ PAS DANS OSM</strong> !"
@@ -1199,6 +1199,18 @@ msgstr ""
msgid "Export to OSM"
msgstr "Exporter vers OSM"
+#: templates/admin/chimere/marker/change_form.html:7
+#: templates/admin/chimere/route/change_form.html:7
+#, python-format
+msgid ""
+"\n"
+"This item has a reference item associated to it. You should treat it via the "
+"<a href='%(rapprochement_form)s'>rapprochement form</a>.\n"
+msgstr ""
+"\n"
+"Cet élément a un élément de référence associé. Vous devriez le traiter via "
+"le <a href='%(rapprochement_form)s'>formulaire de rapprochement</a>.\n"
+
#: templates/admin/chimere/propertymodel/change_form.html:5
msgid ""
"After add/modification of property models you'll have to reload the "
@@ -1249,7 +1261,7 @@ msgstr "Proposer une modification"
#: templates/chimere/detail.html:35
msgid "I would like to propose an amendment for this item:"
-msgstr "Je souhaiterai proposer une modification pour cet élément :"
+msgstr "Je souhaiterais proposer une modification pour cet élément :"
#: templates/chimere/edit.html:20
msgid "Error"
@@ -1298,7 +1310,7 @@ msgstr "Commentaires au sujet de votre proposition"
#: templates/chimere/edit.html:134
msgid "Upload in progress. Please wait..."
-msgstr "Traitement en cours. Veuillez patienter..."
+msgstr "Dépôt en cours. Veuillez patienter..."
#: templates/chimere/edit.html:152 templates/chimere/edit_route.html:77
msgid "Propose"
@@ -1332,7 +1344,7 @@ msgstr "Ajouter"
#: templates/chimere/blocks/alternate_multimedia.html:35
msgid "Add multimedia from your computer or a website"
-msgstr "Ajouter du multimedia depuis votre ordinateur ou un site web"
+msgstr "Ajoutez du multimedia depuis votre ordinateur ou un site web"
#: templates/chimere/blocks/alternate_multimedia.html:36
msgid ""
@@ -1350,7 +1362,7 @@ msgstr "Audio, vidéo, autre..."
#: templates/chimere/blocks/alternate_multimedia.html:47
msgid "Download"
-msgstr "Téléchargement"
+msgstr "Télécharger"
#: templates/chimere/blocks/alternate_multimedia.html:48
msgid "Or"
@@ -1358,19 +1370,19 @@ msgstr "Ou"
#: templates/chimere/blocks/alternate_multimedia.html:80
msgid "You must provide a name."
-msgstr "Vous devez donner un nom."
+msgstr "Vous devez renseigner le nom."
#: templates/chimere/blocks/alternate_multimedia.html:85
msgid "You must choose a media type."
-msgstr "Voux devez choisir un type de média."
+msgstr "Vous devez renseigner un type de fichier média."
#: templates/chimere/blocks/alternate_multimedia.html:91
msgid "You must provide a file or a web address."
-msgstr "Vous devez fournir un fichier ou une adresse web."
+msgstr "Vous devez renseigner un fichier ou une adresse web."
#: templates/chimere/blocks/alternate_multimedia.html:96
msgid "You must provide a web address."
-msgstr "Voux devez donner une adresse web."
+msgstr "Vous devez fournir une adresse web."
#: templates/chimere/blocks/areas.html:4
msgid "Areas:"
@@ -1575,8 +1587,32 @@ msgstr " :"
msgid "Welcome to the %s"
msgstr "Bienvenue sur %s"
+#~ msgid "Advanced options"
+#~ msgstr "Options avancées"
+
+#~ msgid "Excluded"
+#~ msgstr "Exclu"
+
#~ msgid "Topics"
#~ msgstr "Thèmes"
#~ msgid "Administration de Chimère"
#~ msgstr "Administration de Chimère"
+
+#~ msgid "Add/modify a site"
+#~ msgstr "Ajouter ou modifier un site"
+
+#~ msgid "Categorys"
+#~ msgstr "Catégories"
+
+#~ msgid "Theme"
+#~ msgstr "Thème"
+
+#~ msgid "Subtheme"
+#~ msgstr "Sous-thème"
+
+#~ msgid "Subthemes"
+#~ msgstr "Sous-thèmes"
+
+#~ msgid "Themes"
+#~ msgstr "Thèmes"
diff --git a/chimere/migrations/0040_remove_excluded_status.py b/chimere/migrations/0040_remove_excluded_status.py
new file mode 100644
index 0000000..3fda56b
--- /dev/null
+++ b/chimere/migrations/0040_remove_excluded_status.py
@@ -0,0 +1,242 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import DataMigration
+from django.db import models
+
+class Migration(DataMigration):
+
+ def forwards(self, orm):
+ for marker in orm['chimere.Marker'].objects.filter(status='E'):
+ marker.status = 'D'
+ marker.save()
+ for route in orm['chimere.Route'].objects.filter(status='E'):
+ route.status = 'D'
+ route.save()
+
+ def backwards(self, orm):
+ "No backward change needed."
+
+ models = {
+ 'chimere.area': {
+ 'Meta': {'ordering': "('order', 'name')", 'object_name': 'Area'},
+ 'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'default': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+ 'default_subcategories': ('chimere.widgets.SelectMultipleField', [], {'to': "orm['chimere.SubCategory']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'dynamic_categories': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+ 'external_css': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'layers': ('chimere.widgets.SelectMultipleField', [], {'symmetrical': 'False', 'related_name': "'areas'", 'blank': 'True', 'through': "orm['chimere.AreaLayers']", 'to': "orm['chimere.Layer']"}),
+ 'lower_right_corner': ('django.contrib.gis.db.models.fields.PointField', [], {'default': "'POINT(0 0)'"}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+ 'order': ('django.db.models.fields.IntegerField', [], {'unique': 'True'}),
+ 'restrict_to_extent': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'subcategories': ('chimere.widgets.SelectMultipleField', [], {'symmetrical': 'False', 'related_name': "'areas'", 'blank': 'True', 'db_table': "'chimere_subcategory_areas'", 'to': "orm['chimere.SubCategory']"}),
+ 'upper_left_corner': ('django.contrib.gis.db.models.fields.PointField', [], {'default': "'POINT(0 0)'"}),
+ 'urn': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50', 'blank': 'True'}),
+ 'welcome_message': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'})
+ },
+ 'chimere.arealayers': {
+ 'Meta': {'ordering': "('order',)", 'object_name': 'AreaLayers'},
+ 'area': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.Area']"}),
+ 'default': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'layer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.Layer']"}),
+ 'order': ('django.db.models.fields.IntegerField', [], {})
+ },
+ 'chimere.category': {
+ 'Meta': {'ordering': "['order']", 'object_name': 'Category'},
+ 'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+ 'order': ('django.db.models.fields.IntegerField', [], {})
+ },
+ 'chimere.color': {
+ 'Meta': {'ordering': "['order']", 'object_name': 'Color'},
+ 'code': ('django.db.models.fields.CharField', [], {'max_length': '6'}),
+ 'color_theme': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.ColorTheme']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'order': ('django.db.models.fields.IntegerField', [], {})
+ },
+ 'chimere.colortheme': {
+ 'Meta': {'object_name': 'ColorTheme'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})
+ },
+ 'chimere.icon': {
+ 'Meta': {'object_name': 'Icon'},
+ 'height': ('django.db.models.fields.IntegerField', [], {}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+ 'width': ('django.db.models.fields.IntegerField', [], {})
+ },
+ 'chimere.importer': {
+ 'Meta': {'object_name': 'Importer'},
+ 'associate_marker_to_way': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'categories': ('chimere.widgets.SelectMultipleField', [], {'to': "orm['chimere.SubCategory']", 'symmetrical': 'False'}),
+ 'default_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'filtr': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'importer_type': ('django.db.models.fields.CharField', [], {'max_length': '4'}),
+ 'license': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'origin': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'source': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'source_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'srid': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'state': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'zipped': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+ },
+ 'chimere.layer': {
+ 'Meta': {'object_name': 'Layer'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'layer_code': ('django.db.models.fields.TextField', [], {'max_length': '300'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})
+ },
+ 'chimere.marker': {
+ 'Meta': {'ordering': "('status', 'name')", 'object_name': 'Marker'},
+ 'available_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+ 'categories': ('chimere.widgets.SelectMultipleField', [], {'to': "orm['chimere.SubCategory']", 'symmetrical': 'False'}),
+ 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'import_key': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'import_source': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'import_version': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'license': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'modified_since_import': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+ 'not_for_osm': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'origin': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'point': ('chimere.widgets.PointField', [], {}),
+ 'ref_item': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'submited_marker'", 'null': 'True', 'to': "orm['chimere.Marker']"}),
+ 'route': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'associated_marker'", 'null': 'True', 'to': "orm['chimere.Route']"}),
+ 'start_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'status': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
+ 'submiter_comment': ('django.db.models.fields.TextField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'submiter_email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+ 'submiter_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+ 'submiter_session_key': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'})
+ },
+ 'chimere.multimediaextension': {
+ 'Meta': {'object_name': 'MultimediaExtension'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'multimedia_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'extensions'", 'to': "orm['chimere.MultimediaType']"}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '6'})
+ },
+ 'chimere.multimediafile': {
+ 'Meta': {'object_name': 'MultimediaFile'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'marker': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'multimedia_files'", 'to': "orm['chimere.Marker']"}),
+ 'miniature': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'multimedia_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.MultimediaType']", 'null': 'True', 'blank': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+ 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+ 'url': ('django.db.models.fields.URLField', [], {'max_length': '200'})
+ },
+ 'chimere.multimediatype': {
+ 'Meta': {'object_name': 'MultimediaType'},
+ 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'iframe': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'media_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
+ 'mime_type': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})
+ },
+ 'chimere.news': {
+ 'Meta': {'object_name': 'News'},
+ 'areas': ('chimere.widgets.SelectMultipleField', [], {'symmetrical': 'False', 'to': "orm['chimere.Area']", 'null': 'True', 'blank': 'True'}),
+ 'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'content': ('django.db.models.fields.TextField', [], {}),
+ 'date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '150'})
+ },
+ 'chimere.picturefile': {
+ 'Meta': {'object_name': 'PictureFile'},
+ 'height': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'marker': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pictures'", 'to': "orm['chimere.Marker']"}),
+ 'miniature': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+ 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+ 'picture': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),
+ 'thumbnailfile': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'thumbnailfile_height': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'thumbnailfile_width': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'width': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
+ },
+ 'chimere.property': {
+ 'Meta': {'object_name': 'Property'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'marker': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.Marker']"}),
+ 'propertymodel': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.PropertyModel']"}),
+ 'value': ('django.db.models.fields.TextField', [], {})
+ },
+ 'chimere.propertymodel': {
+ 'Meta': {'ordering': "('order',)", 'object_name': 'PropertyModel'},
+ 'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'mandatory': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+ 'order': ('django.db.models.fields.IntegerField', [], {}),
+ 'subcategories': ('chimere.widgets.SelectMultipleField', [], {'symmetrical': 'False', 'related_name': "'properties'", 'blank': 'True', 'to': "orm['chimere.SubCategory']"}),
+ 'type': ('django.db.models.fields.CharField', [], {'max_length': '1'})
+ },
+ 'chimere.route': {
+ 'Meta': {'ordering': "('status', 'name')", 'object_name': 'Route'},
+ 'associated_file': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.RouteFile']", 'null': 'True', 'blank': 'True'}),
+ 'categories': ('chimere.widgets.SelectMultipleField', [], {'to': "orm['chimere.SubCategory']", 'symmetrical': 'False'}),
+ 'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'has_associated_marker': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'height': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'import_key': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'import_source': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'import_version': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'license': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'modified_since_import': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+ 'not_for_osm': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'origin': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'picture': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'ref_item': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'submited_route'", 'null': 'True', 'to': "orm['chimere.Route']"}),
+ 'route': ('chimere.widgets.RouteField', [], {}),
+ 'start_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'status': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
+ 'submiter_comment': ('django.db.models.fields.TextField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'submiter_email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+ 'submiter_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+ 'submiter_session_key': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+ 'width': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
+ },
+ 'chimere.routefile': {
+ 'Meta': {'ordering': "('name',)", 'object_name': 'RouteFile'},
+ 'file_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+ 'raw_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
+ 'simplified_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'})
+ },
+ 'chimere.subcategory': {
+ 'Meta': {'ordering': "['category', 'order']", 'object_name': 'SubCategory'},
+ 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'category': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'subcategories'", 'to': "orm['chimere.Category']"}),
+ 'color_theme': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.ColorTheme']", 'null': 'True', 'blank': 'True'}),
+ 'icon': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.Icon']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'item_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+ 'order': ('django.db.models.fields.IntegerField', [], {'default': '1000'}),
+ 'submission': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
+ },
+ 'chimere.tinyurl': {
+ 'Meta': {'object_name': 'TinyUrl'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'parameters': ('django.db.models.fields.CharField', [], {'max_length': '500'})
+ }
+ }
+
+ complete_apps = ['chimere']
+ symmetrical = True
diff --git a/chimere/migrations/0041_auto__add_field_importer_overwrite.py b/chimere/migrations/0041_auto__add_field_importer_overwrite.py
new file mode 100644
index 0000000..9ae6b84
--- /dev/null
+++ b/chimere/migrations/0041_auto__add_field_importer_overwrite.py
@@ -0,0 +1,244 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+ def forwards(self, orm):
+ # Adding field 'Importer.overwrite'
+ db.add_column('chimere_importer', 'overwrite',
+ self.gf('django.db.models.fields.BooleanField')(default=False),
+ keep_default=False)
+
+
+ def backwards(self, orm):
+ # Deleting field 'Importer.overwrite'
+ db.delete_column('chimere_importer', 'overwrite')
+
+
+ models = {
+ 'chimere.area': {
+ 'Meta': {'ordering': "('order', 'name')", 'object_name': 'Area'},
+ 'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'default': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+ 'default_subcategories': ('chimere.widgets.SelectMultipleField', [], {'to': "orm['chimere.SubCategory']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'dynamic_categories': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+ 'external_css': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'layers': ('chimere.widgets.SelectMultipleField', [], {'symmetrical': 'False', 'related_name': "'areas'", 'blank': 'True', 'through': "orm['chimere.AreaLayers']", 'to': "orm['chimere.Layer']"}),
+ 'lower_right_corner': ('django.contrib.gis.db.models.fields.PointField', [], {'default': "'POINT(0 0)'"}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+ 'order': ('django.db.models.fields.IntegerField', [], {'unique': 'True'}),
+ 'restrict_to_extent': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'subcategories': ('chimere.widgets.SelectMultipleField', [], {'symmetrical': 'False', 'related_name': "'areas'", 'blank': 'True', 'db_table': "'chimere_subcategory_areas'", 'to': "orm['chimere.SubCategory']"}),
+ 'upper_left_corner': ('django.contrib.gis.db.models.fields.PointField', [], {'default': "'POINT(0 0)'"}),
+ 'urn': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '50', 'blank': 'True'}),
+ 'welcome_message': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'})
+ },
+ 'chimere.arealayers': {
+ 'Meta': {'ordering': "('order',)", 'object_name': 'AreaLayers'},
+ 'area': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.Area']"}),
+ 'default': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'layer': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.Layer']"}),
+ 'order': ('django.db.models.fields.IntegerField', [], {})
+ },
+ 'chimere.category': {
+ 'Meta': {'ordering': "['order']", 'object_name': 'Category'},
+ 'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+ 'order': ('django.db.models.fields.IntegerField', [], {})
+ },
+ 'chimere.color': {
+ 'Meta': {'ordering': "['order']", 'object_name': 'Color'},
+ 'code': ('django.db.models.fields.CharField', [], {'max_length': '6'}),
+ 'color_theme': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.ColorTheme']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'order': ('django.db.models.fields.IntegerField', [], {})
+ },
+ 'chimere.colortheme': {
+ 'Meta': {'object_name': 'ColorTheme'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})
+ },
+ 'chimere.icon': {
+ 'Meta': {'object_name': 'Icon'},
+ 'height': ('django.db.models.fields.IntegerField', [], {}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+ 'width': ('django.db.models.fields.IntegerField', [], {})
+ },
+ 'chimere.importer': {
+ 'Meta': {'object_name': 'Importer'},
+ 'associate_marker_to_way': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'categories': ('chimere.widgets.SelectMultipleField', [], {'to': "orm['chimere.SubCategory']", 'symmetrical': 'False'}),
+ 'default_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'filtr': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'importer_type': ('django.db.models.fields.CharField', [], {'max_length': '4'}),
+ 'license': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'origin': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'overwrite': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'source': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'source_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'srid': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'state': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'zipped': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
+ },
+ 'chimere.layer': {
+ 'Meta': {'object_name': 'Layer'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'layer_code': ('django.db.models.fields.TextField', [], {'max_length': '300'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})
+ },
+ 'chimere.marker': {
+ 'Meta': {'ordering': "('status', 'name')", 'object_name': 'Marker'},
+ 'available_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+ 'categories': ('chimere.widgets.SelectMultipleField', [], {'to': "orm['chimere.SubCategory']", 'symmetrical': 'False'}),
+ 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'import_key': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'import_source': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'import_version': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'license': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'modified_since_import': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+ 'not_for_osm': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'origin': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'point': ('chimere.widgets.PointField', [], {}),
+ 'ref_item': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'submited_marker'", 'null': 'True', 'to': "orm['chimere.Marker']"}),
+ 'route': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'associated_marker'", 'null': 'True', 'to': "orm['chimere.Route']"}),
+ 'start_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'status': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
+ 'submiter_comment': ('django.db.models.fields.TextField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'submiter_email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+ 'submiter_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+ 'submiter_session_key': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'})
+ },
+ 'chimere.multimediaextension': {
+ 'Meta': {'object_name': 'MultimediaExtension'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'multimedia_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'extensions'", 'to': "orm['chimere.MultimediaType']"}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '6'})
+ },
+ 'chimere.multimediafile': {
+ 'Meta': {'object_name': 'MultimediaFile'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'marker': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'multimedia_files'", 'to': "orm['chimere.Marker']"}),
+ 'miniature': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'multimedia_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.MultimediaType']", 'null': 'True', 'blank': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+ 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+ 'url': ('django.db.models.fields.URLField', [], {'max_length': '200'})
+ },
+ 'chimere.multimediatype': {
+ 'Meta': {'object_name': 'MultimediaType'},
+ 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'iframe': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'media_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
+ 'mime_type': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'})
+ },
+ 'chimere.news': {
+ 'Meta': {'object_name': 'News'},
+ 'areas': ('chimere.widgets.SelectMultipleField', [], {'symmetrical': 'False', 'to': "orm['chimere.Area']", 'null': 'True', 'blank': 'True'}),
+ 'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'content': ('django.db.models.fields.TextField', [], {}),
+ 'date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '150'})
+ },
+ 'chimere.picturefile': {
+ 'Meta': {'object_name': 'PictureFile'},
+ 'height': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'marker': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pictures'", 'to': "orm['chimere.Marker']"}),
+ 'miniature': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+ 'order': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+ 'picture': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),
+ 'thumbnailfile': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'thumbnailfile_height': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'thumbnailfile_width': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'width': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
+ },
+ 'chimere.property': {
+ 'Meta': {'object_name': 'Property'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'marker': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.Marker']"}),
+ 'propertymodel': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.PropertyModel']"}),
+ 'value': ('django.db.models.fields.TextField', [], {})
+ },
+ 'chimere.propertymodel': {
+ 'Meta': {'ordering': "('order',)", 'object_name': 'PropertyModel'},
+ 'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'mandatory': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+ 'order': ('django.db.models.fields.IntegerField', [], {}),
+ 'subcategories': ('chimere.widgets.SelectMultipleField', [], {'symmetrical': 'False', 'related_name': "'properties'", 'blank': 'True', 'to': "orm['chimere.SubCategory']"}),
+ 'type': ('django.db.models.fields.CharField', [], {'max_length': '1'})
+ },
+ 'chimere.route': {
+ 'Meta': {'ordering': "('status', 'name')", 'object_name': 'Route'},
+ 'associated_file': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.RouteFile']", 'null': 'True', 'blank': 'True'}),
+ 'categories': ('chimere.widgets.SelectMultipleField', [], {'to': "orm['chimere.SubCategory']", 'symmetrical': 'False'}),
+ 'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'has_associated_marker': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'height': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'import_key': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'import_source': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'import_version': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'license': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'modified_since_import': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+ 'not_for_osm': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'origin': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'picture': ('django.db.models.fields.files.ImageField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'ref_item': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'submited_route'", 'null': 'True', 'to': "orm['chimere.Route']"}),
+ 'route': ('chimere.widgets.RouteField', [], {}),
+ 'start_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'status': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
+ 'submiter_comment': ('django.db.models.fields.TextField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+ 'submiter_email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+ 'submiter_name': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+ 'submiter_session_key': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}),
+ 'width': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
+ },
+ 'chimere.routefile': {
+ 'Meta': {'ordering': "('name',)", 'object_name': 'RouteFile'},
+ 'file_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+ 'raw_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
+ 'simplified_file': ('django.db.models.fields.files.FileField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'})
+ },
+ 'chimere.subcategory': {
+ 'Meta': {'ordering': "['category', 'order']", 'object_name': 'SubCategory'},
+ 'available': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'category': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'subcategories'", 'to': "orm['chimere.Category']"}),
+ 'color_theme': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.ColorTheme']", 'null': 'True', 'blank': 'True'}),
+ 'icon': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['chimere.Icon']"}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'item_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '150'}),
+ 'order': ('django.db.models.fields.IntegerField', [], {'default': '1000'}),
+ 'submission': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
+ },
+ 'chimere.tinyurl': {
+ 'Meta': {'object_name': 'TinyUrl'},
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'parameters': ('django.db.models.fields.CharField', [], {'max_length': '500'})
+ }
+ }
+
+ complete_apps = ['chimere'] \ No newline at end of file
diff --git a/chimere/models.py b/chimere/models.py
index 9113cfe..c393cba 100644
--- a/chimere/models.py
+++ b/chimere/models.py
@@ -329,6 +329,8 @@ class Importer(models.Model):
blank=True, null=True)
srid = models.IntegerField(_(u"SRID"), blank=True, null=True)
zipped = models.BooleanField(_(u"Zipped file"), default=False)
+ overwrite = models.BooleanField(_(u"Overwrite existing data"),
+ default=False)
origin = models.CharField(_(u"Origin"), max_length=100,
blank=True, null=True)
license = models.CharField(_(u"License"), max_length=100,
@@ -373,8 +375,7 @@ class GeographicItem(models.Model):
('A', _(u'Available')),
('M', _(u'Modified')),
('D', _(u'Disabled')),
- ('I', _(u'Imported')),
- ('E', _(u"Excluded")))
+ ('I', _(u'Imported')))
STATUS_DCT = dict(STATUS)
status = models.CharField(_(u"Status"), max_length=1, choices=STATUS)
import_key = models.CharField(_(u"Import key"), max_length=200,
@@ -385,7 +386,7 @@ class GeographicItem(models.Model):
blank=True, null=True)
modified_since_import = models.BooleanField(_(u"Modified since last import"),
default=True)
- not_for_osm = models.BooleanField(_(u"Not to be imported inside OSM"),
+ not_for_osm = models.BooleanField(_(u"Not to be exported to OSM"),
default=False)
origin = models.CharField(_(u"Origin"), max_length=100,
blank=True, null=True)
@@ -639,8 +640,8 @@ class Marker(GeographicItem):
PRE_ATTRS = {
- 'Marker':('name', 'geometry', 'import_version'),
- 'Route':('name', 'geometry', 'import_version'),
+ 'Marker':('name', 'geometry', 'import_version', 'modified_since_import'),
+ 'Route':('name', 'geometry', 'import_version', 'modified_since_import'),
'Area':('urn', 'name'),
}
def geometry_pre_save(cls, pre_save_geom_values):
@@ -669,7 +670,11 @@ def geometry_post_save(pre_save_geom_values):
or kwargs['instance'].pk not in pre_save_geom_values:
return
instance = kwargs['instance']
- name, geometry, import_version = pre_save_geom_values[instance.pk]
+ name, geometry, import_version, modified_since_import = \
+ pre_save_geom_values[instance.pk]
+ # force the reinit of modified_since_import
+ if modified_since_import != instance.modified_since_import:
+ return
if (instance.import_version != import_version
and instance.modified_since_import):
instance.modified_since_import = False
diff --git a/chimere/static/chimere/js/importer_interface.js b/chimere/static/chimere/js/importer_interface.js
index 9dc669f..aa332d4 100644
--- a/chimere/static/chimere/js/importer_interface.js
+++ b/chimere/static/chimere/js/importer_interface.js
@@ -1,18 +1,19 @@
django.jQuery(function($) {
var importer_form_filter = {
OSM:new Array('field-filtr', 'field-default_name', 'field-categories',
- 'field-source'),
+ 'field-source', 'field-overwrite'),
KML:new Array('field-source', 'field-source_file', 'field-default_name',
'field-filtr', 'field-zipped', 'field-origin',
- 'field-license', 'field-categories'),
+ 'field-license', 'field-categories', 'field-overwrite'),
SHP:new Array('field-source', 'field-source_file', 'field-default_name',
'field-zipped', 'field-origin', 'field-srid',
- 'field-license', 'field-categories'),
+ 'field-license', 'field-categories', 'field-overwrite'),
RSS:new Array('field-source', 'field-default_name', 'field-origin',
- 'field-srid', 'field-license', 'field-categories'),
+ 'field-srid', 'field-license', 'field-categories',
+ 'field-overwrite'),
CSV:new Array('field-source', 'field-source_file', 'field-default_name',
'field-origin', 'field-srid', 'field-license',
- 'field-categories')
+ 'field-categories', 'field-overwrite')
}
var map_initialized;
function refresh_importer_form(){
diff --git a/chimere/templates/admin/chimere/marker/change_form.html b/chimere/templates/admin/chimere/marker/change_form.html
new file mode 100644
index 0000000..64c48f9
--- /dev/null
+++ b/chimere/templates/admin/chimere/marker/change_form.html
@@ -0,0 +1,13 @@
+{% extends "admin/change_form.html" %}
+{% load i18n %}
+{% block field_sets %}
+{% if original.ref_item and original.ref_item != orginal %}
+<p class='errornote'>
+{% url admin:admin-modification object_id as rapprochement_form %}
+{% blocktrans %}
+This item has a reference item associated to it. You should treat it via the <a href='{{ rapprochement_form }}'>rapprochement form</a>.
+{% endblocktrans %}
+</p>
+{% endif %}
+{{ block.super }}
+{% endblock %}
diff --git a/chimere/templates/admin/chimere/route/change_form.html b/chimere/templates/admin/chimere/route/change_form.html
new file mode 120000
index 0000000..21811b6
--- /dev/null
+++ b/chimere/templates/admin/chimere/route/change_form.html
@@ -0,0 +1 @@
+../marker/change_form.html \ No newline at end of file
diff --git a/chimere/tests.py b/chimere/tests.py
index 790eb55..af342c5 100644
--- a/chimere/tests.py
+++ b/chimere/tests.py
@@ -63,7 +63,21 @@ def subcategory_setup():
icon=icon,
order=1,
item_type='M',)
- return [subcategory_1, subcategory_2]
+
+ subcategory_3 = SubCategory.objects.create(category=category,
+ name='Subcategory 3',
+ available=True,
+ icon=icon,
+ order=1,
+ item_type='M',)
+
+ subcategory_4 = SubCategory.objects.create(category=category,
+ name='Subcategory 4',
+ available=True,
+ icon=icon,
+ order=1,
+ item_type='M',)
+ return [subcategory_1, subcategory_2, subcategory_3, subcategory_4]
def marker_setup(sub_categories=[]):
if not sub_categories:
@@ -124,50 +138,73 @@ class ImporterTest:
nb = max([Marker.objects.filter(categories__pk=cat.pk).count(),
Route.objects.filter(categories__pk=cat.pk).count()])
self.assertEqual(nb_by_cat[cat], nb)
-
# update
for importer, awaited_nb in self.marker_importers:
+ importer.overwrite = True
+ importer.save()
nb, nb_updated, res = importer.manager.get()
if awaited_nb == None:
continue
self.assertEqual(nb, 0)
+ # manage overwrite
+ for importer, awaited_nb in self.marker_importers:
+ if not awaited_nb:
+ continue
+ # mimic the modification of one item
+ for cls in (Marker, Route):
+ items = cls.objects.filter(
+ categories=importer.categories.all()[0]
+ ).order_by('-pk').all()
+ if items.count():
+ item = items.all()[0]
+ item.import_version = 99999 # fake version number
+ item.save()
+ # as when the import_version it is considered as an import
+ # modification force the modification flag
+ item.modified_since_import = True
+ item.save()
+ importer.overwrite = False
+ importer.save()
+ nb, nb_updated, res = importer.manager.get()
+ if awaited_nb == None:
+ continue
+ self.assertEqual(nb, 1)
class KMLImporterTest(TestCase, ImporterTest):
def setUp(self):
- subcategory_1, subcategory_2 = subcategory_setup()
+ subcategories = subcategory_setup()
importer1 = Importer.objects.create(importer_type='KML',
source=test_dir_path+'tests/sample.kml',
filtr="Category 1")
- importer1.categories.add(subcategory_1)
+ importer1.categories.add(subcategories[0])
importer2 = Importer.objects.create(importer_type='KML',
source=test_dir_path+'tests/sample.kml',
filtr="Subcategory 1", associate_marker_to_way=True)
- importer2.categories.add(subcategory_1)
- importer2.categories.add(subcategory_2)
+ importer2.categories.add(subcategories[1])
importer3 = Importer.objects.create(importer_type='KML',
source=test_path+'tests/sample.kml',
filtr="Subcategory 3")
- importer3.categories.add(subcategory_2)
+ importer3.categories.add(subcategories[2])
importer4 = Importer.objects.create(importer_type='KML',
source=test_dir_path+'tests/sample.kml.zip', zipped=True)
- importer4.categories.add(subcategory_1)
+ importer4.categories.add(subcategories[3])
self.marker_importers = [(importer1, 1), (importer2, 3), (importer3, 0),
(importer4, 4)]
class ShapefileImporterTest(TestCase, ImporterTest):
def setUp(self):
- self.subcategory_1, self.subcategory_2 = subcategory_setup()
+ self.subcategories = subcategory_setup()
importer = Importer.objects.create(importer_type='SHP',
source=test_dir_path+'tests/sample_nodes.shp.zip', zipped=True)
- importer.categories.add(self.subcategory_1)
+ importer.categories.add(self.subcategories[0])
importer2 = Importer.objects.create(importer_type='SHP',
source=test_dir_path+'tests/sample_ways.shp.zip',
zipped=True)
- importer2.categories.add(self.subcategory_2)
+ importer2.categories.add(self.subcategories[1])
self.marker_importers = [(importer, 29),
(importer2, 5),]
@@ -182,28 +219,30 @@ class ShapefileImporterTest(TestCase, ImporterTest):
importer.associate_marker_to_way = True
importer.save()
nb, nb_updated, res = importer.manager.get()
- nb = Marker.objects.filter(categories__pk=self.subcategory_2.pk).count()
+ nb = Marker.objects.filter(categories__pk=self.subcategories[1].pk
+ ).count()
self.assertEqual(nb, 5)
- Marker.objects.filter(categories__pk=self.subcategory_2.pk).delete()
- Route.objects.filter(categories__pk=self.subcategory_2.pk).delete()
+ Marker.objects.filter(categories__pk=self.subcategories[1].pk).delete()
+ Route.objects.filter(categories__pk=self.subcategories[1].pk).delete()
importer.associate_marker_to_way = False
importer.save()
nb, nb_updated, res = importer.manager.get()
- nb = Marker.objects.filter(categories__pk=self.subcategory_2.pk).count()
+ nb = Marker.objects.filter(categories__pk=self.subcategories[1].pk
+ ).count()
self.assertEqual(nb, 0)
class OSMImporterTest(TestCase, ImporterTest):
def setUp(self):
- subcategory_1, subcategory_2 = subcategory_setup()
+ subcategories = subcategory_setup()
markers = marker_setup()
importer1 = Importer.objects.create(importer_type='OSM',
source=test_dir_path+'tests/sample_nodes.osm')
- importer1.categories.add(subcategory_1)
+ importer1.categories.add(subcategories[0])
importer2 = Importer.objects.create(importer_type='OSM',
source=test_dir_path+'tests/sample_ways.osm')
- importer2.categories.add(subcategory_2)
+ importer2.categories.add(subcategories[1])
importer3 = Importer.objects.create(importer_type='OSM',
source='http://open.mapquestapi.com/xapi/api/0.6/way'\
'[highway=motorway]'\
@@ -215,13 +254,13 @@ class OSMImporterTest(TestCase, ImporterTest):
class GeoRSSImporterTest(TestCase, ImporterTest):
def setUp(self):
- subcategory_1, subcategory_2 = subcategory_setup()
+ subcategories = subcategory_setup()
importer1 = Importer.objects.create(importer_type='RSS',
source=test_dir_path+'tests/georss_simple.xml')
- importer1.categories.add(subcategory_1)
+ importer1.categories.add(subcategories[0])
importer2 = Importer.objects.create(importer_type='RSS',
source=test_dir_path+'tests/eqs7day-M5.xml')
- importer2.categories.add(subcategory_2)
+ importer2.categories.add(subcategories[1])
self.marker_importers = [(importer1, 1), (importer2, 32)]
@@ -405,6 +444,28 @@ class RapprochementTest(TestCase):
for k in new_vals:
self.assertEqual(getattr(ref_marker, k), new_vals[k])
+ def test_managed_modified_imported_markers(self):
+ ref_marker = self.markers[0]
+ new_vals = {'name':"Marker 1 - modified",
+ 'point':GEOSGeometry('SRID=4326;POINT(-4 48)')}
+ values = {'status':'I', 'ref_item':ref_marker, 'import_version':42}
+ values.update(new_vals)
+ modified_marker = Marker.objects.create(**values)
+ self.assertNotEqual(ref_marker.import_version,
+ modified_marker.import_version)
+ modified_marker.categories.add(ref_marker.categories.all()[0])
+ response = self.client.post('/admin/chimere/marker/',
+ data={'action':['managed_modified'],
+ 'index':0, 'rapprochement':1,
+ 'name':1, 'point':1,
+ '_selected_action':[unicode(ref_marker.pk)]
+ })
+ ref_marker = Marker.objects.get(pk=ref_marker.pk)
+ self.assertEqual(Marker.objects.filter(ref_item=ref_marker,
+ status='I').count(), 0)
+ for k in new_vals.keys() + ['import_version']:
+ self.assertEqual(getattr(ref_marker, k), values[k])
+
def test_managed_modified_routes(self):
ref_route = self.routes[0]
new_vals = {'name':"Route 1 - modified",
diff --git a/chimere/utils.py b/chimere/utils.py
index 4a12e37..0d97757 100644
--- a/chimere/utils.py
+++ b/chimere/utils.py
@@ -83,23 +83,28 @@ class ImportManager:
try:
item = None
if pk:
- try:
- item = cls.objects.get(pk=pk)
- except:
- pass
- if not item:
- item = cls.objects.get(**dct_import)
- if version and item.import_version == int(version):
+ ref_item = cls.objects.get(pk=pk)
+ else:
+ ref_item = cls.objects.get(**dct_import)
+ if version and ref_item.import_version == int(version):
# no update since the last import
- return item, None, None
- for k in values:
- setattr(item, k, values[k])
- try:
- item.save()
- except TypeError:
- # error on data source
- return None, False, False
- updated = True
+ return ref_item, None, None
+ if not self.importer_instance.overwrite \
+ and ref_item.modified_since_import:
+ dct_import['ref_item'] = ref_item
+ else:
+ item = ref_item
+ for k in values:
+ setattr(item, k, values[k])
+ try:
+ item.save()
+ # force the modified_since_import status
+ item.modified_since_import = False
+ item.save()
+ except TypeError:
+ # error on data source
+ return None, False, False
+ updated = True
except ObjectDoesNotExist:
pass
if not item:
diff --git a/docs/_build/html/_sources/administration.txt b/docs/_build/html/_sources/administration.txt
deleted file mode 100644
index db7e078..0000000
--- a/docs/_build/html/_sources/administration.txt
+++ /dev/null
@@ -1,115 +0,0 @@
-.. -*- coding: utf-8 -*-
-.. _administration:
-
-==============
-Administration
-==============
-
-:Author: Étienne Loks
-:date: 2012-10-08
-:Copyright: CC-BY 3.0
-
-This documents presents the administration of Chimère.
-The version has been updated for version 2.0.0.
-
-
-Administration pages presentation
----------------------------------
-
-Administration pages accessible at: http://where_is_your_chimere/admin/
-
-Don't forget the ending slash in the URL.
-
-Identification
-**************
-
-First of all, you'll have to identify yourself with the login and password
-provided.
-
-.. image:: _static/chimere_admin_00.png
-
-
-Main page
-*********
-
-Once authentified you'll have access to the main admin page.
-
-This looks like this:
-
-.. image:: _static/chimere_admin_01.png
-
-#. links to this **Documentation**, to the **Change password** form and to
- **Log out**
-#. a list of recent actions made with this account
-#. an application title, most of your action will be in the **Chimere**
- application
-#. an item inside the application. From these page you can **Add** a new item or
- consult/**Change** items. The **Add** link lead to the new `Item form`_. The
- **Change** link lead to the `Item list`_. The `Item list`_ is also available
- by clicking on the item label.
-
-
-Item list
-*********
-
-.. image:: _static/chimere_admin_02.png
-
-#. path in the admin site. This is a convenient shortcut to come back to the
- main page.
-#. link to create a new item from the item list
-#. search items by word (not available for all type of items)
-#. this filter box permit to filter current entries with some criteria (not
- available for all type of items)
-#. the header of the table is clickable. Click on an header sort the items by
- this header (ascending or descending). Multiple header sort is possible (the
- number on the right of the header explain the order of sorting).
-#. each item can be checked (for applying an action) or selected (by clicking on
- the first column) to see the detail and possibly edit, delete it.
-
-Item form
-*********
-
-.. image:: _static/chimere_admin_03.png
-
-#. fields for the selected item (or blank if it is a new item) are displayed in
- this form. A few of the fields concerning an item are read-only and a few of
- them are hidden. Mandatory fields have their label in bold. Changes on theses
- fields are only effective once the form is submitted.
-#. for some items there are associated sub-items. Theses associated items can be
- modified in this form. If there are many sub-items associated for the current
- item, they can be ordered by drag and drop.
-#. the form has to be validated by one of theses actions buttons. They are
- self-explanatory.
-Creating news
--------------
-
-A news system is available.
-All you have to to do is to click on the Add button near News.
-For each news you have to provided a name and a content. The content can contain HTML tags.
-The avaibility is set with a checkbox.
-
-Creating categories/subcategories
----------------------------------
-
-Before adding categories you have to set some icons. Theses icons appears on the map and in the categories' box on the main map.
-Be careful to resize correctly your icons. Indeed the icon will be presented at their real size on the map.
-To add icons: the Add button near Icons.
-
-Categories are in fact only containers for subcategories. You'll have to provide only a name and an order.
-To add categories: the Add button near categories (quite clear now, isn't it?)
-
-Fields of subcategories are: an associated category, a name, an icon, an order, a color and an element type.
-Theses fields are mainly quite self-explainatory.
-The color is used to draw routes (if this subcategory contains routes). If it a basic color it can be set with the english name (for instance: "red", "blue", "yellow" or "purple") otherwise you can put the HTML RVB code (for instance "#9227c9").
-The element type is the type of element the subcategory can contain: POI, route or both.
-
-Moderation
-----------
-
-The moderation step is quite simple. It works the same with POIs and routes.
-The moderator can access to all POIs (or routes) by clicking on the Modify button.
-A search field is available to search by name but the more interesting is to filter POIs (or route) by state and by subcategory.
-Then to modify an item you have to click on his name.
-The submission can now freely modified. Compared to the main submission interface there is only on field add: the state field. To be publish in the main site the item must have the state: Available.
-If an item is not revelant the Delete button permit to remove it.
-
diff --git a/docs/_build/html/_sources/configuration.txt b/docs/_build/html/_sources/configuration.txt
deleted file mode 100644
index f8bed2b..0000000
--- a/docs/_build/html/_sources/configuration.txt
+++ /dev/null
@@ -1,165 +0,0 @@
-.. -*- coding: utf-8 -*-
-
-=============
-Configuration
-=============
-
-:Author: Étienne Loks
-:date: 2012-10-08
-:Copyright: CC-BY 3.0
-
-This documents presents the first steps to configure your Chimère.
-
-The version has been updated for version 2.0.0.
-
-If an usage to the CLI is required, your session has to be initialised with
-theses environment variables::
-
- CHIMERE_PATH=/srv/chimere # change with your installation path
- CHIMERE_LOCALNAME=mychimere # change with your local project name
- CHIMERE_APP_PATH=$CHIMERE_PATH/$CHIMERE_LOCALNAME
-
-
-When you have installed the application there is a few simple steps to follow to
-configure *your* Chimère.
-
-Most of theses steps are done in the web administration pages.
-
-If you are not familiar with *Django-like* administration pages you can look
-at the first paragraph of :ref:`administration` where it is presented.
-
-To access theses pages you have to identify you with an account with *staff* and
-*superuser* status.
-
-A *superuser* account is created at the initialization of the database.
-
-
-Managing areas
---------------
-
-An *Area* is the base of your map. It defines:
-
-* a name: a human readable label for this area.
-* a welcome message (*not mandatory*): this message is displayed once a day per
- user arriving on the map.
-* a map bounding box: this is the default area to display when arriving on the
- map.
-* restriction on the bounding box: if set to restricted, the end user can't pan
- outside the defined bounding box.
-* available layers (*not mandatory* OSM Mapnik is used by default): OSM Mapnik
- render, OSM MapQuest render, OSM Transport Map render, OSM CycleMap are
- available by default. You can add new custom layer cf. :ref:`managing-layers`.
-* categories restriction (*not mandatory*): if no restriction is set all
- categories are available.
-* default checked categories (*not mandatory*).
-* an external CSS file (*not mandatory*): an URL to an external CSS file.
-* if categories are displayed dynamically (if dynamically is set, the end user
- only view categories witch have items on the map section the user currently
- see).
-* an associated URN (*not mandatory*): the name of the area as a web ressource.
- In practice, if the area is not the default area the URN is used at the end of
- the default URL to access to this area. This is not mandatory but necessary
- for each area that is not the default one.
-
-*Areas* are customizable directly on the web administration interface in
-*Chimere/Areas*.
-
-As there is little chance that the default area is appropriate for you, you'll
-have to set at least one default area.
-
-Adding many area can be a mean to show your map in different flavors.
-
-Managing users
---------------
-
-If you are not the only administrator/moderator of this Chimère installation
-you have to create and manage account for the other users.
-
-You can create a new *superuser* account with the CLI::
-
- ./manage.py createsuperuser
-
-User password can be changed with the CLI (useful if you have forgotten your
-password)::
-
- ./manage.py changepassword username
-
-*Users* are customizable directly on the web administration interface in
-*Auth/User*.
-
-To create a new account, simply click on the Add button near Users. Give a name
-and a default password (the user can change it on in own later).
-
-Then complete the other pieces of information.
-
-Check the case: *Staff status* (or this user will not be able to log to
-the administration website).
-
-If this account is a new technical administrator, check *Superuser status* (this
-user must be trustworthy!). Otherwise you'll have to give permissions to this
-new user. It is easier to don't add permission manually but make this user
-member of a group.
-
-Two type of default group are proposed: application administrator and moderator.
-
-Moderator are limited to an *Area* (they only see items that are inside the
-bounding box). If a moderator manage many areas you'll have to select many
-groups.
-
-Detail of rights for default user/groups:
-
-+-----------------------------------------+-------------------------+---------------------------+-----------+
-| Task | Technical administrator | Application administrator | Moderator |
-+=========================================+=========================+===========================+===========+
-| User add/modify/delete | yes | no | no |
-+-----------------------------------------+-------------------------+---------------------------+-----------+
-| Group add/modify/delete | yes | no | no |
-+-----------------------------------------+-------------------------+---------------------------+-----------+
-| Property model add/modify/delete | yes | no | no |
-+-----------------------------------------+-------------------------+---------------------------+-----------+
-| Import add/modify/delete | yes | no | no |
-+-----------------------------------------+-------------------------+---------------------------+-----------+
-| Layer add/modify/delete | yes | no | no |
-+-----------------------------------------+-------------------------+---------------------------+-----------+
-| News add/modify/delete | yes | yes | no |
-+-----------------------------------------+-------------------------+---------------------------+-----------+
-| Area add/modify/delete | yes | yes | no |
-+-----------------------------------------+-------------------------+---------------------------+-----------+
-| Icon add/modify/delete | yes | yes | no |
-+-----------------------------------------+-------------------------+---------------------------+-----------+
-| Color/Color theme add/modify/delete | yes | yes | no |
-+-----------------------------------------+-------------------------+---------------------------+-----------+
-| Category/Subcategory add/modify/delete | yes | yes | no |
-+-----------------------------------------+-------------------------+---------------------------+-----------+
-| Point Of Interest add/modify/delete | yes | yes | yes |
-+-----------------------------------------+-------------------------+---------------------------+-----------+
-| Route add/modify/delete | yes | yes | yes |
-+-----------------------------------------+-------------------------+---------------------------+-----------+
-
-
-Creating property models
-------------------------
-
-A basic installation of Chimère permit to associate a name, a category, a
-description, dates, multimedia files, picture files, etc. for each geographic
-item.
-
-You may want to add more custom fields like phone number or opening hours. For
-that all you have to do is to add a new property model (*Chimere/Property
-model*).
-
-The administration page ask you for:
-
-* a name,
-* an order (to order between other properties),
-* an availability to the end user (this can be used to set hidden properties),
-* a mandatory status,
-* the categories the property applied to (if no categories selected it applied
- to all),
-* the type: text, long text, password or date.
-
-To make this property available it is necessary to reload your webserver (the
-property is cached).
-
-All forms are then automatically updated with this new field.
-
diff --git a/docs/_build/html/_sources/customisation.txt b/docs/_build/html/_sources/customisation.txt
deleted file mode 100644
index e27be01..0000000
--- a/docs/_build/html/_sources/customisation.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-.. -*- coding: utf-8 -*-
-
-=====================
-Chimère customisation
-=====================
-
-:Author: Étienne Loks
-:date: 2012-10-08
-:Copyright: CC-BY 3.0
-
-This documents presents the installation of Chimère.
-The version has been updated for version 2.0.0.
-
-
-Updating the design
--------------------
-
-You can of course customize Chimère with your own CSS. To do that just edit the file static/styles.css.
-
-After this basic configuration done the harder is done. You can do now application administration tasks.
-
-.. _managing-layers:
-Managing layers
----------------
diff --git a/docs/_build/html/_sources/import_export.txt b/docs/_build/html/_sources/import_export.txt
deleted file mode 100644
index 890a644..0000000
--- a/docs/_build/html/_sources/import_export.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-.. -*- coding: utf-8 -*-
-
-=====================
-Chimère import/export
-=====================
-
-:Author: Étienne Loks
-:date: 2012-10-08
-:Copyright: CC-BY 3.0
-
-This documents presents the administration of Chimère.
-The version has been updated for version 2.0.0.
-
-
diff --git a/docs/_build/html/_sources/install-1.x.txt b/docs/_build/html/_sources/install-1.x.txt
deleted file mode 100644
index 4c8a5b8..0000000
--- a/docs/_build/html/_sources/install-1.x.txt
+++ /dev/null
@@ -1,353 +0,0 @@
-.. -*- coding: utf-8 -*-
-
-========================================
-Chimère installation (old documentation)
-========================================
-
-:Author: Étienne Loks
-:date: 2012-02-15
-:Copyright: CC-BY 3.0
-
-This documents presents the installation of Chimère for version 1.x. This
-documentation is no longer relevant for version 2.
-
------------------
-Base installation
------------------
-
-Installation
-------------
-
-Prerequisites
-*************
-
- - `apache <http://www.apache.org/>`_ version 2.x with [mod_python http://www.modpython.org/] 3.x
-
- - `python <http://www.python.org/>`_ versions 2.6 or 2.7
-
- - `geodjango <http://www.djangoproject.com/>`_ version 1.0
-
- - `postgres <http://www.postgresql.org/>`_ version 8.x
-
- - `gettext <http://www.gnu.org/software/gettext/>`_
-
- - `psycopg2 <http://freshmeat.net/projects/psycopg/>`_
-
- - `Python Imaging Library <http://www.pythonware.com/products/pil/>`_
-
- - `Beautiful Soup <http://www.crummy.com/software/BeautifulSoup/>`_
-
- - `lxml <http://lxml.de/>`_
-
-geodjango is a part of django version 1.0 but it has some specific (geographically related) additionnal dependencies:
-
- - `geos <http://trac.osgeo.org/geos/>`_ 3.0.x
-
- - `proj.4 <http://trac.osgeo.org/proj/>`_ 4.4 to 4.6
-
- - `posgis <http://postgis.refractions.net/>`_ versions 1.2.1 or 1.3.x
-
- - `gdal <http://www.gdal.org/>`_
-
-
-Optionaly (but recommanded):
-
- - `tinymce <http://tinymce.moxiecode.com/>`_
-
- - `gpsbabel <http://www.gpsbabel.org/>`_
-
-
-The simpliest way to obtain these packages is to get them from your favorite Linux distribution repositories (for instance python, python-django, python-beautifulsoup, tinymce, apache2, libgeos-3.2.0, proj, gdal-bin, python-gdal, python-lxml, python-psycopg2, python-imaging, gettext, postgresql-8.4 and postgresql-8.4-postgis packages for Debian Squeeze). If these packages do not exist in your distribution's repository, please refer to the applications' websites.
-
-Database configuration
-**********************
-
-Now that postgres and postgis are installed, you need to create a new user for chimere::
-
- createuser --echo --adduser --createdb --encrypted --pwprompt chimere-user
-
-Then, you have to create the database, and initialize the geographic types (adapt the paths accordingly to your needs)::
-
- createdb --echo --owner chimere-user --encoding UNICODE chimere "My Chimère database"
- createlang plpgsql chimere
- psql -d chimere -f /usr/share/postgresql-8.3-postgis/lwpostgis.sql
- psql -d chimere -f /usr/share/postgresql-8.3-postgis/spatial_ref_sys.sql
-
-Getting the sources
-*******************
-
-The last "stable" version is available in this `directory <http://www.peacefrogs.net/download/>`_.
-
-Another solution is to get the last git version::
-
- git clone git://www.peacefrogs.net/git/chimere
- git tag -l # list tagged versions
- git checkout v1.0.0 # checkout the desired version
-
-
-Install the sources
-*******************
-
-Unpack and move the files in an apache user (www-data for Debian) readable directory::
-
- sudo mkdir /var/local/django
- cd /var/local/django
- sudo tar xvjf /home/etienne/chimere-last.tar.bz2
- sudo chown -R etienne:www-data chimere
-
-In your chimere application directory create settings.py to fit to your configuration.
-A base template is provided (settings.py.example)::
-
- cd chimere/chimere/
- cp settings.py.example settings.py
- vim settings.py
- ####
- PROJECT_NAME = u'Chimère'
-
- ROOT_PATH = '/var/local/django/chimere/chimere/' # path to the installation of Chimère
-
- SERVER_URL = "http://www.peacefrogs.net/" # root of the web address of Chimère
- EXTRA_URL = 'chimere/' # suffix to the web address of Chimère
- BASE_URL = SERVER_URL + EXTRA_URL
- EMAIL_HOST = 'localhost' # smtp of an email server to send emails
-
- TINYMCE_URL = SERVER_URL + 'tinymce/'
-
- # chimere specific
- DEFAULT_CENTER = (-1.679444, 48.114722) # default center of the map
- EPSG_PROJECTION = 900913 # projection used for data exchange (JSON flow)
- EPSG_DISPLAY_PROJECTION = 4326 # projection used to display on the map
-
- # default id category to check on the map
- DEFAULT_CATEGORIES = [1] # list of default category ids checked on the map
-
- # JS definition of the main map cf. OpenLayers documentation for more details
- # to begin you can leave the default OpenStreetMap map rendered with Mapnik
- MAP_LAYER = "new OpenLayers.Layer.OSM.Mapnik('Mapnik')"
-
- # setting the appropriate language code for your site
- LANGUAGE_CODE = 'en-gb'
-
- # database configuration
- DATABASE_ENGINE = 'postgresql_psycopg2' # leave it to 'postgresql_psycopg2'
- DATABASE_NAME = 'chimere' # database name
- DATABASE_USER = 'chimere-user' # database user
- DATABASE_PASSWORD = 'mypassword' # database password
- DATABASE_HOST = '' # set to empty string for localhost
-
- DATABASE_PORT = '' # set to empty string for default
-
- ####
-
-If you want to use tinymce don't forget to make it available to Chimère.
-
-In this same chimere directory, make a symbolic link to django's basic styles (do not forget to change the path according to your configuration, it is the last time I will recall it to you. Next time, you are on your own!)::
-
- ln -s /usr/share/pyshared/django/contrib/admin/media/ .
-
-Compiling languages
-*******************
-
-If your language is available in the locale directory of chimere, you will just need to get it compiled. Still being in the chimere directory, this can be done with (here, "de" stands for german. Replace it with the appropriate language code)::
-
- django-admin compilemessages -l de
-
-If your language is not available, feel free to create the default po files and to submit it, contributions are well appreciated. Procedure is as follows :
-
-You first need to create the default po file (of course, replace "de" according to the language you chose to create)::
-
- django-admin makemessages -l de
-
-There should now be a django.po file in locale/de/LC_MESSAGES. Complete it with your translation.
-
-Now that the translation file is completed, just compile it the same way you would have if the language file was already available.
-
-Database initialisation
-***********************
-
-Create the appropriate tables (still being in chimère application directory)::
-
- ./manage.py syncdb
-
-You will be prompted for the creation of an administrator account (administration can be found at: http://where_is_chimere/admin).
-The database is set, congratulations!
-
-Webserver configuration
-***********************
-
-Apache configuration with mod_wsgi
-++++++++++++++++++++++++++++++++++
-
-Install mod_wsgi for apache::
-
- sudo apt-get install libapache2-mod-wsgi
-
-
-Create and edit a configuration for Chimère::
-
- sudo mkdir /var/local/django/chimere/apache
- sudo cp /var/local/django/chimere/docs/conf/django.wsgi /var/local/django/chimere/apache/django.wsgi
- sudo cp /var/local/django/chimere/docs/conf/apache-wsgi.conf /etc/apache2/sites-available/chimere
-
-Adapt the files django.wsgi (with the correct sys path) and chimere.
-
-To activate the website reload apache::
-
- sudo a2ensite chimere
- sudo /etc/init.d/apache2 reload
-
-Apache configuration with mod_python
-++++++++++++++++++++++++++++++++++++
-
-Install mod_python for apache::
-
- apt-get install libapache2-mod-python
-
-Create and edit a configuration file for Chimère::
-
- sudo vim /etc/apache2/sites-available/chimere
-
-Insert Apache directives for your installation::
-
- # part of the address after the root of your site
- <Location "/chimere/">
- # directory path to the father of the installation of Chimère
- PythonPath "['/var/local/django/'] + sys.path"
- SetHandler python-program
- PythonHandler django.core.handlers.modpython
- SetEnv DJANGO_SETTINGS_MODULE chimere.settings
- # set it to on or off if in test or production environment
- PythonDebug On
- # put differents interpreter names if you deploy several Chimère
- PythonInterpreter chimere
- </Location>
-
-To activate the website reload apache::
-
- sudo a2ensite chimere
- sudo /etc/init.d/apache2 reload
-
-
-Now that you have gone through ALL this configuration procedure (which was not that hard after all) you can configure the site.
-
-------------------
-Base configuration
-------------------
-
-When you have installed the application there is a few simple steps to follow to configure *your* Chimère.
-
-Most of theses steps are done in the administration pages accessible at : http://where_is_chimere/admin
-To access theses pages you have to identify you with login and password provided at the initialization of the database.
-
-Creating users
---------------
-
-If you are not the only administrator of this Chimère installation you have to create account for the other users.
-Currently the process has to be done manualy.
-
-Simply click on the Add button near Users. Give a name and a default password (the user can change it on in own later).
-Then complete the other pieces of information.
-Check the case: Member of the staff (or this user will not be able to log to this administration site).
-To simply give this user correct rights don't add permission manualy but make this user member of a group.
-Two default group are proposed: application administrator and moderator.
-
-Detail of rights for default user/groups:
-
-+-----------------------------------------+-------------------+---------------------------+-----------+
-| Task | Application owner | Application administrator | Moderator |
-+=========================================+===================+===========================+===========+
-| User add/modify/delete | yes | no | no |
-+-----------------------------------------+-------------------+---------------------------+-----------+
-| Group add/modify/delete | yes | no | no |
-+-----------------------------------------+-------------------+---------------------------+-----------+
-| Property model add/modify/delete | yes | no | no |
-+-----------------------------------------+-------------------+---------------------------+-----------+
-| News add/modify/delete | yes | yes | no |
-+-----------------------------------------+-------------------+---------------------------+-----------+
-| Area add/modify/delete | yes | yes | no |
-+-----------------------------------------+-------------------+---------------------------+-----------+
-| Icon add/modify/delete | yes | yes | no |
-+-----------------------------------------+-------------------+---------------------------+-----------+
-| Category/Subcategory add/modify/delete | yes | yes | no |
-+-----------------------------------------+-------------------+---------------------------+-----------+
-| Point Of Interest add/modify/delete | yes | yes | yes |
-+-----------------------------------------+-------------------+---------------------------+-----------+
-| Route add/modify/delete | yes | yes | yes |
-+-----------------------------------------+-------------------+---------------------------+-----------+
-
-Setting the welcome page
-------------------------
-
-The message has to be set by updating the file templates/welcome.html.
-You only have to change the message at the begin of #detail_content.
-
-Creating property models
-------------------------
-
-A basic installation of Chimère only permit to associate a name, a category and (for the point of interest) a picture for each point of interest and each route. You may want to add more fields like phone number or opening hours. For that all you have to do is to add a new property model.
-The administration ask you for name, order (to order between other properties), availability for the user and type (only text field and long text field are available for the moment).
-Then to make this property available it is necessary to restart your application (and then probably to reload Apache).
-All forms are then automaticaly updated with this new field.
-
-Updating the detail window
---------------------------
-
-When clicking on a POI a window appear with the details.
-Particulary if you have set some new property models you may want to customize this window.
-Each property is in a paragraph with id: property_i_j (i is the order and j is the model property id - the first model property is id 1 then 2...).
-You can simply adapt the CSS file (static/styles.css) to match the desired presentation.
-If you want to really change the whole presentation you can change the template file templates/detail.html (go to the Django template documentation for details).
-
-Updating the design
--------------------
-
-You can of course customize Chimère with your own CSS. To do that just edit the file static/styles.css.
-
-After this basic configuration done the harder is done. You can do now application administration tasks.
-
--------------------
-Site administration
--------------------
-
-The explanation are to create new elements. To modify these elements it is the same if only some fields are already filled.
-
-Creating news
--------------
-
-A news system is available.
-All you have to to do is to click on the Add button near News.
-For each news you have to provided a name and a content. The content can contain HTML tags.
-The avaibility is set with a checkbox.
-
-Creating categories/subcategories
----------------------------------
-
-Before adding categories you have to set some icons. Theses icons appears on the map and in the categories' box on the main map.
-Be careful to resize correctly your icons. Indeed the icon will be presented at their real size on the map.
-To add icons: the Add button near Icons.
-
-Categories are in fact only containers for subcategories. You'll have to provide only a name and an order.
-To add categories: the Add button near categories (quite clear now, isn't it?)
-
-Fields of subcategories are: an associated category, a name, an icon, an order, a color and an element type.
-Theses fields are mainly quite self-explainatory.
-The color is used to draw routes (if this subcategory contains routes). If it a basic color it can be set with the english name (for instance: "red", "blue", "yellow" or "purple") otherwise you can put the HTML RVB code (for instance "#9227c9").
-The element type is the type of element the subcategory can contain: POI, route or both.
-
-Creating areas
---------------
-
-Areas are useful to provide a quick access to a particular town, a district, etc.
-To define an area fill a name and move/zoom to the choosed location. Submit it and that's all.
-
-----------
-Moderation
-----------
-
-The moderation step is quite simple. It works the same with POIs and routes.
-The moderator can access to all POIs (or routes) by clicking on the Modify button.
-A search field is available to search by name but the more interesting is to filter POIs (or route) by state and by subcategory.
-Then to modify an item you have to click on his name.
-The submission can now freely modified. Compared to the main submission interface there is only on field add: the state field. To be publish in the main site the item must have the state: Available.
-If an item is not revelant the Delete button permit to remove it.
-
diff --git a/docs/_build/html/_sources/install.txt b/docs/_build/html/_sources/install.txt
deleted file mode 100644
index 2dd745b..0000000
--- a/docs/_build/html/_sources/install.txt
+++ /dev/null
@@ -1,274 +0,0 @@
-.. -*- coding: utf-8 -*-
-
-============
-Installation
-============
-
-:Author: Étienne Loks
-:date: 2012-10-08
-:Copyright: CC-BY 3.0
-
-This documents presents the installation of Chimère.
-The version has been updated for version 2.0.0.
-
-Prerequisites
-*************
-
- - `apache <http://www.apache.org/>`_ version 2.x
- - `python <http://www.python.org/>`_ versions 2.6 or 2.7
- - `django <http://www.djangoproject.com/>`_ >= version 1.4
- - `south <http://south.aeracode.org/>`_
- - `postgres <http://www.postgresql.org/>`_ >= version 8.x
- - `gettext <http://www.gnu.org/software/gettext/>`_
- - `psycopg2 <http://freshmeat.net/projects/psycopg/>`_
- - `Python Imaging Library <http://www.pythonware.com/products/pil/>`_
- - `pyexiv2 <http://tilloy.net/dev/pyexiv2/>`_
- - `Beautiful Soup <http://www.crummy.com/software/BeautifulSoup/>`_
- - python-simplejson
- - python-gdal
- - `unidecode <http://pypi.python.org/pypi/Unidecode>_
- - `lxml <http://lxml.de/>`_
- - `jquery <http://jquery.com/>`_ version 1.7.1 or better
- - `jquery-ui <http://jqueryui.com/>`_
- - `Universal Feed Parser <https://code.google.com/p/feedparser/>`_
-
-geodjango is a part of django since version 1.0 but it has some specific
-(geographically related) additional dependencies:
-
- - `geos <http://trac.osgeo.org/geos/>`_ 3.0.x
- - `proj.4 <http://trac.osgeo.org/proj/>`_ 4.4 to 4.6
- - `posgis <http://postgis.refractions.net/>`_ versions 1.2.1 or 1.3.x
- - `gdal <http://www.gdal.org/>`_
-
-
-Optionaly (but recommanded):
-
- - `tinymce <http://tinymce.moxiecode.com/>`_
- - `gpsbabel <http://www.gpsbabel.org/>`_
- - django-celery if you want to manage large imports
-
-
-The simpliest way to obtain these packages is to get them from your favorite
-Linux distribution repositories. For instance on Debian Wheezy::
-
- apt-get install python python-django python-django-south \
- python-beautifulsoup tinymce apache2 libgeos-3.3.3 proj-bin gdal-bin \
- python-gdal python-lxml python-psycopg2 python-imaging gettext \
- postgresql-9.1 postgresql-9.1-postgis libjs-jquery libjs-jquery-ui \
- python-django-celery python-simplejson gpsbabel \
- python-pyexiv2 python-feedparser javascript-common
-
-On Debian Squeeze (you need to activate backports)::
-
- apt-get install -t squeeze-backports python-django
-
- apt-get install python python-django-south python-beautifulsoup tinymce \
- apache2 libgeos-3.2.0 proj-bin gdal-bin python-gdal python-lxml \
- python-psycopg2 python-imaging gettext postgresql-8.4 \
- postgresql-8.4-postgis libjs-jquery libjs-jquery-ui python-simplejson \
- gpsbabel python-pyexiv2 python-feedparser javascript-common
-
-
-If these packages do not exist in your distribution's repository, please refer
-to the applications' websites.
-
-Database configuration
-**********************
-
-Now that postgres and postgis are installed, you need to create a new user for
-chimere::
-
- su postgres
- createuser --echo --adduser --createdb --encrypted --pwprompt chimere-user
-
-Then, you have to create the database and initialize the geographic types (adapt
-the paths accordingly to your needs)::
-
- PG_VERSION=9.1 # 8.4 for debian Squeeze
- createdb --echo --owner chimere-user --encoding UNICODE chimere "My Chimère database"
- createlang plpgsql chimere # only necessary on Debian Squeeze
- psql -d chimere -f /usr/share/postgresql/$PG_VERSION/contrib/postgis-1.5/postgis.sql
- psql -d chimere -f /usr/share/postgresql/$PG_VERSION/contrib/postgis-1.5/spatial_ref_sys.sql
-
-Install the sources
-*******************
-
-Choose a path to install your Chimère::
-
- INSTALL_PATH=/var/local/django
- mkdir $INSTALL_PATH
-
-From an archive
-+++++++++++++++
-
-The last "stable" version is available in this `directory <http://www.peacefrogs.net/download/chimere/>`_.
-Take care of getting the last version in the desired X.Y branch (for instance
-the last version for the 1.0 branch is version 1.0.2.
-Extract it to the desired destination path::
-
- wget http://www.peacefrogs.net/download/chimere -q -O -| html2text
- (...)
- [[ ]] chimere-1.0.0.tar.bz2 17-Nov-2010 16:51 53K
- [[ ]] chimere-1.0.1.tar.bz2 17-Nov-2010 16:51 53K
- [[ ]] chimere-1.0.2.tar.bz2 17-Nov-2010 16:51 53K
- (...)
-
- wget http://www.peacefrogs.net/download/chimere/chimere-1.0.2.tar.bz2
-
-Download, unpack and move the files in an apache user (www-data for Debian)
-readable directory::
-
- cd $INSTALL_PATH
- tar xvjf chimere-last.tar.bz2
- chown -R myusername:www-data chimere
-
-From the git repository
-+++++++++++++++++++++++
-
-Another solution is to get the last git version::
-
- cd $INSTALL_PATH
- git clone git://www.peacefrogs.net/git/chimere
- cd chimere
- git tag -l # list tagged versions
- git checkout v2.0 # checkout the desired version
-
-
-Create a custom project template
-********************************
-
-There a default project provided "example_project". Copy and modify it (or
-get another project based on Chimere)::
-
- cd $INSTALL_PATH/chimere
- cp -ra example_project mychimere_project
-
-Your project name is used for the name of the Python package of your template.
-As a Python package it should follow the rule of Python variable name:
-it must be at least one letter and can have a string of numbers, letters and
-"_" to any length. Don't begin the name by "_" because it has special
-significance in Python.
-
-In your chimere application directory create local_settings.py to fit to your
-configuration.
-A base template is provided (local_settings.py.example) and short descriptions of
-the more relevant fields are given below (at least check them). Most of theses
-settings are initialized in settings.py. ::
-
- cd $INSTALL_PATH/chimere/mychimere_project
- cp local_settings.py.sample local_settings.py
- vim local_settings.py
-
-:Fields:
-
- * DATABASES: parameters for the database
- * PROJECT_NAME: name of the project
- * SECRET_KEY: a secret key for a particular Django installation. This is
- used to provide cryptographic signing, and should be set to a unique,
- unpredictable value. Change it!
- * ROOT_URLCONF: url configuration for your project something like:
- 'mychimere_project.urls'
- * EMAIL_HOST: smtp of an email server to send emails
- * TINYMCE_URL: url to tinymce path (default is appropriate for a Debian
- installation with tinymce activated)
- * JQUERY_JS_URLS: list of Jquery and Jquery-ui urls (default is appropriate
- for a Debian installation with Jquery and Jquery-ui activated)
- * JQUERY_CSS_URLS: list of Jquery and Jquery-ui urls (default is appropriate
- for a Debian installation with Jquery and Jquery-ui activated)
- * GPSBABEL: path to gpsbabel (default is appropriate for a Debian
- installation with gpsbabel installed)
- * TIME_ZONE: local time zone for this installation
- * LANGUAGE_CODE: language code for this installation
-
-Manage media path permission::
-
- cd $INSTALL_PATH/chimere/mychimere_project
- chown -R user:www-data media
- chmod -R g+w media
-
-Create log file::
-
- mkdir /var/log/django
- touch /var/log/django/chimere.log
- chown -R root:www-data /var/log/django/
- chmod -R g+w /var/log/django/
-
-Regroup static files in one path::
-
- cd $INSTALL_PATH/chimere/mychimere_project
- ./manage.py collectstatic
-
-Compiling languages
-*******************
-
-If your language is available in the locale directory of chimere, you will just
-need to get it compiled. This can be done with (here, **fr** stands for french).
-Replace it with the appropriate language code)::
-
- cd $INSTALL_PATH/chimere/chimere/
- django-admin compilemessages
-
-If your language is not available, feel free to create the default po files and
-to submit it, contributions are well appreciated. Procedure is as follows:
-
-You first need to create the default po file (of course, replace **fr**
-according to the language you choose to create)::
-
- django-admin makemessages -l fr
-
-There should now be a *django.po* file in *locale/fr/LC_MESSAGES*. Complete it
-with your translation.
-
-Now that the translation file is completed, just compile it the same way you
-would have if the language file was already available.
-
-Database initialisation
-***********************
-
-Create the appropriate tables (still being in chimère application directory)::
-
- cd $INSTALL_PATH/chimere/mychimere_project
- ./manage.py syncdb
-
-You will be prompted for the creation of an administrator account
-(administration can be found at: http://where_is_chimere/admin). Then you have
-to create tables managed with south::
-
- ./manage.py migrate
-
-The database is set, congratulations!
-
-If you want to populate your installation with default data (don't do this on
-an already populated instance!)::
-
- ./manage.py loaddata ../chimere/fixtures/default_data.json
-
-Webserver configuration
-***********************
-
-Apache configuration with mod_wsgi
-++++++++++++++++++++++++++++++++++
-
-Install mod_wsgi for apache::
-
- apt-get install libapache2-mod-wsgi
-
-
-TODO: adapt apache-wsgi.conf
-Create and edit a configuration for Chimère::
-
- cp $INSTALL_PATH/chimere/apache/django.wsgi \
- $INSTALL_PATH/chimere/apache/mydjango.wsgi
- vim $INSTALL_PATH/chimere/apache/mydjango.wsgi
- cp $INSTALL_PATH/chimere/apache/apache-wsgi.conf /etc/apache2/sites-available/chimere
- vim /etc/apache2/sites-available/chimere
- # create log dir
- mkdir /var/log/apache2/chimere/
-
-Adapt the files *mydjango.wsgi* (with the correct sys path) and Apache *chimere*.
-
-To activate the website reload apache::
-
- a2ensite chimere
- /etc/init.d/apache2 reload
-
diff --git a/docs/_build/html/_sources/upgrade.txt b/docs/_build/html/_sources/upgrade.txt
deleted file mode 100644
index f2d0d64..0000000
--- a/docs/_build/html/_sources/upgrade.txt
+++ /dev/null
@@ -1,313 +0,0 @@
-.. -*- coding: utf-8 -*-
-
-=======
-Upgrade
-=======
-
-:Author: Étienne Loks
-:date: 2012-10-08
-:Copyright: CC-BY 3.0
-
-
-Before any upgrade backup the database and all your installation files
-(specially if you have made changes to them).
-The process for migration requires a basic knowledge of Git and Linux CLI. It is
-not an easy process. A work is done to easy the upgrade in later versions (>2.0)
-of Chimère.
-
-If several versions has been published, you should repeat any upgrading steps.
-For instance to upgrade from v1.1 to v2.0 you should first upgrade to v1.2 then
-to v2.0. The only optional step is the integration of your customisations.
-
-The current stable version is 2.0.
-If you are considering to contribute on Chimère get the Git master.
-
-The instruction are given for Debian Squeeze and Debian Wheezy.
-
-
-Get new version of dependencies
--------------------------------
-
-Version 1.1 -> 1.2
-******************
-
-.. code-block:: bash
-
- apt-get install python-lxml libjs-jquery gpsbabel python-gdal
-
-Version 1.2 -> 2.0
-******************
-
-Debian Squeeze
-++++++++++++++
-Activate the backports: http://backports-master.debian.org/Instructions/
-Then install the new dependencies::
-
- apt-get install -t squeeze-backports python-django python-django-south \
- python-simplejson libjs-jquery-ui python-pyexiv2 \
- python-feedparser javascript-common
-
-Debian Wheezy
-+++++++++++++
-
-.. code-block:: bash
-
- apt-get install python-django-south python-simplejson libjs-jquery-ui \
- python-pyexiv2 python-feedparser javascript-common
-
-If you are planing to do major import consider the install of `Celery
-<http://celeryproject.org/>`_.
-
-.. code-block:: bash
-
- apt-get install python-django-celery python-kombu
-
-Get the new sources
--------------------
-
-First of all we have to get the new version of the source code.
-For this upgrade process, we are getting the source code from the Git
-repository.
-
-To simplify further instructions, some environment variables are
-initialized.
-
-.. code-block:: bash
-
- CHIMERE_PATH=/srv/chimere
- CHIMERE_TAG=v1.2.0 # version 1.1 -> 1.2
- CHIMERE_TAG=v2.0-RC3 # version 1.2 -> 2.0
- CHIMERE_TAG=master # version 2.0 -> master
- CHIMERE_LOCALNAME=mychimere
-
-Your local name is used for the name of your local git branch and the Python
-package. As a Python package it should follow the rule of Python variable name:
-it must be at least one letter and can have a string of numbers, letters and
-"_" to any length. Don't begin the name by "_" because it has special
-significance in Python.
-
-From a previous Git installation
-********************************
-
-.. code-block:: bash
-
- cd $CHIMERE_PATH
- git checkout -b $CHIMERE_LOCALNAME # do it only if you haven't yet create a local branch
- git stash # if you have uncommited changes
- git checkout master
- git pull
- git checkout $CHIMERE_LOCALNAME
- git rebase $CHIMERE_TAG
-
-From a previous tarball installation
-************************************
-
-Remove first your old installation and get the Git version.
-
-.. code-block:: bash
-
- cd $CHIMERE_PATH
- cd ..
- rm -rf $CHIMERE_PATH
- git clone git://www.peacefrogs.net/git/chimere
- cd chimere
- git checkout $CHIMERE_TAG
- git checkout -b $CHIMERE_LOCALNAME
-
-
-Update basic settings
-*********************
-
-Version 1.1 -> 1.2
-++++++++++++++++++
-
-.. code-block:: bash
-
- CHIMERE_APP_PATH=$CHIMERE_PATH/chimere
- vim $CHIMERE_APP_PATH/settings.py
-
-Add the line (adapted for your jquery and gpsbabel installation).
-
-.. code-block:: python
-
- JQUERY_URL = SERVER_URL + 'jquery/jquery-1.4.4.min.js'
- GPSBABEL = '/usr/bin/gpsbabel'
- # simplify with an error of 5 meters
- GPSBABEL_OPTIONS = 'simplify,crosstrack,error=0.005k'
-
-Version 1.2 -> 2.0
-++++++++++++++++++
-
-Project template
-................
-Create a new project template.
-
-.. code-block:: bash
-
- cd $CHIMERE_PATH
- cp -ra $CHIMERE_PATH/example_project $CHIMERE_LOCALNAME
- CHIMERE_APP_PATH=$CHIMERE_PATH/$CHIMERE_LOCALNAME
-
-local_settings
-..............
-A *local_settings* file is now used.
-
-.. code-block:: bash
-
- cd $CHIMERE_APP_PATH
- cp local_settings.py.sample local_settings.py
- vim local_settings.py
-
-Report your old settings.py in local_settings.py (at least the database
-configuration).
-Your *ROOT_URLCONF* must be set to **value_of_your_localname.urls**.
-
-logs
-....
-Logging is now enabled by default in the file */var/log/django/chimere.log*.
-
-.. code-block:: bash
-
- mkdir /var/log/django
- touch /var/log/django/chimere.log
- chown www-data -R /var/log/django
-
-Static files
-............
-
-Now static file are managed with *django.contrib.staticfiles*.
-
-.. code-block:: bash
-
- cd $CHIMERE_APP_PATH
- ./manage.py collectstatic
-
-Move old static files to the new static directory.
-
-.. code-block:: bash
-
- cp -ra $CHIMERE_PATH/chimere/static/* $CHIMERE_APP_PATH/static/
- cp -ra $CHIMERE_PATH/chimere/static/icons/* $CHIMERE_APP_PATH/media/icons/
- cp -ra $CHIMERE_PATH/chimere/static/upload $CHIMERE_APP_PATH/media/
-
-Webserver configuration
-.......................
-If you are using Apache and WSGI to serve your Chimère, change your WSGI
-configuration file to point to the correct settings:
-**value_of_your_localname.settings**.
-
-Change your webserver directive to point to the correct static directory from
-**your_chimere_path/chimere/static** to
-**your_chimere_path/your_local_name/static**.
-
-Version 2.0 -> master
-+++++++++++++++++++++
-
-Update settings and static files.
-
-.. code-block:: bash
-
- cp $CHIMERE_PATH/example_project/settings.py $CHIMERE_LOCALNAME
- ./manage.py collectstatic
-
-Migrate database
-----------------
-
-Version 1.1 -> 1.2
-******************
-
-Migration scripts test your installation before making changes so you probably
-won't have any lost but by precaution before running theses scripts don't forget
-to backup your database.
-You can also make a copy of your current database into a new database and make
-the new installation to this new database.
-
-The gdal binding for python is necessary to run the upgrade scripts (available
-in the python-gdal package in Debian).
-
-If you run the migration scripts in a production environnement stop the old
-instance of Chimère before executing the migration script. Perhaps prepare the
-web server to point to the new installation before doing the database upgrade
-(cf. next paragraph).
-
-In *settings.py* verify that **chimere.scripts** is in the *INSTALLED_APPS*.
-
-After that in the chimere directory just execute the script.
-
-.. code-block:: bash
-
- cd $CHIMERE_APP_PATH
- python ./scripts/upgrade.py
-
-Version 1.2 -> 2.0
-******************
-
-Django South is now used to manage database migrations.
-
-.. code-block:: bash
-
- cd $CHIMERE_APP_PATH
- ./manage.py syncdb
- ./manage.py migrate chimere 0001 --fake # fake the database initialisation
- ./manage.py migrate chimere
-
-A description field is now available for markers. If you would like to move
-values of an old *Property model* to this new field, a script is available.
-
-.. code-block:: bash
-
- cd $CHIMERE_APP_PATH
- ../chimere/scripts/migrate_properties.py
- # folow the instructions
-
-From 2.0 to master
-******************
-
-.. code-block:: bash
-
- cd $CHIMERE_APP_PATH
- ./manage.py syncdb
- ./manage.py migrate chimere
-
-Update translations
--------------------
-
-Version 1.1 -> 1.2
-******************
-
-.. code-block:: bash
-
- cd $CHIMERE_APP_PATH
- ./manage.py compilemessages
-
-Version 1.2 -> 2.0 -> master
-****************************
-
-.. code-block:: bash
-
- cd $CHIMERE_PATH/chimere
- django-admin compilemessages
-
-Force the upgrade of visitor's web browser cache
-------------------------------------------------
-
-If major changes in the javascript has be done between version, many of your
-users could experience problems. There are many tricks to force the refresh
-of their cache. One of them is to change the location of statics files. To do
-that edit your local_settings.py and change::
-
- STATIC_URL = '/static/'
-
-to::
-
- STATIC_URL = '/static/v2.0.0/'
-
-Then in the static directory.
-
-.. code-block:: bash
-
- cd $CHIMERE_APP_PATH/static
- ln -s `pwd` v2.0.0
-
-Restart the web server to apply this changes.
-
diff --git a/docs/_build/html/_static/ajax-loader.gif b/docs/_build/html/_static/ajax-loader.gif
deleted file mode 100644
index 61faf8c..0000000
--- a/docs/_build/html/_static/ajax-loader.gif
+++ /dev/null
Binary files differ
diff --git a/docs/_build/html/_static/basic.css b/docs/_build/html/_static/basic.css
deleted file mode 100644
index 43e8baf..0000000
--- a/docs/_build/html/_static/basic.css
+++ /dev/null
@@ -1,540 +0,0 @@
-/*
- * basic.css
- * ~~~~~~~~~
- *
- * Sphinx stylesheet -- basic theme.
- *
- * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
- * :license: BSD, see LICENSE for details.
- *
- */
-
-/* -- main layout ----------------------------------------------------------- */
-
-div.clearer {
- clear: both;
-}
-
-/* -- relbar ---------------------------------------------------------------- */
-
-div.related {
- width: 100%;
- font-size: 90%;
-}
-
-div.related h3 {
- display: none;
-}
-
-div.related ul {
- margin: 0;
- padding: 0 0 0 10px;
- list-style: none;
-}
-
-div.related li {
- display: inline;
-}
-
-div.related li.right {
- float: right;
- margin-right: 5px;
-}
-
-/* -- sidebar --------------------------------------------------------------- */
-
-div.sphinxsidebarwrapper {
- padding: 10px 5px 0 10px;
-}
-
-div.sphinxsidebar {
- float: left;
- width: 230px;
- margin-left: -100%;
- font-size: 90%;
-}
-
-div.sphinxsidebar ul {
- list-style: none;
-}
-
-div.sphinxsidebar ul ul,
-div.sphinxsidebar ul.want-points {
- margin-left: 20px;
- list-style: square;
-}
-
-div.sphinxsidebar ul ul {
- margin-top: 0;
- margin-bottom: 0;
-}
-
-div.sphinxsidebar form {
- margin-top: 10px;
-}
-
-div.sphinxsidebar input {
- border: 1px solid #98dbcc;
- font-family: sans-serif;
- font-size: 1em;
-}
-
-div.sphinxsidebar #searchbox input[type="text"] {
- width: 170px;
-}
-
-div.sphinxsidebar #searchbox input[type="submit"] {
- width: 30px;
-}
-
-img {
- border: 0;
-}
-
-/* -- search page ----------------------------------------------------------- */
-
-ul.search {
- margin: 10px 0 0 20px;
- padding: 0;
-}
-
-ul.search li {
- padding: 5px 0 5px 20px;
- background-image: url(file.png);
- background-repeat: no-repeat;
- background-position: 0 7px;
-}
-
-ul.search li a {
- font-weight: bold;
-}
-
-ul.search li div.context {
- color: #888;
- margin: 2px 0 0 30px;
- text-align: left;
-}
-
-ul.keywordmatches li.goodmatch a {
- font-weight: bold;
-}
-
-/* -- index page ------------------------------------------------------------ */
-
-table.contentstable {
- width: 90%;
-}
-
-table.contentstable p.biglink {
- line-height: 150%;
-}
-
-a.biglink {
- font-size: 1.3em;
-}
-
-span.linkdescr {
- font-style: italic;
- padding-top: 5px;
- font-size: 90%;
-}
-
-/* -- general index --------------------------------------------------------- */
-
-table.indextable {
- width: 100%;
-}
-
-table.indextable td {
- text-align: left;
- vertical-align: top;
-}
-
-table.indextable dl, table.indextable dd {
- margin-top: 0;
- margin-bottom: 0;
-}
-
-table.indextable tr.pcap {
- height: 10px;
-}
-
-table.indextable tr.cap {
- margin-top: 10px;
- background-color: #f2f2f2;
-}
-
-img.toggler {
- margin-right: 3px;
- margin-top: 3px;
- cursor: pointer;
-}
-
-div.modindex-jumpbox {
- border-top: 1px solid #ddd;
- border-bottom: 1px solid #ddd;
- margin: 1em 0 1em 0;
- padding: 0.4em;
-}
-
-div.genindex-jumpbox {
- border-top: 1px solid #ddd;
- border-bottom: 1px solid #ddd;
- margin: 1em 0 1em 0;
- padding: 0.4em;
-}
-
-/* -- general body styles --------------------------------------------------- */
-
-a.headerlink {
- visibility: hidden;
-}
-
-h1:hover > a.headerlink,
-h2:hover > a.headerlink,
-h3:hover > a.headerlink,
-h4:hover > a.headerlink,
-h5:hover > a.headerlink,
-h6:hover > a.headerlink,
-dt:hover > a.headerlink {
- visibility: visible;
-}
-
-div.body p.caption {
- text-align: inherit;
-}
-
-div.body td {
- text-align: left;
-}
-
-.field-list ul {
- padding-left: 1em;
-}
-
-.first {
- margin-top: 0 !important;
-}
-
-p.rubric {
- margin-top: 30px;
- font-weight: bold;
-}
-
-img.align-left, .figure.align-left, object.align-left {
- clear: left;
- float: left;
- margin-right: 1em;
-}
-
-img.align-right, .figure.align-right, object.align-right {
- clear: right;
- float: right;
- margin-left: 1em;
-}
-
-img.align-center, .figure.align-center, object.align-center {
- display: block;
- margin-left: auto;
- margin-right: auto;
-}
-
-.align-left {
- text-align: left;
-}
-
-.align-center {
- text-align: center;
-}
-
-.align-right {
- text-align: right;
-}
-
-/* -- sidebars -------------------------------------------------------------- */
-
-div.sidebar {
- margin: 0 0 0.5em 1em;
- border: 1px solid #ddb;
- padding: 7px 7px 0 7px;
- background-color: #ffe;
- width: 40%;
- float: right;
-}
-
-p.sidebar-title {
- font-weight: bold;
-}
-
-/* -- topics ---------------------------------------------------------------- */
-
-div.topic {
- border: 1px solid #ccc;
- padding: 7px 7px 0 7px;
- margin: 10px 0 10px 0;
-}
-
-p.topic-title {
- font-size: 1.1em;
- font-weight: bold;
- margin-top: 10px;
-}
-
-/* -- admonitions ----------------------------------------------------------- */
-
-div.admonition {
- margin-top: 10px;
- margin-bottom: 10px;
- padding: 7px;
-}
-
-div.admonition dt {
- font-weight: bold;
-}
-
-div.admonition dl {
- margin-bottom: 0;
-}
-
-p.admonition-title {
- margin: 0px 10px 5px 0px;
- font-weight: bold;
-}
-
-div.body p.centered {
- text-align: center;
- margin-top: 25px;
-}
-
-/* -- tables ---------------------------------------------------------------- */
-
-table.docutils {
- border: 0;
- border-collapse: collapse;
-}
-
-table.docutils td, table.docutils th {
- padding: 1px 8px 1px 5px;
- border-top: 0;
- border-left: 0;
- border-right: 0;
- border-bottom: 1px solid #aaa;
-}
-
-table.field-list td, table.field-list th {
- border: 0 !important;
-}
-
-table.footnote td, table.footnote th {
- border: 0 !important;
-}
-
-th {
- text-align: left;
- padding-right: 5px;
-}
-
-table.citation {
- border-left: solid 1px gray;
- margin-left: 1px;
-}
-
-table.citation td {
- border-bottom: none;
-}
-
-/* -- other body styles ----------------------------------------------------- */
-
-ol.arabic {
- list-style: decimal;
-}
-
-ol.loweralpha {
- list-style: lower-alpha;
-}
-
-ol.upperalpha {
- list-style: upper-alpha;
-}
-
-ol.lowerroman {
- list-style: lower-roman;
-}
-
-ol.upperroman {
- list-style: upper-roman;
-}
-
-dl {
- margin-bottom: 15px;
-}
-
-dd p {
- margin-top: 0px;
-}
-
-dd ul, dd table {
- margin-bottom: 10px;
-}
-
-dd {
- margin-top: 3px;
- margin-bottom: 10px;
- margin-left: 30px;
-}
-
-dt:target, .highlighted {
- background-color: #fbe54e;
-}
-
-dl.glossary dt {
- font-weight: bold;
- font-size: 1.1em;
-}
-
-.field-list ul {
- margin: 0;
- padding-left: 1em;
-}
-
-.field-list p {
- margin: 0;
-}
-
-.refcount {
- color: #060;
-}
-
-.optional {
- font-size: 1.3em;
-}
-
-.versionmodified {
- font-style: italic;
-}
-
-.system-message {
- background-color: #fda;
- padding: 5px;
- border: 3px solid red;
-}
-
-.footnote:target {
- background-color: #ffa;
-}
-
-.line-block {
- display: block;
- margin-top: 1em;
- margin-bottom: 1em;
-}
-
-.line-block .line-block {
- margin-top: 0;
- margin-bottom: 0;
- margin-left: 1.5em;
-}
-
-.guilabel, .menuselection {
- font-family: sans-serif;
-}
-
-.accelerator {
- text-decoration: underline;
-}
-
-.classifier {
- font-style: oblique;
-}
-
-abbr, acronym {
- border-bottom: dotted 1px;
- cursor: help;
-}
-
-/* -- code displays --------------------------------------------------------- */
-
-pre {
- overflow: auto;
- overflow-y: hidden; /* fixes display issues on Chrome browsers */
-}
-
-td.linenos pre {
- padding: 5px 0px;
- border: 0;
- background-color: transparent;
- color: #aaa;
-}
-
-table.highlighttable {
- margin-left: 0.5em;
-}
-
-table.highlighttable td {
- padding: 0 0.5em 0 0.5em;
-}
-
-tt.descname {
- background-color: transparent;
- font-weight: bold;
- font-size: 1.2em;
-}
-
-tt.descclassname {
- background-color: transparent;
-}
-
-tt.xref, a tt {
- background-color: transparent;
- font-weight: bold;
-}
-
-h1 tt, h2 tt, h3 tt, h4 tt, h5 tt, h6 tt {
- background-color: transparent;
-}
-
-.viewcode-link {
- float: right;
-}
-
-.viewcode-back {
- float: right;
- font-family: sans-serif;
-}
-
-div.viewcode-block:target {
- margin: -1px -10px;
- padding: 0 10px;
-}
-
-/* -- math display ---------------------------------------------------------- */
-
-img.math {
- vertical-align: middle;
-}
-
-div.body div.math p {
- text-align: center;
-}
-
-span.eqno {
- float: right;
-}
-
-/* -- printout stylesheet --------------------------------------------------- */
-
-@media print {
- div.document,
- div.documentwrapper,
- div.bodywrapper {
- margin: 0 !important;
- width: 100%;
- }
-
- div.sphinxsidebar,
- div.related,
- div.footer,
- #top-link {
- display: none;
- }
-} \ No newline at end of file
diff --git a/docs/_build/html/_static/chimere_admin_00.png b/docs/_build/html/_static/chimere_admin_00.png
deleted file mode 100644
index 374c6b6..0000000
--- a/docs/_build/html/_static/chimere_admin_00.png
+++ /dev/null
Binary files differ
diff --git a/docs/_build/html/_static/chimere_admin_01.png b/docs/_build/html/_static/chimere_admin_01.png
deleted file mode 100644
index 0db7f4d..0000000
--- a/docs/_build/html/_static/chimere_admin_01.png
+++ /dev/null
Binary files differ
diff --git a/docs/_build/html/_static/chimere_admin_02.png b/docs/_build/html/_static/chimere_admin_02.png
deleted file mode 100644
index d0fd6fe..0000000
--- a/docs/_build/html/_static/chimere_admin_02.png
+++ /dev/null
Binary files differ
diff --git a/docs/_build/html/_static/chimere_admin_03.png b/docs/_build/html/_static/chimere_admin_03.png
deleted file mode 100644
index e815500..0000000
--- a/docs/_build/html/_static/chimere_admin_03.png
+++ /dev/null
Binary files differ
diff --git a/docs/_build/html/_static/comment-bright.png b/docs/_build/html/_static/comment-bright.png
deleted file mode 100644
index 551517b..0000000
--- a/docs/_build/html/_static/comment-bright.png
+++ /dev/null
Binary files differ
diff --git a/docs/_build/html/_static/comment-close.png b/docs/_build/html/_static/comment-close.png
deleted file mode 100644
index 09b54be..0000000
--- a/docs/_build/html/_static/comment-close.png
+++ /dev/null
Binary files differ
diff --git a/docs/_build/html/_static/comment.png b/docs/_build/html/_static/comment.png
deleted file mode 100644
index 92feb52..0000000
--- a/docs/_build/html/_static/comment.png
+++ /dev/null
Binary files differ
diff --git a/docs/_build/html/_static/default.css b/docs/_build/html/_static/default.css
deleted file mode 100644
index 21f3f50..0000000
--- a/docs/_build/html/_static/default.css
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * default.css_t
- * ~~~~~~~~~~~~~
- *
- * Sphinx stylesheet -- default theme.
- *
- * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
- * :license: BSD, see LICENSE for details.
- *
- */
-
-@import url("basic.css");
-
-/* -- page layout ----------------------------------------------------------- */
-
-body {
- font-family: sans-serif;
- font-size: 100%;
- background-color: #11303d;
- color: #000;
- margin: 0;
- padding: 0;
-}
-
-div.document {
- background-color: #1c4e63;
-}
-
-div.documentwrapper {
- float: left;
- width: 100%;
-}
-
-div.bodywrapper {
- margin: 0 0 0 230px;
-}
-
-div.body {
- background-color: #ffffff;
- color: #000000;
- padding: 0 20px 30px 20px;
-}
-
-div.footer {
- color: #ffffff;
- width: 100%;
- padding: 9px 0 9px 0;
- text-align: center;
- font-size: 75%;
-}
-
-div.footer a {
- color: #ffffff;
- text-decoration: underline;
-}
-
-div.related {
- background-color: #133f52;
- line-height: 30px;
- color: #ffffff;
-}
-
-div.related a {
- color: #ffffff;
-}
-
-div.sphinxsidebar {
-}
-
-div.sphinxsidebar h3 {
- font-family: 'Trebuchet MS', sans-serif;
- color: #ffffff;
- font-size: 1.4em;
- font-weight: normal;
- margin: 0;
- padding: 0;
-}
-
-div.sphinxsidebar h3 a {
- color: #ffffff;
-}
-
-div.sphinxsidebar h4 {
- font-family: 'Trebuchet MS', sans-serif;
- color: #ffffff;
- font-size: 1.3em;
- font-weight: normal;
- margin: 5px 0 0 0;
- padding: 0;
-}
-
-div.sphinxsidebar p {
- color: #ffffff;
-}
-
-div.sphinxsidebar p.topless {
- margin: 5px 10px 10px 10px;
-}
-
-div.sphinxsidebar ul {
- margin: 10px;
- padding: 0;
- color: #ffffff;
-}
-
-div.sphinxsidebar a {
- color: #98dbcc;
-}
-
-div.sphinxsidebar input {
- border: 1px solid #98dbcc;
- font-family: sans-serif;
- font-size: 1em;
-}
-
-
-
-/* -- hyperlink styles ------------------------------------------------------ */
-
-a {
- color: #355f7c;
- text-decoration: none;
-}
-
-a:visited {
- color: #355f7c;
- text-decoration: none;
-}
-
-a:hover {
- text-decoration: underline;
-}
-
-
-
-/* -- body styles ----------------------------------------------------------- */
-
-div.body h1,
-div.body h2,
-div.body h3,
-div.body h4,
-div.body h5,
-div.body h6 {
- font-family: 'Trebuchet MS', sans-serif;
- background-color: #f2f2f2;
- font-weight: normal;
- color: #20435c;
- border-bottom: 1px solid #ccc;
- margin: 20px -20px 10px -20px;
- padding: 3px 0 3px 10px;
-}
-
-div.body h1 { margin-top: 0; font-size: 200%; }
-div.body h2 { font-size: 160%; }
-div.body h3 { font-size: 140%; }
-div.body h4 { font-size: 120%; }
-div.body h5 { font-size: 110%; }
-div.body h6 { font-size: 100%; }
-
-a.headerlink {
- color: #c60f0f;
- font-size: 0.8em;
- padding: 0 4px 0 4px;
- text-decoration: none;
-}
-
-a.headerlink:hover {
- background-color: #c60f0f;
- color: white;
-}
-
-div.body p, div.body dd, div.body li {
- text-align: justify;
- line-height: 130%;
-}
-
-div.admonition p.admonition-title + p {
- display: inline;
-}
-
-div.admonition p {
- margin-bottom: 5px;
-}
-
-div.admonition pre {
- margin-bottom: 5px;
-}
-
-div.admonition ul, div.admonition ol {
- margin-bottom: 5px;
-}
-
-div.note {
- background-color: #eee;
- border: 1px solid #ccc;
-}
-
-div.seealso {
- background-color: #ffc;
- border: 1px solid #ff6;
-}
-
-div.topic {
- background-color: #eee;
-}
-
-div.warning {
- background-color: #ffe4e4;
- border: 1px solid #f66;
-}
-
-p.admonition-title {
- display: inline;
-}
-
-p.admonition-title:after {
- content: ":";
-}
-
-pre {
- padding: 5px;
- background-color: #eeffcc;
- color: #333333;
- line-height: 120%;
- border: 1px solid #ac9;
- border-left: none;
- border-right: none;
-}
-
-tt {
- background-color: #ecf0f3;
- padding: 0 1px 0 1px;
- font-size: 0.95em;
-}
-
-th {
- background-color: #ede;
-}
-
-.warning tt {
- background: #efc2c2;
-}
-
-.note tt {
- background: #d6d6d6;
-}
-
-.viewcode-back {
- font-family: sans-serif;
-}
-
-div.viewcode-block:target {
- background-color: #f4debf;
- border-top: 1px solid #ac9;
- border-bottom: 1px solid #ac9;
-} \ No newline at end of file
diff --git a/docs/_build/html/_static/doctools.js b/docs/_build/html/_static/doctools.js
deleted file mode 100644
index d4619fd..0000000
--- a/docs/_build/html/_static/doctools.js
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * doctools.js
- * ~~~~~~~~~~~
- *
- * Sphinx JavaScript utilities for all documentation.
- *
- * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
- * :license: BSD, see LICENSE for details.
- *
- */
-
-/**
- * select a different prefix for underscore
- */
-$u = _.noConflict();
-
-/**
- * make the code below compatible with browsers without
- * an installed firebug like debugger
-if (!window.console || !console.firebug) {
- var names = ["log", "debug", "info", "warn", "error", "assert", "dir",
- "dirxml", "group", "groupEnd", "time", "timeEnd", "count", "trace",
- "profile", "profileEnd"];
- window.console = {};
- for (var i = 0; i < names.length; ++i)
- window.console[names[i]] = function() {};
-}
- */
-
-/**
- * small helper function to urldecode strings
- */
-jQuery.urldecode = function(x) {
- return decodeURIComponent(x).replace(/\+/g, ' ');
-}
-
-/**
- * small helper function to urlencode strings
- */
-jQuery.urlencode = encodeURIComponent;
-
-/**
- * This function returns the parsed url parameters of the
- * current request. Multiple values per key are supported,
- * it will always return arrays of strings for the value parts.
- */
-jQuery.getQueryParameters = function(s) {
- if (typeof s == 'undefined')
- s = document.location.search;
- var parts = s.substr(s.indexOf('?') + 1).split('&');
- var result = {};
- for (var i = 0; i < parts.length; i++) {
- var tmp = parts[i].split('=', 2);
- var key = jQuery.urldecode(tmp[0]);
- var value = jQuery.urldecode(tmp[1]);
- if (key in result)
- result[key].push(value);
- else
- result[key] = [value];
- }
- return result;
-};
-
-/**
- * small function to check if an array contains
- * a given item.
- */
-jQuery.contains = function(arr, item) {
- for (var i = 0; i < arr.length; i++) {
- if (arr[i] == item)
- return true;
- }
- return false;
-};
-
-/**
- * highlight a given string on a jquery object by wrapping it in
- * span elements with the given class name.
- */
-jQuery.fn.highlightText = function(text, className) {
- function highlight(node) {
- if (node.nodeType == 3) {
- var val = node.nodeValue;
- var pos = val.toLowerCase().indexOf(text);
- if (pos >= 0 && !jQuery(node.parentNode).hasClass(className)) {
- var span = document.createElement("span");
- span.className = className;
- span.appendChild(document.createTextNode(val.substr(pos, text.length)));
- node.parentNode.insertBefore(span, node.parentNode.insertBefore(
- document.createTextNode(val.substr(pos + text.length)),
- node.nextSibling));
- node.nodeValue = val.substr(0, pos);
- }
- }
- else if (!jQuery(node).is("button, select, textarea")) {
- jQuery.each(node.childNodes, function() {
- highlight(this);
- });
- }
- }
- return this.each(function() {
- highlight(this);
- });
-};
-
-/**
- * Small JavaScript module for the documentation.
- */
-var Documentation = {
-
- init : function() {
- this.fixFirefoxAnchorBug();
- this.highlightSearchWords();
- this.initIndexTable();
- },
-
- /**
- * i18n support
- */
- TRANSLATIONS : {},
- PLURAL_EXPR : function(n) { return n == 1 ? 0 : 1; },
- LOCALE : 'unknown',
-
- // gettext and ngettext don't access this so that the functions
- // can safely bound to a different name (_ = Documentation.gettext)
- gettext : function(string) {
- var translated = Documentation.TRANSLATIONS[string];
- if (typeof translated == 'undefined')
- return string;
- return (typeof translated == 'string') ? translated : translated[0];
- },
-
- ngettext : function(singular, plural, n) {
- var translated = Documentation.TRANSLATIONS[singular];
- if (typeof translated == 'undefined')
- return (n == 1) ? singular : plural;
- return translated[Documentation.PLURALEXPR(n)];
- },
-
- addTranslations : function(catalog) {
- for (var key in catalog.messages)
- this.TRANSLATIONS[key] = catalog.messages[key];
- this.PLURAL_EXPR = new Function('n', 'return +(' + catalog.plural_expr + ')');
- this.LOCALE = catalog.locale;
- },
-
- /**
- * add context elements like header anchor links
- */
- addContextElements : function() {
- $('div[id] > :header:first').each(function() {
- $('<a class="headerlink">\u00B6</a>').
- attr('href', '#' + this.id).
- attr('title', _('Permalink to this headline')).
- appendTo(this);
- });
- $('dt[id]').each(function() {
- $('<a class="headerlink">\u00B6</a>').
- attr('href', '#' + this.id).
- attr('title', _('Permalink to this definition')).
- appendTo(this);
- });
- },
-
- /**
- * workaround a firefox stupidity
- */
- fixFirefoxAnchorBug : function() {
- if (document.location.hash && $.browser.mozilla)
- window.setTimeout(function() {
- document.location.href += '';
- }, 10);
- },
-
- /**
- * highlight the search words provided in the url in the text
- */
- highlightSearchWords : function() {
- var params = $.getQueryParameters();
- var terms = (params.highlight) ? params.highlight[0].split(/\s+/) : [];
- if (terms.length) {
- var body = $('div.body');
- window.setTimeout(function() {
- $.each(terms, function() {
- body.highlightText(this.toLowerCase(), 'highlighted');
- });
- }, 10);
- $('<p class="highlight-link"><a href="javascript:Documentation.' +
- 'hideSearchWords()">' + _('Hide Search Matches') + '</a></p>')
- .appendTo($('#searchbox'));
- }
- },
-
- /**
- * init the domain index toggle buttons
- */
- initIndexTable : function() {
- var togglers = $('img.toggler').click(function() {
- var src = $(this).attr('src');
- var idnum = $(this).attr('id').substr(7);
- $('tr.cg-' + idnum).toggle();
- if (src.substr(-9) == 'minus.png')
- $(this).attr('src', src.substr(0, src.length-9) + 'plus.png');
- else
- $(this).attr('src', src.substr(0, src.length-8) + 'minus.png');
- }).css('display', '');
- if (DOCUMENTATION_OPTIONS.COLLAPSE_INDEX) {
- togglers.click();
- }
- },
-
- /**
- * helper function to hide the search marks again
- */
- hideSearchWords : function() {
- $('#searchbox .highlight-link').fadeOut(300);
- $('span.highlighted').removeClass('highlighted');
- },
-
- /**
- * make the url absolute
- */
- makeURL : function(relativeURL) {
- return DOCUMENTATION_OPTIONS.URL_ROOT + '/' + relativeURL;
- },
-
- /**
- * get the current relative url
- */
- getCurrentURL : function() {
- var path = document.location.pathname;
- var parts = path.split(/\//);
- $.each(DOCUMENTATION_OPTIONS.URL_ROOT.split(/\//), function() {
- if (this == '..')
- parts.pop();
- });
- var url = parts.join('/');
- return path.substring(url.lastIndexOf('/') + 1, path.length - 1);
- }
-};
-
-// quick alias for translations
-_ = Documentation.gettext;
-
-$(document).ready(function() {
- Documentation.init();
-});
diff --git a/docs/_build/html/_static/down-pressed.png b/docs/_build/html/_static/down-pressed.png
deleted file mode 100644
index 6f7ad78..0000000
--- a/docs/_build/html/_static/down-pressed.png
+++ /dev/null
Binary files differ
diff --git a/docs/_build/html/_static/down.png b/docs/_build/html/_static/down.png
deleted file mode 100644
index 3003a88..0000000
--- a/docs/_build/html/_static/down.png
+++ /dev/null
Binary files differ
diff --git a/docs/_build/html/_static/file.png b/docs/_build/html/_static/file.png
deleted file mode 100644
index d18082e..0000000
--- a/docs/_build/html/_static/file.png
+++ /dev/null
Binary files differ
diff --git a/docs/_build/html/_static/jquery.js b/docs/_build/html/_static/jquery.js
deleted file mode 100644
index f8b3fb8..0000000
--- a/docs/_build/html/_static/jquery.js
+++ /dev/null
@@ -1,9404 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.7.2
- * http://jquery.com/
- *
- * Copyright 2011, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2011, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- *
- * Date: Sat Aug 4 06:33:40 UTC 2012
- */
-(function( window, undefined ) {
-
-// Use the correct document accordingly with window argument (sandbox)
-var document = window.document,
- navigator = window.navigator,
- location = window.location;
-var jQuery = (function() {
-
-// Define a local copy of jQuery
-var jQuery = function( selector, context ) {
- // The jQuery object is actually just the init constructor 'enhanced'
- return new jQuery.fn.init( selector, context, rootjQuery );
- },
-
- // Map over jQuery in case of overwrite
- _jQuery = window.jQuery,
-
- // Map over the $ in case of overwrite
- _$ = window.$,
-
- // A central reference to the root jQuery(document)
- rootjQuery,
-
- // A simple way to check for HTML strings or ID strings
- // Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
- quickExpr = /^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,
-
- // Check if a string has a non-whitespace character in it
- rnotwhite = /\S/,
-
- // Used for trimming whitespace
- trimLeft = /^\s+/,
- trimRight = /\s+$/,
-
- // Match a standalone tag
- rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/,
-
- // JSON RegExp
- rvalidchars = /^[\],:{}\s]*$/,
- rvalidescape = /\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,
- rvalidtokens = /"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,
- rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
-
- // Useragent RegExp
- rwebkit = /(webkit)[ \/]([\w.]+)/,
- ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/,
- rmsie = /(msie) ([\w.]+)/,
- rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/,
-
- // Matches dashed string for camelizing
- rdashAlpha = /-([a-z]|[0-9])/ig,
- rmsPrefix = /^-ms-/,
-
- // Used by jQuery.camelCase as callback to replace()
- fcamelCase = function( all, letter ) {
- return ( letter + "" ).toUpperCase();
- },
-
- // Keep a UserAgent string for use with jQuery.browser
- userAgent = navigator.userAgent,
-
- // For matching the engine and version of the browser
- browserMatch,
-
- // The deferred used on DOM ready
- readyList,
-
- // The ready event handler
- DOMContentLoaded,
-
- // Save a reference to some core methods
- toString = Object.prototype.toString,
- hasOwn = Object.prototype.hasOwnProperty,
- push = Array.prototype.push,
- slice = Array.prototype.slice,
- trim = String.prototype.trim,
- indexOf = Array.prototype.indexOf,
-
- // [[Class]] -> type pairs
- class2type = {};
-
-jQuery.fn = jQuery.prototype = {
- constructor: jQuery,
- init: function( selector, context, rootjQuery ) {
- var match, elem, ret, doc;
-
- // Handle $(""), $(null), or $(undefined)
- if ( !selector ) {
- return this;
- }
-
- // Handle $(DOMElement)
- if ( selector.nodeType ) {
- this.context = this[0] = selector;
- this.length = 1;
- return this;
- }
-
- // The body element only exists once, optimize finding it
- if ( selector === "body" && !context && document.body ) {
- this.context = document;
- this[0] = document.body;
- this.selector = selector;
- this.length = 1;
- return this;
- }
-
- // Handle HTML strings
- if ( typeof selector === "string" ) {
- // Are we dealing with HTML string or an ID?
- if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
- // Assume that strings that start and end with <> are HTML and skip the regex check
- match = [ null, selector, null ];
-
- } else {
- match = quickExpr.exec( selector );
- }
-
- // Verify a match, and that no context was specified for #id
- if ( match && (match[1] || !context) ) {
-
- // HANDLE: $(html) -> $(array)
- if ( match[1] ) {
- context = context instanceof jQuery ? context[0] : context;
- doc = ( context ? context.ownerDocument || context : document );
-
- // If a single string is passed in and it's a single tag
- // just do a createElement and skip the rest
- ret = rsingleTag.exec( selector );
-
- if ( ret ) {
- if ( jQuery.isPlainObject( context ) ) {
- selector = [ document.createElement( ret[1] ) ];
- jQuery.fn.attr.call( selector, context, true );
-
- } else {
- selector = [ doc.createElement( ret[1] ) ];
- }
-
- } else {
- ret = jQuery.buildFragment( [ match[1] ], [ doc ] );
- selector = ( ret.cacheable ? jQuery.clone(ret.fragment) : ret.fragment ).childNodes;
- }
-
- return jQuery.merge( this, selector );
-
- // HANDLE: $("#id")
- } else {
- elem = document.getElementById( match[2] );
-
- // Check parentNode to catch when Blackberry 4.6 returns
- // nodes that are no longer in the document #6963
- if ( elem && elem.parentNode ) {
- // Handle the case where IE and Opera return items
- // by name instead of ID
- if ( elem.id !== match[2] ) {
- return rootjQuery.find( selector );
- }
-
- // Otherwise, we inject the element directly into the jQuery object
- this.length = 1;
- this[0] = elem;
- }
-
- this.context = document;
- this.selector = selector;
- return this;
- }
-
- // HANDLE: $(expr, $(...))
- } else if ( !context || context.jquery ) {
- return ( context || rootjQuery ).find( selector );
-
- // HANDLE: $(expr, context)
- // (which is just equivalent to: $(context).find(expr)
- } else {
- return this.constructor( context ).find( selector );
- }
-
- // HANDLE: $(function)
- // Shortcut for document ready
- } else if ( jQuery.isFunction( selector ) ) {
- return rootjQuery.ready( selector );
- }
-
- if ( selector.selector !== undefined ) {
- this.selector = selector.selector;
- this.context = selector.context;
- }
-
- return jQuery.makeArray( selector, this );
- },
-
- // Start with an empty selector
- selector: "",
-
- // The current version of jQuery being used
- jquery: "1.7.2",
-
- // The default length of a jQuery object is 0
- length: 0,
-
- // The number of elements contained in the matched element set
- size: function() {
- return this.length;
- },
-
- toArray: function() {
- return slice.call( this, 0 );
- },
-
- // Get the Nth element in the matched element set OR
- // Get the whole matched element set as a clean array
- get: function( num ) {
- return num == null ?
-
- // Return a 'clean' array
- this.toArray() :
-
- // Return just the object
- ( num < 0 ? this[ this.length + num ] : this[ num ] );
- },
-
- // Take an array of elements and push it onto the stack
- // (returning the new matched element set)
- pushStack: function( elems, name, selector ) {
- // Build a new jQuery matched element set
- var ret = this.constructor();
-
- if ( jQuery.isArray( elems ) ) {
- push.apply( ret, elems );
-
- } else {
- jQuery.merge( ret, elems );
- }
-
- // Add the old object onto the stack (as a reference)
- ret.prevObject = this;
-
- ret.context = this.context;
-
- if ( name === "find" ) {
- ret.selector = this.selector + ( this.selector ? " " : "" ) + selector;
- } else if ( name ) {
- ret.selector = this.selector + "." + name + "(" + selector + ")";
- }
-
- // Return the newly-formed element set
- return ret;
- },
-
- // Execute a callback for every element in the matched set.
- // (You can seed the arguments with an array of args, but this is
- // only used internally.)
- each: function( callback, args ) {
- return jQuery.each( this, callback, args );
- },
-
- ready: function( fn ) {
- // Attach the listeners
- jQuery.bindReady();
-
- // Add the callback
- readyList.add( fn );
-
- return this;
- },
-
- eq: function( i ) {
- i = +i;
- return i === -1 ?
- this.slice( i ) :
- this.slice( i, i + 1 );
- },
-
- first: function() {
- return this.eq( 0 );
- },
-
- last: function() {
- return this.eq( -1 );
- },
-
- slice: function() {
- return this.pushStack( slice.apply( this, arguments ),
- "slice", slice.call(arguments).join(",") );
- },
-
- map: function( callback ) {
- return this.pushStack( jQuery.map(this, function( elem, i ) {
- return callback.call( elem, i, elem );
- }));
- },
-
- end: function() {
- return this.prevObject || this.constructor(null);
- },
-
- // For internal use only.
- // Behaves like an Array's method, not like a jQuery method.
- push: push,
- sort: [].sort,
- splice: [].splice
-};
-
-// Give the init function the jQuery prototype for later instantiation
-jQuery.fn.init.prototype = jQuery.fn;
-
-jQuery.extend = jQuery.fn.extend = function() {
- var options, name, src, copy, copyIsArray, clone,
- target = arguments[0] || {},
- i = 1,
- length = arguments.length,
- deep = false;
-
- // Handle a deep copy situation
- if ( typeof target === "boolean" ) {
- deep = target;
- target = arguments[1] || {};
- // skip the boolean and the target
- i = 2;
- }
-
- // Handle case when target is a string or something (possible in deep copy)
- if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
- target = {};
- }
-
- // extend jQuery itself if only one argument is passed
- if ( length === i ) {
- target = this;
- --i;
- }
-
- for ( ; i < length; i++ ) {
- // Only deal with non-null/undefined values
- if ( (options = arguments[ i ]) != null ) {
- // Extend the base object
- for ( name in options ) {
- src = target[ name ];
- copy = options[ name ];
-
- // Prevent never-ending loop
- if ( target === copy ) {
- continue;
- }
-
- // Recurse if we're merging plain objects or arrays
- if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
- if ( copyIsArray ) {
- copyIsArray = false;
- clone = src && jQuery.isArray(src) ? src : [];
-
- } else {
- clone = src && jQuery.isPlainObject(src) ? src : {};
- }
-
- // Never move original objects, clone them
- target[ name ] = jQuery.extend( deep, clone, copy );
-
- // Don't bring in undefined values
- } else if ( copy !== undefined ) {
- target[ name ] = copy;
- }
- }
- }
- }
-
- // Return the modified object
- return target;
-};
-
-jQuery.extend({
- noConflict: function( deep ) {
- if ( window.$ === jQuery ) {
- window.$ = _$;
- }
-
- if ( deep && window.jQuery === jQuery ) {
- window.jQuery = _jQuery;
- }
-
- return jQuery;
- },
-
- // Is the DOM ready to be used? Set to true once it occurs.
- isReady: false,
-
- // A counter to track how many items to wait for before
- // the ready event fires. See #6781
- readyWait: 1,
-
- // Hold (or release) the ready event
- holdReady: function( hold ) {
- if ( hold ) {
- jQuery.readyWait++;
- } else {
- jQuery.ready( true );
- }
- },
-
- // Handle when the DOM is ready
- ready: function( wait ) {
- // Either a released hold or an DOMready/load event and not yet ready
- if ( (wait === true && !--jQuery.readyWait) || (wait !== true && !jQuery.isReady) ) {
- // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
- if ( !document.body ) {
- return setTimeout( jQuery.ready, 1 );
- }
-
- // Remember that the DOM is ready
- jQuery.isReady = true;
-
- // If a normal DOM Ready event fired, decrement, and wait if need be
- if ( wait !== true && --jQuery.readyWait > 0 ) {
- return;
- }
-
- // If there are functions bound, to execute
- readyList.fireWith( document, [ jQuery ] );
-
- // Trigger any bound ready events
- if ( jQuery.fn.trigger ) {
- jQuery( document ).trigger( "ready" ).off( "ready" );
- }
- }
- },
-
- bindReady: function() {
- if ( readyList ) {
- return;
- }
-
- readyList = jQuery.Callbacks( "once memory" );
-
- // Catch cases where $(document).ready() is called after the
- // browser event has already occurred.
- if ( document.readyState === "complete" ) {
- // Handle it asynchronously to allow scripts the opportunity to delay ready
- return setTimeout( jQuery.ready, 1 );
- }
-
- // Mozilla, Opera and webkit nightlies currently support this event
- if ( document.addEventListener ) {
- // Use the handy event callback
- document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
-
- // A fallback to window.onload, that will always work
- window.addEventListener( "load", jQuery.ready, false );
-
- // If IE event model is used
- } else if ( document.attachEvent ) {
- // ensure firing before onload,
- // maybe late but safe also for iframes
- document.attachEvent( "onreadystatechange", DOMContentLoaded );
-
- // A fallback to window.onload, that will always work
- window.attachEvent( "onload", jQuery.ready );
-
- // If IE and not a frame
- // continually check to see if the document is ready
- var toplevel = false;
-
- try {
- toplevel = window.frameElement == null;
- } catch(e) {}
-
- if ( document.documentElement.doScroll && toplevel ) {
- doScrollCheck();
- }
- }
- },
-
- // See test/unit/core.js for details concerning isFunction.
- // Since version 1.3, DOM methods and functions like alert
- // aren't supported. They return false on IE (#2968).
- isFunction: function( obj ) {
- return jQuery.type(obj) === "function";
- },
-
- isArray: Array.isArray || function( obj ) {
- return jQuery.type(obj) === "array";
- },
-
- isWindow: function( obj ) {
- return obj != null && obj == obj.window;
- },
-
- isNumeric: function( obj ) {
- return !isNaN( parseFloat(obj) ) && isFinite( obj );
- },
-
- type: function( obj ) {
- return obj == null ?
- String( obj ) :
- class2type[ toString.call(obj) ] || "object";
- },
-
- isPlainObject: function( obj ) {
- // Must be an Object.
- // Because of IE, we also have to check the presence of the constructor property.
- // Make sure that DOM nodes and window objects don't pass through, as well
- if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
- return false;
- }
-
- try {
- // Not own constructor property must be Object
- if ( obj.constructor &&
- !hasOwn.call(obj, "constructor") &&
- !hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
- return false;
- }
- } catch ( e ) {
- // IE8,9 Will throw exceptions on certain host objects #9897
- return false;
- }
-
- // Own properties are enumerated firstly, so to speed up,
- // if last one is own, then all properties are own.
-
- var key;
- for ( key in obj ) {}
-
- return key === undefined || hasOwn.call( obj, key );
- },
-
- isEmptyObject: function( obj ) {
- for ( var name in obj ) {
- return false;
- }
- return true;
- },
-
- error: function( msg ) {
- throw new Error( msg );
- },
-
- parseJSON: function( data ) {
- if ( typeof data !== "string" || !data ) {
- return null;
- }
-
- // Make sure leading/trailing whitespace is removed (IE can't handle it)
- data = jQuery.trim( data );
-
- // Attempt to parse using the native JSON parser first
- if ( window.JSON && window.JSON.parse ) {
- return window.JSON.parse( data );
- }
-
- // Make sure the incoming data is actual JSON
- // Logic borrowed from http://json.org/json2.js
- if ( rvalidchars.test( data.replace( rvalidescape, "@" )
- .replace( rvalidtokens, "]" )
- .replace( rvalidbraces, "")) ) {
-
- return ( new Function( "return " + data ) )();
-
- }
- jQuery.error( "Invalid JSON: " + data );
- },
-
- // Cross-browser xml parsing
- parseXML: function( data ) {
- if ( typeof data !== "string" || !data ) {
- return null;
- }
- var xml, tmp;
- try {
- if ( window.DOMParser ) { // Standard
- tmp = new DOMParser();
- xml = tmp.parseFromString( data , "text/xml" );
- } else { // IE
- xml = new ActiveXObject( "Microsoft.XMLDOM" );
- xml.async = "false";
- xml.loadXML( data );
- }
- } catch( e ) {
- xml = undefined;
- }
- if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
- jQuery.error( "Invalid XML: " + data );
- }
- return xml;
- },
-
- noop: function() {},
-
- // Evaluates a script in a global context
- // Workarounds based on findings by Jim Driscoll
- // http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
- globalEval: function( data ) {
- if ( data && rnotwhite.test( data ) ) {
- // We use execScript on Internet Explorer
- // We use an anonymous function so that context is window
- // rather than jQuery in Firefox
- ( window.execScript || function( data ) {
- window[ "eval" ].call( window, data );
- } )( data );
- }
- },
-
- // Convert dashed to camelCase; used by the css and data modules
- // Microsoft forgot to hump their vendor prefix (#9572)
- camelCase: function( string ) {
- return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
- },
-
- nodeName: function( elem, name ) {
- return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase();
- },
-
- // args is for internal usage only
- each: function( object, callback, args ) {
- var name, i = 0,
- length = object.length,
- isObj = length === undefined || jQuery.isFunction( object );
-
- if ( args ) {
- if ( isObj ) {
- for ( name in object ) {
- if ( callback.apply( object[ name ], args ) === false ) {
- break;
- }
- }
- } else {
- for ( ; i < length; ) {
- if ( callback.apply( object[ i++ ], args ) === false ) {
- break;
- }
- }
- }
-
- // A special, fast, case for the most common use of each
- } else {
- if ( isObj ) {
- for ( name in object ) {
- if ( callback.call( object[ name ], name, object[ name ] ) === false ) {
- break;
- }
- }
- } else {
- for ( ; i < length; ) {
- if ( callback.call( object[ i ], i, object[ i++ ] ) === false ) {
- break;
- }
- }
- }
- }
-
- return object;
- },
-
- // Use native String.trim function wherever possible
- trim: trim ?
- function( text ) {
- return text == null ?
- "" :
- trim.call( text );
- } :
-
- // Otherwise use our own trimming functionality
- function( text ) {
- return text == null ?
- "" :
- text.toString().replace( trimLeft, "" ).replace( trimRight, "" );
- },
-
- // results is for internal usage only
- makeArray: function( array, results ) {
- var ret = results || [];
-
- if ( array != null ) {
- // The window, strings (and functions) also have 'length'
- // Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930
- var type = jQuery.type( array );
-
- if ( array.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( array ) ) {
- push.call( ret, array );
- } else {
- jQuery.merge( ret, array );
- }
- }
-
- return ret;
- },
-
- inArray: function( elem, array, i ) {
- var len;
-
- if ( array ) {
- if ( indexOf ) {
- return indexOf.call( array, elem, i );
- }
-
- len = array.length;
- i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0;
-
- for ( ; i < len; i++ ) {
- // Skip accessing in sparse arrays
- if ( i in array && array[ i ] === elem ) {
- return i;
- }
- }
- }
-
- return -1;
- },
-
- merge: function( first, second ) {
- var i = first.length,
- j = 0;
-
- if ( typeof second.length === "number" ) {
- for ( var l = second.length; j < l; j++ ) {
- first[ i++ ] = second[ j ];
- }
-
- } else {
- while ( second[j] !== undefined ) {
- first[ i++ ] = second[ j++ ];
- }
- }
-
- first.length = i;
-
- return first;
- },
-
- grep: function( elems, callback, inv ) {
- var ret = [], retVal;
- inv = !!inv;
-
- // Go through the array, only saving the items
- // that pass the validator function
- for ( var i = 0, length = elems.length; i < length; i++ ) {
- retVal = !!callback( elems[ i ], i );
- if ( inv !== retVal ) {
- ret.push( elems[ i ] );
- }
- }
-
- return ret;
- },
-
- // arg is for internal usage only
- map: function( elems, callback, arg ) {
- var value, key, ret = [],
- i = 0,
- length = elems.length,
- // jquery objects are treated as arrays
- isArray = elems instanceof jQuery || length !== undefined && typeof length === "number" && ( ( length > 0 && elems[ 0 ] && elems[ length -1 ] ) || length === 0 || jQuery.isArray( elems ) ) ;
-
- // Go through the array, translating each of the items to their
- if ( isArray ) {
- for ( ; i < length; i++ ) {
- value = callback( elems[ i ], i, arg );
-
- if ( value != null ) {
- ret[ ret.length ] = value;
- }
- }
-
- // Go through every key on the object,
- } else {
- for ( key in elems ) {
- value = callback( elems[ key ], key, arg );
-
- if ( value != null ) {
- ret[ ret.length ] = value;
- }
- }
- }
-
- // Flatten any nested arrays
- return ret.concat.apply( [], ret );
- },
-
- // A global GUID counter for objects
- guid: 1,
-
- // Bind a function to a context, optionally partially applying any
- // arguments.
- proxy: function( fn, context ) {
- if ( typeof context === "string" ) {
- var tmp = fn[ context ];
- context = fn;
- fn = tmp;
- }
-
- // Quick check to determine if target is callable, in the spec
- // this throws a TypeError, but we will just return undefined.
- if ( !jQuery.isFunction( fn ) ) {
- return undefined;
- }
-
- // Simulated bind
- var args = slice.call( arguments, 2 ),
- proxy = function() {
- return fn.apply( context, args.concat( slice.call( arguments ) ) );
- };
-
- // Set the guid of unique handler to the same of original handler, so it can be removed
- proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++;
-
- return proxy;
- },
-
- // Mutifunctional method to get and set values to a collection
- // The value/s can optionally be executed if it's a function
- access: function( elems, fn, key, value, chainable, emptyGet, pass ) {
- var exec,
- bulk = key == null,
- i = 0,
- length = elems.length;
-
- // Sets many values
- if ( key && typeof key === "object" ) {
- for ( i in key ) {
- jQuery.access( elems, fn, i, key[i], 1, emptyGet, value );
- }
- chainable = 1;
-
- // Sets one value
- } else if ( value !== undefined ) {
- // Optionally, function values get executed if exec is true
- exec = pass === undefined && jQuery.isFunction( value );
-
- if ( bulk ) {
- // Bulk operations only iterate when executing function values
- if ( exec ) {
- exec = fn;
- fn = function( elem, key, value ) {
- return exec.call( jQuery( elem ), value );
- };
-
- // Otherwise they run against the entire set
- } else {
- fn.call( elems, value );
- fn = null;
- }
- }
-
- if ( fn ) {
- for (; i < length; i++ ) {
- fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
- }
- }
-
- chainable = 1;
- }
-
- return chainable ?
- elems :
-
- // Gets
- bulk ?
- fn.call( elems ) :
- length ? fn( elems[0], key ) : emptyGet;
- },
-
- now: function() {
- return ( new Date() ).getTime();
- },
-
- // Use of jQuery.browser is frowned upon.
- // More details: http://docs.jquery.com/Utilities/jQuery.browser
- uaMatch: function( ua ) {
- ua = ua.toLowerCase();
-
- var match = rwebkit.exec( ua ) ||
- ropera.exec( ua ) ||
- rmsie.exec( ua ) ||
- ua.indexOf("compatible") < 0 && rmozilla.exec( ua ) ||
- [];
-
- return { browser: match[1] || "", version: match[2] || "0" };
- },
-
- sub: function() {
- function jQuerySub( selector, context ) {
- return new jQuerySub.fn.init( selector, context );
- }
- jQuery.extend( true, jQuerySub, this );
- jQuerySub.superclass = this;
- jQuerySub.fn = jQuerySub.prototype = this();
- jQuerySub.fn.constructor = jQuerySub;
- jQuerySub.sub = this.sub;
- jQuerySub.fn.init = function init( selector, context ) {
- if ( context && context instanceof jQuery && !(context instanceof jQuerySub) ) {
- context = jQuerySub( context );
- }
-
- return jQuery.fn.init.call( this, selector, context, rootjQuerySub );
- };
- jQuerySub.fn.init.prototype = jQuerySub.fn;
- var rootjQuerySub = jQuerySub(document);
- return jQuerySub;
- },
-
- browser: {}
-});
-
-// Populate the class2type map
-jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) {
- class2type[ "[object " + name + "]" ] = name.toLowerCase();
-});
-
-browserMatch = jQuery.uaMatch( userAgent );
-if ( browserMatch.browser ) {
- jQuery.browser[ browserMatch.browser ] = true;
- jQuery.browser.version = browserMatch.version;
-}
-
-// Deprecated, use jQuery.browser.webkit instead
-if ( jQuery.browser.webkit ) {
- jQuery.browser.safari = true;
-}
-
-// IE doesn't match non-breaking spaces with \s
-if ( rnotwhite.test( "\xA0" ) ) {
- trimLeft = /^[\s\xA0]+/;
- trimRight = /[\s\xA0]+$/;
-}
-
-// All jQuery objects should point back to these
-rootjQuery = jQuery(document);
-
-// Cleanup functions for the document ready method
-if ( document.addEventListener ) {
- DOMContentLoaded = function() {
- document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
- jQuery.ready();
- };
-
-} else if ( document.attachEvent ) {
- DOMContentLoaded = function() {
- // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
- if ( document.readyState === "complete" ) {
- document.detachEvent( "onreadystatechange", DOMContentLoaded );
- jQuery.ready();
- }
- };
-}
-
-// The DOM ready check for Internet Explorer
-function doScrollCheck() {
- if ( jQuery.isReady ) {
- return;
- }
-
- try {
- // If IE is used, use the trick by Diego Perini
- // http://javascript.nwbox.com/IEContentLoaded/
- document.documentElement.doScroll("left");
- } catch(e) {
- setTimeout( doScrollCheck, 1 );
- return;
- }
-
- // and execute any waiting functions
- jQuery.ready();
-}
-
-return jQuery;
-
-})();
-
-
-// String to Object flags format cache
-var flagsCache = {};
-
-// Convert String-formatted flags into Object-formatted ones and store in cache
-function createFlags( flags ) {
- var object = flagsCache[ flags ] = {},
- i, length;
- flags = flags.split( /\s+/ );
- for ( i = 0, length = flags.length; i < length; i++ ) {
- object[ flags[i] ] = true;
- }
- return object;
-}
-
-/*
- * Create a callback list using the following parameters:
- *
- * flags: an optional list of space-separated flags that will change how
- * the callback list behaves
- *
- * By default a callback list will act like an event callback list and can be
- * "fired" multiple times.
- *
- * Possible flags:
- *
- * once: will ensure the callback list can only be fired once (like a Deferred)
- *
- * memory: will keep track of previous values and will call any callback added
- * after the list has been fired right away with the latest "memorized"
- * values (like a Deferred)
- *
- * unique: will ensure a callback can only be added once (no duplicate in the list)
- *
- * stopOnFalse: interrupt callings when a callback returns false
- *
- */
-jQuery.Callbacks = function( flags ) {
-
- // Convert flags from String-formatted to Object-formatted
- // (we check in cache first)
- flags = flags ? ( flagsCache[ flags ] || createFlags( flags ) ) : {};
-
- var // Actual callback list
- list = [],
- // Stack of fire calls for repeatable lists
- stack = [],
- // Last fire value (for non-forgettable lists)
- memory,
- // Flag to know if list was already fired
- fired,
- // Flag to know if list is currently firing
- firing,
- // First callback to fire (used internally by add and fireWith)
- firingStart,
- // End of the loop when firing
- firingLength,
- // Index of currently firing callback (modified by remove if needed)
- firingIndex,
- // Add one or several callbacks to the list
- add = function( args ) {
- var i,
- length,
- elem,
- type,
- actual;
- for ( i = 0, length = args.length; i < length; i++ ) {
- elem = args[ i ];
- type = jQuery.type( elem );
- if ( type === "array" ) {
- // Inspect recursively
- add( elem );
- } else if ( type === "function" ) {
- // Add if not in unique mode and callback is not in
- if ( !flags.unique || !self.has( elem ) ) {
- list.push( elem );
- }
- }
- }
- },
- // Fire callbacks
- fire = function( context, args ) {
- args = args || [];
- memory = !flags.memory || [ context, args ];
- fired = true;
- firing = true;
- firingIndex = firingStart || 0;
- firingStart = 0;
- firingLength = list.length;
- for ( ; list && firingIndex < firingLength; firingIndex++ ) {
- if ( list[ firingIndex ].apply( context, args ) === false && flags.stopOnFalse ) {
- memory = true; // Mark as halted
- break;
- }
- }
- firing = false;
- if ( list ) {
- if ( !flags.once ) {
- if ( stack && stack.length ) {
- memory = stack.shift();
- self.fireWith( memory[ 0 ], memory[ 1 ] );
- }
- } else if ( memory === true ) {
- self.disable();
- } else {
- list = [];
- }
- }
- },
- // Actual Callbacks object
- self = {
- // Add a callback or a collection of callbacks to the list
- add: function() {
- if ( list ) {
- var length = list.length;
- add( arguments );
- // Do we need to add the callbacks to the
- // current firing batch?
- if ( firing ) {
- firingLength = list.length;
- // With memory, if we're not firing then
- // we should call right away, unless previous
- // firing was halted (stopOnFalse)
- } else if ( memory && memory !== true ) {
- firingStart = length;
- fire( memory[ 0 ], memory[ 1 ] );
- }
- }
- return this;
- },
- // Remove a callback from the list
- remove: function() {
- if ( list ) {
- var args = arguments,
- argIndex = 0,
- argLength = args.length;
- for ( ; argIndex < argLength ; argIndex++ ) {
- for ( var i = 0; i < list.length; i++ ) {
- if ( args[ argIndex ] === list[ i ] ) {
- // Handle firingIndex and firingLength
- if ( firing ) {
- if ( i <= firingLength ) {
- firingLength--;
- if ( i <= firingIndex ) {
- firingIndex--;
- }
- }
- }
- // Remove the element
- list.splice( i--, 1 );
- // If we have some unicity property then
- // we only need to do this once
- if ( flags.unique ) {
- break;
- }
- }
- }
- }
- }
- return this;
- },
- // Control if a given callback is in the list
- has: function( fn ) {
- if ( list ) {
- var i = 0,
- length = list.length;
- for ( ; i < length; i++ ) {
- if ( fn === list[ i ] ) {
- return true;
- }
- }
- }
- return false;
- },
- // Remove all callbacks from the list
- empty: function() {
- list = [];
- return this;
- },
- // Have the list do nothing anymore
- disable: function() {
- list = stack = memory = undefined;
- return this;
- },
- // Is it disabled?
- disabled: function() {
- return !list;
- },
- // Lock the list in its current state
- lock: function() {
- stack = undefined;
- if ( !memory || memory === true ) {
- self.disable();
- }
- return this;
- },
- // Is it locked?
- locked: function() {
- return !stack;
- },
- // Call all callbacks with the given context and arguments
- fireWith: function( context, args ) {
- if ( stack ) {
- if ( firing ) {
- if ( !flags.once ) {
- stack.push( [ context, args ] );
- }
- } else if ( !( flags.once && memory ) ) {
- fire( context, args );
- }
- }
- return this;
- },
- // Call all the callbacks with the given arguments
- fire: function() {
- self.fireWith( this, arguments );
- return this;
- },
- // To know if the callbacks have already been called at least once
- fired: function() {
- return !!fired;
- }
- };
-
- return self;
-};
-
-
-
-
-var // Static reference to slice
- sliceDeferred = [].slice;
-
-jQuery.extend({
-
- Deferred: function( func ) {
- var doneList = jQuery.Callbacks( "once memory" ),
- failList = jQuery.Callbacks( "once memory" ),
- progressList = jQuery.Callbacks( "memory" ),
- state = "pending",
- lists = {
- resolve: doneList,
- reject: failList,
- notify: progressList
- },
- promise = {
- done: doneList.add,
- fail: failList.add,
- progress: progressList.add,
-
- state: function() {
- return state;
- },
-
- // Deprecated
- isResolved: doneList.fired,
- isRejected: failList.fired,
-
- then: function( doneCallbacks, failCallbacks, progressCallbacks ) {
- deferred.done( doneCallbacks ).fail( failCallbacks ).progress( progressCallbacks );
- return this;
- },
- always: function() {
- deferred.done.apply( deferred, arguments ).fail.apply( deferred, arguments );
- return this;
- },
- pipe: function( fnDone, fnFail, fnProgress ) {
- return jQuery.Deferred(function( newDefer ) {
- jQuery.each( {
- done: [ fnDone, "resolve" ],
- fail: [ fnFail, "reject" ],
- progress: [ fnProgress, "notify" ]
- }, function( handler, data ) {
- var fn = data[ 0 ],
- action = data[ 1 ],
- returned;
- if ( jQuery.isFunction( fn ) ) {
- deferred[ handler ](function() {
- returned = fn.apply( this, arguments );
- if ( returned && jQuery.isFunction( returned.promise ) ) {
- returned.promise().then( newDefer.resolve, newDefer.reject, newDefer.notify );
- } else {
- newDefer[ action + "With" ]( this === deferred ? newDefer : this, [ returned ] );
- }
- });
- } else {
- deferred[ handler ]( newDefer[ action ] );
- }
- });
- }).promise();
- },
- // Get a promise for this deferred
- // If obj is provided, the promise aspect is added to the object
- promise: function( obj ) {
- if ( obj == null ) {
- obj = promise;
- } else {
- for ( var key in promise ) {
- obj[ key ] = promise[ key ];
- }
- }
- return obj;
- }
- },
- deferred = promise.promise({}),
- key;
-
- for ( key in lists ) {
- deferred[ key ] = lists[ key ].fire;
- deferred[ key + "With" ] = lists[ key ].fireWith;
- }
-
- // Handle state
- deferred.done( function() {
- state = "resolved";
- }, failList.disable, progressList.lock ).fail( function() {
- state = "rejected";
- }, doneList.disable, progressList.lock );
-
- // Call given func if any
- if ( func ) {
- func.call( deferred, deferred );
- }
-
- // All done!
- return deferred;
- },
-
- // Deferred helper
- when: function( firstParam ) {
- var args = sliceDeferred.call( arguments, 0 ),
- i = 0,
- length = args.length,
- pValues = new Array( length ),
- count = length,
- pCount = length,
- deferred = length <= 1 && firstParam && jQuery.isFunction( firstParam.promise ) ?
- firstParam :
- jQuery.Deferred(),
- promise = deferred.promise();
- function resolveFunc( i ) {
- return function( value ) {
- args[ i ] = arguments.length > 1 ? sliceDeferred.call( arguments, 0 ) : value;
- if ( !( --count ) ) {
- deferred.resolveWith( deferred, args );
- }
- };
- }
- function progressFunc( i ) {
- return function( value ) {
- pValues[ i ] = arguments.length > 1 ? sliceDeferred.call( arguments, 0 ) : value;
- deferred.notifyWith( promise, pValues );
- };
- }
- if ( length > 1 ) {
- for ( ; i < length; i++ ) {
- if ( args[ i ] && args[ i ].promise && jQuery.isFunction( args[ i ].promise ) ) {
- args[ i ].promise().then( resolveFunc(i), deferred.reject, progressFunc(i) );
- } else {
- --count;
- }
- }
- if ( !count ) {
- deferred.resolveWith( deferred, args );
- }
- } else if ( deferred !== firstParam ) {
- deferred.resolveWith( deferred, length ? [ firstParam ] : [] );
- }
- return promise;
- }
-});
-
-
-
-
-jQuery.support = (function() {
-
- var support,
- all,
- a,
- select,
- opt,
- input,
- fragment,
- tds,
- events,
- eventName,
- i,
- isSupported,
- div = document.createElement( "div" ),
- documentElement = document.documentElement;
-
- // Preliminary tests
- div.setAttribute("className", "t");
- div.innerHTML = " <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
-
- all = div.getElementsByTagName( "*" );
- a = div.getElementsByTagName( "a" )[ 0 ];
-
- // Can't get basic test support
- if ( !all || !all.length || !a ) {
- return {};
- }
-
- // First batch of supports tests
- select = document.createElement( "select" );
- opt = select.appendChild( document.createElement("option") );
- input = div.getElementsByTagName( "input" )[ 0 ];
-
- support = {
- // IE strips leading whitespace when .innerHTML is used
- leadingWhitespace: ( div.firstChild.nodeType === 3 ),
-
- // Make sure that tbody elements aren't automatically inserted
- // IE will insert them into empty tables
- tbody: !div.getElementsByTagName("tbody").length,
-
- // Make sure that link elements get serialized correctly by innerHTML
- // This requires a wrapper element in IE
- htmlSerialize: !!div.getElementsByTagName("link").length,
-
- // Get the style information from getAttribute
- // (IE uses .cssText instead)
- style: /top/.test( a.getAttribute("style") ),
-
- // Make sure that URLs aren't manipulated
- // (IE normalizes it by default)
- hrefNormalized: ( a.getAttribute("href") === "/a" ),
-
- // Make sure that element opacity exists
- // (IE uses filter instead)
- // Use a regex to work around a WebKit issue. See #5145
- opacity: /^0.55/.test( a.style.opacity ),
-
- // Verify style float existence
- // (IE uses styleFloat instead of cssFloat)
- cssFloat: !!a.style.cssFloat,
-
- // Make sure that if no value is specified for a checkbox
- // that it defaults to "on".
- // (WebKit defaults to "" instead)
- checkOn: ( input.value === "on" ),
-
- // Make sure that a selected-by-default option has a working selected property.
- // (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
- optSelected: opt.selected,
-
- // Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
- getSetAttribute: div.className !== "t",
-
- // Tests for enctype support on a form(#6743)
- enctype: !!document.createElement("form").enctype,
-
- // Makes sure cloning an html5 element does not cause problems
- // Where outerHTML is undefined, this still works
- html5Clone: document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav></:nav>",
-
- // Will be defined later
- submitBubbles: true,
- changeBubbles: true,
- focusinBubbles: false,
- deleteExpando: true,
- noCloneEvent: true,
- inlineBlockNeedsLayout: false,
- shrinkWrapBlocks: false,
- reliableMarginRight: true,
- pixelMargin: true
- };
-
- // jQuery.boxModel DEPRECATED in 1.3, use jQuery.support.boxModel instead
- jQuery.boxModel = support.boxModel = (document.compatMode === "CSS1Compat");
-
- // Make sure checked status is properly cloned
- input.checked = true;
- support.noCloneChecked = input.cloneNode( true ).checked;
-
- // Make sure that the options inside disabled selects aren't marked as disabled
- // (WebKit marks them as disabled)
- select.disabled = true;
- support.optDisabled = !opt.disabled;
-
- // Test to see if it's possible to delete an expando from an element
- // Fails in Internet Explorer
- try {
- delete div.test;
- } catch( e ) {
- support.deleteExpando = false;
- }
-
- if ( !div.addEventListener && div.attachEvent && div.fireEvent ) {
- div.attachEvent( "onclick", function() {
- // Cloning a node shouldn't copy over any
- // bound event handlers (IE does this)
- support.noCloneEvent = false;
- });
- div.cloneNode( true ).fireEvent( "onclick" );
- }
-
- // Check if a radio maintains its value
- // after being appended to the DOM
- input = document.createElement("input");
- input.value = "t";
- input.setAttribute("type", "radio");
- support.radioValue = input.value === "t";
-
- input.setAttribute("checked", "checked");
-
- // #11217 - WebKit loses check when the name is after the checked attribute
- input.setAttribute( "name", "t" );
-
- div.appendChild( input );
- fragment = document.createDocumentFragment();
- fragment.appendChild( div.lastChild );
-
- // WebKit doesn't clone checked state correctly in fragments
- support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
- // Check if a disconnected checkbox will retain its checked
- // value of true after appended to the DOM (IE6/7)
- support.appendChecked = input.checked;
-
- fragment.removeChild( input );
- fragment.appendChild( div );
-
- // Technique from Juriy Zaytsev
- // http://perfectionkills.com/detecting-event-support-without-browser-sniffing/
- // We only care about the case where non-standard event systems
- // are used, namely in IE. Short-circuiting here helps us to
- // avoid an eval call (in setAttribute) which can cause CSP
- // to go haywire. See: https://developer.mozilla.org/en/Security/CSP
- if ( div.attachEvent ) {
- for ( i in {
- submit: 1,
- change: 1,
- focusin: 1
- }) {
- eventName = "on" + i;
- isSupported = ( eventName in div );
- if ( !isSupported ) {
- div.setAttribute( eventName, "return;" );
- isSupported = ( typeof div[ eventName ] === "function" );
- }
- support[ i + "Bubbles" ] = isSupported;
- }
- }
-
- fragment.removeChild( div );
-
- // Null elements to avoid leaks in IE
- fragment = select = opt = div = input = null;
-
- // Run tests that need a body at doc ready
- jQuery(function() {
- var container, outer, inner, table, td, offsetSupport,
- marginDiv, conMarginTop, style, html, positionTopLeftWidthHeight,
- paddingMarginBorderVisibility, paddingMarginBorder,
- body = document.getElementsByTagName("body")[0];
-
- if ( !body ) {
- // Return for frameset docs that don't have a body
- return;
- }
-
- conMarginTop = 1;
- paddingMarginBorder = "padding:0;margin:0;border:";
- positionTopLeftWidthHeight = "position:absolute;top:0;left:0;width:1px;height:1px;";
- paddingMarginBorderVisibility = paddingMarginBorder + "0;visibility:hidden;";
- style = "style='" + positionTopLeftWidthHeight + paddingMarginBorder + "5px solid #000;";
- html = "<div " + style + "display:block;'><div style='" + paddingMarginBorder + "0;display:block;overflow:hidden;'></div></div>" +
- "<table " + style + "' cellpadding='0' cellspacing='0'>" +
- "<tr><td></td></tr></table>";
-
- container = document.createElement("div");
- container.style.cssText = paddingMarginBorderVisibility + "width:0;height:0;position:static;top:0;margin-top:" + conMarginTop + "px";
- body.insertBefore( container, body.firstChild );
-
- // Construct the test element
- div = document.createElement("div");
- container.appendChild( div );
-
- // Check if table cells still have offsetWidth/Height when they are set
- // to display:none and there are still other visible table cells in a
- // table row; if so, offsetWidth/Height are not reliable for use when
- // determining if an element has been hidden directly using
- // display:none (it is still safe to use offsets if a parent element is
- // hidden; don safety goggles and see bug #4512 for more information).
- // (only IE 8 fails this test)
- div.innerHTML = "<table><tr><td style='" + paddingMarginBorder + "0;display:none'></td><td>t</td></tr></table>";
- tds = div.getElementsByTagName( "td" );
- isSupported = ( tds[ 0 ].offsetHeight === 0 );
-
- tds[ 0 ].style.display = "";
- tds[ 1 ].style.display = "none";
-
- // Check if empty table cells still have offsetWidth/Height
- // (IE <= 8 fail this test)
- support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 );
-
- // Check if div with explicit width and no margin-right incorrectly
- // gets computed margin-right based on width of container. For more
- // info see bug #3333
- // Fails in WebKit before Feb 2011 nightlies
- // WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
- if ( window.getComputedStyle ) {
- div.innerHTML = "";
- marginDiv = document.createElement( "div" );
- marginDiv.style.width = "0";
- marginDiv.style.marginRight = "0";
- div.style.width = "2px";
- div.appendChild( marginDiv );
- support.reliableMarginRight =
- ( parseInt( ( window.getComputedStyle( marginDiv, null ) || { marginRight: 0 } ).marginRight, 10 ) || 0 ) === 0;
- }
-
- if ( typeof div.style.zoom !== "undefined" ) {
- // Check if natively block-level elements act like inline-block
- // elements when setting their display to 'inline' and giving
- // them layout
- // (IE < 8 does this)
- div.innerHTML = "";
- div.style.width = div.style.padding = "1px";
- div.style.border = 0;
- div.style.overflow = "hidden";
- div.style.display = "inline";
- div.style.zoom = 1;
- support.inlineBlockNeedsLayout = ( div.offsetWidth === 3 );
-
- // Check if elements with layout shrink-wrap their children
- // (IE 6 does this)
- div.style.display = "block";
- div.style.overflow = "visible";
- div.innerHTML = "<div style='width:5px;'></div>";
- support.shrinkWrapBlocks = ( div.offsetWidth !== 3 );
- }
-
- div.style.cssText = positionTopLeftWidthHeight + paddingMarginBorderVisibility;
- div.innerHTML = html;
-
- outer = div.firstChild;
- inner = outer.firstChild;
- td = outer.nextSibling.firstChild.firstChild;
-
- offsetSupport = {
- doesNotAddBorder: ( inner.offsetTop !== 5 ),
- doesAddBorderForTableAndCells: ( td.offsetTop === 5 )
- };
-
- inner.style.position = "fixed";
- inner.style.top = "20px";
-
- // safari subtracts parent border width here which is 5px
- offsetSupport.fixedPosition = ( inner.offsetTop === 20 || inner.offsetTop === 15 );
- inner.style.position = inner.style.top = "";
-
- outer.style.overflow = "hidden";
- outer.style.position = "relative";
-
- offsetSupport.subtractsBorderForOverflowNotVisible = ( inner.offsetTop === -5 );
- offsetSupport.doesNotIncludeMarginInBodyOffset = ( body.offsetTop !== conMarginTop );
-
- if ( window.getComputedStyle ) {
- div.style.marginTop = "1%";
- support.pixelMargin = ( window.getComputedStyle( div, null ) || { marginTop: 0 } ).marginTop !== "1%";
- }
-
- if ( typeof container.style.zoom !== "undefined" ) {
- container.style.zoom = 1;
- }
-
- body.removeChild( container );
- marginDiv = div = container = null;
-
- jQuery.extend( support, offsetSupport );
- });
-
- return support;
-})();
-
-
-
-
-var rbrace = /^(?:\{.*\}|\[.*\])$/,
- rmultiDash = /([A-Z])/g;
-
-jQuery.extend({
- cache: {},
-
- // Please use with caution
- uuid: 0,
-
- // Unique for each copy of jQuery on the page
- // Non-digits removed to match rinlinejQuery
- expando: "jQuery" + ( jQuery.fn.jquery + Math.random() ).replace( /\D/g, "" ),
-
- // The following elements throw uncatchable exceptions if you
- // attempt to add expando properties to them.
- noData: {
- "embed": true,
- // Ban all objects except for Flash (which handle expandos)
- "object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",
- "applet": true
- },
-
- hasData: function( elem ) {
- elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
- return !!elem && !isEmptyDataObject( elem );
- },
-
- data: function( elem, name, data, pvt /* Internal Use Only */ ) {
- if ( !jQuery.acceptData( elem ) ) {
- return;
- }
-
- var privateCache, thisCache, ret,
- internalKey = jQuery.expando,
- getByName = typeof name === "string",
-
- // We have to handle DOM nodes and JS objects differently because IE6-7
- // can't GC object references properly across the DOM-JS boundary
- isNode = elem.nodeType,
-
- // Only DOM nodes need the global jQuery cache; JS object data is
- // attached directly to the object so GC can occur automatically
- cache = isNode ? jQuery.cache : elem,
-
- // Only defining an ID for JS objects if its cache already exists allows
- // the code to shortcut on the same path as a DOM node with no cache
- id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey,
- isEvents = name === "events";
-
- // Avoid doing any more work than we need to when trying to get data on an
- // object that has no data at all
- if ( (!id || !cache[id] || (!isEvents && !pvt && !cache[id].data)) && getByName && data === undefined ) {
- return;
- }
-
- if ( !id ) {
- // Only DOM nodes need a new unique ID for each element since their data
- // ends up in the global cache
- if ( isNode ) {
- elem[ internalKey ] = id = ++jQuery.uuid;
- } else {
- id = internalKey;
- }
- }
-
- if ( !cache[ id ] ) {
- cache[ id ] = {};
-
- // Avoids exposing jQuery metadata on plain JS objects when the object
- // is serialized using JSON.stringify
- if ( !isNode ) {
- cache[ id ].toJSON = jQuery.noop;
- }
- }
-
- // An object can be passed to jQuery.data instead of a key/value pair; this gets
- // shallow copied over onto the existing cache
- if ( typeof name === "object" || typeof name === "function" ) {
- if ( pvt ) {
- cache[ id ] = jQuery.extend( cache[ id ], name );
- } else {
- cache[ id ].data = jQuery.extend( cache[ id ].data, name );
- }
- }
-
- privateCache = thisCache = cache[ id ];
-
- // jQuery data() is stored in a separate object inside the object's internal data
- // cache in order to avoid key collisions between internal data and user-defined
- // data.
- if ( !pvt ) {
- if ( !thisCache.data ) {
- thisCache.data = {};
- }
-
- thisCache = thisCache.data;
- }
-
- if ( data !== undefined ) {
- thisCache[ jQuery.camelCase( name ) ] = data;
- }
-
- // Users should not attempt to inspect the internal events object using jQuery.data,
- // it is undocumented and subject to change. But does anyone listen? No.
- if ( isEvents && !thisCache[ name ] ) {
- return privateCache.events;
- }
-
- // Check for both converted-to-camel and non-converted data property names
- // If a data property was specified
- if ( getByName ) {
-
- // First Try to find as-is property data
- ret = thisCache[ name ];
-
- // Test for null|undefined property data
- if ( ret == null ) {
-
- // Try to find the camelCased property
- ret = thisCache[ jQuery.camelCase( name ) ];
- }
- } else {
- ret = thisCache;
- }
-
- return ret;
- },
-
- removeData: function( elem, name, pvt /* Internal Use Only */ ) {
- if ( !jQuery.acceptData( elem ) ) {
- return;
- }
-
- var thisCache, i, l,
-
- // Reference to internal data cache key
- internalKey = jQuery.expando,
-
- isNode = elem.nodeType,
-
- // See jQuery.data for more information
- cache = isNode ? jQuery.cache : elem,
-
- // See jQuery.data for more information
- id = isNode ? elem[ internalKey ] : internalKey;
-
- // If there is already no cache entry for this object, there is no
- // purpose in continuing
- if ( !cache[ id ] ) {
- return;
- }
-
- if ( name ) {
-
- thisCache = pvt ? cache[ id ] : cache[ id ].data;
-
- if ( thisCache ) {
-
- // Support array or space separated string names for data keys
- if ( !jQuery.isArray( name ) ) {
-
- // try the string as a key before any manipulation
- if ( name in thisCache ) {
- name = [ name ];
- } else {
-
- // split the camel cased version by spaces unless a key with the spaces exists
- name = jQuery.camelCase( name );
- if ( name in thisCache ) {
- name = [ name ];
- } else {
- name = name.split( " " );
- }
- }
- }
-
- for ( i = 0, l = name.length; i < l; i++ ) {
- delete thisCache[ name[i] ];
- }
-
- // If there is no data left in the cache, we want to continue
- // and let the cache object itself get destroyed
- if ( !( pvt ? isEmptyDataObject : jQuery.isEmptyObject )( thisCache ) ) {
- return;
- }
- }
- }
-
- // See jQuery.data for more information
- if ( !pvt ) {
- delete cache[ id ].data;
-
- // Don't destroy the parent cache unless the internal data object
- // had been the only thing left in it
- if ( !isEmptyDataObject(cache[ id ]) ) {
- return;
- }
- }
-
- // Browsers that fail expando deletion also refuse to delete expandos on
- // the window, but it will allow it on all other JS objects; other browsers
- // don't care
- // Ensure that `cache` is not a window object #10080
- if ( jQuery.support.deleteExpando || !cache.setInterval ) {
- delete cache[ id ];
- } else {
- cache[ id ] = null;
- }
-
- // We destroyed the cache and need to eliminate the expando on the node to avoid
- // false lookups in the cache for entries that no longer exist
- if ( isNode ) {
- // IE does not allow us to delete expando properties from nodes,
- // nor does it have a removeAttribute function on Document nodes;
- // we must handle all of these cases
- if ( jQuery.support.deleteExpando ) {
- delete elem[ internalKey ];
- } else if ( elem.removeAttribute ) {
- elem.removeAttribute( internalKey );
- } else {
- elem[ internalKey ] = null;
- }
- }
- },
-
- // For internal use only.
- _data: function( elem, name, data ) {
- return jQuery.data( elem, name, data, true );
- },
-
- // A method for determining if a DOM node can handle the data expando
- acceptData: function( elem ) {
- if ( elem.nodeName ) {
- var match = jQuery.noData[ elem.nodeName.toLowerCase() ];
-
- if ( match ) {
- return !(match === true || elem.getAttribute("classid") !== match);
- }
- }
-
- return true;
- }
-});
-
-jQuery.fn.extend({
- data: function( key, value ) {
- var parts, part, attr, name, l,
- elem = this[0],
- i = 0,
- data = null;
-
- // Gets all values
- if ( key === undefined ) {
- if ( this.length ) {
- data = jQuery.data( elem );
-
- if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) {
- attr = elem.attributes;
- for ( l = attr.length; i < l; i++ ) {
- name = attr[i].name;
-
- if ( name.indexOf( "data-" ) === 0 ) {
- name = jQuery.camelCase( name.substring(5) );
-
- dataAttr( elem, name, data[ name ] );
- }
- }
- jQuery._data( elem, "parsedAttrs", true );
- }
- }
-
- return data;
- }
-
- // Sets multiple values
- if ( typeof key === "object" ) {
- return this.each(function() {
- jQuery.data( this, key );
- });
- }
-
- parts = key.split( ".", 2 );
- parts[1] = parts[1] ? "." + parts[1] : "";
- part = parts[1] + "!";
-
- return jQuery.access( this, function( value ) {
-
- if ( value === undefined ) {
- data = this.triggerHandler( "getData" + part, [ parts[0] ] );
-
- // Try to fetch any internally stored data first
- if ( data === undefined && elem ) {
- data = jQuery.data( elem, key );
- data = dataAttr( elem, key, data );
- }
-
- return data === undefined && parts[1] ?
- this.data( parts[0] ) :
- data;
- }
-
- parts[1] = value;
- this.each(function() {
- var self = jQuery( this );
-
- self.triggerHandler( "setData" + part, parts );
- jQuery.data( this, key, value );
- self.triggerHandler( "changeData" + part, parts );
- });
- }, null, value, arguments.length > 1, null, false );
- },
-
- removeData: function( key ) {
- return this.each(function() {
- jQuery.removeData( this, key );
- });
- }
-});
-
-function dataAttr( elem, key, data ) {
- // If nothing was found internally, try to fetch any
- // data from the HTML5 data-* attribute
- if ( data === undefined && elem.nodeType === 1 ) {
-
- var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
-
- data = elem.getAttribute( name );
-
- if ( typeof data === "string" ) {
- try {
- data = data === "true" ? true :
- data === "false" ? false :
- data === "null" ? null :
- jQuery.isNumeric( data ) ? +data :
- rbrace.test( data ) ? jQuery.parseJSON( data ) :
- data;
- } catch( e ) {}
-
- // Make sure we set the data so it isn't changed later
- jQuery.data( elem, key, data );
-
- } else {
- data = undefined;
- }
- }
-
- return data;
-}
-
-// checks a cache object for emptiness
-function isEmptyDataObject( obj ) {
- for ( var name in obj ) {
-
- // if the public data object is empty, the private is still empty
- if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) {
- continue;
- }
- if ( name !== "toJSON" ) {
- return false;
- }
- }
-
- return true;
-}
-
-
-
-
-function handleQueueMarkDefer( elem, type, src ) {
- var deferDataKey = type + "defer",
- queueDataKey = type + "queue",
- markDataKey = type + "mark",
- defer = jQuery._data( elem, deferDataKey );
- if ( defer &&
- ( src === "queue" || !jQuery._data(elem, queueDataKey) ) &&
- ( src === "mark" || !jQuery._data(elem, markDataKey) ) ) {
- // Give room for hard-coded callbacks to fire first
- // and eventually mark/queue something else on the element
- setTimeout( function() {
- if ( !jQuery._data( elem, queueDataKey ) &&
- !jQuery._data( elem, markDataKey ) ) {
- jQuery.removeData( elem, deferDataKey, true );
- defer.fire();
- }
- }, 0 );
- }
-}
-
-jQuery.extend({
-
- _mark: function( elem, type ) {
- if ( elem ) {
- type = ( type || "fx" ) + "mark";
- jQuery._data( elem, type, (jQuery._data( elem, type ) || 0) + 1 );
- }
- },
-
- _unmark: function( force, elem, type ) {
- if ( force !== true ) {
- type = elem;
- elem = force;
- force = false;
- }
- if ( elem ) {
- type = type || "fx";
- var key = type + "mark",
- count = force ? 0 : ( (jQuery._data( elem, key ) || 1) - 1 );
- if ( count ) {
- jQuery._data( elem, key, count );
- } else {
- jQuery.removeData( elem, key, true );
- handleQueueMarkDefer( elem, type, "mark" );
- }
- }
- },
-
- queue: function( elem, type, data ) {
- var q;
- if ( elem ) {
- type = ( type || "fx" ) + "queue";
- q = jQuery._data( elem, type );
-
- // Speed up dequeue by getting out quickly if this is just a lookup
- if ( data ) {
- if ( !q || jQuery.isArray(data) ) {
- q = jQuery._data( elem, type, jQuery.makeArray(data) );
- } else {
- q.push( data );
- }
- }
- return q || [];
- }
- },
-
- dequeue: function( elem, type ) {
- type = type || "fx";
-
- var queue = jQuery.queue( elem, type ),
- fn = queue.shift(),
- hooks = {};
-
- // If the fx queue is dequeued, always remove the progress sentinel
- if ( fn === "inprogress" ) {
- fn = queue.shift();
- }
-
- if ( fn ) {
- // Add a progress sentinel to prevent the fx queue from being
- // automatically dequeued
- if ( type === "fx" ) {
- queue.unshift( "inprogress" );
- }
-
- jQuery._data( elem, type + ".run", hooks );
- fn.call( elem, function() {
- jQuery.dequeue( elem, type );
- }, hooks );
- }
-
- if ( !queue.length ) {
- jQuery.removeData( elem, type + "queue " + type + ".run", true );
- handleQueueMarkDefer( elem, type, "queue" );
- }
- }
-});
-
-jQuery.fn.extend({
- queue: function( type, data ) {
- var setter = 2;
-
- if ( typeof type !== "string" ) {
- data = type;
- type = "fx";
- setter--;
- }
-
- if ( arguments.length < setter ) {
- return jQuery.queue( this[0], type );
- }
-
- return data === undefined ?
- this :
- this.each(function() {
- var queue = jQuery.queue( this, type, data );
-
- if ( type === "fx" && queue[0] !== "inprogress" ) {
- jQuery.dequeue( this, type );
- }
- });
- },
- dequeue: function( type ) {
- return this.each(function() {
- jQuery.dequeue( this, type );
- });
- },
- // Based off of the plugin by Clint Helfers, with permission.
- // http://blindsignals.com/index.php/2009/07/jquery-delay/
- delay: function( time, type ) {
- time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
- type = type || "fx";
-
- return this.queue( type, function( next, hooks ) {
- var timeout = setTimeout( next, time );
- hooks.stop = function() {
- clearTimeout( timeout );
- };
- });
- },
- clearQueue: function( type ) {
- return this.queue( type || "fx", [] );
- },
- // Get a promise resolved when queues of a certain type
- // are emptied (fx is the type by default)
- promise: function( type, object ) {
- if ( typeof type !== "string" ) {
- object = type;
- type = undefined;
- }
- type = type || "fx";
- var defer = jQuery.Deferred(),
- elements = this,
- i = elements.length,
- count = 1,
- deferDataKey = type + "defer",
- queueDataKey = type + "queue",
- markDataKey = type + "mark",
- tmp;
- function resolve() {
- if ( !( --count ) ) {
- defer.resolveWith( elements, [ elements ] );
- }
- }
- while( i-- ) {
- if (( tmp = jQuery.data( elements[ i ], deferDataKey, undefined, true ) ||
- ( jQuery.data( elements[ i ], queueDataKey, undefined, true ) ||
- jQuery.data( elements[ i ], markDataKey, undefined, true ) ) &&
- jQuery.data( elements[ i ], deferDataKey, jQuery.Callbacks( "once memory" ), true ) )) {
- count++;
- tmp.add( resolve );
- }
- }
- resolve();
- return defer.promise( object );
- }
-});
-
-
-
-
-var rclass = /[\n\t\r]/g,
- rspace = /\s+/,
- rreturn = /\r/g,
- rtype = /^(?:button|input)$/i,
- rfocusable = /^(?:button|input|object|select|textarea)$/i,
- rclickable = /^a(?:rea)?$/i,
- rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,
- getSetAttribute = jQuery.support.getSetAttribute,
- nodeHook, boolHook, fixSpecified;
-
-jQuery.fn.extend({
- attr: function( name, value ) {
- return jQuery.access( this, jQuery.attr, name, value, arguments.length > 1 );
- },
-
- removeAttr: function( name ) {
- return this.each(function() {
- jQuery.removeAttr( this, name );
- });
- },
-
- prop: function( name, value ) {
- return jQuery.access( this, jQuery.prop, name, value, arguments.length > 1 );
- },
-
- removeProp: function( name ) {
- name = jQuery.propFix[ name ] || name;
- return this.each(function() {
- // try/catch handles cases where IE balks (such as removing a property on window)
- try {
- this[ name ] = undefined;
- delete this[ name ];
- } catch( e ) {}
- });
- },
-
- addClass: function( value ) {
- var classNames, i, l, elem,
- setClass, c, cl;
-
- if ( jQuery.isFunction( value ) ) {
- return this.each(function( j ) {
- jQuery( this ).addClass( value.call(this, j, this.className) );
- });
- }
-
- if ( value && typeof value === "string" ) {
- classNames = value.split( rspace );
-
- for ( i = 0, l = this.length; i < l; i++ ) {
- elem = this[ i ];
-
- if ( elem.nodeType === 1 ) {
- if ( !elem.className && classNames.length === 1 ) {
- elem.className = value;
-
- } else {
- setClass = " " + elem.className + " ";
-
- for ( c = 0, cl = classNames.length; c < cl; c++ ) {
- if ( !~setClass.indexOf( " " + classNames[ c ] + " " ) ) {
- setClass += classNames[ c ] + " ";
- }
- }
- elem.className = jQuery.trim( setClass );
- }
- }
- }
- }
-
- return this;
- },
-
- removeClass: function( value ) {
- var classNames, i, l, elem, className, c, cl;
-
- if ( jQuery.isFunction( value ) ) {
- return this.each(function( j ) {
- jQuery( this ).removeClass( value.call(this, j, this.className) );
- });
- }
-
- if ( (value && typeof value === "string") || value === undefined ) {
- classNames = ( value || "" ).split( rspace );
-
- for ( i = 0, l = this.length; i < l; i++ ) {
- elem = this[ i ];
-
- if ( elem.nodeType === 1 && elem.className ) {
- if ( value ) {
- className = (" " + elem.className + " ").replace( rclass, " " );
- for ( c = 0, cl = classNames.length; c < cl; c++ ) {
- className = className.replace(" " + classNames[ c ] + " ", " ");
- }
- elem.className = jQuery.trim( className );
-
- } else {
- elem.className = "";
- }
- }
- }
- }
-
- return this;
- },
-
- toggleClass: function( value, stateVal ) {
- var type = typeof value,
- isBool = typeof stateVal === "boolean";
-
- if ( jQuery.isFunction( value ) ) {
- return this.each(function( i ) {
- jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal );
- });
- }
-
- return this.each(function() {
- if ( type === "string" ) {
- // toggle individual class names
- var className,
- i = 0,
- self = jQuery( this ),
- state = stateVal,
- classNames = value.split( rspace );
-
- while ( (className = classNames[ i++ ]) ) {
- // check each className given, space seperated list
- state = isBool ? state : !self.hasClass( className );
- self[ state ? "addClass" : "removeClass" ]( className );
- }
-
- } else if ( type === "undefined" || type === "boolean" ) {
- if ( this.className ) {
- // store className if set
- jQuery._data( this, "__className__", this.className );
- }
-
- // toggle whole className
- this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
- }
- });
- },
-
- hasClass: function( selector ) {
- var className = " " + selector + " ",
- i = 0,
- l = this.length;
- for ( ; i < l; i++ ) {
- if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) {
- return true;
- }
- }
-
- return false;
- },
-
- val: function( value ) {
- var hooks, ret, isFunction,
- elem = this[0];
-
- if ( !arguments.length ) {
- if ( elem ) {
- hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ];
-
- if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
- return ret;
- }
-
- ret = elem.value;
-
- return typeof ret === "string" ?
- // handle most common string cases
- ret.replace(rreturn, "") :
- // handle cases where value is null/undef or number
- ret == null ? "" : ret;
- }
-
- return;
- }
-
- isFunction = jQuery.isFunction( value );
-
- return this.each(function( i ) {
- var self = jQuery(this), val;
-
- if ( this.nodeType !== 1 ) {
- return;
- }
-
- if ( isFunction ) {
- val = value.call( this, i, self.val() );
- } else {
- val = value;
- }
-
- // Treat null/undefined as ""; convert numbers to string
- if ( val == null ) {
- val = "";
- } else if ( typeof val === "number" ) {
- val += "";
- } else if ( jQuery.isArray( val ) ) {
- val = jQuery.map(val, function ( value ) {
- return value == null ? "" : value + "";
- });
- }
-
- hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
-
- // If set returns undefined, fall back to normal setting
- if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
- this.value = val;
- }
- });
- }
-});
-
-jQuery.extend({
- valHooks: {
- option: {
- get: function( elem ) {
- // attributes.value is undefined in Blackberry 4.7 but
- // uses .value. See #6932
- var val = elem.attributes.value;
- return !val || val.specified ? elem.value : elem.text;
- }
- },
- select: {
- get: function( elem ) {
- var value, i, max, option,
- index = elem.selectedIndex,
- values = [],
- options = elem.options,
- one = elem.type === "select-one";
-
- // Nothing was selected
- if ( index < 0 ) {
- return null;
- }
-
- // Loop through all the selected options
- i = one ? index : 0;
- max = one ? index + 1 : options.length;
- for ( ; i < max; i++ ) {
- option = options[ i ];
-
- // Don't return options that are disabled or in a disabled optgroup
- if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) &&
- (!option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" )) ) {
-
- // Get the specific value for the option
- value = jQuery( option ).val();
-
- // We don't need an array for one selects
- if ( one ) {
- return value;
- }
-
- // Multi-Selects return an array
- values.push( value );
- }
- }
-
- // Fixes Bug #2551 -- select.val() broken in IE after form.reset()
- if ( one && !values.length && options.length ) {
- return jQuery( options[ index ] ).val();
- }
-
- return values;
- },
-
- set: function( elem, value ) {
- var values = jQuery.makeArray( value );
-
- jQuery(elem).find("option").each(function() {
- this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
- });
-
- if ( !values.length ) {
- elem.selectedIndex = -1;
- }
- return values;
- }
- }
- },
-
- attrFn: {
- val: true,
- css: true,
- html: true,
- text: true,
- data: true,
- width: true,
- height: true,
- offset: true
- },
-
- attr: function( elem, name, value, pass ) {
- var ret, hooks, notxml,
- nType = elem.nodeType;
-
- // don't get/set attributes on text, comment and attribute nodes
- if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
- return;
- }
-
- if ( pass && name in jQuery.attrFn ) {
- return jQuery( elem )[ name ]( value );
- }
-
- // Fallback to prop when attributes are not supported
- if ( typeof elem.getAttribute === "undefined" ) {
- return jQuery.prop( elem, name, value );
- }
-
- notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
-
- // All attributes are lowercase
- // Grab necessary hook if one is defined
- if ( notxml ) {
- name = name.toLowerCase();
- hooks = jQuery.attrHooks[ name ] || ( rboolean.test( name ) ? boolHook : nodeHook );
- }
-
- if ( value !== undefined ) {
-
- if ( value === null ) {
- jQuery.removeAttr( elem, name );
- return;
-
- } else if ( hooks && "set" in hooks && notxml && (ret = hooks.set( elem, value, name )) !== undefined ) {
- return ret;
-
- } else {
- elem.setAttribute( name, "" + value );
- return value;
- }
-
- } else if ( hooks && "get" in hooks && notxml && (ret = hooks.get( elem, name )) !== null ) {
- return ret;
-
- } else {
-
- ret = elem.getAttribute( name );
-
- // Non-existent attributes return null, we normalize to undefined
- return ret === null ?
- undefined :
- ret;
- }
- },
-
- removeAttr: function( elem, value ) {
- var propName, attrNames, name, l, isBool,
- i = 0;
-
- if ( value && elem.nodeType === 1 ) {
- attrNames = value.toLowerCase().split( rspace );
- l = attrNames.length;
-
- for ( ; i < l; i++ ) {
- name = attrNames[ i ];
-
- if ( name ) {
- propName = jQuery.propFix[ name ] || name;
- isBool = rboolean.test( name );
-
- // See #9699 for explanation of this approach (setting first, then removal)
- // Do not do this for boolean attributes (see #10870)
- if ( !isBool ) {
- jQuery.attr( elem, name, "" );
- }
- elem.removeAttribute( getSetAttribute ? name : propName );
-
- // Set corresponding property to false for boolean attributes
- if ( isBool && propName in elem ) {
- elem[ propName ] = false;
- }
- }
- }
- }
- },
-
- attrHooks: {
- type: {
- set: function( elem, value ) {
- // We can't allow the type property to be changed (since it causes problems in IE)
- if ( rtype.test( elem.nodeName ) && elem.parentNode ) {
- jQuery.error( "type property can't be changed" );
- } else if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) {
- // Setting the type on a radio button after the value resets the value in IE6-9
- // Reset value to it's default in case type is set after value
- // This is for element creation
- var val = elem.value;
- elem.setAttribute( "type", value );
- if ( val ) {
- elem.value = val;
- }
- return value;
- }
- }
- },
- // Use the value property for back compat
- // Use the nodeHook for button elements in IE6/7 (#1954)
- value: {
- get: function( elem, name ) {
- if ( nodeHook && jQuery.nodeName( elem, "button" ) ) {
- return nodeHook.get( elem, name );
- }
- return name in elem ?
- elem.value :
- null;
- },
- set: function( elem, value, name ) {
- if ( nodeHook && jQuery.nodeName( elem, "button" ) ) {
- return nodeHook.set( elem, value, name );
- }
- // Does not return so that setAttribute is also used
- elem.value = value;
- }
- }
- },
-
- propFix: {
- tabindex: "tabIndex",
- readonly: "readOnly",
- "for": "htmlFor",
- "class": "className",
- maxlength: "maxLength",
- cellspacing: "cellSpacing",
- cellpadding: "cellPadding",
- rowspan: "rowSpan",
- colspan: "colSpan",
- usemap: "useMap",
- frameborder: "frameBorder",
- contenteditable: "contentEditable"
- },
-
- prop: function( elem, name, value ) {
- var ret, hooks, notxml,
- nType = elem.nodeType;
-
- // don't get/set properties on text, comment and attribute nodes
- if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
- return;
- }
-
- notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
-
- if ( notxml ) {
- // Fix name and attach hooks
- name = jQuery.propFix[ name ] || name;
- hooks = jQuery.propHooks[ name ];
- }
-
- if ( value !== undefined ) {
- if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
- return ret;
-
- } else {
- return ( elem[ name ] = value );
- }
-
- } else {
- if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
- return ret;
-
- } else {
- return elem[ name ];
- }
- }
- },
-
- propHooks: {
- tabIndex: {
- get: function( elem ) {
- // elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
- // http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
- var attributeNode = elem.getAttributeNode("tabindex");
-
- return attributeNode && attributeNode.specified ?
- parseInt( attributeNode.value, 10 ) :
- rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
- 0 :
- undefined;
- }
- }
- }
-});
-
-// Add the tabIndex propHook to attrHooks for back-compat (different case is intentional)
-jQuery.attrHooks.tabindex = jQuery.propHooks.tabIndex;
-
-// Hook for boolean attributes
-boolHook = {
- get: function( elem, name ) {
- // Align boolean attributes with corresponding properties
- // Fall back to attribute presence where some booleans are not supported
- var attrNode,
- property = jQuery.prop( elem, name );
- return property === true || typeof property !== "boolean" && ( attrNode = elem.getAttributeNode(name) ) && attrNode.nodeValue !== false ?
- name.toLowerCase() :
- undefined;
- },
- set: function( elem, value, name ) {
- var propName;
- if ( value === false ) {
- // Remove boolean attributes when set to false
- jQuery.removeAttr( elem, name );
- } else {
- // value is true since we know at this point it's type boolean and not false
- // Set boolean attributes to the same name and set the DOM property
- propName = jQuery.propFix[ name ] || name;
- if ( propName in elem ) {
- // Only set the IDL specifically if it already exists on the element
- elem[ propName ] = true;
- }
-
- elem.setAttribute( name, name.toLowerCase() );
- }
- return name;
- }
-};
-
-// IE6/7 do not support getting/setting some attributes with get/setAttribute
-if ( !getSetAttribute ) {
-
- fixSpecified = {
- name: true,
- id: true,
- coords: true
- };
-
- // Use this for any attribute in IE6/7
- // This fixes almost every IE6/7 issue
- nodeHook = jQuery.valHooks.button = {
- get: function( elem, name ) {
- var ret;
- ret = elem.getAttributeNode( name );
- return ret && ( fixSpecified[ name ] ? ret.nodeValue !== "" : ret.specified ) ?
- ret.nodeValue :
- undefined;
- },
- set: function( elem, value, name ) {
- // Set the existing or create a new attribute node
- var ret = elem.getAttributeNode( name );
- if ( !ret ) {
- ret = document.createAttribute( name );
- elem.setAttributeNode( ret );
- }
- return ( ret.nodeValue = value + "" );
- }
- };
-
- // Apply the nodeHook to tabindex
- jQuery.attrHooks.tabindex.set = nodeHook.set;
-
- // Set width and height to auto instead of 0 on empty string( Bug #8150 )
- // This is for removals
- jQuery.each([ "width", "height" ], function( i, name ) {
- jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
- set: function( elem, value ) {
- if ( value === "" ) {
- elem.setAttribute( name, "auto" );
- return value;
- }
- }
- });
- });
-
- // Set contenteditable to false on removals(#10429)
- // Setting to empty string throws an error as an invalid value
- jQuery.attrHooks.contenteditable = {
- get: nodeHook.get,
- set: function( elem, value, name ) {
- if ( value === "" ) {
- value = "false";
- }
- nodeHook.set( elem, value, name );
- }
- };
-}
-
-
-// Some attributes require a special call on IE
-if ( !jQuery.support.hrefNormalized ) {
- jQuery.each([ "href", "src", "width", "height" ], function( i, name ) {
- jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
- get: function( elem ) {
- var ret = elem.getAttribute( name, 2 );
- return ret === null ? undefined : ret;
- }
- });
- });
-}
-
-if ( !jQuery.support.style ) {
- jQuery.attrHooks.style = {
- get: function( elem ) {
- // Return undefined in the case of empty string
- // Normalize to lowercase since IE uppercases css property names
- return elem.style.cssText.toLowerCase() || undefined;
- },
- set: function( elem, value ) {
- return ( elem.style.cssText = "" + value );
- }
- };
-}
-
-// Safari mis-reports the default selected property of an option
-// Accessing the parent's selectedIndex property fixes it
-if ( !jQuery.support.optSelected ) {
- jQuery.propHooks.selected = jQuery.extend( jQuery.propHooks.selected, {
- get: function( elem ) {
- var parent = elem.parentNode;
-
- if ( parent ) {
- parent.selectedIndex;
-
- // Make sure that it also works with optgroups, see #5701
- if ( parent.parentNode ) {
- parent.parentNode.selectedIndex;
- }
- }
- return null;
- }
- });
-}
-
-// IE6/7 call enctype encoding
-if ( !jQuery.support.enctype ) {
- jQuery.propFix.enctype = "encoding";
-}
-
-// Radios and checkboxes getter/setter
-if ( !jQuery.support.checkOn ) {
- jQuery.each([ "radio", "checkbox" ], function() {
- jQuery.valHooks[ this ] = {
- get: function( elem ) {
- // Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
- return elem.getAttribute("value") === null ? "on" : elem.value;
- }
- };
- });
-}
-jQuery.each([ "radio", "checkbox" ], function() {
- jQuery.valHooks[ this ] = jQuery.extend( jQuery.valHooks[ this ], {
- set: function( elem, value ) {
- if ( jQuery.isArray( value ) ) {
- return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 );
- }
- }
- });
-});
-
-
-
-
-var rformElems = /^(?:textarea|input|select)$/i,
- rtypenamespace = /^([^\.]*)?(?:\.(.+))?$/,
- rhoverHack = /(?:^|\s)hover(\.\S+)?\b/,
- rkeyEvent = /^key/,
- rmouseEvent = /^(?:mouse|contextmenu)|click/,
- rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
- rquickIs = /^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,
- quickParse = function( selector ) {
- var quick = rquickIs.exec( selector );
- if ( quick ) {
- // 0 1 2 3
- // [ _, tag, id, class ]
- quick[1] = ( quick[1] || "" ).toLowerCase();
- quick[3] = quick[3] && new RegExp( "(?:^|\\s)" + quick[3] + "(?:\\s|$)" );
- }
- return quick;
- },
- quickIs = function( elem, m ) {
- var attrs = elem.attributes || {};
- return (
- (!m[1] || elem.nodeName.toLowerCase() === m[1]) &&
- (!m[2] || (attrs.id || {}).value === m[2]) &&
- (!m[3] || m[3].test( (attrs[ "class" ] || {}).value ))
- );
- },
- hoverHack = function( events ) {
- return jQuery.event.special.hover ? events : events.replace( rhoverHack, "mouseenter$1 mouseleave$1" );
- };
-
-/*
- * Helper functions for managing events -- not part of the public interface.
- * Props to Dean Edwards' addEvent library for many of the ideas.
- */
-jQuery.event = {
-
- add: function( elem, types, handler, data, selector ) {
-
- var elemData, eventHandle, events,
- t, tns, type, namespaces, handleObj,
- handleObjIn, quick, handlers, special;
-
- // Don't attach events to noData or text/comment nodes (allow plain objects tho)
- if ( elem.nodeType === 3 || elem.nodeType === 8 || !types || !handler || !(elemData = jQuery._data( elem )) ) {
- return;
- }
-
- // Caller can pass in an object of custom data in lieu of the handler
- if ( handler.handler ) {
- handleObjIn = handler;
- handler = handleObjIn.handler;
- selector = handleObjIn.selector;
- }
-
- // Make sure that the handler has a unique ID, used to find/remove it later
- if ( !handler.guid ) {
- handler.guid = jQuery.guid++;
- }
-
- // Init the element's event structure and main handler, if this is the first
- events = elemData.events;
- if ( !events ) {
- elemData.events = events = {};
- }
- eventHandle = elemData.handle;
- if ( !eventHandle ) {
- elemData.handle = eventHandle = function( e ) {
- // Discard the second event of a jQuery.event.trigger() and
- // when an event is called after a page has unloaded
- return typeof jQuery !== "undefined" && (!e || jQuery.event.triggered !== e.type) ?
- jQuery.event.dispatch.apply( eventHandle.elem, arguments ) :
- undefined;
- };
- // Add elem as a property of the handle fn to prevent a memory leak with IE non-native events
- eventHandle.elem = elem;
- }
-
- // Handle multiple events separated by a space
- // jQuery(...).bind("mouseover mouseout", fn);
- types = jQuery.trim( hoverHack(types) ).split( " " );
- for ( t = 0; t < types.length; t++ ) {
-
- tns = rtypenamespace.exec( types[t] ) || [];
- type = tns[1];
- namespaces = ( tns[2] || "" ).split( "." ).sort();
-
- // If event changes its type, use the special event handlers for the changed type
- special = jQuery.event.special[ type ] || {};
-
- // If selector defined, determine special event api type, otherwise given type
- type = ( selector ? special.delegateType : special.bindType ) || type;
-
- // Update special based on newly reset type
- special = jQuery.event.special[ type ] || {};
-
- // handleObj is passed to all event handlers
- handleObj = jQuery.extend({
- type: type,
- origType: tns[1],
- data: data,
- handler: handler,
- guid: handler.guid,
- selector: selector,
- quick: selector && quickParse( selector ),
- namespace: namespaces.join(".")
- }, handleObjIn );
-
- // Init the event handler queue if we're the first
- handlers = events[ type ];
- if ( !handlers ) {
- handlers = events[ type ] = [];
- handlers.delegateCount = 0;
-
- // Only use addEventListener/attachEvent if the special events handler returns false
- if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
- // Bind the global event handler to the element
- if ( elem.addEventListener ) {
- elem.addEventListener( type, eventHandle, false );
-
- } else if ( elem.attachEvent ) {
- elem.attachEvent( "on" + type, eventHandle );
- }
- }
- }
-
- if ( special.add ) {
- special.add.call( elem, handleObj );
-
- if ( !handleObj.handler.guid ) {
- handleObj.handler.guid = handler.guid;
- }
- }
-
- // Add to the element's handler list, delegates in front
- if ( selector ) {
- handlers.splice( handlers.delegateCount++, 0, handleObj );
- } else {
- handlers.push( handleObj );
- }
-
- // Keep track of which events have ever been used, for event optimization
- jQuery.event.global[ type ] = true;
- }
-
- // Nullify elem to prevent memory leaks in IE
- elem = null;
- },
-
- global: {},
-
- // Detach an event or set of events from an element
- remove: function( elem, types, handler, selector, mappedTypes ) {
-
- var elemData = jQuery.hasData( elem ) && jQuery._data( elem ),
- t, tns, type, origType, namespaces, origCount,
- j, events, special, handle, eventType, handleObj;
-
- if ( !elemData || !(events = elemData.events) ) {
- return;
- }
-
- // Once for each type.namespace in types; type may be omitted
- types = jQuery.trim( hoverHack( types || "" ) ).split(" ");
- for ( t = 0; t < types.length; t++ ) {
- tns = rtypenamespace.exec( types[t] ) || [];
- type = origType = tns[1];
- namespaces = tns[2];
-
- // Unbind all events (on this namespace, if provided) for the element
- if ( !type ) {
- for ( type in events ) {
- jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
- }
- continue;
- }
-
- special = jQuery.event.special[ type ] || {};
- type = ( selector? special.delegateType : special.bindType ) || type;
- eventType = events[ type ] || [];
- origCount = eventType.length;
- namespaces = namespaces ? new RegExp("(^|\\.)" + namespaces.split(".").sort().join("\\.(?:.*\\.)?") + "(\\.|$)") : null;
-
- // Remove matching events
- for ( j = 0; j < eventType.length; j++ ) {
- handleObj = eventType[ j ];
-
- if ( ( mappedTypes || origType === handleObj.origType ) &&
- ( !handler || handler.guid === handleObj.guid ) &&
- ( !namespaces || namespaces.test( handleObj.namespace ) ) &&
- ( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
- eventType.splice( j--, 1 );
-
- if ( handleObj.selector ) {
- eventType.delegateCount--;
- }
- if ( special.remove ) {
- special.remove.call( elem, handleObj );
- }
- }
- }
-
- // Remove generic event handler if we removed something and no more handlers exist
- // (avoids potential for endless recursion during removal of special event handlers)
- if ( eventType.length === 0 && origCount !== eventType.length ) {
- if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) {
- jQuery.removeEvent( elem, type, elemData.handle );
- }
-
- delete events[ type ];
- }
- }
-
- // Remove the expando if it's no longer used
- if ( jQuery.isEmptyObject( events ) ) {
- handle = elemData.handle;
- if ( handle ) {
- handle.elem = null;
- }
-
- // removeData also checks for emptiness and clears the expando if empty
- // so use it instead of delete
- jQuery.removeData( elem, [ "events", "handle" ], true );
- }
- },
-
- // Events that are safe to short-circuit if no handlers are attached.
- // Native DOM events should not be added, they may have inline handlers.
- customEvent: {
- "getData": true,
- "setData": true,
- "changeData": true
- },
-
- trigger: function( event, data, elem, onlyHandlers ) {
- // Don't do events on text and comment nodes
- if ( elem && (elem.nodeType === 3 || elem.nodeType === 8) ) {
- return;
- }
-
- // Event object or event type
- var type = event.type || event,
- namespaces = [],
- cache, exclusive, i, cur, old, ontype, special, handle, eventPath, bubbleType;
-
- // focus/blur morphs to focusin/out; ensure we're not firing them right now
- if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
- return;
- }
-
- if ( type.indexOf( "!" ) >= 0 ) {
- // Exclusive events trigger only for the exact event (no namespaces)
- type = type.slice(0, -1);
- exclusive = true;
- }
-
- if ( type.indexOf( "." ) >= 0 ) {
- // Namespaced trigger; create a regexp to match event type in handle()
- namespaces = type.split(".");
- type = namespaces.shift();
- namespaces.sort();
- }
-
- if ( (!elem || jQuery.event.customEvent[ type ]) && !jQuery.event.global[ type ] ) {
- // No jQuery handlers for this event type, and it can't have inline handlers
- return;
- }
-
- // Caller can pass in an Event, Object, or just an event type string
- event = typeof event === "object" ?
- // jQuery.Event object
- event[ jQuery.expando ] ? event :
- // Object literal
- new jQuery.Event( type, event ) :
- // Just the event type (string)
- new jQuery.Event( type );
-
- event.type = type;
- event.isTrigger = true;
- event.exclusive = exclusive;
- event.namespace = namespaces.join( "." );
- event.namespace_re = event.namespace? new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.)?") + "(\\.|$)") : null;
- ontype = type.indexOf( ":" ) < 0 ? "on" + type : "";
-
- // Handle a global trigger
- if ( !elem ) {
-
- // TODO: Stop taunting the data cache; remove global events and always attach to document
- cache = jQuery.cache;
- for ( i in cache ) {
- if ( cache[ i ].events && cache[ i ].events[ type ] ) {
- jQuery.event.trigger( event, data, cache[ i ].handle.elem, true );
- }
- }
- return;
- }
-
- // Clean up the event in case it is being reused
- event.result = undefined;
- if ( !event.target ) {
- event.target = elem;
- }
-
- // Clone any incoming data and prepend the event, creating the handler arg list
- data = data != null ? jQuery.makeArray( data ) : [];
- data.unshift( event );
-
- // Allow special events to draw outside the lines
- special = jQuery.event.special[ type ] || {};
- if ( special.trigger && special.trigger.apply( elem, data ) === false ) {
- return;
- }
-
- // Determine event propagation path in advance, per W3C events spec (#9951)
- // Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
- eventPath = [[ elem, special.bindType || type ]];
- if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
-
- bubbleType = special.delegateType || type;
- cur = rfocusMorph.test( bubbleType + type ) ? elem : elem.parentNode;
- old = null;
- for ( ; cur; cur = cur.parentNode ) {
- eventPath.push([ cur, bubbleType ]);
- old = cur;
- }
-
- // Only add window if we got to document (e.g., not plain obj or detached DOM)
- if ( old && old === elem.ownerDocument ) {
- eventPath.push([ old.defaultView || old.parentWindow || window, bubbleType ]);
- }
- }
-
- // Fire handlers on the event path
- for ( i = 0; i < eventPath.length && !event.isPropagationStopped(); i++ ) {
-
- cur = eventPath[i][0];
- event.type = eventPath[i][1];
-
- handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" );
- if ( handle ) {
- handle.apply( cur, data );
- }
- // Note that this is a bare JS function and not a jQuery handler
- handle = ontype && cur[ ontype ];
- if ( handle && jQuery.acceptData( cur ) && handle.apply( cur, data ) === false ) {
- event.preventDefault();
- }
- }
- event.type = type;
-
- // If nobody prevented the default action, do it now
- if ( !onlyHandlers && !event.isDefaultPrevented() ) {
-
- if ( (!special._default || special._default.apply( elem.ownerDocument, data ) === false) &&
- !(type === "click" && jQuery.nodeName( elem, "a" )) && jQuery.acceptData( elem ) ) {
-
- // Call a native DOM method on the target with the same name name as the event.
- // Can't use an .isFunction() check here because IE6/7 fails that test.
- // Don't do default actions on window, that's where global variables be (#6170)
- // IE<9 dies on focus/blur to hidden element (#1486)
- if ( ontype && elem[ type ] && ((type !== "focus" && type !== "blur") || event.target.offsetWidth !== 0) && !jQuery.isWindow( elem ) ) {
-
- // Don't re-trigger an onFOO event when we call its FOO() method
- old = elem[ ontype ];
-
- if ( old ) {
- elem[ ontype ] = null;
- }
-
- // Prevent re-triggering of the same event, since we already bubbled it above
- jQuery.event.triggered = type;
- elem[ type ]();
- jQuery.event.triggered = undefined;
-
- if ( old ) {
- elem[ ontype ] = old;
- }
- }
- }
- }
-
- return event.result;
- },
-
- dispatch: function( event ) {
-
- // Make a writable jQuery.Event from the native event object
- event = jQuery.event.fix( event || window.event );
-
- var handlers = ( (jQuery._data( this, "events" ) || {} )[ event.type ] || []),
- delegateCount = handlers.delegateCount,
- args = [].slice.call( arguments, 0 ),
- run_all = !event.exclusive && !event.namespace,
- special = jQuery.event.special[ event.type ] || {},
- handlerQueue = [],
- i, j, cur, jqcur, ret, selMatch, matched, matches, handleObj, sel, related;
-
- // Use the fix-ed jQuery.Event rather than the (read-only) native event
- args[0] = event;
- event.delegateTarget = this;
-
- // Call the preDispatch hook for the mapped type, and let it bail if desired
- if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
- return;
- }
-
- // Determine handlers that should run if there are delegated events
- // Avoid non-left-click bubbling in Firefox (#3861)
- if ( delegateCount && !(event.button && event.type === "click") ) {
-
- // Pregenerate a single jQuery object for reuse with .is()
- jqcur = jQuery(this);
- jqcur.context = this.ownerDocument || this;
-
- for ( cur = event.target; cur != this; cur = cur.parentNode || this ) {
-
- // Don't process events on disabled elements (#6911, #8165)
- if ( cur.disabled !== true ) {
- selMatch = {};
- matches = [];
- jqcur[0] = cur;
- for ( i = 0; i < delegateCount; i++ ) {
- handleObj = handlers[ i ];
- sel = handleObj.selector;
-
- if ( selMatch[ sel ] === undefined ) {
- selMatch[ sel ] = (
- handleObj.quick ? quickIs( cur, handleObj.quick ) : jqcur.is( sel )
- );
- }
- if ( selMatch[ sel ] ) {
- matches.push( handleObj );
- }
- }
- if ( matches.length ) {
- handlerQueue.push({ elem: cur, matches: matches });
- }
- }
- }
- }
-
- // Add the remaining (directly-bound) handlers
- if ( handlers.length > delegateCount ) {
- handlerQueue.push({ elem: this, matches: handlers.slice( delegateCount ) });
- }
-
- // Run delegates first; they may want to stop propagation beneath us
- for ( i = 0; i < handlerQueue.length && !event.isPropagationStopped(); i++ ) {
- matched = handlerQueue[ i ];
- event.currentTarget = matched.elem;
-
- for ( j = 0; j < matched.matches.length && !event.isImmediatePropagationStopped(); j++ ) {
- handleObj = matched.matches[ j ];
-
- // Triggered event must either 1) be non-exclusive and have no namespace, or
- // 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace).
- if ( run_all || (!event.namespace && !handleObj.namespace) || event.namespace_re && event.namespace_re.test( handleObj.namespace ) ) {
-
- event.data = handleObj.data;
- event.handleObj = handleObj;
-
- ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
- .apply( matched.elem, args );
-
- if ( ret !== undefined ) {
- event.result = ret;
- if ( ret === false ) {
- event.preventDefault();
- event.stopPropagation();
- }
- }
- }
- }
- }
-
- // Call the postDispatch hook for the mapped type
- if ( special.postDispatch ) {
- special.postDispatch.call( this, event );
- }
-
- return event.result;
- },
-
- // Includes some event props shared by KeyEvent and MouseEvent
- // *** attrChange attrName relatedNode srcElement are not normalized, non-W3C, deprecated, will be removed in 1.8 ***
- props: "attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),
-
- fixHooks: {},
-
- keyHooks: {
- props: "char charCode key keyCode".split(" "),
- filter: function( event, original ) {
-
- // Add which for key events
- if ( event.which == null ) {
- event.which = original.charCode != null ? original.charCode : original.keyCode;
- }
-
- return event;
- }
- },
-
- mouseHooks: {
- props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
- filter: function( event, original ) {
- var eventDoc, doc, body,
- button = original.button,
- fromElement = original.fromElement;
-
- // Calculate pageX/Y if missing and clientX/Y available
- if ( event.pageX == null && original.clientX != null ) {
- eventDoc = event.target.ownerDocument || document;
- doc = eventDoc.documentElement;
- body = eventDoc.body;
-
- event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
- event.pageY = original.clientY + ( doc && doc.scrollTop || body && body.scrollTop || 0 ) - ( doc && doc.clientTop || body && body.clientTop || 0 );
- }
-
- // Add relatedTarget, if necessary
- if ( !event.relatedTarget && fromElement ) {
- event.relatedTarget = fromElement === event.target ? original.toElement : fromElement;
- }
-
- // Add which for click: 1 === left; 2 === middle; 3 === right
- // Note: button is not normalized, so don't use it
- if ( !event.which && button !== undefined ) {
- event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
- }
-
- return event;
- }
- },
-
- fix: function( event ) {
- if ( event[ jQuery.expando ] ) {
- return event;
- }
-
- // Create a writable copy of the event object and normalize some properties
- var i, prop,
- originalEvent = event,
- fixHook = jQuery.event.fixHooks[ event.type ] || {},
- copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
-
- event = jQuery.Event( originalEvent );
-
- for ( i = copy.length; i; ) {
- prop = copy[ --i ];
- event[ prop ] = originalEvent[ prop ];
- }
-
- // Fix target property, if necessary (#1925, IE 6/7/8 & Safari2)
- if ( !event.target ) {
- event.target = originalEvent.srcElement || document;
- }
-
- // Target should not be a text node (#504, Safari)
- if ( event.target.nodeType === 3 ) {
- event.target = event.target.parentNode;
- }
-
- // For mouse/key events; add metaKey if it's not there (#3368, IE6/7/8)
- if ( event.metaKey === undefined ) {
- event.metaKey = event.ctrlKey;
- }
-
- return fixHook.filter? fixHook.filter( event, originalEvent ) : event;
- },
-
- special: {
- ready: {
- // Make sure the ready event is setup
- setup: jQuery.bindReady
- },
-
- load: {
- // Prevent triggered image.load events from bubbling to window.load
- noBubble: true
- },
-
- focus: {
- delegateType: "focusin"
- },
- blur: {
- delegateType: "focusout"
- },
-
- beforeunload: {
- setup: function( data, namespaces, eventHandle ) {
- // We only want to do this special case on windows
- if ( jQuery.isWindow( this ) ) {
- this.onbeforeunload = eventHandle;
- }
- },
-
- teardown: function( namespaces, eventHandle ) {
- if ( this.onbeforeunload === eventHandle ) {
- this.onbeforeunload = null;
- }
- }
- }
- },
-
- simulate: function( type, elem, event, bubble ) {
- // Piggyback on a donor event to simulate a different one.
- // Fake originalEvent to avoid donor's stopPropagation, but if the
- // simulated event prevents default then we do the same on the donor.
- var e = jQuery.extend(
- new jQuery.Event(),
- event,
- { type: type,
- isSimulated: true,
- originalEvent: {}
- }
- );
- if ( bubble ) {
- jQuery.event.trigger( e, null, elem );
- } else {
- jQuery.event.dispatch.call( elem, e );
- }
- if ( e.isDefaultPrevented() ) {
- event.preventDefault();
- }
- }
-};
-
-// Some plugins are using, but it's undocumented/deprecated and will be removed.
-// The 1.7 special event interface should provide all the hooks needed now.
-jQuery.event.handle = jQuery.event.dispatch;
-
-jQuery.removeEvent = document.removeEventListener ?
- function( elem, type, handle ) {
- if ( elem.removeEventListener ) {
- elem.removeEventListener( type, handle, false );
- }
- } :
- function( elem, type, handle ) {
- if ( elem.detachEvent ) {
- elem.detachEvent( "on" + type, handle );
- }
- };
-
-jQuery.Event = function( src, props ) {
- // Allow instantiation without the 'new' keyword
- if ( !(this instanceof jQuery.Event) ) {
- return new jQuery.Event( src, props );
- }
-
- // Event object
- if ( src && src.type ) {
- this.originalEvent = src;
- this.type = src.type;
-
- // Events bubbling up the document may have been marked as prevented
- // by a handler lower down the tree; reflect the correct value.
- this.isDefaultPrevented = ( src.defaultPrevented || src.returnValue === false ||
- src.getPreventDefault && src.getPreventDefault() ) ? returnTrue : returnFalse;
-
- // Event type
- } else {
- this.type = src;
- }
-
- // Put explicitly provided properties onto the event object
- if ( props ) {
- jQuery.extend( this, props );
- }
-
- // Create a timestamp if incoming event doesn't have one
- this.timeStamp = src && src.timeStamp || jQuery.now();
-
- // Mark it as fixed
- this[ jQuery.expando ] = true;
-};
-
-function returnFalse() {
- return false;
-}
-function returnTrue() {
- return true;
-}
-
-// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
-// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
-jQuery.Event.prototype = {
- preventDefault: function() {
- this.isDefaultPrevented = returnTrue;
-
- var e = this.originalEvent;
- if ( !e ) {
- return;
- }
-
- // if preventDefault exists run it on the original event
- if ( e.preventDefault ) {
- e.preventDefault();
-
- // otherwise set the returnValue property of the original event to false (IE)
- } else {
- e.returnValue = false;
- }
- },
- stopPropagation: function() {
- this.isPropagationStopped = returnTrue;
-
- var e = this.originalEvent;
- if ( !e ) {
- return;
- }
- // if stopPropagation exists run it on the original event
- if ( e.stopPropagation ) {
- e.stopPropagation();
- }
- // otherwise set the cancelBubble property of the original event to true (IE)
- e.cancelBubble = true;
- },
- stopImmediatePropagation: function() {
- this.isImmediatePropagationStopped = returnTrue;
- this.stopPropagation();
- },
- isDefaultPrevented: returnFalse,
- isPropagationStopped: returnFalse,
- isImmediatePropagationStopped: returnFalse
-};
-
-// Create mouseenter/leave events using mouseover/out and event-time checks
-jQuery.each({
- mouseenter: "mouseover",
- mouseleave: "mouseout"
-}, function( orig, fix ) {
- jQuery.event.special[ orig ] = {
- delegateType: fix,
- bindType: fix,
-
- handle: function( event ) {
- var target = this,
- related = event.relatedTarget,
- handleObj = event.handleObj,
- selector = handleObj.selector,
- ret;
-
- // For mousenter/leave call the handler if related is outside the target.
- // NB: No relatedTarget if the mouse left/entered the browser window
- if ( !related || (related !== target && !jQuery.contains( target, related )) ) {
- event.type = handleObj.origType;
- ret = handleObj.handler.apply( this, arguments );
- event.type = fix;
- }
- return ret;
- }
- };
-});
-
-// IE submit delegation
-if ( !jQuery.support.submitBubbles ) {
-
- jQuery.event.special.submit = {
- setup: function() {
- // Only need this for delegated form submit events
- if ( jQuery.nodeName( this, "form" ) ) {
- return false;
- }
-
- // Lazy-add a submit handler when a descendant form may potentially be submitted
- jQuery.event.add( this, "click._submit keypress._submit", function( e ) {
- // Node name check avoids a VML-related crash in IE (#9807)
- var elem = e.target,
- form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined;
- if ( form && !form._submit_attached ) {
- jQuery.event.add( form, "submit._submit", function( event ) {
- event._submit_bubble = true;
- });
- form._submit_attached = true;
- }
- });
- // return undefined since we don't need an event listener
- },
-
- postDispatch: function( event ) {
- // If form was submitted by the user, bubble the event up the tree
- if ( event._submit_bubble ) {
- delete event._submit_bubble;
- if ( this.parentNode && !event.isTrigger ) {
- jQuery.event.simulate( "submit", this.parentNode, event, true );
- }
- }
- },
-
- teardown: function() {
- // Only need this for delegated form submit events
- if ( jQuery.nodeName( this, "form" ) ) {
- return false;
- }
-
- // Remove delegated handlers; cleanData eventually reaps submit handlers attached above
- jQuery.event.remove( this, "._submit" );
- }
- };
-}
-
-// IE change delegation and checkbox/radio fix
-if ( !jQuery.support.changeBubbles ) {
-
- jQuery.event.special.change = {
-
- setup: function() {
-
- if ( rformElems.test( this.nodeName ) ) {
- // IE doesn't fire change on a check/radio until blur; trigger it on click
- // after a propertychange. Eat the blur-change in special.change.handle.
- // This still fires onchange a second time for check/radio after blur.
- if ( this.type === "checkbox" || this.type === "radio" ) {
- jQuery.event.add( this, "propertychange._change", function( event ) {
- if ( event.originalEvent.propertyName === "checked" ) {
- this._just_changed = true;
- }
- });
- jQuery.event.add( this, "click._change", function( event ) {
- if ( this._just_changed && !event.isTrigger ) {
- this._just_changed = false;
- jQuery.event.simulate( "change", this, event, true );
- }
- });
- }
- return false;
- }
- // Delegated event; lazy-add a change handler on descendant inputs
- jQuery.event.add( this, "beforeactivate._change", function( e ) {
- var elem = e.target;
-
- if ( rformElems.test( elem.nodeName ) && !elem._change_attached ) {
- jQuery.event.add( elem, "change._change", function( event ) {
- if ( this.parentNode && !event.isSimulated && !event.isTrigger ) {
- jQuery.event.simulate( "change", this.parentNode, event, true );
- }
- });
- elem._change_attached = true;
- }
- });
- },
-
- handle: function( event ) {
- var elem = event.target;
-
- // Swallow native change events from checkbox/radio, we already triggered them above
- if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) {
- return event.handleObj.handler.apply( this, arguments );
- }
- },
-
- teardown: function() {
- jQuery.event.remove( this, "._change" );
-
- return rformElems.test( this.nodeName );
- }
- };
-}
-
-// Create "bubbling" focus and blur events
-if ( !jQuery.support.focusinBubbles ) {
- jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
-
- // Attach a single capturing handler while someone wants focusin/focusout
- var attaches = 0,
- handler = function( event ) {
- jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
- };
-
- jQuery.event.special[ fix ] = {
- setup: function() {
- if ( attaches++ === 0 ) {
- document.addEventListener( orig, handler, true );
- }
- },
- teardown: function() {
- if ( --attaches === 0 ) {
- document.removeEventListener( orig, handler, true );
- }
- }
- };
- });
-}
-
-jQuery.fn.extend({
-
- on: function( types, selector, data, fn, /*INTERNAL*/ one ) {
- var origFn, type;
-
- // Types can be a map of types/handlers
- if ( typeof types === "object" ) {
- // ( types-Object, selector, data )
- if ( typeof selector !== "string" ) { // && selector != null
- // ( types-Object, data )
- data = data || selector;
- selector = undefined;
- }
- for ( type in types ) {
- this.on( type, selector, data, types[ type ], one );
- }
- return this;
- }
-
- if ( data == null && fn == null ) {
- // ( types, fn )
- fn = selector;
- data = selector = undefined;
- } else if ( fn == null ) {
- if ( typeof selector === "string" ) {
- // ( types, selector, fn )
- fn = data;
- data = undefined;
- } else {
- // ( types, data, fn )
- fn = data;
- data = selector;
- selector = undefined;
- }
- }
- if ( fn === false ) {
- fn = returnFalse;
- } else if ( !fn ) {
- return this;
- }
-
- if ( one === 1 ) {
- origFn = fn;
- fn = function( event ) {
- // Can use an empty set, since event contains the info
- jQuery().off( event );
- return origFn.apply( this, arguments );
- };
- // Use same guid so caller can remove using origFn
- fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
- }
- return this.each( function() {
- jQuery.event.add( this, types, fn, data, selector );
- });
- },
- one: function( types, selector, data, fn ) {
- return this.on( types, selector, data, fn, 1 );
- },
- off: function( types, selector, fn ) {
- if ( types && types.preventDefault && types.handleObj ) {
- // ( event ) dispatched jQuery.Event
- var handleObj = types.handleObj;
- jQuery( types.delegateTarget ).off(
- handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType,
- handleObj.selector,
- handleObj.handler
- );
- return this;
- }
- if ( typeof types === "object" ) {
- // ( types-object [, selector] )
- for ( var type in types ) {
- this.off( type, selector, types[ type ] );
- }
- return this;
- }
- if ( selector === false || typeof selector === "function" ) {
- // ( types [, fn] )
- fn = selector;
- selector = undefined;
- }
- if ( fn === false ) {
- fn = returnFalse;
- }
- return this.each(function() {
- jQuery.event.remove( this, types, fn, selector );
- });
- },
-
- bind: function( types, data, fn ) {
- return this.on( types, null, data, fn );
- },
- unbind: function( types, fn ) {
- return this.off( types, null, fn );
- },
-
- live: function( types, data, fn ) {
- jQuery( this.context ).on( types, this.selector, data, fn );
- return this;
- },
- die: function( types, fn ) {
- jQuery( this.context ).off( types, this.selector || "**", fn );
- return this;
- },
-
- delegate: function( selector, types, data, fn ) {
- return this.on( types, selector, data, fn );
- },
- undelegate: function( selector, types, fn ) {
- // ( namespace ) or ( selector, types [, fn] )
- return arguments.length == 1? this.off( selector, "**" ) : this.off( types, selector, fn );
- },
-
- trigger: function( type, data ) {
- return this.each(function() {
- jQuery.event.trigger( type, data, this );
- });
- },
- triggerHandler: function( type, data ) {
- if ( this[0] ) {
- return jQuery.event.trigger( type, data, this[0], true );
- }
- },
-
- toggle: function( fn ) {
- // Save reference to arguments for access in closure
- var args = arguments,
- guid = fn.guid || jQuery.guid++,
- i = 0,
- toggler = function( event ) {
- // Figure out which function to execute
- var lastToggle = ( jQuery._data( this, "lastToggle" + fn.guid ) || 0 ) % i;
- jQuery._data( this, "lastToggle" + fn.guid, lastToggle + 1 );
-
- // Make sure that clicks stop
- event.preventDefault();
-
- // and execute the function
- return args[ lastToggle ].apply( this, arguments ) || false;
- };
-
- // link all the functions, so any of them can unbind this click handler
- toggler.guid = guid;
- while ( i < args.length ) {
- args[ i++ ].guid = guid;
- }
-
- return this.click( toggler );
- },
-
- hover: function( fnOver, fnOut ) {
- return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
- }
-});
-
-jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
- "mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
- "change select submit keydown keypress keyup error contextmenu").split(" "), function( i, name ) {
-
- // Handle event binding
- jQuery.fn[ name ] = function( data, fn ) {
- if ( fn == null ) {
- fn = data;
- data = null;
- }
-
- return arguments.length > 0 ?
- this.on( name, null, data, fn ) :
- this.trigger( name );
- };
-
- if ( jQuery.attrFn ) {
- jQuery.attrFn[ name ] = true;
- }
-
- if ( rkeyEvent.test( name ) ) {
- jQuery.event.fixHooks[ name ] = jQuery.event.keyHooks;
- }
-
- if ( rmouseEvent.test( name ) ) {
- jQuery.event.fixHooks[ name ] = jQuery.event.mouseHooks;
- }
-});
-
-
-
-/*!
- * Sizzle CSS Selector Engine
- * Copyright 2011, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- * More information: http://sizzlejs.com/
- */
-(function(){
-
-var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
- expando = "sizcache" + (Math.random() + '').replace('.', ''),
- done = 0,
- toString = Object.prototype.toString,
- hasDuplicate = false,
- baseHasDuplicate = true,
- rBackslash = /\\/g,
- rReturn = /\r\n/g,
- rNonWord = /\W/;
-
-// Here we check if the JavaScript engine is using some sort of
-// optimization where it does not always call our comparision
-// function. If that is the case, discard the hasDuplicate value.
-// Thus far that includes Google Chrome.
-[0, 0].sort(function() {
- baseHasDuplicate = false;
- return 0;
-});
-
-var Sizzle = function( selector, context, results, seed ) {
- results = results || [];
- context = context || document;
-
- var origContext = context;
-
- if ( context.nodeType !== 1 && context.nodeType !== 9 ) {
- return [];
- }
-
- if ( !selector || typeof selector !== "string" ) {
- return results;
- }
-
- var m, set, checkSet, extra, ret, cur, pop, i,
- prune = true,
- contextXML = Sizzle.isXML( context ),
- parts = [],
- soFar = selector;
-
- // Reset the position of the chunker regexp (start from head)
- do {
- chunker.exec( "" );
- m = chunker.exec( soFar );
-
- if ( m ) {
- soFar = m[3];
-
- parts.push( m[1] );
-
- if ( m[2] ) {
- extra = m[3];
- break;
- }
- }
- } while ( m );
-
- if ( parts.length > 1 && origPOS.exec( selector ) ) {
-
- if ( parts.length === 2 && Expr.relative[ parts[0] ] ) {
- set = posProcess( parts[0] + parts[1], context, seed );
-
- } else {
- set = Expr.relative[ parts[0] ] ?
- [ context ] :
- Sizzle( parts.shift(), context );
-
- while ( parts.length ) {
- selector = parts.shift();
-
- if ( Expr.relative[ selector ] ) {
- selector += parts.shift();
- }
-
- set = posProcess( selector, set, seed );
- }
- }
-
- } else {
- // Take a shortcut and set the context if the root selector is an ID
- // (but not if it'll be faster if the inner selector is an ID)
- if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML &&
- Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) {
-
- ret = Sizzle.find( parts.shift(), context, contextXML );
- context = ret.expr ?
- Sizzle.filter( ret.expr, ret.set )[0] :
- ret.set[0];
- }
-
- if ( context ) {
- ret = seed ?
- { expr: parts.pop(), set: makeArray(seed) } :
- Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML );
-
- set = ret.expr ?
- Sizzle.filter( ret.expr, ret.set ) :
- ret.set;
-
- if ( parts.length > 0 ) {
- checkSet = makeArray( set );
-
- } else {
- prune = false;
- }
-
- while ( parts.length ) {
- cur = parts.pop();
- pop = cur;
-
- if ( !Expr.relative[ cur ] ) {
- cur = "";
- } else {
- pop = parts.pop();
- }
-
- if ( pop == null ) {
- pop = context;
- }
-
- Expr.relative[ cur ]( checkSet, pop, contextXML );
- }
-
- } else {
- checkSet = parts = [];
- }
- }
-
- if ( !checkSet ) {
- checkSet = set;
- }
-
- if ( !checkSet ) {
- Sizzle.error( cur || selector );
- }
-
- if ( toString.call(checkSet) === "[object Array]" ) {
- if ( !prune ) {
- results.push.apply( results, checkSet );
-
- } else if ( context && context.nodeType === 1 ) {
- for ( i = 0; checkSet[i] != null; i++ ) {
- if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && Sizzle.contains(context, checkSet[i])) ) {
- results.push( set[i] );
- }
- }
-
- } else {
- for ( i = 0; checkSet[i] != null; i++ ) {
- if ( checkSet[i] && checkSet[i].nodeType === 1 ) {
- results.push( set[i] );
- }
- }
- }
-
- } else {
- makeArray( checkSet, results );
- }
-
- if ( extra ) {
- Sizzle( extra, origContext, results, seed );
- Sizzle.uniqueSort( results );
- }
-
- return results;
-};
-
-Sizzle.uniqueSort = function( results ) {
- if ( sortOrder ) {
- hasDuplicate = baseHasDuplicate;
- results.sort( sortOrder );
-
- if ( hasDuplicate ) {
- for ( var i = 1; i < results.length; i++ ) {
- if ( results[i] === results[ i - 1 ] ) {
- results.splice( i--, 1 );
- }
- }
- }
- }
-
- return results;
-};
-
-Sizzle.matches = function( expr, set ) {
- return Sizzle( expr, null, null, set );
-};
-
-Sizzle.matchesSelector = function( node, expr ) {
- return Sizzle( expr, null, null, [node] ).length > 0;
-};
-
-Sizzle.find = function( expr, context, isXML ) {
- var set, i, len, match, type, left;
-
- if ( !expr ) {
- return [];
- }
-
- for ( i = 0, len = Expr.order.length; i < len; i++ ) {
- type = Expr.order[i];
-
- if ( (match = Expr.leftMatch[ type ].exec( expr )) ) {
- left = match[1];
- match.splice( 1, 1 );
-
- if ( left.substr( left.length - 1 ) !== "\\" ) {
- match[1] = (match[1] || "").replace( rBackslash, "" );
- set = Expr.find[ type ]( match, context, isXML );
-
- if ( set != null ) {
- expr = expr.replace( Expr.match[ type ], "" );
- break;
- }
- }
- }
- }
-
- if ( !set ) {
- set = typeof context.getElementsByTagName !== "undefined" ?
- context.getElementsByTagName( "*" ) :
- [];
- }
-
- return { set: set, expr: expr };
-};
-
-Sizzle.filter = function( expr, set, inplace, not ) {
- var match, anyFound,
- type, found, item, filter, left,
- i, pass,
- old = expr,
- result = [],
- curLoop = set,
- isXMLFilter = set && set[0] && Sizzle.isXML( set[0] );
-
- while ( expr && set.length ) {
- for ( type in Expr.filter ) {
- if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) {
- filter = Expr.filter[ type ];
- left = match[1];
-
- anyFound = false;
-
- match.splice(1,1);
-
- if ( left.substr( left.length - 1 ) === "\\" ) {
- continue;
- }
-
- if ( curLoop === result ) {
- result = [];
- }
-
- if ( Expr.preFilter[ type ] ) {
- match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter );
-
- if ( !match ) {
- anyFound = found = true;
-
- } else if ( match === true ) {
- continue;
- }
- }
-
- if ( match ) {
- for ( i = 0; (item = curLoop[i]) != null; i++ ) {
- if ( item ) {
- found = filter( item, match, i, curLoop );
- pass = not ^ found;
-
- if ( inplace && found != null ) {
- if ( pass ) {
- anyFound = true;
-
- } else {
- curLoop[i] = false;
- }
-
- } else if ( pass ) {
- result.push( item );
- anyFound = true;
- }
- }
- }
- }
-
- if ( found !== undefined ) {
- if ( !inplace ) {
- curLoop = result;
- }
-
- expr = expr.replace( Expr.match[ type ], "" );
-
- if ( !anyFound ) {
- return [];
- }
-
- break;
- }
- }
- }
-
- // Improper expression
- if ( expr === old ) {
- if ( anyFound == null ) {
- Sizzle.error( expr );
-
- } else {
- break;
- }
- }
-
- old = expr;
- }
-
- return curLoop;
-};
-
-Sizzle.error = function( msg ) {
- throw new Error( "Syntax error, unrecognized expression: " + msg );
-};
-
-/**
- * Utility function for retreiving the text value of an array of DOM nodes
- * @param {Array|Element} elem
- */
-var getText = Sizzle.getText = function( elem ) {
- var i, node,
- nodeType = elem.nodeType,
- ret = "";
-
- if ( nodeType ) {
- if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
- // Use textContent || innerText for elements
- if ( typeof elem.textContent === 'string' ) {
- return elem.textContent;
- } else if ( typeof elem.innerText === 'string' ) {
- // Replace IE's carriage returns
- return elem.innerText.replace( rReturn, '' );
- } else {
- // Traverse it's children
- for ( elem = elem.firstChild; elem; elem = elem.nextSibling) {
- ret += getText( elem );
- }
- }
- } else if ( nodeType === 3 || nodeType === 4 ) {
- return elem.nodeValue;
- }
- } else {
-
- // If no nodeType, this is expected to be an array
- for ( i = 0; (node = elem[i]); i++ ) {
- // Do not traverse comment nodes
- if ( node.nodeType !== 8 ) {
- ret += getText( node );
- }
- }
- }
- return ret;
-};
-
-var Expr = Sizzle.selectors = {
- order: [ "ID", "NAME", "TAG" ],
-
- match: {
- ID: /#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,
- CLASS: /\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,
- NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,
- ATTR: /\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,
- TAG: /^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,
- CHILD: /:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,
- POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,
- PSEUDO: /:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/
- },
-
- leftMatch: {},
-
- attrMap: {
- "class": "className",
- "for": "htmlFor"
- },
-
- attrHandle: {
- href: function( elem ) {
- return elem.getAttribute( "href" );
- },
- type: function( elem ) {
- return elem.getAttribute( "type" );
- }
- },
-
- relative: {
- "+": function(checkSet, part){
- var isPartStr = typeof part === "string",
- isTag = isPartStr && !rNonWord.test( part ),
- isPartStrNotTag = isPartStr && !isTag;
-
- if ( isTag ) {
- part = part.toLowerCase();
- }
-
- for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) {
- if ( (elem = checkSet[i]) ) {
- while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {}
-
- checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ?
- elem || false :
- elem === part;
- }
- }
-
- if ( isPartStrNotTag ) {
- Sizzle.filter( part, checkSet, true );
- }
- },
-
- ">": function( checkSet, part ) {
- var elem,
- isPartStr = typeof part === "string",
- i = 0,
- l = checkSet.length;
-
- if ( isPartStr && !rNonWord.test( part ) ) {
- part = part.toLowerCase();
-
- for ( ; i < l; i++ ) {
- elem = checkSet[i];
-
- if ( elem ) {
- var parent = elem.parentNode;
- checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false;
- }
- }
-
- } else {
- for ( ; i < l; i++ ) {
- elem = checkSet[i];
-
- if ( elem ) {
- checkSet[i] = isPartStr ?
- elem.parentNode :
- elem.parentNode === part;
- }
- }
-
- if ( isPartStr ) {
- Sizzle.filter( part, checkSet, true );
- }
- }
- },
-
- "": function(checkSet, part, isXML){
- var nodeCheck,
- doneName = done++,
- checkFn = dirCheck;
-
- if ( typeof part === "string" && !rNonWord.test( part ) ) {
- part = part.toLowerCase();
- nodeCheck = part;
- checkFn = dirNodeCheck;
- }
-
- checkFn( "parentNode", part, doneName, checkSet, nodeCheck, isXML );
- },
-
- "~": function( checkSet, part, isXML ) {
- var nodeCheck,
- doneName = done++,
- checkFn = dirCheck;
-
- if ( typeof part === "string" && !rNonWord.test( part ) ) {
- part = part.toLowerCase();
- nodeCheck = part;
- checkFn = dirNodeCheck;
- }
-
- checkFn( "previousSibling", part, doneName, checkSet, nodeCheck, isXML );
- }
- },
-
- find: {
- ID: function( match, context, isXML ) {
- if ( typeof context.getElementById !== "undefined" && !isXML ) {
- var m = context.getElementById(match[1]);
- // Check parentNode to catch when Blackberry 4.6 returns
- // nodes that are no longer in the document #6963
- return m && m.parentNode ? [m] : [];
- }
- },
-
- NAME: function( match, context ) {
- if ( typeof context.getElementsByName !== "undefined" ) {
- var ret = [],
- results = context.getElementsByName( match[1] );
-
- for ( var i = 0, l = results.length; i < l; i++ ) {
- if ( results[i].getAttribute("name") === match[1] ) {
- ret.push( results[i] );
- }
- }
-
- return ret.length === 0 ? null : ret;
- }
- },
-
- TAG: function( match, context ) {
- if ( typeof context.getElementsByTagName !== "undefined" ) {
- return context.getElementsByTagName( match[1] );
- }
- }
- },
- preFilter: {
- CLASS: function( match, curLoop, inplace, result, not, isXML ) {
- match = " " + match[1].replace( rBackslash, "" ) + " ";
-
- if ( isXML ) {
- return match;
- }
-
- for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) {
- if ( elem ) {
- if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n\r]/g, " ").indexOf(match) >= 0) ) {
- if ( !inplace ) {
- result.push( elem );
- }
-
- } else if ( inplace ) {
- curLoop[i] = false;
- }
- }
- }
-
- return false;
- },
-
- ID: function( match ) {
- return match[1].replace( rBackslash, "" );
- },
-
- TAG: function( match, curLoop ) {
- return match[1].replace( rBackslash, "" ).toLowerCase();
- },
-
- CHILD: function( match ) {
- if ( match[1] === "nth" ) {
- if ( !match[2] ) {
- Sizzle.error( match[0] );
- }
-
- match[2] = match[2].replace(/^\+|\s*/g, '');
-
- // parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'
- var test = /(-?)(\d*)(?:n([+\-]?\d*))?/.exec(
- match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" ||
- !/\D/.test( match[2] ) && "0n+" + match[2] || match[2]);
-
- // calculate the numbers (first)n+(last) including if they are negative
- match[2] = (test[1] + (test[2] || 1)) - 0;
- match[3] = test[3] - 0;
- }
- else if ( match[2] ) {
- Sizzle.error( match[0] );
- }
-
- // TODO: Move to normal caching system
- match[0] = done++;
-
- return match;
- },
-
- ATTR: function( match, curLoop, inplace, result, not, isXML ) {
- var name = match[1] = match[1].replace( rBackslash, "" );
-
- if ( !isXML && Expr.attrMap[name] ) {
- match[1] = Expr.attrMap[name];
- }
-
- // Handle if an un-quoted value was used
- match[4] = ( match[4] || match[5] || "" ).replace( rBackslash, "" );
-
- if ( match[2] === "~=" ) {
- match[4] = " " + match[4] + " ";
- }
-
- return match;
- },
-
- PSEUDO: function( match, curLoop, inplace, result, not ) {
- if ( match[1] === "not" ) {
- // If we're dealing with a complex expression, or a simple one
- if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) {
- match[3] = Sizzle(match[3], null, null, curLoop);
-
- } else {
- var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);
-
- if ( !inplace ) {
- result.push.apply( result, ret );
- }
-
- return false;
- }
-
- } else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {
- return true;
- }
-
- return match;
- },
-
- POS: function( match ) {
- match.unshift( true );
-
- return match;
- }
- },
-
- filters: {
- enabled: function( elem ) {
- return elem.disabled === false && elem.type !== "hidden";
- },
-
- disabled: function( elem ) {
- return elem.disabled === true;
- },
-
- checked: function( elem ) {
- return elem.checked === true;
- },
-
- selected: function( elem ) {
- // Accessing this property makes selected-by-default
- // options in Safari work properly
- if ( elem.parentNode ) {
- elem.parentNode.selectedIndex;
- }
-
- return elem.selected === true;
- },
-
- parent: function( elem ) {
- return !!elem.firstChild;
- },
-
- empty: function( elem ) {
- return !elem.firstChild;
- },
-
- has: function( elem, i, match ) {
- return !!Sizzle( match[3], elem ).length;
- },
-
- header: function( elem ) {
- return (/h\d/i).test( elem.nodeName );
- },
-
- text: function( elem ) {
- var attr = elem.getAttribute( "type" ), type = elem.type;
- // IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc)
- // use getAttribute instead to test this case
- return elem.nodeName.toLowerCase() === "input" && "text" === type && ( attr === type || attr === null );
- },
-
- radio: function( elem ) {
- return elem.nodeName.toLowerCase() === "input" && "radio" === elem.type;
- },
-
- checkbox: function( elem ) {
- return elem.nodeName.toLowerCase() === "input" && "checkbox" === elem.type;
- },
-
- file: function( elem ) {
- return elem.nodeName.toLowerCase() === "input" && "file" === elem.type;
- },
-
- password: function( elem ) {
- return elem.nodeName.toLowerCase() === "input" && "password" === elem.type;
- },
-
- submit: function( elem ) {
- var name = elem.nodeName.toLowerCase();
- return (name === "input" || name === "button") && "submit" === elem.type;
- },
-
- image: function( elem ) {
- return elem.nodeName.toLowerCase() === "input" && "image" === elem.type;
- },
-
- reset: function( elem ) {
- var name = elem.nodeName.toLowerCase();
- return (name === "input" || name === "button") && "reset" === elem.type;
- },
-
- button: function( elem ) {
- var name = elem.nodeName.toLowerCase();
- return name === "input" && "button" === elem.type || name === "button";
- },
-
- input: function( elem ) {
- return (/input|select|textarea|button/i).test( elem.nodeName );
- },
-
- focus: function( elem ) {
- return elem === elem.ownerDocument.activeElement;
- }
- },
- setFilters: {
- first: function( elem, i ) {
- return i === 0;
- },
-
- last: function( elem, i, match, array ) {
- return i === array.length - 1;
- },
-
- even: function( elem, i ) {
- return i % 2 === 0;
- },
-
- odd: function( elem, i ) {
- return i % 2 === 1;
- },
-
- lt: function( elem, i, match ) {
- return i < match[3] - 0;
- },
-
- gt: function( elem, i, match ) {
- return i > match[3] - 0;
- },
-
- nth: function( elem, i, match ) {
- return match[3] - 0 === i;
- },
-
- eq: function( elem, i, match ) {
- return match[3] - 0 === i;
- }
- },
- filter: {
- PSEUDO: function( elem, match, i, array ) {
- var name = match[1],
- filter = Expr.filters[ name ];
-
- if ( filter ) {
- return filter( elem, i, match, array );
-
- } else if ( name === "contains" ) {
- return (elem.textContent || elem.innerText || getText([ elem ]) || "").indexOf(match[3]) >= 0;
-
- } else if ( name === "not" ) {
- var not = match[3];
-
- for ( var j = 0, l = not.length; j < l; j++ ) {
- if ( not[j] === elem ) {
- return false;
- }
- }
-
- return true;
-
- } else {
- Sizzle.error( name );
- }
- },
-
- CHILD: function( elem, match ) {
- var first, last,
- doneName, parent, cache,
- count, diff,
- type = match[1],
- node = elem;
-
- switch ( type ) {
- case "only":
- case "first":
- while ( (node = node.previousSibling) ) {
- if ( node.nodeType === 1 ) {
- return false;
- }
- }
-
- if ( type === "first" ) {
- return true;
- }
-
- node = elem;
-
- /* falls through */
- case "last":
- while ( (node = node.nextSibling) ) {
- if ( node.nodeType === 1 ) {
- return false;
- }
- }
-
- return true;
-
- case "nth":
- first = match[2];
- last = match[3];
-
- if ( first === 1 && last === 0 ) {
- return true;
- }
-
- doneName = match[0];
- parent = elem.parentNode;
-
- if ( parent && (parent[ expando ] !== doneName || !elem.nodeIndex) ) {
- count = 0;
-
- for ( node = parent.firstChild; node; node = node.nextSibling ) {
- if ( node.nodeType === 1 ) {
- node.nodeIndex = ++count;
- }
- }
-
- parent[ expando ] = doneName;
- }
-
- diff = elem.nodeIndex - last;
-
- if ( first === 0 ) {
- return diff === 0;
-
- } else {
- return ( diff % first === 0 && diff / first >= 0 );
- }
- }
- },
-
- ID: function( elem, match ) {
- return elem.nodeType === 1 && elem.getAttribute("id") === match;
- },
-
- TAG: function( elem, match ) {
- return (match === "*" && elem.nodeType === 1) || !!elem.nodeName && elem.nodeName.toLowerCase() === match;
- },
-
- CLASS: function( elem, match ) {
- return (" " + (elem.className || elem.getAttribute("class")) + " ")
- .indexOf( match ) > -1;
- },
-
- ATTR: function( elem, match ) {
- var name = match[1],
- result = Sizzle.attr ?
- Sizzle.attr( elem, name ) :
- Expr.attrHandle[ name ] ?
- Expr.attrHandle[ name ]( elem ) :
- elem[ name ] != null ?
- elem[ name ] :
- elem.getAttribute( name ),
- value = result + "",
- type = match[2],
- check = match[4];
-
- return result == null ?
- type === "!=" :
- !type && Sizzle.attr ?
- result != null :
- type === "=" ?
- value === check :
- type === "*=" ?
- value.indexOf(check) >= 0 :
- type === "~=" ?
- (" " + value + " ").indexOf(check) >= 0 :
- !check ?
- value && result !== false :
- type === "!=" ?
- value !== check :
- type === "^=" ?
- value.indexOf(check) === 0 :
- type === "$=" ?
- value.substr(value.length - check.length) === check :
- type === "|=" ?
- value === check || value.substr(0, check.length + 1) === check + "-" :
- false;
- },
-
- POS: function( elem, match, i, array ) {
- var name = match[2],
- filter = Expr.setFilters[ name ];
-
- if ( filter ) {
- return filter( elem, i, match, array );
- }
- }
- }
-};
-
-var origPOS = Expr.match.POS,
- fescape = function(all, num){
- return "\\" + (num - 0 + 1);
- };
-
-for ( var type in Expr.match ) {
- Expr.match[ type ] = new RegExp( Expr.match[ type ].source + (/(?![^\[]*\])(?![^\(]*\))/.source) );
- Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, fescape) );
-}
-// Expose origPOS
-// "global" as in regardless of relation to brackets/parens
-Expr.match.globalPOS = origPOS;
-
-var makeArray = function( array, results ) {
- array = Array.prototype.slice.call( array, 0 );
-
- if ( results ) {
- results.push.apply( results, array );
- return results;
- }
-
- return array;
-};
-
-// Perform a simple check to determine if the browser is capable of
-// converting a NodeList to an array using builtin methods.
-// Also verifies that the returned array holds DOM nodes
-// (which is not the case in the Blackberry browser)
-try {
- Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType;
-
-// Provide a fallback method if it does not work
-} catch( e ) {
- makeArray = function( array, results ) {
- var i = 0,
- ret = results || [];
-
- if ( toString.call(array) === "[object Array]" ) {
- Array.prototype.push.apply( ret, array );
-
- } else {
- if ( typeof array.length === "number" ) {
- for ( var l = array.length; i < l; i++ ) {
- ret.push( array[i] );
- }
-
- } else {
- for ( ; array[i]; i++ ) {
- ret.push( array[i] );
- }
- }
- }
-
- return ret;
- };
-}
-
-var sortOrder, siblingCheck;
-
-if ( document.documentElement.compareDocumentPosition ) {
- sortOrder = function( a, b ) {
- if ( a === b ) {
- hasDuplicate = true;
- return 0;
- }
-
- if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) {
- return a.compareDocumentPosition ? -1 : 1;
- }
-
- return a.compareDocumentPosition(b) & 4 ? -1 : 1;
- };
-
-} else {
- sortOrder = function( a, b ) {
- // The nodes are identical, we can exit early
- if ( a === b ) {
- hasDuplicate = true;
- return 0;
-
- // Fallback to using sourceIndex (in IE) if it's available on both nodes
- } else if ( a.sourceIndex && b.sourceIndex ) {
- return a.sourceIndex - b.sourceIndex;
- }
-
- var al, bl,
- ap = [],
- bp = [],
- aup = a.parentNode,
- bup = b.parentNode,
- cur = aup;
-
- // If the nodes are siblings (or identical) we can do a quick check
- if ( aup === bup ) {
- return siblingCheck( a, b );
-
- // If no parents were found then the nodes are disconnected
- } else if ( !aup ) {
- return -1;
-
- } else if ( !bup ) {
- return 1;
- }
-
- // Otherwise they're somewhere else in the tree so we need
- // to build up a full list of the parentNodes for comparison
- while ( cur ) {
- ap.unshift( cur );
- cur = cur.parentNode;
- }
-
- cur = bup;
-
- while ( cur ) {
- bp.unshift( cur );
- cur = cur.parentNode;
- }
-
- al = ap.length;
- bl = bp.length;
-
- // Start walking down the tree looking for a discrepancy
- for ( var i = 0; i < al && i < bl; i++ ) {
- if ( ap[i] !== bp[i] ) {
- return siblingCheck( ap[i], bp[i] );
- }
- }
-
- // We ended someplace up the tree so do a sibling check
- return i === al ?
- siblingCheck( a, bp[i], -1 ) :
- siblingCheck( ap[i], b, 1 );
- };
-
- siblingCheck = function( a, b, ret ) {
- if ( a === b ) {
- return ret;
- }
-
- var cur = a.nextSibling;
-
- while ( cur ) {
- if ( cur === b ) {
- return -1;
- }
-
- cur = cur.nextSibling;
- }
-
- return 1;
- };
-}
-
-// Check to see if the browser returns elements by name when
-// querying by getElementById (and provide a workaround)
-(function(){
- // We're going to inject a fake input element with a specified name
- var form = document.createElement("div"),
- id = "script" + (new Date()).getTime(),
- root = document.documentElement;
-
- form.innerHTML = "<a name='" + id + "'/>";
-
- // Inject it into the root element, check its status, and remove it quickly
- root.insertBefore( form, root.firstChild );
-
- // The workaround has to do additional checks after a getElementById
- // Which slows things down for other browsers (hence the branching)
- if ( document.getElementById( id ) ) {
- Expr.find.ID = function( match, context, isXML ) {
- if ( typeof context.getElementById !== "undefined" && !isXML ) {
- var m = context.getElementById(match[1]);
-
- return m ?
- m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ?
- [m] :
- undefined :
- [];
- }
- };
-
- Expr.filter.ID = function( elem, match ) {
- var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
-
- return elem.nodeType === 1 && node && node.nodeValue === match;
- };
- }
-
- root.removeChild( form );
-
- // release memory in IE
- root = form = null;
-})();
-
-(function(){
- // Check to see if the browser returns only elements
- // when doing getElementsByTagName("*")
-
- // Create a fake element
- var div = document.createElement("div");
- div.appendChild( document.createComment("") );
-
- // Make sure no comments are found
- if ( div.getElementsByTagName("*").length > 0 ) {
- Expr.find.TAG = function( match, context ) {
- var results = context.getElementsByTagName( match[1] );
-
- // Filter out possible comments
- if ( match[1] === "*" ) {
- var tmp = [];
-
- for ( var i = 0; results[i]; i++ ) {
- if ( results[i].nodeType === 1 ) {
- tmp.push( results[i] );
- }
- }
-
- results = tmp;
- }
-
- return results;
- };
- }
-
- // Check to see if an attribute returns normalized href attributes
- div.innerHTML = "<a href='#'></a>";
-
- if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" &&
- div.firstChild.getAttribute("href") !== "#" ) {
-
- Expr.attrHandle.href = function( elem ) {
- return elem.getAttribute( "href", 2 );
- };
- }
-
- // release memory in IE
- div = null;
-})();
-
-if ( document.querySelectorAll ) {
- (function(){
- var oldSizzle = Sizzle,
- div = document.createElement("div"),
- id = "__sizzle__";
-
- div.innerHTML = "<p class='TEST'></p>";
-
- // Safari can't handle uppercase or unicode characters when
- // in quirks mode.
- if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {
- return;
- }
-
- Sizzle = function( query, context, extra, seed ) {
- context = context || document;
-
- // Only use querySelectorAll on non-XML documents
- // (ID selectors don't work in non-HTML documents)
- if ( !seed && !Sizzle.isXML(context) ) {
- // See if we find a selector to speed up
- var match = /^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec( query );
-
- if ( match && (context.nodeType === 1 || context.nodeType === 9) ) {
- // Speed-up: Sizzle("TAG")
- if ( match[1] ) {
- return makeArray( context.getElementsByTagName( query ), extra );
-
- // Speed-up: Sizzle(".CLASS")
- } else if ( match[2] && Expr.find.CLASS && context.getElementsByClassName ) {
- return makeArray( context.getElementsByClassName( match[2] ), extra );
- }
- }
-
- if ( context.nodeType === 9 ) {
- // Speed-up: Sizzle("body")
- // The body element only exists once, optimize finding it
- if ( query === "body" && context.body ) {
- return makeArray( [ context.body ], extra );
-
- // Speed-up: Sizzle("#ID")
- } else if ( match && match[3] ) {
- var elem = context.getElementById( match[3] );
-
- // Check parentNode to catch when Blackberry 4.6 returns
- // nodes that are no longer in the document #6963
- if ( elem && elem.parentNode ) {
- // Handle the case where IE and Opera return items
- // by name instead of ID
- if ( elem.id === match[3] ) {
- return makeArray( [ elem ], extra );
- }
-
- } else {
- return makeArray( [], extra );
- }
- }
-
- try {
- return makeArray( context.querySelectorAll(query), extra );
- } catch(qsaError) {}
-
- // qSA works strangely on Element-rooted queries
- // We can work around this by specifying an extra ID on the root
- // and working up from there (Thanks to Andrew Dupont for the technique)
- // IE 8 doesn't work on object elements
- } else if ( context.nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
- var oldContext = context,
- old = context.getAttribute( "id" ),
- nid = old || id,
- hasParent = context.parentNode,
- relativeHierarchySelector = /^\s*[+~]/.test( query );
-
- if ( !old ) {
- context.setAttribute( "id", nid );
- } else {
- nid = nid.replace( /'/g, "\\$&" );
- }
- if ( relativeHierarchySelector && hasParent ) {
- context = context.parentNode;
- }
-
- try {
- if ( !relativeHierarchySelector || hasParent ) {
- return makeArray( context.querySelectorAll( "[id='" + nid + "'] " + query ), extra );
- }
-
- } catch(pseudoError) {
- } finally {
- if ( !old ) {
- oldContext.removeAttribute( "id" );
- }
- }
- }
- }
-
- return oldSizzle(query, context, extra, seed);
- };
-
- for ( var prop in oldSizzle ) {
- Sizzle[ prop ] = oldSizzle[ prop ];
- }
-
- // release memory in IE
- div = null;
- })();
-}
-
-(function(){
- var html = document.documentElement,
- matches = html.matchesSelector || html.mozMatchesSelector || html.webkitMatchesSelector || html.msMatchesSelector;
-
- if ( matches ) {
- // Check to see if it's possible to do matchesSelector
- // on a disconnected node (IE 9 fails this)
- var disconnectedMatch = !matches.call( document.createElement( "div" ), "div" ),
- pseudoWorks = false;
-
- try {
- // This should fail with an exception
- // Gecko does not error, returns false instead
- matches.call( document.documentElement, "[test!='']:sizzle" );
-
- } catch( pseudoError ) {
- pseudoWorks = true;
- }
-
- Sizzle.matchesSelector = function( node, expr ) {
- // Make sure that attribute selectors are quoted
- expr = expr.replace(/\=\s*([^'"\]]*)\s*\]/g, "='$1']");
-
- if ( !Sizzle.isXML( node ) ) {
- try {
- if ( pseudoWorks || !Expr.match.PSEUDO.test( expr ) && !/!=/.test( expr ) ) {
- var ret = matches.call( node, expr );
-
- // IE 9's matchesSelector returns false on disconnected nodes
- if ( ret || !disconnectedMatch ||
- // As well, disconnected nodes are said to be in a document
- // fragment in IE 9, so check for that
- node.document && node.document.nodeType !== 11 ) {
- return ret;
- }
- }
- } catch(e) {}
- }
-
- return Sizzle(expr, null, null, [node]).length > 0;
- };
- }
-})();
-
-(function(){
- var div = document.createElement("div");
-
- div.innerHTML = "<div class='test e'></div><div class='test'></div>";
-
- // Opera can't find a second classname (in 9.6)
- // Also, make sure that getElementsByClassName actually exists
- if ( !div.getElementsByClassName || div.getElementsByClassName("e").length === 0 ) {
- return;
- }
-
- // Safari caches class attributes, doesn't catch changes (in 3.2)
- div.lastChild.className = "e";
-
- if ( div.getElementsByClassName("e").length === 1 ) {
- return;
- }
-
- Expr.order.splice(1, 0, "CLASS");
- Expr.find.CLASS = function( match, context, isXML ) {
- if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) {
- return context.getElementsByClassName(match[1]);
- }
- };
-
- // release memory in IE
- div = null;
-})();
-
-function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
- for ( var i = 0, l = checkSet.length; i < l; i++ ) {
- var elem = checkSet[i];
-
- if ( elem ) {
- var match = false;
-
- elem = elem[dir];
-
- while ( elem ) {
- if ( elem[ expando ] === doneName ) {
- match = checkSet[elem.sizset];
- break;
- }
-
- if ( elem.nodeType === 1 && !isXML ){
- elem[ expando ] = doneName;
- elem.sizset = i;
- }
-
- if ( elem.nodeName.toLowerCase() === cur ) {
- match = elem;
- break;
- }
-
- elem = elem[dir];
- }
-
- checkSet[i] = match;
- }
- }
-}
-
-function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
- for ( var i = 0, l = checkSet.length; i < l; i++ ) {
- var elem = checkSet[i];
-
- if ( elem ) {
- var match = false;
-
- elem = elem[dir];
-
- while ( elem ) {
- if ( elem[ expando ] === doneName ) {
- match = checkSet[elem.sizset];
- break;
- }
-
- if ( elem.nodeType === 1 ) {
- if ( !isXML ) {
- elem[ expando ] = doneName;
- elem.sizset = i;
- }
-
- if ( typeof cur !== "string" ) {
- if ( elem === cur ) {
- match = true;
- break;
- }
-
- } else if ( Sizzle.filter( cur, [elem] ).length > 0 ) {
- match = elem;
- break;
- }
- }
-
- elem = elem[dir];
- }
-
- checkSet[i] = match;
- }
- }
-}
-
-if ( document.documentElement.contains ) {
- Sizzle.contains = function( a, b ) {
- return a !== b && (a.contains ? a.contains(b) : true);
- };
-
-} else if ( document.documentElement.compareDocumentPosition ) {
- Sizzle.contains = function( a, b ) {
- return !!(a.compareDocumentPosition(b) & 16);
- };
-
-} else {
- Sizzle.contains = function() {
- return false;
- };
-}
-
-Sizzle.isXML = function( elem ) {
- // documentElement is verified for cases where it doesn't yet exist
- // (such as loading iframes in IE - #4833)
- var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement;
-
- return documentElement ? documentElement.nodeName !== "HTML" : false;
-};
-
-var posProcess = function( selector, context, seed ) {
- var match,
- tmpSet = [],
- later = "",
- root = context.nodeType ? [context] : context;
-
- // Position selectors must be done after the filter
- // And so must :not(positional) so we move all PSEUDOs to the end
- while ( (match = Expr.match.PSEUDO.exec( selector )) ) {
- later += match[0];
- selector = selector.replace( Expr.match.PSEUDO, "" );
- }
-
- selector = Expr.relative[selector] ? selector + "*" : selector;
-
- for ( var i = 0, l = root.length; i < l; i++ ) {
- Sizzle( selector, root[i], tmpSet, seed );
- }
-
- return Sizzle.filter( later, tmpSet );
-};
-
-// EXPOSE
-// Override sizzle attribute retrieval
-Sizzle.attr = jQuery.attr;
-Sizzle.selectors.attrMap = {};
-jQuery.find = Sizzle;
-jQuery.expr = Sizzle.selectors;
-jQuery.expr[":"] = jQuery.expr.filters;
-jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = Sizzle.getText;
-jQuery.isXMLDoc = Sizzle.isXML;
-jQuery.contains = Sizzle.contains;
-
-
-})();
-
-
-var runtil = /Until$/,
- rparentsprev = /^(?:parents|prevUntil|prevAll)/,
- // Note: This RegExp should be improved, or likely pulled from Sizzle
- rmultiselector = /,/,
- isSimple = /^.[^:#\[\.,]*$/,
- slice = Array.prototype.slice,
- POS = jQuery.expr.match.globalPOS,
- // methods guaranteed to produce a unique set when starting from a unique set
- guaranteedUnique = {
- children: true,
- contents: true,
- next: true,
- prev: true
- };
-
-jQuery.fn.extend({
- find: function( selector ) {
- var self = this,
- i, l;
-
- if ( typeof selector !== "string" ) {
- return jQuery( selector ).filter(function() {
- for ( i = 0, l = self.length; i < l; i++ ) {
- if ( jQuery.contains( self[ i ], this ) ) {
- return true;
- }
- }
- });
- }
-
- var ret = this.pushStack( "", "find", selector ),
- length, n, r;
-
- for ( i = 0, l = this.length; i < l; i++ ) {
- length = ret.length;
- jQuery.find( selector, this[i], ret );
-
- if ( i > 0 ) {
- // Make sure that the results are unique
- for ( n = length; n < ret.length; n++ ) {
- for ( r = 0; r < length; r++ ) {
- if ( ret[r] === ret[n] ) {
- ret.splice(n--, 1);
- break;
- }
- }
- }
- }
- }
-
- return ret;
- },
-
- has: function( target ) {
- var targets = jQuery( target );
- return this.filter(function() {
- for ( var i = 0, l = targets.length; i < l; i++ ) {
- if ( jQuery.contains( this, targets[i] ) ) {
- return true;
- }
- }
- });
- },
-
- not: function( selector ) {
- return this.pushStack( winnow(this, selector, false), "not", selector);
- },
-
- filter: function( selector ) {
- return this.pushStack( winnow(this, selector, true), "filter", selector );
- },
-
- is: function( selector ) {
- return !!selector && (
- typeof selector === "string" ?
- // If this is a positional selector, check membership in the returned set
- // so $("p:first").is("p:last") won't return true for a doc with two "p".
- POS.test( selector ) ?
- jQuery( selector, this.context ).index( this[0] ) >= 0 :
- jQuery.filter( selector, this ).length > 0 :
- this.filter( selector ).length > 0 );
- },
-
- closest: function( selectors, context ) {
- var ret = [], i, l, cur = this[0];
-
- // Array (deprecated as of jQuery 1.7)
- if ( jQuery.isArray( selectors ) ) {
- var level = 1;
-
- while ( cur && cur.ownerDocument && cur !== context ) {
- for ( i = 0; i < selectors.length; i++ ) {
-
- if ( jQuery( cur ).is( selectors[ i ] ) ) {
- ret.push({ selector: selectors[ i ], elem: cur, level: level });
- }
- }
-
- cur = cur.parentNode;
- level++;
- }
-
- return ret;
- }
-
- // String
- var pos = POS.test( selectors ) || typeof selectors !== "string" ?
- jQuery( selectors, context || this.context ) :
- 0;
-
- for ( i = 0, l = this.length; i < l; i++ ) {
- cur = this[i];
-
- while ( cur ) {
- if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) {
- ret.push( cur );
- break;
-
- } else {
- cur = cur.parentNode;
- if ( !cur || !cur.ownerDocument || cur === context || cur.nodeType === 11 ) {
- break;
- }
- }
- }
- }
-
- ret = ret.length > 1 ? jQuery.unique( ret ) : ret;
-
- return this.pushStack( ret, "closest", selectors );
- },
-
- // Determine the position of an element within
- // the matched set of elements
- index: function( elem ) {
-
- // No argument, return index in parent
- if ( !elem ) {
- return ( this[0] && this[0].parentNode ) ? this.prevAll().length : -1;
- }
-
- // index in selector
- if ( typeof elem === "string" ) {
- return jQuery.inArray( this[0], jQuery( elem ) );
- }
-
- // Locate the position of the desired element
- return jQuery.inArray(
- // If it receives a jQuery object, the first element is used
- elem.jquery ? elem[0] : elem, this );
- },
-
- add: function( selector, context ) {
- var set = typeof selector === "string" ?
- jQuery( selector, context ) :
- jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ),
- all = jQuery.merge( this.get(), set );
-
- return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ?
- all :
- jQuery.unique( all ) );
- },
-
- andSelf: function() {
- return this.add( this.prevObject );
- }
-});
-
-// A painfully simple check to see if an element is disconnected
-// from a document (should be improved, where feasible).
-function isDisconnected( node ) {
- return !node || !node.parentNode || node.parentNode.nodeType === 11;
-}
-
-jQuery.each({
- parent: function( elem ) {
- var parent = elem.parentNode;
- return parent && parent.nodeType !== 11 ? parent : null;
- },
- parents: function( elem ) {
- return jQuery.dir( elem, "parentNode" );
- },
- parentsUntil: function( elem, i, until ) {
- return jQuery.dir( elem, "parentNode", until );
- },
- next: function( elem ) {
- return jQuery.nth( elem, 2, "nextSibling" );
- },
- prev: function( elem ) {
- return jQuery.nth( elem, 2, "previousSibling" );
- },
- nextAll: function( elem ) {
- return jQuery.dir( elem, "nextSibling" );
- },
- prevAll: function( elem ) {
- return jQuery.dir( elem, "previousSibling" );
- },
- nextUntil: function( elem, i, until ) {
- return jQuery.dir( elem, "nextSibling", until );
- },
- prevUntil: function( elem, i, until ) {
- return jQuery.dir( elem, "previousSibling", until );
- },
- siblings: function( elem ) {
- return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
- },
- children: function( elem ) {
- return jQuery.sibling( elem.firstChild );
- },
- contents: function( elem ) {
- return jQuery.nodeName( elem, "iframe" ) ?
- elem.contentDocument || elem.contentWindow.document :
- jQuery.makeArray( elem.childNodes );
- }
-}, function( name, fn ) {
- jQuery.fn[ name ] = function( until, selector ) {
- var ret = jQuery.map( this, fn, until );
-
- if ( !runtil.test( name ) ) {
- selector = until;
- }
-
- if ( selector && typeof selector === "string" ) {
- ret = jQuery.filter( selector, ret );
- }
-
- ret = this.length > 1 && !guaranteedUnique[ name ] ? jQuery.unique( ret ) : ret;
-
- if ( (this.length > 1 || rmultiselector.test( selector )) && rparentsprev.test( name ) ) {
- ret = ret.reverse();
- }
-
- return this.pushStack( ret, name, slice.call( arguments ).join(",") );
- };
-});
-
-jQuery.extend({
- filter: function( expr, elems, not ) {
- if ( not ) {
- expr = ":not(" + expr + ")";
- }
-
- return elems.length === 1 ?
- jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] :
- jQuery.find.matches(expr, elems);
- },
-
- dir: function( elem, dir, until ) {
- var matched = [],
- cur = elem[ dir ];
-
- while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
- if ( cur.nodeType === 1 ) {
- matched.push( cur );
- }
- cur = cur[dir];
- }
- return matched;
- },
-
- nth: function( cur, result, dir, elem ) {
- result = result || 1;
- var num = 0;
-
- for ( ; cur; cur = cur[dir] ) {
- if ( cur.nodeType === 1 && ++num === result ) {
- break;
- }
- }
-
- return cur;
- },
-
- sibling: function( n, elem ) {
- var r = [];
-
- for ( ; n; n = n.nextSibling ) {
- if ( n.nodeType === 1 && n !== elem ) {
- r.push( n );
- }
- }
-
- return r;
- }
-});
-
-// Implement the identical functionality for filter and not
-function winnow( elements, qualifier, keep ) {
-
- // Can't pass null or undefined to indexOf in Firefox 4
- // Set to 0 to skip string check
- qualifier = qualifier || 0;
-
- if ( jQuery.isFunction( qualifier ) ) {
- return jQuery.grep(elements, function( elem, i ) {
- var retVal = !!qualifier.call( elem, i, elem );
- return retVal === keep;
- });
-
- } else if ( qualifier.nodeType ) {
- return jQuery.grep(elements, function( elem, i ) {
- return ( elem === qualifier ) === keep;
- });
-
- } else if ( typeof qualifier === "string" ) {
- var filtered = jQuery.grep(elements, function( elem ) {
- return elem.nodeType === 1;
- });
-
- if ( isSimple.test( qualifier ) ) {
- return jQuery.filter(qualifier, filtered, !keep);
- } else {
- qualifier = jQuery.filter( qualifier, filtered );
- }
- }
-
- return jQuery.grep(elements, function( elem, i ) {
- return ( jQuery.inArray( elem, qualifier ) >= 0 ) === keep;
- });
-}
-
-
-
-
-function createSafeFragment( document ) {
- var list = nodeNames.split( "|" ),
- safeFrag = document.createDocumentFragment();
-
- if ( safeFrag.createElement ) {
- while ( list.length ) {
- safeFrag.createElement(
- list.pop()
- );
- }
- }
- return safeFrag;
-}
-
-var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" +
- "header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",
- rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
- rleadingWhitespace = /^\s+/,
- rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,
- rtagName = /<([\w:]+)/,
- rtbody = /<tbody/i,
- rhtml = /<|&#?\w+;/,
- rnoInnerhtml = /<(?:script|style)/i,
- rnocache = /<(?:script|object|embed|option|style)/i,
- rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"),
- // checked="checked" or checked
- rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
- rscriptType = /\/(java|ecma)script/i,
- rcleanScript = /^\s*<!(?:\[CDATA\[|\-\-)/,
- wrapMap = {
- option: [ 1, "<select multiple='multiple'>", "</select>" ],
- legend: [ 1, "<fieldset>", "</fieldset>" ],
- thead: [ 1, "<table>", "</table>" ],
- tr: [ 2, "<table><tbody>", "</tbody></table>" ],
- td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
- col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
- area: [ 1, "<map>", "</map>" ],
- _default: [ 0, "", "" ]
- },
- safeFragment = createSafeFragment( document );
-
-wrapMap.optgroup = wrapMap.option;
-wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-wrapMap.th = wrapMap.td;
-
-// IE can't serialize <link> and <script> tags normally
-if ( !jQuery.support.htmlSerialize ) {
- wrapMap._default = [ 1, "div<div>", "</div>" ];
-}
-
-jQuery.fn.extend({
- text: function( value ) {
- return jQuery.access( this, function( value ) {
- return value === undefined ?
- jQuery.text( this ) :
- this.empty().append( ( this[0] && this[0].ownerDocument || document ).createTextNode( value ) );
- }, null, value, arguments.length );
- },
-
- wrapAll: function( html ) {
- if ( jQuery.isFunction( html ) ) {
- return this.each(function(i) {
- jQuery(this).wrapAll( html.call(this, i) );
- });
- }
-
- if ( this[0] ) {
- // The elements to wrap the target around
- var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
-
- if ( this[0].parentNode ) {
- wrap.insertBefore( this[0] );
- }
-
- wrap.map(function() {
- var elem = this;
-
- while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
- elem = elem.firstChild;
- }
-
- return elem;
- }).append( this );
- }
-
- return this;
- },
-
- wrapInner: function( html ) {
- if ( jQuery.isFunction( html ) ) {
- return this.each(function(i) {
- jQuery(this).wrapInner( html.call(this, i) );
- });
- }
-
- return this.each(function() {
- var self = jQuery( this ),
- contents = self.contents();
-
- if ( contents.length ) {
- contents.wrapAll( html );
-
- } else {
- self.append( html );
- }
- });
- },
-
- wrap: function( html ) {
- var isFunction = jQuery.isFunction( html );
-
- return this.each(function(i) {
- jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html );
- });
- },
-
- unwrap: function() {
- return this.parent().each(function() {
- if ( !jQuery.nodeName( this, "body" ) ) {
- jQuery( this ).replaceWith( this.childNodes );
- }
- }).end();
- },
-
- append: function() {
- return this.domManip(arguments, true, function( elem ) {
- if ( this.nodeType === 1 ) {
- this.appendChild( elem );
- }
- });
- },
-
- prepend: function() {
- return this.domManip(arguments, true, function( elem ) {
- if ( this.nodeType === 1 ) {
- this.insertBefore( elem, this.firstChild );
- }
- });
- },
-
- before: function() {
- if ( this[0] && this[0].parentNode ) {
- return this.domManip(arguments, false, function( elem ) {
- this.parentNode.insertBefore( elem, this );
- });
- } else if ( arguments.length ) {
- var set = jQuery.clean( arguments );
- set.push.apply( set, this.toArray() );
- return this.pushStack( set, "before", arguments );
- }
- },
-
- after: function() {
- if ( this[0] && this[0].parentNode ) {
- return this.domManip(arguments, false, function( elem ) {
- this.parentNode.insertBefore( elem, this.nextSibling );
- });
- } else if ( arguments.length ) {
- var set = this.pushStack( this, "after", arguments );
- set.push.apply( set, jQuery.clean(arguments) );
- return set;
- }
- },
-
- // keepData is for internal use only--do not document
- remove: function( selector, keepData ) {
- for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
- if ( !selector || jQuery.filter( selector, [ elem ] ).length ) {
- if ( !keepData && elem.nodeType === 1 ) {
- jQuery.cleanData( elem.getElementsByTagName("*") );
- jQuery.cleanData( [ elem ] );
- }
-
- if ( elem.parentNode ) {
- elem.parentNode.removeChild( elem );
- }
- }
- }
-
- return this;
- },
-
- empty: function() {
- for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
- // Remove element nodes and prevent memory leaks
- if ( elem.nodeType === 1 ) {
- jQuery.cleanData( elem.getElementsByTagName("*") );
- }
-
- // Remove any remaining nodes
- while ( elem.firstChild ) {
- elem.removeChild( elem.firstChild );
- }
- }
-
- return this;
- },
-
- clone: function( dataAndEvents, deepDataAndEvents ) {
- dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
- deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
-
- return this.map( function () {
- return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
- });
- },
-
- html: function( value ) {
- return jQuery.access( this, function( value ) {
- var elem = this[0] || {},
- i = 0,
- l = this.length;
-
- if ( value === undefined ) {
- return elem.nodeType === 1 ?
- elem.innerHTML.replace( rinlinejQuery, "" ) :
- null;
- }
-
-
- if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
- ( jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
- !wrapMap[ ( rtagName.exec( value ) || ["", ""] )[1].toLowerCase() ] ) {
-
- value = value.replace( rxhtmlTag, "<$1></$2>" );
-
- try {
- for (; i < l; i++ ) {
- // Remove element nodes and prevent memory leaks
- elem = this[i] || {};
- if ( elem.nodeType === 1 ) {
- jQuery.cleanData( elem.getElementsByTagName( "*" ) );
- elem.innerHTML = value;
- }
- }
-
- elem = 0;
-
- // If using innerHTML throws an exception, use the fallback method
- } catch(e) {}
- }
-
- if ( elem ) {
- this.empty().append( value );
- }
- }, null, value, arguments.length );
- },
-
- replaceWith: function( value ) {
- if ( this[0] && this[0].parentNode ) {
- // Make sure that the elements are removed from the DOM before they are inserted
- // this can help fix replacing a parent with child elements
- if ( jQuery.isFunction( value ) ) {
- return this.each(function(i) {
- var self = jQuery(this), old = self.html();
- self.replaceWith( value.call( this, i, old ) );
- });
- }
-
- if ( typeof value !== "string" ) {
- value = jQuery( value ).detach();
- }
-
- return this.each(function() {
- var next = this.nextSibling,
- parent = this.parentNode;
-
- jQuery( this ).remove();
-
- if ( next ) {
- jQuery(next).before( value );
- } else {
- jQuery(parent).append( value );
- }
- });
- } else {
- return this.length ?
- this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value ) :
- this;
- }
- },
-
- detach: function( selector ) {
- return this.remove( selector, true );
- },
-
- domManip: function( args, table, callback ) {
- var results, first, fragment, parent,
- value = args[0],
- scripts = [];
-
- // We can't cloneNode fragments that contain checked, in WebKit
- if ( !jQuery.support.checkClone && arguments.length === 3 && typeof value === "string" && rchecked.test( value ) ) {
- return this.each(function() {
- jQuery(this).domManip( args, table, callback, true );
- });
- }
-
- if ( jQuery.isFunction(value) ) {
- return this.each(function(i) {
- var self = jQuery(this);
- args[0] = value.call(this, i, table ? self.html() : undefined);
- self.domManip( args, table, callback );
- });
- }
-
- if ( this[0] ) {
- parent = value && value.parentNode;
-
- // If we're in a fragment, just use that instead of building a new one
- if ( jQuery.support.parentNode && parent && parent.nodeType === 11 && parent.childNodes.length === this.length ) {
- results = { fragment: parent };
-
- } else {
- results = jQuery.buildFragment( args, this, scripts );
- }
-
- fragment = results.fragment;
-
- if ( fragment.childNodes.length === 1 ) {
- first = fragment = fragment.firstChild;
- } else {
- first = fragment.firstChild;
- }
-
- if ( first ) {
- table = table && jQuery.nodeName( first, "tr" );
-
- for ( var i = 0, l = this.length, lastIndex = l - 1; i < l; i++ ) {
- callback.call(
- table ?
- root(this[i], first) :
- this[i],
- // Make sure that we do not leak memory by inadvertently discarding
- // the original fragment (which might have attached data) instead of
- // using it; in addition, use the original fragment object for the last
- // item instead of first because it can end up being emptied incorrectly
- // in certain situations (Bug #8070).
- // Fragments from the fragment cache must always be cloned and never used
- // in place.
- results.cacheable || ( l > 1 && i < lastIndex ) ?
- jQuery.clone( fragment, true, true ) :
- fragment
- );
- }
- }
-
- if ( scripts.length ) {
- jQuery.each( scripts, function( i, elem ) {
- if ( elem.src ) {
- jQuery.ajax({
- type: "GET",
- global: false,
- url: elem.src,
- async: false,
- dataType: "script"
- });
- } else {
- jQuery.globalEval( ( elem.text || elem.textContent || elem.innerHTML || "" ).replace( rcleanScript, "/*$0*/" ) );
- }
-
- if ( elem.parentNode ) {
- elem.parentNode.removeChild( elem );
- }
- });
- }
- }
-
- return this;
- }
-});
-
-function root( elem, cur ) {
- return jQuery.nodeName(elem, "table") ?
- (elem.getElementsByTagName("tbody")[0] ||
- elem.appendChild(elem.ownerDocument.createElement("tbody"))) :
- elem;
-}
-
-function cloneCopyEvent( src, dest ) {
-
- if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
- return;
- }
-
- var type, i, l,
- oldData = jQuery._data( src ),
- curData = jQuery._data( dest, oldData ),
- events = oldData.events;
-
- if ( events ) {
- delete curData.handle;
- curData.events = {};
-
- for ( type in events ) {
- for ( i = 0, l = events[ type ].length; i < l; i++ ) {
- jQuery.event.add( dest, type, events[ type ][ i ] );
- }
- }
- }
-
- // make the cloned public data object a copy from the original
- if ( curData.data ) {
- curData.data = jQuery.extend( {}, curData.data );
- }
-}
-
-function cloneFixAttributes( src, dest ) {
- var nodeName;
-
- // We do not need to do anything for non-Elements
- if ( dest.nodeType !== 1 ) {
- return;
- }
-
- // clearAttributes removes the attributes, which we don't want,
- // but also removes the attachEvent events, which we *do* want
- if ( dest.clearAttributes ) {
- dest.clearAttributes();
- }
-
- // mergeAttributes, in contrast, only merges back on the
- // original attributes, not the events
- if ( dest.mergeAttributes ) {
- dest.mergeAttributes( src );
- }
-
- nodeName = dest.nodeName.toLowerCase();
-
- // IE6-8 fail to clone children inside object elements that use
- // the proprietary classid attribute value (rather than the type
- // attribute) to identify the type of content to display
- if ( nodeName === "object" ) {
- dest.outerHTML = src.outerHTML;
-
- } else if ( nodeName === "input" && (src.type === "checkbox" || src.type === "radio") ) {
- // IE6-8 fails to persist the checked state of a cloned checkbox
- // or radio button. Worse, IE6-7 fail to give the cloned element
- // a checked appearance if the defaultChecked value isn't also set
- if ( src.checked ) {
- dest.defaultChecked = dest.checked = src.checked;
- }
-
- // IE6-7 get confused and end up setting the value of a cloned
- // checkbox/radio button to an empty string instead of "on"
- if ( dest.value !== src.value ) {
- dest.value = src.value;
- }
-
- // IE6-8 fails to return the selected option to the default selected
- // state when cloning options
- } else if ( nodeName === "option" ) {
- dest.selected = src.defaultSelected;
-
- // IE6-8 fails to set the defaultValue to the correct value when
- // cloning other types of input fields
- } else if ( nodeName === "input" || nodeName === "textarea" ) {
- dest.defaultValue = src.defaultValue;
-
- // IE blanks contents when cloning scripts
- } else if ( nodeName === "script" && dest.text !== src.text ) {
- dest.text = src.text;
- }
-
- // Event data gets referenced instead of copied if the expando
- // gets copied too
- dest.removeAttribute( jQuery.expando );
-
- // Clear flags for bubbling special change/submit events, they must
- // be reattached when the newly cloned events are first activated
- dest.removeAttribute( "_submit_attached" );
- dest.removeAttribute( "_change_attached" );
-}
-
-jQuery.buildFragment = function( args, nodes, scripts ) {
- var fragment, cacheable, cacheresults, doc,
- first = args[ 0 ];
-
- // nodes may contain either an explicit document object,
- // a jQuery collection or context object.
- // If nodes[0] contains a valid object to assign to doc
- if ( nodes && nodes[0] ) {
- doc = nodes[0].ownerDocument || nodes[0];
- }
-
- // Ensure that an attr object doesn't incorrectly stand in as a document object
- // Chrome and Firefox seem to allow this to occur and will throw exception
- // Fixes #8950
- if ( !doc.createDocumentFragment ) {
- doc = document;
- }
-
- // Only cache "small" (1/2 KB) HTML strings that are associated with the main document
- // Cloning options loses the selected state, so don't cache them
- // IE 6 doesn't like it when you put <object> or <embed> elements in a fragment
- // Also, WebKit does not clone 'checked' attributes on cloneNode, so don't cache
- // Lastly, IE6,7,8 will not correctly reuse cached fragments that were created from unknown elems #10501
- if ( args.length === 1 && typeof first === "string" && first.length < 512 && doc === document &&
- first.charAt(0) === "<" && !rnocache.test( first ) &&
- (jQuery.support.checkClone || !rchecked.test( first )) &&
- (jQuery.support.html5Clone || !rnoshimcache.test( first )) ) {
-
- cacheable = true;
-
- cacheresults = jQuery.fragments[ first ];
- if ( cacheresults && cacheresults !== 1 ) {
- fragment = cacheresults;
- }
- }
-
- if ( !fragment ) {
- fragment = doc.createDocumentFragment();
- jQuery.clean( args, doc, fragment, scripts );
- }
-
- if ( cacheable ) {
- jQuery.fragments[ first ] = cacheresults ? fragment : 1;
- }
-
- return { fragment: fragment, cacheable: cacheable };
-};
-
-jQuery.fragments = {};
-
-jQuery.each({
- appendTo: "append",
- prependTo: "prepend",
- insertBefore: "before",
- insertAfter: "after",
- replaceAll: "replaceWith"
-}, function( name, original ) {
- jQuery.fn[ name ] = function( selector ) {
- var ret = [],
- insert = jQuery( selector ),
- parent = this.length === 1 && this[0].parentNode;
-
- if ( parent && parent.nodeType === 11 && parent.childNodes.length === 1 && insert.length === 1 ) {
- insert[ original ]( this[0] );
- return this;
-
- } else {
- for ( var i = 0, l = insert.length; i < l; i++ ) {
- var elems = ( i > 0 ? this.clone(true) : this ).get();
- jQuery( insert[i] )[ original ]( elems );
- ret = ret.concat( elems );
- }
-
- return this.pushStack( ret, name, insert.selector );
- }
- };
-});
-
-function getAll( elem ) {
- if ( typeof elem.getElementsByTagName !== "undefined" ) {
- return elem.getElementsByTagName( "*" );
-
- } else if ( typeof elem.querySelectorAll !== "undefined" ) {
- return elem.querySelectorAll( "*" );
-
- } else {
- return [];
- }
-}
-
-// Used in clean, fixes the defaultChecked property
-function fixDefaultChecked( elem ) {
- if ( elem.type === "checkbox" || elem.type === "radio" ) {
- elem.defaultChecked = elem.checked;
- }
-}
-// Finds all inputs and passes them to fixDefaultChecked
-function findInputs( elem ) {
- var nodeName = ( elem.nodeName || "" ).toLowerCase();
- if ( nodeName === "input" ) {
- fixDefaultChecked( elem );
- // Skip scripts, get other children
- } else if ( nodeName !== "script" && typeof elem.getElementsByTagName !== "undefined" ) {
- jQuery.grep( elem.getElementsByTagName("input"), fixDefaultChecked );
- }
-}
-
-// Derived From: http://www.iecss.com/shimprove/javascript/shimprove.1-0-1.js
-function shimCloneNode( elem ) {
- var div = document.createElement( "div" );
- safeFragment.appendChild( div );
-
- div.innerHTML = elem.outerHTML;
- return div.firstChild;
-}
-
-jQuery.extend({
- clone: function( elem, dataAndEvents, deepDataAndEvents ) {
- var srcElements,
- destElements,
- i,
- // IE<=8 does not properly clone detached, unknown element nodes
- clone = jQuery.support.html5Clone || jQuery.isXMLDoc(elem) || !rnoshimcache.test( "<" + elem.nodeName + ">" ) ?
- elem.cloneNode( true ) :
- shimCloneNode( elem );
-
- if ( (!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) &&
- (elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) {
- // IE copies events bound via attachEvent when using cloneNode.
- // Calling detachEvent on the clone will also remove the events
- // from the original. In order to get around this, we use some
- // proprietary methods to clear the events. Thanks to MooTools
- // guys for this hotness.
-
- cloneFixAttributes( elem, clone );
-
- // Using Sizzle here is crazy slow, so we use getElementsByTagName instead
- srcElements = getAll( elem );
- destElements = getAll( clone );
-
- // Weird iteration because IE will replace the length property
- // with an element if you are cloning the body and one of the
- // elements on the page has a name or id of "length"
- for ( i = 0; srcElements[i]; ++i ) {
- // Ensure that the destination node is not null; Fixes #9587
- if ( destElements[i] ) {
- cloneFixAttributes( srcElements[i], destElements[i] );
- }
- }
- }
-
- // Copy the events from the original to the clone
- if ( dataAndEvents ) {
- cloneCopyEvent( elem, clone );
-
- if ( deepDataAndEvents ) {
- srcElements = getAll( elem );
- destElements = getAll( clone );
-
- for ( i = 0; srcElements[i]; ++i ) {
- cloneCopyEvent( srcElements[i], destElements[i] );
- }
- }
- }
-
- srcElements = destElements = null;
-
- // Return the cloned set
- return clone;
- },
-
- clean: function( elems, context, fragment, scripts ) {
- var checkScriptType, script, j,
- ret = [];
-
- context = context || document;
-
- // !context.createElement fails in IE with an error but returns typeof 'object'
- if ( typeof context.createElement === "undefined" ) {
- context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
- }
-
- for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
- if ( typeof elem === "number" ) {
- elem += "";
- }
-
- if ( !elem ) {
- continue;
- }
-
- // Convert html string into DOM nodes
- if ( typeof elem === "string" ) {
- if ( !rhtml.test( elem ) ) {
- elem = context.createTextNode( elem );
- } else {
- // Fix "XHTML"-style tags in all browsers
- elem = elem.replace(rxhtmlTag, "<$1></$2>");
-
- // Trim whitespace, otherwise indexOf won't work as expected
- var tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase(),
- wrap = wrapMap[ tag ] || wrapMap._default,
- depth = wrap[0],
- div = context.createElement("div"),
- safeChildNodes = safeFragment.childNodes,
- remove;
-
- // Append wrapper element to unknown element safe doc fragment
- if ( context === document ) {
- // Use the fragment we've already created for this document
- safeFragment.appendChild( div );
- } else {
- // Use a fragment created with the owner document
- createSafeFragment( context ).appendChild( div );
- }
-
- // Go to html and back, then peel off extra wrappers
- div.innerHTML = wrap[1] + elem + wrap[2];
-
- // Move to the right depth
- while ( depth-- ) {
- div = div.lastChild;
- }
-
- // Remove IE's autoinserted <tbody> from table fragments
- if ( !jQuery.support.tbody ) {
-
- // String was a <table>, *may* have spurious <tbody>
- var hasBody = rtbody.test(elem),
- tbody = tag === "table" && !hasBody ?
- div.firstChild && div.firstChild.childNodes :
-
- // String was a bare <thead> or <tfoot>
- wrap[1] === "<table>" && !hasBody ?
- div.childNodes :
- [];
-
- for ( j = tbody.length - 1; j >= 0 ; --j ) {
- if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length ) {
- tbody[ j ].parentNode.removeChild( tbody[ j ] );
- }
- }
- }
-
- // IE completely kills leading whitespace when innerHTML is used
- if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
- div.insertBefore( context.createTextNode( rleadingWhitespace.exec(elem)[0] ), div.firstChild );
- }
-
- elem = div.childNodes;
-
- // Clear elements from DocumentFragment (safeFragment or otherwise)
- // to avoid hoarding elements. Fixes #11356
- if ( div ) {
- div.parentNode.removeChild( div );
-
- // Guard against -1 index exceptions in FF3.6
- if ( safeChildNodes.length > 0 ) {
- remove = safeChildNodes[ safeChildNodes.length - 1 ];
-
- if ( remove && remove.parentNode ) {
- remove.parentNode.removeChild( remove );
- }
- }
- }
- }
- }
-
- // Resets defaultChecked for any radios and checkboxes
- // about to be appended to the DOM in IE 6/7 (#8060)
- var len;
- if ( !jQuery.support.appendChecked ) {
- if ( elem[0] && typeof (len = elem.length) === "number" ) {
- for ( j = 0; j < len; j++ ) {
- findInputs( elem[j] );
- }
- } else {
- findInputs( elem );
- }
- }
-
- if ( elem.nodeType ) {
- ret.push( elem );
- } else {
- ret = jQuery.merge( ret, elem );
- }
- }
-
- if ( fragment ) {
- checkScriptType = function( elem ) {
- return !elem.type || rscriptType.test( elem.type );
- };
- for ( i = 0; ret[i]; i++ ) {
- script = ret[i];
- if ( scripts && jQuery.nodeName( script, "script" ) && (!script.type || rscriptType.test( script.type )) ) {
- scripts.push( script.parentNode ? script.parentNode.removeChild( script ) : script );
-
- } else {
- if ( script.nodeType === 1 ) {
- var jsTags = jQuery.grep( script.getElementsByTagName( "script" ), checkScriptType );
-
- ret.splice.apply( ret, [i + 1, 0].concat( jsTags ) );
- }
- fragment.appendChild( script );
- }
- }
- }
-
- return ret;
- },
-
- cleanData: function( elems ) {
- var data, id,
- cache = jQuery.cache,
- special = jQuery.event.special,
- deleteExpando = jQuery.support.deleteExpando;
-
- for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
- if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
- continue;
- }
-
- id = elem[ jQuery.expando ];
-
- if ( id ) {
- data = cache[ id ];
-
- if ( data && data.events ) {
- for ( var type in data.events ) {
- if ( special[ type ] ) {
- jQuery.event.remove( elem, type );
-
- // This is a shortcut to avoid jQuery.event.remove's overhead
- } else {
- jQuery.removeEvent( elem, type, data.handle );
- }
- }
-
- // Null the DOM reference to avoid IE6/7/8 leak (#7054)
- if ( data.handle ) {
- data.handle.elem = null;
- }
- }
-
- if ( deleteExpando ) {
- delete elem[ jQuery.expando ];
-
- } else if ( elem.removeAttribute ) {
- elem.removeAttribute( jQuery.expando );
- }
-
- delete cache[ id ];
- }
- }
- }
-});
-
-
-
-
-var ralpha = /alpha\([^)]*\)/i,
- ropacity = /opacity=([^)]*)/,
- // fixed for IE9, see #8346
- rupper = /([A-Z]|^ms)/g,
- rnum = /^[\-+]?(?:\d*\.)?\d+$/i,
- rnumnonpx = /^-?(?:\d*\.)?\d+(?!px)[^\d\s]+$/i,
- rrelNum = /^([\-+])=([\-+.\de]+)/,
- rmargin = /^margin/,
-
- cssShow = { position: "absolute", visibility: "hidden", display: "block" },
-
- // order is important!
- cssExpand = [ "Top", "Right", "Bottom", "Left" ],
-
- curCSS,
-
- getComputedStyle,
- currentStyle;
-
-jQuery.fn.css = function( name, value ) {
- return jQuery.access( this, function( elem, name, value ) {
- return value !== undefined ?
- jQuery.style( elem, name, value ) :
- jQuery.css( elem, name );
- }, name, value, arguments.length > 1 );
-};
-
-jQuery.extend({
- // Add in style property hooks for overriding the default
- // behavior of getting and setting a style property
- cssHooks: {
- opacity: {
- get: function( elem, computed ) {
- if ( computed ) {
- // We should always get a number back from opacity
- var ret = curCSS( elem, "opacity" );
- return ret === "" ? "1" : ret;
-
- } else {
- return elem.style.opacity;
- }
- }
- }
- },
-
- // Exclude the following css properties to add px
- cssNumber: {
- "fillOpacity": true,
- "fontWeight": true,
- "lineHeight": true,
- "opacity": true,
- "orphans": true,
- "widows": true,
- "zIndex": true,
- "zoom": true
- },
-
- // Add in properties whose names you wish to fix before
- // setting or getting the value
- cssProps: {
- // normalize float css property
- "float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
- },
-
- // Get and set the style property on a DOM Node
- style: function( elem, name, value, extra ) {
- // Don't set styles on text and comment nodes
- if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
- return;
- }
-
- // Make sure that we're working with the right name
- var ret, type, origName = jQuery.camelCase( name ),
- style = elem.style, hooks = jQuery.cssHooks[ origName ];
-
- name = jQuery.cssProps[ origName ] || origName;
-
- // Check if we're setting a value
- if ( value !== undefined ) {
- type = typeof value;
-
- // convert relative number strings (+= or -=) to relative numbers. #7345
- if ( type === "string" && (ret = rrelNum.exec( value )) ) {
- value = ( +( ret[1] + 1) * +ret[2] ) + parseFloat( jQuery.css( elem, name ) );
- // Fixes bug #9237
- type = "number";
- }
-
- // Make sure that NaN and null values aren't set. See: #7116
- if ( value == null || type === "number" && isNaN( value ) ) {
- return;
- }
-
- // If a number was passed in, add 'px' to the (except for certain CSS properties)
- if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
- value += "px";
- }
-
- // If a hook was provided, use that value, otherwise just set the specified value
- if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value )) !== undefined ) {
- // Wrapped to prevent IE from throwing errors when 'invalid' values are provided
- // Fixes bug #5509
- try {
- style[ name ] = value;
- } catch(e) {}
- }
-
- } else {
- // If a hook was provided get the non-computed value from there
- if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
- return ret;
- }
-
- // Otherwise just get the value from the style object
- return style[ name ];
- }
- },
-
- css: function( elem, name, extra ) {
- var ret, hooks;
-
- // Make sure that we're working with the right name
- name = jQuery.camelCase( name );
- hooks = jQuery.cssHooks[ name ];
- name = jQuery.cssProps[ name ] || name;
-
- // cssFloat needs a special treatment
- if ( name === "cssFloat" ) {
- name = "float";
- }
-
- // If a hook was provided get the computed value from there
- if ( hooks && "get" in hooks && (ret = hooks.get( elem, true, extra )) !== undefined ) {
- return ret;
-
- // Otherwise, if a way to get the computed value exists, use that
- } else if ( curCSS ) {
- return curCSS( elem, name );
- }
- },
-
- // A method for quickly swapping in/out CSS properties to get correct calculations
- swap: function( elem, options, callback ) {
- var old = {},
- ret, name;
-
- // Remember the old values, and insert the new ones
- for ( name in options ) {
- old[ name ] = elem.style[ name ];
- elem.style[ name ] = options[ name ];
- }
-
- ret = callback.call( elem );
-
- // Revert the old values
- for ( name in options ) {
- elem.style[ name ] = old[ name ];
- }
-
- return ret;
- }
-});
-
-// DEPRECATED in 1.3, Use jQuery.css() instead
-jQuery.curCSS = jQuery.css;
-
-if ( document.defaultView && document.defaultView.getComputedStyle ) {
- getComputedStyle = function( elem, name ) {
- var ret, defaultView, computedStyle, width,
- style = elem.style;
-
- name = name.replace( rupper, "-$1" ).toLowerCase();
-
- if ( (defaultView = elem.ownerDocument.defaultView) &&
- (computedStyle = defaultView.getComputedStyle( elem, null )) ) {
-
- ret = computedStyle.getPropertyValue( name );
- if ( ret === "" && !jQuery.contains( elem.ownerDocument.documentElement, elem ) ) {
- ret = jQuery.style( elem, name );
- }
- }
-
- // A tribute to the "awesome hack by Dean Edwards"
- // WebKit uses "computed value (percentage if specified)" instead of "used value" for margins
- // which is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
- if ( !jQuery.support.pixelMargin && computedStyle && rmargin.test( name ) && rnumnonpx.test( ret ) ) {
- width = style.width;
- style.width = ret;
- ret = computedStyle.width;
- style.width = width;
- }
-
- return ret;
- };
-}
-
-if ( document.documentElement.currentStyle ) {
- currentStyle = function( elem, name ) {
- var left, rsLeft, uncomputed,
- ret = elem.currentStyle && elem.currentStyle[ name ],
- style = elem.style;
-
- // Avoid setting ret to empty string here
- // so we don't default to auto
- if ( ret == null && style && (uncomputed = style[ name ]) ) {
- ret = uncomputed;
- }
-
- // From the awesome hack by Dean Edwards
- // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
-
- // If we're not dealing with a regular pixel number
- // but a number that has a weird ending, we need to convert it to pixels
- if ( rnumnonpx.test( ret ) ) {
-
- // Remember the original values
- left = style.left;
- rsLeft = elem.runtimeStyle && elem.runtimeStyle.left;
-
- // Put in the new values to get a computed value out
- if ( rsLeft ) {
- elem.runtimeStyle.left = elem.currentStyle.left;
- }
- style.left = name === "fontSize" ? "1em" : ret;
- ret = style.pixelLeft + "px";
-
- // Revert the changed values
- style.left = left;
- if ( rsLeft ) {
- elem.runtimeStyle.left = rsLeft;
- }
- }
-
- return ret === "" ? "auto" : ret;
- };
-}
-
-curCSS = getComputedStyle || currentStyle;
-
-function getWidthOrHeight( elem, name, extra ) {
-
- // Start with offset property
- var val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
- i = name === "width" ? 1 : 0,
- len = 4;
-
- if ( val > 0 ) {
- if ( extra !== "border" ) {
- for ( ; i < len; i += 2 ) {
- if ( !extra ) {
- val -= parseFloat( jQuery.css( elem, "padding" + cssExpand[ i ] ) ) || 0;
- }
- if ( extra === "margin" ) {
- val += parseFloat( jQuery.css( elem, extra + cssExpand[ i ] ) ) || 0;
- } else {
- val -= parseFloat( jQuery.css( elem, "border" + cssExpand[ i ] + "Width" ) ) || 0;
- }
- }
- }
-
- return val + "px";
- }
-
- // Fall back to computed then uncomputed css if necessary
- val = curCSS( elem, name );
- if ( val < 0 || val == null ) {
- val = elem.style[ name ];
- }
-
- // Computed unit is not pixels. Stop here and return.
- if ( rnumnonpx.test(val) ) {
- return val;
- }
-
- // Normalize "", auto, and prepare for extra
- val = parseFloat( val ) || 0;
-
- // Add padding, border, margin
- if ( extra ) {
- for ( ; i < len; i += 2 ) {
- val += parseFloat( jQuery.css( elem, "padding" + cssExpand[ i ] ) ) || 0;
- if ( extra !== "padding" ) {
- val += parseFloat( jQuery.css( elem, "border" + cssExpand[ i ] + "Width" ) ) || 0;
- }
- if ( extra === "margin" ) {
- val += parseFloat( jQuery.css( elem, extra + cssExpand[ i ]) ) || 0;
- }
- }
- }
-
- return val + "px";
-}
-
-jQuery.each([ "height", "width" ], function( i, name ) {
- jQuery.cssHooks[ name ] = {
- get: function( elem, computed, extra ) {
- if ( computed ) {
- if ( elem.offsetWidth !== 0 ) {
- return getWidthOrHeight( elem, name, extra );
- } else {
- return jQuery.swap( elem, cssShow, function() {
- return getWidthOrHeight( elem, name, extra );
- });
- }
- }
- },
-
- set: function( elem, value ) {
- return rnum.test( value ) ?
- value + "px" :
- value;
- }
- };
-});
-
-if ( !jQuery.support.opacity ) {
- jQuery.cssHooks.opacity = {
- get: function( elem, computed ) {
- // IE uses filters for opacity
- return ropacity.test( (computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "" ) ?
- ( parseFloat( RegExp.$1 ) / 100 ) + "" :
- computed ? "1" : "";
- },
-
- set: function( elem, value ) {
- var style = elem.style,
- currentStyle = elem.currentStyle,
- opacity = jQuery.isNumeric( value ) ? "alpha(opacity=" + value * 100 + ")" : "",
- filter = currentStyle && currentStyle.filter || style.filter || "";
-
- // IE has trouble with opacity if it does not have layout
- // Force it by setting the zoom level
- style.zoom = 1;
-
- // if setting opacity to 1, and no other filters exist - attempt to remove filter attribute #6652
- if ( value >= 1 && jQuery.trim( filter.replace( ralpha, "" ) ) === "" ) {
-
- // Setting style.filter to null, "" & " " still leave "filter:" in the cssText
- // if "filter:" is present at all, clearType is disabled, we want to avoid this
- // style.removeAttribute is IE Only, but so apparently is this code path...
- style.removeAttribute( "filter" );
-
- // if there there is no filter style applied in a css rule, we are done
- if ( currentStyle && !currentStyle.filter ) {
- return;
- }
- }
-
- // otherwise, set new filter values
- style.filter = ralpha.test( filter ) ?
- filter.replace( ralpha, opacity ) :
- filter + " " + opacity;
- }
- };
-}
-
-jQuery(function() {
- // This hook cannot be added until DOM ready because the support test
- // for it is not run until after DOM ready
- if ( !jQuery.support.reliableMarginRight ) {
- jQuery.cssHooks.marginRight = {
- get: function( elem, computed ) {
- // WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
- // Work around by temporarily setting element display to inline-block
- return jQuery.swap( elem, { "display": "inline-block" }, function() {
- if ( computed ) {
- return curCSS( elem, "margin-right" );
- } else {
- return elem.style.marginRight;
- }
- });
- }
- };
- }
-});
-
-if ( jQuery.expr && jQuery.expr.filters ) {
- jQuery.expr.filters.hidden = function( elem ) {
- var width = elem.offsetWidth,
- height = elem.offsetHeight;
-
- return ( width === 0 && height === 0 ) || (!jQuery.support.reliableHiddenOffsets && ((elem.style && elem.style.display) || jQuery.css( elem, "display" )) === "none");
- };
-
- jQuery.expr.filters.visible = function( elem ) {
- return !jQuery.expr.filters.hidden( elem );
- };
-}
-
-// These hooks are used by animate to expand properties
-jQuery.each({
- margin: "",
- padding: "",
- border: "Width"
-}, function( prefix, suffix ) {
-
- jQuery.cssHooks[ prefix + suffix ] = {
- expand: function( value ) {
- var i,
-
- // assumes a single number if not a string
- parts = typeof value === "string" ? value.split(" ") : [ value ],
- expanded = {};
-
- for ( i = 0; i < 4; i++ ) {
- expanded[ prefix + cssExpand[ i ] + suffix ] =
- parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
- }
-
- return expanded;
- }
- };
-});
-
-
-
-
-var r20 = /%20/g,
- rbracket = /\[\]$/,
- rCRLF = /\r?\n/g,
- rhash = /#.*$/,
- rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL
- rinput = /^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,
- // #7653, #8125, #8152: local protocol detection
- rlocalProtocol = /^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,
- rnoContent = /^(?:GET|HEAD)$/,
- rprotocol = /^\/\//,
- rquery = /\?/,
- rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
- rselectTextarea = /^(?:select|textarea)/i,
- rspacesAjax = /\s+/,
- rts = /([?&])_=[^&]*/,
- rurl = /^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,
-
- // Keep a copy of the old load method
- _load = jQuery.fn.load,
-
- /* Prefilters
- * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
- * 2) These are called:
- * - BEFORE asking for a transport
- * - AFTER param serialization (s.data is a string if s.processData is true)
- * 3) key is the dataType
- * 4) the catchall symbol "*" can be used
- * 5) execution will start with transport dataType and THEN continue down to "*" if needed
- */
- prefilters = {},
-
- /* Transports bindings
- * 1) key is the dataType
- * 2) the catchall symbol "*" can be used
- * 3) selection will start with transport dataType and THEN go to "*" if needed
- */
- transports = {},
-
- // Document location
- ajaxLocation,
-
- // Document location segments
- ajaxLocParts,
-
- // Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
- allTypes = ["*/"] + ["*"];
-
-// #8138, IE may throw an exception when accessing
-// a field from window.location if document.domain has been set
-try {
- ajaxLocation = location.href;
-} catch( e ) {
- // Use the href attribute of an A element
- // since IE will modify it given document.location
- ajaxLocation = document.createElement( "a" );
- ajaxLocation.href = "";
- ajaxLocation = ajaxLocation.href;
-}
-
-// Segment location into parts
-ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
-
-// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
-function addToPrefiltersOrTransports( structure ) {
-
- // dataTypeExpression is optional and defaults to "*"
- return function( dataTypeExpression, func ) {
-
- if ( typeof dataTypeExpression !== "string" ) {
- func = dataTypeExpression;
- dataTypeExpression = "*";
- }
-
- if ( jQuery.isFunction( func ) ) {
- var dataTypes = dataTypeExpression.toLowerCase().split( rspacesAjax ),
- i = 0,
- length = dataTypes.length,
- dataType,
- list,
- placeBefore;
-
- // For each dataType in the dataTypeExpression
- for ( ; i < length; i++ ) {
- dataType = dataTypes[ i ];
- // We control if we're asked to add before
- // any existing element
- placeBefore = /^\+/.test( dataType );
- if ( placeBefore ) {
- dataType = dataType.substr( 1 ) || "*";
- }
- list = structure[ dataType ] = structure[ dataType ] || [];
- // then we add to the structure accordingly
- list[ placeBefore ? "unshift" : "push" ]( func );
- }
- }
- };
-}
-
-// Base inspection function for prefilters and transports
-function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR,
- dataType /* internal */, inspected /* internal */ ) {
-
- dataType = dataType || options.dataTypes[ 0 ];
- inspected = inspected || {};
-
- inspected[ dataType ] = true;
-
- var list = structure[ dataType ],
- i = 0,
- length = list ? list.length : 0,
- executeOnly = ( structure === prefilters ),
- selection;
-
- for ( ; i < length && ( executeOnly || !selection ); i++ ) {
- selection = list[ i ]( options, originalOptions, jqXHR );
- // If we got redirected to another dataType
- // we try there if executing only and not done already
- if ( typeof selection === "string" ) {
- if ( !executeOnly || inspected[ selection ] ) {
- selection = undefined;
- } else {
- options.dataTypes.unshift( selection );
- selection = inspectPrefiltersOrTransports(
- structure, options, originalOptions, jqXHR, selection, inspected );
- }
- }
- }
- // If we're only executing or nothing was selected
- // we try the catchall dataType if not done already
- if ( ( executeOnly || !selection ) && !inspected[ "*" ] ) {
- selection = inspectPrefiltersOrTransports(
- structure, options, originalOptions, jqXHR, "*", inspected );
- }
- // unnecessary when only executing (prefilters)
- // but it'll be ignored by the caller in that case
- return selection;
-}
-
-// A special extend for ajax options
-// that takes "flat" options (not to be deep extended)
-// Fixes #9887
-function ajaxExtend( target, src ) {
- var key, deep,
- flatOptions = jQuery.ajaxSettings.flatOptions || {};
- for ( key in src ) {
- if ( src[ key ] !== undefined ) {
- ( flatOptions[ key ] ? target : ( deep || ( deep = {} ) ) )[ key ] = src[ key ];
- }
- }
- if ( deep ) {
- jQuery.extend( true, target, deep );
- }
-}
-
-jQuery.fn.extend({
- load: function( url, params, callback ) {
- if ( typeof url !== "string" && _load ) {
- return _load.apply( this, arguments );
-
- // Don't do a request if no elements are being requested
- } else if ( !this.length ) {
- return this;
- }
-
- var off = url.indexOf( " " );
- if ( off >= 0 ) {
- var selector = url.slice( off, url.length );
- url = url.slice( 0, off );
- }
-
- // Default to a GET request
- var type = "GET";
-
- // If the second parameter was provided
- if ( params ) {
- // If it's a function
- if ( jQuery.isFunction( params ) ) {
- // We assume that it's the callback
- callback = params;
- params = undefined;
-
- // Otherwise, build a param string
- } else if ( typeof params === "object" ) {
- params = jQuery.param( params, jQuery.ajaxSettings.traditional );
- type = "POST";
- }
- }
-
- var self = this;
-
- // Request the remote document
- jQuery.ajax({
- url: url,
- type: type,
- dataType: "html",
- data: params,
- // Complete callback (responseText is used internally)
- complete: function( jqXHR, status, responseText ) {
- // Store the response as specified by the jqXHR object
- responseText = jqXHR.responseText;
- // If successful, inject the HTML into all the matched elements
- if ( jqXHR.isResolved() ) {
- // #4825: Get the actual response in case
- // a dataFilter is present in ajaxSettings
- jqXHR.done(function( r ) {
- responseText = r;
- });
- // See if a selector was specified
- self.html( selector ?
- // Create a dummy div to hold the results
- jQuery("<div>")
- // inject the contents of the document in, removing the scripts
- // to avoid any 'Permission Denied' errors in IE
- .append(responseText.replace(rscript, ""))
-
- // Locate the specified elements
- .find(selector) :
-
- // If not, just inject the full result
- responseText );
- }
-
- if ( callback ) {
- self.each( callback, [ responseText, status, jqXHR ] );
- }
- }
- });
-
- return this;
- },
-
- serialize: function() {
- return jQuery.param( this.serializeArray() );
- },
-
- serializeArray: function() {
- return this.map(function(){
- return this.elements ? jQuery.makeArray( this.elements ) : this;
- })
- .filter(function(){
- return this.name && !this.disabled &&
- ( this.checked || rselectTextarea.test( this.nodeName ) ||
- rinput.test( this.type ) );
- })
- .map(function( i, elem ){
- var val = jQuery( this ).val();
-
- return val == null ?
- null :
- jQuery.isArray( val ) ?
- jQuery.map( val, function( val, i ){
- return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
- }) :
- { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
- }).get();
- }
-});
-
-// Attach a bunch of functions for handling common AJAX events
-jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split( " " ), function( i, o ){
- jQuery.fn[ o ] = function( f ){
- return this.on( o, f );
- };
-});
-
-jQuery.each( [ "get", "post" ], function( i, method ) {
- jQuery[ method ] = function( url, data, callback, type ) {
- // shift arguments if data argument was omitted
- if ( jQuery.isFunction( data ) ) {
- type = type || callback;
- callback = data;
- data = undefined;
- }
-
- return jQuery.ajax({
- type: method,
- url: url,
- data: data,
- success: callback,
- dataType: type
- });
- };
-});
-
-jQuery.extend({
-
- getScript: function( url, callback ) {
- return jQuery.get( url, undefined, callback, "script" );
- },
-
- getJSON: function( url, data, callback ) {
- return jQuery.get( url, data, callback, "json" );
- },
-
- // Creates a full fledged settings object into target
- // with both ajaxSettings and settings fields.
- // If target is omitted, writes into ajaxSettings.
- ajaxSetup: function( target, settings ) {
- if ( settings ) {
- // Building a settings object
- ajaxExtend( target, jQuery.ajaxSettings );
- } else {
- // Extending ajaxSettings
- settings = target;
- target = jQuery.ajaxSettings;
- }
- ajaxExtend( target, settings );
- return target;
- },
-
- ajaxSettings: {
- url: ajaxLocation,
- isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
- global: true,
- type: "GET",
- contentType: "application/x-www-form-urlencoded; charset=UTF-8",
- processData: true,
- async: true,
- /*
- timeout: 0,
- data: null,
- dataType: null,
- username: null,
- password: null,
- cache: null,
- traditional: false,
- headers: {},
- */
-
- accepts: {
- xml: "application/xml, text/xml",
- html: "text/html",
- text: "text/plain",
- json: "application/json, text/javascript",
- "*": allTypes
- },
-
- contents: {
- xml: /xml/,
- html: /html/,
- json: /json/
- },
-
- responseFields: {
- xml: "responseXML",
- text: "responseText"
- },
-
- // List of data converters
- // 1) key format is "source_type destination_type" (a single space in-between)
- // 2) the catchall symbol "*" can be used for source_type
- converters: {
-
- // Convert anything to text
- "* text": window.String,
-
- // Text to html (true = no transformation)
- "text html": true,
-
- // Evaluate text as a json expression
- "text json": jQuery.parseJSON,
-
- // Parse text as xml
- "text xml": jQuery.parseXML
- },
-
- // For options that shouldn't be deep extended:
- // you can add your own custom options here if
- // and when you create one that shouldn't be
- // deep extended (see ajaxExtend)
- flatOptions: {
- context: true,
- url: true
- }
- },
-
- ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
- ajaxTransport: addToPrefiltersOrTransports( transports ),
-
- // Main method
- ajax: function( url, options ) {
-
- // If url is an object, simulate pre-1.5 signature
- if ( typeof url === "object" ) {
- options = url;
- url = undefined;
- }
-
- // Force options to be an object
- options = options || {};
-
- var // Create the final options object
- s = jQuery.ajaxSetup( {}, options ),
- // Callbacks context
- callbackContext = s.context || s,
- // Context for global events
- // It's the callbackContext if one was provided in the options
- // and if it's a DOM node or a jQuery collection
- globalEventContext = callbackContext !== s &&
- ( callbackContext.nodeType || callbackContext instanceof jQuery ) ?
- jQuery( callbackContext ) : jQuery.event,
- // Deferreds
- deferred = jQuery.Deferred(),
- completeDeferred = jQuery.Callbacks( "once memory" ),
- // Status-dependent callbacks
- statusCode = s.statusCode || {},
- // ifModified key
- ifModifiedKey,
- // Headers (they are sent all at once)
- requestHeaders = {},
- requestHeadersNames = {},
- // Response headers
- responseHeadersString,
- responseHeaders,
- // transport
- transport,
- // timeout handle
- timeoutTimer,
- // Cross-domain detection vars
- parts,
- // The jqXHR state
- state = 0,
- // To know if global events are to be dispatched
- fireGlobals,
- // Loop variable
- i,
- // Fake xhr
- jqXHR = {
-
- readyState: 0,
-
- // Caches the header
- setRequestHeader: function( name, value ) {
- if ( !state ) {
- var lname = name.toLowerCase();
- name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
- requestHeaders[ name ] = value;
- }
- return this;
- },
-
- // Raw string
- getAllResponseHeaders: function() {
- return state === 2 ? responseHeadersString : null;
- },
-
- // Builds headers hashtable if needed
- getResponseHeader: function( key ) {
- var match;
- if ( state === 2 ) {
- if ( !responseHeaders ) {
- responseHeaders = {};
- while( ( match = rheaders.exec( responseHeadersString ) ) ) {
- responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
- }
- }
- match = responseHeaders[ key.toLowerCase() ];
- }
- return match === undefined ? null : match;
- },
-
- // Overrides response content-type header
- overrideMimeType: function( type ) {
- if ( !state ) {
- s.mimeType = type;
- }
- return this;
- },
-
- // Cancel the request
- abort: function( statusText ) {
- statusText = statusText || "abort";
- if ( transport ) {
- transport.abort( statusText );
- }
- done( 0, statusText );
- return this;
- }
- };
-
- // Callback for when everything is done
- // It is defined here because jslint complains if it is declared
- // at the end of the function (which would be more logical and readable)
- function done( status, nativeStatusText, responses, headers ) {
-
- // Called once
- if ( state === 2 ) {
- return;
- }
-
- // State is "done" now
- state = 2;
-
- // Clear timeout if it exists
- if ( timeoutTimer ) {
- clearTimeout( timeoutTimer );
- }
-
- // Dereference transport for early garbage collection
- // (no matter how long the jqXHR object will be used)
- transport = undefined;
-
- // Cache response headers
- responseHeadersString = headers || "";
-
- // Set readyState
- jqXHR.readyState = status > 0 ? 4 : 0;
-
- var isSuccess,
- success,
- error,
- statusText = nativeStatusText,
- response = responses ? ajaxHandleResponses( s, jqXHR, responses ) : undefined,
- lastModified,
- etag;
-
- // If successful, handle type chaining
- if ( status >= 200 && status < 300 || status === 304 ) {
-
- // Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
- if ( s.ifModified ) {
-
- if ( ( lastModified = jqXHR.getResponseHeader( "Last-Modified" ) ) ) {
- jQuery.lastModified[ ifModifiedKey ] = lastModified;
- }
- if ( ( etag = jqXHR.getResponseHeader( "Etag" ) ) ) {
- jQuery.etag[ ifModifiedKey ] = etag;
- }
- }
-
- // If not modified
- if ( status === 304 ) {
-
- statusText = "notmodified";
- isSuccess = true;
-
- // If we have data
- } else {
-
- try {
- success = ajaxConvert( s, response );
- statusText = "success";
- isSuccess = true;
- } catch(e) {
- // We have a parsererror
- statusText = "parsererror";
- error = e;
- }
- }
- } else {
- // We extract error from statusText
- // then normalize statusText and status for non-aborts
- error = statusText;
- if ( !statusText || status ) {
- statusText = "error";
- if ( status < 0 ) {
- status = 0;
- }
- }
- }
-
- // Set data for the fake xhr object
- jqXHR.status = status;
- jqXHR.statusText = "" + ( nativeStatusText || statusText );
-
- // Success/Error
- if ( isSuccess ) {
- deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
- } else {
- deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
- }
-
- // Status-dependent callbacks
- jqXHR.statusCode( statusCode );
- statusCode = undefined;
-
- if ( fireGlobals ) {
- globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ),
- [ jqXHR, s, isSuccess ? success : error ] );
- }
-
- // Complete
- completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] );
-
- if ( fireGlobals ) {
- globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
- // Handle the global AJAX counter
- if ( !( --jQuery.active ) ) {
- jQuery.event.trigger( "ajaxStop" );
- }
- }
- }
-
- // Attach deferreds
- deferred.promise( jqXHR );
- jqXHR.success = jqXHR.done;
- jqXHR.error = jqXHR.fail;
- jqXHR.complete = completeDeferred.add;
-
- // Status-dependent callbacks
- jqXHR.statusCode = function( map ) {
- if ( map ) {
- var tmp;
- if ( state < 2 ) {
- for ( tmp in map ) {
- statusCode[ tmp ] = [ statusCode[tmp], map[tmp] ];
- }
- } else {
- tmp = map[ jqXHR.status ];
- jqXHR.then( tmp, tmp );
- }
- }
- return this;
- };
-
- // Remove hash character (#7531: and string promotion)
- // Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
- // We also use the url parameter if available
- s.url = ( ( url || s.url ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
-
- // Extract dataTypes list
- s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( rspacesAjax );
-
- // Determine if a cross-domain request is in order
- if ( s.crossDomain == null ) {
- parts = rurl.exec( s.url.toLowerCase() );
- s.crossDomain = !!( parts &&
- ( parts[ 1 ] != ajaxLocParts[ 1 ] || parts[ 2 ] != ajaxLocParts[ 2 ] ||
- ( parts[ 3 ] || ( parts[ 1 ] === "http:" ? 80 : 443 ) ) !=
- ( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? 80 : 443 ) ) )
- );
- }
-
- // Convert data if not already a string
- if ( s.data && s.processData && typeof s.data !== "string" ) {
- s.data = jQuery.param( s.data, s.traditional );
- }
-
- // Apply prefilters
- inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
-
- // If request was aborted inside a prefilter, stop there
- if ( state === 2 ) {
- return false;
- }
-
- // We can fire global events as of now if asked to
- fireGlobals = s.global;
-
- // Uppercase the type
- s.type = s.type.toUpperCase();
-
- // Determine if request has content
- s.hasContent = !rnoContent.test( s.type );
-
- // Watch for a new set of requests
- if ( fireGlobals && jQuery.active++ === 0 ) {
- jQuery.event.trigger( "ajaxStart" );
- }
-
- // More options handling for requests with no content
- if ( !s.hasContent ) {
-
- // If data is available, append data to url
- if ( s.data ) {
- s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.data;
- // #9682: remove data so that it's not used in an eventual retry
- delete s.data;
- }
-
- // Get ifModifiedKey before adding the anti-cache parameter
- ifModifiedKey = s.url;
-
- // Add anti-cache in url if needed
- if ( s.cache === false ) {
-
- var ts = jQuery.now(),
- // try replacing _= if it is there
- ret = s.url.replace( rts, "$1_=" + ts );
-
- // if nothing was replaced, add timestamp to the end
- s.url = ret + ( ( ret === s.url ) ? ( rquery.test( s.url ) ? "&" : "?" ) + "_=" + ts : "" );
- }
- }
-
- // Set the correct header, if data is being sent
- if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
- jqXHR.setRequestHeader( "Content-Type", s.contentType );
- }
-
- // Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
- if ( s.ifModified ) {
- ifModifiedKey = ifModifiedKey || s.url;
- if ( jQuery.lastModified[ ifModifiedKey ] ) {
- jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ ifModifiedKey ] );
- }
- if ( jQuery.etag[ ifModifiedKey ] ) {
- jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ ifModifiedKey ] );
- }
- }
-
- // Set the Accepts header for the server, depending on the dataType
- jqXHR.setRequestHeader(
- "Accept",
- s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
- s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
- s.accepts[ "*" ]
- );
-
- // Check for headers option
- for ( i in s.headers ) {
- jqXHR.setRequestHeader( i, s.headers[ i ] );
- }
-
- // Allow custom headers/mimetypes and early abort
- if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
- // Abort if not done already
- jqXHR.abort();
- return false;
-
- }
-
- // Install callbacks on deferreds
- for ( i in { success: 1, error: 1, complete: 1 } ) {
- jqXHR[ i ]( s[ i ] );
- }
-
- // Get transport
- transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
-
- // If no transport, we auto-abort
- if ( !transport ) {
- done( -1, "No Transport" );
- } else {
- jqXHR.readyState = 1;
- // Send global event
- if ( fireGlobals ) {
- globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
- }
- // Timeout
- if ( s.async && s.timeout > 0 ) {
- timeoutTimer = setTimeout( function(){
- jqXHR.abort( "timeout" );
- }, s.timeout );
- }
-
- try {
- state = 1;
- transport.send( requestHeaders, done );
- } catch (e) {
- // Propagate exception as error if not done
- if ( state < 2 ) {
- done( -1, e );
- // Simply rethrow otherwise
- } else {
- throw e;
- }
- }
- }
-
- return jqXHR;
- },
-
- // Serialize an array of form elements or a set of
- // key/values into a query string
- param: function( a, traditional ) {
- var s = [],
- add = function( key, value ) {
- // If value is a function, invoke it and return its value
- value = jQuery.isFunction( value ) ? value() : value;
- s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
- };
-
- // Set traditional to true for jQuery <= 1.3.2 behavior.
- if ( traditional === undefined ) {
- traditional = jQuery.ajaxSettings.traditional;
- }
-
- // If an array was passed in, assume that it is an array of form elements.
- if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
- // Serialize the form elements
- jQuery.each( a, function() {
- add( this.name, this.value );
- });
-
- } else {
- // If traditional, encode the "old" way (the way 1.3.2 or older
- // did it), otherwise encode params recursively.
- for ( var prefix in a ) {
- buildParams( prefix, a[ prefix ], traditional, add );
- }
- }
-
- // Return the resulting serialization
- return s.join( "&" ).replace( r20, "+" );
- }
-});
-
-function buildParams( prefix, obj, traditional, add ) {
- if ( jQuery.isArray( obj ) ) {
- // Serialize array item.
- jQuery.each( obj, function( i, v ) {
- if ( traditional || rbracket.test( prefix ) ) {
- // Treat each array item as a scalar.
- add( prefix, v );
-
- } else {
- // If array item is non-scalar (array or object), encode its
- // numeric index to resolve deserialization ambiguity issues.
- // Note that rack (as of 1.0.0) can't currently deserialize
- // nested arrays properly, and attempting to do so may cause
- // a server error. Possible fixes are to modify rack's
- // deserialization algorithm or to provide an option or flag
- // to force array serialization to be shallow.
- buildParams( prefix + "[" + ( typeof v === "object" ? i : "" ) + "]", v, traditional, add );
- }
- });
-
- } else if ( !traditional && jQuery.type( obj ) === "object" ) {
- // Serialize object item.
- for ( var name in obj ) {
- buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
- }
-
- } else {
- // Serialize scalar item.
- add( prefix, obj );
- }
-}
-
-// This is still on the jQuery object... for now
-// Want to move this to jQuery.ajax some day
-jQuery.extend({
-
- // Counter for holding the number of active queries
- active: 0,
-
- // Last-Modified header cache for next request
- lastModified: {},
- etag: {}
-
-});
-
-/* Handles responses to an ajax request:
- * - sets all responseXXX fields accordingly
- * - finds the right dataType (mediates between content-type and expected dataType)
- * - returns the corresponding response
- */
-function ajaxHandleResponses( s, jqXHR, responses ) {
-
- var contents = s.contents,
- dataTypes = s.dataTypes,
- responseFields = s.responseFields,
- ct,
- type,
- finalDataType,
- firstDataType;
-
- // Fill responseXXX fields
- for ( type in responseFields ) {
- if ( type in responses ) {
- jqXHR[ responseFields[type] ] = responses[ type ];
- }
- }
-
- // Remove auto dataType and get content-type in the process
- while( dataTypes[ 0 ] === "*" ) {
- dataTypes.shift();
- if ( ct === undefined ) {
- ct = s.mimeType || jqXHR.getResponseHeader( "content-type" );
- }
- }
-
- // Check if we're dealing with a known content-type
- if ( ct ) {
- for ( type in contents ) {
- if ( contents[ type ] && contents[ type ].test( ct ) ) {
- dataTypes.unshift( type );
- break;
- }
- }
- }
-
- // Check to see if we have a response for the expected dataType
- if ( dataTypes[ 0 ] in responses ) {
- finalDataType = dataTypes[ 0 ];
- } else {
- // Try convertible dataTypes
- for ( type in responses ) {
- if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
- finalDataType = type;
- break;
- }
- if ( !firstDataType ) {
- firstDataType = type;
- }
- }
- // Or just use first one
- finalDataType = finalDataType || firstDataType;
- }
-
- // If we found a dataType
- // We add the dataType to the list if needed
- // and return the corresponding response
- if ( finalDataType ) {
- if ( finalDataType !== dataTypes[ 0 ] ) {
- dataTypes.unshift( finalDataType );
- }
- return responses[ finalDataType ];
- }
-}
-
-// Chain conversions given the request and the original response
-function ajaxConvert( s, response ) {
-
- // Apply the dataFilter if provided
- if ( s.dataFilter ) {
- response = s.dataFilter( response, s.dataType );
- }
-
- var dataTypes = s.dataTypes,
- converters = {},
- i,
- key,
- length = dataTypes.length,
- tmp,
- // Current and previous dataTypes
- current = dataTypes[ 0 ],
- prev,
- // Conversion expression
- conversion,
- // Conversion function
- conv,
- // Conversion functions (transitive conversion)
- conv1,
- conv2;
-
- // For each dataType in the chain
- for ( i = 1; i < length; i++ ) {
-
- // Create converters map
- // with lowercased keys
- if ( i === 1 ) {
- for ( key in s.converters ) {
- if ( typeof key === "string" ) {
- converters[ key.toLowerCase() ] = s.converters[ key ];
- }
- }
- }
-
- // Get the dataTypes
- prev = current;
- current = dataTypes[ i ];
-
- // If current is auto dataType, update it to prev
- if ( current === "*" ) {
- current = prev;
- // If no auto and dataTypes are actually different
- } else if ( prev !== "*" && prev !== current ) {
-
- // Get the converter
- conversion = prev + " " + current;
- conv = converters[ conversion ] || converters[ "* " + current ];
-
- // If there is no direct converter, search transitively
- if ( !conv ) {
- conv2 = undefined;
- for ( conv1 in converters ) {
- tmp = conv1.split( " " );
- if ( tmp[ 0 ] === prev || tmp[ 0 ] === "*" ) {
- conv2 = converters[ tmp[1] + " " + current ];
- if ( conv2 ) {
- conv1 = converters[ conv1 ];
- if ( conv1 === true ) {
- conv = conv2;
- } else if ( conv2 === true ) {
- conv = conv1;
- }
- break;
- }
- }
- }
- }
- // If we found no converter, dispatch an error
- if ( !( conv || conv2 ) ) {
- jQuery.error( "No conversion from " + conversion.replace(" "," to ") );
- }
- // If found converter is not an equivalence
- if ( conv !== true ) {
- // Convert with 1 or 2 converters accordingly
- response = conv ? conv( response ) : conv2( conv1(response) );
- }
- }
- }
- return response;
-}
-
-
-
-
-var jsc = jQuery.now(),
- jsre = /(\=)\?(&|$)|\?\?/i;
-
-// Default jsonp settings
-jQuery.ajaxSetup({
- jsonp: "callback",
- jsonpCallback: function() {
- return jQuery.expando + "_" + ( jsc++ );
- }
-});
-
-// Detect, normalize options and install callbacks for jsonp requests
-jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
-
- var inspectData = ( typeof s.data === "string" ) && /^application\/x\-www\-form\-urlencoded/.test( s.contentType );
-
- if ( s.dataTypes[ 0 ] === "jsonp" ||
- s.jsonp !== false && ( jsre.test( s.url ) ||
- inspectData && jsre.test( s.data ) ) ) {
-
- var responseContainer,
- jsonpCallback = s.jsonpCallback =
- jQuery.isFunction( s.jsonpCallback ) ? s.jsonpCallback() : s.jsonpCallback,
- previous = window[ jsonpCallback ],
- url = s.url,
- data = s.data,
- replace = "$1" + jsonpCallback + "$2";
-
- if ( s.jsonp !== false ) {
- url = url.replace( jsre, replace );
- if ( s.url === url ) {
- if ( inspectData ) {
- data = data.replace( jsre, replace );
- }
- if ( s.data === data ) {
- // Add callback manually
- url += (/\?/.test( url ) ? "&" : "?") + s.jsonp + "=" + jsonpCallback;
- }
- }
- }
-
- s.url = url;
- s.data = data;
-
- // Install callback
- window[ jsonpCallback ] = function( response ) {
- responseContainer = [ response ];
- };
-
- // Clean-up function
- jqXHR.always(function() {
- // Set callback back to previous value
- window[ jsonpCallback ] = previous;
- // Call if it was a function and we have a response
- if ( responseContainer && jQuery.isFunction( previous ) ) {
- window[ jsonpCallback ]( responseContainer[ 0 ] );
- }
- });
-
- // Use data converter to retrieve json after script execution
- s.converters["script json"] = function() {
- if ( !responseContainer ) {
- jQuery.error( jsonpCallback + " was not called" );
- }
- return responseContainer[ 0 ];
- };
-
- // force json dataType
- s.dataTypes[ 0 ] = "json";
-
- // Delegate to script
- return "script";
- }
-});
-
-
-
-
-// Install script dataType
-jQuery.ajaxSetup({
- accepts: {
- script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
- },
- contents: {
- script: /javascript|ecmascript/
- },
- converters: {
- "text script": function( text ) {
- jQuery.globalEval( text );
- return text;
- }
- }
-});
-
-// Handle cache's special case and global
-jQuery.ajaxPrefilter( "script", function( s ) {
- if ( s.cache === undefined ) {
- s.cache = false;
- }
- if ( s.crossDomain ) {
- s.type = "GET";
- s.global = false;
- }
-});
-
-// Bind script tag hack transport
-jQuery.ajaxTransport( "script", function(s) {
-
- // This transport only deals with cross domain requests
- if ( s.crossDomain ) {
-
- var script,
- head = document.head || document.getElementsByTagName( "head" )[0] || document.documentElement;
-
- return {
-
- send: function( _, callback ) {
-
- script = document.createElement( "script" );
-
- script.async = "async";
-
- if ( s.scriptCharset ) {
- script.charset = s.scriptCharset;
- }
-
- script.src = s.url;
-
- // Attach handlers for all browsers
- script.onload = script.onreadystatechange = function( _, isAbort ) {
-
- if ( isAbort || !script.readyState || /loaded|complete/.test( script.readyState ) ) {
-
- // Handle memory leak in IE
- script.onload = script.onreadystatechange = null;
-
- // Remove the script
- if ( head && script.parentNode ) {
- head.removeChild( script );
- }
-
- // Dereference the script
- script = undefined;
-
- // Callback if not abort
- if ( !isAbort ) {
- callback( 200, "success" );
- }
- }
- };
- // Use insertBefore instead of appendChild to circumvent an IE6 bug.
- // This arises when a base node is used (#2709 and #4378).
- head.insertBefore( script, head.firstChild );
- },
-
- abort: function() {
- if ( script ) {
- script.onload( 0, 1 );
- }
- }
- };
- }
-});
-
-
-
-
-var // #5280: Internet Explorer will keep connections alive if we don't abort on unload
- xhrOnUnloadAbort = window.ActiveXObject ? function() {
- // Abort all pending requests
- for ( var key in xhrCallbacks ) {
- xhrCallbacks[ key ]( 0, 1 );
- }
- } : false,
- xhrId = 0,
- xhrCallbacks;
-
-// Functions to create xhrs
-function createStandardXHR() {
- try {
- return new window.XMLHttpRequest();
- } catch( e ) {}
-}
-
-function createActiveXHR() {
- try {
- return new window.ActiveXObject( "Microsoft.XMLHTTP" );
- } catch( e ) {}
-}
-
-// Create the request object
-// (This is still attached to ajaxSettings for backward compatibility)
-jQuery.ajaxSettings.xhr = window.ActiveXObject ?
- /* Microsoft failed to properly
- * implement the XMLHttpRequest in IE7 (can't request local files),
- * so we use the ActiveXObject when it is available
- * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
- * we need a fallback.
- */
- function() {
- return !this.isLocal && createStandardXHR() || createActiveXHR();
- } :
- // For all other browsers, use the standard XMLHttpRequest object
- createStandardXHR;
-
-// Determine support properties
-(function( xhr ) {
- jQuery.extend( jQuery.support, {
- ajax: !!xhr,
- cors: !!xhr && ( "withCredentials" in xhr )
- });
-})( jQuery.ajaxSettings.xhr() );
-
-// Create transport if the browser can provide an xhr
-if ( jQuery.support.ajax ) {
-
- jQuery.ajaxTransport(function( s ) {
- // Cross domain only allowed if supported through XMLHttpRequest
- if ( !s.crossDomain || jQuery.support.cors ) {
-
- var callback;
-
- return {
- send: function( headers, complete ) {
-
- // Get a new xhr
- var xhr = s.xhr(),
- handle,
- i;
-
- // Open the socket
- // Passing null username, generates a login popup on Opera (#2865)
- if ( s.username ) {
- xhr.open( s.type, s.url, s.async, s.username, s.password );
- } else {
- xhr.open( s.type, s.url, s.async );
- }
-
- // Apply custom fields if provided
- if ( s.xhrFields ) {
- for ( i in s.xhrFields ) {
- xhr[ i ] = s.xhrFields[ i ];
- }
- }
-
- // Override mime type if needed
- if ( s.mimeType && xhr.overrideMimeType ) {
- xhr.overrideMimeType( s.mimeType );
- }
-
- // X-Requested-With header
- // For cross-domain requests, seeing as conditions for a preflight are
- // akin to a jigsaw puzzle, we simply never set it to be sure.
- // (it can always be set on a per-request basis or even using ajaxSetup)
- // For same-domain requests, won't change header if already provided.
- if ( !s.crossDomain && !headers["X-Requested-With"] ) {
- headers[ "X-Requested-With" ] = "XMLHttpRequest";
- }
-
- // Need an extra try/catch for cross domain requests in Firefox 3
- try {
- for ( i in headers ) {
- xhr.setRequestHeader( i, headers[ i ] );
- }
- } catch( _ ) {}
-
- // Do send the request
- // This may raise an exception which is actually
- // handled in jQuery.ajax (so no try/catch here)
- xhr.send( ( s.hasContent && s.data ) || null );
-
- // Listener
- callback = function( _, isAbort ) {
-
- var status,
- statusText,
- responseHeaders,
- responses,
- xml;
-
- // Firefox throws exceptions when accessing properties
- // of an xhr when a network error occured
- // http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
- try {
-
- // Was never called and is aborted or complete
- if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
-
- // Only called once
- callback = undefined;
-
- // Do not keep as active anymore
- if ( handle ) {
- xhr.onreadystatechange = jQuery.noop;
- if ( xhrOnUnloadAbort ) {
- delete xhrCallbacks[ handle ];
- }
- }
-
- // If it's an abort
- if ( isAbort ) {
- // Abort it manually if needed
- if ( xhr.readyState !== 4 ) {
- xhr.abort();
- }
- } else {
- status = xhr.status;
- responseHeaders = xhr.getAllResponseHeaders();
- responses = {};
- xml = xhr.responseXML;
-
- // Construct response list
- if ( xml && xml.documentElement /* #4958 */ ) {
- responses.xml = xml;
- }
-
- // When requesting binary data, IE6-9 will throw an exception
- // on any attempt to access responseText (#11426)
- try {
- responses.text = xhr.responseText;
- } catch( _ ) {
- }
-
- // Firefox throws an exception when accessing
- // statusText for faulty cross-domain requests
- try {
- statusText = xhr.statusText;
- } catch( e ) {
- // We normalize with Webkit giving an empty statusText
- statusText = "";
- }
-
- // Filter status for non standard behaviors
-
- // If the request is local and we have data: assume a success
- // (success with no data won't get notified, that's the best we
- // can do given current implementations)
- if ( !status && s.isLocal && !s.crossDomain ) {
- status = responses.text ? 200 : 404;
- // IE - #1450: sometimes returns 1223 when it should be 204
- } else if ( status === 1223 ) {
- status = 204;
- }
- }
- }
- } catch( firefoxAccessException ) {
- if ( !isAbort ) {
- complete( -1, firefoxAccessException );
- }
- }
-
- // Call complete if needed
- if ( responses ) {
- complete( status, statusText, responses, responseHeaders );
- }
- };
-
- // if we're in sync mode or it's in cache
- // and has been retrieved directly (IE6 & IE7)
- // we need to manually fire the callback
- if ( !s.async || xhr.readyState === 4 ) {
- callback();
- } else {
- handle = ++xhrId;
- if ( xhrOnUnloadAbort ) {
- // Create the active xhrs callbacks list if needed
- // and attach the unload handler
- if ( !xhrCallbacks ) {
- xhrCallbacks = {};
- jQuery( window ).unload( xhrOnUnloadAbort );
- }
- // Add to list of active xhrs callbacks
- xhrCallbacks[ handle ] = callback;
- }
- xhr.onreadystatechange = callback;
- }
- },
-
- abort: function() {
- if ( callback ) {
- callback(0,1);
- }
- }
- };
- }
- });
-}
-
-
-
-
-var elemdisplay = {},
- iframe, iframeDoc,
- rfxtypes = /^(?:toggle|show|hide)$/,
- rfxnum = /^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,
- timerId,
- fxAttrs = [
- // height animations
- [ "height", "marginTop", "marginBottom", "paddingTop", "paddingBottom" ],
- // width animations
- [ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ],
- // opacity animations
- [ "opacity" ]
- ],
- fxNow;
-
-jQuery.fn.extend({
- show: function( speed, easing, callback ) {
- var elem, display;
-
- if ( speed || speed === 0 ) {
- return this.animate( genFx("show", 3), speed, easing, callback );
-
- } else {
- for ( var i = 0, j = this.length; i < j; i++ ) {
- elem = this[ i ];
-
- if ( elem.style ) {
- display = elem.style.display;
-
- // Reset the inline display of this element to learn if it is
- // being hidden by cascaded rules or not
- if ( !jQuery._data(elem, "olddisplay") && display === "none" ) {
- display = elem.style.display = "";
- }
-
- // Set elements which have been overridden with display: none
- // in a stylesheet to whatever the default browser style is
- // for such an element
- if ( (display === "" && jQuery.css(elem, "display") === "none") ||
- !jQuery.contains( elem.ownerDocument.documentElement, elem ) ) {
- jQuery._data( elem, "olddisplay", defaultDisplay(elem.nodeName) );
- }
- }
- }
-
- // Set the display of most of the elements in a second loop
- // to avoid the constant reflow
- for ( i = 0; i < j; i++ ) {
- elem = this[ i ];
-
- if ( elem.style ) {
- display = elem.style.display;
-
- if ( display === "" || display === "none" ) {
- elem.style.display = jQuery._data( elem, "olddisplay" ) || "";
- }
- }
- }
-
- return this;
- }
- },
-
- hide: function( speed, easing, callback ) {
- if ( speed || speed === 0 ) {
- return this.animate( genFx("hide", 3), speed, easing, callback);
-
- } else {
- var elem, display,
- i = 0,
- j = this.length;
-
- for ( ; i < j; i++ ) {
- elem = this[i];
- if ( elem.style ) {
- display = jQuery.css( elem, "display" );
-
- if ( display !== "none" && !jQuery._data( elem, "olddisplay" ) ) {
- jQuery._data( elem, "olddisplay", display );
- }
- }
- }
-
- // Set the display of the elements in a second loop
- // to avoid the constant reflow
- for ( i = 0; i < j; i++ ) {
- if ( this[i].style ) {
- this[i].style.display = "none";
- }
- }
-
- return this;
- }
- },
-
- // Save the old toggle function
- _toggle: jQuery.fn.toggle,
-
- toggle: function( fn, fn2, callback ) {
- var bool = typeof fn === "boolean";
-
- if ( jQuery.isFunction(fn) && jQuery.isFunction(fn2) ) {
- this._toggle.apply( this, arguments );
-
- } else if ( fn == null || bool ) {
- this.each(function() {
- var state = bool ? fn : jQuery(this).is(":hidden");
- jQuery(this)[ state ? "show" : "hide" ]();
- });
-
- } else {
- this.animate(genFx("toggle", 3), fn, fn2, callback);
- }
-
- return this;
- },
-
- fadeTo: function( speed, to, easing, callback ) {
- return this.filter(":hidden").css("opacity", 0).show().end()
- .animate({opacity: to}, speed, easing, callback);
- },
-
- animate: function( prop, speed, easing, callback ) {
- var optall = jQuery.speed( speed, easing, callback );
-
- if ( jQuery.isEmptyObject( prop ) ) {
- return this.each( optall.complete, [ false ] );
- }
-
- // Do not change referenced properties as per-property easing will be lost
- prop = jQuery.extend( {}, prop );
-
- function doAnimation() {
- // XXX 'this' does not always have a nodeName when running the
- // test suite
-
- if ( optall.queue === false ) {
- jQuery._mark( this );
- }
-
- var opt = jQuery.extend( {}, optall ),
- isElement = this.nodeType === 1,
- hidden = isElement && jQuery(this).is(":hidden"),
- name, val, p, e, hooks, replace,
- parts, start, end, unit,
- method;
-
- // will store per property easing and be used to determine when an animation is complete
- opt.animatedProperties = {};
-
- // first pass over propertys to expand / normalize
- for ( p in prop ) {
- name = jQuery.camelCase( p );
- if ( p !== name ) {
- prop[ name ] = prop[ p ];
- delete prop[ p ];
- }
-
- if ( ( hooks = jQuery.cssHooks[ name ] ) && "expand" in hooks ) {
- replace = hooks.expand( prop[ name ] );
- delete prop[ name ];
-
- // not quite $.extend, this wont overwrite keys already present.
- // also - reusing 'p' from above because we have the correct "name"
- for ( p in replace ) {
- if ( ! ( p in prop ) ) {
- prop[ p ] = replace[ p ];
- }
- }
- }
- }
-
- for ( name in prop ) {
- val = prop[ name ];
- // easing resolution: per property > opt.specialEasing > opt.easing > 'swing' (default)
- if ( jQuery.isArray( val ) ) {
- opt.animatedProperties[ name ] = val[ 1 ];
- val = prop[ name ] = val[ 0 ];
- } else {
- opt.animatedProperties[ name ] = opt.specialEasing && opt.specialEasing[ name ] || opt.easing || 'swing';
- }
-
- if ( val === "hide" && hidden || val === "show" && !hidden ) {
- return opt.complete.call( this );
- }
-
- if ( isElement && ( name === "height" || name === "width" ) ) {
- // Make sure that nothing sneaks out
- // Record all 3 overflow attributes because IE does not
- // change the overflow attribute when overflowX and
- // overflowY are set to the same value
- opt.overflow = [ this.style.overflow, this.style.overflowX, this.style.overflowY ];
-
- // Set display property to inline-block for height/width
- // animations on inline elements that are having width/height animated
- if ( jQuery.css( this, "display" ) === "inline" &&
- jQuery.css( this, "float" ) === "none" ) {
-
- // inline-level elements accept inline-block;
- // block-level elements need to be inline with layout
- if ( !jQuery.support.inlineBlockNeedsLayout || defaultDisplay( this.nodeName ) === "inline" ) {
- this.style.display = "inline-block";
-
- } else {
- this.style.zoom = 1;
- }
- }
- }
- }
-
- if ( opt.overflow != null ) {
- this.style.overflow = "hidden";
- }
-
- for ( p in prop ) {
- e = new jQuery.fx( this, opt, p );
- val = prop[ p ];
-
- if ( rfxtypes.test( val ) ) {
-
- // Tracks whether to show or hide based on private
- // data attached to the element
- method = jQuery._data( this, "toggle" + p ) || ( val === "toggle" ? hidden ? "show" : "hide" : 0 );
- if ( method ) {
- jQuery._data( this, "toggle" + p, method === "show" ? "hide" : "show" );
- e[ method ]();
- } else {
- e[ val ]();
- }
-
- } else {
- parts = rfxnum.exec( val );
- start = e.cur();
-
- if ( parts ) {
- end = parseFloat( parts[2] );
- unit = parts[3] || ( jQuery.cssNumber[ p ] ? "" : "px" );
-
- // We need to compute starting value
- if ( unit !== "px" ) {
- jQuery.style( this, p, (end || 1) + unit);
- start = ( (end || 1) / e.cur() ) * start;
- jQuery.style( this, p, start + unit);
- }
-
- // If a +=/-= token was provided, we're doing a relative animation
- if ( parts[1] ) {
- end = ( (parts[ 1 ] === "-=" ? -1 : 1) * end ) + start;
- }
-
- e.custom( start, end, unit );
-
- } else {
- e.custom( start, val, "" );
- }
- }
- }
-
- // For JS strict compliance
- return true;
- }
-
- return optall.queue === false ?
- this.each( doAnimation ) :
- this.queue( optall.queue, doAnimation );
- },
-
- stop: function( type, clearQueue, gotoEnd ) {
- if ( typeof type !== "string" ) {
- gotoEnd = clearQueue;
- clearQueue = type;
- type = undefined;
- }
- if ( clearQueue && type !== false ) {
- this.queue( type || "fx", [] );
- }
-
- return this.each(function() {
- var index,
- hadTimers = false,
- timers = jQuery.timers,
- data = jQuery._data( this );
-
- // clear marker counters if we know they won't be
- if ( !gotoEnd ) {
- jQuery._unmark( true, this );
- }
-
- function stopQueue( elem, data, index ) {
- var hooks = data[ index ];
- jQuery.removeData( elem, index, true );
- hooks.stop( gotoEnd );
- }
-
- if ( type == null ) {
- for ( index in data ) {
- if ( data[ index ] && data[ index ].stop && index.indexOf(".run") === index.length - 4 ) {
- stopQueue( this, data, index );
- }
- }
- } else if ( data[ index = type + ".run" ] && data[ index ].stop ){
- stopQueue( this, data, index );
- }
-
- for ( index = timers.length; index--; ) {
- if ( timers[ index ].elem === this && (type == null || timers[ index ].queue === type) ) {
- if ( gotoEnd ) {
-
- // force the next step to be the last
- timers[ index ]( true );
- } else {
- timers[ index ].saveState();
- }
- hadTimers = true;
- timers.splice( index, 1 );
- }
- }
-
- // start the next in the queue if the last step wasn't forced
- // timers currently will call their complete callbacks, which will dequeue
- // but only if they were gotoEnd
- if ( !( gotoEnd && hadTimers ) ) {
- jQuery.dequeue( this, type );
- }
- });
- }
-
-});
-
-// Animations created synchronously will run synchronously
-function createFxNow() {
- setTimeout( clearFxNow, 0 );
- return ( fxNow = jQuery.now() );
-}
-
-function clearFxNow() {
- fxNow = undefined;
-}
-
-// Generate parameters to create a standard animation
-function genFx( type, num ) {
- var obj = {};
-
- jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice( 0, num )), function() {
- obj[ this ] = type;
- });
-
- return obj;
-}
-
-// Generate shortcuts for custom animations
-jQuery.each({
- slideDown: genFx( "show", 1 ),
- slideUp: genFx( "hide", 1 ),
- slideToggle: genFx( "toggle", 1 ),
- fadeIn: { opacity: "show" },
- fadeOut: { opacity: "hide" },
- fadeToggle: { opacity: "toggle" }
-}, function( name, props ) {
- jQuery.fn[ name ] = function( speed, easing, callback ) {
- return this.animate( props, speed, easing, callback );
- };
-});
-
-jQuery.extend({
- speed: function( speed, easing, fn ) {
- var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
- complete: fn || !fn && easing ||
- jQuery.isFunction( speed ) && speed,
- duration: speed,
- easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
- };
-
- opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
- opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
-
- // normalize opt.queue - true/undefined/null -> "fx"
- if ( opt.queue == null || opt.queue === true ) {
- opt.queue = "fx";
- }
-
- // Queueing
- opt.old = opt.complete;
-
- opt.complete = function( noUnmark ) {
- if ( jQuery.isFunction( opt.old ) ) {
- opt.old.call( this );
- }
-
- if ( opt.queue ) {
- jQuery.dequeue( this, opt.queue );
- } else if ( noUnmark !== false ) {
- jQuery._unmark( this );
- }
- };
-
- return opt;
- },
-
- easing: {
- linear: function( p ) {
- return p;
- },
- swing: function( p ) {
- return ( -Math.cos( p*Math.PI ) / 2 ) + 0.5;
- }
- },
-
- timers: [],
-
- fx: function( elem, options, prop ) {
- this.options = options;
- this.elem = elem;
- this.prop = prop;
-
- options.orig = options.orig || {};
- }
-
-});
-
-jQuery.fx.prototype = {
- // Simple function for setting a style value
- update: function() {
- if ( this.options.step ) {
- this.options.step.call( this.elem, this.now, this );
- }
-
- ( jQuery.fx.step[ this.prop ] || jQuery.fx.step._default )( this );
- },
-
- // Get the current size
- cur: function() {
- if ( this.elem[ this.prop ] != null && (!this.elem.style || this.elem.style[ this.prop ] == null) ) {
- return this.elem[ this.prop ];
- }
-
- var parsed,
- r = jQuery.css( this.elem, this.prop );
- // Empty strings, null, undefined and "auto" are converted to 0,
- // complex values such as "rotate(1rad)" are returned as is,
- // simple values such as "10px" are parsed to Float.
- return isNaN( parsed = parseFloat( r ) ) ? !r || r === "auto" ? 0 : r : parsed;
- },
-
- // Start an animation from one number to another
- custom: function( from, to, unit ) {
- var self = this,
- fx = jQuery.fx;
-
- this.startTime = fxNow || createFxNow();
- this.end = to;
- this.now = this.start = from;
- this.pos = this.state = 0;
- this.unit = unit || this.unit || ( jQuery.cssNumber[ this.prop ] ? "" : "px" );
-
- function t( gotoEnd ) {
- return self.step( gotoEnd );
- }
-
- t.queue = this.options.queue;
- t.elem = this.elem;
- t.saveState = function() {
- if ( jQuery._data( self.elem, "fxshow" + self.prop ) === undefined ) {
- if ( self.options.hide ) {
- jQuery._data( self.elem, "fxshow" + self.prop, self.start );
- } else if ( self.options.show ) {
- jQuery._data( self.elem, "fxshow" + self.prop, self.end );
- }
- }
- };
-
- if ( t() && jQuery.timers.push(t) && !timerId ) {
- timerId = setInterval( fx.tick, fx.interval );
- }
- },
-
- // Simple 'show' function
- show: function() {
- var dataShow = jQuery._data( this.elem, "fxshow" + this.prop );
-
- // Remember where we started, so that we can go back to it later
- this.options.orig[ this.prop ] = dataShow || jQuery.style( this.elem, this.prop );
- this.options.show = true;
-
- // Begin the animation
- // Make sure that we start at a small width/height to avoid any flash of content
- if ( dataShow !== undefined ) {
- // This show is picking up where a previous hide or show left off
- this.custom( this.cur(), dataShow );
- } else {
- this.custom( this.prop === "width" || this.prop === "height" ? 1 : 0, this.cur() );
- }
-
- // Start by showing the element
- jQuery( this.elem ).show();
- },
-
- // Simple 'hide' function
- hide: function() {
- // Remember where we started, so that we can go back to it later
- this.options.orig[ this.prop ] = jQuery._data( this.elem, "fxshow" + this.prop ) || jQuery.style( this.elem, this.prop );
- this.options.hide = true;
-
- // Begin the animation
- this.custom( this.cur(), 0 );
- },
-
- // Each step of an animation
- step: function( gotoEnd ) {
- var p, n, complete,
- t = fxNow || createFxNow(),
- done = true,
- elem = this.elem,
- options = this.options;
-
- if ( gotoEnd || t >= options.duration + this.startTime ) {
- this.now = this.end;
- this.pos = this.state = 1;
- this.update();
-
- options.animatedProperties[ this.prop ] = true;
-
- for ( p in options.animatedProperties ) {
- if ( options.animatedProperties[ p ] !== true ) {
- done = false;
- }
- }
-
- if ( done ) {
- // Reset the overflow
- if ( options.overflow != null && !jQuery.support.shrinkWrapBlocks ) {
-
- jQuery.each( [ "", "X", "Y" ], function( index, value ) {
- elem.style[ "overflow" + value ] = options.overflow[ index ];
- });
- }
-
- // Hide the element if the "hide" operation was done
- if ( options.hide ) {
- jQuery( elem ).hide();
- }
-
- // Reset the properties, if the item has been hidden or shown
- if ( options.hide || options.show ) {
- for ( p in options.animatedProperties ) {
- jQuery.style( elem, p, options.orig[ p ] );
- jQuery.removeData( elem, "fxshow" + p, true );
- // Toggle data is no longer needed
- jQuery.removeData( elem, "toggle" + p, true );
- }
- }
-
- // Execute the complete function
- // in the event that the complete function throws an exception
- // we must ensure it won't be called twice. #5684
-
- complete = options.complete;
- if ( complete ) {
-
- options.complete = false;
- complete.call( elem );
- }
- }
-
- return false;
-
- } else {
- // classical easing cannot be used with an Infinity duration
- if ( options.duration == Infinity ) {
- this.now = t;
- } else {
- n = t - this.startTime;
- this.state = n / options.duration;
-
- // Perform the easing function, defaults to swing
- this.pos = jQuery.easing[ options.animatedProperties[this.prop] ]( this.state, n, 0, 1, options.duration );
- this.now = this.start + ( (this.end - this.start) * this.pos );
- }
- // Perform the next step of the animation
- this.update();
- }
-
- return true;
- }
-};
-
-jQuery.extend( jQuery.fx, {
- tick: function() {
- var timer,
- timers = jQuery.timers,
- i = 0;
-
- for ( ; i < timers.length; i++ ) {
- timer = timers[ i ];
- // Checks the timer has not already been removed
- if ( !timer() && timers[ i ] === timer ) {
- timers.splice( i--, 1 );
- }
- }
-
- if ( !timers.length ) {
- jQuery.fx.stop();
- }
- },
-
- interval: 13,
-
- stop: function() {
- clearInterval( timerId );
- timerId = null;
- },
-
- speeds: {
- slow: 600,
- fast: 200,
- // Default speed
- _default: 400
- },
-
- step: {
- opacity: function( fx ) {
- jQuery.style( fx.elem, "opacity", fx.now );
- },
-
- _default: function( fx ) {
- if ( fx.elem.style && fx.elem.style[ fx.prop ] != null ) {
- fx.elem.style[ fx.prop ] = fx.now + fx.unit;
- } else {
- fx.elem[ fx.prop ] = fx.now;
- }
- }
- }
-});
-
-// Ensure props that can't be negative don't go there on undershoot easing
-jQuery.each( fxAttrs.concat.apply( [], fxAttrs ), function( i, prop ) {
- // exclude marginTop, marginLeft, marginBottom and marginRight from this list
- if ( prop.indexOf( "margin" ) ) {
- jQuery.fx.step[ prop ] = function( fx ) {
- jQuery.style( fx.elem, prop, Math.max(0, fx.now) + fx.unit );
- };
- }
-});
-
-if ( jQuery.expr && jQuery.expr.filters ) {
- jQuery.expr.filters.animated = function( elem ) {
- return jQuery.grep(jQuery.timers, function( fn ) {
- return elem === fn.elem;
- }).length;
- };
-}
-
-// Try to restore the default display value of an element
-function defaultDisplay( nodeName ) {
-
- if ( !elemdisplay[ nodeName ] ) {
-
- var body = document.body,
- elem = jQuery( "<" + nodeName + ">" ).appendTo( body ),
- display = elem.css( "display" );
- elem.remove();
-
- // If the simple way fails,
- // get element's real default display by attaching it to a temp iframe
- if ( display === "none" || display === "" ) {
- // No iframe to use yet, so create it
- if ( !iframe ) {
- iframe = document.createElement( "iframe" );
- iframe.frameBorder = iframe.width = iframe.height = 0;
- }
-
- body.appendChild( iframe );
-
- // Create a cacheable copy of the iframe document on first call.
- // IE and Opera will allow us to reuse the iframeDoc without re-writing the fake HTML
- // document to it; WebKit & Firefox won't allow reusing the iframe document.
- if ( !iframeDoc || !iframe.createElement ) {
- iframeDoc = ( iframe.contentWindow || iframe.contentDocument ).document;
- iframeDoc.write( ( jQuery.support.boxModel ? "<!doctype html>" : "" ) + "<html><body>" );
- iframeDoc.close();
- }
-
- elem = iframeDoc.createElement( nodeName );
-
- iframeDoc.body.appendChild( elem );
-
- display = jQuery.css( elem, "display" );
- body.removeChild( iframe );
- }
-
- // Store the correct default display
- elemdisplay[ nodeName ] = display;
- }
-
- return elemdisplay[ nodeName ];
-}
-
-
-
-
-var getOffset,
- rtable = /^t(?:able|d|h)$/i,
- rroot = /^(?:body|html)$/i;
-
-if ( "getBoundingClientRect" in document.documentElement ) {
- getOffset = function( elem, doc, docElem, box ) {
- try {
- box = elem.getBoundingClientRect();
- } catch(e) {}
-
- // Make sure we're not dealing with a disconnected DOM node
- if ( !box || !jQuery.contains( docElem, elem ) ) {
- return box ? { top: box.top, left: box.left } : { top: 0, left: 0 };
- }
-
- var body = doc.body,
- win = getWindow( doc ),
- clientTop = docElem.clientTop || body.clientTop || 0,
- clientLeft = docElem.clientLeft || body.clientLeft || 0,
- scrollTop = win.pageYOffset || jQuery.support.boxModel && docElem.scrollTop || body.scrollTop,
- scrollLeft = win.pageXOffset || jQuery.support.boxModel && docElem.scrollLeft || body.scrollLeft,
- top = box.top + scrollTop - clientTop,
- left = box.left + scrollLeft - clientLeft;
-
- return { top: top, left: left };
- };
-
-} else {
- getOffset = function( elem, doc, docElem ) {
- var computedStyle,
- offsetParent = elem.offsetParent,
- prevOffsetParent = elem,
- body = doc.body,
- defaultView = doc.defaultView,
- prevComputedStyle = defaultView ? defaultView.getComputedStyle( elem, null ) : elem.currentStyle,
- top = elem.offsetTop,
- left = elem.offsetLeft;
-
- while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) {
- if ( jQuery.support.fixedPosition && prevComputedStyle.position === "fixed" ) {
- break;
- }
-
- computedStyle = defaultView ? defaultView.getComputedStyle(elem, null) : elem.currentStyle;
- top -= elem.scrollTop;
- left -= elem.scrollLeft;
-
- if ( elem === offsetParent ) {
- top += elem.offsetTop;
- left += elem.offsetLeft;
-
- if ( jQuery.support.doesNotAddBorder && !(jQuery.support.doesAddBorderForTableAndCells && rtable.test(elem.nodeName)) ) {
- top += parseFloat( computedStyle.borderTopWidth ) || 0;
- left += parseFloat( computedStyle.borderLeftWidth ) || 0;
- }
-
- prevOffsetParent = offsetParent;
- offsetParent = elem.offsetParent;
- }
-
- if ( jQuery.support.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" ) {
- top += parseFloat( computedStyle.borderTopWidth ) || 0;
- left += parseFloat( computedStyle.borderLeftWidth ) || 0;
- }
-
- prevComputedStyle = computedStyle;
- }
-
- if ( prevComputedStyle.position === "relative" || prevComputedStyle.position === "static" ) {
- top += body.offsetTop;
- left += body.offsetLeft;
- }
-
- if ( jQuery.support.fixedPosition && prevComputedStyle.position === "fixed" ) {
- top += Math.max( docElem.scrollTop, body.scrollTop );
- left += Math.max( docElem.scrollLeft, body.scrollLeft );
- }
-
- return { top: top, left: left };
- };
-}
-
-jQuery.fn.offset = function( options ) {
- if ( arguments.length ) {
- return options === undefined ?
- this :
- this.each(function( i ) {
- jQuery.offset.setOffset( this, options, i );
- });
- }
-
- var elem = this[0],
- doc = elem && elem.ownerDocument;
-
- if ( !doc ) {
- return null;
- }
-
- if ( elem === doc.body ) {
- return jQuery.offset.bodyOffset( elem );
- }
-
- return getOffset( elem, doc, doc.documentElement );
-};
-
-jQuery.offset = {
-
- bodyOffset: function( body ) {
- var top = body.offsetTop,
- left = body.offsetLeft;
-
- if ( jQuery.support.doesNotIncludeMarginInBodyOffset ) {
- top += parseFloat( jQuery.css(body, "marginTop") ) || 0;
- left += parseFloat( jQuery.css(body, "marginLeft") ) || 0;
- }
-
- return { top: top, left: left };
- },
-
- setOffset: function( elem, options, i ) {
- var position = jQuery.css( elem, "position" );
-
- // set position first, in-case top/left are set even on static elem
- if ( position === "static" ) {
- elem.style.position = "relative";
- }
-
- var curElem = jQuery( elem ),
- curOffset = curElem.offset(),
- curCSSTop = jQuery.css( elem, "top" ),
- curCSSLeft = jQuery.css( elem, "left" ),
- calculatePosition = ( position === "absolute" || position === "fixed" ) && jQuery.inArray("auto", [curCSSTop, curCSSLeft]) > -1,
- props = {}, curPosition = {}, curTop, curLeft;
-
- // need to be able to calculate position if either top or left is auto and position is either absolute or fixed
- if ( calculatePosition ) {
- curPosition = curElem.position();
- curTop = curPosition.top;
- curLeft = curPosition.left;
- } else {
- curTop = parseFloat( curCSSTop ) || 0;
- curLeft = parseFloat( curCSSLeft ) || 0;
- }
-
- if ( jQuery.isFunction( options ) ) {
- options = options.call( elem, i, curOffset );
- }
-
- if ( options.top != null ) {
- props.top = ( options.top - curOffset.top ) + curTop;
- }
- if ( options.left != null ) {
- props.left = ( options.left - curOffset.left ) + curLeft;
- }
-
- if ( "using" in options ) {
- options.using.call( elem, props );
- } else {
- curElem.css( props );
- }
- }
-};
-
-
-jQuery.fn.extend({
-
- position: function() {
- if ( !this[0] ) {
- return null;
- }
-
- var elem = this[0],
-
- // Get *real* offsetParent
- offsetParent = this.offsetParent(),
-
- // Get correct offsets
- offset = this.offset(),
- parentOffset = rroot.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset();
-
- // Subtract element margins
- // note: when an element has margin: auto the offsetLeft and marginLeft
- // are the same in Safari causing offset.left to incorrectly be 0
- offset.top -= parseFloat( jQuery.css(elem, "marginTop") ) || 0;
- offset.left -= parseFloat( jQuery.css(elem, "marginLeft") ) || 0;
-
- // Add offsetParent borders
- parentOffset.top += parseFloat( jQuery.css(offsetParent[0], "borderTopWidth") ) || 0;
- parentOffset.left += parseFloat( jQuery.css(offsetParent[0], "borderLeftWidth") ) || 0;
-
- // Subtract the two offsets
- return {
- top: offset.top - parentOffset.top,
- left: offset.left - parentOffset.left
- };
- },
-
- offsetParent: function() {
- return this.map(function() {
- var offsetParent = this.offsetParent || document.body;
- while ( offsetParent && (!rroot.test(offsetParent.nodeName) && jQuery.css(offsetParent, "position") === "static") ) {
- offsetParent = offsetParent.offsetParent;
- }
- return offsetParent;
- });
- }
-});
-
-
-// Create scrollLeft and scrollTop methods
-jQuery.each( {scrollLeft: "pageXOffset", scrollTop: "pageYOffset"}, function( method, prop ) {
- var top = /Y/.test( prop );
-
- jQuery.fn[ method ] = function( val ) {
- return jQuery.access( this, function( elem, method, val ) {
- var win = getWindow( elem );
-
- if ( val === undefined ) {
- return win ? (prop in win) ? win[ prop ] :
- jQuery.support.boxModel && win.document.documentElement[ method ] ||
- win.document.body[ method ] :
- elem[ method ];
- }
-
- if ( win ) {
- win.scrollTo(
- !top ? val : jQuery( win ).scrollLeft(),
- top ? val : jQuery( win ).scrollTop()
- );
-
- } else {
- elem[ method ] = val;
- }
- }, method, val, arguments.length, null );
- };
-});
-
-function getWindow( elem ) {
- return jQuery.isWindow( elem ) ?
- elem :
- elem.nodeType === 9 ?
- elem.defaultView || elem.parentWindow :
- false;
-}
-
-
-
-
-// Create width, height, innerHeight, innerWidth, outerHeight and outerWidth methods
-jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
- var clientProp = "client" + name,
- scrollProp = "scroll" + name,
- offsetProp = "offset" + name;
-
- // innerHeight and innerWidth
- jQuery.fn[ "inner" + name ] = function() {
- var elem = this[0];
- return elem ?
- elem.style ?
- parseFloat( jQuery.css( elem, type, "padding" ) ) :
- this[ type ]() :
- null;
- };
-
- // outerHeight and outerWidth
- jQuery.fn[ "outer" + name ] = function( margin ) {
- var elem = this[0];
- return elem ?
- elem.style ?
- parseFloat( jQuery.css( elem, type, margin ? "margin" : "border" ) ) :
- this[ type ]() :
- null;
- };
-
- jQuery.fn[ type ] = function( value ) {
- return jQuery.access( this, function( elem, type, value ) {
- var doc, docElemProp, orig, ret;
-
- if ( jQuery.isWindow( elem ) ) {
- // 3rd condition allows Nokia support, as it supports the docElem prop but not CSS1Compat
- doc = elem.document;
- docElemProp = doc.documentElement[ clientProp ];
- return jQuery.support.boxModel && docElemProp ||
- doc.body && doc.body[ clientProp ] || docElemProp;
- }
-
- // Get document width or height
- if ( elem.nodeType === 9 ) {
- // Either scroll[Width/Height] or offset[Width/Height], whichever is greater
- doc = elem.documentElement;
-
- // when a window > document, IE6 reports a offset[Width/Height] > client[Width/Height]
- // so we can't use max, as it'll choose the incorrect offset[Width/Height]
- // instead we use the correct client[Width/Height]
- // support:IE6
- if ( doc[ clientProp ] >= doc[ scrollProp ] ) {
- return doc[ clientProp ];
- }
-
- return Math.max(
- elem.body[ scrollProp ], doc[ scrollProp ],
- elem.body[ offsetProp ], doc[ offsetProp ]
- );
- }
-
- // Get width or height on the element
- if ( value === undefined ) {
- orig = jQuery.css( elem, type );
- ret = parseFloat( orig );
- return jQuery.isNumeric( ret ) ? ret : orig;
- }
-
- // Set the width or height on the element
- jQuery( elem ).css( type, value );
- }, type, value, arguments.length, null );
- };
-});
-
-
-
-
-// Expose jQuery to the global object
-window.jQuery = window.$ = jQuery;
-
-// Expose jQuery as an AMD module, but only for AMD loaders that
-// understand the issues with loading multiple versions of jQuery
-// in a page that all might call define(). The loader will indicate
-// they have special allowances for multiple jQuery versions by
-// specifying define.amd.jQuery = true. Register as a named module,
-// since jQuery can be concatenated with other files that may use define,
-// but not use a proper concatenation script that understands anonymous
-// AMD modules. A named AMD is safest and most robust way to register.
-// Lowercase jquery is used because AMD module names are derived from
-// file names, and jQuery is normally delivered in a lowercase file name.
-// Do this after creating the global so that if an AMD module wants to call
-// noConflict to hide this version of jQuery, it will work.
-if ( typeof define === "function" && define.amd && define.amd.jQuery ) {
- define( "jquery", [], function () { return jQuery; } );
-}
-
-
-
-})( window );
diff --git a/docs/_build/html/_static/minus.png b/docs/_build/html/_static/minus.png
deleted file mode 100644
index da1c562..0000000
--- a/docs/_build/html/_static/minus.png
+++ /dev/null
Binary files differ
diff --git a/docs/_build/html/_static/plus.png b/docs/_build/html/_static/plus.png
deleted file mode 100644
index b3cb374..0000000
--- a/docs/_build/html/_static/plus.png
+++ /dev/null
Binary files differ
diff --git a/docs/_build/html/_static/pygments.css b/docs/_build/html/_static/pygments.css
deleted file mode 100644
index 1a14f2a..0000000
--- a/docs/_build/html/_static/pygments.css
+++ /dev/null
@@ -1,62 +0,0 @@
-.highlight .hll { background-color: #ffffcc }
-.highlight { background: #eeffcc; }
-.highlight .c { color: #408090; font-style: italic } /* Comment */
-.highlight .err { border: 1px solid #FF0000 } /* Error */
-.highlight .k { color: #007020; font-weight: bold } /* Keyword */
-.highlight .o { color: #666666 } /* Operator */
-.highlight .cm { color: #408090; font-style: italic } /* Comment.Multiline */
-.highlight .cp { color: #007020 } /* Comment.Preproc */
-.highlight .c1 { color: #408090; font-style: italic } /* Comment.Single */
-.highlight .cs { color: #408090; background-color: #fff0f0 } /* Comment.Special */
-.highlight .gd { color: #A00000 } /* Generic.Deleted */
-.highlight .ge { font-style: italic } /* Generic.Emph */
-.highlight .gr { color: #FF0000 } /* Generic.Error */
-.highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */
-.highlight .gi { color: #00A000 } /* Generic.Inserted */
-.highlight .go { color: #303030 } /* Generic.Output */
-.highlight .gp { color: #c65d09; font-weight: bold } /* Generic.Prompt */
-.highlight .gs { font-weight: bold } /* Generic.Strong */
-.highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */
-.highlight .gt { color: #0040D0 } /* Generic.Traceback */
-.highlight .kc { color: #007020; font-weight: bold } /* Keyword.Constant */
-.highlight .kd { color: #007020; font-weight: bold } /* Keyword.Declaration */
-.highlight .kn { color: #007020; font-weight: bold } /* Keyword.Namespace */
-.highlight .kp { color: #007020 } /* Keyword.Pseudo */
-.highlight .kr { color: #007020; font-weight: bold } /* Keyword.Reserved */
-.highlight .kt { color: #902000 } /* Keyword.Type */
-.highlight .m { color: #208050 } /* Literal.Number */
-.highlight .s { color: #4070a0 } /* Literal.String */
-.highlight .na { color: #4070a0 } /* Name.Attribute */
-.highlight .nb { color: #007020 } /* Name.Builtin */
-.highlight .nc { color: #0e84b5; font-weight: bold } /* Name.Class */
-.highlight .no { color: #60add5 } /* Name.Constant */
-.highlight .nd { color: #555555; font-weight: bold } /* Name.Decorator */
-.highlight .ni { color: #d55537; font-weight: bold } /* Name.Entity */
-.highlight .ne { color: #007020 } /* Name.Exception */
-.highlight .nf { color: #06287e } /* Name.Function */
-.highlight .nl { color: #002070; font-weight: bold } /* Name.Label */
-.highlight .nn { color: #0e84b5; font-weight: bold } /* Name.Namespace */
-.highlight .nt { color: #062873; font-weight: bold } /* Name.Tag */
-.highlight .nv { color: #bb60d5 } /* Name.Variable */
-.highlight .ow { color: #007020; font-weight: bold } /* Operator.Word */
-.highlight .w { color: #bbbbbb } /* Text.Whitespace */
-.highlight .mf { color: #208050 } /* Literal.Number.Float */
-.highlight .mh { color: #208050 } /* Literal.Number.Hex */
-.highlight .mi { color: #208050 } /* Literal.Number.Integer */
-.highlight .mo { color: #208050 } /* Literal.Number.Oct */
-.highlight .sb { color: #4070a0 } /* Literal.String.Backtick */
-.highlight .sc { color: #4070a0 } /* Literal.String.Char */
-.highlight .sd { color: #4070a0; font-style: italic } /* Literal.String.Doc */
-.highlight .s2 { color: #4070a0 } /* Literal.String.Double */
-.highlight .se { color: #4070a0; font-weight: bold } /* Literal.String.Escape */
-.highlight .sh { color: #4070a0 } /* Literal.String.Heredoc */
-.highlight .si { color: #70a0d0; font-style: italic } /* Literal.String.Interpol */
-.highlight .sx { color: #c65d09 } /* Literal.String.Other */
-.highlight .sr { color: #235388 } /* Literal.String.Regex */
-.highlight .s1 { color: #4070a0 } /* Literal.String.Single */
-.highlight .ss { color: #517918 } /* Literal.String.Symbol */
-.highlight .bp { color: #007020 } /* Name.Builtin.Pseudo */
-.highlight .vc { color: #bb60d5 } /* Name.Variable.Class */
-.highlight .vg { color: #bb60d5 } /* Name.Variable.Global */
-.highlight .vi { color: #bb60d5 } /* Name.Variable.Instance */
-.highlight .il { color: #208050 } /* Literal.Number.Integer.Long */ \ No newline at end of file
diff --git a/docs/_build/html/_static/searchtools.js b/docs/_build/html/_static/searchtools.js
deleted file mode 100644
index 663be4c..0000000
--- a/docs/_build/html/_static/searchtools.js
+++ /dev/null
@@ -1,560 +0,0 @@
-/*
- * searchtools.js_t
- * ~~~~~~~~~~~~~~~~
- *
- * Sphinx JavaScript utilties for the full-text search.
- *
- * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
- * :license: BSD, see LICENSE for details.
- *
- */
-
-/**
- * helper function to return a node containing the
- * search summary for a given text. keywords is a list
- * of stemmed words, hlwords is the list of normal, unstemmed
- * words. the first one is used to find the occurance, the
- * latter for highlighting it.
- */
-
-jQuery.makeSearchSummary = function(text, keywords, hlwords) {
- var textLower = text.toLowerCase();
- var start = 0;
- $.each(keywords, function() {
- var i = textLower.indexOf(this.toLowerCase());
- if (i > -1)
- start = i;
- });
- start = Math.max(start - 120, 0);
- var excerpt = ((start > 0) ? '...' : '') +
- $.trim(text.substr(start, 240)) +
- ((start + 240 - text.length) ? '...' : '');
- var rv = $('<div class="context"></div>').text(excerpt);
- $.each(hlwords, function() {
- rv = rv.highlightText(this, 'highlighted');
- });
- return rv;
-}
-
-
-/**
- * Porter Stemmer
- */
-var Stemmer = function() {
-
- var step2list = {
- ational: 'ate',
- tional: 'tion',
- enci: 'ence',
- anci: 'ance',
- izer: 'ize',
- bli: 'ble',
- alli: 'al',
- entli: 'ent',
- eli: 'e',
- ousli: 'ous',
- ization: 'ize',
- ation: 'ate',
- ator: 'ate',
- alism: 'al',
- iveness: 'ive',
- fulness: 'ful',
- ousness: 'ous',
- aliti: 'al',
- iviti: 'ive',
- biliti: 'ble',
- logi: 'log'
- };
-
- var step3list = {
- icate: 'ic',
- ative: '',
- alize: 'al',
- iciti: 'ic',
- ical: 'ic',
- ful: '',
- ness: ''
- };
-
- var c = "[^aeiou]"; // consonant
- var v = "[aeiouy]"; // vowel
- var C = c + "[^aeiouy]*"; // consonant sequence
- var V = v + "[aeiou]*"; // vowel sequence
-
- var mgr0 = "^(" + C + ")?" + V + C; // [C]VC... is m>0
- var meq1 = "^(" + C + ")?" + V + C + "(" + V + ")?$"; // [C]VC[V] is m=1
- var mgr1 = "^(" + C + ")?" + V + C + V + C; // [C]VCVC... is m>1
- var s_v = "^(" + C + ")?" + v; // vowel in stem
-
- this.stemWord = function (w) {
- var stem;
- var suffix;
- var firstch;
- var origword = w;
-
- if (w.length < 3)
- return w;
-
- var re;
- var re2;
- var re3;
- var re4;
-
- firstch = w.substr(0,1);
- if (firstch == "y")
- w = firstch.toUpperCase() + w.substr(1);
-
- // Step 1a
- re = /^(.+?)(ss|i)es$/;
- re2 = /^(.+?)([^s])s$/;
-
- if (re.test(w))
- w = w.replace(re,"$1$2");
- else if (re2.test(w))
- w = w.replace(re2,"$1$2");
-
- // Step 1b
- re = /^(.+?)eed$/;
- re2 = /^(.+?)(ed|ing)$/;
- if (re.test(w)) {
- var fp = re.exec(w);
- re = new RegExp(mgr0);
- if (re.test(fp[1])) {
- re = /.$/;
- w = w.replace(re,"");
- }
- }
- else if (re2.test(w)) {
- var fp = re2.exec(w);
- stem = fp[1];
- re2 = new RegExp(s_v);
- if (re2.test(stem)) {
- w = stem;
- re2 = /(at|bl|iz)$/;
- re3 = new RegExp("([^aeiouylsz])\\1$");
- re4 = new RegExp("^" + C + v + "[^aeiouwxy]$");
- if (re2.test(w))
- w = w + "e";
- else if (re3.test(w)) {
- re = /.$/;
- w = w.replace(re,"");
- }
- else if (re4.test(w))
- w = w + "e";
- }
- }
-
- // Step 1c
- re = /^(.+?)y$/;
- if (re.test(w)) {
- var fp = re.exec(w);
- stem = fp[1];
- re = new RegExp(s_v);
- if (re.test(stem))
- w = stem + "i";
- }
-
- // Step 2
- re = /^(.+?)(ational|tional|enci|anci|izer|bli|alli|entli|eli|ousli|ization|ation|ator|alism|iveness|fulness|ousness|aliti|iviti|biliti|logi)$/;
- if (re.test(w)) {
- var fp = re.exec(w);
- stem = fp[1];
- suffix = fp[2];
- re = new RegExp(mgr0);
- if (re.test(stem))
- w = stem + step2list[suffix];
- }
-
- // Step 3
- re = /^(.+?)(icate|ative|alize|iciti|ical|ful|ness)$/;
- if (re.test(w)) {
- var fp = re.exec(w);
- stem = fp[1];
- suffix = fp[2];
- re = new RegExp(mgr0);
- if (re.test(stem))
- w = stem + step3list[suffix];
- }
-
- // Step 4
- re = /^(.+?)(al|ance|ence|er|ic|able|ible|ant|ement|ment|ent|ou|ism|ate|iti|ous|ive|ize)$/;
- re2 = /^(.+?)(s|t)(ion)$/;
- if (re.test(w)) {
- var fp = re.exec(w);
- stem = fp[1];
- re = new RegExp(mgr1);
- if (re.test(stem))
- w = stem;
- }
- else if (re2.test(w)) {
- var fp = re2.exec(w);
- stem = fp[1] + fp[2];
- re2 = new RegExp(mgr1);
- if (re2.test(stem))
- w = stem;
- }
-
- // Step 5
- re = /^(.+?)e$/;
- if (re.test(w)) {
- var fp = re.exec(w);
- stem = fp[1];
- re = new RegExp(mgr1);
- re2 = new RegExp(meq1);
- re3 = new RegExp("^" + C + v + "[^aeiouwxy]$");
- if (re.test(stem) || (re2.test(stem) && !(re3.test(stem))))
- w = stem;
- }
- re = /ll$/;
- re2 = new RegExp(mgr1);
- if (re.test(w) && re2.test(w)) {
- re = /.$/;
- w = w.replace(re,"");
- }
-
- // and turn initial Y back to y
- if (firstch == "y")
- w = firstch.toLowerCase() + w.substr(1);
- return w;
- }
-}
-
-
-/**
- * Search Module
- */
-var Search = {
-
- _index : null,
- _queued_query : null,
- _pulse_status : -1,
-
- init : function() {
- var params = $.getQueryParameters();
- if (params.q) {
- var query = params.q[0];
- $('input[name="q"]')[0].value = query;
- this.performSearch(query);
- }
- },
-
- loadIndex : function(url) {
- $.ajax({type: "GET", url: url, data: null, success: null,
- dataType: "script", cache: true});
- },
-
- setIndex : function(index) {
- var q;
- this._index = index;
- if ((q = this._queued_query) !== null) {
- this._queued_query = null;
- Search.query(q);
- }
- },
-
- hasIndex : function() {
- return this._index !== null;
- },
-
- deferQuery : function(query) {
- this._queued_query = query;
- },
-
- stopPulse : function() {
- this._pulse_status = 0;
- },
-
- startPulse : function() {
- if (this._pulse_status >= 0)
- return;
- function pulse() {
- Search._pulse_status = (Search._pulse_status + 1) % 4;
- var dotString = '';
- for (var i = 0; i < Search._pulse_status; i++)
- dotString += '.';
- Search.dots.text(dotString);
- if (Search._pulse_status > -1)
- window.setTimeout(pulse, 500);
- };
- pulse();
- },
-
- /**
- * perform a search for something
- */
- performSearch : function(query) {
- // create the required interface elements
- this.out = $('#search-results');
- this.title = $('<h2>' + _('Searching') + '</h2>').appendTo(this.out);
- this.dots = $('<span></span>').appendTo(this.title);
- this.status = $('<p style="display: none"></p>').appendTo(this.out);
- this.output = $('<ul class="search"/>').appendTo(this.out);
-
- $('#search-progress').text(_('Preparing search...'));
- this.startPulse();
-
- // index already loaded, the browser was quick!
- if (this.hasIndex())
- this.query(query);
- else
- this.deferQuery(query);
- },
-
- query : function(query) {
- var stopwords = ["and","then","into","it","as","are","in","if","for","no","there","their","was","is","be","to","that","but","they","not","such","with","by","a","on","these","of","will","this","near","the","or","at"];
-
- // Stem the searchterms and add them to the correct list
- var stemmer = new Stemmer();
- var searchterms = [];
- var excluded = [];
- var hlterms = [];
- var tmp = query.split(/\s+/);
- var objectterms = [];
- for (var i = 0; i < tmp.length; i++) {
- if (tmp[i] != "") {
- objectterms.push(tmp[i].toLowerCase());
- }
-
- if ($u.indexOf(stopwords, tmp[i]) != -1 || tmp[i].match(/^\d+$/) ||
- tmp[i] == "") {
- // skip this "word"
- continue;
- }
- // stem the word
- var word = stemmer.stemWord(tmp[i]).toLowerCase();
- // select the correct list
- if (word[0] == '-') {
- var toAppend = excluded;
- word = word.substr(1);
- }
- else {
- var toAppend = searchterms;
- hlterms.push(tmp[i].toLowerCase());
- }
- // only add if not already in the list
- if (!$.contains(toAppend, word))
- toAppend.push(word);
- };
- var highlightstring = '?highlight=' + $.urlencode(hlterms.join(" "));
-
- // console.debug('SEARCH: searching for:');
- // console.info('required: ', searchterms);
- // console.info('excluded: ', excluded);
-
- // prepare search
- var filenames = this._index.filenames;
- var titles = this._index.titles;
- var terms = this._index.terms;
- var fileMap = {};
- var files = null;
- // different result priorities
- var importantResults = [];
- var objectResults = [];
- var regularResults = [];
- var unimportantResults = [];
- $('#search-progress').empty();
-
- // lookup as object
- for (var i = 0; i < objectterms.length; i++) {
- var others = [].concat(objectterms.slice(0,i),
- objectterms.slice(i+1, objectterms.length))
- var results = this.performObjectSearch(objectterms[i], others);
- // Assume first word is most likely to be the object,
- // other words more likely to be in description.
- // Therefore put matches for earlier words first.
- // (Results are eventually used in reverse order).
- objectResults = results[0].concat(objectResults);
- importantResults = results[1].concat(importantResults);
- unimportantResults = results[2].concat(unimportantResults);
- }
-
- // perform the search on the required terms
- for (var i = 0; i < searchterms.length; i++) {
- var word = searchterms[i];
- // no match but word was a required one
- if ((files = terms[word]) == null)
- break;
- if (files.length == undefined) {
- files = [files];
- }
- // create the mapping
- for (var j = 0; j < files.length; j++) {
- var file = files[j];
- if (file in fileMap)
- fileMap[file].push(word);
- else
- fileMap[file] = [word];
- }
- }
-
- // now check if the files don't contain excluded terms
- for (var file in fileMap) {
- var valid = true;
-
- // check if all requirements are matched
- if (fileMap[file].length != searchterms.length)
- continue;
-
- // ensure that none of the excluded terms is in the
- // search result.
- for (var i = 0; i < excluded.length; i++) {
- if (terms[excluded[i]] == file ||
- $.contains(terms[excluded[i]] || [], file)) {
- valid = false;
- break;
- }
- }
-
- // if we have still a valid result we can add it
- // to the result list
- if (valid)
- regularResults.push([filenames[file], titles[file], '', null]);
- }
-
- // delete unused variables in order to not waste
- // memory until list is retrieved completely
- delete filenames, titles, terms;
-
- // now sort the regular results descending by title
- regularResults.sort(function(a, b) {
- var left = a[1].toLowerCase();
- var right = b[1].toLowerCase();
- return (left > right) ? -1 : ((left < right) ? 1 : 0);
- });
-
- // combine all results
- var results = unimportantResults.concat(regularResults)
- .concat(objectResults).concat(importantResults);
-
- // print the results
- var resultCount = results.length;
- function displayNextItem() {
- // results left, load the summary and display it
- if (results.length) {
- var item = results.pop();
- var listItem = $('<li style="display:none"></li>');
- if (DOCUMENTATION_OPTIONS.FILE_SUFFIX == '') {
- // dirhtml builder
- var dirname = item[0] + '/';
- if (dirname.match(/\/index\/$/)) {
- dirname = dirname.substring(0, dirname.length-6);
- } else if (dirname == 'index/') {
- dirname = '';
- }
- listItem.append($('<a/>').attr('href',
- DOCUMENTATION_OPTIONS.URL_ROOT + dirname +
- highlightstring + item[2]).html(item[1]));
- } else {
- // normal html builders
- listItem.append($('<a/>').attr('href',
- item[0] + DOCUMENTATION_OPTIONS.FILE_SUFFIX +
- highlightstring + item[2]).html(item[1]));
- }
- if (item[3]) {
- listItem.append($('<span> (' + item[3] + ')</span>'));
- Search.output.append(listItem);
- listItem.slideDown(5, function() {
- displayNextItem();
- });
- } else if (DOCUMENTATION_OPTIONS.HAS_SOURCE) {
- $.get(DOCUMENTATION_OPTIONS.URL_ROOT + '_sources/' +
- item[0] + '.txt', function(data) {
- if (data != '') {
- listItem.append($.makeSearchSummary(data, searchterms, hlterms));
- Search.output.append(listItem);
- }
- listItem.slideDown(5, function() {
- displayNextItem();
- });
- }, "text");
- } else {
- // no source available, just display title
- Search.output.append(listItem);
- listItem.slideDown(5, function() {
- displayNextItem();
- });
- }
- }
- // search finished, update title and status message
- else {
- Search.stopPulse();
- Search.title.text(_('Search Results'));
- if (!resultCount)
- Search.status.text(_('Your search did not match any documents. Please make sure that all words are spelled correctly and that you\'ve selected enough categories.'));
- else
- Search.status.text(_('Search finished, found %s page(s) matching the search query.').replace('%s', resultCount));
- Search.status.fadeIn(500);
- }
- }
- displayNextItem();
- },
-
- performObjectSearch : function(object, otherterms) {
- var filenames = this._index.filenames;
- var objects = this._index.objects;
- var objnames = this._index.objnames;
- var titles = this._index.titles;
-
- var importantResults = [];
- var objectResults = [];
- var unimportantResults = [];
-
- for (var prefix in objects) {
- for (var name in objects[prefix]) {
- var fullname = (prefix ? prefix + '.' : '') + name;
- if (fullname.toLowerCase().indexOf(object) > -1) {
- var match = objects[prefix][name];
- var objname = objnames[match[1]][2];
- var title = titles[match[0]];
- // If more than one term searched for, we require other words to be
- // found in the name/title/description
- if (otherterms.length > 0) {
- var haystack = (prefix + ' ' + name + ' ' +
- objname + ' ' + title).toLowerCase();
- var allfound = true;
- for (var i = 0; i < otherterms.length; i++) {
- if (haystack.indexOf(otherterms[i]) == -1) {
- allfound = false;
- break;
- }
- }
- if (!allfound) {
- continue;
- }
- }
- var descr = objname + _(', in ') + title;
- anchor = match[3];
- if (anchor == '')
- anchor = fullname;
- else if (anchor == '-')
- anchor = objnames[match[1]][1] + '-' + fullname;
- result = [filenames[match[0]], fullname, '#'+anchor, descr];
- switch (match[2]) {
- case 1: objectResults.push(result); break;
- case 0: importantResults.push(result); break;
- case 2: unimportantResults.push(result); break;
- }
- }
- }
- }
-
- // sort results descending
- objectResults.sort(function(a, b) {
- return (a[1] > b[1]) ? -1 : ((a[1] < b[1]) ? 1 : 0);
- });
-
- importantResults.sort(function(a, b) {
- return (a[1] > b[1]) ? -1 : ((a[1] < b[1]) ? 1 : 0);
- });
-
- unimportantResults.sort(function(a, b) {
- return (a[1] > b[1]) ? -1 : ((a[1] < b[1]) ? 1 : 0);
- });
-
- return [importantResults, objectResults, unimportantResults]
- }
-}
-
-$(document).ready(function() {
- Search.init();
-}); \ No newline at end of file
diff --git a/docs/_build/html/_static/sidebar.js b/docs/_build/html/_static/sidebar.js
deleted file mode 100644
index a45e192..0000000
--- a/docs/_build/html/_static/sidebar.js
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * sidebar.js
- * ~~~~~~~~~~
- *
- * This script makes the Sphinx sidebar collapsible.
- *
- * .sphinxsidebar contains .sphinxsidebarwrapper. This script adds
- * in .sphixsidebar, after .sphinxsidebarwrapper, the #sidebarbutton
- * used to collapse and expand the sidebar.
- *
- * When the sidebar is collapsed the .sphinxsidebarwrapper is hidden
- * and the width of the sidebar and the margin-left of the document
- * are decreased. When the sidebar is expanded the opposite happens.
- * This script saves a per-browser/per-session cookie used to
- * remember the position of the sidebar among the pages.
- * Once the browser is closed the cookie is deleted and the position
- * reset to the default (expanded).
- *
- * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
- * :license: BSD, see LICENSE for details.
- *
- */
-
-$(function() {
- // global elements used by the functions.
- // the 'sidebarbutton' element is defined as global after its
- // creation, in the add_sidebar_button function
- var bodywrapper = $('.bodywrapper');
- var sidebar = $('.sphinxsidebar');
- var sidebarwrapper = $('.sphinxsidebarwrapper');
-
- // for some reason, the document has no sidebar; do not run into errors
- if (!sidebar.length) return;
-
- // original margin-left of the bodywrapper and width of the sidebar
- // with the sidebar expanded
- var bw_margin_expanded = bodywrapper.css('margin-left');
- var ssb_width_expanded = sidebar.width();
-
- // margin-left of the bodywrapper and width of the sidebar
- // with the sidebar collapsed
- var bw_margin_collapsed = '.8em';
- var ssb_width_collapsed = '.8em';
-
- // colors used by the current theme
- var dark_color = $('.related').css('background-color');
- var light_color = $('.document').css('background-color');
-
- function sidebar_is_collapsed() {
- return sidebarwrapper.is(':not(:visible)');
- }
-
- function toggle_sidebar() {
- if (sidebar_is_collapsed())
- expand_sidebar();
- else
- collapse_sidebar();
- }
-
- function collapse_sidebar() {
- sidebarwrapper.hide();
- sidebar.css('width', ssb_width_collapsed);
- bodywrapper.css('margin-left', bw_margin_collapsed);
- sidebarbutton.css({
- 'margin-left': '0',
- 'height': bodywrapper.height()
- });
- sidebarbutton.find('span').text('»');
- sidebarbutton.attr('title', _('Expand sidebar'));
- document.cookie = 'sidebar=collapsed';
- }
-
- function expand_sidebar() {
- bodywrapper.css('margin-left', bw_margin_expanded);
- sidebar.css('width', ssb_width_expanded);
- sidebarwrapper.show();
- sidebarbutton.css({
- 'margin-left': ssb_width_expanded-12,
- 'height': bodywrapper.height()
- });
- sidebarbutton.find('span').text('«');
- sidebarbutton.attr('title', _('Collapse sidebar'));
- document.cookie = 'sidebar=expanded';
- }
-
- function add_sidebar_button() {
- sidebarwrapper.css({
- 'float': 'left',
- 'margin-right': '0',
- 'width': ssb_width_expanded - 28
- });
- // create the button
- sidebar.append(
- '<div id="sidebarbutton"><span>&laquo;</span></div>'
- );
- var sidebarbutton = $('#sidebarbutton');
- light_color = sidebarbutton.css('background-color');
- // find the height of the viewport to center the '<<' in the page
- var viewport_height;
- if (window.innerHeight)
- viewport_height = window.innerHeight;
- else
- viewport_height = $(window).height();
- sidebarbutton.find('span').css({
- 'display': 'block',
- 'margin-top': (viewport_height - sidebar.position().top - 20) / 2
- });
-
- sidebarbutton.click(toggle_sidebar);
- sidebarbutton.attr('title', _('Collapse sidebar'));
- sidebarbutton.css({
- 'color': '#FFFFFF',
- 'border-left': '1px solid ' + dark_color,
- 'font-size': '1.2em',
- 'cursor': 'pointer',
- 'height': bodywrapper.height(),
- 'padding-top': '1px',
- 'margin-left': ssb_width_expanded - 12
- });
-
- sidebarbutton.hover(
- function () {
- $(this).css('background-color', dark_color);
- },
- function () {
- $(this).css('background-color', light_color);
- }
- );
- }
-
- function set_position_from_cookie() {
- if (!document.cookie)
- return;
- var items = document.cookie.split(';');
- for(var k=0; k<items.length; k++) {
- var key_val = items[k].split('=');
- var key = key_val[0];
- if (key == 'sidebar') {
- var value = key_val[1];
- if ((value == 'collapsed') && (!sidebar_is_collapsed()))
- collapse_sidebar();
- else if ((value == 'expanded') && (sidebar_is_collapsed()))
- expand_sidebar();
- }
- }
- }
-
- add_sidebar_button();
- var sidebarbutton = $('#sidebarbutton');
- set_position_from_cookie();
-});
diff --git a/docs/_build/html/_static/underscore.js b/docs/_build/html/_static/underscore.js
deleted file mode 100644
index eaba008..0000000
--- a/docs/_build/html/_static/underscore.js
+++ /dev/null
@@ -1,807 +0,0 @@
-// Underscore.js 1.1.6
-// (c) 2011 Jeremy Ashkenas, DocumentCloud Inc.
-// Underscore is freely distributable under the MIT license.
-// Portions of Underscore are inspired or borrowed from Prototype,
-// Oliver Steele's Functional, and John Resig's Micro-Templating.
-// For all details and documentation:
-// http://documentcloud.github.com/underscore
-
-(function() {
-
- // Baseline setup
- // --------------
-
- // Establish the root object, `window` in the browser, or `global` on the server.
- var root = this;
-
- // Save the previous value of the `_` variable.
- var previousUnderscore = root._;
-
- // Establish the object that gets returned to break out of a loop iteration.
- var breaker = {};
-
- // Save bytes in the minified (but not gzipped) version:
- var ArrayProto = Array.prototype, ObjProto = Object.prototype, FuncProto = Function.prototype;
-
- // Create quick reference variables for speed access to core prototypes.
- var slice = ArrayProto.slice,
- unshift = ArrayProto.unshift,
- toString = ObjProto.toString,
- hasOwnProperty = ObjProto.hasOwnProperty;
-
- // All **ECMAScript 5** native function implementations that we hope to use
- // are declared here.
- var
- nativeForEach = ArrayProto.forEach,
- nativeMap = ArrayProto.map,
- nativeReduce = ArrayProto.reduce,
- nativeReduceRight = ArrayProto.reduceRight,
- nativeFilter = ArrayProto.filter,
- nativeEvery = ArrayProto.every,
- nativeSome = ArrayProto.some,
- nativeIndexOf = ArrayProto.indexOf,
- nativeLastIndexOf = ArrayProto.lastIndexOf,
- nativeIsArray = Array.isArray,
- nativeKeys = Object.keys,
- nativeBind = FuncProto.bind;
-
- // Create a safe reference to the Underscore object for use below.
- var _ = function(obj) { return new wrapper(obj); };
-
- // Export the Underscore object for **CommonJS**, with backwards-compatibility
- // for the old `require()` API. If we're not in CommonJS, add `_` to the
- // global object.
- if (typeof module !== 'undefined' && module.exports) {
- module.exports = _;
- _._ = _;
- } else {
- root._ = _;
- }
-
- // Current version.
- _.VERSION = '1.1.6';
-
- // Collection Functions
- // --------------------
-
- // The cornerstone, an `each` implementation, aka `forEach`.
- // Handles objects implementing `forEach`, arrays, and raw objects.
- // Delegates to **ECMAScript 5**'s native `forEach` if available.
- var each = _.each = _.forEach = function(obj, iterator, context) {
- if (obj == null) return;
- if (nativeForEach && obj.forEach === nativeForEach) {
- obj.forEach(iterator, context);
- } else if (_.isNumber(obj.length)) {
- for (var i = 0, l = obj.length; i < l; i++) {
- if (iterator.call(context, obj[i], i, obj) === breaker) return;
- }
- } else {
- for (var key in obj) {
- if (hasOwnProperty.call(obj, key)) {
- if (iterator.call(context, obj[key], key, obj) === breaker) return;
- }
- }
- }
- };
-
- // Return the results of applying the iterator to each element.
- // Delegates to **ECMAScript 5**'s native `map` if available.
- _.map = function(obj, iterator, context) {
- var results = [];
- if (obj == null) return results;
- if (nativeMap && obj.map === nativeMap) return obj.map(iterator, context);
- each(obj, function(value, index, list) {
- results[results.length] = iterator.call(context, value, index, list);
- });
- return results;
- };
-
- // **Reduce** builds up a single result from a list of values, aka `inject`,
- // or `foldl`. Delegates to **ECMAScript 5**'s native `reduce` if available.
- _.reduce = _.foldl = _.inject = function(obj, iterator, memo, context) {
- var initial = memo !== void 0;
- if (obj == null) obj = [];
- if (nativeReduce && obj.reduce === nativeReduce) {
- if (context) iterator = _.bind(iterator, context);
- return initial ? obj.reduce(iterator, memo) : obj.reduce(iterator);
- }
- each(obj, function(value, index, list) {
- if (!initial && index === 0) {
- memo = value;
- initial = true;
- } else {
- memo = iterator.call(context, memo, value, index, list);
- }
- });
- if (!initial) throw new TypeError("Reduce of empty array with no initial value");
- return memo;
- };
-
- // The right-associative version of reduce, also known as `foldr`.
- // Delegates to **ECMAScript 5**'s native `reduceRight` if available.
- _.reduceRight = _.foldr = function(obj, iterator, memo, context) {
- if (obj == null) obj = [];
- if (nativeReduceRight && obj.reduceRight === nativeReduceRight) {
- if (context) iterator = _.bind(iterator, context);
- return memo !== void 0 ? obj.reduceRight(iterator, memo) : obj.reduceRight(iterator);
- }
- var reversed = (_.isArray(obj) ? obj.slice() : _.toArray(obj)).reverse();
- return _.reduce(reversed, iterator, memo, context);
- };
-
- // Return the first value which passes a truth test. Aliased as `detect`.
- _.find = _.detect = function(obj, iterator, context) {
- var result;
- any(obj, function(value, index, list) {
- if (iterator.call(context, value, index, list)) {
- result = value;
- return true;
- }
- });
- return result;
- };
-
- // Return all the elements that pass a truth test.
- // Delegates to **ECMAScript 5**'s native `filter` if available.
- // Aliased as `select`.
- _.filter = _.select = function(obj, iterator, context) {
- var results = [];
- if (obj == null) return results;
- if (nativeFilter && obj.filter === nativeFilter) return obj.filter(iterator, context);
- each(obj, function(value, index, list) {
- if (iterator.call(context, value, index, list)) results[results.length] = value;
- });
- return results;
- };
-
- // Return all the elements for which a truth test fails.
- _.reject = function(obj, iterator, context) {
- var results = [];
- if (obj == null) return results;
- each(obj, function(value, index, list) {
- if (!iterator.call(context, value, index, list)) results[results.length] = value;
- });
- return results;
- };
-
- // Determine whether all of the elements match a truth test.
- // Delegates to **ECMAScript 5**'s native `every` if available.
- // Aliased as `all`.
- _.every = _.all = function(obj, iterator, context) {
- var result = true;
- if (obj == null) return result;
- if (nativeEvery && obj.every === nativeEvery) return obj.every(iterator, context);
- each(obj, function(value, index, list) {
- if (!(result = result && iterator.call(context, value, index, list))) return breaker;
- });
- return result;
- };
-
- // Determine if at least one element in the object matches a truth test.
- // Delegates to **ECMAScript 5**'s native `some` if available.
- // Aliased as `any`.
- var any = _.some = _.any = function(obj, iterator, context) {
- iterator || (iterator = _.identity);
- var result = false;
- if (obj == null) return result;
- if (nativeSome && obj.some === nativeSome) return obj.some(iterator, context);
- each(obj, function(value, index, list) {
- if (result = iterator.call(context, value, index, list)) return breaker;
- });
- return result;
- };
-
- // Determine if a given value is included in the array or object using `===`.
- // Aliased as `contains`.
- _.include = _.contains = function(obj, target) {
- var found = false;
- if (obj == null) return found;
- if (nativeIndexOf && obj.indexOf === nativeIndexOf) return obj.indexOf(target) != -1;
- any(obj, function(value) {
- if (found = value === target) return true;
- });
- return found;
- };
-
- // Invoke a method (with arguments) on every item in a collection.
- _.invoke = function(obj, method) {
- var args = slice.call(arguments, 2);
- return _.map(obj, function(value) {
- return (method.call ? method || value : value[method]).apply(value, args);
- });
- };
-
- // Convenience version of a common use case of `map`: fetching a property.
- _.pluck = function(obj, key) {
- return _.map(obj, function(value){ return value[key]; });
- };
-
- // Return the maximum element or (element-based computation).
- _.max = function(obj, iterator, context) {
- if (!iterator && _.isArray(obj)) return Math.max.apply(Math, obj);
- var result = {computed : -Infinity};
- each(obj, function(value, index, list) {
- var computed = iterator ? iterator.call(context, value, index, list) : value;
- computed >= result.computed && (result = {value : value, computed : computed});
- });
- return result.value;
- };
-
- // Return the minimum element (or element-based computation).
- _.min = function(obj, iterator, context) {
- if (!iterator && _.isArray(obj)) return Math.min.apply(Math, obj);
- var result = {computed : Infinity};
- each(obj, function(value, index, list) {
- var computed = iterator ? iterator.call(context, value, index, list) : value;
- computed < result.computed && (result = {value : value, computed : computed});
- });
- return result.value;
- };
-
- // Sort the object's values by a criterion produced by an iterator.
- _.sortBy = function(obj, iterator, context) {
- return _.pluck(_.map(obj, function(value, index, list) {
- return {
- value : value,
- criteria : iterator.call(context, value, index, list)
- };
- }).sort(function(left, right) {
- var a = left.criteria, b = right.criteria;
- return a < b ? -1 : a > b ? 1 : 0;
- }), 'value');
- };
-
- // Use a comparator function to figure out at what index an object should
- // be inserted so as to maintain order. Uses binary search.
- _.sortedIndex = function(array, obj, iterator) {
- iterator || (iterator = _.identity);
- var low = 0, high = array.length;
- while (low < high) {
- var mid = (low + high) >> 1;
- iterator(array[mid]) < iterator(obj) ? low = mid + 1 : high = mid;
- }
- return low;
- };
-
- // Safely convert anything iterable into a real, live array.
- _.toArray = function(iterable) {
- if (!iterable) return [];
- if (iterable.toArray) return iterable.toArray();
- if (_.isArray(iterable)) return iterable;
- if (_.isArguments(iterable)) return slice.call(iterable);
- return _.values(iterable);
- };
-
- // Return the number of elements in an object.
- _.size = function(obj) {
- return _.toArray(obj).length;
- };
-
- // Array Functions
- // ---------------
-
- // Get the first element of an array. Passing **n** will return the first N
- // values in the array. Aliased as `head`. The **guard** check allows it to work
- // with `_.map`.
- _.first = _.head = function(array, n, guard) {
- return (n != null) && !guard ? slice.call(array, 0, n) : array[0];
- };
-
- // Returns everything but the first entry of the array. Aliased as `tail`.
- // Especially useful on the arguments object. Passing an **index** will return
- // the rest of the values in the array from that index onward. The **guard**
- // check allows it to work with `_.map`.
- _.rest = _.tail = function(array, index, guard) {
- return slice.call(array, (index == null) || guard ? 1 : index);
- };
-
- // Get the last element of an array.
- _.last = function(array) {
- return array[array.length - 1];
- };
-
- // Trim out all falsy values from an array.
- _.compact = function(array) {
- return _.filter(array, function(value){ return !!value; });
- };
-
- // Return a completely flattened version of an array.
- _.flatten = function(array) {
- return _.reduce(array, function(memo, value) {
- if (_.isArray(value)) return memo.concat(_.flatten(value));
- memo[memo.length] = value;
- return memo;
- }, []);
- };
-
- // Return a version of the array that does not contain the specified value(s).
- _.without = function(array) {
- var values = slice.call(arguments, 1);
- return _.filter(array, function(value){ return !_.include(values, value); });
- };
-
- // Produce a duplicate-free version of the array. If the array has already
- // been sorted, you have the option of using a faster algorithm.
- // Aliased as `unique`.
- _.uniq = _.unique = function(array, isSorted) {
- return _.reduce(array, function(memo, el, i) {
- if (0 == i || (isSorted === true ? _.last(memo) != el : !_.include(memo, el))) memo[memo.length] = el;
- return memo;
- }, []);
- };
-
- // Produce an array that contains every item shared between all the
- // passed-in arrays.
- _.intersect = function(array) {
- var rest = slice.call(arguments, 1);
- return _.filter(_.uniq(array), function(item) {
- return _.every(rest, function(other) {
- return _.indexOf(other, item) >= 0;
- });
- });
- };
-
- // Zip together multiple lists into a single array -- elements that share
- // an index go together.
- _.zip = function() {
- var args = slice.call(arguments);
- var length = _.max(_.pluck(args, 'length'));
- var results = new Array(length);
- for (var i = 0; i < length; i++) results[i] = _.pluck(args, "" + i);
- return results;
- };
-
- // If the browser doesn't supply us with indexOf (I'm looking at you, **MSIE**),
- // we need this function. Return the position of the first occurrence of an
- // item in an array, or -1 if the item is not included in the array.
- // Delegates to **ECMAScript 5**'s native `indexOf` if available.
- // If the array is large and already in sort order, pass `true`
- // for **isSorted** to use binary search.
- _.indexOf = function(array, item, isSorted) {
- if (array == null) return -1;
- var i, l;
- if (isSorted) {
- i = _.sortedIndex(array, item);
- return array[i] === item ? i : -1;
- }
- if (nativeIndexOf && array.indexOf === nativeIndexOf) return array.indexOf(item);
- for (i = 0, l = array.length; i < l; i++) if (array[i] === item) return i;
- return -1;
- };
-
-
- // Delegates to **ECMAScript 5**'s native `lastIndexOf` if available.
- _.lastIndexOf = function(array, item) {
- if (array == null) return -1;
- if (nativeLastIndexOf && array.lastIndexOf === nativeLastIndexOf) return array.lastIndexOf(item);
- var i = array.length;
- while (i--) if (array[i] === item) return i;
- return -1;
- };
-
- // Generate an integer Array containing an arithmetic progression. A port of
- // the native Python `range()` function. See
- // [the Python documentation](http://docs.python.org/library/functions.html#range).
- _.range = function(start, stop, step) {
- if (arguments.length <= 1) {
- stop = start || 0;
- start = 0;
- }
- step = arguments[2] || 1;
-
- var len = Math.max(Math.ceil((stop - start) / step), 0);
- var idx = 0;
- var range = new Array(len);
-
- while(idx < len) {
- range[idx++] = start;
- start += step;
- }
-
- return range;
- };
-
- // Function (ahem) Functions
- // ------------------
-
- // Create a function bound to a given object (assigning `this`, and arguments,
- // optionally). Binding with arguments is also known as `curry`.
- // Delegates to **ECMAScript 5**'s native `Function.bind` if available.
- // We check for `func.bind` first, to fail fast when `func` is undefined.
- _.bind = function(func, obj) {
- if (func.bind === nativeBind && nativeBind) return nativeBind.apply(func, slice.call(arguments, 1));
- var args = slice.call(arguments, 2);
- return function() {
- return func.apply(obj, args.concat(slice.call(arguments)));
- };
- };
-
- // Bind all of an object's methods to that object. Useful for ensuring that
- // all callbacks defined on an object belong to it.
- _.bindAll = function(obj) {
- var funcs = slice.call(arguments, 1);
- if (funcs.length == 0) funcs = _.functions(obj);
- each(funcs, function(f) { obj[f] = _.bind(obj[f], obj); });
- return obj;
- };
-
- // Memoize an expensive function by storing its results.
- _.memoize = function(func, hasher) {
- var memo = {};
- hasher || (hasher = _.identity);
- return function() {
- var key = hasher.apply(this, arguments);
- return hasOwnProperty.call(memo, key) ? memo[key] : (memo[key] = func.apply(this, arguments));
- };
- };
-
- // Delays a function for the given number of milliseconds, and then calls
- // it with the arguments supplied.
- _.delay = function(func, wait) {
- var args = slice.call(arguments, 2);
- return setTimeout(function(){ return func.apply(func, args); }, wait);
- };
-
- // Defers a function, scheduling it to run after the current call stack has
- // cleared.
- _.defer = function(func) {
- return _.delay.apply(_, [func, 1].concat(slice.call(arguments, 1)));
- };
-
- // Internal function used to implement `_.throttle` and `_.debounce`.
- var limit = function(func, wait, debounce) {
- var timeout;
- return function() {
- var context = this, args = arguments;
- var throttler = function() {
- timeout = null;
- func.apply(context, args);
- };
- if (debounce) clearTimeout(timeout);
- if (debounce || !timeout) timeout = setTimeout(throttler, wait);
- };
- };
-
- // Returns a function, that, when invoked, will only be triggered at most once
- // during a given window of time.
- _.throttle = function(func, wait) {
- return limit(func, wait, false);
- };
-
- // Returns a function, that, as long as it continues to be invoked, will not
- // be triggered. The function will be called after it stops being called for
- // N milliseconds.
- _.debounce = function(func, wait) {
- return limit(func, wait, true);
- };
-
- // Returns a function that will be executed at most one time, no matter how
- // often you call it. Useful for lazy initialization.
- _.once = function(func) {
- var ran = false, memo;
- return function() {
- if (ran) return memo;
- ran = true;
- return memo = func.apply(this, arguments);
- };
- };
-
- // Returns the first function passed as an argument to the second,
- // allowing you to adjust arguments, run code before and after, and
- // conditionally execute the original function.
- _.wrap = function(func, wrapper) {
- return function() {
- var args = [func].concat(slice.call(arguments));
- return wrapper.apply(this, args);
- };
- };
-
- // Returns a function that is the composition of a list of functions, each
- // consuming the return value of the function that follows.
- _.compose = function() {
- var funcs = slice.call(arguments);
- return function() {
- var args = slice.call(arguments);
- for (var i=funcs.length-1; i >= 0; i--) {
- args = [funcs[i].apply(this, args)];
- }
- return args[0];
- };
- };
-
- // Returns a function that will only be executed after being called N times.
- _.after = function(times, func) {
- return function() {
- if (--times < 1) { return func.apply(this, arguments); }
- };
- };
-
-
- // Object Functions
- // ----------------
-
- // Retrieve the names of an object's properties.
- // Delegates to **ECMAScript 5**'s native `Object.keys`
- _.keys = nativeKeys || function(obj) {
- if (obj !== Object(obj)) throw new TypeError('Invalid object');
- var keys = [];
- for (var key in obj) if (hasOwnProperty.call(obj, key)) keys[keys.length] = key;
- return keys;
- };
-
- // Retrieve the values of an object's properties.
- _.values = function(obj) {
- return _.map(obj, _.identity);
- };
-
- // Return a sorted list of the function names available on the object.
- // Aliased as `methods`
- _.functions = _.methods = function(obj) {
- return _.filter(_.keys(obj), function(key){ return _.isFunction(obj[key]); }).sort();
- };
-
- // Extend a given object with all the properties in passed-in object(s).
- _.extend = function(obj) {
- each(slice.call(arguments, 1), function(source) {
- for (var prop in source) {
- if (source[prop] !== void 0) obj[prop] = source[prop];
- }
- });
- return obj;
- };
-
- // Fill in a given object with default properties.
- _.defaults = function(obj) {
- each(slice.call(arguments, 1), function(source) {
- for (var prop in source) {
- if (obj[prop] == null) obj[prop] = source[prop];
- }
- });
- return obj;
- };
-
- // Create a (shallow-cloned) duplicate of an object.
- _.clone = function(obj) {
- return _.isArray(obj) ? obj.slice() : _.extend({}, obj);
- };
-
- // Invokes interceptor with the obj, and then returns obj.
- // The primary purpose of this method is to "tap into" a method chain, in
- // order to perform operations on intermediate results within the chain.
- _.tap = function(obj, interceptor) {
- interceptor(obj);
- return obj;
- };
-
- // Perform a deep comparison to check if two objects are equal.
- _.isEqual = function(a, b) {
- // Check object identity.
- if (a === b) return true;
- // Different types?
- var atype = typeof(a), btype = typeof(b);
- if (atype != btype) return false;
- // Basic equality test (watch out for coercions).
- if (a == b) return true;
- // One is falsy and the other truthy.
- if ((!a && b) || (a && !b)) return false;
- // Unwrap any wrapped objects.
- if (a._chain) a = a._wrapped;
- if (b._chain) b = b._wrapped;
- // One of them implements an isEqual()?
- if (a.isEqual) return a.isEqual(b);
- // Check dates' integer values.
- if (_.isDate(a) && _.isDate(b)) return a.getTime() === b.getTime();
- // Both are NaN?
- if (_.isNaN(a) && _.isNaN(b)) return false;
- // Compare regular expressions.
- if (_.isRegExp(a) && _.isRegExp(b))
- return a.source === b.source &&
- a.global === b.global &&
- a.ignoreCase === b.ignoreCase &&
- a.multiline === b.multiline;
- // If a is not an object by this point, we can't handle it.
- if (atype !== 'object') return false;
- // Check for different array lengths before comparing contents.
- if (a.length && (a.length !== b.length)) return false;
- // Nothing else worked, deep compare the contents.
- var aKeys = _.keys(a), bKeys = _.keys(b);
- // Different object sizes?
- if (aKeys.length != bKeys.length) return false;
- // Recursive comparison of contents.
- for (var key in a) if (!(key in b) || !_.isEqual(a[key], b[key])) return false;
- return true;
- };
-
- // Is a given array or object empty?
- _.isEmpty = function(obj) {
- if (_.isArray(obj) || _.isString(obj)) return obj.length === 0;
- for (var key in obj) if (hasOwnProperty.call(obj, key)) return false;
- return true;
- };
-
- // Is a given value a DOM element?
- _.isElement = function(obj) {
- return !!(obj && obj.nodeType == 1);
- };
-
- // Is a given value an array?
- // Delegates to ECMA5's native Array.isArray
- _.isArray = nativeIsArray || function(obj) {
- return toString.call(obj) === '[object Array]';
- };
-
- // Is a given variable an arguments object?
- _.isArguments = function(obj) {
- return !!(obj && hasOwnProperty.call(obj, 'callee'));
- };
-
- // Is a given value a function?
- _.isFunction = function(obj) {
- return !!(obj && obj.constructor && obj.call && obj.apply);
- };
-
- // Is a given value a string?
- _.isString = function(obj) {
- return !!(obj === '' || (obj && obj.charCodeAt && obj.substr));
- };
-
- // Is a given value a number?
- _.isNumber = function(obj) {
- return !!(obj === 0 || (obj && obj.toExponential && obj.toFixed));
- };
-
- // Is the given value `NaN`? `NaN` happens to be the only value in JavaScript
- // that does not equal itself.
- _.isNaN = function(obj) {
- return obj !== obj;
- };
-
- // Is a given value a boolean?
- _.isBoolean = function(obj) {
- return obj === true || obj === false;
- };
-
- // Is a given value a date?
- _.isDate = function(obj) {
- return !!(obj && obj.getTimezoneOffset && obj.setUTCFullYear);
- };
-
- // Is the given value a regular expression?
- _.isRegExp = function(obj) {
- return !!(obj && obj.test && obj.exec && (obj.ignoreCase || obj.ignoreCase === false));
- };
-
- // Is a given value equal to null?
- _.isNull = function(obj) {
- return obj === null;
- };
-
- // Is a given variable undefined?
- _.isUndefined = function(obj) {
- return obj === void 0;
- };
-
- // Utility Functions
- // -----------------
-
- // Run Underscore.js in *noConflict* mode, returning the `_` variable to its
- // previous owner. Returns a reference to the Underscore object.
- _.noConflict = function() {
- root._ = previousUnderscore;
- return this;
- };
-
- // Keep the identity function around for default iterators.
- _.identity = function(value) {
- return value;
- };
-
- // Run a function **n** times.
- _.times = function (n, iterator, context) {
- for (var i = 0; i < n; i++) iterator.call(context, i);
- };
-
- // Add your own custom functions to the Underscore object, ensuring that
- // they're correctly added to the OOP wrapper as well.
- _.mixin = function(obj) {
- each(_.functions(obj), function(name){
- addToWrapper(name, _[name] = obj[name]);
- });
- };
-
- // Generate a unique integer id (unique within the entire client session).
- // Useful for temporary DOM ids.
- var idCounter = 0;
- _.uniqueId = function(prefix) {
- var id = idCounter++;
- return prefix ? prefix + id : id;
- };
-
- // By default, Underscore uses ERB-style template delimiters, change the
- // following template settings to use alternative delimiters.
- _.templateSettings = {
- evaluate : /<%([\s\S]+?)%>/g,
- interpolate : /<%=([\s\S]+?)%>/g
- };
-
- // JavaScript micro-templating, similar to John Resig's implementation.
- // Underscore templating handles arbitrary delimiters, preserves whitespace,
- // and correctly escapes quotes within interpolated code.
- _.template = function(str, data) {
- var c = _.templateSettings;
- var tmpl = 'var __p=[],print=function(){__p.push.apply(__p,arguments);};' +
- 'with(obj||{}){__p.push(\'' +
- str.replace(/\\/g, '\\\\')
- .replace(/'/g, "\\'")
- .replace(c.interpolate, function(match, code) {
- return "'," + code.replace(/\\'/g, "'") + ",'";
- })
- .replace(c.evaluate || null, function(match, code) {
- return "');" + code.replace(/\\'/g, "'")
- .replace(/[\r\n\t]/g, ' ') + "__p.push('";
- })
- .replace(/\r/g, '\\r')
- .replace(/\n/g, '\\n')
- .replace(/\t/g, '\\t')
- + "');}return __p.join('');";
- var func = new Function('obj', tmpl);
- return data ? func(data) : func;
- };
-
- // The OOP Wrapper
- // ---------------
-
- // If Underscore is called as a function, it returns a wrapped object that
- // can be used OO-style. This wrapper holds altered versions of all the
- // underscore functions. Wrapped objects may be chained.
- var wrapper = function(obj) { this._wrapped = obj; };
-
- // Expose `wrapper.prototype` as `_.prototype`
- _.prototype = wrapper.prototype;
-
- // Helper function to continue chaining intermediate results.
- var result = function(obj, chain) {
- return chain ? _(obj).chain() : obj;
- };
-
- // A method to easily add functions to the OOP wrapper.
- var addToWrapper = function(name, func) {
- wrapper.prototype[name] = function() {
- var args = slice.call(arguments);
- unshift.call(args, this._wrapped);
- return result(func.apply(_, args), this._chain);
- };
- };
-
- // Add all of the Underscore functions to the wrapper object.
- _.mixin(_);
-
- // Add all mutator Array functions to the wrapper.
- each(['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], function(name) {
- var method = ArrayProto[name];
- wrapper.prototype[name] = function() {
- method.apply(this._wrapped, arguments);
- return result(this._wrapped, this._chain);
- };
- });
-
- // Add all accessor Array functions to the wrapper.
- each(['concat', 'join', 'slice'], function(name) {
- var method = ArrayProto[name];
- wrapper.prototype[name] = function() {
- return result(method.apply(this._wrapped, arguments), this._chain);
- };
- });
-
- // Start chaining a wrapped Underscore object.
- wrapper.prototype.chain = function() {
- this._chain = true;
- return this;
- };
-
- // Extracts the result from a wrapped and chained object.
- wrapper.prototype.value = function() {
- return this._wrapped;
- };
-
-})();
diff --git a/docs/_build/html/_static/up-pressed.png b/docs/_build/html/_static/up-pressed.png
deleted file mode 100644
index 8bd587a..0000000
--- a/docs/_build/html/_static/up-pressed.png
+++ /dev/null
Binary files differ
diff --git a/docs/_build/html/_static/up.png b/docs/_build/html/_static/up.png
deleted file mode 100644
index b946256..0000000
--- a/docs/_build/html/_static/up.png
+++ /dev/null
Binary files differ
diff --git a/docs/_build/html/_static/websupport.js b/docs/_build/html/_static/websupport.js
deleted file mode 100644
index e9bd1b8..0000000
--- a/docs/_build/html/_static/websupport.js
+++ /dev/null
@@ -1,808 +0,0 @@
-/*
- * websupport.js
- * ~~~~~~~~~~~~~
- *
- * sphinx.websupport utilties for all documentation.
- *
- * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
- * :license: BSD, see LICENSE for details.
- *
- */
-
-(function($) {
- $.fn.autogrow = function() {
- return this.each(function() {
- var textarea = this;
-
- $.fn.autogrow.resize(textarea);
-
- $(textarea)
- .focus(function() {
- textarea.interval = setInterval(function() {
- $.fn.autogrow.resize(textarea);
- }, 500);
- })
- .blur(function() {
- clearInterval(textarea.interval);
- });
- });
- };
-
- $.fn.autogrow.resize = function(textarea) {
- var lineHeight = parseInt($(textarea).css('line-height'), 10);
- var lines = textarea.value.split('\n');
- var columns = textarea.cols;
- var lineCount = 0;
- $.each(lines, function() {
- lineCount += Math.ceil(this.length / columns) || 1;
- });
- var height = lineHeight * (lineCount + 1);
- $(textarea).css('height', height);
- };
-})(jQuery);
-
-(function($) {
- var comp, by;
-
- function init() {
- initEvents();
- initComparator();
- }
-
- function initEvents() {
- $('a.comment-close').live("click", function(event) {
- event.preventDefault();
- hide($(this).attr('id').substring(2));
- });
- $('a.vote').live("click", function(event) {
- event.preventDefault();
- handleVote($(this));
- });
- $('a.reply').live("click", function(event) {
- event.preventDefault();
- openReply($(this).attr('id').substring(2));
- });
- $('a.close-reply').live("click", function(event) {
- event.preventDefault();
- closeReply($(this).attr('id').substring(2));
- });
- $('a.sort-option').live("click", function(event) {
- event.preventDefault();
- handleReSort($(this));
- });
- $('a.show-proposal').live("click", function(event) {
- event.preventDefault();
- showProposal($(this).attr('id').substring(2));
- });
- $('a.hide-proposal').live("click", function(event) {
- event.preventDefault();
- hideProposal($(this).attr('id').substring(2));
- });
- $('a.show-propose-change').live("click", function(event) {
- event.preventDefault();
- showProposeChange($(this).attr('id').substring(2));
- });
- $('a.hide-propose-change').live("click", function(event) {
- event.preventDefault();
- hideProposeChange($(this).attr('id').substring(2));
- });
- $('a.accept-comment').live("click", function(event) {
- event.preventDefault();
- acceptComment($(this).attr('id').substring(2));
- });
- $('a.delete-comment').live("click", function(event) {
- event.preventDefault();
- deleteComment($(this).attr('id').substring(2));
- });
- $('a.comment-markup').live("click", function(event) {
- event.preventDefault();
- toggleCommentMarkupBox($(this).attr('id').substring(2));
- });
- }
-
- /**
- * Set comp, which is a comparator function used for sorting and
- * inserting comments into the list.
- */
- function setComparator() {
- // If the first three letters are "asc", sort in ascending order
- // and remove the prefix.
- if (by.substring(0,3) == 'asc') {
- var i = by.substring(3);
- comp = function(a, b) { return a[i] - b[i]; };
- } else {
- // Otherwise sort in descending order.
- comp = function(a, b) { return b[by] - a[by]; };
- }
-
- // Reset link styles and format the selected sort option.
- $('a.sel').attr('href', '#').removeClass('sel');
- $('a.by' + by).removeAttr('href').addClass('sel');
- }
-
- /**
- * Create a comp function. If the user has preferences stored in
- * the sortBy cookie, use those, otherwise use the default.
- */
- function initComparator() {
- by = 'rating'; // Default to sort by rating.
- // If the sortBy cookie is set, use that instead.
- if (document.cookie.length > 0) {
- var start = document.cookie.indexOf('sortBy=');
- if (start != -1) {
- start = start + 7;
- var end = document.cookie.indexOf(";", start);
- if (end == -1) {
- end = document.cookie.length;
- by = unescape(document.cookie.substring(start, end));
- }
- }
- }
- setComparator();
- }
-
- /**
- * Show a comment div.
- */
- function show(id) {
- $('#ao' + id).hide();
- $('#ah' + id).show();
- var context = $.extend({id: id}, opts);
- var popup = $(renderTemplate(popupTemplate, context)).hide();
- popup.find('textarea[name="proposal"]').hide();
- popup.find('a.by' + by).addClass('sel');
- var form = popup.find('#cf' + id);
- form.submit(function(event) {
- event.preventDefault();
- addComment(form);
- });
- $('#s' + id).after(popup);
- popup.slideDown('fast', function() {
- getComments(id);
- });
- }
-
- /**
- * Hide a comment div.
- */
- function hide(id) {
- $('#ah' + id).hide();
- $('#ao' + id).show();
- var div = $('#sc' + id);
- div.slideUp('fast', function() {
- div.remove();
- });
- }
-
- /**
- * Perform an ajax request to get comments for a node
- * and insert the comments into the comments tree.
- */
- function getComments(id) {
- $.ajax({
- type: 'GET',
- url: opts.getCommentsURL,
- data: {node: id},
- success: function(data, textStatus, request) {
- var ul = $('#cl' + id);
- var speed = 100;
- $('#cf' + id)
- .find('textarea[name="proposal"]')
- .data('source', data.source);
-
- if (data.comments.length === 0) {
- ul.html('<li>No comments yet.</li>');
- ul.data('empty', true);
- } else {
- // If there are comments, sort them and put them in the list.
- var comments = sortComments(data.comments);
- speed = data.comments.length * 100;
- appendComments(comments, ul);
- ul.data('empty', false);
- }
- $('#cn' + id).slideUp(speed + 200);
- ul.slideDown(speed);
- },
- error: function(request, textStatus, error) {
- showError('Oops, there was a problem retrieving the comments.');
- },
- dataType: 'json'
- });
- }
-
- /**
- * Add a comment via ajax and insert the comment into the comment tree.
- */
- function addComment(form) {
- var node_id = form.find('input[name="node"]').val();
- var parent_id = form.find('input[name="parent"]').val();
- var text = form.find('textarea[name="comment"]').val();
- var proposal = form.find('textarea[name="proposal"]').val();
-
- if (text == '') {
- showError('Please enter a comment.');
- return;
- }
-
- // Disable the form that is being submitted.
- form.find('textarea,input').attr('disabled', 'disabled');
-
- // Send the comment to the server.
- $.ajax({
- type: "POST",
- url: opts.addCommentURL,
- dataType: 'json',
- data: {
- node: node_id,
- parent: parent_id,
- text: text,
- proposal: proposal
- },
- success: function(data, textStatus, error) {
- // Reset the form.
- if (node_id) {
- hideProposeChange(node_id);
- }
- form.find('textarea')
- .val('')
- .add(form.find('input'))
- .removeAttr('disabled');
- var ul = $('#cl' + (node_id || parent_id));
- if (ul.data('empty')) {
- $(ul).empty();
- ul.data('empty', false);
- }
- insertComment(data.comment);
- var ao = $('#ao' + node_id);
- ao.find('img').attr({'src': opts.commentBrightImage});
- if (node_id) {
- // if this was a "root" comment, remove the commenting box
- // (the user can get it back by reopening the comment popup)
- $('#ca' + node_id).slideUp();
- }
- },
- error: function(request, textStatus, error) {
- form.find('textarea,input').removeAttr('disabled');
- showError('Oops, there was a problem adding the comment.');
- }
- });
- }
-
- /**
- * Recursively append comments to the main comment list and children
- * lists, creating the comment tree.
- */
- function appendComments(comments, ul) {
- $.each(comments, function() {
- var div = createCommentDiv(this);
- ul.append($(document.createElement('li')).html(div));
- appendComments(this.children, div.find('ul.comment-children'));
- // To avoid stagnating data, don't store the comments children in data.
- this.children = null;
- div.data('comment', this);
- });
- }
-
- /**
- * After adding a new comment, it must be inserted in the correct
- * location in the comment tree.
- */
- function insertComment(comment) {
- var div = createCommentDiv(comment);
-
- // To avoid stagnating data, don't store the comments children in data.
- comment.children = null;
- div.data('comment', comment);
-
- var ul = $('#cl' + (comment.node || comment.parent));
- var siblings = getChildren(ul);
-
- var li = $(document.createElement('li'));
- li.hide();
-
- // Determine where in the parents children list to insert this comment.
- for(i=0; i < siblings.length; i++) {
- if (comp(comment, siblings[i]) <= 0) {
- $('#cd' + siblings[i].id)
- .parent()
- .before(li.html(div));
- li.slideDown('fast');
- return;
- }
- }
-
- // If we get here, this comment rates lower than all the others,
- // or it is the only comment in the list.
- ul.append(li.html(div));
- li.slideDown('fast');
- }
-
- function acceptComment(id) {
- $.ajax({
- type: 'POST',
- url: opts.acceptCommentURL,
- data: {id: id},
- success: function(data, textStatus, request) {
- $('#cm' + id).fadeOut('fast');
- $('#cd' + id).removeClass('moderate');
- },
- error: function(request, textStatus, error) {
- showError('Oops, there was a problem accepting the comment.');
- }
- });
- }
-
- function deleteComment(id) {
- $.ajax({
- type: 'POST',
- url: opts.deleteCommentURL,
- data: {id: id},
- success: function(data, textStatus, request) {
- var div = $('#cd' + id);
- if (data == 'delete') {
- // Moderator mode: remove the comment and all children immediately
- div.slideUp('fast', function() {
- div.remove();
- });
- return;
- }
- // User mode: only mark the comment as deleted
- div
- .find('span.user-id:first')
- .text('[deleted]').end()
- .find('div.comment-text:first')
- .text('[deleted]').end()
- .find('#cm' + id + ', #dc' + id + ', #ac' + id + ', #rc' + id +
- ', #sp' + id + ', #hp' + id + ', #cr' + id + ', #rl' + id)
- .remove();
- var comment = div.data('comment');
- comment.username = '[deleted]';
- comment.text = '[deleted]';
- div.data('comment', comment);
- },
- error: function(request, textStatus, error) {
- showError('Oops, there was a problem deleting the comment.');
- }
- });
- }
-
- function showProposal(id) {
- $('#sp' + id).hide();
- $('#hp' + id).show();
- $('#pr' + id).slideDown('fast');
- }
-
- function hideProposal(id) {
- $('#hp' + id).hide();
- $('#sp' + id).show();
- $('#pr' + id).slideUp('fast');
- }
-
- function showProposeChange(id) {
- $('#pc' + id).hide();
- $('#hc' + id).show();
- var textarea = $('#pt' + id);
- textarea.val(textarea.data('source'));
- $.fn.autogrow.resize(textarea[0]);
- textarea.slideDown('fast');
- }
-
- function hideProposeChange(id) {
- $('#hc' + id).hide();
- $('#pc' + id).show();
- var textarea = $('#pt' + id);
- textarea.val('').removeAttr('disabled');
- textarea.slideUp('fast');
- }
-
- function toggleCommentMarkupBox(id) {
- $('#mb' + id).toggle();
- }
-
- /** Handle when the user clicks on a sort by link. */
- function handleReSort(link) {
- var classes = link.attr('class').split(/\s+/);
- for (var i=0; i<classes.length; i++) {
- if (classes[i] != 'sort-option') {
- by = classes[i].substring(2);
- }
- }
- setComparator();
- // Save/update the sortBy cookie.
- var expiration = new Date();
- expiration.setDate(expiration.getDate() + 365);
- document.cookie= 'sortBy=' + escape(by) +
- ';expires=' + expiration.toUTCString();
- $('ul.comment-ul').each(function(index, ul) {
- var comments = getChildren($(ul), true);
- comments = sortComments(comments);
- appendComments(comments, $(ul).empty());
- });
- }
-
- /**
- * Function to process a vote when a user clicks an arrow.
- */
- function handleVote(link) {
- if (!opts.voting) {
- showError("You'll need to login to vote.");
- return;
- }
-
- var id = link.attr('id');
- if (!id) {
- // Didn't click on one of the voting arrows.
- return;
- }
- // If it is an unvote, the new vote value is 0,
- // Otherwise it's 1 for an upvote, or -1 for a downvote.
- var value = 0;
- if (id.charAt(1) != 'u') {
- value = id.charAt(0) == 'u' ? 1 : -1;
- }
- // The data to be sent to the server.
- var d = {
- comment_id: id.substring(2),
- value: value
- };
-
- // Swap the vote and unvote links.
- link.hide();
- $('#' + id.charAt(0) + (id.charAt(1) == 'u' ? 'v' : 'u') + d.comment_id)
- .show();
-
- // The div the comment is displayed in.
- var div = $('div#cd' + d.comment_id);
- var data = div.data('comment');
-
- // If this is not an unvote, and the other vote arrow has
- // already been pressed, unpress it.
- if ((d.value !== 0) && (data.vote === d.value * -1)) {
- $('#' + (d.value == 1 ? 'd' : 'u') + 'u' + d.comment_id).hide();
- $('#' + (d.value == 1 ? 'd' : 'u') + 'v' + d.comment_id).show();
- }
-
- // Update the comments rating in the local data.
- data.rating += (data.vote === 0) ? d.value : (d.value - data.vote);
- data.vote = d.value;
- div.data('comment', data);
-
- // Change the rating text.
- div.find('.rating:first')
- .text(data.rating + ' point' + (data.rating == 1 ? '' : 's'));
-
- // Send the vote information to the server.
- $.ajax({
- type: "POST",
- url: opts.processVoteURL,
- data: d,
- error: function(request, textStatus, error) {
- showError('Oops, there was a problem casting that vote.');
- }
- });
- }
-
- /**
- * Open a reply form used to reply to an existing comment.
- */
- function openReply(id) {
- // Swap out the reply link for the hide link
- $('#rl' + id).hide();
- $('#cr' + id).show();
-
- // Add the reply li to the children ul.
- var div = $(renderTemplate(replyTemplate, {id: id})).hide();
- $('#cl' + id)
- .prepend(div)
- // Setup the submit handler for the reply form.
- .find('#rf' + id)
- .submit(function(event) {
- event.preventDefault();
- addComment($('#rf' + id));
- closeReply(id);
- })
- .find('input[type=button]')
- .click(function() {
- closeReply(id);
- });
- div.slideDown('fast', function() {
- $('#rf' + id).find('textarea').focus();
- });
- }
-
- /**
- * Close the reply form opened with openReply.
- */
- function closeReply(id) {
- // Remove the reply div from the DOM.
- $('#rd' + id).slideUp('fast', function() {
- $(this).remove();
- });
-
- // Swap out the hide link for the reply link
- $('#cr' + id).hide();
- $('#rl' + id).show();
- }
-
- /**
- * Recursively sort a tree of comments using the comp comparator.
- */
- function sortComments(comments) {
- comments.sort(comp);
- $.each(comments, function() {
- this.children = sortComments(this.children);
- });
- return comments;
- }
-
- /**
- * Get the children comments from a ul. If recursive is true,
- * recursively include childrens' children.
- */
- function getChildren(ul, recursive) {
- var children = [];
- ul.children().children("[id^='cd']")
- .each(function() {
- var comment = $(this).data('comment');
- if (recursive)
- comment.children = getChildren($(this).find('#cl' + comment.id), true);
- children.push(comment);
- });
- return children;
- }
-
- /** Create a div to display a comment in. */
- function createCommentDiv(comment) {
- if (!comment.displayed && !opts.moderator) {
- return $('<div class="moderate">Thank you! Your comment will show up '
- + 'once it is has been approved by a moderator.</div>');
- }
- // Prettify the comment rating.
- comment.pretty_rating = comment.rating + ' point' +
- (comment.rating == 1 ? '' : 's');
- // Make a class (for displaying not yet moderated comments differently)
- comment.css_class = comment.displayed ? '' : ' moderate';
- // Create a div for this comment.
- var context = $.extend({}, opts, comment);
- var div = $(renderTemplate(commentTemplate, context));
-
- // If the user has voted on this comment, highlight the correct arrow.
- if (comment.vote) {
- var direction = (comment.vote == 1) ? 'u' : 'd';
- div.find('#' + direction + 'v' + comment.id).hide();
- div.find('#' + direction + 'u' + comment.id).show();
- }
-
- if (opts.moderator || comment.text != '[deleted]') {
- div.find('a.reply').show();
- if (comment.proposal_diff)
- div.find('#sp' + comment.id).show();
- if (opts.moderator && !comment.displayed)
- div.find('#cm' + comment.id).show();
- if (opts.moderator || (opts.username == comment.username))
- div.find('#dc' + comment.id).show();
- }
- return div;
- }
-
- /**
- * A simple template renderer. Placeholders such as <%id%> are replaced
- * by context['id'] with items being escaped. Placeholders such as <#id#>
- * are not escaped.
- */
- function renderTemplate(template, context) {
- var esc = $(document.createElement('div'));
-
- function handle(ph, escape) {
- var cur = context;
- $.each(ph.split('.'), function() {
- cur = cur[this];
- });
- return escape ? esc.text(cur || "").html() : cur;
- }
-
- return template.replace(/<([%#])([\w\.]*)\1>/g, function() {
- return handle(arguments[2], arguments[1] == '%' ? true : false);
- });
- }
-
- /** Flash an error message briefly. */
- function showError(message) {
- $(document.createElement('div')).attr({'class': 'popup-error'})
- .append($(document.createElement('div'))
- .attr({'class': 'error-message'}).text(message))
- .appendTo('body')
- .fadeIn("slow")
- .delay(2000)
- .fadeOut("slow");
- }
-
- /** Add a link the user uses to open the comments popup. */
- $.fn.comment = function() {
- return this.each(function() {
- var id = $(this).attr('id').substring(1);
- var count = COMMENT_METADATA[id];
- var title = count + ' comment' + (count == 1 ? '' : 's');
- var image = count > 0 ? opts.commentBrightImage : opts.commentImage;
- var addcls = count == 0 ? ' nocomment' : '';
- $(this)
- .append(
- $(document.createElement('a')).attr({
- href: '#',
- 'class': 'sphinx-comment-open' + addcls,
- id: 'ao' + id
- })
- .append($(document.createElement('img')).attr({
- src: image,
- alt: 'comment',
- title: title
- }))
- .click(function(event) {
- event.preventDefault();
- show($(this).attr('id').substring(2));
- })
- )
- .append(
- $(document.createElement('a')).attr({
- href: '#',
- 'class': 'sphinx-comment-close hidden',
- id: 'ah' + id
- })
- .append($(document.createElement('img')).attr({
- src: opts.closeCommentImage,
- alt: 'close',
- title: 'close'
- }))
- .click(function(event) {
- event.preventDefault();
- hide($(this).attr('id').substring(2));
- })
- );
- });
- };
-
- var opts = {
- processVoteURL: '/_process_vote',
- addCommentURL: '/_add_comment',
- getCommentsURL: '/_get_comments',
- acceptCommentURL: '/_accept_comment',
- deleteCommentURL: '/_delete_comment',
- commentImage: '/static/_static/comment.png',
- closeCommentImage: '/static/_static/comment-close.png',
- loadingImage: '/static/_static/ajax-loader.gif',
- commentBrightImage: '/static/_static/comment-bright.png',
- upArrow: '/static/_static/up.png',
- downArrow: '/static/_static/down.png',
- upArrowPressed: '/static/_static/up-pressed.png',
- downArrowPressed: '/static/_static/down-pressed.png',
- voting: false,
- moderator: false
- };
-
- if (typeof COMMENT_OPTIONS != "undefined") {
- opts = jQuery.extend(opts, COMMENT_OPTIONS);
- }
-
- var popupTemplate = '\
- <div class="sphinx-comments" id="sc<%id%>">\
- <p class="sort-options">\
- Sort by:\
- <a href="#" class="sort-option byrating">best rated</a>\
- <a href="#" class="sort-option byascage">newest</a>\
- <a href="#" class="sort-option byage">oldest</a>\
- </p>\
- <div class="comment-header">Comments</div>\
- <div class="comment-loading" id="cn<%id%>">\
- loading comments... <img src="<%loadingImage%>" alt="" /></div>\
- <ul id="cl<%id%>" class="comment-ul"></ul>\
- <div id="ca<%id%>">\
- <p class="add-a-comment">Add a comment\
- (<a href="#" class="comment-markup" id="ab<%id%>">markup</a>):</p>\
- <div class="comment-markup-box" id="mb<%id%>">\
- reStructured text markup: <i>*emph*</i>, <b>**strong**</b>, \
- <tt>``code``</tt>, \
- code blocks: <tt>::</tt> and an indented block after blank line</div>\
- <form method="post" id="cf<%id%>" class="comment-form" action="">\
- <textarea name="comment" cols="80"></textarea>\
- <p class="propose-button">\
- <a href="#" id="pc<%id%>" class="show-propose-change">\
- Propose a change &#9657;\
- </a>\
- <a href="#" id="hc<%id%>" class="hide-propose-change">\
- Propose a change &#9663;\
- </a>\
- </p>\
- <textarea name="proposal" id="pt<%id%>" cols="80"\
- spellcheck="false"></textarea>\
- <input type="submit" value="Add comment" />\
- <input type="hidden" name="node" value="<%id%>" />\
- <input type="hidden" name="parent" value="" />\
- </form>\
- </div>\
- </div>';
-
- var commentTemplate = '\
- <div id="cd<%id%>" class="sphinx-comment<%css_class%>">\
- <div class="vote">\
- <div class="arrow">\
- <a href="#" id="uv<%id%>" class="vote" title="vote up">\
- <img src="<%upArrow%>" />\
- </a>\
- <a href="#" id="uu<%id%>" class="un vote" title="vote up">\
- <img src="<%upArrowPressed%>" />\
- </a>\
- </div>\
- <div class="arrow">\
- <a href="#" id="dv<%id%>" class="vote" title="vote down">\
- <img src="<%downArrow%>" id="da<%id%>" />\
- </a>\
- <a href="#" id="du<%id%>" class="un vote" title="vote down">\
- <img src="<%downArrowPressed%>" />\
- </a>\
- </div>\
- </div>\
- <div class="comment-content">\
- <p class="tagline comment">\
- <span class="user-id"><%username%></span>\
- <span class="rating"><%pretty_rating%></span>\
- <span class="delta"><%time.delta%></span>\
- </p>\
- <div class="comment-text comment"><#text#></div>\
- <p class="comment-opts comment">\
- <a href="#" class="reply hidden" id="rl<%id%>">reply &#9657;</a>\
- <a href="#" class="close-reply" id="cr<%id%>">reply &#9663;</a>\
- <a href="#" id="sp<%id%>" class="show-proposal">proposal &#9657;</a>\
- <a href="#" id="hp<%id%>" class="hide-proposal">proposal &#9663;</a>\
- <a href="#" id="dc<%id%>" class="delete-comment hidden">delete</a>\
- <span id="cm<%id%>" class="moderation hidden">\
- <a href="#" id="ac<%id%>" class="accept-comment">accept</a>\
- </span>\
- </p>\
- <pre class="proposal" id="pr<%id%>">\
-<#proposal_diff#>\
- </pre>\
- <ul class="comment-children" id="cl<%id%>"></ul>\
- </div>\
- <div class="clearleft"></div>\
- </div>\
- </div>';
-
- var replyTemplate = '\
- <li>\
- <div class="reply-div" id="rd<%id%>">\
- <form id="rf<%id%>">\
- <textarea name="comment" cols="80"></textarea>\
- <input type="submit" value="Add reply" />\
- <input type="button" value="Cancel" />\
- <input type="hidden" name="parent" value="<%id%>" />\
- <input type="hidden" name="node" value="" />\
- </form>\
- </div>\
- </li>';
-
- $(document).ready(function() {
- init();
- });
-})(jQuery);
-
-$(document).ready(function() {
- // add comment anchors for all paragraphs that are commentable
- $('.sphinx-has-comment').comment();
-
- // highlight search words in search results
- $("div.context").each(function() {
- var params = $.getQueryParameters();
- var terms = (params.q) ? params.q[0].split(/\s+/) : [];
- var result = $(this);
- $.each(terms, function() {
- result.highlightText(this.toLowerCase(), 'highlighted');
- });
- });
-
- // directly open comment window if requested
- var anchor = document.location.hash;
- if (anchor.substring(0, 9) == '#comment-') {
- $('#ao' + anchor.substring(9)).click();
- document.location.hash = '#s' + anchor.substring(9);
- }
-});
diff --git a/docs/_build/html/administration.html b/docs/_build/html/administration.html
deleted file mode 100644
index f5cd345..0000000
--- a/docs/_build/html/administration.html
+++ /dev/null
@@ -1,231 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
- <title>Administration &mdash; Chimère 2.0 documentation</title>
-
- <link rel="stylesheet" href="_static/default.css" type="text/css" />
- <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-
- <script type="text/javascript">
- var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '',
- VERSION: '2.0',
- COLLAPSE_INDEX: false,
- FILE_SUFFIX: '.html',
- HAS_SOURCE: true
- };
- </script>
- <script type="text/javascript" src="_static/jquery.js"></script>
- <script type="text/javascript" src="_static/underscore.js"></script>
- <script type="text/javascript" src="_static/doctools.js"></script>
- <link rel="top" title="Chimère 2.0 documentation" href="index.html" />
- <link rel="next" title="Chimère import/export" href="import_export.html" />
- <link rel="prev" title="Chimère customisation" href="customisation.html" />
- </head>
- <body>
- <div class="related">
- <h3>Navigation</h3>
- <ul>
- <li class="right" style="margin-right: 10px">
- <a href="genindex.html" title="General Index"
- accesskey="I">index</a></li>
- <li class="right" >
- <a href="import_export.html" title="Chimère import/export"
- accesskey="N">next</a> |</li>
- <li class="right" >
- <a href="customisation.html" title="Chimère customisation"
- accesskey="P">previous</a> |</li>
- <li><a href="index.html">Chimère 2.0 documentation</a> &raquo;</li>
- </ul>
- </div>
-
- <div class="document">
- <div class="documentwrapper">
- <div class="bodywrapper">
- <div class="body">
-
- <div class="section" id="administration">
-<span id="id1"></span><h1>Administration<a class="headerlink" href="#administration" title="Permalink to this headline">¶</a></h1>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Author:</th><td class="field-body">Étienne Loks</td>
-</tr>
-<tr class="field-even field"><th class="field-name">date:</th><td class="field-body">2012-10-08</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Copyright:</th><td class="field-body">CC-BY 3.0</td>
-</tr>
-</tbody>
-</table>
-<p>This documents presents the administration of Chimère.
-The version has been updated for version 2.0.0.</p>
-<div class="section" id="administration-pages-presentation">
-<h2>Administration pages presentation<a class="headerlink" href="#administration-pages-presentation" title="Permalink to this headline">¶</a></h2>
-<p>Administration pages accessible at: <a class="reference external" href="http://where_is_your_chimere/admin/">http://where_is_your_chimere/admin/</a></p>
-<p>Don&#8217;t forget the ending slash in the URL.</p>
-<div class="section" id="identification">
-<h3>Identification<a class="headerlink" href="#identification" title="Permalink to this headline">¶</a></h3>
-<p>First of all, you&#8217;ll have to identify yourself with the login and password
-provided.</p>
-<img alt="_images/chimere_admin_00.png" src="_images/chimere_admin_00.png" />
-</div>
-<div class="section" id="main-page">
-<h3>Main page<a class="headerlink" href="#main-page" title="Permalink to this headline">¶</a></h3>
-<p>Once authentified you&#8217;ll have access to the main admin page.</p>
-<p>This looks like this:</p>
-<img alt="_images/chimere_admin_01.png" src="_images/chimere_admin_01.png" />
-<ol class="arabic simple">
-<li>links to this <strong>Documentation</strong>, to the <strong>Change password</strong> form and to
-<strong>Log out</strong></li>
-<li>a list of recent actions made with this account</li>
-<li>an application title, most of your action will be in the <strong>Chimere</strong>
-application</li>
-<li>an item inside the application. From these page you can <strong>Add</strong> a new item or
-consult/<strong>Change</strong> items. The <strong>Add</strong> link lead to the new <a class="reference internal" href="#item-form">Item form</a>. The
-<strong>Change</strong> link lead to the <a class="reference internal" href="#item-list">Item list</a>. The <a class="reference internal" href="#item-list">Item list</a> is also available
-by clicking on the item label.</li>
-</ol>
-</div>
-<div class="section" id="item-list">
-<h3>Item list<a class="headerlink" href="#item-list" title="Permalink to this headline">¶</a></h3>
-<img alt="_images/chimere_admin_02.png" src="_images/chimere_admin_02.png" />
-<ol class="arabic simple">
-<li>path in the admin site. This is a convenient shortcut to come back to the
-main page.</li>
-<li>link to create a new item from the item list</li>
-<li>search items by word (not available for all type of items)</li>
-<li>this filter box permit to filter current entries with some criteria (not
-available for all type of items)</li>
-<li>the header of the table is clickable. Click on an header sort the items by
-this header (ascending or descending). Multiple header sort is possible (the
-number on the right of the header explain the order of sorting).</li>
-<li>each item can be checked (for applying an action) or selected (by clicking on
-the first column) to see the detail and possibly edit, delete it.</li>
-</ol>
-</div>
-<div class="section" id="item-form">
-<h3>Item form<a class="headerlink" href="#item-form" title="Permalink to this headline">¶</a></h3>
-<img alt="_images/chimere_admin_03.png" src="_images/chimere_admin_03.png" />
-<ol class="arabic simple">
-<li>fields for the selected item (or blank if it is a new item) are displayed in
-this form. A few of the fields concerning an item are read-only and a few of
-them are hidden. Mandatory fields have their label in bold. Changes on theses
-fields are only effective once the form is submitted.</li>
-<li>for some items there are associated sub-items. Theses associated items can be
-modified in this form. If there are many sub-items associated for the current
-item, they can be ordered by drag and drop.</li>
-<li>the form has to be validated by one of theses actions buttons. They are
-self-explanatory.</li>
-</ol>
-</div>
-</div>
-<div class="section" id="creating-news">
-<h2>Creating news<a class="headerlink" href="#creating-news" title="Permalink to this headline">¶</a></h2>
-<p>A news system is available.
-All you have to to do is to click on the Add button near News.
-For each news you have to provided a name and a content. The content can contain HTML tags.
-The avaibility is set with a checkbox.</p>
-</div>
-<div class="section" id="creating-categories-subcategories">
-<h2>Creating categories/subcategories<a class="headerlink" href="#creating-categories-subcategories" title="Permalink to this headline">¶</a></h2>
-<p>Before adding categories you have to set some icons. Theses icons appears on the map and in the categories&#8217; box on the main map.
-Be careful to resize correctly your icons. Indeed the icon will be presented at their real size on the map.
-To add icons: the Add button near Icons.</p>
-<p>Categories are in fact only containers for subcategories. You&#8217;ll have to provide only a name and an order.
-To add categories: the Add button near categories (quite clear now, isn&#8217;t it?)</p>
-<p>Fields of subcategories are: an associated category, a name, an icon, an order, a color and an element type.
-Theses fields are mainly quite self-explainatory.
-The color is used to draw routes (if this subcategory contains routes). If it a basic color it can be set with the english name (for instance: &#8220;red&#8221;, &#8220;blue&#8221;, &#8220;yellow&#8221; or &#8220;purple&#8221;) otherwise you can put the HTML RVB code (for instance &#8220;#9227c9&#8221;).
-The element type is the type of element the subcategory can contain: POI, route or both.</p>
-</div>
-<div class="section" id="moderation">
-<h2>Moderation<a class="headerlink" href="#moderation" title="Permalink to this headline">¶</a></h2>
-<p>The moderation step is quite simple. It works the same with POIs and routes.
-The moderator can access to all POIs (or routes) by clicking on the Modify button.
-A search field is available to search by name but the more interesting is to filter POIs (or route) by state and by subcategory.
-Then to modify an item you have to click on his name.
-The submission can now freely modified. Compared to the main submission interface there is only on field add: the state field. To be publish in the main site the item must have the state: Available.
-If an item is not revelant the Delete button permit to remove it.</p>
-</div>
-</div>
-
-
- </div>
- </div>
- </div>
- <div class="sphinxsidebar">
- <div class="sphinxsidebarwrapper">
- <h3><a href="index.html">Table Of Contents</a></h3>
- <ul>
-<li><a class="reference internal" href="#">Administration</a><ul>
-<li><a class="reference internal" href="#administration-pages-presentation">Administration pages presentation</a><ul>
-<li><a class="reference internal" href="#identification">Identification</a></li>
-<li><a class="reference internal" href="#main-page">Main page</a></li>
-<li><a class="reference internal" href="#item-list">Item list</a></li>
-<li><a class="reference internal" href="#item-form">Item form</a></li>
-</ul>
-</li>
-<li><a class="reference internal" href="#creating-news">Creating news</a></li>
-<li><a class="reference internal" href="#creating-categories-subcategories">Creating categories/subcategories</a></li>
-<li><a class="reference internal" href="#moderation">Moderation</a></li>
-</ul>
-</li>
-</ul>
-
- <h4>Previous topic</h4>
- <p class="topless"><a href="customisation.html"
- title="previous chapter">Chimère customisation</a></p>
- <h4>Next topic</h4>
- <p class="topless"><a href="import_export.html"
- title="next chapter">Chimère import/export</a></p>
- <h3>This Page</h3>
- <ul class="this-page-menu">
- <li><a href="_sources/administration.txt"
- rel="nofollow">Show Source</a></li>
- </ul>
-<div id="searchbox" style="display: none">
- <h3>Quick search</h3>
- <form class="search" action="search.html" method="get">
- <input type="text" name="q" />
- <input type="submit" value="Go" />
- <input type="hidden" name="check_keywords" value="yes" />
- <input type="hidden" name="area" value="default" />
- </form>
- <p class="searchtip" style="font-size: 90%">
- Enter search terms or a module, class or function name.
- </p>
-</div>
-<script type="text/javascript">$('#searchbox').show(0);</script>
- </div>
- </div>
- <div class="clearer"></div>
- </div>
- <div class="related">
- <h3>Navigation</h3>
- <ul>
- <li class="right" style="margin-right: 10px">
- <a href="genindex.html" title="General Index"
- >index</a></li>
- <li class="right" >
- <a href="import_export.html" title="Chimère import/export"
- >next</a> |</li>
- <li class="right" >
- <a href="customisation.html" title="Chimère customisation"
- >previous</a> |</li>
- <li><a href="index.html">Chimère 2.0 documentation</a> &raquo;</li>
- </ul>
- </div>
- <div class="footer">
- &copy; Copyright 2012, Étienne Loks.
- Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
- </div>
- </body>
-</html> \ No newline at end of file
diff --git a/docs/_build/html/configuration.html b/docs/_build/html/configuration.html
deleted file mode 100644
index 01ab81f..0000000
--- a/docs/_build/html/configuration.html
+++ /dev/null
@@ -1,309 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
- <title>Configuration &mdash; Chimère 2.0 documentation</title>
-
- <link rel="stylesheet" href="_static/default.css" type="text/css" />
- <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-
- <script type="text/javascript">
- var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '',
- VERSION: '2.0',
- COLLAPSE_INDEX: false,
- FILE_SUFFIX: '.html',
- HAS_SOURCE: true
- };
- </script>
- <script type="text/javascript" src="_static/jquery.js"></script>
- <script type="text/javascript" src="_static/underscore.js"></script>
- <script type="text/javascript" src="_static/doctools.js"></script>
- <link rel="top" title="Chimère 2.0 documentation" href="index.html" />
- <link rel="next" title="Chimère customisation" href="customisation.html" />
- <link rel="prev" title="Upgrade" href="upgrade.html" />
- </head>
- <body>
- <div class="related">
- <h3>Navigation</h3>
- <ul>
- <li class="right" style="margin-right: 10px">
- <a href="genindex.html" title="General Index"
- accesskey="I">index</a></li>
- <li class="right" >
- <a href="customisation.html" title="Chimère customisation"
- accesskey="N">next</a> |</li>
- <li class="right" >
- <a href="upgrade.html" title="Upgrade"
- accesskey="P">previous</a> |</li>
- <li><a href="index.html">Chimère 2.0 documentation</a> &raquo;</li>
- </ul>
- </div>
-
- <div class="document">
- <div class="documentwrapper">
- <div class="bodywrapper">
- <div class="body">
-
- <div class="section" id="configuration">
-<h1>Configuration<a class="headerlink" href="#configuration" title="Permalink to this headline">¶</a></h1>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Author:</th><td class="field-body">Étienne Loks</td>
-</tr>
-<tr class="field-even field"><th class="field-name">date:</th><td class="field-body">2012-10-08</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Copyright:</th><td class="field-body">CC-BY 3.0</td>
-</tr>
-</tbody>
-</table>
-<p>This documents presents the first steps to configure your Chimère.</p>
-<p>The version has been updated for version 2.0.0.</p>
-<p>If an usage to the CLI is required, your session has to be initialised with
-theses environment variables:</p>
-<div class="highlight-python"><pre>CHIMERE_PATH=/srv/chimere # change with your installation path
-CHIMERE_LOCALNAME=mychimere # change with your local project name
-CHIMERE_APP_PATH=$CHIMERE_PATH/$CHIMERE_LOCALNAME</pre>
-</div>
-<p>When you have installed the application there is a few simple steps to follow to
-configure <em>your</em> Chimère.</p>
-<p>Most of theses steps are done in the web administration pages.</p>
-<p>If you are not familiar with <em>Django-like</em> administration pages you can look
-at the first paragraph of <a class="reference internal" href="administration.html#administration"><em>Administration</em></a> where it is presented.</p>
-<p>To access theses pages you have to identify you with an account with <em>staff</em> and
-<em>superuser</em> status.</p>
-<p>A <em>superuser</em> account is created at the initialization of the database.</p>
-<div class="section" id="managing-areas">
-<h2>Managing areas<a class="headerlink" href="#managing-areas" title="Permalink to this headline">¶</a></h2>
-<p>An <em>Area</em> is the base of your map. It defines:</p>
-<ul class="simple">
-<li>a name: a human readable label for this area.</li>
-<li>a welcome message (<em>not mandatory</em>): this message is displayed once a day per
-user arriving on the map.</li>
-<li>a map bounding box: this is the default area to display when arriving on the
-map.</li>
-<li>restriction on the bounding box: if set to restricted, the end user can&#8217;t pan
-outside the defined bounding box.</li>
-<li>available layers (<em>not mandatory</em> OSM Mapnik is used by default): OSM Mapnik
-render, OSM MapQuest render, OSM Transport Map render, OSM CycleMap are
-available by default. You can add new custom layer cf. <em class="xref std std-ref">managing-layers</em>.</li>
-<li>categories restriction (<em>not mandatory</em>): if no restriction is set all
-categories are available.</li>
-<li>default checked categories (<em>not mandatory</em>).</li>
-<li>an external CSS file (<em>not mandatory</em>): an URL to an external CSS file.</li>
-<li>if categories are displayed dynamically (if dynamically is set, the end user
-only view categories witch have items on the map section the user currently
-see).</li>
-<li>an associated URN (<em>not mandatory</em>): the name of the area as a web ressource.
-In practice, if the area is not the default area the URN is used at the end of
-the default URL to access to this area. This is not mandatory but necessary
-for each area that is not the default one.</li>
-</ul>
-<p><em>Areas</em> are customizable directly on the web administration interface in
-<em>Chimere/Areas</em>.</p>
-<p>As there is little chance that the default area is appropriate for you, you&#8217;ll
-have to set at least one default area.</p>
-<p>Adding many area can be a mean to show your map in different flavors.</p>
-</div>
-<div class="section" id="managing-users">
-<h2>Managing users<a class="headerlink" href="#managing-users" title="Permalink to this headline">¶</a></h2>
-<p>If you are not the only administrator/moderator of this Chimère installation
-you have to create and manage account for the other users.</p>
-<p>You can create a new <em>superuser</em> account with the CLI:</p>
-<div class="highlight-python"><pre>./manage.py createsuperuser</pre>
-</div>
-<p>User password can be changed with the CLI (useful if you have forgotten your
-password):</p>
-<div class="highlight-python"><pre>./manage.py changepassword username</pre>
-</div>
-<p><em>Users</em> are customizable directly on the web administration interface in
-<em>Auth/User</em>.</p>
-<p>To create a new account, simply click on the Add button near Users. Give a name
-and a default password (the user can change it on in own later).</p>
-<p>Then complete the other pieces of information.</p>
-<p>Check the case: <em>Staff status</em> (or this user will not be able to log to
-the administration website).</p>
-<p>If this account is a new technical administrator, check <em>Superuser status</em> (this
-user must be trustworthy!). Otherwise you&#8217;ll have to give permissions to this
-new user. It is easier to don&#8217;t add permission manually but make this user
-member of a group.</p>
-<p>Two type of default group are proposed: application administrator and moderator.</p>
-<p>Moderator are limited to an <em>Area</em> (they only see items that are inside the
-bounding box). If a moderator manage many areas you&#8217;ll have to select many
-groups.</p>
-<p>Detail of rights for default user/groups:</p>
-<table border="1" class="docutils">
-<colgroup>
-<col width="39%" />
-<col width="24%" />
-<col width="26%" />
-<col width="11%" />
-</colgroup>
-<thead valign="bottom">
-<tr class="row-odd"><th class="head">Task</th>
-<th class="head">Technical administrator</th>
-<th class="head">Application administrator</th>
-<th class="head">Moderator</th>
-</tr>
-</thead>
-<tbody valign="top">
-<tr class="row-even"><td>User add/modify/delete</td>
-<td>yes</td>
-<td>no</td>
-<td>no</td>
-</tr>
-<tr class="row-odd"><td>Group add/modify/delete</td>
-<td>yes</td>
-<td>no</td>
-<td>no</td>
-</tr>
-<tr class="row-even"><td>Property model add/modify/delete</td>
-<td>yes</td>
-<td>no</td>
-<td>no</td>
-</tr>
-<tr class="row-odd"><td>Import add/modify/delete</td>
-<td>yes</td>
-<td>no</td>
-<td>no</td>
-</tr>
-<tr class="row-even"><td>Layer add/modify/delete</td>
-<td>yes</td>
-<td>no</td>
-<td>no</td>
-</tr>
-<tr class="row-odd"><td>News add/modify/delete</td>
-<td>yes</td>
-<td>yes</td>
-<td>no</td>
-</tr>
-<tr class="row-even"><td>Area add/modify/delete</td>
-<td>yes</td>
-<td>yes</td>
-<td>no</td>
-</tr>
-<tr class="row-odd"><td>Icon add/modify/delete</td>
-<td>yes</td>
-<td>yes</td>
-<td>no</td>
-</tr>
-<tr class="row-even"><td>Color/Color theme add/modify/delete</td>
-<td>yes</td>
-<td>yes</td>
-<td>no</td>
-</tr>
-<tr class="row-odd"><td>Category/Subcategory add/modify/delete</td>
-<td>yes</td>
-<td>yes</td>
-<td>no</td>
-</tr>
-<tr class="row-even"><td>Point Of Interest add/modify/delete</td>
-<td>yes</td>
-<td>yes</td>
-<td>yes</td>
-</tr>
-<tr class="row-odd"><td>Route add/modify/delete</td>
-<td>yes</td>
-<td>yes</td>
-<td>yes</td>
-</tr>
-</tbody>
-</table>
-</div>
-<div class="section" id="creating-property-models">
-<h2>Creating property models<a class="headerlink" href="#creating-property-models" title="Permalink to this headline">¶</a></h2>
-<p>A basic installation of Chimère permit to associate a name, a category, a
-description, dates, multimedia files, picture files, etc. for each geographic
-item.</p>
-<p>You may want to add more custom fields like phone number or opening hours. For
-that all you have to do is to add a new property model (<em>Chimere/Property
-model</em>).</p>
-<p>The administration page ask you for:</p>
-<ul class="simple">
-<li>a name,</li>
-<li>an order (to order between other properties),</li>
-<li>an availability to the end user (this can be used to set hidden properties),</li>
-<li>a mandatory status,</li>
-<li>the categories the property applied to (if no categories selected it applied
-to all),</li>
-<li>the type: text, long text, password or date.</li>
-</ul>
-<p>To make this property available it is necessary to reload your webserver (the
-property is cached).</p>
-<p>All forms are then automatically updated with this new field.</p>
-</div>
-</div>
-
-
- </div>
- </div>
- </div>
- <div class="sphinxsidebar">
- <div class="sphinxsidebarwrapper">
- <h3><a href="index.html">Table Of Contents</a></h3>
- <ul>
-<li><a class="reference internal" href="#">Configuration</a><ul>
-<li><a class="reference internal" href="#managing-areas">Managing areas</a></li>
-<li><a class="reference internal" href="#managing-users">Managing users</a></li>
-<li><a class="reference internal" href="#creating-property-models">Creating property models</a></li>
-</ul>
-</li>
-</ul>
-
- <h4>Previous topic</h4>
- <p class="topless"><a href="upgrade.html"
- title="previous chapter">Upgrade</a></p>
- <h4>Next topic</h4>
- <p class="topless"><a href="customisation.html"
- title="next chapter">Chimère customisation</a></p>
- <h3>This Page</h3>
- <ul class="this-page-menu">
- <li><a href="_sources/configuration.txt"
- rel="nofollow">Show Source</a></li>
- </ul>
-<div id="searchbox" style="display: none">
- <h3>Quick search</h3>
- <form class="search" action="search.html" method="get">
- <input type="text" name="q" />
- <input type="submit" value="Go" />
- <input type="hidden" name="check_keywords" value="yes" />
- <input type="hidden" name="area" value="default" />
- </form>
- <p class="searchtip" style="font-size: 90%">
- Enter search terms or a module, class or function name.
- </p>
-</div>
-<script type="text/javascript">$('#searchbox').show(0);</script>
- </div>
- </div>
- <div class="clearer"></div>
- </div>
- <div class="related">
- <h3>Navigation</h3>
- <ul>
- <li class="right" style="margin-right: 10px">
- <a href="genindex.html" title="General Index"
- >index</a></li>
- <li class="right" >
- <a href="customisation.html" title="Chimère customisation"
- >next</a> |</li>
- <li class="right" >
- <a href="upgrade.html" title="Upgrade"
- >previous</a> |</li>
- <li><a href="index.html">Chimère 2.0 documentation</a> &raquo;</li>
- </ul>
- </div>
- <div class="footer">
- &copy; Copyright 2012, Étienne Loks.
- Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
- </div>
- </body>
-</html> \ No newline at end of file
diff --git a/docs/_build/html/customisation.html b/docs/_build/html/customisation.html
deleted file mode 100644
index 43faf84..0000000
--- a/docs/_build/html/customisation.html
+++ /dev/null
@@ -1,143 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
- <title>Chimère customisation &mdash; Chimère 2.0 documentation</title>
-
- <link rel="stylesheet" href="_static/default.css" type="text/css" />
- <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-
- <script type="text/javascript">
- var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '',
- VERSION: '2.0',
- COLLAPSE_INDEX: false,
- FILE_SUFFIX: '.html',
- HAS_SOURCE: true
- };
- </script>
- <script type="text/javascript" src="_static/jquery.js"></script>
- <script type="text/javascript" src="_static/underscore.js"></script>
- <script type="text/javascript" src="_static/doctools.js"></script>
- <link rel="top" title="Chimère 2.0 documentation" href="index.html" />
- <link rel="next" title="Administration" href="administration.html" />
- <link rel="prev" title="Configuration" href="configuration.html" />
- </head>
- <body>
- <div class="related">
- <h3>Navigation</h3>
- <ul>
- <li class="right" style="margin-right: 10px">
- <a href="genindex.html" title="General Index"
- accesskey="I">index</a></li>
- <li class="right" >
- <a href="administration.html" title="Administration"
- accesskey="N">next</a> |</li>
- <li class="right" >
- <a href="configuration.html" title="Configuration"
- accesskey="P">previous</a> |</li>
- <li><a href="index.html">Chimère 2.0 documentation</a> &raquo;</li>
- </ul>
- </div>
-
- <div class="document">
- <div class="documentwrapper">
- <div class="bodywrapper">
- <div class="body">
-
- <div class="section" id="chimere-customisation">
-<h1>Chimère customisation<a class="headerlink" href="#chimere-customisation" title="Permalink to this headline">¶</a></h1>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Author:</th><td class="field-body">Étienne Loks</td>
-</tr>
-<tr class="field-even field"><th class="field-name">date:</th><td class="field-body">2012-10-08</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Copyright:</th><td class="field-body">CC-BY 3.0</td>
-</tr>
-</tbody>
-</table>
-<p>This documents presents the installation of Chimère.
-The version has been updated for version 2.0.0.</p>
-<div class="section" id="updating-the-design">
-<h2>Updating the design<a class="headerlink" href="#updating-the-design" title="Permalink to this headline">¶</a></h2>
-<p>You can of course customize Chimère with your own CSS. To do that just edit the file static/styles.css.</p>
-<p>After this basic configuration done the harder is done. You can do now application administration tasks.</p>
-</div>
-<div class="section" id="id1">
-<h2>Managing layers<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h2>
-</div>
-</div>
-
-
- </div>
- </div>
- </div>
- <div class="sphinxsidebar">
- <div class="sphinxsidebarwrapper">
- <h3><a href="index.html">Table Of Contents</a></h3>
- <ul>
-<li><a class="reference internal" href="#">Chimère customisation</a><ul>
-<li><a class="reference internal" href="#updating-the-design">Updating the design</a></li>
-<li><a class="reference internal" href="#id1">Managing layers</a></li>
-</ul>
-</li>
-</ul>
-
- <h4>Previous topic</h4>
- <p class="topless"><a href="configuration.html"
- title="previous chapter">Configuration</a></p>
- <h4>Next topic</h4>
- <p class="topless"><a href="administration.html"
- title="next chapter">Administration</a></p>
- <h3>This Page</h3>
- <ul class="this-page-menu">
- <li><a href="_sources/customisation.txt"
- rel="nofollow">Show Source</a></li>
- </ul>
-<div id="searchbox" style="display: none">
- <h3>Quick search</h3>
- <form class="search" action="search.html" method="get">
- <input type="text" name="q" />
- <input type="submit" value="Go" />
- <input type="hidden" name="check_keywords" value="yes" />
- <input type="hidden" name="area" value="default" />
- </form>
- <p class="searchtip" style="font-size: 90%">
- Enter search terms or a module, class or function name.
- </p>
-</div>
-<script type="text/javascript">$('#searchbox').show(0);</script>
- </div>
- </div>
- <div class="clearer"></div>
- </div>
- <div class="related">
- <h3>Navigation</h3>
- <ul>
- <li class="right" style="margin-right: 10px">
- <a href="genindex.html" title="General Index"
- >index</a></li>
- <li class="right" >
- <a href="administration.html" title="Administration"
- >next</a> |</li>
- <li class="right" >
- <a href="configuration.html" title="Configuration"
- >previous</a> |</li>
- <li><a href="index.html">Chimère 2.0 documentation</a> &raquo;</li>
- </ul>
- </div>
- <div class="footer">
- &copy; Copyright 2012, Étienne Loks.
- Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
- </div>
- </body>
-</html> \ No newline at end of file
diff --git a/docs/_build/html/genindex.html b/docs/_build/html/genindex.html
deleted file mode 100644
index f46fa3f..0000000
--- a/docs/_build/html/genindex.html
+++ /dev/null
@@ -1,95 +0,0 @@
-
-
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
- <title>Index &mdash; Chimère 2.0 documentation</title>
-
- <link rel="stylesheet" href="_static/default.css" type="text/css" />
- <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-
- <script type="text/javascript">
- var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '',
- VERSION: '2.0',
- COLLAPSE_INDEX: false,
- FILE_SUFFIX: '.html',
- HAS_SOURCE: true
- };
- </script>
- <script type="text/javascript" src="_static/jquery.js"></script>
- <script type="text/javascript" src="_static/underscore.js"></script>
- <script type="text/javascript" src="_static/doctools.js"></script>
- <link rel="top" title="Chimère 2.0 documentation" href="index.html" />
- </head>
- <body>
- <div class="related">
- <h3>Navigation</h3>
- <ul>
- <li class="right" style="margin-right: 10px">
- <a href="#" title="General Index"
- accesskey="I">index</a></li>
- <li><a href="index.html">Chimère 2.0 documentation</a> &raquo;</li>
- </ul>
- </div>
-
- <div class="document">
- <div class="documentwrapper">
- <div class="bodywrapper">
- <div class="body">
-
-
-<h1 id="index">Index</h1>
-
-<div class="genindex-jumpbox">
-
-</div>
-
-
- </div>
- </div>
- </div>
- <div class="sphinxsidebar">
- <div class="sphinxsidebarwrapper">
-
-
-
-<div id="searchbox" style="display: none">
- <h3>Quick search</h3>
- <form class="search" action="search.html" method="get">
- <input type="text" name="q" />
- <input type="submit" value="Go" />
- <input type="hidden" name="check_keywords" value="yes" />
- <input type="hidden" name="area" value="default" />
- </form>
- <p class="searchtip" style="font-size: 90%">
- Enter search terms or a module, class or function name.
- </p>
-</div>
-<script type="text/javascript">$('#searchbox').show(0);</script>
- </div>
- </div>
- <div class="clearer"></div>
- </div>
- <div class="related">
- <h3>Navigation</h3>
- <ul>
- <li class="right" style="margin-right: 10px">
- <a href="#" title="General Index"
- >index</a></li>
- <li><a href="index.html">Chimère 2.0 documentation</a> &raquo;</li>
- </ul>
- </div>
- <div class="footer">
- &copy; Copyright 2012, Étienne Loks.
- Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
- </div>
- </body>
-</html> \ No newline at end of file
diff --git a/docs/_build/html/import_export.html b/docs/_build/html/import_export.html
deleted file mode 100644
index a12fd22..0000000
--- a/docs/_build/html/import_export.html
+++ /dev/null
@@ -1,116 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
- <title>Chimère import/export &mdash; Chimère 2.0 documentation</title>
-
- <link rel="stylesheet" href="_static/default.css" type="text/css" />
- <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-
- <script type="text/javascript">
- var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '',
- VERSION: '2.0',
- COLLAPSE_INDEX: false,
- FILE_SUFFIX: '.html',
- HAS_SOURCE: true
- };
- </script>
- <script type="text/javascript" src="_static/jquery.js"></script>
- <script type="text/javascript" src="_static/underscore.js"></script>
- <script type="text/javascript" src="_static/doctools.js"></script>
- <link rel="top" title="Chimère 2.0 documentation" href="index.html" />
- <link rel="prev" title="Chimère customisation" href="customisation.html" />
- </head>
- <body>
- <div class="related">
- <h3>Navigation</h3>
- <ul>
- <li class="right" style="margin-right: 10px">
- <a href="genindex.html" title="General Index"
- accesskey="I">index</a></li>
- <li class="right" >
- <a href="customisation.html" title="Chimère customisation"
- accesskey="P">previous</a> |</li>
- <li><a href="index.html">Chimère 2.0 documentation</a> &raquo;</li>
- </ul>
- </div>
-
- <div class="document">
- <div class="documentwrapper">
- <div class="bodywrapper">
- <div class="body">
-
- <div class="section" id="chimere-import-export">
-<h1>Chimère import/export<a class="headerlink" href="#chimere-import-export" title="Permalink to this headline">¶</a></h1>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Author:</th><td class="field-body">Étienne Loks</td>
-</tr>
-<tr class="field-even field"><th class="field-name">date:</th><td class="field-body">2012-10-08</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Copyright:</th><td class="field-body">CC-BY 3.0</td>
-</tr>
-</tbody>
-</table>
-<p>This documents presents the administration of Chimère.
-The version has been updated for version 2.0.0.</p>
-</div>
-
-
- </div>
- </div>
- </div>
- <div class="sphinxsidebar">
- <div class="sphinxsidebarwrapper">
- <h4>Previous topic</h4>
- <p class="topless"><a href="customisation.html"
- title="previous chapter">Chimère customisation</a></p>
- <h3>This Page</h3>
- <ul class="this-page-menu">
- <li><a href="_sources/import_export.txt"
- rel="nofollow">Show Source</a></li>
- </ul>
-<div id="searchbox" style="display: none">
- <h3>Quick search</h3>
- <form class="search" action="search.html" method="get">
- <input type="text" name="q" />
- <input type="submit" value="Go" />
- <input type="hidden" name="check_keywords" value="yes" />
- <input type="hidden" name="area" value="default" />
- </form>
- <p class="searchtip" style="font-size: 90%">
- Enter search terms or a module, class or function name.
- </p>
-</div>
-<script type="text/javascript">$('#searchbox').show(0);</script>
- </div>
- </div>
- <div class="clearer"></div>
- </div>
- <div class="related">
- <h3>Navigation</h3>
- <ul>
- <li class="right" style="margin-right: 10px">
- <a href="genindex.html" title="General Index"
- >index</a></li>
- <li class="right" >
- <a href="customisation.html" title="Chimère customisation"
- >previous</a> |</li>
- <li><a href="index.html">Chimère 2.0 documentation</a> &raquo;</li>
- </ul>
- </div>
- <div class="footer">
- &copy; Copyright 2012, Étienne Loks.
- Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
- </div>
- </body>
-</html> \ No newline at end of file
diff --git a/docs/_build/html/index.html b/docs/_build/html/index.html
deleted file mode 100644
index 8b4ca6d..0000000
--- a/docs/_build/html/index.html
+++ /dev/null
@@ -1,143 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
- <title>Welcome to Chimère’s documentation! &mdash; Chimère 2.0 documentation</title>
-
- <link rel="stylesheet" href="_static/default.css" type="text/css" />
- <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-
- <script type="text/javascript">
- var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '',
- VERSION: '2.0',
- COLLAPSE_INDEX: false,
- FILE_SUFFIX: '.html',
- HAS_SOURCE: true
- };
- </script>
- <script type="text/javascript" src="_static/jquery.js"></script>
- <script type="text/javascript" src="_static/underscore.js"></script>
- <script type="text/javascript" src="_static/doctools.js"></script>
- <link rel="top" title="Chimère 2.0 documentation" href="#" />
- <link rel="next" title="Installation" href="install.html" />
- </head>
- <body>
- <div class="related">
- <h3>Navigation</h3>
- <ul>
- <li class="right" style="margin-right: 10px">
- <a href="genindex.html" title="General Index"
- accesskey="I">index</a></li>
- <li class="right" >
- <a href="install.html" title="Installation"
- accesskey="N">next</a> |</li>
- <li><a href="#">Chimère 2.0 documentation</a> &raquo;</li>
- </ul>
- </div>
-
- <div class="document">
- <div class="documentwrapper">
- <div class="bodywrapper">
- <div class="body">
-
- <div class="section" id="welcome-to-chimere-s-documentation">
-<h1>Welcome to Chimère&#8217;s documentation!<a class="headerlink" href="#welcome-to-chimere-s-documentation" title="Permalink to this headline">¶</a></h1>
-<div class="toctree-wrapper compound">
-<ul>
-<li class="toctree-l1"><a class="reference internal" href="install.html">Installation</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="install.html#prerequisites">Prerequisites</a></li>
-<li class="toctree-l2"><a class="reference internal" href="install.html#database-configuration">Database configuration</a></li>
-<li class="toctree-l2"><a class="reference internal" href="install.html#install-the-sources">Install the sources</a></li>
-<li class="toctree-l2"><a class="reference internal" href="install.html#create-a-custom-project-template">Create a custom project template</a></li>
-<li class="toctree-l2"><a class="reference internal" href="install.html#compiling-languages">Compiling languages</a></li>
-<li class="toctree-l2"><a class="reference internal" href="install.html#database-initialisation">Database initialisation</a></li>
-<li class="toctree-l2"><a class="reference internal" href="install.html#webserver-configuration">Webserver configuration</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="upgrade.html">Upgrade</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="upgrade.html#get-new-version-of-dependencies">Get new version of dependencies</a></li>
-<li class="toctree-l2"><a class="reference internal" href="upgrade.html#get-the-new-sources">Get the new sources</a></li>
-<li class="toctree-l2"><a class="reference internal" href="upgrade.html#migrate-database">Migrate database</a></li>
-<li class="toctree-l2"><a class="reference internal" href="upgrade.html#update-translations">Update translations</a></li>
-<li class="toctree-l2"><a class="reference internal" href="upgrade.html#force-the-upgrade-of-visitor-s-web-browser-cache">Force the upgrade of visitor&#8217;s web browser cache</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="configuration.html">Configuration</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="configuration.html#managing-areas">Managing areas</a></li>
-<li class="toctree-l2"><a class="reference internal" href="configuration.html#managing-users">Managing users</a></li>
-<li class="toctree-l2"><a class="reference internal" href="configuration.html#creating-property-models">Creating property models</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="customisation.html">Chimère customisation</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="customisation.html#updating-the-design">Updating the design</a></li>
-<li class="toctree-l2"><a class="reference internal" href="customisation.html#id1">Managing layers</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="administration.html">Administration</a><ul>
-<li class="toctree-l2"><a class="reference internal" href="administration.html#administration-pages-presentation">Administration pages presentation</a></li>
-<li class="toctree-l2"><a class="reference internal" href="administration.html#creating-news">Creating news</a></li>
-<li class="toctree-l2"><a class="reference internal" href="administration.html#creating-categories-subcategories">Creating categories/subcategories</a></li>
-<li class="toctree-l2"><a class="reference internal" href="administration.html#moderation">Moderation</a></li>
-</ul>
-</li>
-<li class="toctree-l1"><a class="reference internal" href="import_export.html">Chimère import/export</a></li>
-</ul>
-</div>
-</div>
-
-
- </div>
- </div>
- </div>
- <div class="sphinxsidebar">
- <div class="sphinxsidebarwrapper">
- <h4>Next topic</h4>
- <p class="topless"><a href="install.html"
- title="next chapter">Installation</a></p>
- <h3>This Page</h3>
- <ul class="this-page-menu">
- <li><a href="_sources/index.txt"
- rel="nofollow">Show Source</a></li>
- </ul>
-<div id="searchbox" style="display: none">
- <h3>Quick search</h3>
- <form class="search" action="search.html" method="get">
- <input type="text" name="q" />
- <input type="submit" value="Go" />
- <input type="hidden" name="check_keywords" value="yes" />
- <input type="hidden" name="area" value="default" />
- </form>
- <p class="searchtip" style="font-size: 90%">
- Enter search terms or a module, class or function name.
- </p>
-</div>
-<script type="text/javascript">$('#searchbox').show(0);</script>
- </div>
- </div>
- <div class="clearer"></div>
- </div>
- <div class="related">
- <h3>Navigation</h3>
- <ul>
- <li class="right" style="margin-right: 10px">
- <a href="genindex.html" title="General Index"
- >index</a></li>
- <li class="right" >
- <a href="install.html" title="Installation"
- >next</a> |</li>
- <li><a href="#">Chimère 2.0 documentation</a> &raquo;</li>
- </ul>
- </div>
- <div class="footer">
- &copy; Copyright 2012, Étienne Loks.
- Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
- </div>
- </body>
-</html> \ No newline at end of file
diff --git a/docs/_build/html/install.html b/docs/_build/html/install.html
deleted file mode 100644
index 6f74a04..0000000
--- a/docs/_build/html/install.html
+++ /dev/null
@@ -1,389 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
- <title>Installation &mdash; Chimère 2.0 documentation</title>
-
- <link rel="stylesheet" href="_static/default.css" type="text/css" />
- <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-
- <script type="text/javascript">
- var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '',
- VERSION: '2.0',
- COLLAPSE_INDEX: false,
- FILE_SUFFIX: '.html',
- HAS_SOURCE: true
- };
- </script>
- <script type="text/javascript" src="_static/jquery.js"></script>
- <script type="text/javascript" src="_static/underscore.js"></script>
- <script type="text/javascript" src="_static/doctools.js"></script>
- <link rel="top" title="Chimère 2.0 documentation" href="index.html" />
- <link rel="next" title="Upgrade" href="upgrade.html" />
- <link rel="prev" title="Welcome to Chimère’s documentation!" href="index.html" />
- </head>
- <body>
- <div class="related">
- <h3>Navigation</h3>
- <ul>
- <li class="right" style="margin-right: 10px">
- <a href="genindex.html" title="General Index"
- accesskey="I">index</a></li>
- <li class="right" >
- <a href="upgrade.html" title="Upgrade"
- accesskey="N">next</a> |</li>
- <li class="right" >
- <a href="index.html" title="Welcome to Chimère’s documentation!"
- accesskey="P">previous</a> |</li>
- <li><a href="index.html">Chimère 2.0 documentation</a> &raquo;</li>
- </ul>
- </div>
-
- <div class="document">
- <div class="documentwrapper">
- <div class="bodywrapper">
- <div class="body">
-
- <div class="section" id="installation">
-<h1>Installation<a class="headerlink" href="#installation" title="Permalink to this headline">¶</a></h1>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Author:</th><td class="field-body">Étienne Loks</td>
-</tr>
-<tr class="field-even field"><th class="field-name">date:</th><td class="field-body">2012-10-08</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Copyright:</th><td class="field-body">CC-BY 3.0</td>
-</tr>
-</tbody>
-</table>
-<p>This documents presents the installation of Chimère.
-The version has been updated for version 2.0.0.</p>
-<div class="section" id="prerequisites">
-<h2>Prerequisites<a class="headerlink" href="#prerequisites" title="Permalink to this headline">¶</a></h2>
-<blockquote>
-<div><ul class="simple">
-<li><a class="reference external" href="http://www.apache.org/">apache</a> version 2.x</li>
-<li><a class="reference external" href="http://www.python.org/">python</a> versions 2.6 or 2.7</li>
-<li><a class="reference external" href="http://www.djangoproject.com/">django</a> &gt;= version 1.4</li>
-<li><a class="reference external" href="http://south.aeracode.org/">south</a></li>
-<li><a class="reference external" href="http://www.postgresql.org/">postgres</a> &gt;= version 8.x</li>
-<li><a class="reference external" href="http://www.gnu.org/software/gettext/">gettext</a></li>
-<li><a class="reference external" href="http://freshmeat.net/projects/psycopg/">psycopg2</a></li>
-<li><a class="reference external" href="http://www.pythonware.com/products/pil/">Python Imaging Library</a></li>
-<li><a class="reference external" href="http://tilloy.net/dev/pyexiv2/">pyexiv2</a></li>
-<li><a class="reference external" href="http://www.crummy.com/software/BeautifulSoup/">Beautiful Soup</a></li>
-<li>python-simplejson</li>
-<li>python-gdal</li>
-<li><a href="#id1"><span class="problematic" id="id2">`</span></a>unidecode &lt;<a class="reference external" href="http://pypi.python.org/pypi/Unidecode">http://pypi.python.org/pypi/Unidecode</a>&gt;_</li>
-<li><a class="reference external" href="http://lxml.de/">lxml</a></li>
-<li><a class="reference external" href="http://jquery.com/">jquery</a> version 1.7.1 or better</li>
-<li><a class="reference external" href="http://jqueryui.com/">jquery-ui</a></li>
-<li><a class="reference external" href="https://code.google.com/p/feedparser/">Universal Feed Parser</a></li>
-</ul>
-</div></blockquote>
-<p>geodjango is a part of django since version 1.0 but it has some specific
-(geographically related) additional dependencies:</p>
-<blockquote>
-<div><ul class="simple">
-<li><a class="reference external" href="http://trac.osgeo.org/geos/">geos</a> 3.0.x</li>
-<li><a class="reference external" href="http://trac.osgeo.org/proj/">proj.4</a> 4.4 to 4.6</li>
-<li><a class="reference external" href="http://postgis.refractions.net/">posgis</a> versions 1.2.1 or 1.3.x</li>
-<li><a class="reference external" href="http://www.gdal.org/">gdal</a></li>
-</ul>
-</div></blockquote>
-<p>Optionaly (but recommanded):</p>
-<blockquote>
-<div><ul class="simple">
-<li><a class="reference external" href="http://tinymce.moxiecode.com/">tinymce</a></li>
-<li><a class="reference external" href="http://www.gpsbabel.org/">gpsbabel</a></li>
-<li>django-celery if you want to manage large imports</li>
-</ul>
-</div></blockquote>
-<p>The simpliest way to obtain these packages is to get them from your favorite
-Linux distribution repositories. For instance on Debian Wheezy:</p>
-<div class="highlight-python"><pre>apt-get install python python-django python-django-south \
- python-beautifulsoup tinymce apache2 libgeos-3.3.3 proj-bin gdal-bin \
- python-gdal python-lxml python-psycopg2 python-imaging gettext \
- postgresql-9.1 postgresql-9.1-postgis libjs-jquery libjs-jquery-ui \
- python-django-celery python-simplejson gpsbabel \
- python-pyexiv2 python-feedparser javascript-common</pre>
-</div>
-<p>On Debian Squeeze (you need to activate backports):</p>
-<div class="highlight-python"><pre>apt-get install -t squeeze-backports python-django
-
-apt-get install python python-django-south python-beautifulsoup tinymce \
- apache2 libgeos-3.2.0 proj-bin gdal-bin python-gdal python-lxml \
- python-psycopg2 python-imaging gettext postgresql-8.4 \
- postgresql-8.4-postgis libjs-jquery libjs-jquery-ui python-simplejson \
- gpsbabel python-pyexiv2 python-feedparser javascript-common</pre>
-</div>
-<p>If these packages do not exist in your distribution&#8217;s repository, please refer
-to the applications&#8217; websites.</p>
-</div>
-<div class="section" id="database-configuration">
-<h2>Database configuration<a class="headerlink" href="#database-configuration" title="Permalink to this headline">¶</a></h2>
-<p>Now that postgres and postgis are installed, you need to create a new user for
-chimere:</p>
-<div class="highlight-python"><pre>su postgres
-createuser --echo --adduser --createdb --encrypted --pwprompt chimere-user</pre>
-</div>
-<p>Then, you have to create the database and initialize the geographic types (adapt
-the paths accordingly to your needs):</p>
-<div class="highlight-python"><pre>PG_VERSION=9.1 # 8.4 for debian Squeeze
-createdb --echo --owner chimere-user --encoding UNICODE chimere "My Chimère database"
-createlang plpgsql chimere # only necessary on Debian Squeeze
-psql -d chimere -f /usr/share/postgresql/$PG_VERSION/contrib/postgis-1.5/postgis.sql
-psql -d chimere -f /usr/share/postgresql/$PG_VERSION/contrib/postgis-1.5/spatial_ref_sys.sql</pre>
-</div>
-</div>
-<div class="section" id="install-the-sources">
-<h2>Install the sources<a class="headerlink" href="#install-the-sources" title="Permalink to this headline">¶</a></h2>
-<p>Choose a path to install your Chimère:</p>
-<div class="highlight-python"><pre>INSTALL_PATH=/var/local/django
-mkdir $INSTALL_PATH</pre>
-</div>
-<div class="section" id="from-an-archive">
-<h3>From an archive<a class="headerlink" href="#from-an-archive" title="Permalink to this headline">¶</a></h3>
-<p>The last &#8220;stable&#8221; version is available in this <a class="reference external" href="http://www.peacefrogs.net/download/chimere/">directory</a>.
-Take care of getting the last version in the desired X.Y branch (for instance
-the last version for the 1.0 branch is version 1.0.2.
-Extract it to the desired destination path:</p>
-<div class="highlight-python"><pre>wget http://www.peacefrogs.net/download/chimere -q -O -| html2text
-(...)
-[[ ]] chimere-1.0.0.tar.bz2 17-Nov-2010 16:51 53K
-[[ ]] chimere-1.0.1.tar.bz2 17-Nov-2010 16:51 53K
-[[ ]] chimere-1.0.2.tar.bz2 17-Nov-2010 16:51 53K
-(...)
-
-wget http://www.peacefrogs.net/download/chimere/chimere-1.0.2.tar.bz2</pre>
-</div>
-<p>Download, unpack and move the files in an apache user (www-data for Debian)
-readable directory:</p>
-<div class="highlight-python"><pre>cd $INSTALL_PATH
-tar xvjf chimere-last.tar.bz2
-chown -R myusername:www-data chimere</pre>
-</div>
-</div>
-<div class="section" id="from-the-git-repository">
-<h3>From the git repository<a class="headerlink" href="#from-the-git-repository" title="Permalink to this headline">¶</a></h3>
-<p>Another solution is to get the last git version:</p>
-<div class="highlight-python"><pre>cd $INSTALL_PATH
-git clone git://www.peacefrogs.net/git/chimere
-cd chimere
-git tag -l # list tagged versions
-git checkout v2.0 # checkout the desired version</pre>
-</div>
-</div>
-</div>
-<div class="section" id="create-a-custom-project-template">
-<h2>Create a custom project template<a class="headerlink" href="#create-a-custom-project-template" title="Permalink to this headline">¶</a></h2>
-<p>There a default project provided &#8220;example_project&#8221;. Copy and modify it (or
-get another project based on Chimere):</p>
-<div class="highlight-python"><pre>cd $INSTALL_PATH/chimere
-cp -ra example_project mychimere_project</pre>
-</div>
-<p>Your project name is used for the name of the Python package of your template.
-As a Python package it should follow the rule of Python variable name:
-it must be at least one letter and can have a string of numbers, letters and
-&#8220;_&#8221; to any length. Don&#8217;t begin the name by &#8220;_&#8221; because it has special
-significance in Python.</p>
-<p>In your chimere application directory create local_settings.py to fit to your
-configuration.
-A base template is provided (local_settings.py.example) and short descriptions of
-the more relevant fields are given below (at least check them). Most of theses
-settings are initialized in settings.py.</p>
-<div class="highlight-python"><pre>cd $INSTALL_PATH/chimere/mychimere_project
-cp local_settings.py.sample local_settings.py
-vim local_settings.py</pre>
-</div>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Fields:</th><td class="field-body"><ul class="first last simple">
-<li>DATABASES: parameters for the database</li>
-<li>PROJECT_NAME: name of the project</li>
-<li>SECRET_KEY: a secret key for a particular Django installation. This is
-used to provide cryptographic signing, and should be set to a unique,
-unpredictable value. Change it!</li>
-<li>ROOT_URLCONF: url configuration for your project something like:
-&#8216;mychimere_project.urls&#8217;</li>
-<li>EMAIL_HOST: smtp of an email server to send emails</li>
-<li>TINYMCE_URL: url to tinymce path (default is appropriate for a Debian
-installation with tinymce activated)</li>
-<li>JQUERY_JS_URLS: list of Jquery and Jquery-ui urls (default is appropriate
-for a Debian installation with Jquery and Jquery-ui activated)</li>
-<li>JQUERY_CSS_URLS: list of Jquery and Jquery-ui urls (default is appropriate
-for a Debian installation with Jquery and Jquery-ui activated)</li>
-<li>GPSBABEL: path to gpsbabel (default is appropriate for a Debian
-installation with gpsbabel installed)</li>
-<li>TIME_ZONE: local time zone for this installation</li>
-<li>LANGUAGE_CODE: language code for this installation</li>
-</ul>
-</td>
-</tr>
-</tbody>
-</table>
-<p>Manage media path permission:</p>
-<div class="highlight-python"><pre>cd $INSTALL_PATH/chimere/mychimere_project
-chown -R user:www-data media
-chmod -R g+w media</pre>
-</div>
-<p>Create log file:</p>
-<div class="highlight-python"><pre>mkdir /var/log/django
-touch /var/log/django/chimere.log
-chown -R root:www-data /var/log/django/
-chmod -R g+w /var/log/django/</pre>
-</div>
-<p>Regroup static files in one path:</p>
-<div class="highlight-python"><pre>cd $INSTALL_PATH/chimere/mychimere_project
-./manage.py collectstatic</pre>
-</div>
-</div>
-<div class="section" id="compiling-languages">
-<h2>Compiling languages<a class="headerlink" href="#compiling-languages" title="Permalink to this headline">¶</a></h2>
-<p>If your language is available in the locale directory of chimere, you will just
-need to get it compiled. This can be done with (here, <strong>fr</strong> stands for french).
-Replace it with the appropriate language code):</p>
-<div class="highlight-python"><pre>cd $INSTALL_PATH/chimere/chimere/
-django-admin compilemessages</pre>
-</div>
-<p>If your language is not available, feel free to create the default po files and
-to submit it, contributions are well appreciated. Procedure is as follows:</p>
-<p>You first need to create the default po file (of course, replace <strong>fr</strong>
-according to the language you choose to create):</p>
-<div class="highlight-python"><pre>django-admin makemessages -l fr</pre>
-</div>
-<p>There should now be a <em>django.po</em> file in <em>locale/fr/LC_MESSAGES</em>. Complete it
-with your translation.</p>
-<p>Now that the translation file is completed, just compile it the same way you
-would have if the language file was already available.</p>
-</div>
-<div class="section" id="database-initialisation">
-<h2>Database initialisation<a class="headerlink" href="#database-initialisation" title="Permalink to this headline">¶</a></h2>
-<p>Create the appropriate tables (still being in chimère application directory):</p>
-<div class="highlight-python"><pre>cd $INSTALL_PATH/chimere/mychimere_project
-./manage.py syncdb</pre>
-</div>
-<p>You will be prompted for the creation of an administrator account
-(administration can be found at: <a class="reference external" href="http://where_is_chimere/admin">http://where_is_chimere/admin</a>). Then you have
-to create tables managed with south:</p>
-<div class="highlight-python"><pre>./manage.py migrate</pre>
-</div>
-<p>The database is set, congratulations!</p>
-<p>If you want to populate your installation with default data (don&#8217;t do this on
-an already populated instance!):</p>
-<div class="highlight-python"><pre>./manage.py loaddata ../chimere/fixtures/default_data.json</pre>
-</div>
-</div>
-<div class="section" id="webserver-configuration">
-<h2>Webserver configuration<a class="headerlink" href="#webserver-configuration" title="Permalink to this headline">¶</a></h2>
-<div class="section" id="apache-configuration-with-mod-wsgi">
-<h3>Apache configuration with mod_wsgi<a class="headerlink" href="#apache-configuration-with-mod-wsgi" title="Permalink to this headline">¶</a></h3>
-<p>Install mod_wsgi for apache:</p>
-<div class="highlight-python"><pre>apt-get install libapache2-mod-wsgi</pre>
-</div>
-<p>TODO: adapt apache-wsgi.conf
-Create and edit a configuration for Chimère:</p>
-<div class="highlight-python"><pre>cp $INSTALL_PATH/chimere/apache/django.wsgi \
- $INSTALL_PATH/chimere/apache/mydjango.wsgi
-vim $INSTALL_PATH/chimere/apache/mydjango.wsgi
-cp $INSTALL_PATH/chimere/apache/apache-wsgi.conf /etc/apache2/sites-available/chimere
-vim /etc/apache2/sites-available/chimere
-# create log dir
-mkdir /var/log/apache2/chimere/</pre>
-</div>
-<p>Adapt the files <em>mydjango.wsgi</em> (with the correct sys path) and Apache <em>chimere</em>.</p>
-<p>To activate the website reload apache:</p>
-<div class="highlight-python"><pre>a2ensite chimere
-/etc/init.d/apache2 reload</pre>
-</div>
-</div>
-</div>
-</div>
-
-
- </div>
- </div>
- </div>
- <div class="sphinxsidebar">
- <div class="sphinxsidebarwrapper">
- <h3><a href="index.html">Table Of Contents</a></h3>
- <ul>
-<li><a class="reference internal" href="#">Installation</a><ul>
-<li><a class="reference internal" href="#prerequisites">Prerequisites</a></li>
-<li><a class="reference internal" href="#database-configuration">Database configuration</a></li>
-<li><a class="reference internal" href="#install-the-sources">Install the sources</a><ul>
-<li><a class="reference internal" href="#from-an-archive">From an archive</a></li>
-<li><a class="reference internal" href="#from-the-git-repository">From the git repository</a></li>
-</ul>
-</li>
-<li><a class="reference internal" href="#create-a-custom-project-template">Create a custom project template</a></li>
-<li><a class="reference internal" href="#compiling-languages">Compiling languages</a></li>
-<li><a class="reference internal" href="#database-initialisation">Database initialisation</a></li>
-<li><a class="reference internal" href="#webserver-configuration">Webserver configuration</a><ul>
-<li><a class="reference internal" href="#apache-configuration-with-mod-wsgi">Apache configuration with mod_wsgi</a></li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-
- <h4>Previous topic</h4>
- <p class="topless"><a href="index.html"
- title="previous chapter">Welcome to Chimère&#8217;s documentation!</a></p>
- <h4>Next topic</h4>
- <p class="topless"><a href="upgrade.html"
- title="next chapter">Upgrade</a></p>
- <h3>This Page</h3>
- <ul class="this-page-menu">
- <li><a href="_sources/install.txt"
- rel="nofollow">Show Source</a></li>
- </ul>
-<div id="searchbox" style="display: none">
- <h3>Quick search</h3>
- <form class="search" action="search.html" method="get">
- <input type="text" name="q" />
- <input type="submit" value="Go" />
- <input type="hidden" name="check_keywords" value="yes" />
- <input type="hidden" name="area" value="default" />
- </form>
- <p class="searchtip" style="font-size: 90%">
- Enter search terms or a module, class or function name.
- </p>
-</div>
-<script type="text/javascript">$('#searchbox').show(0);</script>
- </div>
- </div>
- <div class="clearer"></div>
- </div>
- <div class="related">
- <h3>Navigation</h3>
- <ul>
- <li class="right" style="margin-right: 10px">
- <a href="genindex.html" title="General Index"
- >index</a></li>
- <li class="right" >
- <a href="upgrade.html" title="Upgrade"
- >next</a> |</li>
- <li class="right" >
- <a href="index.html" title="Welcome to Chimère’s documentation!"
- >previous</a> |</li>
- <li><a href="index.html">Chimère 2.0 documentation</a> &raquo;</li>
- </ul>
- </div>
- <div class="footer">
- &copy; Copyright 2012, Étienne Loks.
- Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
- </div>
- </body>
-</html> \ No newline at end of file
diff --git a/docs/_build/html/objects.inv b/docs/_build/html/objects.inv
deleted file mode 100644
index 7a41eb7..0000000
--- a/docs/_build/html/objects.inv
+++ /dev/null
Binary files differ
diff --git a/docs/_build/html/search.html b/docs/_build/html/search.html
deleted file mode 100644
index bf6be74..0000000
--- a/docs/_build/html/search.html
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
- <title>Search &mdash; Chimère 2.0 documentation</title>
-
- <link rel="stylesheet" href="_static/default.css" type="text/css" />
- <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-
- <script type="text/javascript">
- var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '',
- VERSION: '2.0',
- COLLAPSE_INDEX: false,
- FILE_SUFFIX: '.html',
- HAS_SOURCE: true
- };
- </script>
- <script type="text/javascript" src="_static/jquery.js"></script>
- <script type="text/javascript" src="_static/underscore.js"></script>
- <script type="text/javascript" src="_static/doctools.js"></script>
- <script type="text/javascript" src="_static/searchtools.js"></script>
- <link rel="top" title="Chimère 2.0 documentation" href="index.html" />
- <script type="text/javascript">
- jQuery(function() { Search.loadIndex("searchindex.js"); });
- </script>
-
-
- </head>
- <body>
- <div class="related">
- <h3>Navigation</h3>
- <ul>
- <li class="right" style="margin-right: 10px">
- <a href="genindex.html" title="General Index"
- accesskey="I">index</a></li>
- <li><a href="index.html">Chimère 2.0 documentation</a> &raquo;</li>
- </ul>
- </div>
-
- <div class="document">
- <div class="documentwrapper">
- <div class="bodywrapper">
- <div class="body">
-
- <h1 id="search-documentation">Search</h1>
- <div id="fallback" class="admonition warning">
- <script type="text/javascript">$('#fallback').hide();</script>
- <p>
- Please activate JavaScript to enable the search
- functionality.
- </p>
- </div>
- <p>
- From here you can search these documents. Enter your search
- words into the box below and click "search". Note that the search
- function will automatically search for all of the words. Pages
- containing fewer words won't appear in the result list.
- </p>
- <form action="" method="get">
- <input type="text" name="q" value="" />
- <input type="submit" value="search" />
- <span id="search-progress" style="padding-left: 10px"></span>
- </form>
-
- <div id="search-results">
-
- </div>
-
- </div>
- </div>
- </div>
- <div class="sphinxsidebar">
- <div class="sphinxsidebarwrapper">
- </div>
- </div>
- <div class="clearer"></div>
- </div>
- <div class="related">
- <h3>Navigation</h3>
- <ul>
- <li class="right" style="margin-right: 10px">
- <a href="genindex.html" title="General Index"
- >index</a></li>
- <li><a href="index.html">Chimère 2.0 documentation</a> &raquo;</li>
- </ul>
- </div>
- <div class="footer">
- &copy; Copyright 2012, Étienne Loks.
- Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
- </div>
- </body>
-</html> \ No newline at end of file
diff --git a/docs/_build/html/searchindex.js b/docs/_build/html/searchindex.js
deleted file mode 100644
index 1cdf783..0000000
--- a/docs/_build/html/searchindex.js
+++ /dev/null
@@ -1 +0,0 @@
-Search.setIndex({objects:{},terms:{all:[1,3,6],code:[1,3,4],forget:[1,3],yellow:3,signific:[1,4],osm:6,follow:[1,6,4],feedpars:[1,4],content:3,depend:[2,1,4],zone:4,readabl:[6,4],base_url:[],send:4,easiest:[],init:4,program:[],titl:3,text:6,larg:4,town:[],sourc:[2,1,4],string:[1,4],createsuperus:6,relev:4,administr:[0,2,3,4,5,6],button:[6,3],list:[3,4],geograph:[6,4],item:[6,3],form:[6,3],quick:[],initialis:[2,1,6,4],dir:4,pleas:4,base_us:[],direct:1,sign:4,design:[0,2],download:4,further:1,myusernam:4,click:[6,3],blue:3,index:[],appear:3,compar:3,section:6,multimedia:6,abl:6,beautifulsoup:4,access:[6,3],delet:[6,3],version:[0,1,2,3,4,5,6],"new":[2,1,3,6,4],net:[1,4],chimer:[1,3,6,4],chose:[],createdb:4,french:4,"005k":1,witch:6,address:[],path:[6,3,4],modifi:[6,3,4],sinc:4,interpret:[],box:[6,3],search:3,host:[],prior:[],permit:[6,3],action:3,template_context_processor:[],chang:[1,3,6,4],chanc:6,environn:1,chimere_tag:1,repositori:[1,4],father:[],modul:[],apt:[1,4],vim:[1,4],put:3,authentifi:3,subcategori:[2,6,3],fake:1,marker:1,instal:[0,1,6,4,2],select:[6,3],from:[1,3,4],would:[1,4],univers:4,upgrad:[2,1],next:1,websit:[6,4],few:[6,3],handler:[],usr:[1,4],criteria:3,type:[6,3,4],more:[6,3,4],sort:3,where_is_your_chimer:3,desir:4,share:4,relat:4,server_url:1,customis:[0,1,2],phone:6,"export":[2,5],indic:[],particular:4,recommand:4,unpack:4,cach:[2,1,6],must:[1,3,6,4],psql:4,"static":[0,1,4],account:[6,3,4],word:3,hour:6,prepar:1,work:[1,3],uniqu:4,soup:4,paragraph:[1,6],can:[0,1,3,6,4],lc_messag:4,default_categori:[],root:4,prompt:4,tar:4,give:6,process:1,sudo:[],smtp:4,templat:[2,1,4],tarbal:1,tag:[3,4],want:[6,4],default_cent:[],mapnik:6,lxml:[1,4],end:[6,3],anoth:4,length:[1,4],write:[],verifi:1,simpl:[6,3],css:[0,6],email_host:4,map:[6,3],product:1,rebas:1,pypi:4,clone:[1,4],after:[0,1],superus:6,upload:1,manuali:[],befor:[1,3],plane:1,beauti:4,date:[0,1,3,4,5,6],multipl:3,data:[1,4],"short":4,practic:6,bind:1,postgi:4,lost:1,stash:1,django:[1,6,4],issu:[],inform:6,environ:[1,6],jquery_js_url:4,allow:[],order:[6,3],checkbox:3,move:[1,4],becaus:[1,4],meter:1,through:[],tinymce_url:4,still:4,mainli:3,dynam:6,paramet:4,style:0,group:6,cli:[1,6],fit:4,psycopg2:4,clickabl:3,better:4,window:[],requir:[1,6],where_is_chimer:4,media_root:[],hidden:[6,3],main:3,extra_url:[],changepassword:6,them:[1,3,4],recal:[],thei:[6,3],python:[1,4],dai:6,initi:[1,6,4],nov:4,now:[0,1,3,4],choic:[],name:[1,3,6,4],jquery_css_url:4,pyshar:[],gpsbabel:[1,4],off:[],drop:3,refresh:1,xvjf:4,html2text:4,each:[6,3],found:4,unicod:4,updat:[0,1,2,3,4,5,6],mean:6,compil:[2,4],replac:4,jquery_url:1,hard:[],procedur:4,realli:[],backport:[1,4],extract:4,special:[1,4],out:3,variabl:[1,6,4],won:1,tinymc:4,publish:[1,3],categori:[2,6,3],adapt:[1,4],modpython:[],correct:[1,4],red:3,common:[1,4],postgr:4,uncommit:1,migrat:[2,1,4],precaut:1,given:[1,4],free:4,base:[6,4],ask:6,org:[1,4],"9227c9":3,mychimer:[1,6],unpredict:4,gdal:[1,4],care:[3,4],spatial_ref_si:4,could:1,area:[2,6],static_url:1,database_host:[],filter:3,perhap:1,isn:3,outsid:6,root_urlconf:[1,4],auth:6,south:[1,4],first:[1,3,6,4],feed:4,major:1,suffix:[],render:6,feel:4,onc:[6,3],number:[1,3,6,4],yourself:3,restrict:6,mai:6,instruct:1,alreadi:4,done:[0,1,6,4],least:[1,6,4],mydjango:4,owner:4,stabl:[1,4],installed_app:1,optionali:4,size:3,differ:6,"long":6,district:[],script:1,associ:[6,3],top:[],mkdir:[1,4],system:3,messag:6,chimere_dynamic_categori:[],master:1,conveni:3,option:1,copi:[1,4],install_path:4,part:4,consult:3,detail_cont:[],haven:1,png:[],serv:1,provid:[3,4],remov:[1,3],project:[2,1,6,4],pythoninterpret:[],ressourc:6,database_password:[],transport:6,browser:[2,1],favorit:4,ani:[1,4],packag:[1,4],manner:[],have:[1,3,6,4],tabl:[3,4],need:4,element:3,pg_version:4,plpgsql:4,local_set:[1,4],engin:[],bz2:4,min:1,rout:[6,3],port:[],also:[1,3],etienn:[],take:4,which:[],default_data:4,simplifi:1,map_lay:[],sethandl:[],usernam:6,choos:4,most:[6,3,4],letter:[1,4],deploi:[],geodjango:4,icon:[1,3,6],time_zon:4,don:[1,3,6,4],url:[1,3,6,4],doc:[],clear:3,later:[1,6],flow:[],your_chimere_path:1,inde:3,database_port:[],pythonhandl:[],left:[],fact:3,wsgi:[1,4],show:6,german:[],visitor:[2,1],database_us:[],directli:6,session:6,loaddata:4,secret_kei:4,permiss:[6,4],cryptograph:4,staff:6,celeri:[1,4],current:[1,3,6],onli:[1,3,6,4],locat:1,execut:1,copyright:[0,1,3,4,5,6],explain:3,configur:[0,1,6,4,2],apach:[1,4],should:[1,4],theme:6,simpliest:4,local:[1,6,4],media_url:[],contribut:[1,4],get:[2,1,4],familiar:6,your_local_nam:1,stop:1,blank:3,wheezi:[1,4],a2ensit:4,report:1,geo:4,restart:1,enabl:1,chimere_localnam:[1,6],reload:[6,4],integr:1,contain:3,where:6,explainatori:3,view:6,set:[1,3,6,4],project_nam:4,"chim\u00e8r":[0,1,2,3,4,5,6],knowledg:1,displai:[6,3],see:[6,3],mandatori:[6,3],epsg_display_project:[],concern:3,jqueri:[1,4],statu:6,avaibl:3,correctli:3,databas:[2,1,6,4],someth:4,cours:[0,4],label:[6,3],state:3,epsg_project:[],between:[1,6],"import":[2,1,6,4,5],experi:1,email:4,accord:4,javascript:[1,4],appreci:4,kei:4,postgresql_psycopg2:[],job:[],here:4,purpl:3,addit:4,cyclemap:6,both:3,last:4,admin:[1,3,4],gpsbabel_opt:1,etc:[6,4],instanc:[1,3,4],forgotten:6,freeli:3,login:3,whole:[],load:[],simpli:6,technic:6,point:[1,6],color:[6,3],arriv:6,chmod:4,header:3,littl:6,poi:3,mapquest:6,mod_python:[],backend:[],quit:3,folow:1,come:3,empti:[],example_project:[1,4],json:4,valu:[1,4],interest:[6,3],basic:[0,1,3,6],popul:4,createlang:4,regroup:4,imag:4,present:[0,2,3,4,5,6],"case":6,chimere_path:[1,6],look:[6,3],vanilla:[],properti:[2,1,6],harder:0,easier:6,trick:1,defin:6,error:1,value_of_your_localnam:1,fixtur:4,compilemessag:[1,4],openstreetmap:[],real:3,layer:[0,6,2],customiz:6,libj:[1,4],"\u00e9tienn":[0,1,3,4,5,6],site:[3,4],destin:4,archiv:4,conf:4,sever:1,welcom:[2,6],open:6,author:[0,1,3,4,5,6],media:[1,4],make:[1,6],exchang:[],same:[3,4],member:6,html:3,descend:3,document:[0,2,3,4,5,6],mod_wsgi:4,pan:6,complet:[6,4],http:[1,3,4],webserv:[2,1,6,4],effect:3,solut:4,moment:[],user:[2,1,6,4],mani:[1,3,6],extern:6,rvb:3,posgi:4,recent:3,pwprompt:4,task:[0,6],moder:[2,6,3],center:[],chimere_app_path:[1,6],entri:3,well:4,exampl:4,thi:[0,1,3,4,5,6],english:3,model:[2,1,6],self:3,piec:6,propos:6,explan:[],identifi:[6,3],just:[0,1,4],mypassword:[],obtain:4,activ:[1,4],insid:[6,3],human:6,touch:[1,4],flavor:6,yet:1,languag:[2,4],web:[2,1,6],easi:1,"53k":4,shortcut:3,apache2:4,identif:3,add:[1,3,6],other:6,appli:[1,3,6],apart:[],explanatori:3,match:[],bin:[1,4],applic:[0,6,3,4],format:[],read:3,database_engin:[],database_nam:[],password:[6,3],mod:4,linux:[1,4],insert:[],like:[1,3,6,4],specif:4,mychimere_project:4,unidecod:4,property_i_j:[],zoom:[],staticfil:1,server:[1,4],edit:[0,1,3,4],necessari:[1,6,4],"_static":[],django_settings_modul:[],resiz:3,page:[2,6,3],two:6,www:[1,4],right:[6,3],chimere_display_area:[],manual:6,creation:4,some:[1,3,4],begin:[1,4],revel:3,sampl:[1,4],language_cod:4,home:[],librari:4,distribut:4,lead:3,bottom:[],makemessag:4,definit:[],per:6,libapache2:4,evolv:[],leav:[],proj:4,slash:3,localhost:[],refer:4,core:[],previou:1,run:1,bold:3,chimere_default_cent:[],usag:6,step:[1,3,6],squeez:[1,4],prerequisit:[2,4],wget:4,trustworthi:6,sub:3,postgresql:4,chimere_restricted_ext:[],column:3,eventuali:[],manag:[0,1,6,4,2],srv:[1,6],stand:4,backup:1,ratatouil:[],own:[0,6],addus:4,setenv:[],additionn:[],pythonpath:[],encod:4,bound:6,automat:6,appropri:[6,4],been:[0,1,3,4,5,6],contrib:[1,4],openlay:[],your:[0,1,3,6,4],libgeo:4,accordingli:4,git:[1,4],fill:[],lwpostgi:[],wai:4,pictur:6,lok:[0,1,3,4,5,6],secret:4,submit:[3,4],custom:[0,6,4,2],avail:[1,3,6,4],interfac:[6,3],"var":[1,4],submiss:3,particulari:[],properli:[],administration_:[],simplejson:[1,4],forc:[2,1],ascend:3,back:3,pwd:1,collectstat:[1,4],link:3,translat:[2,1,4],pyexiv2:[1,4],line:1,congratul:4,pull:1,made:[1,3],possibl:3,"default":[1,6,4],checkout:[1,4],chimere_default_categori:[],pythondebug:[],rc2:[],rc3:1,below:4,limit:6,otherwis:[6,3],problem:1,urn:6,crosstrack:1,gone:[],creat:[2,1,3,6,4],createus:4,parser:4,exist:4,rule:[1,4],file:[0,1,6,4],syncdb:[1,4],chimere_default_zoom:[],check:[6,3,4],probabl:1,echo:4,encrypt:4,automaticali:[],todo:4,when:6,detail:[6,3],gettext:4,field:[1,3,6,4],old:1,valid:3,kombu:1,branch:[1,4],chimere_admin_01:[],test:1,you:[0,1,3,6,4],draw:3,repeat:1,peacefrog:[1,4],symbol:[],drag:3,log:[1,3,6,4],consid:1,sql:4,debian:[1,4],longer:[],migrate_properti:1,directori:[1,4],root_path:[],descript:[1,6,4],dgango:[],chown:[1,4],time:4},objtypes:{},titles:["Chim\u00e8re customisation","Upgrade","Welcome to Chim\u00e8re&#8217;s documentation!","Administration","Installation","Chim\u00e8re import/export","Configuration"],objnames:{},filenames:["customisation","upgrade","index","administration","install","import_export","configuration"]}) \ No newline at end of file
diff --git a/docs/_build/html/upgrade.html b/docs/_build/html/upgrade.html
deleted file mode 100644
index 2304c83..0000000
--- a/docs/_build/html/upgrade.html
+++ /dev/null
@@ -1,424 +0,0 @@
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
- <title>Upgrade &mdash; Chimère 2.0 documentation</title>
-
- <link rel="stylesheet" href="_static/default.css" type="text/css" />
- <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
-
- <script type="text/javascript">
- var DOCUMENTATION_OPTIONS = {
- URL_ROOT: '',
- VERSION: '2.0',
- COLLAPSE_INDEX: false,
- FILE_SUFFIX: '.html',
- HAS_SOURCE: true
- };
- </script>
- <script type="text/javascript" src="_static/jquery.js"></script>
- <script type="text/javascript" src="_static/underscore.js"></script>
- <script type="text/javascript" src="_static/doctools.js"></script>
- <link rel="top" title="Chimère 2.0 documentation" href="index.html" />
- <link rel="next" title="Configuration" href="configuration.html" />
- <link rel="prev" title="Installation" href="install.html" />
- </head>
- <body>
- <div class="related">
- <h3>Navigation</h3>
- <ul>
- <li class="right" style="margin-right: 10px">
- <a href="genindex.html" title="General Index"
- accesskey="I">index</a></li>
- <li class="right" >
- <a href="configuration.html" title="Configuration"
- accesskey="N">next</a> |</li>
- <li class="right" >
- <a href="install.html" title="Installation"
- accesskey="P">previous</a> |</li>
- <li><a href="index.html">Chimère 2.0 documentation</a> &raquo;</li>
- </ul>
- </div>
-
- <div class="document">
- <div class="documentwrapper">
- <div class="bodywrapper">
- <div class="body">
-
- <div class="section" id="upgrade">
-<h1>Upgrade<a class="headerlink" href="#upgrade" title="Permalink to this headline">¶</a></h1>
-<table class="docutils field-list" frame="void" rules="none">
-<col class="field-name" />
-<col class="field-body" />
-<tbody valign="top">
-<tr class="field-odd field"><th class="field-name">Author:</th><td class="field-body">Étienne Loks</td>
-</tr>
-<tr class="field-even field"><th class="field-name">date:</th><td class="field-body">2012-10-08</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Copyright:</th><td class="field-body">CC-BY 3.0</td>
-</tr>
-</tbody>
-</table>
-<p>Before any upgrade backup the database and all your installation files
-(specially if you have made changes to them).
-The process for migration requires a basic knowledge of Git and Linux CLI. It is
-not an easy process. A work is done to easy the upgrade in later versions (&gt;2.0)
-of Chimère.</p>
-<p>If several versions has been published, you should repeat any upgrading steps.
-For instance to upgrade from v1.1 to v2.0 you should first upgrade to v1.2 then
-to v2.0. The only optional step is the integration of your customisations.</p>
-<p>The current stable version is 2.0.
-If you are considering to contribute on Chimère get the Git master.</p>
-<p>The instruction are given for Debian Squeeze and Debian Wheezy.</p>
-<div class="section" id="get-new-version-of-dependencies">
-<h2>Get new version of dependencies<a class="headerlink" href="#get-new-version-of-dependencies" title="Permalink to this headline">¶</a></h2>
-<div class="section" id="version-1-1-1-2">
-<h3>Version 1.1 -&gt; 1.2<a class="headerlink" href="#version-1-1-1-2" title="Permalink to this headline">¶</a></h3>
-<div class="highlight-bash"><div class="highlight"><pre>apt-get install python-lxml libjs-jquery gpsbabel python-gdal
-</pre></div>
-</div>
-</div>
-<div class="section" id="version-1-2-2-0">
-<h3>Version 1.2 -&gt; 2.0<a class="headerlink" href="#version-1-2-2-0" title="Permalink to this headline">¶</a></h3>
-<div class="section" id="debian-squeeze">
-<h4>Debian Squeeze<a class="headerlink" href="#debian-squeeze" title="Permalink to this headline">¶</a></h4>
-<p>Activate the backports: <a class="reference external" href="http://backports-master.debian.org/Instructions/">http://backports-master.debian.org/Instructions/</a>
-Then install the new dependencies:</p>
-<div class="highlight-python"><pre>apt-get install -t squeeze-backports python-django python-django-south \
- python-simplejson libjs-jquery-ui python-pyexiv2 \
- python-feedparser javascript-common</pre>
-</div>
-</div>
-<div class="section" id="debian-wheezy">
-<h4>Debian Wheezy<a class="headerlink" href="#debian-wheezy" title="Permalink to this headline">¶</a></h4>
-<div class="highlight-bash"><div class="highlight"><pre>apt-get install python-django-south python-simplejson libjs-jquery-ui <span class="se">\</span>
- python-pyexiv2 python-feedparser javascript-common
-</pre></div>
-</div>
-<p>If you are planing to do major import consider the install of <a class="reference external" href="http://celeryproject.org/">Celery</a>.</p>
-<div class="highlight-bash"><div class="highlight"><pre>apt-get install python-django-celery python-kombu
-</pre></div>
-</div>
-</div>
-</div>
-</div>
-<div class="section" id="get-the-new-sources">
-<h2>Get the new sources<a class="headerlink" href="#get-the-new-sources" title="Permalink to this headline">¶</a></h2>
-<p>First of all we have to get the new version of the source code.
-For this upgrade process, we are getting the source code from the Git
-repository.</p>
-<p>To simplify further instructions, some environment variables are
-initialized.</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">CHIMERE_PATH</span><span class="o">=</span>/srv/chimere
-<span class="nv">CHIMERE_TAG</span><span class="o">=</span>v1.2.0 <span class="c"># version 1.1 -&gt; 1.2</span>
-<span class="nv">CHIMERE_TAG</span><span class="o">=</span>v2.0-RC3 <span class="c"># version 1.2 -&gt; 2.0</span>
-<span class="nv">CHIMERE_TAG</span><span class="o">=</span>master <span class="c"># version 2.0 -&gt; master</span>
-<span class="nv">CHIMERE_LOCALNAME</span><span class="o">=</span>mychimere
-</pre></div>
-</div>
-<p>Your local name is used for the name of your local git branch and the Python
-package. As a Python package it should follow the rule of Python variable name:
-it must be at least one letter and can have a string of numbers, letters and
-&#8220;_&#8221; to any length. Don&#8217;t begin the name by &#8220;_&#8221; because it has special
-significance in Python.</p>
-<div class="section" id="from-a-previous-git-installation">
-<h3>From a previous Git installation<a class="headerlink" href="#from-a-previous-git-installation" title="Permalink to this headline">¶</a></h3>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nb">cd</span> <span class="nv">$CHIMERE_PATH</span>
-git checkout -b <span class="nv">$CHIMERE_LOCALNAME</span> <span class="c"># do it only if you haven&#39;t yet create a local branch</span>
-git stash <span class="c"># if you have uncommited changes</span>
-git checkout master
-git pull
-git checkout <span class="nv">$CHIMERE_LOCALNAME</span>
-git rebase <span class="nv">$CHIMERE_TAG</span>
-</pre></div>
-</div>
-</div>
-<div class="section" id="from-a-previous-tarball-installation">
-<h3>From a previous tarball installation<a class="headerlink" href="#from-a-previous-tarball-installation" title="Permalink to this headline">¶</a></h3>
-<p>Remove first your old installation and get the Git version.</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nb">cd</span> <span class="nv">$CHIMERE_PATH</span>
-<span class="nb">cd</span> ..
-rm -rf <span class="nv">$CHIMERE_PATH</span>
-git clone git://www.peacefrogs.net/git/chimere
-<span class="nb">cd </span>chimere
-git checkout <span class="nv">$CHIMERE_TAG</span>
-git checkout -b <span class="nv">$CHIMERE_LOCALNAME</span>
-</pre></div>
-</div>
-</div>
-<div class="section" id="update-basic-settings">
-<h3>Update basic settings<a class="headerlink" href="#update-basic-settings" title="Permalink to this headline">¶</a></h3>
-<div class="section" id="id1">
-<h4>Version 1.1 -&gt; 1.2<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h4>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nv">CHIMERE_APP_PATH</span><span class="o">=</span><span class="nv">$CHIMERE_PATH</span>/chimere
-vim <span class="nv">$CHIMERE_APP_PATH</span>/settings.py
-</pre></div>
-</div>
-<p>Add the line (adapted for your jquery and gpsbabel installation).</p>
-<div class="highlight-python"><div class="highlight"><pre><span class="n">JQUERY_URL</span> <span class="o">=</span> <span class="n">SERVER_URL</span> <span class="o">+</span> <span class="s">&#39;jquery/jquery-1.4.4.min.js&#39;</span>
-<span class="n">GPSBABEL</span> <span class="o">=</span> <span class="s">&#39;/usr/bin/gpsbabel&#39;</span>
-<span class="c"># simplify with an error of 5 meters</span>
-<span class="n">GPSBABEL_OPTIONS</span> <span class="o">=</span> <span class="s">&#39;simplify,crosstrack,error=0.005k&#39;</span>
-</pre></div>
-</div>
-</div>
-<div class="section" id="id2">
-<h4>Version 1.2 -&gt; 2.0<a class="headerlink" href="#id2" title="Permalink to this headline">¶</a></h4>
-<div class="section" id="project-template">
-<h5>Project template<a class="headerlink" href="#project-template" title="Permalink to this headline">¶</a></h5>
-<p>Create a new project template.</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nb">cd</span> <span class="nv">$CHIMERE_PATH</span>
-cp -ra <span class="nv">$CHIMERE_PATH</span>/example_project <span class="nv">$CHIMERE_LOCALNAME</span>
-<span class="nv">CHIMERE_APP_PATH</span><span class="o">=</span><span class="nv">$CHIMERE_PATH</span>/<span class="nv">$CHIMERE_LOCALNAME</span>
-</pre></div>
-</div>
-</div>
-<div class="section" id="local-settings">
-<h5>local_settings<a class="headerlink" href="#local-settings" title="Permalink to this headline">¶</a></h5>
-<p>A <em>local_settings</em> file is now used.</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nb">cd</span> <span class="nv">$CHIMERE_APP_PATH</span>
-cp local_settings.py.sample local_settings.py
-vim local_settings.py
-</pre></div>
-</div>
-<p>Report your old settings.py in local_settings.py (at least the database
-configuration).
-Your <em>ROOT_URLCONF</em> must be set to <strong>value_of_your_localname.urls</strong>.</p>
-</div>
-<div class="section" id="logs">
-<h5>logs<a class="headerlink" href="#logs" title="Permalink to this headline">¶</a></h5>
-<p>Logging is now enabled by default in the file <em>/var/log/django/chimere.log</em>.</p>
-<div class="highlight-bash"><div class="highlight"><pre>mkdir /var/log/django
-touch /var/log/django/chimere.log
-chown www-data -R /var/log/django
-</pre></div>
-</div>
-</div>
-<div class="section" id="static-files">
-<h5>Static files<a class="headerlink" href="#static-files" title="Permalink to this headline">¶</a></h5>
-<p>Now static file are managed with <em>django.contrib.staticfiles</em>.</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nb">cd</span> <span class="nv">$CHIMERE_APP_PATH</span>
-./manage.py collectstatic
-</pre></div>
-</div>
-<p>Move old static files to the new static directory.</p>
-<div class="highlight-bash"><div class="highlight"><pre>cp -ra <span class="nv">$CHIMERE_PATH</span>/chimere/static/* <span class="nv">$CHIMERE_APP_PATH</span>/static/
-cp -ra <span class="nv">$CHIMERE_PATH</span>/chimere/static/icons/* <span class="nv">$CHIMERE_APP_PATH</span>/media/icons/
-cp -ra <span class="nv">$CHIMERE_PATH</span>/chimere/static/upload <span class="nv">$CHIMERE_APP_PATH</span>/media/
-</pre></div>
-</div>
-</div>
-<div class="section" id="webserver-configuration">
-<h5>Webserver configuration<a class="headerlink" href="#webserver-configuration" title="Permalink to this headline">¶</a></h5>
-<p>If you are using Apache and WSGI to serve your Chimère, change your WSGI
-configuration file to point to the correct settings:
-<strong>value_of_your_localname.settings</strong>.</p>
-<p>Change your webserver directive to point to the correct static directory from
-<strong>your_chimere_path/chimere/static</strong> to
-<strong>your_chimere_path/your_local_name/static</strong>.</p>
-</div>
-</div>
-<div class="section" id="version-2-0-master">
-<h4>Version 2.0 -&gt; master<a class="headerlink" href="#version-2-0-master" title="Permalink to this headline">¶</a></h4>
-<p>Update settings and static files.</p>
-<div class="highlight-bash"><div class="highlight"><pre>cp <span class="nv">$CHIMERE_PATH</span>/example_project/settings.py <span class="nv">$CHIMERE_LOCALNAME</span>
-./manage.py collectstatic
-</pre></div>
-</div>
-</div>
-</div>
-</div>
-<div class="section" id="migrate-database">
-<h2>Migrate database<a class="headerlink" href="#migrate-database" title="Permalink to this headline">¶</a></h2>
-<div class="section" id="id3">
-<h3>Version 1.1 -&gt; 1.2<a class="headerlink" href="#id3" title="Permalink to this headline">¶</a></h3>
-<p>Migration scripts test your installation before making changes so you probably
-won&#8217;t have any lost but by precaution before running theses scripts don&#8217;t forget
-to backup your database.
-You can also make a copy of your current database into a new database and make
-the new installation to this new database.</p>
-<p>The gdal binding for python is necessary to run the upgrade scripts (available
-in the python-gdal package in Debian).</p>
-<p>If you run the migration scripts in a production environnement stop the old
-instance of Chimère before executing the migration script. Perhaps prepare the
-web server to point to the new installation before doing the database upgrade
-(cf. next paragraph).</p>
-<p>In <em>settings.py</em> verify that <strong>chimere.scripts</strong> is in the <em>INSTALLED_APPS</em>.</p>
-<p>After that in the chimere directory just execute the script.</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nb">cd</span> <span class="nv">$CHIMERE_APP_PATH</span>
-python ./scripts/upgrade.py
-</pre></div>
-</div>
-</div>
-<div class="section" id="id4">
-<h3>Version 1.2 -&gt; 2.0<a class="headerlink" href="#id4" title="Permalink to this headline">¶</a></h3>
-<p>Django South is now used to manage database migrations.</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nb">cd</span> <span class="nv">$CHIMERE_APP_PATH</span>
-./manage.py syncdb
-./manage.py migrate chimere 0001 --fake <span class="c"># fake the database initialisation</span>
-./manage.py migrate chimere
-</pre></div>
-</div>
-<p>A description field is now available for markers. If you would like to move
-values of an old <em>Property model</em> to this new field, a script is available.</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nb">cd</span> <span class="nv">$CHIMERE_APP_PATH</span>
-../chimere/scripts/migrate_properties.py
-<span class="c"># folow the instructions</span>
-</pre></div>
-</div>
-</div>
-<div class="section" id="from-2-0-to-master">
-<h3>From 2.0 to master<a class="headerlink" href="#from-2-0-to-master" title="Permalink to this headline">¶</a></h3>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nb">cd</span> <span class="nv">$CHIMERE_APP_PATH</span>
-./manage.py syncdb
-./manage.py migrate chimere
-</pre></div>
-</div>
-</div>
-</div>
-<div class="section" id="update-translations">
-<h2>Update translations<a class="headerlink" href="#update-translations" title="Permalink to this headline">¶</a></h2>
-<div class="section" id="id5">
-<h3>Version 1.1 -&gt; 1.2<a class="headerlink" href="#id5" title="Permalink to this headline">¶</a></h3>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nb">cd</span> <span class="nv">$CHIMERE_APP_PATH</span>
-./manage.py compilemessages
-</pre></div>
-</div>
-</div>
-<div class="section" id="version-1-2-2-0-master">
-<h3>Version 1.2 -&gt; 2.0 -&gt; master<a class="headerlink" href="#version-1-2-2-0-master" title="Permalink to this headline">¶</a></h3>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nb">cd</span> <span class="nv">$CHIMERE_PATH</span>/chimere
-django-admin compilemessages
-</pre></div>
-</div>
-</div>
-</div>
-<div class="section" id="force-the-upgrade-of-visitor-s-web-browser-cache">
-<h2>Force the upgrade of visitor&#8217;s web browser cache<a class="headerlink" href="#force-the-upgrade-of-visitor-s-web-browser-cache" title="Permalink to this headline">¶</a></h2>
-<p>If major changes in the javascript has be done between version, many of your
-users could experience problems. There are many tricks to force the refresh
-of their cache. One of them is to change the location of statics files. To do
-that edit your local_settings.py and change:</p>
-<div class="highlight-python"><div class="highlight"><pre><span class="n">STATIC_URL</span> <span class="o">=</span> <span class="s">&#39;/static/&#39;</span>
-</pre></div>
-</div>
-<p>to:</p>
-<div class="highlight-python"><div class="highlight"><pre><span class="n">STATIC_URL</span> <span class="o">=</span> <span class="s">&#39;/static/v2.0.0/&#39;</span>
-</pre></div>
-</div>
-<p>Then in the static directory.</p>
-<div class="highlight-bash"><div class="highlight"><pre><span class="nb">cd</span> <span class="nv">$CHIMERE_APP_PATH</span>/static
-ln -s <span class="sb">`</span><span class="nb">pwd</span><span class="sb">`</span> v2.0.0
-</pre></div>
-</div>
-<p>Restart the web server to apply this changes.</p>
-</div>
-</div>
-
-
- </div>
- </div>
- </div>
- <div class="sphinxsidebar">
- <div class="sphinxsidebarwrapper">
- <h3><a href="index.html">Table Of Contents</a></h3>
- <ul>
-<li><a class="reference internal" href="#">Upgrade</a><ul>
-<li><a class="reference internal" href="#get-new-version-of-dependencies">Get new version of dependencies</a><ul>
-<li><a class="reference internal" href="#version-1-1-1-2">Version 1.1 -&gt; 1.2</a></li>
-<li><a class="reference internal" href="#version-1-2-2-0">Version 1.2 -&gt; 2.0</a><ul>
-<li><a class="reference internal" href="#debian-squeeze">Debian Squeeze</a></li>
-<li><a class="reference internal" href="#debian-wheezy">Debian Wheezy</a></li>
-</ul>
-</li>
-</ul>
-</li>
-<li><a class="reference internal" href="#get-the-new-sources">Get the new sources</a><ul>
-<li><a class="reference internal" href="#from-a-previous-git-installation">From a previous Git installation</a></li>
-<li><a class="reference internal" href="#from-a-previous-tarball-installation">From a previous tarball installation</a></li>
-<li><a class="reference internal" href="#update-basic-settings">Update basic settings</a><ul>
-<li><a class="reference internal" href="#id1">Version 1.1 -&gt; 1.2</a></li>
-<li><a class="reference internal" href="#id2">Version 1.2 -&gt; 2.0</a><ul>
-<li><a class="reference internal" href="#project-template">Project template</a></li>
-<li><a class="reference internal" href="#local-settings">local_settings</a></li>
-<li><a class="reference internal" href="#logs">logs</a></li>
-<li><a class="reference internal" href="#static-files">Static files</a></li>
-<li><a class="reference internal" href="#webserver-configuration">Webserver configuration</a></li>
-</ul>
-</li>
-<li><a class="reference internal" href="#version-2-0-master">Version 2.0 -&gt; master</a></li>
-</ul>
-</li>
-</ul>
-</li>
-<li><a class="reference internal" href="#migrate-database">Migrate database</a><ul>
-<li><a class="reference internal" href="#id3">Version 1.1 -&gt; 1.2</a></li>
-<li><a class="reference internal" href="#id4">Version 1.2 -&gt; 2.0</a></li>
-<li><a class="reference internal" href="#from-2-0-to-master">From 2.0 to master</a></li>
-</ul>
-</li>
-<li><a class="reference internal" href="#update-translations">Update translations</a><ul>
-<li><a class="reference internal" href="#id5">Version 1.1 -&gt; 1.2</a></li>
-<li><a class="reference internal" href="#version-1-2-2-0-master">Version 1.2 -&gt; 2.0 -&gt; master</a></li>
-</ul>
-</li>
-<li><a class="reference internal" href="#force-the-upgrade-of-visitor-s-web-browser-cache">Force the upgrade of visitor&#8217;s web browser cache</a></li>
-</ul>
-</li>
-</ul>
-
- <h4>Previous topic</h4>
- <p class="topless"><a href="install.html"
- title="previous chapter">Installation</a></p>
- <h4>Next topic</h4>
- <p class="topless"><a href="configuration.html"
- title="next chapter">Configuration</a></p>
- <h3>This Page</h3>
- <ul class="this-page-menu">
- <li><a href="_sources/upgrade.txt"
- rel="nofollow">Show Source</a></li>
- </ul>
-<div id="searchbox" style="display: none">
- <h3>Quick search</h3>
- <form class="search" action="search.html" method="get">
- <input type="text" name="q" />
- <input type="submit" value="Go" />
- <input type="hidden" name="check_keywords" value="yes" />
- <input type="hidden" name="area" value="default" />
- </form>
- <p class="searchtip" style="font-size: 90%">
- Enter search terms or a module, class or function name.
- </p>
-</div>
-<script type="text/javascript">$('#searchbox').show(0);</script>
- </div>
- </div>
- <div class="clearer"></div>
- </div>
- <div class="related">
- <h3>Navigation</h3>
- <ul>
- <li class="right" style="margin-right: 10px">
- <a href="genindex.html" title="General Index"
- >index</a></li>
- <li class="right" >
- <a href="configuration.html" title="Configuration"
- >next</a> |</li>
- <li class="right" >
- <a href="install.html" title="Installation"
- >previous</a> |</li>
- <li><a href="index.html">Chimère 2.0 documentation</a> &raquo;</li>
- </ul>
- </div>
- <div class="footer">
- &copy; Copyright 2012, Étienne Loks.
- Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
- </div>
- </body>
-</html> \ No newline at end of file
diff --git a/docs/_static/chimere_admin_00.png b/docs/_static/chimere_admin_00.png
deleted file mode 100644
index 374c6b6..0000000
--- a/docs/_static/chimere_admin_00.png
+++ /dev/null
Binary files differ
diff --git a/docs/_static/chimere_admin_01.png b/docs/_static/chimere_admin_01.png
deleted file mode 100644
index 0db7f4d..0000000
--- a/docs/_static/chimere_admin_01.png
+++ /dev/null
Binary files differ
diff --git a/docs/_static/chimere_admin_02.png b/docs/_static/chimere_admin_02.png
deleted file mode 100644
index d0fd6fe..0000000
--- a/docs/_static/chimere_admin_02.png
+++ /dev/null
Binary files differ
diff --git a/docs/_static/chimere_admin_03.png b/docs/_static/chimere_admin_03.png
deleted file mode 100644
index e815500..0000000
--- a/docs/_static/chimere_admin_03.png
+++ /dev/null
Binary files differ
diff --git a/docs/administration.rst b/docs/administration.rst
deleted file mode 100644
index 75d8761..0000000
--- a/docs/administration.rst
+++ /dev/null
@@ -1,116 +0,0 @@
-.. -*- coding: utf-8 -*-
-.. _administration:
-
-==============
-Administration
-==============
-
-:Author: Étienne Loks
-:date: 2012-10-08
-:Copyright: CC-BY 3.0
-
-This documents presents the administration of Chimère.
-The version has been updated for version 2.0.0.
-
-
-Administration pages presentation
----------------------------------
-
-Administration pages accessible at: http://where_is_your_chimere/admin/
-
-Don't forget the ending slash in the URL.
-
-Identification
-**************
-
-First of all, you'll have to identify yourself with the login and password
-provided.
-
-.. image:: _static/chimere_admin_00.png
-
-
-Main page
-*********
-
-Once authentified you'll have access to the main admin page.
-
-This looks like this:
-
-.. image:: _static/chimere_admin_01.png
-
-#. links to this **Documentation**, to the **Change password** form and to
- **Log out**
-#. a list of recent actions made with this account
-#. an application title, most of your action will be in the **Chimere**
- application
-#. an item inside the application. From these page you can **Add** a new item or
- consult/**Change** items. The **Add** link lead to the new `Item form`_. The
- **Change** link lead to the `Item list`_. The `Item list`_ is also available
- by clicking on the item label.
-
-
-Item list
-*********
-
-.. image:: _static/chimere_admin_02.png
-
-#. path in the admin site. This is a convenient shortcut to come back to the
- main page.
-#. link to create a new item from the item list
-#. search items by word (not available for all type of items)
-#. this filter box permit to filter current entries with some criteria (not
- available for all type of items)
-#. the header of the table is clickable. Click on an header sort the items by
- this header (ascending or descending). Multiple header sort is possible (the
- number on the right of the header explain the order of sorting).
-#. each item can be checked (for applying an action) or selected (by clicking on
- the first column) to see the detail and possibly edit, delete it.
-
-Item form
-*********
-
-.. image:: _static/chimere_admin_03.png
-
-#. fields for the selected item (or blank if it is a new item) are displayed in
- this form. A few of the fields concerning an item are read-only and a few of
- them are hidden. Mandatory fields have their label in bold. Changes on theses
- fields are only effective once the form is submitted.
-#. for some items there are associated sub-items. Theses associated items can be
- modified in this form. If there are many sub-items associated for the current
- item, they can be ordered by drag and drop.
-#. the form has to be validated by one of theses actions buttons. They are
- self-explanatory.
-
-Managing news
--------------
-
-A news system is available.
-All you have to to do is to click on the Add button near News.
-For each news you have to provided a name and a content. The content can contain HTML tags.
-The avaibility is set with a checkbox.
-
-Creating categories/subcategories
----------------------------------
-
-Before adding categories you have to set some icons. Theses icons appears on the map and in the categories' box on the main map.
-Be careful to resize correctly your icons. Indeed the icon will be presented at their real size on the map.
-To add icons: the Add button near Icons.
-
-Categories are in fact only containers for subcategories. You'll have to provide only a name and an order.
-To add categories: the Add button near categories (quite clear now, isn't it?)
-
-Fields of subcategories are: an associated category, a name, an icon, an order, a color and an element type.
-Theses fields are mainly quite self-explainatory.
-The color is used to draw routes (if this subcategory contains routes). If it a basic color it can be set with the english name (for instance: "red", "blue", "yellow" or "purple") otherwise you can put the HTML RVB code (for instance "#9227c9").
-The element type is the type of element the subcategory can contain: POI, route or both.
-
-Moderation
-----------
-
-The moderation step is quite simple. It works the same with POIs and routes.
-The moderator can access to all POIs (or routes) by clicking on the Modify button.
-A search field is available to search by name but the more interesting is to filter POIs (or route) by state and by subcategory.
-Then to modify an item you have to click on his name.
-The submission can now freely modified. Compared to the main submission interface there is only on field add: the state field. To be publish in the main site the item must have the state: Available.
-If an item is not revelant the Delete button permit to remove it.
-
diff --git a/docs/customisation.rst b/docs/customisation.rst
deleted file mode 100644
index e27be01..0000000
--- a/docs/customisation.rst
+++ /dev/null
@@ -1,24 +0,0 @@
-.. -*- coding: utf-8 -*-
-
-=====================
-Chimère customisation
-=====================
-
-:Author: Étienne Loks
-:date: 2012-10-08
-:Copyright: CC-BY 3.0
-
-This documents presents the installation of Chimère.
-The version has been updated for version 2.0.0.
-
-
-Updating the design
--------------------
-
-You can of course customize Chimère with your own CSS. To do that just edit the file static/styles.css.
-
-After this basic configuration done the harder is done. You can do now application administration tasks.
-
-.. _managing-layers:
-Managing layers
----------------
diff --git a/docs/Makefile b/docs/en/Makefile
index dc549a6..fcccf30 100644
--- a/docs/Makefile
+++ b/docs/en/Makefile
@@ -5,7 +5,7 @@
SPHINXOPTS =
SPHINXBUILD = sphinx-build
PAPER =
-BUILDDIR = _build
+BUILDDIR = build
# Internal variables.
PAPEROPT_a4 = -D latex_paper_size=a4
diff --git a/docs/en/administration.rst b/docs/en/administration.rst
new file mode 100644
index 0000000..1f13f11
--- /dev/null
+++ b/docs/en/administration.rst
@@ -0,0 +1,217 @@
+.. -*- coding: utf-8 -*-
+.. _administration:
+
+==============
+Administration
+==============
+
+:Author: Étienne Loks
+:date: 2012-11-28
+:Copyright: CC-BY 3.0
+
+This document presents the administration of Chimère.
+It has been updated for version 2.0.0.
+
+
+Administration pages presentation
+---------------------------------
+
+Administration pages are accessible at: http://where_is_your_chimere/admin/
+
+Don't forget the ending slash in the URL.
+
+Identification
+**************
+
+First of all, you'll have to identify yourself with the login and password
+provided.
+
+.. image:: static/chimere_admin_00.png
+
+
+Main page
+*********
+
+Once authentified you'll have access to the main admin page.
+
+It looks like this:
+
+.. image:: static/chimere_admin_01.png
+
+#. links to this **Documentation**, to the **Change password** form and to
+ **Log out**,
+#. the list of recent actions made with this account,
+#. an application title, most of your action will be in the **Chimere**
+ application,
+#. an item inside the application. From these pages you can **Add** a new item or
+ consult/**Change** items. The **Add** link leads to the new `Item form`_. The
+ **Change** link leads to the `Item list`_. The `Item list`_ is also available
+ by clicking on the item label.
+
+
+Item list
+*********
+
+.. image:: static/chimere_admin_02.png
+
+#. path in the admin site. This is a convenient shortcut to come back to the
+ main page,
+#. link to create a new item from the item list,
+#. search items by words (not available for all item types),
+#. this filter box permits to filter current entries with some criteria (not
+ available for all type of items),
+#. the header of the table is clickable. Clicking on an header sorts the items by
+ this header (ascending or descending). Multiple header sort is possible (the
+ number on the right of the header explains the sorting order),
+#. each item can be checked (for applying an action) or selected (by clicking on
+ the first column) to see the detail and edit or delete it.
+
+Item form
+*********
+
+.. image:: static/chimere_admin_03.png
+
+#. fields for the selected item (or blank if it is a new item) are displayed in
+ this form. A few fields are read-only and another few are hidden. Mandatory
+ fields have their label in bold. Changes on these fields are only effective
+ once the form is submitted.
+#. for some items there are associated sub-items. These associated items can be
+ modified in this form. If there are many sub-items associated for the current
+ item, they can be ordered by drag and drop.
+#. the form has to be validated by one of these action buttons. They are
+ self-explanatory.
+
+Status
+******
+
+*Status* is a property attached to each geographic item in Chimère. To
+administrate efficiently Chimère you need to understand the mean of each status.
+
+- **Submitted**: Status of a new item freshly proposed by an end user. This item
+ is not visible on the map.
+- **Available**: Status of an item visible on the map.
+- **Disabled**: Status of a discarded item.
+- **Modified**: Status of an amendment proposed by an end-user.
+- **Imported**: Status of a newly imported item. Import and export operations
+ need that all items with *imported* status are treated (validated, disabled
+ or deleted).
+
+
+Managing news
+-------------
+
+A news system is available.
+All you have to to do is to click on the **Add** button near News.
+For each news you have to provide a name and a content. The content can contain
+HTML tags.
+The availability is set with a checkbox.
+
+Creating categories/subcategories
+---------------------------------
+
+Before adding categories you have to set some icons. These icons appear on the
+map and in the categories' box on the main map.
+Be careful to resize correctly your icons. Indeed the icon will be presented at
+their real size on the map.
+To add icons: the **Add** button near Icons.
+
+The website http://mapicons.nicolasmollet.com/ allow to easily generate map
+icons.
+
+Categories are in fact only containers for subcategories. You'll have to provide
+only a name and an order.
+To add categories: the **Add** button near categories (quite clear now, isn't
+it?).
+
+Fields of subcategories are: an associated category, a name, an icon, an order,
+a color and an element type.
+These fields are mainly quite self- explanatory.
+The color is used to draw routes (if this subcategory contains routes). If it a
+basic color it can be set with the English name (for instance: *red*, *blue*,
+*yellow* or *purple*) otherwise you can put the HTML RVB code (for instance
+*#9227c9*).
+The element type is the type of element that the subcategory can contain: POI, route
+or both.
+
+.. _geographic-items-management:
+
+Editing or moderating items
+---------------------------
+
+The moderation step is quite simple. It works the same with POIs and routes.
+The moderator can access to all POIs (or routes) by clicking on them on the
+list.
+
+A search field is available to search by name but the more interesting is to
+filter POIs (or route) by state and by subcategory.
+
+There are some actions available in the action list:
+
+- **Delete**: to delete selected items. A confirmation step is displayed,
+- **Validate**: to set the status *Available* to selected items,
+- **Disable**: to set the status *Disabled* to selected items. This is useful to
+ keep items you don't want to be exposed on the map,
+- **Managed modified items**: to manage the amendment made by end users on the
+ main site (cf. :ref:`managing-modified`). Modified item has to be treated
+ one by one,
+- **Export to...**: to export selected item to the selected format.
+
+
+To modify an item, classically you have to click on its name.
+Then you access to a form to freely modify the item.
+
+.. image:: static/chimere_admin_modify_item.png
+
+In this form there are all data available to the end user form plus some extra
+fields.
+
+- The *Import fields* only make sense with data imported from an external
+ source or for data to be exported to OSM (cf. the :ref:`import section
+ <importing>` of this documentation),
+- *Associated items fields* are read-only fields that list items associated to
+ the current one (for example the reference item of an amendment or an associated
+ file of a route).
+
+Associated multimedia items are at the bottom of the form. You can freely add,
+change items and change their order with drag and drop.
+
+Don't forget to validate your change with one of the **Save** buttons at the
+bottom of the form (it is easily forgotten when you change multimedia items).
+
+If an item is not relevant the **Delete** button enables to remove it.
+
+.. _managing-modified:
+
+Managing end user amendment/imported item modified locally
+----------------------------------------------------------
+
+Amendment can be proposed on the main site by end-users.
+In Chimère an amendment is a new item with the status **Modified** and with a
+link to the reference item modified.
+
+You can also have imported items which have been modified both locally and on
+the external source. The new version from the external source has the status
+**Imported** and have a link to the reference item.
+
+.. Note::
+ If you are logged as an administrator and make changes on the map with the
+ end user form they will be directly validated.
+
+
+A special form has been developed to facilitate the processing of these
+modified items.
+
+You can access to this special form with the action *Managed modified items*.
+
+.. image:: static/chimere_admin_modified_management.png
+
+This form is a table with three columns:
+
+#. The first column displays the information for the reference item,
+#. The second column displays the information proposed by the submitter,
+#. The third column is a list of checkboxes. For each row checked, after the
+ validation, the value of the modified item will replace the value of the
+ reference item.
+
+.. Note::
+ To reject all modifications validate the form with no checkbox checked.
diff --git a/docs/conf.py b/docs/en/conf.py
index 9221eb1..7b92da9 100644
--- a/docs/conf.py
+++ b/docs/en/conf.py
@@ -64,7 +64,7 @@ release = '2.0'
# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
-exclude_patterns = ['_build']
+exclude_patterns = ['build']
# The reST default role (used for this markup: `text`) to use for all documents.
#default_role = None
@@ -120,7 +120,7 @@ html_theme = 'default'
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = ['static']
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
diff --git a/docs/configuration.rst b/docs/en/configuration.rst
index f8bed2b..e5870bb 100644
--- a/docs/configuration.rst
+++ b/docs/en/configuration.rst
@@ -8,66 +8,83 @@ Configuration
:date: 2012-10-08
:Copyright: CC-BY 3.0
-This documents presents the first steps to configure your Chimère.
+This document presents the first steps to configure your Chimère.
+It has been updated for version 2.0.0.
-The version has been updated for version 2.0.0.
-
-If an usage to the CLI is required, your session has to be initialised with
-theses environment variables::
+Your session has to be initialised with these environment variables in
+the Command Line Interface::
CHIMERE_PATH=/srv/chimere # change with your installation path
CHIMERE_LOCALNAME=mychimere # change with your local project name
CHIMERE_APP_PATH=$CHIMERE_PATH/$CHIMERE_LOCALNAME
-When you have installed the application there is a few simple steps to follow to
+Once the application installed, there are a few simple steps to follow to
configure *your* Chimère.
-Most of theses steps are done in the web administration pages.
+Most of these steps are done in the web administration pages.
If you are not familiar with *Django-like* administration pages you can look
at the first paragraph of :ref:`administration` where it is presented.
-To access theses pages you have to identify you with an account with *staff* and
+To access these pages you have to identify with an account with *staff* and
*superuser* status.
A *superuser* account is created at the initialization of the database.
+Configuring the Sites framework
+-------------------------------
+
+*Sites* framework allow you to serve the same content on different domains.
+Most of you will probably use only one domain but this unique domain has to
+be configured. This is done in the web administration interface in *Sites > Sites*.
+You only need to change *example.com* by your domain name. If you forget to
+do that, some functionalities such as RSS feeds will not work properly.
+
+.. _managing-areas:
Managing areas
--------------
An *Area* is the base of your map. It defines:
-* a name: a human readable label for this area.
-* a welcome message (*not mandatory*): this message is displayed once a day per
- user arriving on the map.
-* a map bounding box: this is the default area to display when arriving on the
- map.
-* restriction on the bounding box: if set to restricted, the end user can't pan
- outside the defined bounding box.
-* available layers (*not mandatory* OSM Mapnik is used by default): OSM Mapnik
- render, OSM MapQuest render, OSM Transport Map render, OSM CycleMap are
- available by default. You can add new custom layer cf. :ref:`managing-layers`.
-* categories restriction (*not mandatory*): if no restriction is set all
- categories are available.
-* default checked categories (*not mandatory*).
-* an external CSS file (*not mandatory*): an URL to an external CSS file.
-* if categories are displayed dynamically (if dynamically is set, the end user
- only view categories witch have items on the map section the user currently
- see).
+* a name: a human readable label for this area,
* an associated URN (*not mandatory*): the name of the area as a web ressource.
In practice, if the area is not the default area the URN is used at the end of
the default URL to access to this area. This is not mandatory but necessary
- for each area that is not the default one.
+ for each area that is not the default one,
+* a welcome message (*not mandatory*): this message is displayed once a day per
+ user arriving on the map,
+* an order (to sort areas),
+* an availability,
+* a "*default*" state. The "*default*" area is viewed by default. Only one area
+ can be the default: activating this state disables it on the possible other
+ area with a default state,
+* default checked categories (*not mandatory*),
+* if categories are displayed dynamically. If dynamically is set, the end user
+ only views categories which have items on the map section he is currently
+ looking at,
+* categories restriction (*not mandatory*): if no restriction is set all
+ categories are available,
+* an external CSS file (*not mandatory*): an URL to an external CSS file,
+* restriction on the bounding box: if set to restricted, the end user can't pan
+ outside the defined bounding box. Due to technical reasons of OpenLayers,
+ there is at this time no restriction on the zoom,
+* a map bounding box: this is the area to display when arriving on the map. If
+ the area is restricted it will be the bounding box that restricts the end
+ user. Hold the *control* key, click and drag to draw the bounding box,
+* available layers (*not mandatory*: OSM Mapnik is used by default): OSM
+ Mapnik render, OSM MapQuest render, OSM Transport Map render, OSM CycleMap are
+ available by default. You can add new custom layers (cf.
+ :ref:`managing-layers`).
*Areas* are customizable directly on the web administration interface in
-*Chimere/Areas*.
+*Chimere > Areas*.
-As there is little chance that the default area is appropriate for you, you'll
-have to set at least one default area.
+As there is little chance that the default area should be appropriated for you,
+you'll have to set at least one default area.
-Adding many area can be a mean to show your map in different flavors.
+Adding many areas can be a mean to show your map in different flavors.
Managing users
--------------
@@ -75,7 +92,7 @@ Managing users
If you are not the only administrator/moderator of this Chimère installation
you have to create and manage account for the other users.
-You can create a new *superuser* account with the CLI::
+You can create a new *superuser* account with the Command Line Interface (CLI)::
./manage.py createsuperuser
@@ -87,60 +104,61 @@ password)::
*Users* are customizable directly on the web administration interface in
*Auth/User*.
-To create a new account, simply click on the Add button near Users. Give a name
-and a default password (the user can change it on in own later).
+To create a new account, simply click on the *Add* button near *Users*. Give a
+name and a default password (the user can change it on his own later).
Then complete the other pieces of information.
-Check the case: *Staff status* (or this user will not be able to log to
-the administration website).
+Check the case: *Staff status* (or this user will not be able to log to the
+administration website).
If this account is a new technical administrator, check *Superuser status* (this
user must be trustworthy!). Otherwise you'll have to give permissions to this
-new user. It is easier to don't add permission manually but make this user
-member of a group.
+new user. It is easier not to add permission manually but to make this user
+a member of a group.
-Two type of default group are proposed: application administrator and moderator.
+Two types of default group are proposed: application administrator and
+moderator.
Moderator are limited to an *Area* (they only see items that are inside the
-bounding box). If a moderator manage many areas you'll have to select many
+bounding box). If a moderator manages many areas you'll have to select many
groups.
-Detail of rights for default user/groups:
+Detail of rights for default groups:
+-----------------------------------------+-------------------------+---------------------------+-----------+
-| Task | Technical administrator | Application administrator | Moderator |
+| Item (add/modify/delete on) | Technical administrator | Application administrator | Moderator |
+=========================================+=========================+===========================+===========+
-| User add/modify/delete | yes | no | no |
+| User | yes | no | no |
+-----------------------------------------+-------------------------+---------------------------+-----------+
-| Group add/modify/delete | yes | no | no |
+| Group | yes | no | no |
+-----------------------------------------+-------------------------+---------------------------+-----------+
-| Property model add/modify/delete | yes | no | no |
+| Property model | yes | no | no |
+-----------------------------------------+-------------------------+---------------------------+-----------+
-| Import add/modify/delete | yes | no | no |
+| Import | yes | no | no |
+-----------------------------------------+-------------------------+---------------------------+-----------+
-| Layer add/modify/delete | yes | no | no |
+| Layer | yes | no | no |
+-----------------------------------------+-------------------------+---------------------------+-----------+
-| News add/modify/delete | yes | yes | no |
+| News | yes | yes | no |
+-----------------------------------------+-------------------------+---------------------------+-----------+
-| Area add/modify/delete | yes | yes | no |
+| Area | yes | yes | no |
+-----------------------------------------+-------------------------+---------------------------+-----------+
-| Icon add/modify/delete | yes | yes | no |
+| Icon | yes | yes | no |
+-----------------------------------------+-------------------------+---------------------------+-----------+
-| Color/Color theme add/modify/delete | yes | yes | no |
+| Color/Color theme | yes | yes | no |
+-----------------------------------------+-------------------------+---------------------------+-----------+
-| Category/Subcategory add/modify/delete | yes | yes | no |
+| Category/Subcategory | yes | yes | no |
+-----------------------------------------+-------------------------+---------------------------+-----------+
-| Point Of Interest add/modify/delete | yes | yes | yes |
+| Point Of Interest | yes | yes | yes |
+-----------------------------------------+-------------------------+---------------------------+-----------+
-| Route add/modify/delete | yes | yes | yes |
+| Route | yes | yes | yes |
+-----------------------------------------+-------------------------+---------------------------+-----------+
Creating property models
------------------------
-A basic installation of Chimère permit to associate a name, a category, a
+A basic installation of Chimère permits to associate a name, a category, a
description, dates, multimedia files, picture files, etc. for each geographic
item.
@@ -148,18 +166,22 @@ You may want to add more custom fields like phone number or opening hours. For
that all you have to do is to add a new property model (*Chimere/Property
model*).
-The administration page ask you for:
+The administration page asks you for:
* a name,
-* an order (to order between other properties),
+* an order (to sort properties),
* an availability to the end user (this can be used to set hidden properties),
* a mandatory status,
-* the categories the property applied to (if no categories selected it applied
+* the categories the property applies to (if no categories selected it applies
to all),
* the type: text, long text, password or date.
-To make this property available it is necessary to reload your webserver (the
+To make this property available it is necessary to reload your web server (the
property is cached).
All forms are then automatically updated with this new field.
+If you don't want to allow add and modification of properties you can disable
+this form by setting CHIMERE_HIDE_PROPERTYMODEL to *True* in your
+*local_settings.py* file.
+
diff --git a/docs/en/customisation.rst b/docs/en/customisation.rst
new file mode 100644
index 0000000..665e2f8
--- /dev/null
+++ b/docs/en/customisation.rst
@@ -0,0 +1,52 @@
+.. -*- coding: utf-8 -*-
+
+=============
+Customisation
+=============
+
+:Author: Étienne Loks
+:date: 2012-11-28
+:Copyright: CC-BY 3.0
+
+This document presents the customisation of Chimère.
+It has been updated for version 2.0.0.
+
+
+.. _managing-layers:
+
+Managing layers
+---------------
+
+There are some different layers available by default in Chimère (OSM Mapnik, OSM
+Mapquest, OSM Transport map, OSM Cyclemap). You can add some extra layer using
+the web administration pages of Chimère. The new layer is defined with the
+appropriate `Openlayers <http://openlayers.org/>`_ JS code. This JS code must
+be a compatible Openlayers Layer instance with no ending semi-colon. For
+instance defining a Bing layer can be done with this kind of code::
+
+ new OpenLayers.Layer.Bing({
+ name: "Aerial",
+ key: "my-bing-API-key",
+ type: "Aerial"})
+
+
+Refer to the `Openlayers documentation API
+<http://dev.openlayers.org/releases/OpenLayers-2.12/doc/apidocs/files/OpenLayers-js.html>`_
+for more details.
+
+
+Customizing the layout and the design
+-------------------------------------
+
+If you only want to customize the CSS, the easiest way to do it is to add a
+link to an extra CSS to your *Areas* cf. :ref:`managing-areas`.
+
+If you want to do larger changes in the layout and the style the (well named)
+example_project can be customized to fit your needs. Each template file present
+in the *chimere/templates* directory can be copied in your *myproject/templates*
+directory and then modified.
+You only need to copy files that you want to modify. These files are in
+Django template language mainly made of pure HTML with some logic. Refer to
+the `Django template documentation <https://docs.djangoproject.com/en/1.4/ref/templates/>`_
+for more details.
+
diff --git a/docs/en/import_export.rst b/docs/en/import_export.rst
new file mode 100644
index 0000000..6dd1d7a
--- /dev/null
+++ b/docs/en/import_export.rst
@@ -0,0 +1,241 @@
+.. -*- coding: utf-8 -*-
+
+=============
+Import/export
+=============
+
+:Author: Étienne Loks
+:date: 2012-11-28
+:Copyright: CC-BY 3.0
+
+This document presents the import/export functionnalities of Chimère.
+It has been updated for version 2.0.0.
+
+.. _importing:
+
+Importing
+---------
+
+In Chimère the import mechanism is based on **Import object**. These objects
+are stored in database to keep trace of imports and to facilitate the
+re-importation from the same source. In fact if possible the update of data from
+a same type of source is managed.
+
+.. Note::
+ The ability to do such updates depends on the existence of a unique id
+ for each object on your source.
+
+To add an **Import object** you need to go to *Chimere > Imports* then **Add**.
+
+After that you'll have to select your source type and then the form depends on
+this source type.
+
+Common fields
+*************
+
+- **Name by default**: if no name can be identified to the newly imported object
+ this is the name that will be used. If this field is empty the name of the
+ associated category will be use.
+- **SRID**: Chimère will try to identify automatically the correct coordinate
+ system from the given source. But sometimes the information is not present or
+ cannot be guessed (for instance a Shapefile that uses non standard proj file).
+ In this case Chimère will use WGS84 by default (the classic
+ latitude/longitude) but it is not always correct. If you experience problems
+ with items localisation you should put here the `SRID
+ <https://en.wikipedia.org/wiki/SRID>`_ associated to the coordinate system of
+ your source.
+- **Overload existing data**: by default when data is updated on the source and
+ has been changed in your Chimère instance a new item is created and has to
+ be reconciled with the :ref:`amendment form <managing-modified>`. If you don't
+ want to use this form and then overwrite with the data from the external
+ source, check this option.
+- **Origin**: if not null this field will be associated to each item imported in
+ order to easily identify where the item came from. For OSM import the source
+ is automatically added.
+- **License**: if not null this field will be associated to each item imported in
+ order to easily identify the license associated to the item. For OSM import
+ the license is automatically added.
+- **Associated subcategories (mandatory)**: The selected subcategories will be
+ associated to newly imported items.
+
+
+KML import
+**********
+
+.. image:: static/chimere_admin_import_KML.png
+
+
+- **Web address/source file (mandatory)**: your KML could be distant or a local
+ file. You'll have to fill one of the two fields.
+- **Filter**: if you want to import only a specific *Folder* of your KML file
+ put his name on this field.
+- **Zipped file**: if your source is a KMLZ file (a zipped KML), check this case.
+
+Shapefile import
+****************
+
+.. image:: static/chimere_admin_import_shapefile.png
+
+
+- **Web address/source file (mandatory)**: your Shapefile could be distant or a
+ local file. You'll have to fill one of the two fields.
+- **Zipped file**: only zipped Shapefiles are accepted so this checkbox has to be
+ checked.
+
+GeoRSS import
+*************
+
+Simple GeoRSS and W3C GeoRSS are managed.
+
+.. image:: static/chimere_admin_import_georss.png
+
+- **Web address (mandatory)**: only distant GeoRSS are managed.
+
+CSV import
+**********
+
+The format of the CSV file (number and order of columns) managed by Chimère
+varies depending on the properties you have added on your Chimère instance.
+So we recommend you to first do an export of some items in CSV with Chimère.
+The CSV format of the exported file will meet Chimère requirements.
+
+By the way because of the geometry of the item this format is not very
+convenient to add new content but could be handy to update informations.
+
+.. Warning::
+ If you mean to update existing data by this import, unless you know how to
+ edit WKT do *not* modify the geometry column.
+
+.. image:: static/chimere_admin_import_CSV.png
+
+- **Web address/source file (mandatory)**: your CSV file could be distant or a
+ local file. You'll have to fill one of the two fields.
+
+.. _osm-import:
+
+OpenStreetMap import
+********************
+
+.. image:: static/chimere_admin_import_OSM.png
+
+To import from OSM Chimère use the XAPI API of OSM.
+
+- **Web address (mandatory)**: XAPI url used to import data. This field should
+ be filled with a default address. By default the MapQuest server is used as it
+ seems to be the more robust. If you experience problems with OSM import, check
+ the availability of the XAPI server used and eventually change it.
+- **Filter area (mandatory)**: draw the bounding box you want to use for your
+ OSM import.
+- **Filter type (mandatory)**: choose if you want to import way or nodes.
+- **Filter tag (mandatory)**: choose the OSM key/value couple used to filter OSM
+ data. A link to the `OSM Map features page
+ <https://wiki.openstreetmap.org/wiki/Map_Features>`_ is provided to help you
+ find appropriate values.
+- **Refresh button**: this button convert your choices to appropriate XAPI args.
+ You have to hit this button before validating the form.
+
+Importing
+*********
+
+Once your new import item created, select it in the import object list, choose
+the **Import** action and validate.
+
+The import should be processing normally. If not, an explicit error message
+should be printed in the state column of your import.
+
+You can also launch imports with the CLI (ideal for crontab jobs). In the
+project directory you only need to launch the command::
+
+ ./manage.py chimere_import <import_id>
+
+- *import_id* is the import ID
+
+If you launch the command without *import_id* the list of imports available is
+presented and you can choose one.
+
+.. _manage-imported-data:
+
+Managing imported data
+**********************
+
+All new imported items have the state **Imported**. To make them available on
+the map you'll have to validate them. If you don't want some items to be visible
+on the map, instead of deleting them it is recommended to set them to the state
+**Disabled**. So on the next update from the source, rather than appear as new
+items they remain disabled.
+
+.. Warning::
+ Be careful with duplicates between your existing data and imported data. This
+ is particularly important if you want to export your data to OSM.
+
+Exporting
+---------
+
+Export to CSV/KML/Shapefile
+***************************
+
+Directly from the :ref:`geographic items list <geographic-items-management>` you
+can export to the chosen format. All you have to do is to select the desired
+items, choose the appropriate action in the action list and validate.
+
+You can also launch exports with the CLI (ideal for crontab jobs). In the
+project directory you only need to launch the command::
+
+ ./manage.py chimere_export <subcategory_id> <CSV|KML|SHP> \
+ <marker|route> <filename>
+
+- *subcategory_id* is the ID of the chosen subcategory
+- *CSV|KML|SHP* is the chosen format
+- *marker|route* is to get marker or route
+- *filename* is the output filename
+
+If you launch the command without arguments you will be prompted for the choice
+to make for your export.
+
+
+Export to OSM
+*************
+
+.. Warning::
+ If you are not sure of what you are doing with OSM export: don't do it! It is
+ really important to not mess with others' data.
+
+.. Note::
+ Only export of OSM nodes are managed.
+
+OSM export is not that easily managed. First (if not yet done) you'll have to
+define an import (:ref:`see above <osm-import>` for details). This will enable
+to determine:
+
+- the area concerned by your export.
+- the key/value tag to append to your new/updated items.
+- the subcategories concerned by your export. If you think that some items in
+ these subcategories should not be in OSM database (because there are not
+ relevant or because of license issues) beforehand mark them as **Not for OSM**
+ in the *import fields* of the :ref:`geographic items forms
+ <geographic-items-management>`.
+
+
+The OSM export in Chimère is designed to be the more preservative possible in
+regards to OSM database. That's why before any export an import is done. If
+the new import has updated data, treat them before doing an export (cf.
+:ref:`manage imported data <manage-imported-data>`).
+
+To launch an export select the appropriate *Import* object in the imports list.
+Then select the **Export to OSM** action and validate.
+Then you'll be asked for your OSM username and password and the API you want to
+use. If you regularly use Chimère to do export, it is recommended to create an
+OSM specific account for that.
+The test API is available to make export test. If you want to use the test
+API you'll have to create a specific account on the test platform.
+
+.. Warning::
+ The data on the test platform are not synced with the main platform. You won't
+ have the same data than the ones you got with XAPI.
+
+Once all this field filled, you can (finally!) launch the export.
+
+When exporting tags are automatically added/updated:
+
+- *name*: get from the item name in Chimère.
+- *source*: to identify Chimère as a source.
diff --git a/docs/index.rst b/docs/en/index.rst
index 45f40e0..ee1dd6f 100644
--- a/docs/index.rst
+++ b/docs/en/index.rst
@@ -12,6 +12,6 @@ Welcome to Chimère's documentation!
install
upgrade
configuration
- customisation
administration
import_export
+ customisation
diff --git a/docs/install.rst b/docs/en/install.rst
index 10c333e..ea27efc 100644
--- a/docs/install.rst
+++ b/docs/en/install.rst
@@ -5,31 +5,30 @@ Installation
============
:Author: Étienne Loks
-:date: 2012-10-08
+:date: 2012-11-28
:Copyright: CC-BY 3.0
-This documents presents the installation of Chimère.
-The version has been updated for version 2.0.0.
+This document presents the installation of Chimère.
+It has been updated for version 2.0.0.
Prerequisites
*************
- - `apache <http://www.apache.org/>`_ version 2.x
- - `python <http://www.python.org/>`_ versions 2.6 or 2.7
- - `django <http://www.djangoproject.com/>`_ >= version 1.4
- - `south <http://south.aeracode.org/>`_
- - `postgres <http://www.postgresql.org/>`_ >= version 8.x
- - `gettext <http://www.gnu.org/software/gettext/>`_
- - `psycopg2 <http://freshmeat.net/projects/psycopg/>`_
+ - `Apache <http://www.apache.org/>`_ version 2.x
+ - `Python <http://www.python.org/>`_ versions 2.6 or 2.7
+ - `Django <http://www.djangoproject.com/>`_ >= version 1.4
+ - `South <http://south.aeracode.org/>`_
+ - `Postgres <http://www.postgresql.org/>`_ >= version 8.x
+ - `Gettext <http://www.gnu.org/software/gettext/>`_
+ - `Psycopg2 <http://freshmeat.net/projects/psycopg/>`_
- `Python Imaging Library <http://www.pythonware.com/products/pil/>`_
- - `pyexiv2 <http://tilloy.net/dev/pyexiv2/>`_
+ - `Pyexiv2 <http://tilloy.net/dev/pyexiv2/>`_
- `Beautiful Soup <http://www.crummy.com/software/BeautifulSoup/>`_
- python-simplejson
- python-gdal
- - `unidecode <http://pypi.python.org/pypi/Unidecode>_
- - `lxml <http://lxml.de/>`_
- - `jquery <http://jquery.com/>`_ version 1.7.1 or better
- - `jquery-ui <http://jqueryui.com/>`_
+ - `Lxml <http://lxml.de/>`_
+ - `Jquery <http://jquery.com/>`_ version 1.7.1 or better
+ - `Jquery-ui <http://jqueryui.com/>`_
- `Universal Feed Parser <https://code.google.com/p/feedparser/>`_
geodjango is a part of django since version 1.0 but it has some specific
@@ -37,7 +36,7 @@ geodjango is a part of django since version 1.0 but it has some specific
- `geos <http://trac.osgeo.org/geos/>`_ 3.0.x
- `proj.4 <http://trac.osgeo.org/proj/>`_ 4.4 to 4.6
- - `posgis <http://postgis.refractions.net/>`_ versions 1.2.1 or 1.3.x
+ - `postgis <http://postgis.refractions.net/>`_ versions 1.2.1 or 1.3.x
- `gdal <http://www.gdal.org/>`_
@@ -51,23 +50,26 @@ Optionaly (but recommanded):
The simpliest way to obtain these packages is to get them from your favorite
Linux distribution repositories. For instance on Debian Wheezy::
- apt-get install python python-django python-django-south \
- python-beautifulsoup tinymce apache2 libgeos-3.3.3 proj-bin gdal-bin \
- python-gdal python-lxml python-psycopg2 python-imaging gettext \
- postgresql-9.1 postgresql-9.1-postgis libjs-jquery libjs-jquery-ui \
- python-django-celery python-simplejson gpsbabel \
- python-pyexiv2 python-feedparser javascript-common
+ apt-get install apache2 python python-django python-django-south \
+ postgresql-9.1 gettext python-psycopg2 python-imaging \
+ python-pyexiv2 python-beautifulsoup python-simplejson python-gdal \
+ python-lxml libjs-jquery libjs-jquery-ui python-feedparser \
+ libgeos-3.3.3 proj-bin postgresql-9.1-postgis gdal-bin \
+ tinymce gpsbabel python-django-celery javascript-common
+
On Debian Squeeze (you need to activate backports)::
apt-get install -t squeeze-backports python-django libjs-jquery
- apt-get install python python-django-south python-beautifulsoup tinymce \
- apache2 libgeos-3.2.0 proj-bin gdal-bin python-gdal python-lxml \
- python-psycopg2 python-imaging gettext postgresql-8.4 \
- postgresql-8.4-postgis libjs-jquery libjs-jquery-ui python-simplejson \
- gpsbabel python-pyexiv2 python-feedparser javascript-common
+ apt-get install apache2 python python-django python-django-south \
+ postgresql-8.4 gettext python-psycopg2 python-imaging \
+ python-pyexiv2 python-beautifulsoup python-simplejson python-gdal \
+ python-lxml libjs-jquery libjs-jquery-ui python-feedparser \
+ libgeos-3.2.0 proj-bin postgresql-8.4-postgis gdal-bin \
+ tinymce gpsbabel javascript-common
+The package *python-django-celery* doesn't exist for Debian Squeeze.
If these packages do not exist in your distribution's repository, please refer
to the applications' websites.
@@ -76,7 +78,7 @@ Database configuration
**********************
Now that postgres and postgis are installed, you need to create a new user for
-chimere::
+Chimère::
su postgres
createuser --echo --adduser --createdb --encrypted --pwprompt chimere-user
@@ -90,8 +92,11 @@ the paths accordingly to your needs)::
psql -d chimere -f /usr/share/postgresql/$PG_VERSION/contrib/postgis-1.5/postgis.sql
psql -d chimere -f /usr/share/postgresql/$PG_VERSION/contrib/postgis-1.5/spatial_ref_sys.sql
-Install the sources
-*******************
+Installing the sources
+**********************
+
+.. Note::
+ If you are considering to contribute on Chimère get the Git master.
Choose a path to install your Chimère::
@@ -103,8 +108,7 @@ From an archive
The last "stable" version is available in this `directory <http://www.peacefrogs.net/download/chimere/>`_.
Take care of getting the last version in the desired X.Y branch (for instance
-the last version for the 1.0 branch is version 1.0.2.
-Extract it to the desired destination path::
+the last version for the 1.0 branch is version 1.0.2).::
wget http://www.peacefrogs.net/download/chimere -q -O -| html2text
(...)
@@ -122,10 +126,10 @@ readable directory::
tar xvjf chimere-last.tar.bz2
chown -R myusername:www-data chimere
-From the git repository
+From the Git repository
+++++++++++++++++++++++
-Another solution is to get the last git version::
+Another solution is to get it from the Git repository::
cd $INSTALL_PATH
git clone git://www.peacefrogs.net/git/chimere
@@ -134,26 +138,26 @@ Another solution is to get the last git version::
git checkout v2.0 # checkout the desired version
-Create a custom project template
-********************************
+Creating a custom project template
+**********************************
-There a default project provided "example_project". Copy and modify it (or
-get another project based on Chimere)::
+There, a default project is provided (*example_project*). Copy and modify
+it (or get another project based on Chimère)::
cd $INSTALL_PATH/chimere
cp -ra example_project mychimere_project
Your project name is used for the name of the Python package of your template.
As a Python package it should follow the rule of Python variable name:
-it must be at least one letter and can have a string of numbers, letters and
-"_" to any length. Don't begin the name by "_" because it has special
-significance in Python.
+it must contain at least one letter and can have a string of numbers, letters and
+underscores ("_") to any length. Don't use accentuated letters. Don't begin the
+name by "_" because it has special significance in Python.
-In your chimere application directory create local_settings.py to fit to your
+In your Chimère application directory create *local_settings.py* to fit to your
configuration.
-A base template is provided (local_settings.py.example) and short descriptions of
-the more relevant fields are given below (at least check them). Most of theses
-settings are initialized in settings.py. ::
+A base template is provided (*local_settings.py.example*) and short descriptions
+of the more relevant fields are given below (at least check them). Most of
+these settings are initialized in *settings.py*. ::
cd $INSTALL_PATH/chimere/mychimere_project
cp local_settings.py.sample local_settings.py
@@ -165,18 +169,20 @@ settings are initialized in settings.py. ::
* PROJECT_NAME: name of the project
* SECRET_KEY: a secret key for a particular Django installation. This is
used to provide cryptographic signing, and should be set to a unique,
- unpredictable value. Change it!
+ unpredictable value. **Change it!**
* ROOT_URLCONF: url configuration for your project something like:
'mychimere_project.urls'
* EMAIL_HOST: smtp of an email server to send emails
* TINYMCE_URL: url to tinymce path (default is appropriate for a Debian
- installation with tinymce activated)
- * JQUERY_JS_URLS: list of Jquery and Jquery-ui urls (default is appropriate
- for a Debian installation with Jquery and Jquery-ui activated)
- * JQUERY_CSS_URLS: list of Jquery and Jquery-ui urls (default is appropriate
- for a Debian installation with Jquery and Jquery-ui activated)
+ installation with tinymce package installed)
+ * JQUERY_JS_URLS: list of jquery and jquery-ui javascript urls (default is
+ appropriate for a Debian installation with libjs-jquery libjs-jquery-ui
+ packages installed)
+ * JQUERY_CSS_URLS: list of jquery and jquery-ui CSS urls (default is
+ appropriate for a Debian installation with libjs-jquery libjs-jquery-ui
+ packages installed)
* GPSBABEL: path to gpsbabel (default is appropriate for a Debian
- installation with gpsbabel installed)
+ installation with gpsbabel package installed)
* TIME_ZONE: local time zone for this installation
* LANGUAGE_CODE: language code for this installation
@@ -201,14 +207,14 @@ Regroup static files in one path::
Compiling languages
*******************
-If your language is available in the locale directory of chimere, you will just
-need to get it compiled. This can be done with (here, **fr** stands for french).
-Replace it with the appropriate language code)::
+If your language is available in the directory *chimere/locale/*, you will just
+need to get it compiled. This can be done with the following command (here,
+**fr** stands for French, replace it with the appropriate language code)::
cd $INSTALL_PATH/chimere/chimere/
- django-admin compilemessages
+ django-admin compilemessages -l fr
-If your language is not available, feel free to create the default po files and
+If your language is not available, feel free to create the default po file and
to submit it, contributions are well appreciated. Procedure is as follows:
You first need to create the default po file (of course, replace **fr**
@@ -225,14 +231,14 @@ would have if the language file was already available.
Database initialisation
***********************
-Create the appropriate tables (still being in chimère application directory)::
+Create the appropriate tables (still being in your Chimère project directory)::
cd $INSTALL_PATH/chimere/mychimere_project
./manage.py syncdb
You will be prompted for the creation of an administrator account
-(administration can be found at: http://where_is_chimere/admin). Then you have
-to create tables managed with south::
+(administration can be found at: http://where_is_chimere/admin/). Then you have
+to create tables managed with Django-South::
./manage.py migrate
@@ -249,32 +255,34 @@ Webserver configuration
Apache configuration with mod_wsgi
++++++++++++++++++++++++++++++++++
-Install mod_wsgi for apache::
+Install *mod_wsgi* for Apache::
apt-get install libapache2-mod-wsgi
-TODO: adapt apache-wsgi.conf
Create and edit a configuration for Chimère::
cp $INSTALL_PATH/chimere/apache/django.wsgi \
- $INSTALL_PATH/chimere/apache/mydjango.wsgi
+ $INSTALL_PATH/chimere/apache/mydjango.wsgi
vim $INSTALL_PATH/chimere/apache/mydjango.wsgi
- cp $INSTALL_PATH/chimere/apache/apache-wsgi.conf /etc/apache2/sites-available/chimere
+ cp $INSTALL_PATH/chimere/apache/apache-wsgi.conf \
+ /etc/apache2/sites-available/chimere
vim /etc/apache2/sites-available/chimere
# create log dir
mkdir /var/log/apache2/chimere/
+ chown www-data /var/log/apache2/chimere/
-Adapt the files *mydjango.wsgi* (with the correct sys path) and Apache *chimere*.
+Adapt the files *mydjango.wsgi* (with the correct sys path and the correct
+module) and Apache *chimere* (with the correct servername and correct paths).
-To activate the website reload apache::
+To activate the website, reload apache::
a2ensite chimere
/etc/init.d/apache2 reload
If you encounter problem with the upload of files with Unicode chars in their
-names activate the appropriate locale in Apache. On a Debian server with UTF-8
-as default encoding in the file */etc/apache2/envvars* uncomment the following
+names, activate the appropriate locale in Apache. On a Debian server with UTF-8
+as default encoding, in the file */etc/apache2/envvars* uncomment the following
line::
. /etc/default/locale
diff --git a/docs/_build/html/_images/chimere_admin_00.png b/docs/en/static/chimere_admin_00.png
index 374c6b6..374c6b6 100644
--- a/docs/_build/html/_images/chimere_admin_00.png
+++ b/docs/en/static/chimere_admin_00.png
Binary files differ
diff --git a/docs/_build/html/_images/chimere_admin_01.png b/docs/en/static/chimere_admin_01.png
index 0db7f4d..0db7f4d 100644
--- a/docs/_build/html/_images/chimere_admin_01.png
+++ b/docs/en/static/chimere_admin_01.png
Binary files differ
diff --git a/docs/_build/html/_images/chimere_admin_02.png b/docs/en/static/chimere_admin_02.png
index d0fd6fe..d0fd6fe 100644
--- a/docs/_build/html/_images/chimere_admin_02.png
+++ b/docs/en/static/chimere_admin_02.png
Binary files differ
diff --git a/docs/_build/html/_images/chimere_admin_03.png b/docs/en/static/chimere_admin_03.png
index e815500..e815500 100644
--- a/docs/_build/html/_images/chimere_admin_03.png
+++ b/docs/en/static/chimere_admin_03.png
Binary files differ
diff --git a/docs/en/static/chimere_admin_import_CSV.png b/docs/en/static/chimere_admin_import_CSV.png
new file mode 100644
index 0000000..20e53c9
--- /dev/null
+++ b/docs/en/static/chimere_admin_import_CSV.png
Binary files differ
diff --git a/docs/en/static/chimere_admin_import_KML.png b/docs/en/static/chimere_admin_import_KML.png
new file mode 100644
index 0000000..ad35302
--- /dev/null
+++ b/docs/en/static/chimere_admin_import_KML.png
Binary files differ
diff --git a/docs/en/static/chimere_admin_import_OSM.png b/docs/en/static/chimere_admin_import_OSM.png
new file mode 100644
index 0000000..03b3632
--- /dev/null
+++ b/docs/en/static/chimere_admin_import_OSM.png
Binary files differ
diff --git a/docs/en/static/chimere_admin_import_georss.png b/docs/en/static/chimere_admin_import_georss.png
new file mode 100644
index 0000000..6c95693
--- /dev/null
+++ b/docs/en/static/chimere_admin_import_georss.png
Binary files differ
diff --git a/docs/en/static/chimere_admin_import_shapefile.png b/docs/en/static/chimere_admin_import_shapefile.png
new file mode 100644
index 0000000..0f5bdcf
--- /dev/null
+++ b/docs/en/static/chimere_admin_import_shapefile.png
Binary files differ
diff --git a/docs/en/static/chimere_admin_modified_management.png b/docs/en/static/chimere_admin_modified_management.png
new file mode 100644
index 0000000..84e069e
--- /dev/null
+++ b/docs/en/static/chimere_admin_modified_management.png
Binary files differ
diff --git a/docs/en/static/chimere_admin_modify_item.png b/docs/en/static/chimere_admin_modify_item.png
new file mode 100644
index 0000000..861ea20
--- /dev/null
+++ b/docs/en/static/chimere_admin_modify_item.png
Binary files differ
diff --git a/docs/upgrade.rst b/docs/en/upgrade.rst
index d7c7233..d44ae02 100644
--- a/docs/upgrade.rst
+++ b/docs/en/upgrade.rst
@@ -8,25 +8,31 @@ Upgrade
:date: 2012-10-08
:Copyright: CC-BY 3.0
+This document presents the upgrade of Chimère.
+It has been updated for version 2.0.0.
+
+.. Warning::
+ Before any upgrade backup the database and all your installation files
+ (specially if you have made changes to them).
-Before any upgrade backup the database and all your installation files
-(specially if you have made changes to them).
The process for migration requires a basic knowledge of Git and Linux CLI. It is
-not an easy process. A work is done to easy the upgrade in later versions (>2.0)
-of Chimère.
+*not* an easy process. A work is currently done to easy the upgrade in later
+versions (>2.0) of Chimère.
-If several versions has been published, you should repeat any upgrading steps.
+If several versions have been published, you should repeat all upgrading steps.
For instance to upgrade from v1.1 to v2.0 you should first upgrade to v1.2 then
to v2.0. The only optional step is the integration of your customisations.
The current stable version is 2.0.
-If you are considering to contribute on Chimère get the Git master.
-The instruction are given for Debian Squeeze and Debian Wheezy.
+.. Note::
+ If you are considering to contribute on Chimère get the Git master.
+
+The instructions are given for Debian Squeeze and Debian Wheezy.
-Get new version of dependencies
--------------------------------
+Getting new versions of dependencies
+------------------------------------
Version 1.1 -> 1.2
******************
@@ -55,18 +61,18 @@ Debian Wheezy
apt-get install python-django-south python-simplejson libjs-jquery-ui \
python-pyexiv2 python-feedparser javascript-common
-If you are planing to do major import consider the install of `Celery
+If you are planning to do major import consider the install of `Celery
<http://celeryproject.org/>`_.
.. code-block:: bash
apt-get install python-django-celery python-kombu
-Get the new sources
--------------------
+Getting the new sources
+-----------------------
-First of all we have to get the new version of the source code.
-For this upgrade process, we are getting the source code from the Git
+First of all you have to get the new version of the source code.
+For the upgrade process, the source code has to be from the Git
repository.
To simplify further instructions, some environment variables are
@@ -80,10 +86,10 @@ initialized.
CHIMERE_TAG=master # version 2.0 -> master
CHIMERE_LOCALNAME=mychimere
-Your local name is used for the name of your local git branch and the Python
+Your local name is used for the name of your local Git branch and the Python
package. As a Python package it should follow the rule of Python variable name:
it must be at least one letter and can have a string of numbers, letters and
-"_" to any length. Don't begin the name by "_" because it has special
+underscores ("_") to any length. Don't begin the name by "_" because it has special
significance in Python.
From a previous Git installation
@@ -92,7 +98,7 @@ From a previous Git installation
.. code-block:: bash
cd $CHIMERE_PATH
- git checkout -b $CHIMERE_LOCALNAME # do it only if you haven't yet create a local branch
+ git checkout -b $CHIMERE_LOCALNAME # only if you haven't created yet a local branch
git stash # if you have uncommited changes
git checkout master
git pull
@@ -102,7 +108,7 @@ From a previous Git installation
From a previous tarball installation
************************************
-Remove first your old installation and get the Git version.
+First remove your old installation and get the Git version:
.. code-block:: bash
@@ -126,7 +132,7 @@ Version 1.1 -> 1.2
CHIMERE_APP_PATH=$CHIMERE_PATH/chimere
vim $CHIMERE_APP_PATH/settings.py
-Add the line (adapted for your jquery and gpsbabel installation).
+Add the following lines (adapted for your jquery and gpsbabel installation):
.. code-block:: python
@@ -140,7 +146,7 @@ Version 1.2 -> 2.0
Project template
................
-Create a new project template.
+Create a new project template:
.. code-block:: bash
@@ -158,9 +164,9 @@ A *local_settings* file is now used.
cp local_settings.py.sample local_settings.py
vim local_settings.py
-Report your old settings.py in local_settings.py (at least the database
-configuration).
-Your *ROOT_URLCONF* must be set to **value_of_your_localname.urls**.
+Report your old settings from *settings.py* to *local_settings.py* (at least the
+database configuration).
+The setting *ROOT_URLCONF* must be set to **value_of_your_localname.urls**.
logs
....
@@ -175,14 +181,14 @@ Logging is now enabled by default in the file */var/log/django/chimere.log*.
Static files
............
-Now static file are managed with *django.contrib.staticfiles*.
+Now static files are managed with *django.contrib.staticfiles*.
.. code-block:: bash
cd $CHIMERE_APP_PATH
./manage.py collectstatic
-Move old static files to the new static directory.
+Move old static files to the new static directory:
.. code-block:: bash
@@ -217,22 +223,20 @@ Version 1.1 -> 1.2
******************
Migration scripts test your installation before making changes so you probably
-won't have any lost but by precaution before running theses scripts don't forget
+won't have any lost but by precaution before running these scripts don't forget
to backup your database.
You can also make a copy of your current database into a new database and make
the new installation to this new database.
-The gdal binding for python is necessary to run the upgrade scripts (available
+The gdal binding for Python is necessary to run the upgrade scripts (available
in the python-gdal package in Debian).
If you run the migration scripts in a production environnement stop the old
-instance of Chimère before executing the migration script. Perhaps prepare the
-web server to point to the new installation before doing the database upgrade
-(cf. next paragraph).
+instance of Chimère before executing the migration script.
In *settings.py* verify that **chimere.scripts** is in the *INSTALLED_APPS*.
-After that in the chimere directory just execute the script.
+After that in the Chimère directory just execute the script.
.. code-block:: bash
@@ -258,10 +262,10 @@ values of an old *Property model* to this new field, a script is available.
cd $CHIMERE_APP_PATH
../chimere/scripts/migrate_properties.py
- # folow the instructions
+ # follow the instructions
-From 2.0 to master
-******************
+Version 2.0 -> master
+*********************
.. code-block:: bash
@@ -288,10 +292,10 @@ Version 1.2 -> 2.0 -> master
cd $CHIMERE_PATH/chimere
django-admin compilemessages
-Force the upgrade of visitor's web browser cache
-------------------------------------------------
+Forcing the refresh of visitor's web browser cache
+--------------------------------------------------
-If major changes in the javascript has be done between version, many of your
+Major changes in the javascript has been done between versions, many of your
users could experience problems. There are many tricks to force the refresh
of their cache. One of them is to change the location of statics files. To do
that edit your local_settings.py and change::
@@ -302,12 +306,6 @@ to::
STATIC_URL = '/static/v2.0.0/'
-Then in the static directory.
-
-.. code-block:: bash
-
- cd $CHIMERE_APP_PATH/static
- ln -s `pwd` v2.0.0
-
+Then change the webserver directive to point to your new path.
Restart the web server to apply this changes.
diff --git a/docs/fr/Makefile b/docs/fr/Makefile
new file mode 100644
index 0000000..fcccf30
--- /dev/null
+++ b/docs/fr/Makefile
@@ -0,0 +1,130 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS =
+SPHINXBUILD = sphinx-build
+PAPER =
+BUILDDIR = build
+
+# Internal variables.
+PAPEROPT_a4 = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest
+
+help:
+ @echo "Please use \`make <target>' where <target> is one of"
+ @echo " html to make standalone HTML files"
+ @echo " dirhtml to make HTML files named index.html in directories"
+ @echo " singlehtml to make a single large HTML file"
+ @echo " pickle to make pickle files"
+ @echo " json to make JSON files"
+ @echo " htmlhelp to make HTML files and a HTML help project"
+ @echo " qthelp to make HTML files and a qthelp project"
+ @echo " devhelp to make HTML files and a Devhelp project"
+ @echo " epub to make an epub"
+ @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+ @echo " latexpdf to make LaTeX files and run them through pdflatex"
+ @echo " text to make text files"
+ @echo " man to make manual pages"
+ @echo " changes to make an overview of all changed/added/deprecated items"
+ @echo " linkcheck to check all external links for integrity"
+ @echo " doctest to run all doctests embedded in the documentation (if enabled)"
+
+clean:
+ -rm -rf $(BUILDDIR)/*
+
+html:
+ $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+ @echo
+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+ $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+ @echo
+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+singlehtml:
+ $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+ @echo
+ @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+pickle:
+ $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+ @echo
+ @echo "Build finished; now you can process the pickle files."
+
+json:
+ $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+ @echo
+ @echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+ $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+ @echo
+ @echo "Build finished; now you can run HTML Help Workshop with the" \
+ ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+ $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+ @echo
+ @echo "Build finished; now you can run "qcollectiongenerator" with the" \
+ ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+ @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/Chimre.qhcp"
+ @echo "To view the help file:"
+ @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/Chimre.qhc"
+
+devhelp:
+ $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+ @echo
+ @echo "Build finished."
+ @echo "To view the help file:"
+ @echo "# mkdir -p $$HOME/.local/share/devhelp/Chimre"
+ @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/Chimre"
+ @echo "# devhelp"
+
+epub:
+ $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+ @echo
+ @echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+ @echo
+ @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+ @echo "Run \`make' in that directory to run these through (pdf)latex" \
+ "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+ @echo "Running LaTeX files through pdflatex..."
+ $(MAKE) -C $(BUILDDIR)/latex all-pdf
+ @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+ $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+ @echo
+ @echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+ $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+ @echo
+ @echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+changes:
+ $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+ @echo
+ @echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+ $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+ @echo
+ @echo "Link check complete; look for any errors in the above output " \
+ "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+ $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+ @echo "Testing of doctests in the sources finished, look at the " \
+ "results in $(BUILDDIR)/doctest/output.txt."
diff --git a/docs/fr/administration.rst b/docs/fr/administration.rst
new file mode 100644
index 0000000..8fcf41a
--- /dev/null
+++ b/docs/fr/administration.rst
@@ -0,0 +1,241 @@
+.. -*- coding: utf-8 -*-
+.. _administration:
+
+==============
+Administration
+==============
+
+:Auteur: Étienne Loks
+:date: 2012-11-29
+:Copyright: CC-BY 3.0
+
+Ce document présente l'administration de Chimère.
+Il a été mis à jour pour la version 2.0.0 de Chimère.
+
+Présentation des pages d'administration
+---------------------------------------
+
+Les pages d'administration sont accessibles à l'adresse :
+http://where_is_your_chimere/admin/
+
+N'oubliez pas la barre oblique (slash) à la fin de l'adresse.
+
+Identification
+**************
+
+Tout d'abord vous avez à vous identifier avec l'identifiant et le mot de
+passe fournis.
+
+.. image:: static/chimere_admin_00.png
+
+
+Page principale
+***************
+
+Une fois identifié, vous avez accès à la page principale d'administration.
+
+Cela s'affiche ainsi :
+
+.. image:: static/chimere_admin_01.png
+
+#. lien vers cette **Documentation**, vers le formulaire de **Changement de mot
+ de passe** et la déconnexion ;
+#. la liste des actions récemment faites avec ce compte ;
+#. un titre d'application, la plupart des actions vont se faire dans
+ l'application **Chimere** ;
+#. un élément à l'intérieur de l'application. Depuis ces pages, vous pouvez
+ *Ajouter* un nouvel élément ou consulter/**Changer** des éléments. Le lien
+ **Ajouter** conduit au `Formulaire des éléments`_. Le lien **Modifier**
+ conduit à la `Liste des éléments`_. La `Liste des éléments`_ est également
+ disponible en cliquant sur le libellé de l'élément.
+
+
+Liste des éléments
+******************
+
+.. image:: static/chimere_admin_02.png
+
+#. chemin dans le site d'administration. C'est un raccourci pratique pour
+ revenir à la page principale.
+#. lien pour créer un nouvel élément depuis la liste des éléments.
+#. recherche des éléments par mot (n'est pas disponible pour tous les types
+ d'éléments).
+#. cette boite permet de filtrer les entrées actuelles avec des filtres (n'est
+ pas disponible pour tous les types d'éléments)
+#. les en-têtes de cette table sont cliquables. Cliquer sur une en-tête permet
+ de trier les éléments de manière ascendante et descendante. Un tri multi-en-tête
+ est possible (le nombre à droite de l'en-tête indique l'ordre de prise en
+ compte dans le tri).
+#. chaque élément peut être coché (pour lui appliquer une action) ou sélectionné
+ (en cliquant sur la première colonne) pour voir son détail et éventuellement
+ le modifier ou le supprimer.
+
+Formulaire des éléments
+***********************
+
+.. image:: static/chimere_admin_03.png
+
+#. les champs pour l'élément sélectionné (ou vide si c'est un nouvel élément)
+ sont affichés dans ce formulaire. Parfois certains champs sont en lecture
+ seule et d'autres sont cachés. Les champs obligatoires ont leur intitulé en
+ gras. Les changements sur ces champs ne sont effectifs qu'une fois le
+ formulaire validé.
+#. pour certains éléments il y a des sous-éléments associés. Ces sous-éléments
+ peuvent être modifiés directement dans ce formulaire. Lorsque plusieurs
+ sous-éléments sont associés à un élément, ils peuvent être réagencés par
+ glisser-déposer.
+#. le formulaire doit être validé par un de ces boutons. Ils parlent d'eux-même.
+
+États
+*****
+
+Les *États* sont des propriétés rattachées à chaque élément géographique dans
+Chimère. Pour administrer Chimère efficacement il est nécessaire de comprendre
+chacun de ces états.
+
+- **Proposé**: État d'un élément nouvellement proposé par un utilisateur. Cet
+ élément n'est pas visible sur la carte.
+- **Disponible**: État d'un élément visible sur la carte.
+- **Désactivé**: État d'un élément écarté.
+- **Modifié**: État d'une proposition de modification d'un élément par un
+ utilisateur.
+- **Importé**: État d'un élément nouvellement importé. Les opérations d'import
+ et d'export nécessitent que tous les éléments avec l'état *importé* soient
+ traités (validés, désactivés ou supprimés).
+
+
+Gestion des nouvelles
+---------------------
+
+Un système de nouvelles est disponible.
+Tout ce que vous avez à faire est de cliquer sur le bouton *Ajouter* à côté de
+*Nouvelles*.
+Pour chaque nouvelle il est nécessaire de fournir un nom et un contenu. Le
+contenu peut contenir des balises HTML.
+La disponibilité est gérée avec une case à cocher.
+
+Création de catégories/sous-catégories
+--------------------------------------
+
+Avant l'ajout de catégories, il est nécessaire de définir des icônes. Ces icônes
+apparaissent sur la carte et sur la boîte contenant les catégories sur la carte
+principale.
+Faites attention de bien redimensionner vos icônes. En effet les icônes vont
+être présentées à leur taille réelle sur la carte.
+Pour ajouter des icônes : cliquez sur le bouton **Ajout** à côté de *Icônes*.
+
+Le site http://mapicons.nicolasmollet.com/ permet de générer facilement des
+icônes adaptées à un usage dans Chimère.
+
+Les catégories sont en fait des conteneurs à sous-catégories. Il est juste
+nécessaire de fournir nom et ordre d'affichage.
+Pour ajouter des catégories : cliquez sur le bouton **Ajout** près des
+catégories.
+
+Les champs concernant les sous-catégories sont : un nom, une icône, un ordre,
+un thème de couleur et un type d'élément.
+La plupart des champs parlent d'eux-mêmes.
+Les thèmes de couleurs sont composés de plusieurs couleurs.
+Les couleurs sont utilisées pour le tracé des trajets (si la sous-catégorie
+contient des trajets). Si c'est une couleur de base, cela peut être défini
+par le nom en anglais (par exemple *red* pour rouge, *blue* pour bleu,
+*purple* pour violet) sinon vous pouvez donner le code couleur HTML RVB
+(par exemple *#9227c9*).
+Le type d'élément est le type d'élément que la sous-catégorie peut contenir :
+points d'intérêts, trajets ou les deux.
+
+.. _geographic-items-management:
+
+Édition/modération des éléments
+-------------------------------
+
+L'étape de modération est relativement simple. Elle fonctionne de la même
+manière avec les points d'intérêt ou avec les trajets.
+Le modérateur accède classiquement aux points d'intérêts (ou trajets) en
+cliquant sur leur nom dans la liste d'éléments.
+
+Un champ de recherche est disponible pour rechercher par nom mais il est
+généralement plus intéressant de filtrer par état et sous-catégories.
+
+Il y a un certain nombre d'action disponible.
+
+- **Supprimer** pour supprimer les éléments sélectionnés. Une étape de
+ confirmation est affichée.
+- **Valider** pour donner le status *Disponible* aux éléments sélectionnés.
+- **Désactiver** pour donner le status *Désactivé* aux éléments sélectionnés.
+ C'est particulièrement utile pour garder des éléments que vous ne voulez
+ pas voir apparaître sur la carte mais conserver en base de données.
+- **Gérer les éléments modifiés** pour gérer les propositions de modification
+ par les utilisateurs sur le site principal (cf. :ref:`managing-modified`).
+ Les éléments modifiés ne peuvent être traités qu'un par un.
+- **Export en...** pour exporter les éléments sélectionnés vers le format
+ sélectionné.
+
+
+Pour modifier un élément, classiquement, vous cliquez sur son nom pour accéder
+ensuite à un formulaire pour modifier librement l'élément.
+
+.. image:: static/chimere_admin_modify_item.png
+
+Sur ce formulaire il y a tous les éléments disponibles à l'utilisateur plus
+quelques champs supplémentaires.
+
+- Les champs *Imports* ne sont pertinent que pour les données importées depuis
+ une source externe ou pour les données destinées à être exportées vers OSM
+ cf. à la :ref:`section import <importing>` de cette documentation.
+- Les *Éléments associés* sont des champs en lecture seule qui listent les
+ éléments associés à l'élément courant (élément de référence d'une
+ modification, fichier associé à un trajet).
+
+
+Les éléments multimédias sont listés à la fin du formulaire. Vous pouvez
+librement ajouter, modifier, changer l'ordre (avec du glisser-déposer) de ces
+éléments.
+
+Si un élément n'est pas pertinent, le bouton **Supprimer** permet de le
+supprimer.
+
+.. Warning::
+ N'oubliez pas de valider vis changements avec un des boutons d'enregistrement
+ disponibles à la fin du formulaire (notamment il est assez facile d'oublier
+ de confirmer les changements faits aux éléments multimédias).
+
+.. _managing-modified:
+
+Gérer les modifications des utilisateurs/les éléments importés ayant des modifications locales
+----------------------------------------------------------------------------------------------
+
+Des propositions de modification peuvent être faits sur le site principal par
+les utilisateurs.
+
+Dans Chimère, une proposition de modification est un nouvel élément avec l'état
+**Modifié** qui dispose d'un lien vers l'élément de référence.
+
+Vous pouvez avoir aussi des éléments importés qui ont à la fois des
+modifications locales et sur la source externe. La nouvelle version de la source
+externe a l'état **Importé** et un lien vers l'élément de référence.
+
+.. Note::
+ Si vous êtes identifié en tant qu'administrateur et que vous faites des
+ changements sur la carte avec le « formulaire utilisateur » les changements
+ vont être directement pris en compte.
+
+Un formulaire spécifique a été développé pour faciliter le traitement de ces
+éléments modifiés.
+
+Vous pouvez accéder à ce formulaire spécifique avec l'action *Gérer les éléments
+modifiés*.
+
+.. image:: static/chimere_admin_modified_management.png
+
+Ce formulaire est un tableau à 3 colonnes.
+
+#. La première colonne affiche les informations de l'élément de référence.
+#. La seconde colonne affiche les informations que propose l'utilisateur.
+#. La troisième colonne est une liste de cases à cocher. Après validation, pour
+ chaque ligne cochée, la valeur de l'élément modifié remplacera la valeur de
+ l'élément de référence.
+
+.. Note::
+ Pour rejeter toutes les modifications proposées, validez le formulaire sans
+ cocher aucune case.
diff --git a/docs/fr/conf.py b/docs/fr/conf.py
new file mode 100644
index 0000000..f1ad157
--- /dev/null
+++ b/docs/fr/conf.py
@@ -0,0 +1,216 @@
+# -*- coding: utf-8 -*-
+#
+# Chimère documentation build configuration file, created by
+# sphinx-quickstart on Wed Feb 15 00:42:28 2012.
+#
+# This file is execfile()d with the current directory set to its containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys, os
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#sys.path.insert(0, os.path.abspath('.'))
+
+# -- General configuration -----------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be extensions
+# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+extensions = []
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix of source filenames.
+source_suffix = '.rst'
+
+# The encoding of source files.
+#source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'Chimère'
+copyright = u'2012, Étienne Loks'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '2.0'
+# The full version, including alpha/beta/rc tags.
+release = '2.0'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+language = 'fr'
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = ['build']
+
+# The reST default role (used for this markup: `text`) to use for all documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+
+# -- Options for HTML output ---------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages. See the documentation for
+# a list of builtin themes.
+html_theme = 'default'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further. For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = []
+
+# The name for this set of Sphinx documents. If None, it defaults to
+# "<project> v<release> documentation".
+html_title = u"Documentation de Chimère"
+
+# A shorter title for the navigation bar. Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['static']
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_domain_indices = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it. The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = None
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'Chimeredoc'
+
+
+# -- Options for LaTeX output --------------------------------------------------
+
+# The paper size ('letter' or 'a4').
+#latex_paper_size = 'letter'
+
+# The font size ('10pt', '11pt' or '12pt').
+#latex_font_size = '10pt'
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title, author, documentclass [howto/manual]).
+latex_documents = [
+ ('index', 'Chimere.tex', u'Documentation de Chimère',
+ u'Étienne Loks', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# If true, show page references after internal links.
+#latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#latex_show_urls = False
+
+# Additional stuff for the LaTeX preamble.
+#latex_preamble = ''
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_domain_indices = True
+
+
+# -- Options for manual page output --------------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+ ('index', 'chimere', u'Chimère Documentation',
+ [u'Étienne Loks'], 1)
+]
diff --git a/docs/fr/configuration.rst b/docs/fr/configuration.rst
new file mode 100644
index 0000000..f419a0d
--- /dev/null
+++ b/docs/fr/configuration.rst
@@ -0,0 +1,202 @@
+.. -*- coding: utf-8 -*-
+
+=============
+Configuration
+=============
+
+:Auteur: Étienne Loks
+:date: 2012-11-29
+:Copyright: CC-BY 3.0
+
+Ce document présente l'installation de Chimère.
+Il a été mis à jour pour la version 2.0.0 de Chimère.
+
+Votre session doit être initialisée avec ces variables d'environnement
+en ligne de commande : ::
+
+ CHIMERE_PATH=/srv/chimere # changez avec votre répertoire d'installation
+ CHIMERE_LOCALNAME=mychimere # changez avec le nom de votre projet
+ CHIMERE_APP_PATH=$CHIMERE_PATH/$CHIMERE_LOCALNAME
+
+
+Une fois l'application installée, il y a un certain nombre d'étapes à suivre
+pour configurer *votre* Chimère.
+
+La plupart de ces étapes sont faites dans les pages web d'administration.
+
+Si vous n'êtes pas familiarisé avec les pages d'administration de *type
+Django* vous pouvez dès maintenant regarder le premier paragraphe de
+l':ref:`administration` où elles sont présentées.
+
+Pour accéder à ces pages vous avez à vous identifier avec un compte ayant
+pour état *équipe* ou *super-utilisateur*.
+
+Un compte *super-utilisateur* est créé à l'initialisation de la base de données.
+
+Configurer le framework Sites
+-----------------------------
+
+Le framework *Sites* vous permet de servir le contenu pour différents domaines
+Internet. La plupart des installations serviront le contenu pour un seul domaine
+mais ce domaine unique doit être configuré.
+
+Pour cela allez dans les pages web d'administration *Sites > Sites*.
+Vous avez juste à changer *example.com* par votre nom de domaine. Si vous
+oubliez de faire cela, quelques fonctionnalités comme les flux RSS ne
+fonctionneront pas correctement.
+
+.. _managing-areas:
+
+Gérer les zones
+---------------
+
+Une zone est la base de votre carte. Pour une zone il est défini :
+
+* un nom : un libellé pour cette zone ;
+* une URN associée (*facultatif*) : le nom de la zone en tant que ressource
+ Web. En pratique si la zone définie n'est pas celle par défaut, elle est
+ utilisée à la fin de l'adresse Web de base pour pouvoir accéder à cette zone.
+ Ce n'est pas obligatoire mais nécessaire en pratique pour chaque zone qui
+ n'est pas celle par défaut ;
+* un message par défaut (*facultatif*) : ce message est affiché une fois par
+ jour par utilisateur consultant la carte ;
+* un ordre (pour trier les zones) ;
+* une disponibilité ;
+* un état « *par défaut* ». La zone *par défaut* est vue par défaut. Une seul
+ zone peut être *par défaut* : activez cet état sur une zone le désactive sur
+ toutes les autres ;
+* des catégories cochées par défaut (*facultatif*) ;
+* si les catégories sont affichées dynamiquement. Si les catégories sont
+ affichées dynamiquement, l'utilisateur ne voit seulement que les catégories
+ qui ont des éléments sur la portion de carte actuellement à l'écran ;
+* des restrictions sur les catégories (*facultatif*): si aucune restriction
+ n'est définie, toutes les catégories sont disponibles ;
+* une feuille de style CSS externe (*facultatif*) : une adresse Web qui pointe
+ vers une feuille de style CSS externe ;
+* une restriction à la portion de carte : si coché, l'utilisateur ne pourra
+ pas faire glisser la carte en dehors de la portion de carte. À cause de
+ limitations de la bibliothèque OpenLayers utilisée par Chimère, il n'y a pas
+ de restriction sur le zoom ;
+* une portion de carte : c'est la zone qui sera affichée par défaut en arrivant
+ sur la carte. Si la restriction sur une portion de carte est activée, la
+ restriction portera sur cette portion. Laissez appuyée la touche *Control*,
+ cliquez et glissez pour dessiner la portion de carte choisie.
+* calques disponibles (*facultatif* : OSM Mapnik est utilisé par défaut): les
+ rendus OSM Mapnik, OSM MapQuest, OSM Transport Map, OSM CycleMap sont
+ disponibles par défaut. Vous pouvez ajouter de nouveaux calques (cf.
+ :ref:`managing-layers`).
+
+Les *Zones* sont personnalisables directement depuis l'interface
+d'administration dans *Chimere > Zones*.
+
+Comme il y a peu de chance que la zone définie par défaut vous convienne, il
+sera au minimum nécessaire de définir une zone par défaut.
+
+Ajouter plusieurs zones peut être un moyen d'afficher vos données de différentes
+manières.
+
+Gestion des utilisateurs
+------------------------
+
+Si vous n'êtes pas le seul administrateur/modérateur de cette installation de
+Chimère vous aurez à créer et gérer des comptes pour les autres utilisateurs.
+
+Vous pouvez créer un nouvel administrateur en ligne de commande : ::
+
+ ./manage.py createsuperuser
+
+Les mots de passe peuvent être changés en ligne de commande (utile si vous
+avez oublié votre mot de passe) : ::
+
+ ./manage.py changepassword username
+
+Les *Utilisateurs* sont directement éditables depuis les pages d'administration
+au niveau de la section *Auth/Utilisateur*.
+
+Pour créer un nouveau compte, cliquez simplement sur le bouton *Ajouter* à côté
+de *Utilisateur*. Donnez un nom et un mot de passe (l'utilisateur pourra changer
+son mot de passe plus tard).
+
+Ensuite complétez les autres informations.
+
+Cochez la case : *Statut équipe* (ou cet utilisateur ne sera pas capable
+d'accéder aux pages d'administration).
+
+Si ce compte est un nouvel administrateur technique, cochez la case *Statut
+superutilisateur* (cet utilisateur doit être digne de confiance !). Sinon
+vous allez devoir donner des permissions à ce nouvel utilisateur. Plutôt que
+d'assigner manuellement des permissions aux utilisateurs, il est plus simple
+de leur affecter un groupe avec des permissions pré-définies.
+
+Deux types de groupe sont proposés par défaut : les administrateurs de
+l'application et les modérateurs.
+
+Les groupes de modérateurs ont des droits limités à une seule zone (le nom
+du groupe est *Nom_de_zone modération*). Ils ne voient que les éléments
+qui concernent leur zone. Un utilisateur pouvant faire partie de plusieurs
+groupes, il peut modérer plusieurs zones.
+
+
+Détails des droits pour les groupes par défaut :
+
++------------------------------------------+--------------------------+---------------------------------+------------+
+| Élément (ajout/modification/suppression) | Administrateur technique | Administrateur de l'application | Modérateur |
++==========================================+==========================+=================================+============+
+| Utilisateur | Oui | Non | Non |
++------------------------------------------+--------------------------+---------------------------------+------------+
+| Groupe | Oui | Non | Non |
++------------------------------------------+--------------------------+---------------------------------+------------+
+| Modèle de propriété | Oui | Non | Non |
++------------------------------------------+--------------------------+---------------------------------+------------+
+| Import | Oui | Non | Non |
++------------------------------------------+--------------------------+---------------------------------+------------+
+| Calque | Oui | Non | Non |
++------------------------------------------+--------------------------+---------------------------------+------------+
+| Nouvelles | Oui | Oui | Non |
++------------------------------------------+--------------------------+---------------------------------+------------+
+| Zone | Oui | Oui | Non |
++------------------------------------------+--------------------------+---------------------------------+------------+
+| Icône | Oui | Oui | Non |
++------------------------------------------+--------------------------+---------------------------------+------------+
+| Couleurs/thème de couleur | Oui | Oui | Non |
++------------------------------------------+--------------------------+---------------------------------+------------+
+| Catégorie/Sous-catégorie | Oui | Oui | Non |
++------------------------------------------+--------------------------+---------------------------------+------------+
+| Point d'intérêt | Oui | Oui | Oui |
++------------------------------------------+--------------------------+---------------------------------+------------+
+| Trajet | Oui | Oui | Oui |
++------------------------------------------+--------------------------+---------------------------------+------------+
+
+
+Créer des modèles de propriété
+------------------------------
+
+Une installation de base de Chimère permet d'associer un nom, des catégories,
+une description, des dates, des fichiers multimédias, des fichiers d'image
+à chaque élément géographique.
+
+Vous souhaitez peut-être des champs personnalisés tels que des numéros de
+téléphone ou des horaires d'ouverture. Pour cela, il suffit d'ajouter un nouveau
+modèle de propriété (*Chimere/Modèle de propriété*).
+
+La page d'administration vous demande :
+
+* un nom ;
+* un ordre (pour ordonner les propriétés entre elles) ;
+* une disponibilité pour l'utilisateur (cela peut être utilisé pour associer
+ des propriétés cachées) ;
+* un état « Obligatoire » qui oblige à remplir ce champ dans les formulaires ;
+* les catégories auxquelles associer cette propriété (si aucune catégorie n'est
+ sélectionnée, la propriété est disponible pour toutes les categories) ;
+* le type : texte, texte long, mot de passe ou date.
+
+.. Warning::
+ Pour rendre cette propriété disponible, il est nécessaire de recharger le
+ serveur Web (les propriétés sont mis en cache).
+
+Les formulaires sont alors automatiquement mis à jour avec ce nouveau champ.
+
+En tant qu'administrateur, si vous ne souhaitez pas rendre disponible l'ajout
+ou la modification des propriétés, vous pouvez désactiver la gestion des modèles
+de propriété en mettant *CHIMERE_HIDE_PROPERTYMODEL* à la valeur *True* dans
+votre fichier *local_settings.py*.
diff --git a/docs/fr/customisation.rst b/docs/fr/customisation.rst
new file mode 100644
index 0000000..016f9e4
--- /dev/null
+++ b/docs/fr/customisation.rst
@@ -0,0 +1,58 @@
+.. -*- coding: utf-8 -*-
+
+================
+Personnalisation
+================
+
+:Auteur: Étienne Loks
+:date: 2012-11-29
+:Copyright: CC-BY 3.0
+
+Ce document présente la personnalisation de Chimère.
+Ce document a été mis à jour pour la version 2.0.0 de Chimère.
+
+.. _managing-layers:
+
+Gestion des calques
+-------------------
+
+Il y a différents calques disponibles par défaut dans Chimère (OSM Mapnik, OSM
+Mapquest, OSM Transport map, OSM Cyclemap). Vous pouvez ajouter d'autres calques
+en utilisant les pages d'administration de Chimère.
+
+Le nouveau calque est défini en utilisant une chaîne de code Javascript adéquate
+de la bibliothèque `Openlayers <http://openlayers.org/>`_. Ce code Javascript
+doit être une instance de *Openlayers Layer*, sans point virgule final.
+
+Par exemple définir un calque Bing peut être fait avec un code de ce type : ::
+
+ new OpenLayers.Layer.Bing({
+ name: "Aerial",
+ key: "my-bing-API-key",
+ type: "Aerial"})
+
+
+Référez vous à la `documentation de l'API Openlayers
+<http://dev.openlayers.org/releases/OpenLayers-2.12/doc/apidocs/files/OpenLayers-js.html>`_
+pour plus de détail.
+
+
+Personnaliser l'agencement et le design
+---------------------------------------
+
+Si vous souhaitez simplement améliorer la feuille de style CSS, le plus simple
+est d'ajouter un lien vers une feuille de style supplémentaire dans vos *Zones*
+(cf. :ref:`managing-areas`).
+
+Si vous souhaitez faire des changements plus importants dans l'agencement et la
+présentation, le projet *example_project* peut être personnalisé pour
+correspondre à vos besoins. Chaque fichier de patron de page présent dans le
+dossier *chimere/templates* peut être copié dans votre dossier
+*monprojet/templates* puis modifié.
+
+Il est juste nécessaire de copier les fichiers que vous souhaitez modifier.
+Ces fichiers sont écrits dans le langage de patron Django principalement composé
+de HTML avec des éléments de logique. Référez vous à la `documentation des
+patrons Django <https://docs.djangoproject.com/en/1.4/ref/templates/>`_ pour
+plus de détails.
+
diff --git a/docs/fr/import_export.rst b/docs/fr/import_export.rst
new file mode 100644
index 0000000..beca4e7
--- /dev/null
+++ b/docs/fr/import_export.rst
@@ -0,0 +1,268 @@
+.. -*- coding: utf-8 -*-
+
+=============
+Import/export
+=============
+
+:Author: Étienne Loks
+:date: 2012-11-28
+:Copyright: CC-BY 3.0
+
+Ce document présente les fonctions d'import et d'export de Chimère.
+Ce document a été mis à jour pour la version 2.0.0 de Chimère.
+
+.. _importing:
+
+Import
+------
+
+Dans Chimère, le mécanisme d'import est basé sur les objets **Import**. Ces
+objets sont stockés dans une base de données pour garder trace des imports et
+pour faciliter la ré-importation depuis une même source. En fait, si cela est
+possible, la mise à jour de données depuis un même type de source est gérée, de
+préférence à une ré-importation.
+
+.. Note::
+ La possibilité de réaliser de telles mises à jour est conditionnée à
+ l'existence d'un identifiant unique pour chaque objet de la source.
+
+Pour ajouter un objet **Import**, vous devez aller dans *Chimere > Imports* puis
+cliquer sur **Ajouter**.
+
+Après cela, vous aurez à sélectionner votre type de source. Le formulaire
+suivant dépend de ce type de source.
+
+Champs communs à tous les types de source
+*****************************************
+
+- **Nom par défaut** : si aucun nom ne peut être trouvé dans la source pour ce
+ nouvel objet le nom par défaut sera utilisé. Si ce champ est vide le nom de
+ la catégorie associée sera utilisée.
+- **SRID** : Chimère tente d'identifier automatiquement le système de coordonnées
+ utilisé par la source. Mais parfois l'information n'est pas présente ou ne
+ peut pas être devinée (par exemple un fichier Shapefile qui utilise un fichier
+ proj non standard). Dans ce cas, Chimère utilise WGS84 par défaut (latitude et
+ longitude). Si vous avez des problèmes avec la localisation des éléments vous
+ devez probablement mettre ici le `SRID <https://en.wikipedia.org/wiki/SRID>`_
+ correspondant au système de coordonnées de votre source.
+- **Écraser les données existantes** : par défaut quand les données ont été
+ mises à jour à la fois sur la source externe et sur votre source externe un
+ nouvel élément est créé et a à être rapproché avec le :ref:`formulaire de
+ gestion des modifications <managing-modified>`. Si vous ne souhaitez pas avoir
+ à faire ce rapprochement et alors écraser les données existantes avec les
+ données de la source externe, cochez cette option.
+- **Origine** : si non nul, ce champ va être associé à chaque élément importé
+ afin d'identifier facilement d'où l'élément provient. Pour les imports OSM
+ la source est ajoutée automatiquement.
+- **Licence** : si non nul, ce champ va être associé à chaque élément importé
+ afin d'identifier facilement la licence de l'élément. Pour les imports OSM
+ la licence est ajoutée automatiquement.
+- **Sous-catégories (obligatoire)** : les sous-catégories sélectionnées seront
+ associées automatiquement aux nouveaux éléments importés.
+
+
+Import KML
+**********
+
+.. image:: static/chimere_admin_import_KML.png
+
+
+- **Adresse Web / fichier source (obligatoire)** : votre fichier KML peut être
+ local ou distant. Vous avez à remplir un des deux champs.
+- **Filtre**: si vous souhaitez importer seulement un dossier (**Folder**) du
+ fichier KML mettez son nom dans ce champ.
+- **Fichier zippé**: si votre source est un fichier KMLZ (un fichier KML zippé),
+ cochez cette case.
+
+Import Shapefile
+****************
+
+.. image:: static/chimere_admin_import_shapefile.png
+
+
+- **Adresse Web / fichier source (obligatoire)** : votre fichier shapefile peut
+ être local ou distant. Vous avez à remplir un des deux champs.
+- **Fichier zippé**: seuls les fichiers shapefile zippés sont acceptés aussi
+ cette case devrait être cochée.
+
+Import GeoRSS
+*************
+
+Simple GeoRSS et W3C GeoRSS sont gérés.
+
+.. image:: static/chimere_admin_import_georss.png
+
+- **Adresse Web (obligatoire)**: seul les flux GeoRSS distant sont gérés.
+
+Import CSV
+**********
+
+Le format du fichier CSV (nombre et ordres des colonnes) géré par Chimère
+varie en fonction des modèles de propriété que vous avez utilisé sur votre
+instance Chimère.
+Aussi, il est recommandé dans un premier temps de faire un export CSV de
+quelques éléments.
+Le format du fichier CSV exporté sera compatible avec Chimère pour l'import.
+
+
+En tout cas à cause des champs géographiques ce format n'est pas très
+pratique pour l'ajout de nouveau contenu mais peut s'avérer utile pour les
+mises à jour d'information.
+
+.. Warning::
+ Si vous souhaitez mettre à jour des données existantes avec cet import, à
+ moins que vous sachiez éditer du WKT ne modifiez **pas** la colonne qui
+ concerne la géométrie de l'élément.
+
+.. image:: static/chimere_admin_import_CSV.png
+
+- **Adresse Web/fichier source (obligatoire)** : votre fichier CSV peut être
+ distant ou local. Vous avez à remplir un des deux champs.
+
+.. _osm-import:
+
+Import OpenStreetMap
+********************
+
+.. image:: static/chimere_admin_import_OSM.png
+
+Pour importer depuis OSM, Chimère utilise l'API XAPI d'OSM.
+
+- **Adresse Web (obligatoire)**: l'URL XAPI à utiliser pour importer. Ce champ
+ doit être rempli par défaut. Par défaut le serveur MapQuest est utilisé car
+ il semble le plus robuste. Si vous avez des problèmes avec l'import de données
+ OSM, vérifiez la disponibilité du serveur utilisé et le cas échéant changez
+ le.
+- **Filtre sur zone (obligatoire)**: dessinez la section de carte à utiliser
+ pour votre import OSM.
+- **Filtre sur types (obligatoire)**: choisissez si vous souhaitez importer des
+ routes ou des nœuds.
+- **Filtre sur les clé/valeur (obligatoire)**: choisissez la paire clé/valeur
+ à utiliser pour filtrer les données OSM. Un lien vers la `page de « Map
+ features » OSM <https://wiki.openstreetmap.org/wiki/Map_Features>`_ est
+ fourni pour vous aider à trouver les valeurs adaptées.
+- **Bouton de rafraîchissement**: ce bouton convertit vos choix en arguments
+ XAPI adaptés. N'oubliez pas de presser sur ce bouton avant de valider le
+ formulaire.
+
+Importer
+********
+
+Une fois que le nouvel objet *Import* est créé, sélectionnez le dans la liste
+des objets, choisissez *Importer* et valider.
+
+L'import doit se dérouler normalement. Dans le cas contraire, un message
+d'erreur explicite doit s'afficher dans la colonne *État* de votre import.
+
+Vous pouvez aussi lancer vos imports en ligne de commande (idéal pour les
+travaux à mettre dans la table *cron*). Dans le répertoire du projet, il est
+juste nécessaire de lancer la commande ::
+
+ ./manage.py chimere_import <import_id>
+
+- *import_id* est l'identifiant de l'import
+
+Si vous lancez l'import en ligne de commande sans l'identifiant d'import, la
+liste des imports disponibles est affichée et vous pouvez alors en choisir un.
+
+.. _manage-imported-data:
+
+Gérer les données importées
+***************************
+
+Tous les nouveaux éléments importés ont l'état **Importé**. Pour que ceux-ci
+soient disponible sur la carte, il est nécessaire de les valider. Si vous
+ne souhaitez pas afficher certains éléments plutôt que de les supprimer, il est
+recommandé de les mettre à l'état **Désactivé**. Ainsi lors de la prochaine
+mise à jour depuis la source, ceux-ci resteront désactivés plutôt que
+d'apparaître comme nouveaux éléments.
+
+.. Warning::
+ Soyez vigilants avec les doublons entre les données existantes et les données
+ importées. C'est particulièrement important si vous souhaitez exporter vos
+ données vers OSM.
+
+Export
+------
+
+Exporter vers CSV/KML/Shapefile
+*******************************
+
+Depuis les :ref:`listes d'éléments géographiques <geographic-items-management>`
+vous pouvez exporter directement vers le format choisi.
+Tout ce que vous avez à faire c'est de sélectionner les éléments que vous
+souhaitez exporter, choisir l'action appropriée dans la liste d'action et de
+valider.
+
+Vous pouvez aussi lancer les exports depuis la ligne de commande (idéal pour les
+travaux à mettre dans la table *cron*). Dans le répertoire du projet, vous avez
+juste à lancer ::
+
+ ./manage.py chimere_export <subcategory_id> <CSV|KML|SHP> \
+ <marker|route> <filename>
+
+- *subcategory_id* est l'identifiant de la sous-categorie choisie ;
+- *CSV|KML|SHP* est le format choisi ;
+- *marker|route* est pour obtenir points d'intérêts (marker) ou trajets
+ (route) ;
+- *filename* est le nom du fichier de sortie
+
+Si vous lancez la commande sans arguments il vous sera demandé les choix à faire
+pour votre export.
+
+
+Exporter vers OSM
+*****************
+
+.. Warning::
+ Si vous n'êtes pas sûr de ce que vous êtes entrain de faire avec les exports
+ vers OSM : **ne le faites pas !** C'est vraiment important de ne pas
+ plaisanter avec les données des autres.
+
+.. Note::
+ Seuls les exports des nœuds OSM sont gérés.
+
+Les exports ne sont pas aussi facile à gérer que les autres exports. Tout
+d'abord (si cela n'est pas déjà fait) vous avez à définir un import OSM
+(:ref:`regarder dessus <osm-import>` pour plus de détail). Cela permettra de
+déterminer :
+
+- la zone géographique concernée par votre export ;
+- la clé/valeur à ajouter à vos éléments (nouveaux ou mis à jour) ;
+- les sous-catégories concernées par cet export. Si vous pensez que certains
+ éléments dans ces sous-catégories ne devraient pas être dans la base de
+ données OSM (car ils ne sont pas pertinents ou à cause de question de licence)
+ marquez les préalablement comme **À ne pas exporter vers OSM** dans les
+ *champs d'imports* des :ref:`formulaires concernant les éléments géographiques
+ <geographic-items-management>`.
+
+
+L'export vers OSM dans Chimère est fait de sorte à être le plus
+conservateur possible par rapport à la base de données OSM. C'est pour cela
+qu'avant tout export, un import est fait. Si le nouvel import a des données
+mises à jour, il est nécessaire de retraiter les nouvelles données importées
+avant de faire un export (cf. :ref:`gérer les données importées
+<manage-imported-data>`).
+
+Pour lancer un export sélectionnez l'objet *Import* approprié dans la liste
+des imports. Ensuite sélectionnez l'action **Exporter vers OSM** et validez.
+Puis on vous demande votre identifiant OSM, votre mot de passe OSM et l'API
+que vous souhaitez utiliser. Si vous comptez faire des exports régulièrement
+avec Chimère, il est recommandé de créer un compte spécifique pour cela.
+L'API de test est disponible pour faire des tests d'export. Si vous souhaitez
+utiliser l'API de test, vous aurez à créer un compte spécifique sur la
+plateforme de test.
+
+.. Warning::
+ Les données sur la plateforme de test ne sont pas synchronisées avec la
+ plateforme principale. Vous n'aurez pas les mêmes données que celles celles
+ importées avec XAPI.
+
+Une fois que tous ces champs sont remplis, vous pouvez (enfin !) lancer
+l'export.
+
+Quand vous exportez, des couples clés/valeurs sont automatiquement ajoutés/mis à
+jour dans la base de données OSM :
+
+- *name*: obtenu depuis le nom de l'élément dans Chimère ;
+- *source*: pour identifier Chimère comme une source.
diff --git a/docs/_build/html/_sources/index.txt b/docs/fr/index.rst
index 45f40e0..dd9b1e7 100644
--- a/docs/_build/html/_sources/index.txt
+++ b/docs/fr/index.rst
@@ -3,8 +3,8 @@
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
-Welcome to Chimère's documentation!
-===================================
+Bienvenue dans la documentation de Chimère !
+============================================
.. toctree::
:maxdepth: 2
@@ -12,6 +12,6 @@ Welcome to Chimère's documentation!
install
upgrade
configuration
- customisation
administration
import_export
+ customisation
diff --git a/docs/fr/install.rst b/docs/fr/install.rst
new file mode 100644
index 0000000..841eae2
--- /dev/null
+++ b/docs/fr/install.rst
@@ -0,0 +1,299 @@
+.. -*- coding: utf-8 -*-
+
+============
+Installation
+============
+
+:Auteur: Étienne Loks
+:date: 2012-11-28
+:Copyright: CC-BY 3.0
+
+Ce document présente l'installation de Chimère.
+Il a été mis à jour pour la version 2.0.0 de Chimère.
+
+Pré-requis
+**********
+
+ - `Apache <http://www.apache.org/>`_ version 2.x
+ - `Python <http://www.python.org/>`_ versions 2.6 ou 2.7
+ - `Django <http://www.djangoproject.com/>`_ >= version 1.4
+ - `South <http://south.aeracode.org/>`_
+ - `Postgres <http://www.postgresql.org/>`_ >= version 8.x
+ - `Gettext <http://www.gnu.org/software/gettext/>`_
+ - `Psycopg2 <http://freshmeat.net/projects/psycopg/>`_
+ - `Python Imaging Library <http://www.pythonware.com/products/pil/>`_
+ - `Pyexiv2 <http://tilloy.net/dev/pyexiv2/>`_
+ - `Beautiful Soup <http://www.crummy.com/software/BeautifulSoup/>`_
+ - python-simplejson
+ - python-gdal
+ - `Lxml <http://lxml.de/>`_
+ - `Jquery <http://jquery.com/>`_ version 1.7.1 or better
+ - `Jquery-ui <http://jqueryui.com/>`_
+ - `Universal Feed Parser <https://code.google.com/p/feedparser/>`_
+
+geodjango fait partie de Django depuis la version 1.0 mais nécessite quelques
+dépendances supplémentaires :
+
+ - `geos <http://trac.osgeo.org/geos/>`_ 3.0.x
+ - `proj.4 <http://trac.osgeo.org/proj/>`_ 4.4 to 4.6
+ - `posgis <http://postgis.refractions.net/>`_ versions 1.2.1 ou 1.3.x
+ - `gdal <http://www.gdal.org/>`_
+
+
+Optionnel (mais recommandé) :
+
+ - `tinymce <http://tinymce.moxiecode.com/>`_
+ - `gpsbabel <http://www.gpsbabel.org/>`_
+ - django-celery pour une meilleure gestion des imports importants
+
+La manière la plus simple de satisfaire à ces pré-prequis est de les installer
+par le biais des dépôts de votre distribution Linux préférée. Par exemple
+pour Debian Wheezy : ::
+
+ apt-get install apache2 python python-django python-django-south \
+ postgresql-9.1 gettext python-psycopg2 python-imaging \
+ python-pyexiv2 python-beautifulsoup python-simplejson python-gdal \
+ python-lxml libjs-jquery libjs-jquery-ui python-feedparser \
+ libgeos-3.3.3 proj-bin postgresql-9.1-postgis gdal-bin \
+ tinymce gpsbabel python-django-celery javascript-common
+
+Pour Debian Squeeze (il est nécessaire d'activer les backports) : ::
+
+ apt-get install -t squeeze-backports python-django libjs-jquery
+
+ apt-get install apache2 python python-django python-django-south \
+ postgresql-8.4 gettext python-psycopg2 python-imaging \
+ python-pyexiv2 python-beautifulsoup python-simplejson python-gdal \
+ python-lxml libjs-jquery libjs-jquery-ui python-feedparser \
+ libgeos-3.2.0 proj-bin postgresql-8.4-postgis gdal-bin \
+ tinymce gpsbabel javascript-common
+
+Le paquet *python-django-celery* n'existe pas pour Debian Squeeze.
+
+Si ces paquets n'ont pas d'équivalents dans les dépôts de votre distribution
+Linux, référez-vous aux sites web de ces applications.
+
+Configuration de la base de données
+***********************************
+
+Maintenant que postgres et postgis sont installés, vous avez besoin de créer
+un nouvel utilisateur pour Chimère : ::
+
+ su postgres
+ createuser --echo --adduser --createdb --encrypted --pwprompt chimere-user
+
+Ensuite, vous avez besoin de créer la base de données et d'initialiser les types
+géographiques (adaptez les chemins par rapport à vos besoins) : ::
+
+ PG_VERSION=9.1 # 8.4 pour debian Squeeze
+ createdb --echo --owner chimere-user --encoding UNICODE chimere "Ma base de données Chimère"
+ createlang plpgsql chimere # seulement nécessaire sous Debian Squeeze
+ psql -d chimere -f /usr/share/postgresql/$PG_VERSION/contrib/postgis-1.5/postgis.sql
+ psql -d chimere -f /usr/share/postgresql/$PG_VERSION/contrib/postgis-1.5/spatial_ref_sys.sql
+
+Installer les sources
+*********************
+
+Choisissez un chemin où installer Chimère ::
+
+ INSTALL_PATH=/var/local/django
+ mkdir $INSTALL_PATH
+
+Depuis une archive
+++++++++++++++++++
+
+La dernière version « stable » est disponible dans ce `répertoire
+<http://www.peacefrogs.net/download/chimere/>`_.
+Prenez garde à prendre la dernière version de la branche souhaitée
+(par exemple la dernière version de la branche 1.0 est la version 1.0.2). ::
+
+ wget http://www.peacefrogs.net/download/chimere -q -O -| html2text
+ (...)
+ [[ ]] chimere-1.0.0.tar.bz2 17-Nov-2010 16:51 53K
+ [[ ]] chimere-1.0.1.tar.bz2 17-Nov-2010 16:51 53K
+ [[ ]] chimere-1.0.2.tar.bz2 17-Nov-2010 16:51 53K
+ (...)
+
+ wget http://www.peacefrogs.net/download/chimere/chimere-1.0.2.tar.bz2
+
+Téléchargez, décompressez et déplacez les fichiers dans un répertoire lisible
+par l'utilisateur de votre serveur web (www-data pour Debian). ::
+
+ cd $INSTALL_PATH
+ tar xvjf chimere-last.tar.bz2
+ chown -R myusername:www-data chimere
+
+Depuis le dépôt Git
++++++++++++++++++++
+
+Une autre solution est d'obtenir les sources depuis le dépôt Git : ::
+
+ cd $INSTALL_PATH
+ git clone git://www.peacefrogs.net/git/chimere
+ cd chimere
+ git tag -l # lister les versions
+ git checkout v2.0 # choisir la version désirée
+
+
+Créez un patron pour votre projet
+*********************************
+
+Il y a un exemple de projet fourni (*example_project*). Copiez-le et
+modifiez-le (ou utilisez un autre projet basé sur Chimère) : ::
+
+ cd $INSTALL_PATH/chimere
+ cp -ra example_project mychimere_project
+
+Le nom de votre projet est utilisé pour le nom de la bibliothèque Python
+correspondant à votre projet.
+En tant que bibliothèque Python, ce nom doit suivre les règles de nommage des
+noms de variable Python : il doit comporter au moins une lettre et peut
+comporter autant de nombres et de lettres que souhaité, le caractère tiret bas
+(« _ ») est accepté. N'utilisez pas de caractères accentués. Ne commencez pas
+par « _ » car cela a une signification particulière en Python.
+
+Dans le répertoire de votre application Chimère créez un fichier
+*local_settings.py* qui correspond à votre configuration.
+Un fichier de base est fourni (*local_settings.py.example*) et des descriptions
+courtes des variables les plus pertinentes sont données sous celui-ci
+(survolez-les au minimum). La plupart de ces paramétrages sont initialisés dans
+le fichier *settings.py*. ::
+
+ cd $INSTALL_PATH/chimere/mychimere_project
+ cp local_settings.py.sample local_settings.py
+ vim local_settings.py
+
+:Champs:
+
+ * DATABASES : paramètres relatifs à la base de données
+ * PROJECT_NAME : nom du projet
+ * SECRET_KEY : une clé secrète pour l'installation de votre application
+ Django. Cette clé est utilisée pour les signatures cryptographiques de
+ l'application et doit être initialisée à une valeur unique et non
+ devinable. **Modifiez-là !**
+ * ROOT_URLCONF : module Python de configuration des urls pour votre projet.
+ Cela devrait être quelque chose comme : 'mychimere_project.urls'
+ * EMAIL_HOST : SMTP du serveur de courriel pour envoyer des courriels
+ * TINYMCE_URL : url du chemin vers tinymce (le chemin par défaut est adapté
+ pour une installation sous Debian avec le paquet tinymce installé)
+ * JQUERY_JS_URLS : liste des adresses des fichiers javascript jquery et
+ jquery-ui (les valeurs par défaut sont appropriées pour une installation
+ sous Debian avec les paquets libjs-jquery et libjs-jquery-ui installés)
+ * JQUERY_CSS_URLS : liste des adresses des fichiers CSS jquery et
+ jquery-ui (les valeurs par défaut sont appropriées pour une installation
+ sous Debian avec les paquets libjs-jquery et libjs-jquery-ui installés)
+ * GPSBABEL : chemin de gpsbabel (la valeur par défaut est appropriée pour
+ une installation sous Debian avec le paquet gpsbabel installé)
+ * TIME_ZONE : fuseau horaire local de cette installation
+ * LANGUAGE_CODE : code de langage pour cette installation
+
+Gérez les permissions du dossier de média : ::
+
+ cd $INSTALL_PATH/chimere/mychimere_project
+ chown -R user:www-data media
+ chmod -R g+w media
+
+Créez le fichier de log : ::
+
+ mkdir /var/log/django
+ touch /var/log/django/chimere.log
+ chown -R root:www-data /var/log/django/
+ chmod -R g+w /var/log/django/
+
+Regroupez les fichiers static dans un seul répertoire : ::
+
+ cd $INSTALL_PATH/chimere/mychimere_project
+ ./manage.py collectstatic
+
+Compilation des langages
+************************
+
+Si votre langage est disponible dans le dossier *chimere/locale/*, il est juste
+nécessaire de le compiler.
+Pour faire cela, il faut lancer la commande suivante (ici, **fr** est pour le
+français, remplacez cela avec le code de langage approprié) : ::
+
+ cd $INSTALL_PATH/chimere/chimere/
+ django-admin compilemessages -l fr
+
+Si votre langage n'est pas disponible, n'hésitez pas à créer le fichier **po**
+par défaut et à le proposer (les contributions sont bienvenues).
+La procédure est explicité ci-dessous.
+
+Il est d'abord nécessaire de créer le fichier po par défaut (bien sûr remplacez
+**fr** par le code du langage que vous souhaitez créer) : ::
+
+ django-admin makemessages -l fr
+
+Il doit y avoir maintenant un fichier *django.po* dans le répertoire
+*locale/fr/LC_MESSAGES*. Ensuite il faut le compléter avec votre
+traduction.
+
+Une fois le votre fichier de traduction complété, il suffit de le
+compiler de la même manière que vous l'auriez fait si ce fichier était
+initialement disponible.
+
+Initialisation de la base de données
+************************************
+
+Créez les tables de la base de données (toujours dans le répertoire de votre
+projet) : ::
+
+ cd $INSTALL_PATH/chimere/mychimere_project
+ ./manage.py syncdb
+
+
+Vous aurez à rentrer les informations pour la création du compte administrateur
+(les pages d'administration se trouvent à l'adresse :
+http://where_is_chimere/admin/). Ensuite pour créer les tables de la base de
+données gérées par Django-South : ::
+
+ ./manage.py migrate
+
+La base de données est en place, félicitations !
+
+Si vous voulez remplir votre installation avec des données par défaut (ne le
+faites pas sur une instance de Chimère contenant déjà des données !) : ::
+
+ ./manage.py loaddata ../chimere/fixtures/default_data.json
+
+Configuration du serveur web
+****************************
+
+Configuration d'Apache avec mod_wsgi
+++++++++++++++++++++++++++++++++++++
+
+Installez *mod_wsgi* pour Apache : ::
+
+ apt-get install libapache2-mod-wsgi
+
+
+Créez et éditez la configuration de Chimère en fonction de votre installation ::
+
+ cp $INSTALL_PATH/chimere/apache/django.wsgi \
+ $INSTALL_PATH/chimere/apache/mydjango.wsgi
+ vim $INSTALL_PATH/chimere/apache/mydjango.wsgi
+ cp $INSTALL_PATH/chimere/apache/apache-wsgi.conf \
+ /etc/apache2/sites-available/chimere
+ vim /etc/apache2/sites-available/chimere
+ # créer le répertoire des logs
+ mkdir /var/log/apache2/chimere/
+ chown www-data /var/log/apache2/chimere/
+
+Adaptez les fichiers *mydjango.wsgi* (avec le chemin correct *sys* des
+bibliothèques Python de Chimère et le nom correct pour le module) et le fichier
+*chimere* de Apache (avec le nom de serveur correct et les chemins corrects).
+
+Pour activer le site web, rechargez Apache : ::
+
+ a2ensite chimere
+ /etc/init.d/apache2 reload
+
+Si vous avez des problèmes de dépôt de fichier avec des caractères Unicode dans
+leurs noms, activez la locale appropriée dans Apache. Sur un serveur Debian avec
+UTF-8 comme codage par défaut, dans le fichier */etc/apache2/envvars*
+décommentez la ligne suivante : ::
+
+ . /etc/default/locale
+
+
diff --git a/docs/fr/static/chimere_admin_00.png b/docs/fr/static/chimere_admin_00.png
new file mode 100644
index 0000000..e9f6bf7
--- /dev/null
+++ b/docs/fr/static/chimere_admin_00.png
Binary files differ
diff --git a/docs/fr/static/chimere_admin_01.png b/docs/fr/static/chimere_admin_01.png
new file mode 100644
index 0000000..f387677
--- /dev/null
+++ b/docs/fr/static/chimere_admin_01.png
Binary files differ
diff --git a/docs/fr/static/chimere_admin_02.png b/docs/fr/static/chimere_admin_02.png
new file mode 100644
index 0000000..b14878c
--- /dev/null
+++ b/docs/fr/static/chimere_admin_02.png
Binary files differ
diff --git a/docs/fr/static/chimere_admin_03.png b/docs/fr/static/chimere_admin_03.png
new file mode 100644
index 0000000..b8f6774
--- /dev/null
+++ b/docs/fr/static/chimere_admin_03.png
Binary files differ
diff --git a/docs/fr/static/chimere_admin_import_CSV.png b/docs/fr/static/chimere_admin_import_CSV.png
new file mode 100644
index 0000000..6783564
--- /dev/null
+++ b/docs/fr/static/chimere_admin_import_CSV.png
Binary files differ
diff --git a/docs/fr/static/chimere_admin_import_KML.png b/docs/fr/static/chimere_admin_import_KML.png
new file mode 100644
index 0000000..2c4e72b
--- /dev/null
+++ b/docs/fr/static/chimere_admin_import_KML.png
Binary files differ
diff --git a/docs/fr/static/chimere_admin_import_OSM.png b/docs/fr/static/chimere_admin_import_OSM.png
new file mode 100644
index 0000000..1fa75a6
--- /dev/null
+++ b/docs/fr/static/chimere_admin_import_OSM.png
Binary files differ
diff --git a/docs/fr/static/chimere_admin_import_georss.png b/docs/fr/static/chimere_admin_import_georss.png
new file mode 100644
index 0000000..6faf556
--- /dev/null
+++ b/docs/fr/static/chimere_admin_import_georss.png
Binary files differ
diff --git a/docs/fr/static/chimere_admin_import_shapefile.png b/docs/fr/static/chimere_admin_import_shapefile.png
new file mode 100644
index 0000000..74a92d9
--- /dev/null
+++ b/docs/fr/static/chimere_admin_import_shapefile.png
Binary files differ
diff --git a/docs/fr/static/chimere_admin_modified_management.png b/docs/fr/static/chimere_admin_modified_management.png
new file mode 100644
index 0000000..2281511
--- /dev/null
+++ b/docs/fr/static/chimere_admin_modified_management.png
Binary files differ
diff --git a/docs/fr/static/chimere_admin_modify_item.png b/docs/fr/static/chimere_admin_modify_item.png
new file mode 100644
index 0000000..e40ca11
--- /dev/null
+++ b/docs/fr/static/chimere_admin_modify_item.png
Binary files differ
diff --git a/docs/fr/upgrade.rst b/docs/fr/upgrade.rst
new file mode 100644
index 0000000..a092b4b
--- /dev/null
+++ b/docs/fr/upgrade.rst
@@ -0,0 +1,334 @@
+.. -*- coding: utf-8 -*-
+
+===========
+Mise à jour
+===========
+
+:Auteur: Étienne Loks
+:date: 2012-11-29
+:Copyright: CC-BY 3.0
+
+Ce document présente la mise à jour de Chimère.
+Il a été mis à jour pour la version 2.0.0 de Chimère.
+
+.. Warning::
+ Avant toute mise à jour faites une sauvegarde de la base de données et de
+ tous vos fichiers d'installation (en particulier si vous avez fait des
+ changements sur ceux-ci).
+
+La procédure de migration nécessite une connaissance de base de Git et de la
+ligne de commande Linux. Ce n'est *pas* une procédure facile. Un travail est en
+cours pour faciliter les mises à jour des futures versions de Chimère (>2.0).
+
+Si plusieurs versions de Chimère ont été publiées depuis votre installation,
+vous devez répéter toutes les étapes de mise à jour.
+Par exemple pour mettre à jour depuis la version 1.1 vers la version 2.0, vous
+devez d'abord mettre à jour vers la version 1.2 puis vers la version 2.0.
+La seule étape optionnelle est l'intégration de vos personnalisations.
+
+La version stable actuelle est la version 2.0.
+
+.. Note::
+ Si vous souhaitez améliorer Chimère prenez la branche *master* sur Git.
+
+Les instructions sont données pour Debian Squeeze et Debian Wheezy.
+
+
+Obtenir des nouvelles versions des dépendances
+----------------------------------------------
+
+Version 1.1 -> 1.2
+******************
+
+.. code-block:: bash
+
+ apt-get install python-lxml libjs-jquery gpsbabel python-gdal
+
+Version 1.2 -> 2.0
+******************
+
+Debian Squeeze
+++++++++++++++
+Activez les backports (http://backports-master.debian.org/Instructions/).
+Puis installez les nouvelles dépendances ::
+
+ apt-get install -t squeeze-backports python-django python-django-south \
+ python-simplejson libjs-jquery-ui python-pyexiv2 \
+ python-feedparser javascript-common libjs-jquery
+
+Debian Wheezy
++++++++++++++
+
+.. code-block:: bash
+
+ apt-get install python-django-south python-simplejson libjs-jquery-ui \
+ python-pyexiv2 python-feedparser javascript-common
+
+Si vous comptez réaliser des imports importants envisagez l'installation
+de `Celery <http://celeryproject.org/>`_.
+
+.. code-block:: bash
+
+ apt-get install python-django-celery python-kombu
+
+Obtenir les nouvelles sources
+-----------------------------
+
+Tout d'abord vous avez besoin de la nouvelle version du code source.
+Pour la procédure d'installation, le code source doit être celui du dépôt Git.
+
+Pour simplifier les instructions suivantes, quelques variables d'environnement
+sont initialisées.
+
+.. code-block:: bash
+
+ CHIMERE_PATH=/srv/chimere
+ CHIMERE_TAG=v1.2.0 # version 1.1 -> 1.2
+ CHIMERE_TAG=v2.0-RC3 # version 1.2 -> 2.0
+ CHIMERE_TAG=master # version 2.0 -> master
+ CHIMERE_LOCALNAME=mychimere
+
+Le nom de votre projet (*CHIMERE_LOCALNAME*) est utilisé pour le nom de la
+bibliothèque Python correspondant à votre projet ainsi que votre propre
+branche Git.
+En tant que bibliothèque Python, ce nom doit suivre les règles de nommage des
+noms de variable Python : il doit comporter au moins une lettre et peut
+comporter autant de nombres et de lettres que souhaité, le caractère tiret bas
+(« _ ») est accepté. N'utilisez pas de caractères accentués. Ne commencez pas
+par « _ » car cela a une signification particulière en Python.
+
+
+Pour une précédente installation Git
+************************************
+
+.. code-block:: bash
+
+ cd $CHIMERE_PATH
+ git checkout -b $CHIMERE_LOCALNAME # seulement si vous n'avez pas encore
+ # créé votre branche locale
+ git stash # si vous avez des changements pas encore « commités »
+ git checkout master
+ git pull
+ git checkout $CHIMERE_LOCALNAME
+ git rebase $CHIMERE_TAG
+
+Pour une précédente installation depuis une archive
+***************************************************
+
+Supprimez d'abord votre ancienne installation et obtenez la version Git :
+
+.. code-block:: bash
+
+ cd $CHIMERE_PATH
+ cd ..
+ rm -rf $CHIMERE_PATH
+ git clone git://www.peacefrogs.net/git/chimere
+ cd chimere
+ git checkout $CHIMERE_TAG
+ git checkout -b $CHIMERE_LOCALNAME
+
+
+Mettre à jour les paramètres de base
+************************************
+
+Version 1.1 -> 1.2
+++++++++++++++++++
+
+.. code-block:: bash
+
+ CHIMERE_APP_PATH=$CHIMERE_PATH/chimere
+ vim $CHIMERE_APP_PATH/settings.py
+
+Ajoutez les lignes suivantes (adaptez en fonction de vos installations
+jquery et gpsbabel) :
+
+.. code-block:: python
+
+ JQUERY_URL = SERVER_URL + 'jquery/jquery-1.4.4.min.js'
+ GPSBABEL = '/usr/bin/gpsbabel'
+ # simplification des trajets avec une tolérance de 5 mètres
+ GPSBABEL_OPTIONS = 'simplify,crosstrack,error=0.005k'
+
+Version 1.2 -> 2.0
+++++++++++++++++++
+
+Patron de projet
+................
+Créez un nouveau patron de projet :
+
+.. code-block:: bash
+
+ cd $CHIMERE_PATH
+ cp -ra $CHIMERE_PATH/example_project $CHIMERE_LOCALNAME
+ CHIMERE_APP_PATH=$CHIMERE_PATH/$CHIMERE_LOCALNAME
+
+local_settings
+..............
+Un fichier *local_settings* est maintenant utilisé.
+
+.. code-block:: bash
+
+ cd $CHIMERE_APP_PATH
+ cp local_settings.py.sample local_settings.py
+ vim local_settings.py
+
+Reportez vos anciens paramètres de *settings.py* vers *local_settings.py*
+(au minimum la configuration de votre base de données).
+Le paramètre *ROOT_URLCONF* doit être mis à la valeur
+« **nom_de_votre_projet.urls** ».
+
+logs
+....
+Par défaut, des fichiers de *log* sont maintenant écrit dans le fichier :
+« */var/log/django/chimere.log* ».
+
+.. code-block:: bash
+
+ mkdir /var/log/django
+ touch /var/log/django/chimere.log
+ chown www-data -R /var/log/django
+
+Fichiers statiques
+..................
+
+Les fichiers statiques sont maintenant gérés avec
+« **django.contrib.staticfiles** ».
+
+.. code-block:: bash
+
+ cd $CHIMERE_APP_PATH
+ ./manage.py collectstatic
+
+
+Déplacez vos anciens fichiers statiques vers le nouveau répertoire :
+
+.. code-block:: bash
+
+ cp -ra $CHIMERE_PATH/chimere/static/* $CHIMERE_APP_PATH/static/
+ cp -ra $CHIMERE_PATH/chimere/static/icons/* $CHIMERE_APP_PATH/media/icons/
+ cp -ra $CHIMERE_PATH/chimere/static/upload $CHIMERE_APP_PATH/media/
+
+Configuration du serveur Web
+............................
+
+Si vous utilisez Apache et WSGI pour mettre à disposition votre Chimère,
+changez la configuration pour pointer vers le chemin correct de
+configuration : « **nom_de_votre_projet.settings** ».
+
+Changez la directive de votre serveur web pour qu'elle pointe vers le bon
+répertoire statique de « **votre_chemin_vers_chimere/chimere/static** » en
+« **votre_chemin_vers_chimere/nom_de_votre_projet/static** ».
+
+Version 2.0 -> master
++++++++++++++++++++++
+
+Mettez à jour les paramètres et les fichiers statiques.
+
+.. code-block:: bash
+
+ cp $CHIMERE_PATH/example_project/settings.py $CHIMERE_LOCALNAME
+ ./manage.py collectstatic
+
+Migration de la base de données
+-------------------------------
+
+Version 1.1 -> 1.2
+******************
+
+Les scripts de migration testent votre installation avant de faire des
+changements. Vous n'aurez donc probablement pas de perte mais par précaution
+avant de les lancer n'oubliez pas de faire une sauvegarde de votre base de
+données.
+Vous pouvez aussi faire une copie de votre base de données actuelle dans une
+nouvelle base et faire la mise à jour sur cette nouvelle base de données.
+
+La bibliothèque GDAL pour Python est nécessaire pour faire fonctionner ces
+scripts (disponible avec le paquet *python-gdal* dans Debian).
+
+Si vous souhaitez lancer le script de migration dans un environnement de
+production, stoppez l'instance de Chimère avant d'exécuter le script de
+migration.
+
+Dans le fichier *settings.py* vérifiez que **chimere.scripts** fait partie
+des *INSTALLED_APPS*.
+
+Après cela, dans le répertoire d'installation de Chimère, exécutez simplement
+le script.
+
+.. code-block:: bash
+
+ cd $CHIMERE_APP_PATH
+ python ./scripts/upgrade.py
+
+Version 1.2 -> 2.0
+******************
+
+Django South est maintenant utilisé pour les migrations de base de données.
+
+.. code-block:: bash
+
+ cd $CHIMERE_APP_PATH
+ ./manage.py syncdb
+ ./manage.py migrate chimere 0001 --fake # simule l'initialisation de la base
+ # de données
+ ./manage.py migrate chimere
+
+Un champ descriptif est maintenant disponible pour les points d'intérêts. Si
+vous souhaitez migrer un ancien *modèle de propriété* vers ce nouveau champ,
+un script est disponible.
+
+.. code-block:: bash
+
+ cd $CHIMERE_APP_PATH
+ ../chimere/scripts/migrate_properties.py
+ # suivez les instructions
+
+Version 2.0 -> master
+*********************
+
+.. code-block:: bash
+
+ cd $CHIMERE_APP_PATH
+ ./manage.py syncdb
+ ./manage.py migrate chimere
+
+Mise à jour des traductions
+---------------------------
+
+Version 1.1 -> 1.2
+******************
+
+.. code-block:: bash
+
+ cd $CHIMERE_APP_PATH
+ ./manage.py compilemessages
+
+Version 1.2 -> 2.0 -> master
+****************************
+
+.. code-block:: bash
+
+ cd $CHIMERE_PATH/chimere
+ django-admin compilemessages
+
+Forcer le rafraîchissement du cache du navigateur des utilisateurs
+------------------------------------------------------------------
+
+Des changements importants au niveau des styles et du javascript sont faits
+entre les différentes versions. Cela peut provoquer des dysfonctionnements
+importants chez des utilisateurs dont le navigateur web a conservé les anciennes
+versions de certains fichiers en cache. Il y a plusieurs moyens de forcer le
+rafraîchissement de leur cache. Un de ceux-ci est de changer le chemin vers les
+fichiers statiques. Pour faire cela, éditez votre fichier *local_settings.py* et
+changez : ::
+
+ STATIC_URL = '/static/'
+
+en : ::
+
+ STATIC_URL = '/static/v2.0.0/'
+
+Changez la directive concernant les fichiers statiques sur le fichier de
+configuration de votre serveur web.
+Redémarrez alors le serveur web pour appliquer les changements.
+
diff --git a/docs/import_export.rst b/docs/import_export.rst
deleted file mode 100644
index 890a644..0000000
--- a/docs/import_export.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-.. -*- coding: utf-8 -*-
-
-=====================
-Chimère import/export
-=====================
-
-:Author: Étienne Loks
-:date: 2012-10-08
-:Copyright: CC-BY 3.0
-
-This documents presents the administration of Chimère.
-The version has been updated for version 2.0.0.
-
-
diff --git a/requirements.txt b/requirements.txt
index b7d71a1..f458f31 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,6 @@ pil
lxml
south==0.7.3
simplejson
-unidecode
feedparser
django-extensions
django-tinymce