To modify an item, classically you have to click on his name. Then you access to a form to freely modify the item. In this form there is 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. to the import section of this documentation. Associated items fields are read only -fields that list items associated to the current one (reference item of an -amendment, 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 @@ -258,7 +259,7 @@ reference item. title="previous chapter">Configuration

Next topic

This Page

Chimère customisation¶

Customisation¶

- + @@ -102,7 +102,7 @@ for more details.

Chimère customisation
- Customisation
  - Managing layers
  - Customizing the layout and the design
  @@ -111,7 +111,7 @@ for more details.
  
  Previous topic
  
  Chimère import/export
  + title="previous chapter">Import/export
  
  This Page
  - index
  - - previous |
  - Chimère 2.0 documentation »
  diff --git a/docs/_build/html/import_export.html b/docs/_build/html/import_export.html index 2772c8e..00b696c 100644 --- a/docs/_build/html/import_export.html +++ b/docs/_build/html/import_export.html @@ -8,7 +8,7 @@ - Chimère import/export — Chimère 2.0 documentation + Import/export — Chimère 2.0 documentation @@ -26,7 +26,7 @@ - + @@ -37,7 +37,7 @@ index
- - next |
- -
  -
  Chimère import/export ¶
  +
  +
  Import/export¶

Author:	Étienne Loks
date:	2012-10-08
date:	2012-11-28
Copyright:	CC-BY 3.0

- + @@ -69,6 +69,173 @@ The version has been updated for version 2.0.0.

Importing¶

In Chimère the import mechanism is based on Import object. Theses 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. 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 +the type of source.

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 projection +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 associated to the projection of +your source.
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¶

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¶

_images/chimere_admin_import_shapefile.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.
Zipped file: only zipped shapefile are accepted this checkbox have to be +checked.

GeoRSS import¶

Simple GeoRSS and W3C GeoRSS are managed.

Web address (mandatory): only distant GeoRSS are managed.

CSV import¶

As the format of the CSV file managed by Chimère could vary depending on the +property you have add on your Chimère instance 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.

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.

OpenStreetMap import¶

To import from OSM Chimère uses 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 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, select +the Import action and validated.

The import should be processing normally. If not an explicit error message +should be print in the state column of your import.

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 an item to be visible on +the map instead of delete them it is recommended to set them to the state +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 geographic items list you +can export to the choose format. All you have to do is to select the desired +items, choose the appropriate action in the action list and validate.

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 (see above for details). This will permit +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 +theses 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 geographic items forms.

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 theses new data will overload data in your +Chimère (if you don’t want that: don’t do export). All pending imported items +should have been treated before doing an export.

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 use regularly 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 are +not going to have the same data that 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.

@@ -80,8 +247,23 @@ The version has been updated for version 2.0.0.

Chimère import/export
- Importing
- Import/export
  - Importing
    - Common fields
    - KML import
    - Shapefile import
    - GeoRSS import
    - CSV import
    - OpenStreetMap import
    - Importing
    - Managing imported data
    +
  - Exporting
    - Export to CSV/KML/Shapefile
    - Export to OSM
    +
@@ -91,7 +273,7 @@ The version has been updated for version 2.0.0.
title="previous chapter">Administration

Next topic

Chimère customisation
+ title="next chapter">Customisation

This Page
- index
- - next |
- Managing end user amendment
Chimère import/export
- Import/export
  - Importing
  - Exporting
- Chimère customisation
  - Customisation
    - Managing layers
    - Customizing the layout and the design
    diff --git a/docs/_build/html/objects.inv b/docs/_build/html/objects.inv index d0161af..7538b6a 100644 Binary files a/docs/_build/html/objects.inv and b/docs/_build/html/objects.inv differ diff --git a/docs/_build/html/searchindex.js b/docs/_build/html/searchindex.js index e21926c..b2a8630 100644 --- a/docs/_build/html/searchindex.js +++ b/docs/_build/html/searchindex.js @@ -1 +1 @@ -Search.setIndex({objects:{},terms:{all:[1,3,6],code:[0,1,3,4],forget:[1,3],yellow:3,signific:[1,4],osm:[0,6,3],follow:[1,6,4],feedpars:[1,4],row:3,content:[6,3],hold:6,depend:[2,1,4],zone:4,readabl:[6,4],base_url:[],send:4,easiest:0,init:4,program:[],titl:3,text:6,sens:3,town:[],sourc:[2,1,3,4],string:[1,4],createsuperus:6,relev:[3,4],administr:[0,2,3,4,5,6],button:[6,3],list:[3,4],geograph:[6,3,4],item:[2,6,3],form:[6,3],quick:[],initialis:[2,1,6,4],dir:4,pleas:4,base_us:[],direct:1,sign:4,second:3,design:[0,2],download:4,further:1,myusernam:4,click:[6,3],blue:3,index:[],appear:3,compar:[],section:[6,3],multimedia:[6,3],abl:6,beautifulsoup:4,access:[6,3],delet:[6,3],version:[0,1,2,3,4,5,6],"new":[0,1,2,3,4,6],net:[1,4],chimer:[0,1,3,6,4],chose:[],createdb:4,french:4,"005k":1,witch:6,address:[],path:[6,3,4],modifi:[0,6,3,4],sinc:4,interpret:[],box:[6,3],search:3,larger:0,host:[],prior:[],permit:[6,3],action:3,template_context_processor:[],chang:[0,1,3,6,4],apart:[],chanc:6,environn:1,chimere_tag:1,repositori:[1,4],extra:[0,3],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:[0,6,3,4],more:[0,6,3,4],sort:[6,3],where_is_your_chimer:3,desir:4,mypassword:[],share:4,relat:4,server_url:1,customis:[0,1,2],phone:6,"export":[2,3,5],indic:[],particular:4,recommand:4,unpack:4,cach:[2,1,6],must:[0,1,6,4],psql:4,"static":[1,4],account:[6,3,4],word:3,hour:6,prepar:1,work:[1,3,6],uniqu:[6,4],soup:4,paragraph:[1,6],can:[0,1,3,6,4],lc_messag:4,default_categori:[],root:4,control:6,prompt:4,tar:4,give:6,process:[1,3],sudo:[],smtp:4,templat:[0,1,4,2],tarbal:1,tag:[3,4],want:[0,6,3,4],default_cent:[],spe:[],mapnik:[0,6],lxml:[1,4],end:[0,6,3,2],freshli:3,anoth:4,length:[1,4],write:[],pure:0,reject:3,verifi:1,simpl:[6,3],css:[0,6],email_host:4,map:[0,6,3],product:1,rebas:1,pypi:4,clone:[1,4],after:[1,3],superus:6,upload:[1,4],manuali:[],befor:[1,3],plane:1,beauti:4,date:[0,1,3,4,5,6],multipl:3,data:[1,3,4],"short":4,practic:6,third:3,bind:1,bing:0,postgi:4,lost:1,stash:1,django:[0,1,6,4],issu:[],inform:[6,3],environ:[1,6],jquery_js_url:4,allow:6,order:[6,3],oper:3,checkbox:3,move:[1,4],becaus:[1,4],meter:1,through:[],addus:4,tinymce_url:4,still:4,mainli:[0,3],dynam:6,paramet:4,style:0,group:6,cli:[1,6],fit:[0,4],psycopg2:4,clickabl:[],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],framework:[2,6],facilit:3,nov:4,now:[1,3,4],choic:[],name:[0,1,3,6,4],jquery_css_url:4,pyshar:[],gpsbabel:[1,4],off:[],drop:3,refresh:1,easili:3,xvjf:4,html2text:4,each:[0,6,3],found:4,unicod:4,updat:[0,1,2,3,4,5,6],mean:[6,3],compil:[2,4],domain:6,replac:[3,4],jquery_url:1,hard:[],procedur:4,realli:[],backport:[1,4],forgot:[6,3],extract:4,special:[1,3,4],out:3,variabl:[1,6,4],won:1,tinymc:4,newli:3,publish:1,categori:[2,6,3],adapt:[1,4],modpython:[],ref:[],correct:[1,4],red:3,common:[1,4],postgr:4,uncommit:1,migrat:[2,1,4],precaut:1,given:[1,4],free:4,reason:6,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:[0,6,2],static_url:1,keep:3,filter:3,perhap:1,isn:3,outsid:6,root_urlconf:[1,4],auth:6,south:[1,4],first:[1,3,6,4],feed:[6,4],teh:3,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:[0,6],"long":6,district:[],script:1,associ:[6,3],top:[],mkdir:[1,4],system:3,messag:6,attach:3,chimere_dynamic_categori:[],cliquabl:3,master:1,conveni:3,option:1,copi:[0,1,4],install_path:4,part:4,consult:3,detail_cont:[],haven:1,png:[],rss:6,serv:[1,6],kind:0,provid:[3,4],remov:[1,3],project:[2,1,6,4],pythoninterpret:[],ressourc:6,database_password:[],other:6,browser:[2,1],favorit:4,ani:[1,4],myproject:0,packag:[1,4],manner:[],have:[1,3,6,4],tabl:[3,4],need:[0,6,3,4],element:3,pg_version:4,plpgsql:4,local_set:[1,6,4],engin:[],bz2:4,min:1,rout:[6,3],port:[],note:3,also:[1,3],etienn:[],take:4,which:[],librari:4,default_data:4,simplifi:1,map_lay:[],sethandl:[],usernam:6,choos:4,most:[6,3,4],larg: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,visibl:3,wsgi:[1,4],show:6,german:[],visitor:[2,1],database_us:[],directli:[6,3],session:6,loaddata:4,secret_kei:4,permiss:[6,4],cryptograph:4,staff:6,celeri:[1,4],current:[1,3,6],onli:[0,1,3,6,4],locat:1,execut:1,copyright:[0,1,3,4,5,6],explain:3,configur:[2,1,6,4],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,layout:[0,2],enabl:1,specif:4,chimere_localnam:[1,6],reload:[6,4],integr:1,contain:3,where:6,explainatori:[],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,3],avaibl:[],correctli:3,databas:[2,1,6,4],someth:4,cours:4,label:[6,3],state:[6,3],epsg_project:[],between:1,"import":[2,1,3,4,5,6],experi:1,email:4,accord:4,javascript:[1,4],appreci:4,kei:[0,6,4],postgresql_psycopg2:[],job:[],here:4,purpl:3,addit:4,cyclemap:[0,6],both:3,last:4,expos:3,admin:[1,3,4],gpsbabel_opt:1,etc:[6,4],instanc:[0,1,3,4],forgotten:6,freeli:3,login:3,com:6,load:[],simpli:6,technic:6,point:[1,6],color:[6,3],arriv:6,chmod:4,header:3,colon:0,littl:6,poi:3,mapquest:[0,6],mod_python:[],backend:[],quit:3,folow:1,come:3,due:6,empti:[],example_project:[0,1,4],json:4,valu:[1,3,4],administration_:[],modif:[6,3],popul:4,createlang:4,regroup:4,imag:4,understand:3,present:[0,2,3,4,5,6],"case":6,chimere_path:[1,6],look:[6,3],amend:[2,3],vanilla:[],properti:[2,1,3,6],harder:[],easier:6,trick:1,defin:[0,6],error:1,value_of_your_localnam:1,envvar:4,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:[2,6,3,4],destin:4,archiv:4,uncom:4,conf:4,sever:1,develop:3,welcom:[2,6],open:6,author:[0,1,3,4,5,6],media:[1,4],make:[1,3,6],exchang:[],same:[6,3,4],member:6,html:[0,3],descend:3,compat:0,document:[0,2,3,4,5,6],mod_wsgi:4,pan:6,complet:[6,4],http:[1,3,4],webserv:[2,1,4],logic:0,effect:3,solut:4,moment:[],user:[2,1,3,6,4],mani:[1,3,6],extern:[6,3],rvb:3,posgi:4,recent:3,pwprompt:4,task:6,moder:[2,6,3],center:[],chimere_app_path:[1,6],entri:3,well:[0,4],exampl:[6,4],thi:[0,1,3,4,5,6],english:3,model:[2,1,6],self:3,piec:6,propos:[6,3],explan:[],identifi:[6,3],just:[1,4],chimere_hide_propertymodel:6,obtain:4,activ:[1,6,4],insid:[6,3],human:6,touch:[1,4],flavor:6,yet:1,languag:[0,4,2],web:[0,1,6,2],easi:1,field:[1,3,6,4],particulari:[],"53k":4,shortcut:3,apache2:4,identif:3,add:[0,1,3,6],setenv:[],appli:[1,3,6],save:3,explanatori:3,match:[],bin:[1,4],applic:[6,3,4],format:3,read:3,database_engin:[],database_nam:[],password:[6,3],mod:4,linux:[1,4],insert:[],like:[1,3,6,4],semi:0,mychimere_project:4,unidecod:4,property_i_j:[],zoom:6,staticfil:1,server:[1,6,4],edit:[2,1,3,4],api:0,necessari:[1,6,4],"_static":[],django_settings_modul:[],resiz:3,page:[0,6,3,2],two:6,encount:4,www:[1,4],right:[6,3],chimere_display_area:[],manual:6,creation:4,some:[0,1,3,4],begin:[1,4],revel:[],sampl:[1,4],language_cod:4,home:[],transport:[0,6],distribut:4,lead:3,confirm:3,makemessag:4,definit:[],per:6,whole:[],libapache2:4,evolv:[],leav:[],proj:4,slash:3,three:3,localhost:[],refer:[0,3,4],core:[],plu:3,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,2,3,4,6],srv:[1,6],stand:4,discard:3,backup:1,disabl:[6,3],ratatouil:[],own:6,effici:3,additionn:[],pythonpath:[],submitt:3,encod:4,bound:6,automat:6,appropri:[0,6,4],been:[0,1,3,4,5,6],contrib:[1,4],openlay:0,your:[0,1,3,6,4],libgeo:4,accordingli:4,git:[1,4],fill:[],lwpostgi:[],wai:[0,4],pictur:6,lok:[0,1,3,4,5,6],secret:4,submit:[3,4],custom:[0,6,4,2],avail:[0,1,3,6,4],interfac:6,"var":[1,4],submiss:[],treat:3,"function":6,properli:6,interest:[6,3],simplejson:[1,4],forc:[2,1],ascend:3,basic:[1,3,6],back:3,pwd:1,collectstat:[1,4],link:[0,3],translat:[2,1,4],pyexiv2:[1,4],line:[1,4],"true":6,congratul:4,pull:1,made:[0,1,3],utf:4,possibl:[6,3],createus:4,checkout:[1,4],chimere_default_categori:[],pythondebug:[],rc2:[],rc3:1,below:4,limit:6,otherwis:[6,3],problem:[1,4],urn:6,crosstrack:1,gone:[],aerial:0,creat:[2,1,3,6,4],classic:3,parser:4,"char":4,exist:4,rule:[1,4],file:[0,1,3,6,4],syncdb:[1,4],chimere_default_zoom:[],check:[6,3,4],probabl:[1,6],echo:4,encrypt:4,automaticali:[],todo:4,when:[6,3],detail:[0,6,3],gettext:4,"default":[0,1,6,4],old:1,valid:3,kombu:1,branch:[1,4],chimere_admin_01:[],test:1,you:[0,1,3,6,4],draw:[6,3],repeat:1,peacefrog:[1,4],symbol:[],bottom:3,drag:[6,3],database_host:[],log:[1,3,6,4],consid:1,sql:4,debian:[1,4],longer:[],migrate_properti:1,directori:[0,1,4],root_path:[],descript:[1,6,4],dgango:[],chown:[1,4],time:[6,4]},objtypes:{},titles:["Chim\u00e8re customisation","Upgrade","Welcome to Chim\u00e8re’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 +Search.setIndex({objects:{},terms:{all:[5,1,3,6],code:[0,1,3,4],forget:[1,3],yellow:3,signific:[1,4],osm:[0,6,3,5],abil:5,follow:[1,6,4],feedpars:[1,4],row:3,content:[5,6,3],hold:6,depend:[2,1,4,5],zone:4,readabl:[6,4],base_url:[],send:4,easiest:0,init:4,program:[],titl:3,text:6,sens:3,town:[],sourc:[2,1,3,4,5],string:[1,4],mechan:5,veri:5,relev:[5,3,4],administr:[0,2,3,4,5,6],button:[5,6,3],list:[5,3,4],geograph:[5,6,3,4],"try":5,item:[2,6,3,5],form:[5,6,3],quick:[],particularli:5,initialis:[2,1,6,4],dir:4,pleas:4,base_us:[],direct:1,sign:4,second:3,design:[0,5,2],download:4,further:1,myusernam:4,click:[6,3],append:5,blue:3,index:[],what:5,appear:3,compar:[],section:[6,3],multimedia:[6,3],abl:6,beautifulsoup:4,overload:5,access:[6,3],delet:[5,6,3],version:[0,1,2,3,4,5,6],"new":[0,1,2,3,4,5,6],net:[1,4],chimer:[0,1,3,4,5,6],chose:[],createdb:4,french:4,georss:5,"005k":1,witch:6,address:5,path:[6,3,4],modifi:[0,6,3,4],sinc:4,interpret:[],box:[5,6,3],search:3,larger:0,host:[],prior:[],permit:[5,6,3],action:[5,3],template_context_processor:[],chang:[0,1,3,4,5,6],apart:[],chanc:6,environn:1,chimere_tag:1,repositori:[1,4],extra:[0,3],father:[],modul:[],apt:[1,4],vim:[1,4],put:[5,3],authentifi:3,subcategori:[2,6,3,5],fake:1,marker:1,instal:[0,1,6,4,2],select:[5,6,3],from:[5,1,3,4],would:[1,4],univers:4,upgrad:[2,1],next:1,websit:[6,4],few:[6,3],handler:[],usr:[1,4],recommend:5,type:[0,6,3,4,5],more:[0,6,3,4,5],sort:[6,3],where_is_your_chimer:3,desir:[5,4],mypassword:[],share:4,relat:4,server_url:1,customis:[0,1,2],warn:5,phone:6,"export":[2,3,5],indic:[],particular:4,recommand:4,unpack:4,cach:[2,1,6],must:[0,1,6,4],psql:4,"static":[1,4],account:[5,6,3,4],word:3,sometim:5,hour:6,prepar:1,work:[1,3,6],uniqu:[5,6,4],soup:4,paragraph:[1,6],xapi:5,can:[0,1,3,4,5,6],lc_messag:4,meet:5,default_categori:[],root:4,appropri:[0,6,4,5],control:6,prompt:4,tar:4,give:6,process:[5,1,3],sudo:[],smtp:4,templat:[0,1,4,2],tarbal:1,tag:[5,3,4],want:[0,6,3,4,5],default_cent:[],spe:[],mapnik:[0,6],alwai:5,lxml:[1,4],end:[0,6,3,2],freshli:3,anoth:4,length:[1,4],write:[],pure:0,reject:3,verifi:1,csv:5,simpl:[5,6,3],css:[0,6],email_host:4,map:[0,6,3,5],product:1,rebas:1,mess:5,pypi:4,clone:[1,4],after:[5,1,3],superus:6,upload:[1,4],manuali:[],befor:[5,1,3],plane:1,beauti:4,date:[0,1,3,4,5,6],multipl:3,data:[5,1,3,4],"short":4,practic:6,third:3,bind:1,bing:0,explicit:5,lost:1,stash:1,django:[0,1,6,4],issu:5,inform:[5,6,3],environ:[1,6],jquery_js_url:4,allow:6,order:[5,6,3],origin:5,checkbox:[5,3],help:5,move:[1,4],becaus:[5,1,4],meter:1,createsuperus:6,through:[],addus:4,tinymce_url:4,still:4,mainli:[0,3],dynam:6,paramet:4,style:0,group:6,cli:[1,6],fit:[0,4],psycopg2:4,clickabl:[],better:4,platform:5,window:[],pend:5,requir:[5,1,6],where_is_chimer:4,media_root:[],hidden:[6,3],main:[5,3],extra_url:[],changepassword:6,them:[5,1,3,4],recal:[],thei:[6,3],python:[1,4],dai:6,initi:[1,6,4],framework:[2,6],facilit:[5,3],instead:5,nov:4,now:[1,3,4],choic:5,eventu:5,name:[0,1,3,4,5,6],jquery_css_url:4,pyshar:[],gpsbabel:[1,4],off:[],drop:3,refresh:[5,1],easili:[5,3],xvjf:4,html2text:4,each:[0,6,3,5],found:4,unicod:4,updat:[0,1,2,3,4,5,6],mean:[6,3],compil:[2,4],domain:6,replac:[3,4],jquery_url:1,hard:[],procedur:4,realli:5,backport:[1,4],forgot:[6,3],wgs84:5,extract:4,special:[1,3,4],out:3,variabl:[1,6,4],won:1,optionali:4,newli:[5,3],publish:1,categori:[2,6,3,5],adapt:[1,4],print:5,got:5,modpython:[],ref:[],correct:[5,1,4],red:3,common:[5,1,4],postgr:4,uncommit:1,migrat:[2,1,4],precaut:1,given:[5,1,4],free:4,standard:5,reason:6,base:[5,6,4],postgi:4,org:[1,4],"9227c9":3,mychimer:[1,6],unpredict:4,gdal:[1,4],care:[5,3,4],spatial_ref_si:4,launch:5,could:[5,1],area:[0,6,5,2],ask:[5,6],static_url:1,keep:[5,3],filter:[5,3],perhap:1,isn:3,outsid:6,root_urlconf:[1,4],auth:6,licens:5,south:[1,4],first:[5,1,3,6,4],oper:3,teh:3,major:1,attent:[],render:6,feel:4,onc:[5,6,3],cryptograph:4,number:[1,3,6,4],yourself:3,restrict:6,mai:6,instruct:1,alreadi:4,done:[0,1,6,4,5],least:[1,6,4],mydjango:4,owner:4,stabl:[1,4],installed_app:1,tinymc:4,size:3,differ:[0,6],"long":6,district:[],script:1,associ:[5,6,3],top:[],mkdir:[1,4],system:3,messag:[5,6],attach:3,chimere_dynamic_categori:[],accept:5,cliquabl:3,master:1,choos:[5,4],conveni:[5,3],"final":5,store:5,option:1,copi:[0,1,4],install_path:4,sync:5,part:4,consult:3,pythondebug:[],haven:1,png:[],rss:6,serv:[1,6],kind:0,provid:[5,3,4],remov:[1,3],project:[2,1,6,4,5],pythoninterpret:[],ressourc:6,database_password:[],other:[5,6],transport:[0,6],browser:[2,1],latitud:5,favorit:4,beforehand:5,ani:[5,1,4],myproject:0,packag:[1,4],manner:[],have:[5,1,3,6,4],tabl:[3,4],need:[0,6,3,4,5],seem:5,element:3,pg_version:4,plpgsql:4,local_set:[1,6,4],engin:[],bz2:4,min:1,rout:[6,3],port:[],note:[5,3],also:[1,3],etienn:[],take:4,which:[],default_data:4,simplifi:1,map_lay:[],sure:5,sethandl:[],trace:5,normal:5,usernam:[5,6],object:5,most:[6,3,4],larg:4,letter:[1,4],deploi:[],geodjango:4,why:5,icon:[1,3,6],time_zon:4,don:[5,1,3,6,4],url:[5,1,3,6,4],doc:[],clear:3,later:[1,6],flow:[],your_chimere_path:1,inde:3,database_port:[],pythonhandl:[],left:[],fact:[5,3],visibl:[5,3],wsgi:[1,4],think:5,show:6,german:[],visitor:[2,1],database_us:[],directli:[5,6,3],session:6,loaddata:4,secret_kei:4,permiss:[6,4],detail_cont:[],find:5,staff:6,celeri:[1,4],current:[1,3,6],onli:[0,1,3,4,5,6],locat:1,execut:1,copyright:[0,1,3,4,5,6],explain:3,configur:[2,1,6,4],apach:[1,4],should:[5,1,4],theme:6,simpliest:4,folder:5,local:[5,1,6,4],media_url:[],hit:5,contribut:[1,4],get:[2,1,4,5],familiar:6,your_local_nam:1,stop:1,regularli:5,cannot:5,wheezi:[1,4],a2ensit:4,report:1,geo:4,restart:1,layout:[0,2],enabl:1,chimere_localnam:[1,6],reload:[6,4],feed:[6,4],integr:1,contain:3,where:[5,6],explainatori:[],view:6,set:[5,1,3,6,4],project_nam:4,"chim\u00e8r":[0,1,2,3,4,5,6],knowledg:1,see:[5,6,3],mandatori:[5,6,3],arg:5,epsg_display_project:[],concern:[5,3],jqueri:[1,4],statu:[6,3],avaibl:[],correctli:3,databas:[2,1,6,4,5],someth:4,cours:4,label:[6,3],state:[5,6,3],epsg_project:[],between:[5,1],"import":[2,1,3,4,5,6],experi:[5,1],email:4,accord:4,javascript:[1,4],appreci:4,kei:[0,6,4,5],postgresql_psycopg2:[],job:[],here:[5,4],purpl:3,addit:4,cyclemap:[0,6],both:3,last:4,expos:3,admin:[1,3,4],gpsbabel_opt:1,etc:[6,4],instanc:[0,1,3,4,5],forgotten:6,freeli:3,login:3,com:6,load:[],simpli:6,technic:6,point:[1,6],color:[6,3],arriv:6,chmod:4,header:3,colon:0,littl:6,poi:3,mapquest:[0,6,5],mod_python:[],backend:[],quit:3,coupl:5,folow:1,come:3,classic:[5,3],three:3,empti:5,example_project:[0,1,4],json:4,valu:[5,1,3,4],interest:[6,3],modif:[6,3],popul:4,createlang:4,regroup:4,imag:4,blank:3,understand:3,shapefil:5,present:[0,2,3,4,5,6],"case":[5,6],chimere_path:[1,6],look:[6,3],amend:[2,3],vanilla:[],properti:[2,1,3,6,5],harder:[],easier:6,trick:1,defin:[0,6,5],suffix:[],abov:5,error:[5,1],value_of_your_localnam:1,envvar:4,fixtur:4,compilemessag:[1,4],openstreetmap:5,real:3,layer:[0,6,2],customiz:6,kmlz:5,libj:[1,4],"\u00e9tienn":[0,1,3,4,5,6],site:[2,6,3,4],destin:4,archiv:4,uncom:4,conf:4,sever:1,"null":5,develop:3,welcom:[2,6],open:6,author:[0,1,3,4,5,6],media:[1,4],make:[5,1,3,6],exchang:[],same:[5,6,3,4],member:6,preserv:5,html:[0,3],descend:3,compat:0,document:[0,2,3,4,5,6],mod_wsgi:4,pan:6,complet:[6,4],http:[1,3,4],webserv:[2,1,4],logic:0,effect:3,solut:4,moment:[],user:[2,1,3,6,4],mani:[1,3,6],extern:[6,3],robust:5,rvb:3,posgi:4,recent:3,pwprompt:4,task:6,moder:[2,6,3],center:[],chimere_app_path:[1,6],entri:3,well:[0,4],non:5,exampl:[6,4],thi:[0,1,3,4,5,6],english:3,model:[2,1,6],self:3,piec:6,propos:[6,3],explan:[],identifi:[5,6,3],just:[1,4],chimere_hide_propertymodel:6,obtain:4,activ:[1,6,4],insid:[6,3],distant:5,human:6,touch:[1,4],flavor:6,yet:[5,1],languag:[0,4,2],web:[0,1,5,6,2],like:[1,3,6,4],easi:1,particulari:[],"53k":4,shortcut:3,apache2:4,identif:3,add:[0,1,3,6,5],setenv:[],appli:[1,3,6],save:3,explanatori:3,match:[],bin:[1,4],applic:[6,3,4],format:[5,3],read:3,regard:5,database_engin:[],database_nam:[],password:[5,6,3],mod:4,linux:[1,4],insert:[],specif:[5,4],semi:0,mychimere_project:4,unidecod:4,property_i_j:[],zoom:6,staticfil:1,server:[5,1,6,4],edit:[2,1,3,4],api:[0,5],necessari:[1,6,4],"_static":[],django_settings_modul:[],resiz:3,page:[0,6,3,5,2],two:[5,6],encount:4,www:[1,4],right:[6,3],chimere_display_area:[],manual:6,creation:4,some:[0,1,3,4,5],begin:[1,4],revel:[],sampl:[1,4],language_cod:4,home:[],guess:5,librari:4,distribut:4,basic:[1,3,6],lead:3,confirm:3,makemessag:4,kml:5,definit:[],localis:5,per:6,whole:[],libapache2:4,evolv:[],leav:[],proj:[5,4],slash:3,duplic:5,localhost:[],refer:[0,3,4],core:[],plu:3,previou:1,run:1,bold:3,chimere_default_cent:[],usag:6,step:[1,3,6],squeez:[1,4],prerequisit:[2,4],srid:5,wget:4,handi:5,trustworthi:6,sub:3,postgresql:4,zip:5,chimere_restricted_ext:[],column:[5,3],eventuali:[],geometri:5,manag:[0,1,2,3,4,5,6],srv:[1,6],stand:4,discard:3,backup:1,disabl:[5,6,3],ratatouil:[],own:6,effici:3,additionn:[],pythonpath:[],submitt:3,encod:4,bound:[5,6],automat:[5,6],due:6,been:[0,1,3,4,5,6],contrib:[1,4],openlay:0,mark:5,your:[0,1,3,4,5,6],libgeo:4,accordingli:4,git:[1,4],fill:5,lwpostgi:[],wai:[0,4,5],pictur:6,lok:[0,1,3,4,5,6],secret:4,submit:[3,4],custom:[0,6,4,2],avail:[0,1,3,4,5,6],interfac:6,"var":[1,4],submiss:[],treat:[5,3],"function":6,properli:6,administration_:[],simplejson:[1,4],forc:[2,1],ascend:3,criteria:3,vari:5,back:3,pwd:1,collectstat:[1,4],link:[0,3,5],translat:[2,1,4],pyexiv2:[1,4],line:[1,4],"true":6,congratul:4,pull:1,made:[0,1,3],utf:4,possibl:[5,6,3],"default":[0,1,6,4,5],checkout:[1,4],chimere_default_categori:[],displai:[6,3],rc2:[],rc3:1,below:4,limit:6,otherwis:[6,3],problem:[5,1,4],urn:6,crosstrack:1,gone:[],featur:5,aerial:0,creat:[2,1,3,4,5,6],createus:4,parser:4,"char":4,exist:[5,4],rule:[1,4],file:[0,1,3,4,5,6],syncdb:[1,4],chimere_default_zoom:[],check:[5,6,3,4],probabl:[1,6],echo:4,encrypt:4,automaticali:[],todo:4,when:[5,6,3],detail:[0,6,3,5],gettext:4,field:[5,1,3,6,4],old:1,valid:[5,3],kombu:1,branch:[1,4],chimere_admin_01:[],test:[5,1],you:[0,1,3,4,5,6],node:5,draw:[5,6,3],repeat:1,determin:5,peacefrog:[1,4],symbol:[],bottom:3,drag:[6,3],database_host:[],log:[1,3,6,4],consid:1,sql:4,debian:[1,4],longitud:5,longer:[],migrate_properti:1,directori:[0,1,4],root_path:[],descript:[1,6,4],dgango:[],chown:[1,4],came:5,time:[6,4],w3c:5,convert:5},objtypes:{},titles:["Customisation","Upgrade","Welcome to Chim\u00e8re’s documentation!","Administration","Installation","Import/export","Configuration"],objnames:{},filenames:["customisation","upgrade","index","administration","install","import_export","configuration"]}) \ No newline at end of file diff --git a/docs/_static/chimere_admin_import_CSV.png b/docs/_static/chimere_admin_import_CSV.png new file mode 100644 index 0000000..e67a37b Binary files /dev/null and b/docs/_static/chimere_admin_import_CSV.png differ diff --git a/docs/_static/chimere_admin_import_KML.png b/docs/_static/chimere_admin_import_KML.png new file mode 100644 index 0000000..b48d69a Binary files /dev/null and b/docs/_static/chimere_admin_import_KML.png differ diff --git a/docs/_static/chimere_admin_import_OSM.png b/docs/_static/chimere_admin_import_OSM.png new file mode 100644 index 0000000..a599348 Binary files /dev/null and b/docs/_static/chimere_admin_import_OSM.png differ diff --git a/docs/_static/chimere_admin_import_georss.png b/docs/_static/chimere_admin_import_georss.png new file mode 100644 index 0000000..5278652 Binary files /dev/null and b/docs/_static/chimere_admin_import_georss.png differ diff --git a/docs/_static/chimere_admin_import_shapefile.png b/docs/_static/chimere_admin_import_shapefile.png new file mode 100644 index 0000000..ce612be Binary files /dev/null and b/docs/_static/chimere_admin_import_shapefile.png differ diff --git a/docs/administration.rst b/docs/administration.rst index 2f8ddb5..b79c95b 100644 --- a/docs/administration.rst +++ b/docs/administration.rst @@ -6,7 +6,7 @@ Administration ============== :Author: Étienne Loks -:date: 2012-10-08 +:date: 2012-11-28 :Copyright: CC-BY 3.0 This documents presents the administration of Chimère. @@ -130,6 +130,8 @@ basic color it can be set with the English name (for instance: *red*, *blue*, The element type is the type of element the subcategory can contain: POI, route or both. +.. _geographic-items-management: + Edition/moderation of items --------------------------- @@ -155,11 +157,12 @@ There is a some actions available in the action list. To modify an item, classically you have to click on his name. Then you access to a form to freely modify the item. In this form there is all data available to the end user form plus some extra -fields. The *Import fields* only make sense with data imported from an external +fields. +- The *Import fields* only make sense with data imported from an external source or for data to be exported to OSM cf. to the :ref:`import section -` of this documentation. *Associated items fields* are read only -fields that list items associated to the current one (reference item of an -amendment, associated file of a route). +` of this documentation. +- *Associated items fields* are read only fields that list items associated to +the current one (reference item of an amendment, 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. diff --git a/docs/customisation.rst b/docs/customisation.rst index 19002dc..c8ce2f6 100644 --- a/docs/customisation.rst +++ b/docs/customisation.rst @@ -1,11 +1,11 @@ .. -*- coding: utf-8 -*- -===================== -Chimère customisation -===================== +============= +Customisation +============= :Author: Étienne Loks -:date: 2012-10-08 +:date: 2012-11-28 :Copyright: CC-BY 3.0 This documents presents the installation of Chimère. diff --git a/docs/import_export.rst b/docs/import_export.rst index 3d4b0ed..71f9178 100644 --- a/docs/import_export.rst +++ b/docs/import_export.rst @@ -1,11 +1,11 @@ .. -*- coding: utf-8 -*- -===================== -Chimère import/export -===================== +============= +Import/export +============= :Author: Étienne Loks -:date: 2012-10-08 +:date: 2012-11-28 :Copyright: CC-BY 3.0 This documents presents the administration of Chimère. @@ -15,3 +15,186 @@ The version has been updated for version 2.0.0. Importing --------- + +In Chimère the import mechanism is based on **Import object**. Theses 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. 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 +the type of source. + +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 projection + 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 associated to the projection of + your source. +- **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 KML could be distant or a local + file. You'll have to fill one of the two fields. +- **Zipped file**: only zipped shapefile are accepted this checkbox have 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 +********** + +As the format of the CSV file managed by Chimère could vary depending on the +property you have add on your Chimère instance 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. + +.. 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 uses 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 + `_ 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, select +the **Import** action and validated. + +The import should be processing normally. If not an explicit error message +should be print in the state column of your import. + +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 an item to be visible on +the map instead of delete them it is recommended to set them to the state +**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 ` you +can export to the choose format. All you have to do is to select the desired +items, choose the appropriate action in the action list and validate. + +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 ` for details). This will permit +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 + theses 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 + `. + + +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 theses new data will overload data in your +Chimère (if you don't want that: don't do export). All pending imported items +should have been treated before doing an export. + +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 use regularly 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 are + not going to have the same data that 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. -- cgit v1.2.3 From 3dac3aa1a580f04376a1c16d2416f34351b14adb Mon Sep 17 00:00:00 2001 From: Nawa Date: Thu, 29 Nov 2012 23:54:29 +0100 Subject: Documentation: new corrections, mainly on the administration part --- docs/_build/html/_sources/administration.txt | 104 ++++++++++++------------ docs/_build/html/_sources/configuration.txt | 4 +- docs/_build/html/_sources/customisation.txt | 4 +- docs/_build/html/_sources/import_export.txt | 72 +++++++++-------- docs/_build/html/_sources/install.txt | 77 +++++++++--------- docs/_build/html/_sources/upgrade.txt | 18 +++-- docs/_build/html/administration.html | 113 ++++++++++++++------------- docs/_build/html/configuration.html | 6 +- docs/_build/html/customisation.html | 4 +- docs/_build/html/import_export.html | 77 ++++++++++-------- docs/_build/html/index.html | 12 +-- docs/_build/html/install.html | 82 ++++++++++--------- docs/_build/html/objects.inv | 5 +- docs/_build/html/searchindex.js | 2 +- docs/_build/html/upgrade.html | 24 +++--- docs/administration.rst | 98 +++++++++++------------ docs/configuration.rst | 4 +- docs/customisation.rst | 2 +- docs/install.rst | 8 +- docs/upgrade.rst | 12 +-- 20 files changed, 385 insertions(+), 343 deletions(-) (limited to 'docs/_build/html/import_export.html') diff --git a/docs/_build/html/_sources/administration.txt b/docs/_build/html/_sources/administration.txt index fa95012..92b6442 100644 --- a/docs/_build/html/_sources/administration.txt +++ b/docs/_build/html/_sources/administration.txt @@ -10,7 +10,7 @@ Administration :Copyright: CC-BY 3.0 This document presents the administration of Chimère. -It has has been updated for version 2.0.0. +It has been updated for version 2.0.0. Administration pages presentation @@ -34,18 +34,18 @@ Main page Once authentified you'll have access to the main admin page. -This looks like this: +It 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 + **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 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 + 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. @@ -55,16 +55,16 @@ 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 cliquable. Click on an header sort the items by + 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 explain the order of sorting). + 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 possibly edit, delete it. + the first column) to see the detail and edit or delete it. Item form ********* @@ -72,13 +72,13 @@ 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 + 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 theses actions buttons. They are +#. the form has to be validated by one of these action buttons. They are self-explanatory. Status @@ -87,7 +87,7 @@ 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. -- **Submited**: Status of a new item freshly proposed by an end user. This item +- **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. @@ -102,14 +102,14 @@ 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 +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. Theses icons appears on the +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. @@ -122,17 +122,17 @@ 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- explanatory. +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 the subcategory can contain: POI, route +The element type is the type of element that the subcategory can contain: POI, route or both. .. _geographic-items-management: -Edition/moderation of items +Editing or moderating items --------------------------- The moderation step is quite simple. It works the same with POIs and routes. @@ -142,35 +142,40 @@ 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 is a some actions available in the action list. +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 teh 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. to :ref:`managing-modified`. Modified item has to be treated - one by one. -- **Export to...** to export selected item to the selected format. +- **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 his name. +To modify an item, classically you have to click on its name. Then you access to a form to freely modify the item. -In this form there is all data available to the end user form plus some extra + +.. 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. to the :ref:`import section -` of this documentation. -- *Associated items fields* are read only fields that list items associated to -the current one (reference item of an amendment, associated file of a route). + source or for data to be exported to OSM (cf. the :ref:`import section + ` 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 forgot when you change multimedia items). +bottom of the form (it is easily forgotten when you change multimedia items). -If an item is not relevant the **Delete** button permit to remove it. +If an item is not relevant the **Delete** button enables to remove it. .. _managing-modified: @@ -183,9 +188,9 @@ to the reference item modified. .. Note:: If you are logged as an administrator and make changes on the map with the - end user form there will be directly validated. + end user form they will be directly validated. -A special form has been developed to facilitate the processing of theses +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*. @@ -194,10 +199,11 @@ You can access to this special form with the action *Managed modified items*. This form is a table with three columns. -#. The first column display the information for the reference item. -#. The second column display the information proposed by the submitter. +#. 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. -To reject all modification validate the form with no checkbox checked. +.. Note:: + To reject all modification validate the form with no checkbox checked. diff --git a/docs/_build/html/_sources/configuration.txt b/docs/_build/html/_sources/configuration.txt index 39acdfd..c0cef30 100644 --- a/docs/_build/html/_sources/configuration.txt +++ b/docs/_build/html/_sources/configuration.txt @@ -80,8 +80,8 @@ An *Area* is the base of your map. It defines: *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. +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. diff --git a/docs/_build/html/_sources/customisation.txt b/docs/_build/html/_sources/customisation.txt index e6615db..665e2f8 100644 --- a/docs/_build/html/_sources/customisation.txt +++ b/docs/_build/html/_sources/customisation.txt @@ -8,7 +8,7 @@ Customisation :date: 2012-11-28 :Copyright: CC-BY 3.0 -This document presents the installation of Chimère. +This document presents the customisation of Chimère. It has been updated for version 2.0.0. @@ -17,7 +17,7 @@ It has been updated for version 2.0.0. Managing layers --------------- -There is some different layers available by default in Chimère (OSM Mapnik, OSM +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 `_ JS code. This JS code must diff --git a/docs/_build/html/_sources/import_export.txt b/docs/_build/html/_sources/import_export.txt index e8d283b..eb581ce 100644 --- a/docs/_build/html/_sources/import_export.txt +++ b/docs/_build/html/_sources/import_export.txt @@ -16,16 +16,19 @@ It has been updated for version 2.0.0. Importing --------- -In Chimère the import mechanism is based on **Import object**. Theses objects +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. The ability to do such updates depends on the -existence of a unique id for each object on your source. +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 -the type of source. +this source type. Common fields ************* @@ -35,7 +38,7 @@ Common fields associated category will be use. - **SRID**: Chimère will try to identify automatically the correct projection 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 + 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 associated to the projection of @@ -60,7 +63,7 @@ KML import 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. +- **Zipped file**: if your source is a KMLZ file (a zipped KML), check this case. Shapefile import **************** @@ -68,9 +71,9 @@ Shapefile import .. image:: _static/chimere_admin_import_shapefile.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. -- **Zipped file**: only zipped shapefile are accepted this checkbox have to be +- **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 @@ -85,12 +88,17 @@ Simple GeoRSS and W3C GeoRSS are managed. CSV import ********** -As the format of the CSV file managed by Chimère could vary depending on the -property you have add on your Chimère instance 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. +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, do *not* modify the + geometry column. .. image:: _static/chimere_admin_import_CSV.png @@ -104,11 +112,11 @@ OpenStreetMap import .. image:: _static/chimere_admin_import_OSM.png -To import from OSM Chimère uses the XAPI API of OSM. +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 + 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. @@ -123,18 +131,18 @@ To import from OSM Chimère uses the XAPI API of OSM. Importing ********* -Once your new import item created. Select it in the import object list, select -the **Import** action and validated. +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 print in the state column of your import. +The import should be processing normally. If not, an explicit error message +should be printed in the state column of your import. 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 an item to be visible on -the map instead of delete them it is recommended to set them to the state +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**. .. Warning:: @@ -148,7 +156,7 @@ Export to CSV/KML/Shapefile *************************** Directly from the :ref:`geographic items list ` you -can export to the choose format. All you have to do is to select the desired +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. Export to OSM @@ -156,19 +164,19 @@ 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. + 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 ` for details). This will permit +define an import (:ref:`see above ` 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 - theses subcategories should not be in OSM database (because there are not + 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 `. @@ -176,23 +184,23 @@ to determine: 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 theses new data will overload data in your +the new import has updated data, these new data will overload data in your Chimère (if you don't want that: don't do export). All pending imported items should have been treated before doing an export. 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 use regularly Chimère to do export it is recommended to create an +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 are - not going to have the same data that you got with XAPI. + 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. +Once all this field filled, you can (finally!) launch the export. When exporting tags are automatically added/updated: diff --git a/docs/_build/html/_sources/install.txt b/docs/_build/html/_sources/install.txt index f05e5f0..248ece9 100644 --- a/docs/_build/html/_sources/install.txt +++ b/docs/_build/html/_sources/install.txt @@ -78,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 @@ -92,8 +92,8 @@ 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 +********************** Choose a path to install your Chimère:: @@ -105,8 +105,7 @@ From an archive The last "stable" version is available in this `directory `_. 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 (...) @@ -127,7 +126,7 @@ readable directory:: 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 @@ -136,26 +135,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 is 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 -underscores ("_") 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 these -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 @@ -167,18 +166,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 @@ -203,9 +204,9 @@ 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 @@ -227,14 +228,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 @@ -251,23 +252,25 @@ 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 + 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 + 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:: @@ -276,7 +279,7 @@ To activate the website, reload apache:: 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 +as default encoding, in the file */etc/apache2/envvars* uncomment the following line:: . /etc/default/locale diff --git a/docs/_build/html/_sources/upgrade.txt b/docs/_build/html/_sources/upgrade.txt index d7c7233..796ed98 100644 --- a/docs/_build/html/_sources/upgrade.txt +++ b/docs/_build/html/_sources/upgrade.txt @@ -8,6 +8,8 @@ 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. Before any upgrade backup the database and all your installation files (specially if you have made changes to them). @@ -25,8 +27,8 @@ 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 -------------------------------- +Getting new versions of dependencies +------------------------------------ Version 1.1 -> 1.2 ****************** @@ -62,8 +64,8 @@ If you are planing to do major import consider the install of `Celery 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 @@ -102,7 +104,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 @@ -217,7 +219,7 @@ 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. @@ -288,8 +290,8 @@ Version 1.2 -> 2.0 -> master cd $CHIMERE_PATH/chimere django-admin compilemessages -Force the upgrade of visitor's web browser cache ------------------------------------------------- +Forcing 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 diff --git a/docs/_build/html/administration.html b/docs/_build/html/administration.html index b4c3bb1..8dff6e6 100644 --- a/docs/_build/html/administration.html +++ b/docs/_build/html/administration.html @@ -63,7 +63,7 @@

Author:	Étienne Loks
date:	2012-10-08
date:	2012-11-28
Copyright:	CC-BY 3.0

This document presents the administration of Chimère. -It has has been updated for version 2.0.0.

+It has been updated for version 2.0.0.

Administration pages presentation¶

Administration pages are accessible at: http://where_is_your_chimere/admin/

@@ -77,17 +77,17 @@ provided.

Main page¶

Once authentified you’ll have access to the main admin page.

This looks like this:

It looks like this:

links to this Documentation, to the Change password form and to -Log out
a list of recent actions made with this account

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 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 +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.

@@ -96,16 +96,16 @@ by clicking on the item label. _images/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 cliquable. Click on an header sort the items by +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 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.

@@ -113,13 +113,13 @@ the first column) to see the detail and possibly edit, delete it. _images/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 +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 theses actions buttons. They are +
the form has to be validated by one of these action buttons. They are self-explanatory.

@@ -128,7 +128,7 @@ self-explanatory.

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.

Submited: Status of a new item freshly proposed by an end user. This item +
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.

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 +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. Theses icons appears on the +

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. @@ -160,45 +160,49 @@ To add categories: the Add button near categories (quite clear 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- explanatory. +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 the subcategory can contain: POI, route +The element type is the type of element that the subcategory can contain: POI, route or both.

Edition/moderation of items¶

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 is a some actions available in the action list.

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 teh 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. to Managing end user amendment. Modified item has to be treated -one by one.
Export to... to export selected item to the selected format.
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. Managing end user amendment). 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.

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 import section 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).

To modify an item, classically you have to click on his name. -Then you access to a form to freely modify the item. -In this form there is 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. to the import section of this documentation. -- Associated items fields are read only fields that list items associated to -the current one (reference item of an amendment, 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 forgot when you change multimedia items).

If an item is not relevant the Delete button permit to remove it.

+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 end user amendment¶

@@ -208,21 +212,24 @@ to the reference item modified.

Note

If you are logged as an administrator and make changes on the map with the -end user form there will be directly validated.

+end user form they will be directly validated.

A special form has been developed to facilitate the processing of theses +

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.

_images/chimere_admin_modified_management.png

This form is a table with three columns.

The first column display the information for the reference item.
The second column display the information proposed by the submitter.
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.

To reject all modification validate the form with no checkbox checked.

Note

To reject all modification validate the form with no checkbox checked.

@@ -245,7 +252,7 @@ reference item.

Managing news

Creating categories/subcategories

Edition/moderation of items

Editing or moderating items

Managing end user amendment

diff --git a/docs/_build/html/configuration.html b/docs/_build/html/configuration.html index b86ec1a..e0be85b 100644 --- a/docs/_build/html/configuration.html +++ b/docs/_build/html/configuration.html @@ -74,7 +74,7 @@ CHIMERE_APP_PATH=$CHIMERE_PATH/$CHIMERE_LOCALNAME configure your Chimère.

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 Administration where it is presented.

+at the first paragraph of Administration where it is presented.

To access these 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.

@@ -121,8 +121,8 @@ available by default. You can add new custom layer cf. diff --git a/docs/_build/html/customisation.html b/docs/_build/html/customisation.html index 62f864c..594f8e4 100644 --- a/docs/_build/html/customisation.html +++ b/docs/_build/html/customisation.html @@ -58,11 +58,11 @@ -

This document presents the installation of Chimère. +

This document presents the customisation of Chimère. It has been updated for version 2.0.0.

Managing layers ¶

There is some different layers available by default in Chimère (OSM Mapnik, OSM +

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 JS code. This JS code must diff --git a/docs/_build/html/import_export.html b/docs/_build/html/import_export.html index acfb5eb..5a0dcd4 100644 --- a/docs/_build/html/import_export.html +++ b/docs/_build/html/import_export.html @@ -66,14 +66,18 @@ It has been updated for version 2.0.0.

Importing¶

In Chimère the import mechanism is based on Import object. Theses objects +

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. The ability to do such updates depends on the -existence of a unique id for each object on your source.

+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 -the type of source.

+this source type.

Common fields¶

SRID: Chimère will try to identify automatically the correct projection 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 +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 associated to the projection of @@ -105,16 +109,16 @@ associated to newly imported items.
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.
Zipped file: if your source is a KMLZ file (a zipped KML), check this case.

Shapefile import¶

Web address/source file (mandatory): your KML could be distant or a local -file. You’ll have to fill one of the two fields.
Zipped file: only zipped shapefile are accepted this checkbox have to be +
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.

@@ -128,12 +132,17 @@ checked.

CSV import¶

As the format of the CSV file managed by Chimère could vary depending on the -property you have add on your Chimère instance 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.

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, do not modify the +geometry column.

Web address/source file (mandatory): your CSV file could be distant or a @@ -143,11 +152,11 @@ local file. You’ll have to fill one of the two fields.

OpenStreetMap import¶

To import from OSM Chimère uses the XAPI API of OSM.

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 +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.

Importing¶

Once your new import item created. Select it in the import object list, select -the Import action and validated.

The import should be processing normally. If not an explicit error message -should be print in the state column of your import.

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.

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 an item to be visible on -the map instead of delete them it is recommended to set them to the state +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.

Warning

@@ -183,8 +192,8 @@ is particularly important if you want to export your data to OSM.

Exporting¶

Export to CSV/KML/Shapefile¶

Directly from the geographic items list you -can export to the choose format. All you have to do is to select the desired +

Directly from the geographic items list 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.

@@ -192,41 +201,41 @@ items, choose the appropriate action in the action list and validate.

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.

+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 (see above for details). This will permit +define an import (see above 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 -theses subcategories should not be in OSM database (because there are not +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 geographic items forms.

import fields

geographic items forms

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 theses new data will overload data in your +the new import has updated data, these new data will overload data in your Chimère (if you don’t want that: don’t do export). All pending imported items should have been treated before doing an export.

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 use regularly Chimère to do export it is recommended to create an +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 are -not going to have the same data that you got with XAPI.

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.

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.
Installation
Upgrade
Configuration
- Administration pages presentation
- Managing news
- Creating categories/subcategories
- Edition/moderation of items
- Editing or moderating items
- Managing end user amendment

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

@@ -143,8 +143,8 @@ psql -d chimere -f /usr/share/postgresql/$PG_VERSION/contrib/postgis-1.5/postgis psql -d chimere -f /usr/share/postgresql/$PG_VERSION/contrib/postgis-1.5/spatial_ref_sys.sql

Install the sources¶

Installing the sources¶

Choose a path to install your Chimère:

INSTALL_PATH=/var/local/django
 mkdir $INSTALL_PATH

@@ -153,8 +153,7 @@ mkdir $INSTALL_PATH

From an archive¶

The last “stable” version is available in this directory. 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
 (...)
 [[   ]] chimere-1.0.0.tar.bz2     17-Nov-2010 16:51  53K
@@ -173,7 +172,7 @@ chown -R myusername:www-data chimere

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
 cd chimere
@@ -182,23 +181,23 @@ git checkout v2.0 # checkout the desired version

Create a custom project template¶

There a default project is provided (example_project). Copy and modify it (or -get another project based on Chimere):

Creating a custom project template¶

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 -underscores (“_”) 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 +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 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 these -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
 vim local_settings.py

@@ -212,18 +211,20 @@ vim local_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

@@ -249,9 +250,9 @@ chmod -R g+w /var/log/django/

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

@@ -268,13 +269,13 @@ 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

The database is set, congratulations!

@@ -287,26 +288,29 @@ an already populated instance!):

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
+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
+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/
+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:

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 +as default encoding, in the file /etc/apache2/envvars uncomment the following line:

. /etc/default/locale

@@ -325,12 +329,12 @@ line:

Installation

Prerequisites
Database configuration
Install the sources
- Installing the sources
  - From an archive
  - From the git repository
- Create a custom project template
- Creating a custom project template
- Compiling languages
- Database initialisation
- Webserver configuration
- Configuration

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:

INSTALL_PATH=/var/local/django
 mkdir $INSTALL_PATH

@@ -171,8 +175,8 @@ chown -R myusername:www-data chimere

From the git repository¶

Another solution is to get it from the git repository:

From the Git repository¶

Another solution is to get it from the Git repository:

cd $INSTALL_PATH
 git clone git://www.peacefrogs.net/git/chimere
 cd chimere
@@ -331,7 +335,7 @@ line:
 Database configuration
 Installing the sources
 From an archive
-From the git repository
+From the Git repository
 
 
 Creating a custom project template
diff --git a/docs/_build/html/objects.inv b/docs/_build/html/objects.inv
index 85f3dfc..58b4ee0 100644
Binary files a/docs/_build/html/objects.inv and b/docs/_build/html/objects.inv differ
diff --git a/docs/_build/html/searchindex.js b/docs/_build/html/searchindex.js
index 55c5904..1649736 100644
--- a/docs/_build/html/searchindex.js
+++ b/docs/_build/html/searchindex.js
@@ -1 +1 @@
-Search.setIndex({objects:{},terms:{all:[6,2,4,7],code:[0,1,2,4,5,8],forget:[2,4],rentrer:1,"d\u00e9j\u00e0":1,wsgi:[1,2,5],yellow:4,signific:[2,5],osm:[8,0,7,4,6],conteneur:8,abil:6,fourni:[1,8],"\u00e9tape":8,redimensionn:8,row:4,votr:1,categori:[3,7,4,6],utilisateur:[1,8],hold:7,depend:[3,2,5,6],backup:2,zone:5,donner:8,"mani\u00e8r":[1,8],xapi:6,specif:[6,5],send:5,easiest:0,init:[1,5],revenir:8,visitor:[3,2],sens:4,"r\u00e9f\u00e9rez":1,"\u00e9quival":1,valeur:[1,8],"apr\u00e8":8,sourc:[3,1,2,4,5,6,8],string:[2,5],prendr:1,"valid\u00e9":8,parfoi:8,util:8,plusieur:8,mechan:6,veri:6,garder:8,voir:8,relev:[6,4,5],tri:8,"\u00e9cart\u00e9":8,administr:[0,1,3,4,5,6,7,8],button:[6,7,4],list:[6,1,8,4,5],geograph:[6,7,4,5],"pr\u00e9sentat":8,"try":6,item:[3,7,4,6],checkout:[1,2,5],courriel:1,signif:1,loaddata:[1,5],"proc\u00e9dur":1,"initialis\u00e9":1,initialis:[3,1,2,7,5],dir:[1,5],osgeo:1,teh:[],version:[0,1,2,3,4,5,6,7,8],"sp\u00e9cifiqu":8,"derni\u00e8r":1,sync:6,sign:5,second:[8,4],droit:8,design:[0,6,3],follow:[2,7,5],download:[1,5],further:2,myusernam:[1,5],click:[7,4],append:6,integr:2,blue:[8,4],what:6,lettr:1,appear:4,feedpars:[1,2,5],section:[8,7,4],multimedia:[7,4],abl:7,quelqu:[1,8],overload:6,"\u00e9l\u00e9ment":8,current:[2,4,7],delet:[6,7,4],simpliest:5,sur:[1,8],effectif:8,peuvent:8,"new":[0,2,3,4,5,6,7],net:[1,2,5],fuseau:1,cela:[1,8],celeri:[1,2,5],administrateur:[1,8],chose:1,"d\u00e9compressez":1,createdb:[1,5],supprim:8,here:[6,5],georss:6,"005k":2,modif:[8,7,4],free:5,"\u00e9tait":1,address:6,ver:[1,8],modifi:[0,4,5,6,7,8],sinc:5,valu:[6,2,4,5],"m\u00eame":[1,8],box:[6,7,4],search:4,larger:0,envoy:1,later:[2,7],permit:[7,4],action:[6,8,4],chang:[0,2,4,5,6,7],changer:8,chanc:7,environn:2,"mod\u00e9rateur":8,"d\u00e9sir\u00e9":1,repositori:[2,5],extra:[0,4],appli:[2,4,7],modul:[1,5],"syst\u00e8m":8,apt:[1,2,5],vim:[1,2,5],postgi:[1,5],api:[0,6],subcategori:[3,7,4,6],visibl:[6,8,4],marker:2,instal:[3,1,2,5,7,8],"cr\u00e9ation":1,select:[6,7,4],from:[6,2,4,5],patron:1,zip:6,univers:[1,5],upgrad:[3,2],next:2,websit:[7,5],few:[7,4],usr:[1,2,5],criteria:4,"\u00eate":8,"r\u00e9ell":8,assez:8,type:[0,1,4,5,6,7,8],more:[0,7,4,5,6],sort:[7,4],ensuit:[1,8],where_is_your_chimer:[8,4],desir:[6,5],filtrer:8,"utilis\u00e9":[1,8],relat:5,commencez:1,server_url:2,fonction:1,site:[3,1,4,5,7,8],warn:[6,8],parlent:8,migrate_properti:2,templat:[0,2,5,3],aux:[1,8],moin:1,recommand:5,unpack:5,cach:[3,2,7],"rattach\u00e9":8,must:[0,2,7,5],psql:[1,5],account:[6,7,4,5],word:4,sometim:6,hour:7,trouvent:1,car:1,prepar:2,work:[2,4,7],uniqu:[6,1,7,5],pour:[1,8],soup:[1,5],"g\u00e9rer":8,modifiez:1,can:[0,2,4,5,6,7],lc_messag:[1,5],meet:6,"g\u00e9rez":1,root:[1,5],obliqu:8,control:7,abord:[1,8],prompt:5,tar:[1,5],give:7,process:[6,2,4],requi:1,share:[1,5],accept:6,listent:8,bienvenu:1,tag:[6,1,4,5],want:[0,7,4,5,6],tarbal:2,suivant:1,"ent\u00eat":8,mapnik:[0,7],alwai:6,lxml:[1,2,5],end:[8,0,7,4,3],freshli:4,anoth:[4,5],restart:2,tableau:8,rapport:1,clair:8,pure:0,reject:4,instead:6,csv:6,simpl:[8,6,1,7,4],css:[0,1,7,5],email_host:[1,5],map:[0,7,4,6],product:2,rebas:2,mess:6,clone:[1,2,5],after:[6,2,4],minimum:1,superus:7,upload:[2,5],befor:[6,2,4],cours:5,sinon:8,attent:8,date:[0,1,2,4,5,6,7,8],multipl:4,underscor:5,classiqu:8,associ:[6,7,4],"ic\u00f4n":8,"h\u00e9sitez":1,projet:1,permet:8,practic:7,third:4,read:4,bind:2,bing:0,explicit:6,avant:8,"acc\u00e9der":8,django:[0,1,2,7,5],issu:6,inform:[8,6,1,7,4],mainten:[1,8],environ:[2,7],allow:7,media:[1,2,5],sont:[1,8],"biblioth\u00e8qu":1,order:[6,7,4],origin:6,checkbox:[6,4],creation:[8,5],help:6,bien:[1,8],apparaiss:8,"gliss\u00e9":8,becaus:[6,2,5],peut:[1,8],"int\u00e9r\u00eat":8,installez:1,own:7,addus:[1,5],tinymce_url:[1,5],nombr:[1,8],mainli:[0,4],dynam:7,paramet:5,member:7,style:0,group:7,"pr\u00e9sent\u00e9":8,fit:[0,5],chosen:6,psycopg2:[1,5],changement:8,clickabl:4,better:[1,5],platform:6,pend:6,eux:8,where_is_chimer:[1,5],suffit:1,"op\u00e9rat":8,hidden:[7,4],main:[6,4],fin:8,"g\u00e9n\u00e9ralement":8,descend:4,nom:[1,8],them:[6,2,4,5],haven:2,thei:[7,4],python:[1,2,5],encod:[1,5],dan:[1,8],taill:8,handi:6,"suppl\u00e9mentair":[1,8],number:[6,2,4,7,5],framework:[3,7],cet:8,autr:[1,8],optionnel:1,verifi:2,nov:[1,5],now:[2,4,5],regroupez:1,trajet:8,"bas\u00e9":1,choic:6,document:[0,1,2,3,4,5,6,7,8],"r\u00e9agenc\u00e9":8,trac:1,unidecod:[1,5],edit:[3,2,4,5],aucun:8,drop:4,refresh:[6,2],easili:[6,4],localis:6,"import\u00e9":8,each:[0,7,4,6],"fran\u00e7ai":1,found:5,smtp:[1,5],updat:[0,2,3,4,5,6,7],mean:[6,7,4],compil:[3,1,5],dispon:[1,8],domain:7,"int\u00e9rieur":8,replac:[4,5],lign:[1,8],mydjango:[1,5],procedur:5,realli:6,"cr\u00e9er":[1,8],local_set:[1,2,7,5],"static":[1,2,5],forgot:7,"cr\u00e9ez":1,"identifi\u00e9":8,dispos:8,"probl\u00e8m":1,special:[2,4,5],out:4,variabl:[1,2,7,5],"cl\u00e9":1,optionali:5,newli:[6,4],publish:2,content:[6,7,4],contenu:8,backport:[1,2,5],adapt:[2,5],print:6,got:6,correct:[6,1,2,5],red:[8,4],serveur:1,postgr:[1,5],ascendant:8,"propos\u00e9":8,insid:[7,4],line:[2,5],migrat:[3,1,2,5],precaut:2,given:[6,2,5],cart:8,standard:6,reason:7,base:[6,1,7,8,5],que:[1,8],put:[6,4],org:[1,2],"9227c9":[8,4],mychimer:[2,7],unpredict:5,gdal:[1,2,5],care:[6,4,5],contient:8,spatial_ref_si:[1,5],wai:[0,5,6],launch:6,"caract\u00e8r":1,could:[6,2],area:[0,7,6,3],ask:[6,7],static_url:2,keep:[6,4],filter:[6,4],length:[2,5],trier:8,place:1,isn:4,outsid:7,geometri:6,lancer:1,think:6,south:[1,2,5],first:[6,2,4,7,5],oper:4,pleas:5,major:2,initial:1,beauti:[1,5],directli:[6,7,4],"troisi\u00e8m":8,feel:5,onc:[6,7,4],"pr\u00e9":1,"pr\u00e8":8,barr:8,yourself:4,restrict:7,mai:[1,7,8],instruct:2,alreadi:5,done:[0,2,7,5,6],least:[2,7,5],blank:4,owner:[1,5],stabl:[1,2,5],installed_app:2,tinymc:[1,5],ont:[1,8],size:4,differ:[0,7],lister:1,fonctionn:8,boit:8,script:2,avec:[1,8],licens:6,mkdir:[1,2,5],system:4,messag:[6,7],tou:8,avez:[1,8],attach:4,master:2,"appropri\u00e9":1,traduct:1,proposit:8,conveni:[6,4],"final":6,store:6,"\u00e9t\u00e9":[1,8],conduit:8,pare:8,ainsi:8,"trac\u00e9":8,copi:[0,2,5],install_path:[1,5],plane:2,direct:[2,8],recherch:8,"short":5,court:1,"\u00e9galement":8,consult:[8,4],vide:8,"n\u00e9cessit":[1,8],than:6,rss:7,serv:[2,7],kind:0,"compl\u00e9t\u00e9":1,provid:[6,4,5],remov:[2,4],satisfair:1,cli:[2,7],plupart:[1,8],project:[3,2,7,5,6],ressourc:7,gestion:[1,8],initi:[2,7,5],browser:[3,2],latitud:6,"param\u00e9trag":1,"acc\u00e8":8,favorit:5,tiret:1,beforehand:6,ani:[6,2,5],correspond:1,myproject:0,packag:[2,5],"g\u00e9ographiqu":[1,8],faut:1,stash:2,have:[6,2,4,7,5],tabl:[8,1,4,5],need:[0,7,4,5,6],seem:6,element:4,pg_version:[1,5],plpgsql:[1,5],option:2,raccourci:8,suivr:1,bz2:[1,5],"\u00e9ventuel":8,min:2,rout:[7,4],"d\u00e9connexion":8,note:[6,8,4],also:[2,4],witch:7,take:5,obligatoir:8,roug:8,librari:[1,5],default_data:[1,5],"r\u00e9pertoir":1,compat:0,begin:[2,5],sure:6,distribut:[1,5],trace:6,normal:6,usernam:[6,7],object:6,"acc\u00e8d":8,createus:[1,5],doit:[1,8],most:[7,4,5],render:7,"\u00e9tat":8,compt:[1,8],remplacez:1,"g\u00e9r\u00e9":1,geodjango:[1,5],why:6,dai:7,sub:4,doivent:8,time_zon:[1,5],don:[6,2,4,7,5],refract:1,url:[1,2,4,5,6,7],clear:4,"\u00e9ditez":1,openlay:0,pwd:2,inde:4,"g\u00e9r\u00e9e":8,part:5,determin:6,databas:[3,1,2,5,6,7],efficac:8,"r\u00e9cemment":8,came:6,son:8,"n\u00e9cessair":[1,8],show:7,text:7,ajout:8,conserv:8,beautifulsoup:[1,5],session:7,particularli:6,permiss:[1,7,5],contenir:8,"compos\u00e9":8,data:[6,1,2,4,5],find:6,"multim\u00e9dia":8,chimer:[0,1,2,4,5,6,7,8],fichier:[1,8],onli:[0,2,4,5,6,7],submit:[4,5],locat:2,execut:2,copyright:[0,1,2,4,5,6,7,8],"pr\u00e9f\u00e9r\u00e9e":1,explain:4,configur:[3,1,2,7,5],apach:[1,2,5],souhaitez:1,should:[6,2,7,5],theme:7,cliquabl:8,"destin\u00e9":8,"particuli\u00e8r":[1,8],folder:6,local:[6,1,2,7,5],move:[2,5],hit:6,contribut:[1,2,5],get:[3,1,2,5,6],familiar:7,your_local_nam:2,stop:2,regularli:6,solut:[1,5],"param\u00e8tr":1,cannot:6,meter:2,wheezi:[1,2,5],a2ensit:[1,5],report:2,"d\u00e9velopp\u00e9":8,geo:[1,5],lisibl:1,requir:[6,2,7],layout:[0,3],enabl:[6,2,4],chimere_localnam:[2,7],reload:[1,7,5],qui:[1,8],leur:[1,8],common:[6,1,2,5],rechargez:1,contain:[4,5],toujour:1,where:[6,7],valid:[6,8,4],view:7,bleu:8,set:[1,2,4,5,6,7],project_nam:[1,5],fair:[1,8],"chim\u00e8r":[0,1,2,3,4,5,6,7,8],principal:8,knowledg:2,kombu:2,"m\u00e9dia":1,displai:[7,4],touch:[1,2,5],see:[6,7,4],mandatori:[6,7,4],"recommand\u00e9":1,sou:[1,8],violet:8,ordr:8,obtenir:1,concern:[6,8],jqueri:[1,2,5],statu:[8,7,4],still:5,"d\u00e9sactiv":8,correctli:4,"cach\u00e9":8,vari:6,someth:5,vont:8,below:5,label:[7,4],pouvez:8,state:[6,7,4],won:[6,2],chemin:[1,8],between:[6,2],lui:8,jquery_url:2,experi:[6,2],"list\u00e9":8,email:5,signatur:1,accord:5,appreci:5,kei:[0,7,5,6],effet:8,javascript:[1,2,5],dossier:1,auteur:[1,8],french:5,"export\u00e9":8,purpl:[8,4],addit:5,cyclemap:[0,7],both:4,adaptez:1,shapefil:6,"r\u00e9f\u00e9renc":8,admin:[8,1,2,4,5],gpsbabel_opt:2,etc:[1,7,5],"d\u00e9sactiv\u00e9":8,instanc:[0,1,2,4,5,6],tout:8,logic:0,comm:1,login:4,com:7,"adapt\u00e9":1,english:4,"c\u00f4t\u00e9":8,technic:7,point:[2,8,7],color:[7,4],devrait:8,"s\u00fbr":1,arriv:7,chmod:[1,5],"r\u00e8gle":1,colon:0,littl:7,"d\u00e9finir":8,linux:[1,2,5],mapquest:[0,7,6],colonn:8,seulement:1,lorsqu:8,duplic:6,"d\u00e9pos\u00e9":8,quit:4,arg:6,copiez:1,coupl:6,folow:2,come:4,due:7,empti:6,example_project:[0,1,2,5],depui:[1,8],json:[1,5],treat:[6,4],interest:[7,4],basic:[2,4,7],popul:5,"propri\u00e9t\u00e9":8,filtr:8,"associ\u00e9":8,createlang:[1,5],remplacera:8,regroup:5,pri:8,imag:[1,5],convert:6,understand:4,last:[1,5],present:[0,2,3,4,5,6,7],"case":[6,7,8],multi:8,save:4,chimere_path:[2,7],look:[7,4],amend:[3,8,4],"entr\u00e9":8,secret_kei:[1,5],properti:[3,2,4,7,6],chimere_tag:2,easier:7,trick:2,defin:[0,7,6],facil:8,abov:6,error:[6,2],indiqu:8,value_of_your_localnam:2,envvar:[1,5],tant:[1,8],fixtur:[1,5],codag:1,compilemessag:[1,2,5],openstreetmap:6,bin:[1,2,5],layer:[0,7,3],would:[2,5],customiz:7,"supprim\u00e9":8,kmlz:6,conten:[1,8],biai:1,"\u00e9tienn":[0,1,2,4,5,6,7,8],prenez:1,comport:1,activ:[1,2,7,5],soit:8,archiv:[1,5],uncom:5,conf:[1,5],"compl\u00e9ter":1,mod:[1,5],sever:2,par:[1,8],"null":6,develop:4,welcom:[3,7],open:7,author:[0,2,4,5,6,7],parti:1,make:[6,2,4,7],header:4,root_urlconf:[1,2,5],same:[6,7,4,5],affich:8,balis:8,pass:8,html:[0,8,4],changepassword:7,explanatori:4,easi:2,web:[0,1,2,3,6,7],eventu:6,choisissez:1,mod_wsgi:[1,5],pan:7,complet:[7,5],wgs84:6,webserv:[3,2,5],cryptographiqu:1,forgotten:[7,4],effect:4,cliquant:8,libj:[1,2,5],auth:7,jquery_css_url:[1,5],mani:[2,4,7],extern:[8,7,4],jour:[1,8],"coch\u00e9":8,posgi:1,recent:4,"modifi\u00e9":8,pwprompt:[1,5],appropri:[0,7,5,6],moder:[3,7,4],paquet:1,chimere_app_path:[2,7],entri:4,"affich\u00e9":8,well:[0,5],non:[6,1,8],exampl:[1,7,4,5],command:[1,5],thi:[0,2,4,5,6,7],choos:[6,5],soient:8,model:[3,2,7],voulez:[1,8],propos:[8,1,7,4],nommag:1,seul:[1,8],identifi:[8,6,7,4],just:[1,2,8,5],chimere_hide_propertymodel:7,couleur:8,"trait\u00e9":8,obtain:5,"s\u00e9lectionn\u00e9":8,sampl:[1,2,5],comprendr:8,distant:6,human:7,createsuperus:7,simpli:7,flavor:7,yet:[6,2],languag:[0,5,3],traitement:8,task:7,expos:4,fait:[1,8],autant:1,"53k":[1,5],shortcut:4,apache2:[1,5],identif:[8,4],add:[0,2,4,7,6],chaqu:8,simplejson:[1,2,5],xvjf:[1,5],descendant:8,adress:[1,8],survolez:1,anglai:8,applic:[8,1,7,4,5],formulair:8,deux:8,format:[6,8,4],preserv:6,regard:6,librement:8,piec:7,mot:8,relativ:8,bouton:8,password:[6,7,4],prise:8,name:[0,2,4,5,6,7],aurez:1,like:[2,4,7,5],semi:0,"d\u00e9fini":8,fournir:8,mychimere_project:[1,5],activez:1,manual:7,zoom:7,staticfil:2,server:[6,2,7,5],gpsbabel:[1,2,5],princip:8,authentifi:4,necessari:[2,7,5],"accept\u00e9":1,customis:[0,2,3],resiz:4,pratiqu:8,"d\u00e9tail":8,"d\u00e9p\u00f4t":1,encount:5,www:[1,2,5],right:[7,4],old:2,besoin:1,simplifi:2,staff:7,poi:4,paragraph:[2,7],back:4,self:4,"export":[3,8,4,6],language_cod:[1,5],syncdb:[1,2,5],guess:6,transport:[0,7],ici:1,est:[1,8],langag:1,lead:4,confirm:[8,4],kml:6,"install\u00e9":1,per:7,libapache2:[1,5],jquery_js_url:[1,5],larg:5,proj:[6,1,5],slash:4,prequi:1,"mod\u00e9rat":8,three:4,avoir:1,foi:8,refer:[0,4,5],"premi\u00e8r":8,plu:[8,1,4],previou:2,run:2,bold:4,cliquer:8,devin:1,enregistr:8,usag:7,cliquez:8,uncommit:2,step:[2,4,7],squeez:[1,2,5],prerequisit:[3,5],srid:6,wget:[1,5],unicod:[1,5],"disponibilit\u00e9":8,trustworthi:7,postgresql:[1,5],"\u00eatre":[1,8],column:[6,4],http:[8,1,2,4,5],page:[0,1,3,4,6,7,8],srv:[2,7],"f\u00e9licit":1,pertin:[1,8],discard:4,"cat\u00e9gori":8,"donn\u00e9":[1,8],"libell\u00e9":8,cett:[1,8],feed:[1,7,5],"d\u00e9commentez":1,effici:4,letter:[2,5],remplir:1,gard:1,submitt:4,lien:8,bound:[6,7],automat:[6,7],two:[6,7],champ:8,been:[0,2,4,5,6,7],contrib:[1,2,5],"import":[3,1,2,4,5,6,7,8],mark:6,your:[0,2,4,5,6,7],libgeo:[1,5],manag:[0,1,2,3,4,5,6,7,8],accordingli:5,git:[1,2,5],fill:6,log:[1,2,4,7,5],real:4,pictur:7,lok:[0,1,2,4,5,6,7,8],celui:1,secret:5,"long":7,custom:[0,7,5,3],avail:[0,1,2,4,5,6,7],lost:2,interfac:7,gra:8,"var":[1,2,5],icon:[2,4,7],"\u00e9dition":8,"intitul\u00e9":8,"function":7,auriez:1,properli:7,rejet:8,form:[6,7,4],forc:[3,2],ascend:4,recommend:6,horair:1,facilit:[6,8,4],readabl:[7,5],your_chimere_path:2,collectstat:[1,2,5],link:[0,4,6],translat:[3,2,5],pyexiv2:[1,2,5],cryptograph:5,stand:5,"true":7,meilleur:1,congratul:5,pull:2,robust:6,made:[0,2,4],utf:[1,5],possibl:[8,6,7,4],"default":[0,1,2,5,6,7],"d\u00e9placez":1,fake:2,access:[8,7,4],"th\u00e8me":8,rc3:2,makemessag:[1,5],limit:7,notam:8,otherwis:[7,4],problem:[6,2,5],urn:7,crosstrack:2,"accentu\u00e9":1,rvb:[8,4],featur:6,aerial:0,creat:[3,1,2,4,5,6,7],classic:[6,4],disabl:[6,7,4],certain:8,"pr\u00e9sent":[1,8],parser:[1,5],accentu:5,nouvel:[1,8],lectur:8,"char":5,html2text:[1,5],exist:[6,5],"d\u00e9pendanc":1,file:[0,2,4,5,6,7],some:[0,2,4,5,6],cocher:8,path:[7,4,5],check:[6,7,4,5],appliqu:8,probabl:[2,7],echo:[1,5],freeli:4,"appara\u00eetr":8,perhap:2,encrypt:[1,5],courant:8,relatif:1,titl:4,user:[3,1,2,4,5,7,8],"d\u00e9faut":1,when:[6,7,4],detail:[0,7,4,6],gettext:[1,5],vou:[1,8],field:[1,2,4,5,6,7],other:[6,7],oubliez:8,branch:[1,2,5],titr:8,test:[6,2],you:[0,2,4,5,6,7],"int\u00e9ress":8,validez:8,oublier:8,servernam:5,particular:5,node:6,draw:[6,7,4],repeat:2,chacun:8,peacefrog:[1,2,5],"souhait\u00e9":1,choisir:1,drag:[7,4],consid:2,sql:[1,5],debian:[1,2,5],longitud:6,phone:7,directori:[0,2,5],affichag:8,bottom:4,descript:[1,2,7,5],rule:[2,5],actuel:8,utilisez:1,chown:[1,2,5],fact:[6,4],time:[7,5],exempl:[1,8],w3c:6,"t\u00e9l\u00e9chargez":1,"secr\u00e8t":1},objtypes:{},titles:["Customisation","Installation","Upgrade","Welcome to Chim\u00e8re’s documentation!","Administration","Installation","Import/export","Configuration","Administration"],objnames:{},filenames:["customisation","fr/install","upgrade","index","administration","install","import_export","configuration","fr/administration"]})
\ No newline at end of file
+Search.setIndex({objects:{},terms:{all:[6,2,4,8],code:[0,1,2,4,5,7,9],forget:[2,4],rentrer:1,"d\u00e9j\u00e0":1,"n\u00e9cessair":[7,1,9],yellow:4,signific:[2,5],osm:[0,4,7,6,8,9],per:8,abil:6,follow:[2,8,5],"\u00e9tape":9,redimensionn:9,row:4,content:[6,8,4],utilisateur:[1,9],recommand:5,depend:[3,2,5,6],system:4,zone:[7,5],donner:9,"mani\u00e8r":[1,9],"d\u00e9fini":[7,9],xapi:6,send:5,cach:[3,2,8],realli:6,init:[1,5],revenir:9,text:8,sens:4,"r\u00e9f\u00e9rez":[7,1],ajout:[7,9],adapt:[2,5],"apr\u00e8":9,"am\u00e9lior":7,sourc:[3,1,2,4,5,6,9],string:[2,5],prendr:1,than:6,"valid\u00e9":9,semi:0,parfoi:9,util:9,mechan:6,veri:6,garder:9,voir:9,relev:[6,4,5],tri:9,"\u00e9cart\u00e9":9,"r\u00e9agenc\u00e9":9,cryptograph:5,button:[6,8,4],list:[6,1,9,4,5],geograph:[6,8,4,5],"pr\u00e9sentat":[7,9],"try":6,item:[3,8,4,6],form:[6,8,4],courriel:1,signif:1,particularli:6,"proc\u00e9dur":1,refer:[0,4,5],initialis:[3,1,2,8,5],dir:[1,5],teh:[],"sp\u00e9cifiqu":9,"derni\u00e8r":1,sync:6,sign:5,second:[9,4],droit:9,design:[0,7,6,3],fourni:[1,9],download:[1,5],further:2,myusernam:[1,5],click:[8,4],append:6,"propos\u00e9":9,blue:[9,4],what:6,lettr:1,appear:4,preserv:6,feedpars:[1,2,5],section:[9,8,4],multimedia:[8,4],abl:8,quelqu:[1,9],overload:6,"\u00e9l\u00e9ment":[7,9],current:[2,4,8],delet:[6,8,4],simpliest:5,sur:[1,9],effectif:9,calqu:7,peuvent:9,"new":[0,2,3,4,5,6,7,8],net:[1,2,5],fuseau:1,cela:[1,9],chimer:[0,1,2,4,5,6,7,8,9],administrateur:[1,9],chose:1,longitud:6,usag:8,createdb:[1,5],supprim:9,here:[6,5],georss:6,"005k":2,modif:[9,8,4],cart:9,"\u00e9tait":1,address:6,ver:[7,1,9],modifi:[0,4,5,7,6,8,9],sinc:5,valu:[6,2,4,5],"m\u00eame":[1,9],box:[6,8,4],search:4,larger:0,envoy:1,proj:[6,1,5],permit:[8,4],action:[6,9,4],chang:[0,2,4,5,6,8],changer:9,chanc:8,environn:2,"mod\u00e9rateur":9,"d\u00e9sir\u00e9":1,prerequisit:[3,5],extra:[0,4],appli:[2,4,8],modul:[1,5],apt:[1,2,5],vim:[1,2,5],filenam:6,api:[0,6,7],subcategori:[3,8,4,6],visibl:[6,9,4],marker:[6,2],instal:[3,1,2,5,7,8,9],should:[6,2,8,5],"ad\u00e9quat":7,yourself:4,from:[6,2,4,5],patron:[7,1],zip:6,choos:[6,5],univers:[1,5],upgrad:[3,2],next:2,websit:[8,5],few:[8,4],usr:[1,2,5],criteria:4,"\u00eate":9,"r\u00e9ell":9,assez:9,type:[0,1,4,5,7,6,8,9],more:[0,8,4,5,6],sort:[8,4],contient:9,where_is_your_chimer:[9,4],desir:[6,5],filtrer:9,"utilis\u00e9":[1,9],relat:5,commencez:1,server_url:2,fonction:1,comport:1,warn:[6,2,9],parlent:9,templat:[7,0,2,5,3],aux:[1,9],moin:1,hold:8,unpack:5,easiest:0,"rattach\u00e9":9,must:[0,2,8,5],psql:[1,5],account:[6,8,4,5],word:4,hour:8,trouvent:1,car:1,prepar:2,work:[2,4,8],uniqu:[6,1,8,5],pour:[7,1,9],soup:[1,5],"g\u00e9rer":9,modifiez:1,can:[0,2,4,5,6,8],lc_messag:[1,5],meet:6,"g\u00e9rez":1,root:[1,5],obliqu:9,appropri:[0,8,5,6],control:8,abord:[1,9],prompt:[6,5],tar:[1,5],give:8,process:[6,2,4],requi:1,share:[1,5],accept:6,listent:9,bienvenu:1,tag:[6,1,4,5],want:[0,8,4,5,6],tarbal:2,agenc:7,suivant:1,"ent\u00eat":9,clair:9,alwai:6,chimere_export:6,lxml:[1,2,5],end:[9,0,8,4,3],freshli:4,anoth:[4,5],tableau:9,rapport:1,mapnik:[0,8,7],pure:0,reject:4,verifi:2,csv:6,simpl:[1,4,6,7,8,9],css:[0,1,8,5,7],email_host:[1,5],map:[0,8,4,6,7],product:2,rebas:2,mess:6,clone:[1,2,5],after:[6,2,4],minimum:1,"long":8,superus:8,witch:8,befor:[6,2,4],cours:5,sinon:9,attent:9,discard:4,date:[0,1,2,4,5,6,7,8,9],multipl:4,underscor:[2,5],associ:[6,8,4],"ic\u00f4n":9,welcom:[3,8],projet:1,permet:9,practic:8,third:4,bind:2,bing:[0,7],explicit:6,avant:9,"acc\u00e9der":9,django:[0,1,2,5,7,8],issu:6,inform:[9,6,1,8,4],cannot:6,environ:[2,8],allow:8,parti:1,sont:[7,1,9],"biblioth\u00e8qu":[7,1],order:[6,8,4],oper:4,checkbox:[6,4],help:6,apparaiss:9,"gliss\u00e9":9,becaus:[6,2,5],peut:[7,1,9],"int\u00e9r\u00eat":9,installez:1,effici:4,tinymce_url:[1,5],nombr:[1,9],mainli:[0,4],"\u00e9dition":9,dynam:8,paramet:5,balis:9,style:[0,7],group:8,directli:[6,8,4],fit:[0,5],chosen:6,psycopg2:[1,5],changement:[7,9],clickabl:4,better:[1,5],platform:6,pend:6,eux:9,where_is_chimer:[1,5],onc:[6,8,4],"op\u00e9rat":9,hidden:[8,4],main:[6,4],fin:9,"g\u00e9n\u00e9ralement":9,changepassword:8,nom:[1,9],them:[6,2,4,5],thei:[8,4],python:[1,2,5],lien:[7,9],dan:[7,1,9],taill:9,handi:6,"suppl\u00e9mentair":[7,1,9],number:[6,2,4,8,5],framework:[3,8],cet:9,autr:[7,1,9],optionnel:1,instead:6,nov:[1,5],echo:[1,5],regroupez:1,trajet:9,"bas\u00e9":1,choic:6,eventu:6,administr:[0,1,3,4,5,6,7,8,9],trac:1,unidecod:[1,5],edit:[3,2,4,5],aucun:9,drop:4,refresh:[3,2,6],easili:[6,4],localis:6,alreadi:5,each:[0,8,4,6],"\u00eatre":[7,1,9],found:5,smtp:[1,5],updat:[0,2,3,4,5,6,8],mean:[6,8,4],compil:[3,1,5],dispon:[7,1,9],domain:8,"int\u00e9rieur":9,kml:6,chimere_app_path:[2,8],subcategory_id:6,replac:[4,5],lign:[1,9],blank:4,crontab:6,upload:[2,5],"cr\u00e9er":[1,9],"static":[1,2,5],forgot:8,"cr\u00e9ez":1,wgs84:6,dispos:9,"probl\u00e8m":1,special:[2,4,5],out:4,variabl:[1,2,8,5],"cl\u00e9":1,tinymc:[1,5],newli:[6,4],"nomm\u00e9":7,publish:2,categori:[3,8,4,6],contenu:9,valeur:[1,9],translat:[3,2,5],print:6,got:6,correct:[6,1,2,5],red:[9,4],serveur:1,postgr:[1,5],ascendant:9,pui:7,insid:[8,4],state:[6,8,4],migrat:[3,1,2,5],precaut:2,differ:[0,8],free:5,standard:6,reason:8,base:[6,1,8,9,5],que:[7,1,9],postgi:[1,5],org:[1,2],"9227c9":[9,4],cliquant:9,mychimer:[2,8],unpredict:5,gdal:[1,2,5],care:[6,4,5],ensuit:[1,9],spatial_ref_si:[1,5],wai:[0,5,6],launch:6,where:[6,8],could:[6,2],pictur:8,put:[6,4],static_url:2,keep:[6,4],filter:[6,4],length:[2,5],trier:9,place:1,isn:4,outsid:8,geometri:6,lancer:1,think:6,south:[1,2,5],first:[6,2,4,8,5],origin:6,pleas:5,major:2,celui:1,beauti:[1,5],"pr\u00e9sent\u00e9":9,"troisi\u00e8m":9,feel:5,suffit:1,"pr\u00e9":1,"pr\u00e8":9,oubliez:9,votr:[7,1],restrict:8,mai:[1,8,9],instruct:2,"import\u00e9":9,done:[0,2,8,5,6],messag:[6,8],mydjango:[1,5],owner:[1,5],stabl:[1,2,5],createsuperus:8,installed_app:2,optionali:5,ont:[1,9],size:4,given:[6,2,5],lister:1,fonctionn:9,boit:9,script:2,avec:[7,1,9],licens:6,mkdir:[1,2,5],sometim:6,least:[2,8,5],tou:9,avez:[1,9],attach:4,master:[2,5],cliquabl:9,interfac:8,proposit:9,conveni:[6,4],"final":[7,6],store:6,conduit:9,pare:9,ainsi:9,"trac\u00e9":9,copi:[0,2,5],install_path:[1,5],plane:[],direct:[2,9],recherch:9,"short":5,consult:[9,4],haven:2,vari:6,rss:8,serv:[2,8],kind:0,"compl\u00e9t\u00e9":1,provid:[6,4,5],remov:[2,4],satisfair:1,requir:[6,2,8],plupart:[1,9],project:[3,2,8,5,6],ressourc:8,gestion:[7,1,9],other:[6,8],initi:[2,8,5],transport:[0,8,7],browser:[3,2],latitud:6,"affich\u00e9":9,"param\u00e9trag":1,"acc\u00e8":9,"copi\u00e9":7,favorit:5,tiret:1,beforehand:6,ani:[6,2,5],correspond:1,myproject:0,packag:[2,5],"g\u00e9ographiqu":[1,9],faut:1,stash:2,have:[6,2,4,8,5],tabl:[9,1,4,5],need:[0,8,4,5,6],seem:6,element:4,pg_version:[1,5],plpgsql:[1,5],option:2,raccourci:9,suivr:1,bz2:[1,5],"\u00e9ventuel":9,min:2,rout:[6,8,4],expos:4,courant:9,"d\u00e9connexion":9,note:[9,6,2,4,5],also:[6,2,4],ideal:6,exampl:[1,8,4,5],"d\u00e9commentez":1,take:5,obligatoir:9,properli:8,roug:9,default_data:[1,5],"r\u00e9pertoir":1,compat:0,begin:[2,5],sure:6,distribut:[1,5],trace:6,normal:6,usernam:[6,8],object:6,statu:[9,8,4],doit:[1,9],most:[8,4,5],render:8,"\u00e9tat":9,plan:2,compt:[1,9],remplacez:1,geodjango:[1,5],why:6,sub:4,doivent:9,time_zon:[1,5],don:[6,2,4,8,5],refract:1,url:[1,2,4,5,6,8],clear:4,"\u00e9ditez":1,openlay:[0,7],your_chimere_path:2,inde:4,"g\u00e9r\u00e9e":9,part:5,determin:6,efficac:9,"r\u00e9cemment":9,came:6,personnalis:7,wsgi:[1,2,5],set:[1,2,4,5,6,8],show:8,visitor:[3,2],"\u00e9quival":1,conserv:9,beautifulsoup:[1,5],area:[0,7,6,8,3],session:8,loaddata:[1,5],permiss:[1,8,5],identifi:[9,6,8,4],descendant:9,"compos\u00e9":[7,9],data:[6,1,2,4,5],find:6,addit:5,"multim\u00e9dia":9,celeri:[1,2,5],fichier:[7,1,9],onli:[0,2,4,5,6,8],locat:2,just:[7,1,2,9,5],copyright:[0,1,2,4,5,6,7,8,9],"pr\u00e9f\u00e9r\u00e9e":1,explain:4,configur:[3,1,2,8,5],apach:[1,2,5],souhaitez:[7,1],"cr\u00e9ation":1,like:[2,4,8,5],theme:8,version:[0,1,2,3,4,5,6,7,8,9],"destin\u00e9":9,"diff\u00e9rent":7,chemin:[1,9],folder:6,local:[6,1,2,8,5],move:[2,5],hit:6,contribut:[1,2,5],get:[3,1,2,5,6],familiar:8,your_local_nam:2,stop:2,linux:[1,2,5],regularli:6,solut:[1,5],mainten:[1,9],meter:2,wheezi:[1,2,5],a2ensit:[1,5],report:2,"d\u00e9velopp\u00e9":9,geo:[1,5],lisibl:1,restart:2,layout:[0,3],shp:6,enabl:[6,2,4],probabl:[2,8],chimere_localnam:[2,8],reload:[1,8,5],qui:[1,9],leur:[1,9],common:[6,1,2,5],rechargez:1,contain:[4,5],toujour:1,"caract\u00e8r":1,view:8,bleu:9,nouveau:7,barr:9,project_nam:[1,5],fair:[7,1,9],"chim\u00e8r":[0,1,2,3,4,5,6,7,8,9],principal:[7,9],knowledg:2,kombu:2,"m\u00e9dia":1,see:[6,8,4],mandatori:[6,8,4],"recommand\u00e9":1,rejet:9,violet:9,ordr:9,flavor:8,"d\u00e9placez":1,concern:[6,9],jqueri:[1,2,5],"acc\u00e8d":9,still:5,"d\u00e9sactiv":9,correctli:4,"cach\u00e9":9,databas:[3,1,2,5,6,8],someth:5,vont:9,label:[8,4],pouvez:[7,9],bien:[7,1,9],won:[6,2],"particuli\u00e8r":[1,9],between:[6,2],lui:9,experi:[6,2],email:5,signatur:1,accord:5,javascript:[7,1,2,5],appreci:5,kei:[0,8,6,5,7],effet:9,ask:[6,8],court:1,dossier:[7,1],job:6,comm:1,french:5,otherwis:[8,4],"export\u00e9":9,purpl:[9,4],cli:[6,2,8],cyclemap:[0,8,7],both:4,adaptez:1,shapefil:6,"r\u00e9f\u00e9renc":9,admin:[9,1,2,4,5],gpsbabel_opt:2,champ:9,etc:[1,8,5],instanc:[0,1,2,4,5,6,7],tout:9,logic:0,auteur:[7,1,9],login:4,com:8,"adapt\u00e9":1,"c\u00f4t\u00e9":9,technic:8,point:[7,2,9,8],color:[8,4],devrait:9,"s\u00fbr":1,correspondr:7,arriv:8,chmod:[1,5],"r\u00e8gle":1,featur:6,colon:0,littl:8,"d\u00e9finir":[7,9],poi:4,mapquest:[0,8,6,7],monprojet:7,colonn:9,pyexiv2:[1,2,5],seulement:1,lorsqu:9,duplic:6,"d\u00e9pos\u00e9":9,quit:4,copiez:1,coupl:6,folow:[],come:4,shortcut:4,classic:[6,4],copier:7,due:8,empti:6,example_project:[0,1,2,5,7],depui:[1,9],json:[1,5],treat:[6,4],interest:[8,4],basic:[2,4,8],popul:5,"propri\u00e9t\u00e9":9,filtr:9,adress:[1,9],"associ\u00e9":9,createlang:[1,5],parser:[1,5],remplacera:9,regroup:5,pri:9,imag:[1,5],convert:6,argument:6,understand:4,last:[1,5],collectstat:[1,2,5],present:[0,2,3,4,5,6,8],"case":[6,8,9],multi:9,save:4,look:[8,4],amend:[3,9,4],"entr\u00e9":9,secret_kei:[1,5],properti:[3,2,4,8,6],easier:8,trick:2,defin:[0,8,6],facil:9,abov:6,error:[6,2],indiqu:9,value_of_your_localnam:2,envvar:[1,5],tant:[1,9],fixtur:[1,5],compilemessag:[1,2,5],openstreetmap:6,anglai:9,layer:[0,7,8,3],customiz:8,"supprim\u00e9":9,kmlz:6,conten:[1,9],chimere_hide_propertymodel:8,biai:1,"\u00e9tienn":[0,1,2,4,5,6,7,8,9],prenez:1,site:[3,1,4,5,8,9],activ:[1,2,8,5],soit:9,archiv:[1,5],uncom:5,conf:[1,5],"compl\u00e9ter":1,sever:2,par:[7,1,9],"null":6,develop:4,"syst\u00e8m":9,open:8,author:[0,2,4,5,6,8],media:[1,2,5],make:[6,2,4,8],format:[6,9,4],root_urlconf:[1,2,5],same:[6,8,4,5],affich:9,member:8,pass:9,"th\u00e8me":9,descend:4,document:[0,1,2,3,4,5,6,7,8,9],choisissez:1,mod_wsgi:[1,5],pan:8,complet:[8,5],"identifi\u00e9":9,webserv:[3,2,5],cryptographiqu:1,forgotten:[8,4],effect:4,dai:8,auth:8,applic:[9,1,8,4,5],mani:[2,4,8],extern:[9,8,4],jour:[7,1,9],"coch\u00e9":9,posgi:1,recent:4,"modifi\u00e9":[7,9],pwprompt:[1,5],task:8,moder:[3,8,4],paquet:1,"\u00e9galement":9,entri:4,"d\u00e9sactiv\u00e9":9,well:[0,5],non:[6,1,9],without:6,command:[6,1,5],thi:[0,2,4,5,6,8],english:4,san:7,soient:9,model:[3,2,8],feuill:7,voulez:[1,9],piec:8,propos:[9,1,8,4],nommag:1,contenir:9,execut:2,chimere_tag:2,couleur:9,"trait\u00e9":9,obtain:5,"s\u00e9lectionn\u00e9":9,chimere_import:6,select:[6,8,4],distant:6,human:8,touch:[1,2,5],simpli:8,obtenir:1,yet:[6,2],languag:[0,5,3],traitement:9,web:[0,1,2,3,6,8],now:[2,4,5],easi:2,virgul:7,"personnalis\u00e9":7,fait:[7,1,9],"\u00e9t\u00e9":[7,1,9],"53k":[1,5],vide:9,apache2:[1,5],identif:[9,4],add:[0,2,4,8,6],chaqu:[7,9],recommend:6,mod:[1,5],osgeo:1,survolez:1,bin:[1,2,5],libj:[1,2,5],formulair:9,deux:9,"appropri\u00e9":1,read:4,regard:6,librement:9,"fran\u00e7ai":1,mot:9,test:[6,2],bouton:9,password:[6,8,4],you:[0,2,4,5,6,8],name:[0,2,4,5,7,6,8],aurez:1,"d\u00e9faut":[7,1],jquery_css_url:[1,5],specif:[6,5],header:4,fournir:9,mychimere_project:[1,5],activez:1,manual:8,html:[0,9,4,7],staticfil:2,server:[6,2,8,5],gpsbabel:[1,2,5],princip:9,authentifi:4,necessari:[2,8,5],"install\u00e9":1,"accept\u00e9":1,customis:[7,0,2,3],output:6,resiz:4,pratiqu:9,"d\u00e9tail":[7,9],"d\u00e9p\u00f4t":1,two:[6,8],import_id:6,encount:5,www:[1,2,5],right:[8,4],old:2,besoin:[7,1],simplifi:2,staff:8,creation:[9,5],paragraph:[2,8],back:4,phone:8,self:4,certain:9,feed:[1,8,5],"export":[3,9,4,6],language_cod:[1,5],syncdb:[1,2,5],"cat\u00e9gori":9,guess:6,"n\u00e9cessit":[1,9],ici:1,est:[7,1,9],chacun:9,lead:4,confirm:[9,4],makemessag:[1,5],codag:1,xvjf:[1,5],conteneur:9,libapache2:[1,5],jquery_js_url:[1,5],larg:5,explanatori:4,slash:4,titr:9,prequi:1,"mod\u00e9rat":9,three:4,avoir:1,foi:9,"initialis\u00e9":1,"premi\u00e8r":9,plu:[7,1,9,4],previou:2,run:2,bold:4,cliquer:9,devin:1,"d\u00e9compressez":1,cliquez:9,uncommit:2,step:[2,4,8],logiqu:7,squeez:[1,2,5],repositori:[2,5],srid:6,wget:[1,5],unicod:[1,5],"disponibilit\u00e9":9,trustworthi:8,postgresql:[1,5],would:[2,5],column:[6,4],http:[9,1,2,4,5],page:[0,1,3,4,6,7,8,9],integr:2,srv:[2,8],"f\u00e9licit":1,pertin:[1,9],"list\u00e9":9,backup:2,"donn\u00e9":[1,9],"libell\u00e9":9,cett:[1,9],arg:6,own:8,addus:[1,5],letter:[2,5],remplir:1,sql:[1,5],gard:1,submitt:4,encod:[1,5],bound:[6,8],automat:[6,8],son:9,sou:[1,9],been:[0,2,4,5,6,8],contrib:[1,2,5],"import":[3,1,2,4,5,6,7,8,9],mark:6,your:[0,2,4,5,6,8],libgeo:[1,5],manag:[0,1,2,3,4,5,6,7,8,9],accordingli:5,git:[1,2,5],fill:6,log:[1,2,4,8,5],real:4,plusieur:9,lok:[0,1,2,4,5,6,7,8,9],initial:1,secret:5,submit:[4,5],custom:[0,8,5,3],avail:[0,1,2,4,5,6,8],lost:2,traduct:1,gra:9,"var":[1,2,5],icon:[2,4,8],jquery_url:2,"intitul\u00e9":9,"function":8,auriez:1,chimere_path:[2,8],simplement:7,local_set:[1,2,8,5],simplejson:[1,2,5],forc:[3,2],ascend:4,classiqu:9,horair:1,facilit:[6,9,4],readabl:[8,5],pwd:2,doi:7,link:[0,4,6],procedur:5,zoom:8,"\u00e9crit":7,line:[2,5],stand:5,"true":8,meilleur:1,congratul:5,pull:2,robust:6,made:[0,2,4],utf:[1,5],possibl:[9,6,8,4],"default":[0,1,2,5,6,8],checkout:[1,2,5],fake:2,access:[9,8,4],displai:[8,4],rc3:2,below:5,"cha\u00een":7,limit:8,notam:9,backport:[1,2,5],problem:[6,2,5],urn:8,crosstrack:2,"accentu\u00e9":1,rvb:[9,4],later:[2,8],aerial:[0,7],creat:[3,1,2,4,5,6,8],createus:[1,5],disabl:[6,8,4],"h\u00e9sitez":1,utilis:7,sampl:[1,2,5],accentu:5,nouvel:[1,9],lectur:9,"char":5,html2text:[1,5],exist:[6,5],"d\u00e9pendanc":1,file:[0,2,4,5,6,8],some:[0,2,4,5,6],cocher:9,path:[8,4,5],check:[6,8,4,5],appliqu:9,"g\u00e9r\u00e9":1,autant:1,freeli:4,"appara\u00eetr":9,encrypt:[1,5],exempl:[7,1,9],relatif:1,titl:4,user:[3,1,2,4,5,8,9],seul:[1,9],when:[6,8,4],detail:[0,8,4,6],gettext:[1,5],vou:[7,1,9],field:[1,2,4,5,6,8],valid:[6,9,4],librari:[1,5],branch:[1,2,5],comprendr:9,relativ:9,prise:9,"int\u00e9ress":9,validez:9,oublier:9,servernam:5,particular:5,node:6,draw:[6,8,4],repeat:2,langag:[7,1],peacefrog:[1,2,5],"souhait\u00e9":1,choisir:1,drag:[8,4],consid:[2,5],"param\u00e8tr":1,debian:[1,2,5],enregistr:9,migrate_properti:2,directori:[0,2,5,6],affichag:9,bottom:4,descript:[1,2,8,5],"pr\u00e9sent":[7,1,9],actuel:9,utilisez:1,chown:[1,2,5],rule:[2,5],fact:[6,4],time:[8,5],perhap:2,w3c:6,"t\u00e9l\u00e9chargez":1,"secr\u00e8t":1},objtypes:{},titles:["Customisation","Installation","Upgrade","Welcome to Chim\u00e8re’s documentation!","Administration","Installation","Import/export","Customisation","Configuration","Administration"],objnames:{},filenames:["customisation","fr/install","upgrade","index","administration","install","import_export","fr/customisation","configuration","fr/administration"]})
\ No newline at end of file
diff --git a/docs/_build/html/upgrade.html b/docs/_build/html/upgrade.html
index c38cc8f..56d800c 100644
--- a/docs/_build/html/upgrade.html
+++ b/docs/_build/html/upgrade.html
@@ -64,17 +64,23 @@
 
 This document presents the upgrade of Chimère.
 It has been updated for version 2.0.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.
+

+Warning
+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 currently done to easy the upgrade in later
+versions (>2.0) of Chimère.
+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.
+The current stable version is 2.0.
+
+Note
+If you are considering to contribute on Chimère get the Git master.
+
+The instructions are given for Debian Squeeze and Debian Wheezy.
 
 Getting new versions of dependencies¶
 
@@ -100,7 +106,7 @@ Then install the new dependencies:
                 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.

apt-get install python-django-celery python-kombu

@@ -109,8 +115,8 @@ Then install the new dependencies:

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 initialized.

@@ -121,15 +127,15 @@ initialized.

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¶

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
@@ -140,7 +146,7 @@ git rebase $CHIMERE_TAG

From a previous tarball installation¶

First remove your old installation and get the Git version.

First remove your old installation and get the Git version:

cd $CHIMERE_PATH
 cd ..
 rm -rf $CHIMERE_PATH
@@ -159,7 +165,7 @@ git checkout -b $CHIMERE_LOCALNAME
 vim $CHIMERE_APP_PATH/settings.py
 

Add the line (adapted for your jquery and gpsbabel installation).

Add the line (adapted for your jquery and gpsbabel installation):

JQUERY_URL = SERVER_URL + 'jquery/jquery-1.4.4.min.js'
 GPSBABEL = '/usr/bin/gpsbabel'
 # simplify with an error of 5 meters
@@ -171,7 +177,7 @@ vim $CHIMERE_APP_PATH/settings.py
 Version 1.2 -> 2.0¶
 
 Project template¶
-Create a new project template.
+Create a new project template:
 cd $CHIMERE_PATH
 cp -ra $CHIMERE_PATH/example_project $CHIMERE_LOCALNAME
 CHIMERE_APP_PATH=$CHIMERE_PATH/$CHIMERE_LOCALNAME
@@ -201,12 +207,12 @@ chown www-data -R /var/log/django
 
 
 Static files¶
-Now static file are managed with django.contrib.staticfiles.
+Now static files are managed with django.contrib.staticfiles.
 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:
 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/
@@ -268,7 +274,7 @@ python ./scripts/upgrade.py
 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
 
 
 
@@ -298,9 +304,9 @@ django-admin compilemessages
 
 
 
-
-Forcing the upgrade of visitor’s web browser cache¶
-If major changes in the javascript has be done between version, many of your
+

+Forcing the refresh of visitor’s web browser cache¶
+If 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:
@@ -311,7 +317,7 @@ that edit your local_settings.py and change:
 STATIC_URL = '/static/v2.0.0/'
 
 
-Then in the static directory.
+Then in the static directory:
 cd $CHIMERE_APP_PATH/static
 ln -s `pwd` v2.0.0
 
@@ -367,7 +373,7 @@ ln -s `pwd`Version 1.2 -> 2.0 -> master
 
 
-Forcing the upgrade of visitor’s web browser cache
+Forcing the refresh of visitor’s web browser cache
 
 
 
diff --git a/docs/administration.rst b/docs/administration.rst
index 92b6442..672caa9 100644
--- a/docs/administration.rst
+++ b/docs/administration.rst
@@ -197,7 +197,7 @@ 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.
+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,
@@ -206,4 +206,4 @@ This form is a table with three columns.
    reference item.
 
 .. Note::
-   To reject all modification validate the form with no checkbox checked.
+   To reject all modifications validate the form with no checkbox checked.
diff --git a/docs/install.rst b/docs/install.rst
index 248ece9..02aeb42 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -95,6 +95,9 @@ the paths accordingly to your needs)::
 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::
 
     INSTALL_PATH=/var/local/django
@@ -123,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 it from the git repository::
+Another solution is to get it from the Git repository::
 
     cd $INSTALL_PATH
     git clone git://www.peacefrogs.net/git/chimere
diff --git a/docs/upgrade.rst b/docs/upgrade.rst
index 796ed98..377e5e7 100644
--- a/docs/upgrade.rst
+++ b/docs/upgrade.rst
@@ -11,20 +11,24 @@ Upgrade
 This document presents the upgrade of Chimère.
 It has been updated for version 2.0.0.
 
-Before any upgrade backup the database and all your installation files
-(specially if you have made changes to them).
+.. Warning::
+   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.
 
 
 Getting new versions of dependencies
@@ -57,7 +61,7 @@ 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
 `_.
 
 .. code-block:: bash
@@ -67,8 +71,8 @@ If you are planing to do major import consider the install of `Celery
 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
@@ -82,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
@@ -94,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
@@ -104,7 +108,7 @@ From a previous Git installation
 From a previous tarball installation
 ************************************
 
-First remove your old installation and get the Git version.
+First remove your old installation and get the Git version:
 
 .. code-block:: bash
 
@@ -128,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 line (adapted for your jquery and gpsbabel installation):
 
 .. code-block:: python
 
@@ -142,7 +146,7 @@ Version 1.2 -> 2.0
 
 Project template
 ................
-Create a new project template.
+Create a new project template:
 
 .. code-block:: bash
 
@@ -177,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
 
@@ -260,7 +264,7 @@ 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
 ******************
@@ -290,10 +294,10 @@ Version 1.2 -> 2.0 -> master
     cd $CHIMERE_PATH/chimere
     django-admin compilemessages
 
-Forcing 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
+If 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::
@@ -304,7 +308,7 @@ to::
 
     STATIC_URL = '/static/v2.0.0/'
 
-Then in the static directory.
+Then in the static directory:
 
 .. code-block:: bash
 
-- 
cgit v1.2.3


From edc9cbc5b49c8869343957566098dd6bbf8a9f3e Mon Sep 17 00:00:00 2001
From: Étienne Loks 
Date: Fri, 30 Nov 2012 01:12:27 +0100
Subject: Documentation: add missing image

---
 docs/_build/html/_static/basic.css         |   11 +-
 docs/_build/html/_static/doctools.js       |   10 +-
 docs/_build/html/_static/jquery.js         | 9056 +++++++++++++++++++---------
 docs/_build/html/_static/searchtools.js    |  141 +-
 docs/_build/html/_static/sidebar.js        |    3 +
 docs/_build/html/administration.html       |   21 +-
 docs/_build/html/configuration.html        |   47 +-
 docs/_build/html/customisation.html        |   21 +-
 docs/_build/html/genindex.html             |   23 +-
 docs/_build/html/import_export.html        |   19 +-
 docs/_build/html/index.html                |   13 +-
 docs/_build/html/install.html              |   21 +-
 docs/_build/html/objects.inv               |  Bin 375 -> 384 bytes
 docs/_build/html/search.html               |   13 +-
 docs/_build/html/searchindex.js            |    2 +-
 docs/_build/html/upgrade.html              |   19 +-
 docs/_static/chimere_admin_modify_item.png |  Bin 0 -> 109282 bytes
 17 files changed, 6330 insertions(+), 3090 deletions(-)
 create mode 100644 docs/_static/chimere_admin_modify_item.png

(limited to 'docs/_build/html/import_export.html')

diff --git a/docs/_build/html/_static/basic.css b/docs/_build/html/_static/basic.css
index eb22a94..43e8baf 100644
--- a/docs/_build/html/_static/basic.css
+++ b/docs/_build/html/_static/basic.css
@@ -79,11 +79,11 @@ div.sphinxsidebar input {
     font-size: 1em;
 }
 
-div.sphinxsidebar input[type="text"] {
+div.sphinxsidebar #searchbox input[type="text"] {
     width: 170px;
 }
 
-div.sphinxsidebar input[type="submit"] {
+div.sphinxsidebar #searchbox input[type="submit"] {
     width: 30px;
 }
 
@@ -447,6 +447,11 @@ dl.glossary dt {
     font-style: oblique;
 }
 
+abbr, acronym {
+    border-bottom: dotted 1px;
+    cursor: help;
+}
+
 /* -- code displays --------------------------------------------------------- */
 
 pre {
@@ -532,4 +537,4 @@ span.eqno {
     #top-link {
         display: none;
     }
-}
+}
\ No newline at end of file
diff --git a/docs/_build/html/_static/doctools.js b/docs/_build/html/_static/doctools.js
index 8b9bd2c..d4619fd 100644
--- a/docs/_build/html/_static/doctools.js
+++ b/docs/_build/html/_static/doctools.js
@@ -2,7 +2,7 @@
  * doctools.js
  * ~~~~~~~~~~~
  *
- * Sphinx JavaScript utilties for all documentation.
+ * Sphinx JavaScript utilities for all documentation.
  *
  * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
  * :license: BSD, see LICENSE for details.
@@ -185,9 +185,9 @@ var Documentation = {
           body.highlightText(this.toLowerCase(), 'highlighted');
         });
       }, 10);
-      $('' + _('Hide Search Matches') + '')
-          .appendTo($('.sidebar .this-page-menu'));
+      $('' + _('Hide Search Matches') + '')
+          .appendTo($('#searchbox'));
     }
   },
 
@@ -213,7 +213,7 @@ var Documentation = {
    * helper function to hide the search marks again
    */
   hideSearchWords : function() {
-    $('.sidebar .this-page-menu li.highlight-link').fadeOut(300);
+    $('#searchbox .highlight-link').fadeOut(300);
     $('span.highlighted').removeClass('highlighted');
   },
 
diff --git a/docs/_build/html/_static/jquery.js b/docs/_build/html/_static/jquery.js
index fff6776..96d660c 100644
--- a/docs/_build/html/_static/jquery.js
+++ b/docs/_build/html/_static/jquery.js
@@ -1,24 +1,30 @@
 /*!
- * jQuery JavaScript Library v1.4.2
+ * jQuery JavaScript Library v1.7.2
  * http://jquery.com/
  *
- * Copyright 2010, John Resig
+ * 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 2010, The Dojo Foundation
+ * Copyright 2011, The Dojo Foundation
  * Released under the MIT, BSD, and GPL Licenses.
  *
- * Date: Sat Feb 13 22:33:48 2010 -0500
+ * Date: Thu Nov 15 18:28:24 BRST 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 );
+		return new jQuery.fn.init( selector, context, rootjQuery );
 	},
 
 	// Map over jQuery in case of overwrite
@@ -27,52 +33,70 @@ var jQuery = function( selector, context ) {
 	// Map over the $ in case of overwrite
 	_$ = window.$,
 
-	// Use the correct document accordingly with window argument (sandbox)
-	document = window.document,
-
 	// A central reference to the root jQuery(document)
 	rootjQuery,
 
 	// A simple way to check for HTML strings or ID strings
-	// (both of which we optimize for)
-	quickExpr = /^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/,
-
-	// Is it a simple selector
-	isSimple = /^.[^:#\[\.,]*$/,
+	// Prioritize #id over  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
-	rtrim = /^(\s|\u00A0)+|(\s|\u00A0)+$/g,
+	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,
-	
-	// Has the ready events already been bound?
-	readyBound = false,
-	
-	// The functions to execute on DOM ready
-	readyList = [],
+
+	// The deferred used on DOM ready
+	readyList,
 
 	// The ready event handler
 	DOMContentLoaded,
 
 	// Save a reference to some core methods
 	toString = Object.prototype.toString,
-	hasOwnProperty = Object.prototype.hasOwnProperty,
+	hasOwn = Object.prototype.hasOwnProperty,
 	push = Array.prototype.push,
 	slice = Array.prototype.slice,
-	indexOf = Array.prototype.indexOf;
+	trim = String.prototype.trim,
+	indexOf = Array.prototype.indexOf,
+
+	// [[Class]] -> type pairs
+	class2type = {};
 
 jQuery.fn = jQuery.prototype = {
-	init: function( selector, context ) {
+	constructor: jQuery,
+	init: function( selector, context, rootjQuery ) {
 		var match, elem, ret, doc;
 
 		// Handle $(""), $(null), or $(undefined)
@@ -86,12 +110,12 @@ jQuery.fn = jQuery.prototype = {
 			this.length = 1;
 			return this;
 		}
-		
+
 		// The body element only exists once, optimize finding it
-		if ( selector === "body" && !context ) {
+		if ( selector === "body" && !context && document.body ) {
 			this.context = document;
 			this[0] = document.body;
-			this.selector = "body";
+			this.selector = selector;
 			this.length = 1;
 			return this;
 		}
@@ -99,14 +123,21 @@ jQuery.fn = jQuery.prototype = {
 		// Handle HTML strings
 		if ( typeof selector === "string" ) {
 			// Are we dealing with HTML string or an ID?
-			match = quickExpr.exec( selector );
+			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] ) {
-					doc = (context ? context.ownerDocument || context : document);
+					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
@@ -122,17 +153,19 @@ jQuery.fn = jQuery.prototype = {
 						}
 
 					} else {
-						ret = buildFragment( [ match[1] ], [ doc ] );
-						selector = (ret.cacheable ? ret.fragment.cloneNode(true) : ret.fragment).childNodes;
+						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] );
 
-					if ( elem ) {
+					// 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] ) {
@@ -149,21 +182,14 @@ jQuery.fn = jQuery.prototype = {
 					return this;
 				}
 
-			// HANDLE: $("TAG")
-			} else if ( !context && /^\w+$/.test( selector ) ) {
-				this.selector = selector;
-				this.context = document;
-				selector = document.getElementsByTagName( selector );
-				return jQuery.merge( this, selector );
-
 			// HANDLE: $(expr, $(...))
 			} else if ( !context || context.jquery ) {
-				return (context || rootjQuery).find( selector );
+				return ( context || rootjQuery ).find( selector );
 
 			// HANDLE: $(expr, context)
 			// (which is just equivalent to: $(context).find(expr)
 			} else {
-				return jQuery( context ).find( selector );
+				return this.constructor( context ).find( selector );
 			}
 
 		// HANDLE: $(function)
@@ -172,7 +198,7 @@ jQuery.fn = jQuery.prototype = {
 			return rootjQuery.ready( selector );
 		}
 
-		if (selector.selector !== undefined) {
+		if ( selector.selector !== undefined ) {
 			this.selector = selector.selector;
 			this.context = selector.context;
 		}
@@ -184,7 +210,7 @@ jQuery.fn = jQuery.prototype = {
 	selector: "",
 
 	// The current version of jQuery being used
-	jquery: "1.4.2",
+	jquery: "1.7.2",
 
 	// The default length of a jQuery object is 0
 	length: 0,
@@ -207,18 +233,18 @@ jQuery.fn = jQuery.prototype = {
 			this.toArray() :
 
 			// Return just the object
-			( num < 0 ? this.slice(num)[ 0 ] : this[ num ] );
+			( 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 = jQuery();
+		var ret = this.constructor();
 
 		if ( jQuery.isArray( elems ) ) {
 			push.apply( ret, elems );
-		
+
 		} else {
 			jQuery.merge( ret, elems );
 		}
@@ -229,7 +255,7 @@ jQuery.fn = jQuery.prototype = {
 		ret.context = this.context;
 
 		if ( name === "find" ) {
-			ret.selector = this.selector + (this.selector ? " " : "") + selector;
+			ret.selector = this.selector + ( this.selector ? " " : "" ) + selector;
 		} else if ( name ) {
 			ret.selector = this.selector + "." + name + "(" + selector + ")";
 		}
@@ -244,29 +270,22 @@ jQuery.fn = jQuery.prototype = {
 	each: function( callback, args ) {
 		return jQuery.each( this, callback, args );
 	},
-	
+
 	ready: function( fn ) {
 		// Attach the listeners
 		jQuery.bindReady();
 
-		// If the DOM is already ready
-		if ( jQuery.isReady ) {
-			// Execute the function immediately
-			fn.call( document, jQuery );
-
-		// Otherwise, remember the function for later
-		} else if ( readyList ) {
-			// Add the function to the wait list
-			readyList.push( fn );
-		}
+		// Add the callback
+		readyList.add( fn );
 
 		return this;
 	},
-	
+
 	eq: function( i ) {
+		i = +i;
 		return i === -1 ?
 			this.slice( i ) :
-			this.slice( i, +i + 1 );
+			this.slice( i, i + 1 );
 	},
 
 	first: function() {
@@ -287,9 +306,9 @@ jQuery.fn = jQuery.prototype = {
 			return callback.call( elem, i, elem );
 		}));
 	},
-	
+
 	end: function() {
-		return this.prevObject || jQuery(null);
+		return this.prevObject || this.constructor(null);
 	},
 
 	// For internal use only.
@@ -303,8 +322,11 @@ jQuery.fn = jQuery.prototype = {
 jQuery.fn.init.prototype = jQuery.fn;
 
 jQuery.extend = jQuery.fn.extend = function() {
-	// copy reference to target object
-	var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options, name, src, copy;
+	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" ) {
@@ -338,10 +360,15 @@ jQuery.extend = jQuery.fn.extend = function() {
 					continue;
 				}
 
-				// Recurse if we're merging object literal values or arrays
-				if ( deep && copy && ( jQuery.isPlainObject(copy) || jQuery.isArray(copy) ) ) {
-					var clone = src && ( jQuery.isPlainObject(src) || jQuery.isArray(src) ) ? src
-						: jQuery.isArray(copy) ? [] : {};
+				// 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 );
@@ -360,67 +387,79 @@ jQuery.extend = jQuery.fn.extend = function() {
 
 jQuery.extend({
 	noConflict: function( deep ) {
-		window.$ = _$;
+		if ( window.$ === jQuery ) {
+			window.$ = _$;
+		}
 
-		if ( deep ) {
+		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() {
-		// Make sure that the DOM is not already loaded
-		if ( !jQuery.isReady ) {
+	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, 13 );
+				return setTimeout( jQuery.ready, 1 );
 			}
 
 			// Remember that the DOM is ready
 			jQuery.isReady = true;
 
-			// If there are functions bound, to execute
-			if ( readyList ) {
-				// Execute all of them
-				var fn, i = 0;
-				while ( (fn = readyList[ i++ ]) ) {
-					fn.call( document, jQuery );
-				}
-
-				// Reset the list of functions
-				readyList = null;
+			// 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.triggerHandler ) {
-				jQuery( document ).triggerHandler( "ready" );
+			if ( jQuery.fn.trigger ) {
+				jQuery( document ).trigger( "ready" ).off( "ready" );
 			}
 		}
 	},
-	
+
 	bindReady: function() {
-		if ( readyBound ) {
+		if ( readyList ) {
 			return;
 		}
 
-		readyBound = true;
+		readyList = jQuery.Callbacks( "once memory" );
 
 		// Catch cases where $(document).ready() is called after the
 		// browser event has already occurred.
 		if ( document.readyState === "complete" ) {
-			return jQuery.ready();
+			// 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 );
 
@@ -428,8 +467,8 @@ jQuery.extend({
 		} else if ( document.attachEvent ) {
 			// ensure firing before onload,
 			// maybe late but safe also for iframes
-			document.attachEvent("onreadystatechange", DOMContentLoaded);
-			
+			document.attachEvent( "onreadystatechange", DOMContentLoaded );
+
 			// A fallback to window.onload, that will always work
 			window.attachEvent( "onload", jQuery.ready );
 
@@ -451,35 +490,54 @@ jQuery.extend({
 	// Since version 1.3, DOM methods and functions like alert
 	// aren't supported. They return false on IE (#2968).
 	isFunction: function( obj ) {
-		return toString.call(obj) === "[object Function]";
+		return jQuery.type(obj) === "function";
 	},
 
-	isArray: function( obj ) {
-		return toString.call(obj) === "[object Array]";
+	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 || toString.call(obj) !== "[object Object]" || obj.nodeType || obj.setInterval ) {
+		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
 			return false;
 		}
-		
-		// Not own constructor property must be Object
-		if ( obj.constructor
-			&& !hasOwnProperty.call(obj, "constructor")
-			&& !hasOwnProperty.call(obj.constructor.prototype, "isPrototypeOf") ) {
+
+		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 || hasOwnProperty.call( obj, key );
+
+		return key === undefined || hasOwn.call( obj, key );
 	},
 
 	isEmptyObject: function( obj ) {
@@ -488,11 +546,11 @@ jQuery.extend({
 		}
 		return true;
 	},
-	
+
 	error: function( msg ) {
-		throw msg;
+		throw new Error( msg );
 	},
-	
+
 	parseJSON: function( data ) {
 		if ( typeof data !== "string" || !data ) {
 			return null;
@@ -500,48 +558,70 @@ jQuery.extend({
 
 		// 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 ( /^[\],:{}\s]*$/.test(data.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, "@")
-			.replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, "]")
-			.replace(/(?:^|:|,)(?:\s*\[)+/g, "")) ) {
+		if ( rvalidchars.test( data.replace( rvalidescape, "@" )
+			.replace( rvalidtokens, "]" )
+			.replace( rvalidbraces, "")) ) {
 
-			// Try to use the native JSON parser first
-			return window.JSON && window.JSON.parse ?
-				window.JSON.parse( data ) :
-				(new Function("return " + data))();
+			return ( new Function( "return " + data ) )();
 
-		} else {
-			jQuery.error( "Invalid JSON: " + 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() {},
 
-	// Evalulates a script in a global context
+	// 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) ) {
-			// Inspired by code by Andrea Giammarchi
-			// http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html
-			var head = document.getElementsByTagName("head")[0] || document.documentElement,
-				script = document.createElement("script");
-
-			script.type = "text/javascript";
-
-			if ( jQuery.support.scriptEval ) {
-				script.appendChild( document.createTextNode( data ) );
-			} else {
-				script.text = data;
-			}
-
-			// Use insertBefore instead of appendChild to circumvent an IE6 bug.
-			// This arises when a base node is used (#2709).
-			head.insertBefore( script, head.firstChild );
-			head.removeChild( script );
+		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();
 	},
@@ -550,7 +630,7 @@ jQuery.extend({
 	each: function( object, callback, args ) {
 		var name, i = 0,
 			length = object.length,
-			isObj = length === undefined || jQuery.isFunction(object);
+			isObj = length === undefined || jQuery.isFunction( object );
 
 		if ( args ) {
 			if ( isObj ) {
@@ -576,17 +656,31 @@ jQuery.extend({
 					}
 				}
 			} else {
-				for ( var value = object[0];
-					i < length && callback.call( value, i, value ) !== false; value = object[++i] ) {}
+				for ( ; i < length; ) {
+					if ( callback.call( object[ i ], i, object[ i++ ] ) === false ) {
+						break;
+					}
+				}
 			}
 		}
 
 		return object;
 	},
 
-	trim: function( text ) {
-		return (text || "").replace( rtrim, "" );
-	},
+	// 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 ) {
@@ -594,9 +688,10 @@ jQuery.extend({
 
 		if ( array != null ) {
 			// The window, strings (and functions) also have 'length'
-			// The extra typeof function check is to prevent crashes
-			// in Safari 2 (See: #3039)
-			if ( array.length == null || typeof array === "string" || jQuery.isFunction(array) || (typeof array !== "function" && array.setInterval) ) {
+			// 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 );
@@ -606,14 +701,22 @@ jQuery.extend({
 		return ret;
 	},
 
-	inArray: function( elem, array ) {
-		if ( array.indexOf ) {
-			return array.indexOf( elem );
-		}
+	inArray: function( elem, array, i ) {
+		var len;
 
-		for ( var i = 0, length = array.length; i < length; i++ ) {
-			if ( array[ i ] === elem ) {
-				return i;
+		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;
+				}
 			}
 		}
 
@@ -621,13 +724,14 @@ jQuery.extend({
 	},
 
 	merge: function( first, second ) {
-		var i = first.length, j = 0;
+		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++ ];
@@ -640,12 +744,14 @@ jQuery.extend({
 	},
 
 	grep: function( elems, callback, inv ) {
-		var ret = [];
+		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++ ) {
-			if ( !inv !== !callback( elems[ i ], i ) ) {
+			retVal = !!callback( elems[ i ], i );
+			if ( inv !== retVal ) {
 				ret.push( elems[ i ] );
 			}
 		}
@@ -655,69 +761,167 @@ jQuery.extend({
 
 	// arg is for internal usage only
 	map: function( elems, callback, arg ) {
-		var ret = [], value;
+		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
-		// new value (or values).
-		for ( var i = 0, length = elems.length; i < length; i++ ) {
-			value = callback( elems[ i ], i, arg );
+		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;
+				if ( value != null ) {
+					ret[ ret.length ] = value;
+				}
 			}
 		}
 
+		// Flatten any nested arrays
 		return ret.concat.apply( [], ret );
 	},
 
 	// A global GUID counter for objects
 	guid: 1,
 
-	proxy: function( fn, proxy, thisObject ) {
-		if ( arguments.length === 2 ) {
-			if ( typeof proxy === "string" ) {
-				thisObject = fn;
-				fn = thisObject[ proxy ];
-				proxy = undefined;
+	// 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;
+		}
 
-			} else if ( proxy && !jQuery.isFunction( proxy ) ) {
-				thisObject = proxy;
-				proxy = undefined;
-			}
+		// 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;
 		}
 
-		if ( !proxy && fn ) {
+		// Simulated bind
+		var args = slice.call( arguments, 2 ),
 			proxy = function() {
-				return fn.apply( thisObject || this, arguments );
+				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
-		if ( fn ) {
-			proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++;
-		}
+		proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++;
 
-		// So proxy can be declared as an argument
 		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 = /(webkit)[ \/]([\w.]+)/.exec( ua ) ||
-			/(opera)(?:.*version)?[ \/]([\w.]+)/.exec( ua ) ||
-			/(msie) ([\w.]+)/.exec( ua ) ||
-			!/compatible/.test( ua ) && /(mozilla)(?:.*? rv:([\w.]+))?/.exec( ua ) ||
-		  	[];
+		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;
@@ -729,10 +933,10 @@ if ( jQuery.browser.webkit ) {
 	jQuery.browser.safari = true;
 }
 
-if ( indexOf ) {
-	jQuery.inArray = function( elem, array ) {
-		return indexOf.call( array, elem );
-	};
+// 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
@@ -765,7 +969,7 @@ function doScrollCheck() {
 		// If IE is used, use the trick by Diego Perini
 		// http://javascript.nwbox.com/IEContentLoaded/
 		document.documentElement.doScroll("left");
-	} catch( error ) {
+	} catch(e) {
 		setTimeout( doScrollCheck, 1 );
 		return;
 	}
@@ -774,77 +978,422 @@ function doScrollCheck() {
 	jQuery.ready();
 }
 
-function evalScript( i, elem ) {
-	if ( elem.src ) {
-		jQuery.ajax({
-			url: elem.src,
-			async: false,
-			dataType: "script"
-		});
-	} else {
-		jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" );
-	}
+return jQuery;
+
+})();
+
+
+// String to Object flags format cache
+var flagsCache = {};
 
-	if ( elem.parentNode ) {
-		elem.parentNode.removeChild( elem );
+// 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;
 }
 
-// Mutifunctional method to get and set values to a collection
-// The value/s can be optionally by executed if its a function
-function access( elems, key, value, exec, fn, pass ) {
-	var length = elems.length;
-	
-	// Setting many attributes
-	if ( typeof key === "object" ) {
-		for ( var k in key ) {
-			access( elems, k, key[k], exec, fn, value );
-		}
-		return elems;
-	}
-	
-	// Setting one attribute
-	if ( value !== undefined ) {
-		// Optionally, function values get executed if exec is true
-		exec = !pass && exec && jQuery.isFunction(value);
-		
-		for ( var i = 0; i < length; i++ ) {
-			fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
+/*
+ * 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 );
+				}
+			};
 		}
-		
-		return elems;
+		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;
 	}
-	
-	// Getting an attribute
-	return length ? fn( elems[0], key ) : undefined;
-}
+});
+
+
 
-function now() {
-	return (new Date).getTime();
-}
-(function() {
 
-	jQuery.support = {};
+jQuery.support = (function() {
 
-	var root = document.documentElement,
-		script = document.createElement("script"),
-		div = document.createElement("div"),
-		id = "script" + now();
+	var support,
+		all,
+		a,
+		select,
+		opt,
+		input,
+		fragment,
+		tds,
+		events,
+		eventName,
+		i,
+		isSupported,
+		div = document.createElement( "div" ),
+		documentElement = document.documentElement;
 
-	div.style.display = "none";
-	div.innerHTML = "   
a";
+	// Preliminary tests
+	div.setAttribute("className", "t");
+	div.innerHTML = "   
a";
 
-	var all = div.getElementsByTagName("*"),
-		a = div.getElementsByTagName("a")[0];
+	all = div.getElementsByTagName( "*" );
+	a = div.getElementsByTagName( "a" )[ 0 ];
 
 	// Can't get basic test support
 	if ( !all || !all.length || !a ) {
-		return;
+		return {};
 	}
 
-	jQuery.support = {
+	// 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,
+		leadingWhitespace: ( div.firstChild.nodeType === 3 ),
 
 		// Make sure that tbody elements aren't automatically inserted
 		// IE will insert them into empty tables
@@ -855,17 +1404,17 @@ function now() {
 		htmlSerialize: !!div.getElementsByTagName("link").length,
 
 		// Get the style information from getAttribute
-		// (IE uses .cssText insted)
-		style: /red/.test( a.getAttribute("style") ),
+		// (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",
+		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 ),
+		opacity: /^0.55/.test( a.style.opacity ),
 
 		// Verify style float existence
 		// (IE uses styleFloat instead of cssFloat)
@@ -874,237 +1423,556 @@ function now() {
 		// Make sure that if no value is specified for a checkbox
 		// that it defaults to "on".
 		// (WebKit defaults to "" instead)
-		checkOn: div.getElementsByTagName("input")[0].value === "on",
+		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: document.createElement("select").appendChild( document.createElement("option") ).selected,
+		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,
 
-		parentNode: div.removeChild( div.appendChild( document.createElement("div") ) ).parentNode === null,
+		// 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>",
 
 		// Will be defined later
+		submitBubbles: true,
+		changeBubbles: true,
+		focusinBubbles: false,
 		deleteExpando: true,
-		checkClone: false,
-		scriptEval: false,
 		noCloneEvent: true,
-		boxModel: null
+		inlineBlockNeedsLayout: false,
+		shrinkWrapBlocks: false,
+		reliableMarginRight: true,
+		pixelMargin: true
 	};
 
-	script.type = "text/javascript";
-	try {
-		script.appendChild( document.createTextNode( "window." + id + "=1;" ) );
-	} catch(e) {}
+	// jQuery.boxModel DEPRECATED in 1.3, use jQuery.support.boxModel instead
+	jQuery.boxModel = support.boxModel = (document.compatMode === "CSS1Compat");
 
-	root.insertBefore( script, root.firstChild );
+	// Make sure checked status is properly cloned
+	input.checked = true;
+	support.noCloneChecked = input.cloneNode( true ).checked;
 
-	// Make sure that the execution of code works by injecting a script
-	// tag with appendChild/createTextNode
-	// (IE doesn't support this, fails, and uses .text instead)
-	if ( window[ id ] ) {
-		jQuery.support.scriptEval = true;
-		delete window[ id ];
-	}
+	// 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 script.test;
-	
-	} catch(e) {
-		jQuery.support.deleteExpando = false;
+		delete div.test;
+	} catch( e ) {
+		support.deleteExpando = false;
 	}
 
-	root.removeChild( script );
-
-	if ( div.attachEvent && div.fireEvent ) {
-		div.attachEvent("onclick", function click() {
+	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)
-			jQuery.support.noCloneEvent = false;
-			div.detachEvent("onclick", click);
+			support.noCloneEvent = false;
 		});
-		div.cloneNode(true).fireEvent("onclick");
+		div.cloneNode( true ).fireEvent( "onclick" );
 	}
 
-	div = document.createElement("div");
-	div.innerHTML = "";
+	// 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";
 
-	var fragment = document.createDocumentFragment();
-	fragment.appendChild( div.firstChild );
+	input.setAttribute("checked", "checked");
 
-	// WebKit doesn't clone checked state correctly in fragments
-	jQuery.support.checkClone = fragment.cloneNode(true).cloneNode(true).lastChild.checked;
+	// #11217 - WebKit loses check when the name is after the checked attribute
+	input.setAttribute( "name", "t" );
 
-	// Figure out if the W3C box model works as expected
-	// document.body must exist before we can do this
-	jQuery(function() {
-		var div = document.createElement("div");
-		div.style.width = div.style.paddingLeft = "1px";
+	div.appendChild( input );
+	fragment = document.createDocumentFragment();
+	fragment.appendChild( div.lastChild );
 
-		document.body.appendChild( div );
-		jQuery.boxModel = jQuery.support.boxModel = div.offsetWidth === 2;
-		document.body.removeChild( div ).style.display = 'none';
+	// WebKit doesn't clone checked state correctly in fragments
+	support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked;
 
-		div = null;
-	});
+	// Check if a disconnected checkbox will retain its checked
+	// value of true after appended to the DOM (IE6/7)
+	support.appendChecked = input.checked;
 
-	// Technique from Juriy Zaytsev
-	// http://thinkweb2.com/projects/prototype/detecting-event-support-without-browser-sniffing/
-	var eventSupported = function( eventName ) { 
-		var el = document.createElement("div"); 
-		eventName = "on" + eventName; 
-
-		var isSupported = (eventName in el); 
-		if ( !isSupported ) { 
-			el.setAttribute(eventName, "return;"); 
-			isSupported = typeof el[eventName] === "function"; 
-		} 
-		el = null; 
-
-		return isSupported; 
-	};
-	
-	jQuery.support.submitBubbles = eventSupported("submit");
-	jQuery.support.changeBubbles = eventSupported("change");
+	fragment.removeChild( input );
+	fragment.appendChild( div );
 
-	// release memory in IE
-	root = script = div = all = a = null;
+	// 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 = "" +
+			"" +
+			"";
+
+		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 = " t";
+		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 = "";
+			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;
 })();
 
-jQuery.props = {
-	"for": "htmlFor",
-	"class": "className",
-	readonly: "readOnly",
-	maxlength: "maxLength",
-	cellspacing: "cellSpacing",
-	rowspan: "rowSpan",
-	colspan: "colSpan",
-	tabindex: "tabIndex",
-	usemap: "useMap",
-	frameborder: "frameBorder"
-};
-var expando = "jQuery" + now(), uuid = 0, windowData = {};
+
+
+
+var rbrace = /^(?:\{.*\}|\[.*\])$/,
+	rmultiDash = /([A-Z])/g;
 
 jQuery.extend({
 	cache: {},
-	
-	expando:expando,
+
+	// 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,
-		"object": true,
+		// Ban all objects except for Flash (which handle expandos)
+		"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",
 		"applet": true
 	},
 
-	data: function( elem, name, data ) {
-		if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
+	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;
 		}
 
-		elem = elem == window ?
-			windowData :
-			elem;
+		var privateCache, thisCache, ret,
+			internalKey = jQuery.expando,
+			getByName = typeof name === "string",
 
-		var id = elem[ expando ], cache = jQuery.cache, thisCache;
+			// 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,
 
-		if ( !id && typeof name === "string" && data === undefined ) {
-			return null;
-		}
+			// 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";
 
-		// Compute a unique ID for the element
-		if ( !id ) { 
-			id = ++uuid;
+		// 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;
 		}
 
-		// Avoid generating a new cache unless none exists and we
-		// want to manipulate it.
-		if ( typeof name === "object" ) {
-			elem[ expando ] = id;
-			thisCache = cache[ id ] = jQuery.extend(true, {}, name);
+		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;
+			}
+		}
 
-		} else if ( !cache[ id ] ) {
-			elem[ expando ] = id;
+		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 );
+			}
 		}
 
-		thisCache = cache[ id ];
+		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;
+		}
 
-		// Prevent overriding the named cache with undefined values
 		if ( data !== undefined ) {
-			thisCache[ name ] = data;
+			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;
 		}
 
-		return typeof name === "string" ? thisCache[ name ] : thisCache;
+		// 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 ) {
-		if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
+	removeData: function( elem, name, pvt /* Internal Use Only */ ) {
+		if ( !jQuery.acceptData( elem ) ) {
 			return;
 		}
 
-		elem = elem == window ?
-			windowData :
-			elem;
+		var thisCache, i, l,
 
-		var id = elem[ expando ], cache = jQuery.cache, thisCache = cache[ id ];
+			// 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 we want to remove a specific section of the element's data
 		if ( name ) {
+
+			thisCache = pvt ? cache[ id ] : cache[ id ].data;
+
 			if ( thisCache ) {
-				// Remove the section of cache data
-				delete thisCache[ name ];
 
-				// If we've removed all the data, remove the element's cache
-				if ( jQuery.isEmptyObject(thisCache) ) {
-					jQuery.removeData( elem );
+				// 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;
 			}
+		}
 
-		// Otherwise, we want to remove all of the element's data
+		// 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 {
-			if ( jQuery.support.deleteExpando ) {
-				delete elem[ jQuery.expando ];
+			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( jQuery.expando );
+				elem.removeAttribute( internalKey );
+			} else {
+				elem[ internalKey ] = null;
 			}
+		}
+	},
 
-			// Completely remove the data cache
-			delete cache[ id ];
+	// 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 ) {
-		if ( typeof key === "undefined" && this.length ) {
-			return jQuery.data( this[0] );
+		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;
+		}
 
-		} else if ( typeof key === "object" ) {
+		// Sets multiple values
+		if ( typeof key === "object" ) {
 			return this.each(function() {
 				jQuery.data( this, key );
 			});
 		}
 
-		var parts = key.split(".");
+		parts = key.split( ".", 2 );
 		parts[1] = parts[1] ? "." + parts[1] : "";
+		part = parts[1] + "!";
+
+		return jQuery.access( this, function( value ) {
 
-		if ( value === undefined ) {
-			var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
+			if ( value === undefined ) {
+				data = this.triggerHandler( "getData" + part, [ parts[0] ] );
 
-			if ( data === undefined && this.length ) {
-				data = jQuery.data( this[0], key );
+				// 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;
 			}
-			return data === undefined && parts[1] ?
-				this.data( parts[0] ) :
-				data;
-		} else {
-			return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function() {
+
+			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 ) {
@@ -1113,34 +1981,128 @@ jQuery.fn.extend({
 		});
 	}
 });
-jQuery.extend({
-	queue: function( elem, type, data ) {
-		if ( !elem ) {
-			return;
+
+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;
+}
 
-		type = (type || "fx") + "queue";
-		var q = jQuery.data( elem, type );
+// checks a cache object for emptiness
+function isEmptyDataObject( obj ) {
+	for ( var name in obj ) {
 
-		// Speed up dequeue by getting out quickly if this is just a lookup
-		if ( !data ) {
-			return q || [];
+		// 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;
 		}
+	}
 
-		if ( !q || jQuery.isArray(data) ) {
-			q = jQuery.data( elem, type, jQuery.makeArray(data) );
+	return true;
+}
 
-		} else {
-			q.push( data );
+
+
+
+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 );
 
-		return q;
+			// 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();
+		var queue = jQuery.queue( elem, type ),
+			fn = queue.shift(),
+			hooks = {};
 
 		// If the fx queue is dequeued, always remove the progress sentinel
 		if ( fn === "inprogress" ) {
@@ -1151,104 +2113,167 @@ jQuery.extend({
 			// Add a progress sentinel to prevent the fx queue from being
 			// automatically dequeued
 			if ( type === "fx" ) {
-				queue.unshift("inprogress");
+				queue.unshift( "inprogress" );
 			}
 
-			fn.call(elem, function() {
-				jQuery.dequeue(elem, type);
-			});
+			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 ( data === undefined ) {
+		if ( arguments.length < setter ) {
 			return jQuery.queue( this[0], type );
 		}
-		return this.each(function( i, elem ) {
-			var queue = jQuery.queue( this, type, data );
 
-			if ( type === "fx" && queue[0] !== "inprogress" ) {
-				jQuery.dequeue( this, 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;
+		time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
 		type = type || "fx";
 
-		return this.queue( type, function() {
-			var elem = this;
-			setTimeout(function() {
-				jQuery.dequeue( elem, type );
-			}, time );
+		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]/g,
+
+
+
+
+var rclass = /[\n\t\r]/g,
 	rspace = /\s+/,
 	rreturn = /\r/g,
-	rspecialurl = /href|src|style/,
-	rtype = /(button|input)/i,
-	rfocusable = /(button|input|object|select|textarea)/i,
-	rclickable = /^(a|area)$/i,
-	rradiocheck = /radio|checkbox/;
+	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 access( this, name, value, true, jQuery.attr );
+		return jQuery.access( this, jQuery.attr, name, value, arguments.length > 1 );
 	},
 
-	removeAttr: function( name, fn ) {
-		return this.each(function(){
-			jQuery.attr( this, name, "" );
-			if ( this.nodeType === 1 ) {
-				this.removeAttribute( name );
-			}
+	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 ) {
-		if ( jQuery.isFunction(value) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				self.addClass( value.call(this, i, self.attr("class")) );
+		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" ) {
-			var classNames = (value || "").split( rspace );
+			classNames = value.split( rspace );
 
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				var elem = this[i];
+			for ( i = 0, l = this.length; i < l; i++ ) {
+				elem = this[ i ];
 
 				if ( elem.nodeType === 1 ) {
-					if ( !elem.className ) {
+					if ( !elem.className && classNames.length === 1 ) {
 						elem.className = value;
 
 					} else {
-						var className = " " + elem.className + " ", setClass = elem.className;
-						for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
-							if ( className.indexOf( " " + classNames[c] + " " ) < 0 ) {
-								setClass += " " + classNames[c];
+						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 );
@@ -1261,24 +2286,25 @@ jQuery.fn.extend({
 	},
 
 	removeClass: function( value ) {
-		if ( jQuery.isFunction(value) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				self.removeClass( value.call(this, i, self.attr("class")) );
+		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 ) {
-			var classNames = (value || "").split(rspace);
+			classNames = ( value || "" ).split( rspace );
 
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				var elem = this[i];
+			for ( i = 0, l = this.length; i < l; i++ ) {
+				elem = this[ i ];
 
 				if ( elem.nodeType === 1 && elem.className ) {
 					if ( value ) {
-						var className = (" " + elem.className + " ").replace(rclass, " ");
-						for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
-							className = className.replace(" " + classNames[c] + " ", " ");
+						className = (" " + elem.className + " ").replace( rclass, " " );
+						for ( c = 0, cl = classNames.length; c < cl; c++ ) {
+							className = className.replace(" " + classNames[ c ] + " ", " ");
 						}
 						elem.className = jQuery.trim( className );
 
@@ -1293,19 +2319,21 @@ jQuery.fn.extend({
 	},
 
 	toggleClass: function( value, stateVal ) {
-		var type = typeof value, isBool = typeof stateVal === "boolean";
+		var type = typeof value,
+			isBool = typeof stateVal === "boolean";
 
 		if ( jQuery.isFunction( value ) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				self.toggleClass( value.call(this, i, self.attr("class"), stateVal), stateVal );
+			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),
+				var className,
+					i = 0,
+					self = jQuery( this ),
 					state = stateVal,
 					classNames = value.split( rspace );
 
@@ -1318,19 +2346,21 @@ jQuery.fn.extend({
 			} else if ( type === "undefined" || type === "boolean" ) {
 				if ( this.className ) {
 					// store className if set
-					jQuery.data( this, "__className__", this.className );
+					jQuery._data( this, "__className__", this.className );
 				}
 
 				// toggle whole className
-				this.className = this.className || value === false ? "" : jQuery.data( this, "__className__" ) || "";
+				this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
 			}
 		});
 	},
 
 	hasClass: function( selector ) {
-		var className = " " + selector + " ";
-		for ( var i = 0, l = this.length; i < l; i++ ) {
-			if ( (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) {
+		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;
 			}
 		}
@@ -1339,95 +2369,59 @@ jQuery.fn.extend({
 	},
 
 	val: function( value ) {
-		if ( value === undefined ) {
-			var elem = this[0];
+		var hooks, ret, isFunction,
+			elem = this[0];
 
+		if ( !arguments.length ) {
 			if ( elem ) {
-				if ( jQuery.nodeName( elem, "option" ) ) {
-					return (elem.attributes.value || {}).specified ? elem.value : elem.text;
-				}
-
-				// We need to handle select boxes special
-				if ( jQuery.nodeName( elem, "select" ) ) {
-					var index = elem.selectedIndex,
-						values = [],
-						options = elem.options,
-						one = elem.type === "select-one";
+				hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ];
 
-					// Nothing was selected
-					if ( index < 0 ) {
-						return null;
-					}
-
-					// Loop through all the selected options
-					for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
-						var option = options[ i ];
-
-						if ( option.selected ) {
-							// Get the specifc 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 );
-						}
-					}
-
-					return values;
-				}
-
-				// Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
-				if ( rradiocheck.test( elem.type ) && !jQuery.support.checkOn ) {
-					return elem.getAttribute("value") === null ? "on" : elem.value;
+				if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
+					return ret;
 				}
-				
 
-				// Everything else, we just grab the value
-				return (elem.value || "").replace(rreturn, "");
+				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 undefined;
+			return;
 		}
 
-		var isFunction = jQuery.isFunction(value);
+		isFunction = jQuery.isFunction( value );
 
-		return this.each(function(i) {
-			var self = jQuery(this), val = 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());
+				val = value.call( this, i, self.val() );
+			} else {
+				val = value;
 			}
 
-			// Typecast each time if the value is a Function and the appended
-			// value is therefore different each time.
-			if ( typeof val === "number" ) {
+			// Treat null/undefined as ""; convert numbers to string
+			if ( val == null ) {
+				val = "";
+			} else if ( typeof val === "number" ) {
 				val += "";
-			}
-
-			if ( jQuery.isArray(val) && rradiocheck.test( this.type ) ) {
-				this.checked = jQuery.inArray( self.val(), val ) >= 0;
-
-			} else if ( jQuery.nodeName( this, "select" ) ) {
-				var values = jQuery.makeArray(val);
-
-				jQuery( "option", this ).each(function() {
-					this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
+			} else if ( jQuery.isArray( val ) ) {
+				val = jQuery.map(val, function ( value ) {
+					return value == null ? "" : value + "";
 				});
+			}
 
-				if ( !values.length ) {
-					this.selectedIndex = -1;
-				}
+			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
 
-			} else {
+			// If set returns undefined, fall back to normal setting
+			if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
 				this.value = val;
 			}
 		});
@@ -1435,212 +2429,559 @@ jQuery.fn.extend({
 });
 
 jQuery.extend({
-	attrFn: {
-		val: true,
-		css: true,
-		html: true,
-		text: true,
-		data: true,
-		width: true,
+	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 ) {
-		// don't set attributes on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return undefined;
+		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);
-		}
-
-		var notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem ),
-			// Whether we are setting (or getting)
-			set = value !== undefined;
-
-		// Try to normalize/fix the name
-		name = notxml && jQuery.props[ name ] || name;
-
-		// Only do all the following if this is a node (faster for style)
-		if ( elem.nodeType === 1 ) {
-			// These attributes require special treatment
-			var special = rspecialurl.test( name );
-
-			// Safari mis-reports the default selected property of an option
-			// Accessing the parent's selectedIndex property fixes it
-			if ( name === "selected" && !jQuery.support.optSelected ) {
-				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 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;
 			}
 
-			// If applicable, access the attribute via the DOM 0 way
-			if ( name in elem && notxml && !special ) {
-				if ( set ) {
-					// We can't allow the type property to be changed (since it causes problems in IE)
-					if ( name === "type" && rtype.test( elem.nodeName ) && elem.parentNode ) {
-						jQuery.error( "type property can't be changed" );
+		} 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 );
 
-					elem[ name ] = value;
+					// Set corresponding property to false for boolean attributes
+					if ( isBool && propName in elem ) {
+						elem[ propName ] = false;
+					}
 				}
+			}
+		}
+	},
 
-				// browsers index elements by id/name on forms, give priority to attributes.
-				if ( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) ) {
-					return elem.getAttributeNode( name ).nodeValue;
+	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/
-				if ( name === "tabIndex" ) {
-					var attributeNode = elem.getAttributeNode( "tabIndex" );
+				var attributeNode = elem.getAttributeNode("tabindex");
 
-					return attributeNode && attributeNode.specified ?
-						attributeNode.value :
-						rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
-							0 :
-							undefined;
-				}
+				return attributeNode && attributeNode.specified ?
+					parseInt( attributeNode.value, 10 ) :
+					rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
+						0 :
+						undefined;
+			}
+		}
+	}
+});
 
-				return elem[ name ];
+// 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 + "" );
+		}
+	};
 
-			if ( !jQuery.support.style && notxml && name === "style" ) {
-				if ( set ) {
-					elem.style.cssText = "" + 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;
 				}
+			}
+		});
+	});
 
-				return elem.style.cssText;
+	// 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 );
+		}
+	};
+}
 
-			if ( set ) {
-				// convert the value to a string (all browsers do this but IE) see #1070
-				elem.setAttribute( name, "" + value );
+
+// 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 );
+		}
+	};
+}
 
-			var attr = !jQuery.support.hrefNormalized && notxml && special ?
-					// Some attributes require a special call on IE
-					elem.getAttribute( name, 2 ) :
-					elem.getAttribute( name );
+// 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;
 
-			// Non-existent attributes return null, we normalize to undefined
-			return attr === null ? undefined : attr;
+			if ( parent ) {
+				parent.selectedIndex;
+
+				// Make sure that it also works with optgroups, see #5701
+				if ( parent.parentNode ) {
+					parent.parentNode.selectedIndex;
+				}
+			}
+			return null;
 		}
+	});
+}
 
-		// elem is actually elem.style ... set the style
-		// Using attr for specific style information is now deprecated. Use style instead.
-		return jQuery.style( elem, name, value );
-	}
+// 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 rnamespaces = /\.(.*)$/,
-	fcleanup = function( nm ) {
-		return nm.replace(/[^\w\s\.\|`]/g, function( ch ) {
-			return "\\" + ch;
-		});
+
+
+
+
+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" );
 	};
 
 /*
- * A number of helper functions used for managing events.
- * Many of the ideas behind this code originated from
- * Dean Edwards' addEvent library.
+ * Helper functions for managing events -- not part of the public interface.
+ * Props to Dean Edwards' addEvent library for many of the ideas.
  */
 jQuery.event = {
 
-	// Bind an event to an element
-	// Original by Dean Edwards
-	add: function( elem, types, handler, data ) {
-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return;
-		}
+	add: function( elem, types, handler, data, selector ) {
 
-		// For whatever reason, IE has trouble passing the window object
-		// around, causing it to be cloned in the process
-		if ( elem.setInterval && ( elem !== window && !elem.frameElement ) ) {
-			elem = window;
-		}
+		var elemData, eventHandle, events,
+			t, tns, type, namespaces, handleObj,
+			handleObjIn, quick, handlers, special;
 
-		var handleObjIn, handleObj;
+		// 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 function being executed has a unique ID
+		// 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
-		var elemData = jQuery.data( elem );
-
-		// If no elemData is found then we must be trying to bind to one of the
-		// banned noData elements
-		if ( !elemData ) {
-			return;
+		// Init the element's event structure and main handler, if this is the first
+		events = elemData.events;
+		if ( !events ) {
+			elemData.events = events = {};
 		}
-
-		var events = elemData.events = elemData.events || {},
-			eventHandle = elemData.handle, eventHandle;
-
+		eventHandle = elemData.handle;
 		if ( !eventHandle ) {
-			elemData.handle = eventHandle = function() {
-				// Handle the second event of a trigger and when
-				// an event is called after a page has unloaded
-				return typeof jQuery !== "undefined" && !jQuery.event.triggered ?
-					jQuery.event.handle.apply( eventHandle.elem, arguments ) :
+			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;
 		}
 
-		// Add elem as a property of the handle function
-		// This is to prevent a memory leak with non-native events in IE.
-		eventHandle.elem = elem;
-
 		// Handle multiple events separated by a space
 		// jQuery(...).bind("mouseover mouseout", fn);
-		types = types.split(" ");
-
-		var type, i = 0, namespaces;
-
-		while ( (type = types[ i++ ]) ) {
-			handleObj = handleObjIn ?
-				jQuery.extend({}, handleObjIn) :
-				{ handler: handler, data: data };
+		types = jQuery.trim( hoverHack(types) ).split( " " );
+		for ( t = 0; t < types.length; t++ ) {
 
-			// Namespaced event handlers
-			if ( type.indexOf(".") > -1 ) {
-				namespaces = type.split(".");
-				type = namespaces.shift();
-				handleObj.namespace = namespaces.slice(0).sort().join(".");
+			tns = rtypenamespace.exec( types[t] ) || [];
+			type = tns[1];
+			namespaces = ( tns[2] || "" ).split( "." ).sort();
 
-			} else {
-				namespaces = [];
-				handleObj.namespace = "";
-			}
+			// If event changes its type, use the special event handlers for the changed type
+			special = jQuery.event.special[ type ] || {};
 
-			handleObj.type = type;
-			handleObj.guid = handler.guid;
+			// If selector defined, determine special event api type, otherwise given type
+			type = ( selector ? special.delegateType : special.bindType ) || type;
 
-			// Get the current list of functions bound to this event
-			var handlers = events[ type ],
-				special = jQuery.event.special[ type ] || {};
+			// Update special based on newly reset type
+			special = jQuery.event.special[ type ] || {};
 
-			// Init the event handler queue
+			// 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;
 
-				// Check for a special event handler
-				// Only use addEventListener/attachEvent if the special
-				// events handler returns false
+				// 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 ) {
@@ -1651,19 +2992,23 @@ jQuery.event = {
 					}
 				}
 			}
-			
-			if ( special.add ) { 
-				special.add.call( elem, handleObj ); 
+
+			if ( special.add ) {
+				special.add.call( elem, handleObj );
 
 				if ( !handleObj.handler.guid ) {
 					handleObj.handler.guid = handler.guid;
 				}
 			}
 
-			// Add the function to the element's handler list
-			handlers.push( handleObj );
+			// 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 been used, for global triggering
+			// Keep track of which events have ever been used, for event optimization
 			jQuery.event.global[ type ] = true;
 		}
 
@@ -1674,426 +3019,528 @@ jQuery.event = {
 	global: {},
 
 	// Detach an event or set of events from an element
-	remove: function( elem, types, handler, pos ) {
-		// don't do events on text and comment nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return;
-		}
-
-		var ret, type, fn, i = 0, all, namespaces, namespace, special, eventType, handleObj, origType,
-			elemData = jQuery.data( elem ),
-			events = elemData && elemData.events;
-
-		if ( !elemData || !events ) {
-			return;
-		}
-
-		// types is actually an event object here
-		if ( types && types.type ) {
-			handler = types.handler;
-			types = types.type;
-		}
-
-		// Unbind all events for the element
-		if ( !types || typeof types === "string" && types.charAt(0) === "." ) {
-			types = types || "";
+	remove: function( elem, types, handler, selector, mappedTypes ) {
 
-			for ( type in events ) {
-				jQuery.event.remove( elem, type + types );
-			}
+		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;
 		}
 
-		// Handle multiple events separated by a space
-		// jQuery(...).unbind("mouseover mouseout", fn);
-		types = types.split(" ");
-
-		while ( (type = types[ i++ ]) ) {
-			origType = type;
-			handleObj = null;
-			all = type.indexOf(".") < 0;
-			namespaces = [];
-
-			if ( !all ) {
-				// Namespaced event handlers
-				namespaces = type.split(".");
-				type = namespaces.shift();
+		// 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];
 
-				namespace = new RegExp("(^|\\.)" + 
-					jQuery.map( namespaces.slice(0).sort(), fcleanup ).join("\\.(?:.*\\.)?") + "(\\.|$)")
-			}
-
-			eventType = events[ type ];
-
-			if ( !eventType ) {
-				continue;
-			}
-
-			if ( !handler ) {
-				for ( var j = 0; j < eventType.length; j++ ) {
-					handleObj = eventType[ j ];
-
-					if ( all || namespace.test( handleObj.namespace ) ) {
-						jQuery.event.remove( elem, origType, handleObj.handler, j );
-						eventType.splice( j--, 1 );
-					}
+			// 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;
 
-			for ( var j = pos || 0; j < eventType.length; j++ ) {
+			// Remove matching events
+			for ( j = 0; j < eventType.length; j++ ) {
 				handleObj = eventType[ j ];
 
-				if ( handler.guid === handleObj.guid ) {
-					// remove the given handler for the given type
-					if ( all || namespace.test( handleObj.namespace ) ) {
-						if ( pos == null ) {
-							eventType.splice( j--, 1 );
-						}
+				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 ( special.remove ) {
-							special.remove.call( elem, handleObj );
-						}
+					if ( handleObj.selector ) {
+						eventType.delegateCount--;
 					}
-
-					if ( pos != null ) {
-						break;
+					if ( special.remove ) {
+						special.remove.call( elem, handleObj );
 					}
 				}
 			}
 
-			// remove generic event handler if no more handlers exist
-			if ( eventType.length === 0 || pos != null && eventType.length === 1 ) {
+			// 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 ) {
-					removeEvent( elem, type, elemData.handle );
+					jQuery.removeEvent( elem, type, elemData.handle );
 				}
 
-				ret = null;
 				delete events[ type ];
 			}
 		}
 
 		// Remove the expando if it's no longer used
 		if ( jQuery.isEmptyObject( events ) ) {
-			var handle = elemData.handle;
+			handle = elemData.handle;
 			if ( handle ) {
 				handle.elem = null;
 			}
 
-			delete elemData.events;
-			delete elemData.handle;
-
-			if ( jQuery.isEmptyObject( elemData ) ) {
-				jQuery.removeData( elem );
-			}
+			// removeData also checks for emptiness and clears the expando if empty
+			// so use it instead of delete
+			jQuery.removeData( elem, [ "events", "handle" ], true );
 		}
 	},
 
-	// bubbling is internal
-	trigger: function( event, data, elem /*, bubbling */ ) {
+	// 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,
-			bubbling = arguments[3];
+			namespaces = [],
+			cache, exclusive, i, cur, old, ontype, special, handle, eventPath, bubbleType;
 
-		if ( !bubbling ) {
-			event = typeof event === "object" ?
-				// jQuery.Event object
-				event[expando] ? event :
-				// Object literal
-				jQuery.extend( jQuery.Event(type), event ) :
-				// Just the event type (string)
-				jQuery.Event(type);
+		// 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 ) {
-				event.type = type = type.slice(0, -1);
-				event.exclusive = true;
-			}
+		if ( type.indexOf( "!" ) >= 0 ) {
+			// Exclusive events trigger only for the exact event (no namespaces)
+			type = type.slice(0, -1);
+			exclusive = true;
+		}
 
-			// Handle a global trigger
-			if ( !elem ) {
-				// Don't bubble custom events when global (to avoid too much overhead)
-				event.stopPropagation();
-
-				// Only trigger if we've ever bound an event for it
-				if ( jQuery.event.global[ type ] ) {
-					jQuery.each( jQuery.cache, function() {
-						if ( this.events && this.events[type] ) {
-							jQuery.event.trigger( event, data, this.handle.elem );
-						}
-					});
-				}
-			}
+		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 );
 
-			// Handle triggering a single element
+		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 ) {
 
-			// don't do events on text and comment nodes
-			if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
-				return undefined;
+			// 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 in case it is reused
-			event.result = undefined;
+		// Clean up the event in case it is being reused
+		event.result = undefined;
+		if ( !event.target ) {
 			event.target = elem;
-
-			// Clone the incoming data, if any
-			data = jQuery.makeArray( data );
-			data.unshift( event );
 		}
 
-		event.currentTarget = elem;
+		// Clone any incoming data and prepend the event, creating the handler arg list
+		data = data != null ? jQuery.makeArray( data ) : [];
+		data.unshift( event );
 
-		// Trigger the event, it is assumed that "handle" is a function
-		var handle = jQuery.data( elem, "handle" );
-		if ( handle ) {
-			handle.apply( elem, data );
+		// Allow special events to draw outside the lines
+		special = jQuery.event.special[ type ] || {};
+		if ( special.trigger && special.trigger.apply( elem, data ) === false ) {
+			return;
 		}
 
-		var parent = elem.parentNode || elem.ownerDocument;
+		// 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 ) ) {
 
-		// Trigger an inline bound script
-		try {
-			if ( !(elem && elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()]) ) {
-				if ( elem[ "on" + type ] && elem[ "on" + type ].apply( elem, data ) === false ) {
-					event.result = false;
-				}
+			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;
 			}
 
-		// prevent IE from throwing an error for some elements with some event types, see #3533
-		} catch (e) {}
+			// 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];
 
-		if ( !event.isPropagationStopped() && parent ) {
-			jQuery.event.trigger( event, data, parent, true );
+			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;
 
-		} else if ( !event.isDefaultPrevented() ) {
-			var target = event.target, old,
-				isClick = jQuery.nodeName(target, "a") && type === "click",
-				special = jQuery.event.special[ type ] || {};
+		// If nobody prevented the default action, do it now
+		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
 
-			if ( (!special._default || special._default.call( elem, event ) === false) && 
-				!isClick && !(target && target.nodeName && jQuery.noData[target.nodeName.toLowerCase()]) ) {
+			if ( (!special._default || special._default.apply( elem.ownerDocument, data ) === false) &&
+				!(type === "click" && jQuery.nodeName( elem, "a" )) && jQuery.acceptData( elem ) ) {
 
-				try {
-					if ( target[ type ] ) {
-						// Make sure that we don't accidentally re-trigger the onFOO events
-						old = target[ "on" + type ];
+				// 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 ) ) {
 
-						if ( old ) {
-							target[ "on" + type ] = null;
-						}
+					// Don't re-trigger an onFOO event when we call its FOO() method
+					old = elem[ ontype ];
 
-						jQuery.event.triggered = true;
-						target[ type ]();
+					if ( old ) {
+						elem[ ontype ] = null;
 					}
 
-				// prevent IE from throwing an error for some elements with some event types, see #3533
-				} catch (e) {}
+					// 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 ) {
-					target[ "on" + type ] = old;
+					if ( old ) {
+						elem[ ontype ] = old;
+					}
 				}
-
-				jQuery.event.triggered = false;
 			}
 		}
+
+		return event.result;
 	},
 
-	handle: function( event ) {
-		var all, handlers, namespaces, namespace, events;
+	dispatch: function( event ) {
 
-		event = arguments[0] = jQuery.event.fix( event || window.event );
-		event.currentTarget = this;
+		// Make a writable jQuery.Event from the native event object
+		event = jQuery.event.fix( event || window.event );
 
-		// Namespaced event handlers
-		all = event.type.indexOf(".") < 0 && !event.exclusive;
+		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;
 
-		if ( !all ) {
-			namespaces = event.type.split(".");
-			event.type = namespaces.shift();
-			namespace = new RegExp("(^|\\.)" + namespaces.slice(0).sort().join("\\.(?:.*\\.)?") + "(\\.|$)");
+		// 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;
 		}
 
-		var events = jQuery.data(this, "events"), handlers = events[ event.type ];
+		// 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") ) {
 
-		if ( events && handlers ) {
-			// Clone the handlers to prevent manipulation
-			handlers = handlers.slice(0);
+			// Pregenerate a single jQuery object for reuse with .is()
+			jqcur = jQuery(this);
+			jqcur.context = this.ownerDocument || this;
 
-			for ( var j = 0, l = handlers.length; j < l; j++ ) {
-				var handleObj = handlers[ j ];
+			for ( cur = event.target; cur != this; cur = cur.parentNode || this ) {
 
-				// Filter the functions by class
-				if ( all || namespace.test( handleObj.namespace ) ) {
-					// Pass in a reference to the handler function itself
-					// So that we can later remove it
-					event.handler = handleObj.handler;
-					event.data = handleObj.data;
-					event.handleObj = handleObj;
-	
-					var ret = handleObj.handler.apply( this, arguments );
+				// 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 ( ret !== undefined ) {
-						event.result = ret;
+						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();
 						}
 					}
-
-					if ( event.isImmediatePropagationStopped() ) {
-						break;
-					}
 				}
 			}
 		}
 
+		// Call the postDispatch hook for the mapped type
+		if ( special.postDispatch ) {
+			special.postDispatch.call( this, event );
+		}
+
 		return event.result;
 	},
 
-	props: "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
+	// 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[ expando ] ) {
+		if ( event[ jQuery.expando ] ) {
 			return event;
 		}
 
-		// store a copy of the original event object
-		// and "clone" to set read-only properties
-		var originalEvent = 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 ( var i = this.props.length, prop; i; ) {
-			prop = this.props[ --i ];
+		for ( i = copy.length; i; ) {
+			prop = copy[ --i ];
 			event[ prop ] = originalEvent[ prop ];
 		}
 
-		// Fix target property, if necessary
+		// Fix target property, if necessary (#1925, IE 6/7/8 & Safari2)
 		if ( !event.target ) {
-			event.target = event.srcElement || document; // Fixes #1925 where srcElement might not be defined either
+			event.target = originalEvent.srcElement || document;
 		}
 
-		// check if target is a textnode (safari)
+		// Target should not be a text node (#504, Safari)
 		if ( event.target.nodeType === 3 ) {
 			event.target = event.target.parentNode;
 		}
 
-		// Add relatedTarget, if necessary
-		if ( !event.relatedTarget && event.fromElement ) {
-			event.relatedTarget = event.fromElement === event.target ? event.toElement : event.fromElement;
-		}
-
-		// Calculate pageX/Y if missing and clientX/Y available
-		if ( event.pageX == null && event.clientX != null ) {
-			var doc = document.documentElement, body = document.body;
-			event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc && doc.clientLeft || body && body.clientLeft || 0);
-			event.pageY = event.clientY + (doc && doc.scrollTop  || body && body.scrollTop  || 0) - (doc && doc.clientTop  || body && body.clientTop  || 0);
-		}
-
-		// Add which for key events
-		if ( !event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode) ) {
-			event.which = event.charCode || event.keyCode;
-		}
-
-		// Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)
-		if ( !event.metaKey && event.ctrlKey ) {
+		// For mouse/key events; add metaKey if it's not there (#3368, IE6/7/8)
+		if ( event.metaKey === undefined ) {
 			event.metaKey = event.ctrlKey;
 		}
 
-		// Add which for click: 1 === left; 2 === middle; 3 === right
-		// Note: button is not normalized, so don't use it
-		if ( !event.which && event.button !== undefined ) {
-			event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) ));
-		}
-
-		return event;
+		return fixHook.filter? fixHook.filter( event, originalEvent ) : event;
 	},
 
-	// Deprecated, use jQuery.guid instead
-	guid: 1E8,
-
-	// Deprecated, use jQuery.proxy instead
-	proxy: jQuery.proxy,
-
 	special: {
 		ready: {
 			// Make sure the ready event is setup
-			setup: jQuery.bindReady,
-			teardown: jQuery.noop
+			setup: jQuery.bindReady
 		},
 
-		live: {
-			add: function( handleObj ) {
-				jQuery.event.add( this, handleObj.origType, jQuery.extend({}, handleObj, {handler: liveHandler}) ); 
-			},
-
-			remove: function( handleObj ) {
-				var remove = true,
-					type = handleObj.origType.replace(rnamespaces, "");
-				
-				jQuery.each( jQuery.data(this, "events").live || [], function() {
-					if ( type === this.origType.replace(rnamespaces, "") ) {
-						remove = false;
-						return false;
-					}
-				});
-
-				if ( remove ) {
-					jQuery.event.remove( this, handleObj.origType, liveHandler );
-				}
-			}
+		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 ( this.setInterval ) {
+				if ( jQuery.isWindow( this ) ) {
 					this.onbeforeunload = eventHandle;
 				}
-
-				return false;
 			},
+
 			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();
+		}
 	}
 };
 
-var removeEvent = document.removeEventListener ?
+// 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 ) {
-		elem.removeEventListener( type, handle, false );
-	} : 
+		if ( elem.removeEventListener ) {
+			elem.removeEventListener( type, handle, false );
+		}
+	} :
 	function( elem, type, handle ) {
-		elem.detachEvent( "on" + type, handle );
+		if ( elem.detachEvent ) {
+			elem.detachEvent( "on" + type, handle );
+		}
 	};
 
-jQuery.Event = function( src ) {
+jQuery.Event = function( src, props ) {
 	// Allow instantiation without the 'new' keyword
-	if ( !this.preventDefault ) {
-		return new jQuery.Event( src );
+	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;
 	}
 
-	// timeStamp is buggy for some events on Firefox(#3843)
-	// So we won't rely on the native value
-	this.timeStamp = now();
+	// 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[ expando ] = true;
+	this[ jQuery.expando ] = true;
 };
 
 function returnFalse() {
@@ -2113,13 +3560,15 @@ jQuery.Event.prototype = {
 		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)
-		e.returnValue = false;
+		} else {
+			e.returnValue = false;
+		}
 	},
 	stopPropagation: function() {
 		this.isPropagationStopped = returnTrue;
@@ -2144,319 +3593,312 @@ jQuery.Event.prototype = {
 	isImmediatePropagationStopped: returnFalse
 };
 
-// Checks if an event happened on an element within another element
-// Used in jQuery.event.special.mouseenter and mouseleave handlers
-var withinElement = function( event ) {
-	// Check if mouse(over|out) are still within the same parent element
-	var parent = event.relatedTarget;
-
-	// Firefox sometimes assigns relatedTarget a XUL element
-	// which we cannot access the parentNode property of
-	try {
-		// Traverse up the tree
-		while ( parent && parent !== this ) {
-			parent = parent.parentNode;
-		}
-
-		if ( parent !== this ) {
-			// set the correct event type
-			event.type = event.data;
-
-			// handle event if we actually just moused on to a non sub-element
-			jQuery.event.handle.apply( this, arguments );
-		}
-
-	// assuming we've left the element since we most likely mousedover a xul element
-	} catch(e) { }
-},
-
-// In case of event delegation, we only need to rename the event.type,
-// liveHandler will take care of the rest.
-delegate = function( event ) {
-	event.type = event.data;
-	jQuery.event.handle.apply( this, arguments );
-};
-
-// Create mouseenter and mouseleave events
+// Create mouseenter/leave events using mouseover/out and event-time checks
 jQuery.each({
 	mouseenter: "mouseover",
 	mouseleave: "mouseout"
 }, function( orig, fix ) {
 	jQuery.event.special[ orig ] = {
-		setup: function( data ) {
-			jQuery.event.add( this, fix, data && data.selector ? delegate : withinElement, orig );
-		},
-		teardown: function( data ) {
-			jQuery.event.remove( this, fix, data && data.selector ? delegate : withinElement );
+		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;
 		}
 	};
 });
 
-// submit delegation
+// IE submit delegation
 if ( !jQuery.support.submitBubbles ) {
 
 	jQuery.event.special.submit = {
-		setup: function( data, namespaces ) {
-			if ( this.nodeName.toLowerCase() !== "form" ) {
-				jQuery.event.add(this, "click.specialSubmit", function( e ) {
-					var elem = e.target, type = elem.type;
-
-					if ( (type === "submit" || type === "image") && jQuery( elem ).closest("form").length ) {
-						return trigger( "submit", this, arguments );
-					}
-				});
-	 
-				jQuery.event.add(this, "keypress.specialSubmit", function( e ) {
-					var elem = e.target, type = elem.type;
+		setup: function() {
+			// Only need this for delegated form submit events
+			if ( jQuery.nodeName( this, "form" ) ) {
+				return false;
+			}
 
-					if ( (type === "text" || type === "password") && jQuery( elem ).closest("form").length && e.keyCode === 13 ) {
-						return trigger( "submit", this, arguments );
-					}
-				});
+			// 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 );
+				}
+			}
+		},
 
-			} else {
+		teardown: function() {
+			// Only need this for delegated form submit events
+			if ( jQuery.nodeName( this, "form" ) ) {
 				return false;
 			}
-		},
 
-		teardown: function( namespaces ) {
-			jQuery.event.remove( this, ".specialSubmit" );
+			// Remove delegated handlers; cleanData eventually reaps submit handlers attached above
+			jQuery.event.remove( this, "._submit" );
 		}
 	};
-
 }
 
-// change delegation, happens here so we have bind.
+// IE change delegation and checkbox/radio fix
 if ( !jQuery.support.changeBubbles ) {
 
-	var formElems = /textarea|input|select/i,
-
-	changeFilters,
-
-	getVal = function( elem ) {
-		var type = elem.type, val = elem.value;
-
-		if ( type === "radio" || type === "checkbox" ) {
-			val = elem.checked;
-
-		} else if ( type === "select-multiple" ) {
-			val = elem.selectedIndex > -1 ?
-				jQuery.map( elem.options, function( elem ) {
-					return elem.selected;
-				}).join("-") :
-				"";
-
-		} else if ( elem.nodeName.toLowerCase() === "select" ) {
-			val = elem.selectedIndex;
-		}
-
-		return val;
-	},
-
-	testChange = function testChange( e ) {
-		var elem = e.target, data, val;
-
-		if ( !formElems.test( elem.nodeName ) || elem.readOnly ) {
-			return;
-		}
-
-		data = jQuery.data( elem, "_change_data" );
-		val = getVal(elem);
-
-		// the current data will be also retrieved by beforeactivate
-		if ( e.type !== "focusout" || elem.type !== "radio" ) {
-			jQuery.data( elem, "_change_data", val );
-		}
-		
-		if ( data === undefined || val === data ) {
-			return;
-		}
-
-		if ( data != null || val ) {
-			e.type = "change";
-			return jQuery.event.trigger( e, arguments[1], elem );
-		}
-	};
-
 	jQuery.event.special.change = {
-		filters: {
-			focusout: testChange, 
 
-			click: function( e ) {
-				var elem = e.target, type = elem.type;
+		setup: function() {
 
-				if ( type === "radio" || type === "checkbox" || elem.nodeName.toLowerCase() === "select" ) {
-					return testChange.call( this, e );
+			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 );
+						}
+					});
 				}
-			},
-
-			// Change has to be called before submit
-			// Keydown will be called before keypress, which is used in submit-event delegation
-			keydown: function( e ) {
-				var elem = e.target, type = elem.type;
+				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 ( (e.keyCode === 13 && elem.nodeName.toLowerCase() !== "textarea") ||
-					(e.keyCode === 32 && (type === "checkbox" || type === "radio")) ||
-					type === "select-multiple" ) {
-					return testChange.call( this, e );
+				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;
 				}
-			},
-
-			// Beforeactivate happens also before the previous element is blurred
-			// with this event you can't trigger a change event, but you can store
-			// information/focus[in] is not needed anymore
-			beforeactivate: function( e ) {
-				var elem = e.target;
-				jQuery.data( elem, "_change_data", getVal(elem) );
-			}
+			});
 		},
 
-		setup: function( data, namespaces ) {
-			if ( this.type === "file" ) {
-				return false;
-			}
+		handle: function( event ) {
+			var elem = event.target;
 
-			for ( var type in changeFilters ) {
-				jQuery.event.add( this, type + ".specialChange", changeFilters[type] );
+			// 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 );
 			}
-
-			return formElems.test( this.nodeName );
 		},
 
-		teardown: function( namespaces ) {
-			jQuery.event.remove( this, ".specialChange" );
+		teardown: function() {
+			jQuery.event.remove( this, "._change" );
 
-			return formElems.test( this.nodeName );
+			return rformElems.test( this.nodeName );
 		}
 	};
-
-	changeFilters = jQuery.event.special.change.filters;
-}
-
-function trigger( type, elem, args ) {
-	args[0].type = type;
-	return jQuery.event.handle.apply( elem, args );
 }
 
 // Create "bubbling" focus and blur events
-if ( document.addEventListener ) {
+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() {
-				this.addEventListener( orig, handler, true );
-			}, 
-			teardown: function() { 
-				this.removeEventListener( orig, handler, true );
+				if ( attaches++ === 0 ) {
+					document.addEventListener( orig, handler, true );
+				}
+			},
+			teardown: function() {
+				if ( --attaches === 0 ) {
+					document.removeEventListener( orig, handler, true );
+				}
 			}
 		};
-
-		function handler( e ) { 
-			e = jQuery.event.fix( e );
-			e.type = fix;
-			return jQuery.event.handle.call( this, e );
-		}
 	});
 }
 
-jQuery.each(["bind", "one"], function( i, name ) {
-	jQuery.fn[ name ] = function( type, data, fn ) {
-		// Handle object literals
-		if ( typeof type === "object" ) {
-			for ( var key in type ) {
-				this[ name ](key, data, type[key], fn);
-			}
-			return this;
-		}
-		
-		if ( jQuery.isFunction( data ) ) {
-			fn = data;
-			data = undefined;
-		}
-
-		var handler = name === "one" ? jQuery.proxy( fn, function( event ) {
-			jQuery( this ).unbind( event, handler );
-			return fn.apply( this, arguments );
-		}) : fn;
+jQuery.fn.extend({
 
-		if ( type === "unload" && name !== "one" ) {
-			this.one( type, data, fn );
+	on: function( types, selector, data, fn, /*INTERNAL*/ one ) {
+		var origFn, type;
 
-		} else {
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				jQuery.event.add( this[i], type, handler, data );
+		// 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;
 		}
 
-		return this;
-	};
-});
-
-jQuery.fn.extend({
-	unbind: function( type, fn ) {
-		// Handle object literals
-		if ( typeof type === "object" && !type.preventDefault ) {
-			for ( var key in type ) {
-				this.unbind(key, type[key]);
+		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;
+		}
 
-		} else {
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				jQuery.event.remove( this[i], type, fn );
+		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.live( types, data, fn, selector );
+		return this.on( types, selector, data, fn );
 	},
-	
 	undelegate: function( selector, types, fn ) {
-		if ( arguments.length === 0 ) {
-				return this.unbind( "live" );
-		
-		} else {
-			return this.die( types, null, fn, selector );
-		}
+		// ( 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] ) {
-			var event = jQuery.Event( type );
-			event.preventDefault();
-			event.stopPropagation();
-			jQuery.event.trigger( event, data, this[0] );
-			return event.result;
+			return jQuery.event.trigger( type, data, this[0], true );
 		}
 	},
 
 	toggle: function( fn ) {
 		// Save reference to arguments for access in closure
-		var args = arguments, i = 1;
+		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 ) {
-			jQuery.proxy( fn, args[ i++ ] );
+			args[ i++ ].guid = guid;
 		}
 
-		return this.click( jQuery.proxy( fn, 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;
-		}));
+		return this.click( toggler );
 	},
 
 	hover: function( fnOver, fnOut ) {
@@ -2464,216 +3906,106 @@ jQuery.fn.extend({
 	}
 });
 
-var liveMap = {
-	focus: "focusin",
-	blur: "focusout",
-	mouseenter: "mouseover",
-	mouseleave: "mouseout"
-};
-
-jQuery.each(["live", "die"], function( i, name ) {
-	jQuery.fn[ name ] = function( types, data, fn, origSelector /* Internal Use Only */ ) {
-		var type, i = 0, match, namespaces, preType,
-			selector = origSelector || this.selector,
-			context = origSelector ? this : jQuery( this.context );
+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 ) {
 
-		if ( jQuery.isFunction( data ) ) {
+	// Handle event binding
+	jQuery.fn[ name ] = function( data, fn ) {
+		if ( fn == null ) {
 			fn = data;
-			data = undefined;
+			data = null;
 		}
 
-		types = (types || "").split(" ");
-
-		while ( (type = types[ i++ ]) != null ) {
-			match = rnamespaces.exec( type );
-			namespaces = "";
+		return arguments.length > 0 ?
+			this.on( name, null, data, fn ) :
+			this.trigger( name );
+	};
 
-			if ( match )  {
-				namespaces = match[0];
-				type = type.replace( rnamespaces, "" );
-			}
+	if ( jQuery.attrFn ) {
+		jQuery.attrFn[ name ] = true;
+	}
 
-			if ( type === "hover" ) {
-				types.push( "mouseenter" + namespaces, "mouseleave" + namespaces );
-				continue;
-			}
+	if ( rkeyEvent.test( name ) ) {
+		jQuery.event.fixHooks[ name ] = jQuery.event.keyHooks;
+	}
 
-			preType = type;
+	if ( rmouseEvent.test( name ) ) {
+		jQuery.event.fixHooks[ name ] = jQuery.event.mouseHooks;
+	}
+});
 
-			if ( type === "focus" || type === "blur" ) {
-				types.push( liveMap[ type ] + namespaces );
-				type = type + namespaces;
 
-			} else {
-				type = (liveMap[ type ] || type) + namespaces;
-			}
 
-			if ( name === "live" ) {
-				// bind live handler
-				context.each(function(){
-					jQuery.event.add( this, liveConvert( type, selector ),
-						{ data: data, selector: selector, handler: fn, origType: type, origHandler: fn, preType: preType } );
-				});
+/*!
+ * Sizzle CSS Selector Engine
+ *  Copyright 2011, The Dojo Foundation
+ *  Released under the MIT, BSD, and GPL Licenses.
+ *  More information: http://sizzlejs.com/
+ */
+(function(){
 
-			} else {
-				// unbind live handler
-				context.unbind( liveConvert( type, selector ), fn );
-			}
-		}
-		
-		return this;
-	}
-});
-
-function liveHandler( event ) {
-	var stop, elems = [], selectors = [], args = arguments,
-		related, match, handleObj, elem, j, i, l, data,
-		events = jQuery.data( this, "events" );
-
-	// Make sure we avoid non-left-click bubbling in Firefox (#3861)
-	if ( event.liveFired === this || !events || !events.live || event.button && event.type === "click" ) {
-		return;
-	}
-
-	event.liveFired = this;
-
-	var live = events.live.slice(0);
-
-	for ( j = 0; j < live.length; j++ ) {
-		handleObj = live[j];
-
-		if ( handleObj.origType.replace( rnamespaces, "" ) === event.type ) {
-			selectors.push( handleObj.selector );
-
-		} else {
-			live.splice( j--, 1 );
-		}
-	}
-
-	match = jQuery( event.target ).closest( selectors, event.currentTarget );
-
-	for ( i = 0, l = match.length; i < l; i++ ) {
-		for ( j = 0; j < live.length; j++ ) {
-			handleObj = live[j];
-
-			if ( match[i].selector === handleObj.selector ) {
-				elem = match[i].elem;
-				related = null;
-
-				// Those two events require additional checking
-				if ( handleObj.preType === "mouseenter" || handleObj.preType === "mouseleave" ) {
-					related = jQuery( event.relatedTarget ).closest( handleObj.selector )[0];
-				}
-
-				if ( !related || related !== elem ) {
-					elems.push({ elem: elem, handleObj: handleObj });
-				}
-			}
-		}
-	}
-
-	for ( i = 0, l = elems.length; i < l; i++ ) {
-		match = elems[i];
-		event.currentTarget = match.elem;
-		event.data = match.handleObj.data;
-		event.handleObj = match.handleObj;
-
-		if ( match.handleObj.origHandler.apply( match.elem, args ) === false ) {
-			stop = false;
-			break;
-		}
-	}
-
-	return stop;
-}
-
-function liveConvert( type, selector ) {
-	return "live." + (type && type !== "*" ? type + "." : "") + selector.replace(/\./g, "`").replace(/ /g, "&");
-}
-
-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").split(" "), function( i, name ) {
-
-	// Handle event binding
-	jQuery.fn[ name ] = function( fn ) {
-		return fn ? this.bind( name, fn ) : this.trigger( name );
-	};
-
-	if ( jQuery.attrFn ) {
-		jQuery.attrFn[ name ] = true;
-	}
-});
-
-// Prevent memory leaks in IE
-// Window isn't included so as not to unbind existing unload events
-// More info:
-//  - http://isaacschlueter.com/2006/10/msie-memory-leaks/
-if ( window.attachEvent && !window.addEventListener ) {
-	window.attachEvent("onunload", function() {
-		for ( var id in jQuery.cache ) {
-			if ( jQuery.cache[ id ].handle ) {
-				// Try/Catch is to handle iframes being unloaded, see #4280
-				try {
-					jQuery.event.remove( jQuery.cache[ id ].handle.elem );
-				} catch(e) {}
-			}
-		}
-	});
-}
-/*!
- * Sizzle CSS Selector Engine - v1.0
- *  Copyright 2009, The Dojo Foundation
- *  Released under the MIT, BSD, and GPL Licenses.
- *  More information: http://sizzlejs.com/
- */
-(function(){
-
-var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
+var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
+	expando = "sizcache" + (Math.random() + '').replace('.', ''),
 	done = 0,
 	toString = Object.prototype.toString,
 	hasDuplicate = false,
-	baseHasDuplicate = true;
+	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(){
+[0, 0].sort(function() {
 	baseHasDuplicate = false;
 	return 0;
 });
 
-var Sizzle = function(selector, context, results, seed) {
+var Sizzle = function( selector, context, results, seed ) {
 	results = results || [];
-	var origContext = context = context || document;
+	context = context || document;
+
+	var origContext = context;
 
 	if ( context.nodeType !== 1 && context.nodeType !== 9 ) {
 		return [];
 	}
-	
+
 	if ( !selector || typeof selector !== "string" ) {
 		return results;
 	}
 
-	var parts = [], m, set, checkSet, extra, prune = true, contextXML = isXML(context),
+	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)
-	while ( (chunker.exec(""), m = chunker.exec(soFar)) !== null ) {
-		soFar = m[3];
-		
-		parts.push( m[1] );
-		
-		if ( m[2] ) {
-			extra = m[3];
-			break;
+	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 );
+			set = posProcess( parts[0] + parts[1], context, seed );
+
 		} else {
 			set = Expr.relative[ parts[0] ] ?
 				[ context ] :
@@ -2685,33 +4017,42 @@ var Sizzle = function(selector, context, results, seed) {
 				if ( Expr.relative[ selector ] ) {
 					selector += parts.shift();
 				}
-				
-				set = posProcess( selector, set );
+
+				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]) ) {
-			var ret = Sizzle.find( parts.shift(), context, contextXML );
-			context = ret.expr ? Sizzle.filter( ret.expr, ret.set )[0] : ret.set[0];
+
+			ret = Sizzle.find( parts.shift(), context, contextXML );
+			context = ret.expr ?
+				Sizzle.filter( ret.expr, ret.set )[0] :
+				ret.set[0];
 		}
 
 		if ( context ) {
-			var ret = seed ?
+			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;
+
+			set = ret.expr ?
+				Sizzle.filter( ret.expr, ret.set ) :
+				ret.set;
 
 			if ( parts.length > 0 ) {
-				checkSet = makeArray(set);
+				checkSet = makeArray( set );
+
 			} else {
 				prune = false;
 			}
 
 			while ( parts.length ) {
-				var cur = parts.pop(), pop = cur;
+				cur = parts.pop();
+				pop = cur;
 
 				if ( !Expr.relative[ cur ] ) {
 					cur = "";
@@ -2725,6 +4066,7 @@ var Sizzle = function(selector, context, results, seed) {
 
 				Expr.relative[ cur ]( checkSet, pop, contextXML );
 			}
+
 		} else {
 			checkSet = parts = [];
 		}
@@ -2741,19 +4083,22 @@ var Sizzle = function(selector, context, results, seed) {
 	if ( toString.call(checkSet) === "[object Array]" ) {
 		if ( !prune ) {
 			results.push.apply( results, checkSet );
+
 		} else if ( context && context.nodeType === 1 ) {
-			for ( var i = 0; checkSet[i] != null; i++ ) {
-				if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && contains(context, checkSet[i])) ) {
+			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 ( var i = 0; checkSet[i] != null; i++ ) {
+			for ( i = 0; checkSet[i] != null; i++ ) {
 				if ( checkSet[i] && checkSet[i].nodeType === 1 ) {
 					results.push( set[i] );
 				}
 			}
 		}
+
 	} else {
 		makeArray( checkSet, results );
 	}
@@ -2766,15 +4111,15 @@ var Sizzle = function(selector, context, results, seed) {
 	return results;
 };
 
-Sizzle.uniqueSort = function(results){
+Sizzle.uniqueSort = function( results ) {
 	if ( sortOrder ) {
 		hasDuplicate = baseHasDuplicate;
-		results.sort(sortOrder);
+		results.sort( sortOrder );
 
 		if ( hasDuplicate ) {
 			for ( var i = 1; i < results.length; i++ ) {
-				if ( results[i] === results[i-1] ) {
-					results.splice(i--, 1);
+				if ( results[i] === results[ i - 1 ] ) {
+					results.splice( i--, 1 );
 				}
 			}
 		}
@@ -2783,27 +4128,32 @@ Sizzle.uniqueSort = function(results){
 	return results;
 };
 
-Sizzle.matches = function(expr, set){
-	return Sizzle(expr, null, null, set);
+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, match;
+Sizzle.find = function( expr, context, isXML ) {
+	var set, i, len, match, type, left;
 
 	if ( !expr ) {
 		return [];
 	}
 
-	for ( var i = 0, l = Expr.order.length; i < l; i++ ) {
-		var type = Expr.order[i], match;
-		
+	for ( i = 0, len = Expr.order.length; i < len; i++ ) {
+		type = Expr.order[i];
+
 		if ( (match = Expr.leftMatch[ type ].exec( expr )) ) {
-			var left = match[1];
-			match.splice(1,1);
+			left = match[1];
+			match.splice( 1, 1 );
 
 			if ( left.substr( left.length - 1 ) !== "\\" ) {
-				match[1] = (match[1] || "").replace(/\\/g, "");
+				match[1] = (match[1] || "").replace( rBackslash, "" );
 				set = Expr.find[ type ]( match, context, isXML );
+
 				if ( set != null ) {
 					expr = expr.replace( Expr.match[ type ], "" );
 					break;
@@ -2813,20 +4163,29 @@ Sizzle.find = function(expr, context, isXML){
 	}
 
 	if ( !set ) {
-		set = context.getElementsByTagName("*");
+		set = typeof context.getElementsByTagName !== "undefined" ?
+			context.getElementsByTagName( "*" ) :
+			[];
 	}
 
-	return {set: set, expr: expr};
+	return { set: set, expr: expr };
 };
 
-Sizzle.filter = function(expr, set, inplace, not){
-	var old = expr, result = [], curLoop = set, match, anyFound,
-		isXMLFilter = set && set[0] && isXML(set[0]);
+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 ( var type in Expr.filter ) {
+		for ( type in Expr.filter ) {
 			if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) {
-				var filter = Expr.filter[ type ], found, item, left = match[1];
+				filter = Expr.filter[ type ];
+				left = match[1];
+
 				anyFound = false;
 
 				match.splice(1,1);
@@ -2844,23 +4203,26 @@ Sizzle.filter = function(expr, set, inplace, not){
 
 					if ( !match ) {
 						anyFound = found = true;
+
 					} else if ( match === true ) {
 						continue;
 					}
 				}
 
 				if ( match ) {
-					for ( var i = 0; (item = curLoop[i]) != null; i++ ) {
+					for ( i = 0; (item = curLoop[i]) != null; i++ ) {
 						if ( item ) {
 							found = filter( item, match, i, curLoop );
-							var pass = not ^ !!found;
+							pass = not ^ found;
 
 							if ( inplace && found != null ) {
 								if ( pass ) {
 									anyFound = true;
+
 								} else {
 									curLoop[i] = false;
 								}
+
 							} else if ( pass ) {
 								result.push( item );
 								anyFound = true;
@@ -2889,6 +4251,7 @@ Sizzle.filter = function(expr, set, inplace, not){
 		if ( expr === old ) {
 			if ( anyFound == null ) {
 				Sizzle.error( expr );
+
 			} else {
 				break;
 			}
@@ -2901,35 +4264,82 @@ Sizzle.filter = function(expr, set, inplace, not){
 };
 
 Sizzle.error = function( msg ) {
-	throw "Syntax error, unrecognized expression: " + 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|)\s*\]/,
-		TAG: /^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/,
-		CHILD: /:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,
-		POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,
-		PSEUDO: /:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/
+		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");
+		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 && !/\W/.test(part),
+				isTag = isPartStr && !rNonWord.test( part ),
 				isPartStrNotTag = isPartStr && !isTag;
 
 			if ( isTag ) {
@@ -2950,22 +4360,29 @@ var Expr = Sizzle.selectors = {
 				Sizzle.filter( part, checkSet, true );
 			}
 		},
-		">": function(checkSet, part){
-			var isPartStr = typeof part === "string";
 
-			if ( isPartStr && !/\W/.test(part) ) {
+		">": function( checkSet, part ) {
+			var elem,
+				isPartStr = typeof part === "string",
+				i = 0,
+				l = checkSet.length;
+
+			if ( isPartStr && !rNonWord.test( part ) ) {
 				part = part.toLowerCase();
 
-				for ( var i = 0, l = checkSet.length; i < l; i++ ) {
-					var elem = checkSet[i];
+				for ( ; i < l; i++ ) {
+					elem = checkSet[i];
+
 					if ( elem ) {
 						var parent = elem.parentNode;
 						checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false;
 					}
 				}
+
 			} else {
-				for ( var i = 0, l = checkSet.length; i < l; i++ ) {
-					var elem = checkSet[i];
+				for ( ; i < l; i++ ) {
+					elem = checkSet[i];
+
 					if ( elem ) {
 						checkSet[i] = isPartStr ?
 							elem.parentNode :
@@ -2978,37 +4395,50 @@ var Expr = Sizzle.selectors = {
 				}
 			}
 		},
+
 		"": function(checkSet, part, isXML){
-			var doneName = done++, checkFn = dirCheck;
+			var nodeCheck,
+				doneName = done++,
+				checkFn = dirCheck;
 
-			if ( typeof part === "string" && !/\W/.test(part) ) {
-				var nodeCheck = part = part.toLowerCase();
+			if ( typeof part === "string" && !rNonWord.test( part ) ) {
+				part = part.toLowerCase();
+				nodeCheck = part;
 				checkFn = dirNodeCheck;
 			}
 
-			checkFn("parentNode", part, doneName, checkSet, nodeCheck, isXML);
+			checkFn( "parentNode", part, doneName, checkSet, nodeCheck, isXML );
 		},
-		"~": function(checkSet, part, isXML){
-			var doneName = done++, checkFn = dirCheck;
 
-			if ( typeof part === "string" && !/\W/.test(part) ) {
-				var nodeCheck = part = part.toLowerCase();
+		"~": 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);
+			checkFn( "previousSibling", part, doneName, checkSet, nodeCheck, isXML );
 		}
 	},
+
 	find: {
-		ID: function(match, context, isXML){
+		ID: function( match, context, isXML ) {
 			if ( typeof context.getElementById !== "undefined" && !isXML ) {
 				var m = context.getElementById(match[1]);
-				return m ? [m] : [];
+				// 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){
+
+		NAME: function( match, context ) {
 			if ( typeof context.getElementsByName !== "undefined" ) {
-				var ret = [], results = context.getElementsByName(match[1]);
+				var ret = [],
+					results = context.getElementsByName( match[1] );
 
 				for ( var i = 0, l = results.length; i < l; i++ ) {
 					if ( results[i].getAttribute("name") === match[1] ) {
@@ -3019,13 +4449,16 @@ var Expr = Sizzle.selectors = {
 				return ret.length === 0 ? null : ret;
 			}
 		},
-		TAG: function(match, context){
-			return context.getElementsByTagName(match[1]);
+
+		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(/\\/g, "") + " ";
+		CLASS: function( match, curLoop, inplace, result, not, isXML ) {
+			match = " " + match[1].replace( rBackslash, "" ) + " ";
 
 			if ( isXML ) {
 				return match;
@@ -3033,10 +4466,11 @@ var Expr = Sizzle.selectors = {
 
 			for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) {
 				if ( elem ) {
-					if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n]/g, " ").indexOf(match) >= 0) ) {
+					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;
 					}
@@ -3045,16 +4479,25 @@ var Expr = Sizzle.selectors = {
 
 			return false;
 		},
-		ID: function(match){
-			return match[1].replace(/\\/g, "");
+
+		ID: function( match ) {
+			return match[1].replace( rBackslash, "" );
 		},
-		TAG: function(match, curLoop){
-			return match[1].toLowerCase();
+
+		TAG: function( match, curLoop ) {
+			return match[1].replace( rBackslash, "" ).toLowerCase();
 		},
-		CHILD: function(match){
+
+		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(
+				var test = /(-?)(\d*)(?:n([+\-]?\d*))?/.exec(
 					match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" ||
 					!/\D/.test( match[2] ) && "0n+" + match[2] || match[2]);
 
@@ -3062,217 +4505,296 @@ var Expr = Sizzle.selectors = {
 				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].replace(/\\/g, "");
-			
+
+		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){
+
+		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){
+
+		POS: function( match ) {
 			match.unshift( true );
+
 			return match;
 		}
 	},
+
 	filters: {
-		enabled: function(elem){
+		enabled: function( elem ) {
 			return elem.disabled === false && elem.type !== "hidden";
 		},
-		disabled: function(elem){
+
+		disabled: function( elem ) {
 			return elem.disabled === true;
 		},
-		checked: function(elem){
+
+		checked: function( elem ) {
 			return elem.checked === true;
 		},
-		selected: function(elem){
+
+		selected: function( elem ) {
 			// Accessing this property makes selected-by-default
 			// options in Safari work properly
-			elem.parentNode.selectedIndex;
+			if ( elem.parentNode ) {
+				elem.parentNode.selectedIndex;
+			}
+
 			return elem.selected === true;
 		},
-		parent: function(elem){
+
+		parent: function( elem ) {
 			return !!elem.firstChild;
 		},
-		empty: function(elem){
+
+		empty: function( elem ) {
 			return !elem.firstChild;
 		},
-		has: function(elem, i, match){
+
+		has: function( elem, i, match ) {
 			return !!Sizzle( match[3], elem ).length;
 		},
-		header: function(elem){
-			return /h\d/i.test( elem.nodeName );
+
+		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 );
 		},
-		text: function(elem){
-			return "text" === elem.type;
+
+		radio: function( elem ) {
+			return elem.nodeName.toLowerCase() === "input" && "radio" === elem.type;
 		},
-		radio: function(elem){
-			return "radio" === elem.type;
+
+		checkbox: function( elem ) {
+			return elem.nodeName.toLowerCase() === "input" && "checkbox" === elem.type;
 		},
-		checkbox: function(elem){
-			return "checkbox" === elem.type;
+
+		file: function( elem ) {
+			return elem.nodeName.toLowerCase() === "input" && "file" === elem.type;
 		},
-		file: function(elem){
-			return "file" === elem.type;
+
+		password: function( elem ) {
+			return elem.nodeName.toLowerCase() === "input" && "password" === elem.type;
 		},
-		password: function(elem){
-			return "password" === elem.type;
+
+		submit: function( elem ) {
+			var name = elem.nodeName.toLowerCase();
+			return (name === "input" || name === "button") && "submit" === elem.type;
 		},
-		submit: function(elem){
-			return "submit" === elem.type;
+
+		image: function( elem ) {
+			return elem.nodeName.toLowerCase() === "input" && "image" === elem.type;
 		},
-		image: function(elem){
-			return "image" === elem.type;
+
+		reset: function( elem ) {
+			var name = elem.nodeName.toLowerCase();
+			return (name === "input" || name === "button") && "reset" === elem.type;
 		},
-		reset: function(elem){
-			return "reset" === elem.type;
+
+		button: function( elem ) {
+			var name = elem.nodeName.toLowerCase();
+			return name === "input" && "button" === elem.type || name === "button";
 		},
-		button: function(elem){
-			return "button" === elem.type || elem.nodeName.toLowerCase() === "button";
+
+		input: function( elem ) {
+			return (/input|select|textarea|button/i).test( elem.nodeName );
 		},
-		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){
+		first: function( elem, i ) {
 			return i === 0;
 		},
-		last: function(elem, i, match, array){
+
+		last: function( elem, i, match, array ) {
 			return i === array.length - 1;
 		},
-		even: function(elem, i){
+
+		even: function( elem, i ) {
 			return i % 2 === 0;
 		},
-		odd: function(elem, i){
+
+		odd: function( elem, i ) {
 			return i % 2 === 1;
 		},
-		lt: function(elem, i, match){
+
+		lt: function( elem, i, match ) {
 			return i < match[3] - 0;
 		},
-		gt: function(elem, i, match){
+
+		gt: function( elem, i, match ) {
 			return i > match[3] - 0;
 		},
-		nth: function(elem, i, match){
+
+		nth: function( elem, i, match ) {
 			return match[3] - 0 === i;
 		},
-		eq: function(elem, i, match){
+
+		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 ];
+		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 i = 0, l = not.length; i < l; i++ ) {
-					if ( not[i] === elem ) {
+				for ( var j = 0, l = not.length; j < l; j++ ) {
+					if ( not[j] === elem ) {
 						return false;
 					}
 				}
 
 				return true;
+
 			} else {
-				Sizzle.error( "Syntax error, unrecognized expression: " + name );
+				Sizzle.error( name );
 			}
 		},
-		CHILD: function(elem, match){
-			var type = match[1], node = elem;
-			switch (type) {
-				case 'only':
-				case 'first':
-					while ( (node = node.previousSibling) )	 {
-						if ( node.nodeType === 1 ) { 
-							return false; 
+
+		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; 
+
+					if ( type === "first" ) {
+						return true;
 					}
+
 					node = elem;
-				case 'last':
-					while ( (node = node.nextSibling) )	 {
-						if ( node.nodeType === 1 ) { 
-							return false; 
+
+					/* falls through */
+				case "last":
+					while ( (node = node.nextSibling) ) {
+						if ( node.nodeType === 1 ) {
+							return false;
 						}
 					}
+
 					return true;
-				case 'nth':
-					var first = match[2], last = match[3];
+
+				case "nth":
+					first = match[2];
+					last = match[3];
 
 					if ( first === 1 && last === 0 ) {
 						return true;
 					}
-					
-					var doneName = match[0],
-						parent = elem.parentNode;
-	
-					if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) {
-						var count = 0;
+
+					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.sizcache = doneName;
+						}
+
+						parent[ expando ] = doneName;
 					}
-					
-					var diff = elem.nodeIndex - last;
+
+					diff = elem.nodeIndex - last;
+
 					if ( first === 0 ) {
 						return diff === 0;
+
 					} else {
 						return ( diff % first === 0 && diff / first >= 0 );
 					}
 			}
 		},
-		ID: function(elem, match){
+
+		ID: function( elem, match ) {
 			return elem.nodeType === 1 && elem.getAttribute("id") === match;
 		},
-		TAG: function(elem, match){
-			return (match === "*" && elem.nodeType === 1) || elem.nodeName.toLowerCase() === match;
+
+		TAG: function( elem, match ) {
+			return (match === "*" && elem.nodeType === 1) || !!elem.nodeName && elem.nodeName.toLowerCase() === match;
 		},
-		CLASS: function(elem, match){
+
+		CLASS: function( elem, match ) {
 			return (" " + (elem.className || elem.getAttribute("class")) + " ")
 				.indexOf( match ) > -1;
 		},
-		ATTR: function(elem, match){
+
+		ATTR: function( elem, match ) {
 			var name = match[1],
-				result = Expr.attrHandle[ name ] ?
+				result = Sizzle.attr ?
+					Sizzle.attr( elem, name ) :
+					Expr.attrHandle[ name ] ?
 					Expr.attrHandle[ name ]( elem ) :
 					elem[ name ] != null ?
 						elem[ name ] :
@@ -3283,6 +4805,8 @@ var Expr = Sizzle.selectors = {
 
 			return result == null ?
 				type === "!=" :
+				!type && Sizzle.attr ?
+				result != null :
 				type === "=" ?
 				value === check :
 				type === "*=" ?
@@ -3301,8 +4825,10 @@ var Expr = Sizzle.selectors = {
 				value === check || value.substr(0, check.length + 1) === check + "-" :
 				false;
 		},
-		POS: function(elem, match, i, array){
-			var name = match[2], filter = Expr.setFilters[ name ];
+
+		POS: function( elem, match, i, array ) {
+			var name = match[2],
+				filter = Expr.setFilters[ name ];
 
 			if ( filter ) {
 				return filter( elem, i, match, array );
@@ -3311,23 +4837,27 @@ var Expr = Sizzle.selectors = {
 	}
 };
 
-var origPOS = Expr.match.POS;
+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, function(all, num){
-		return "\\" + (num - 0 + 1);
-	}));
+	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) {
+var makeArray = function( array, results ) {
 	array = Array.prototype.slice.call( array, 0 );
 
 	if ( results ) {
 		results.push.apply( results, array );
 		return results;
 	}
-	
+
 	return array;
 };
 
@@ -3339,19 +4869,22 @@ 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 ret = results || [];
+} 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 i = 0, l = array.length; i < l; i++ ) {
+				for ( var l = array.length; i < l; i++ ) {
 					ret.push( array[i] );
 				}
+
 			} else {
-				for ( var i = 0; array[i]; i++ ) {
+				for ( ; array[i]; i++ ) {
 					ret.push( array[i] );
 				}
 			}
@@ -3361,78 +4894,100 @@ try {
 	};
 }
 
-var sortOrder;
+var sortOrder, siblingCheck;
 
 if ( document.documentElement.compareDocumentPosition ) {
 	sortOrder = function( a, b ) {
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+		}
+
 		if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) {
-			if ( a == b ) {
-				hasDuplicate = true;
-			}
 			return a.compareDocumentPosition ? -1 : 1;
 		}
 
-		var ret = a.compareDocumentPosition(b) & 4 ? -1 : a === b ? 0 : 1;
-		if ( ret === 0 ) {
-			hasDuplicate = true;
-		}
-		return ret;
+		return a.compareDocumentPosition(b) & 4 ? -1 : 1;
 	};
-} else if ( "sourceIndex" in document.documentElement ) {
+
+} else {
 	sortOrder = function( a, b ) {
-		if ( !a.sourceIndex || !b.sourceIndex ) {
-			if ( a == b ) {
-				hasDuplicate = true;
-			}
-			return a.sourceIndex ? -1 : 1;
+		// 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 ret = a.sourceIndex - b.sourceIndex;
-		if ( ret === 0 ) {
-			hasDuplicate = true;
+		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;
 		}
-		return ret;
-	};
-} else if ( document.createRange ) {
-	sortOrder = function( a, b ) {
-		if ( !a.ownerDocument || !b.ownerDocument ) {
-			if ( a == b ) {
-				hasDuplicate = true;
-			}
-			return a.ownerDocument ? -1 : 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;
 		}
 
-		var aRange = a.ownerDocument.createRange(), bRange = b.ownerDocument.createRange();
-		aRange.setStart(a, 0);
-		aRange.setEnd(a, 0);
-		bRange.setStart(b, 0);
-		bRange.setEnd(b, 0);
-		var ret = aRange.compareBoundaryPoints(Range.START_TO_END, bRange);
-		if ( ret === 0 ) {
-			hasDuplicate = true;
+		cur = bup;
+
+		while ( cur ) {
+			bp.unshift( cur );
+			cur = cur.parentNode;
 		}
-		return ret;
+
+		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 );
 	};
-}
 
-// Utility function for retreiving the text value of an array of DOM nodes
-function getText( elems ) {
-	var ret = "", elem;
+	siblingCheck = function( a, b, ret ) {
+		if ( a === b ) {
+			return ret;
+		}
 
-	for ( var i = 0; elems[i]; i++ ) {
-		elem = elems[i];
+		var cur = a.nextSibling;
 
-		// Get the text from text nodes and CDATA nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 4 ) {
-			ret += elem.nodeValue;
+		while ( cur ) {
+			if ( cur === b ) {
+				return -1;
+			}
 
-		// Traverse everything else, except comment nodes
-		} else if ( elem.nodeType !== 8 ) {
-			ret += getText( elem.childNodes );
+			cur = cur.nextSibling;
 		}
-	}
 
-	return ret;
+		return 1;
+	};
 }
 
 // Check to see if the browser returns elements by name when
@@ -3440,31 +4995,40 @@ function getText( elems ) {
 (function(){
 	// We're going to inject a fake input element with a specified name
 	var form = document.createElement("div"),
-		id = "script" + (new Date).getTime();
+		id = "script" + (new Date()).getTime(),
+		root = document.documentElement;
+
 	form.innerHTML = "";
 
 	// Inject it into the root element, check its status, and remove it quickly
-	var root = document.documentElement;
 	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){
+		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 : [];
+
+				return m ?
+					m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ?
+						[m] :
+						undefined :
+					[];
 			}
 		};
 
-		Expr.filter.ID = function(elem, match){
+		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 );
-	root = form = null; // release memory in IE
+
+	// release memory in IE
+	root = form = null;
 })();
 
 (function(){
@@ -3477,8 +5041,8 @@ function getText( elems ) {
 
 	// Make sure no comments are found
 	if ( div.getElementsByTagName("*").length > 0 ) {
-		Expr.find.TAG = function(match, context){
-			var results = context.getElementsByTagName(match[1]);
+		Expr.find.TAG = function( match, context ) {
+			var results = context.getElementsByTagName( match[1] );
 
 			// Filter out possible comments
 			if ( match[1] === "*" ) {
@@ -3499,19 +5063,25 @@ function getText( elems ) {
 
 	// Check to see if an attribute returns normalized href attributes
 	div.innerHTML = "";
+
 	if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" &&
 			div.firstChild.getAttribute("href") !== "#" ) {
-		Expr.attrHandle.href = function(elem){
-			return elem.getAttribute("href", 2);
+
+		Expr.attrHandle.href = function( elem ) {
+			return elem.getAttribute( "href", 2 );
 		};
 	}
 
-	div = null; // release memory in IE
+	// release memory in IE
+	div = null;
 })();
 
 if ( document.querySelectorAll ) {
 	(function(){
-		var oldSizzle = Sizzle, div = document.createElement("div");
+		var oldSizzle = Sizzle,
+			div = document.createElement("div"),
+			id = "__sizzle__";
+
 		div.innerHTML = "";
 
 		// Safari can't handle uppercase or unicode characters when
@@ -3519,29 +5089,145 @@ if ( document.querySelectorAll ) {
 		if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {
 			return;
 		}
-	
-		Sizzle = function(query, context, extra, seed){
+
+		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 && context.nodeType === 9 && !isXML(context) ) {
-				try {
-					return makeArray( context.querySelectorAll(query), extra );
-				} catch(e){}
-			}
-		
-			return oldSizzle(query, context, extra, seed);
-		};
+			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 ];
 		}
 
-		div = null; // release memory in IE
+		// 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");
 
@@ -3559,32 +5245,35 @@ if ( document.querySelectorAll ) {
 	if ( div.getElementsByClassName("e").length === 1 ) {
 		return;
 	}
-	
+
 	Expr.order.splice(1, 0, "CLASS");
-	Expr.find.CLASS = function(match, context, isXML) {
+	Expr.find.CLASS = function( match, context, isXML ) {
 		if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) {
 			return context.getElementsByClassName(match[1]);
 		}
 	};
 
-	div = null; // release memory in IE
+	// 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 ) {
-			elem = elem[dir];
 			var match = false;
 
+			elem = elem[dir];
+
 			while ( elem ) {
-				if ( elem.sizcache === doneName ) {
+				if ( elem[ expando ] === doneName ) {
 					match = checkSet[elem.sizset];
 					break;
 				}
 
 				if ( elem.nodeType === 1 && !isXML ){
-					elem.sizcache = doneName;
+					elem[ expando ] = doneName;
 					elem.sizset = i;
 				}
 
@@ -3604,21 +5293,24 @@ function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
 function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
 	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
 		var elem = checkSet[i];
+
 		if ( elem ) {
-			elem = elem[dir];
 			var match = false;
 
+			elem = elem[dir];
+
 			while ( elem ) {
-				if ( elem.sizcache === doneName ) {
+				if ( elem[ expando ] === doneName ) {
 					match = checkSet[elem.sizset];
 					break;
 				}
 
 				if ( elem.nodeType === 1 ) {
 					if ( !isXML ) {
-						elem.sizcache = doneName;
+						elem[ expando ] = doneName;
 						elem.sizset = i;
 					}
+
 					if ( typeof cur !== "string" ) {
 						if ( elem === cur ) {
 							match = true;
@@ -3639,21 +5331,34 @@ function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
 	}
 }
 
-var contains = document.compareDocumentPosition ? function(a, b){
-	return !!(a.compareDocumentPosition(b) & 16);
-} : function(a, b){
-	return a !== b && (a.contains ? a.contains(b) : true);
-};
+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);
+	};
 
-var isXML = function(elem){
+} 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) 
+	// (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){
-	var tmpSet = [], later = "", match,
+var posProcess = function( selector, context, seed ) {
+	var match,
+		tmpSet = [],
+		later = "",
 		root = context.nodeType ? [context] : context;
 
 	// Position selectors must be done after the filter
@@ -3666,73 +5371,69 @@ var posProcess = function(selector, context){
 	selector = Expr.relative[selector] ? selector + "*" : selector;
 
 	for ( var i = 0, l = root.length; i < l; i++ ) {
-		Sizzle( selector, root[i], tmpSet );
+		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 = getText;
-jQuery.isXMLDoc = isXML;
-jQuery.contains = contains;
+jQuery.text = Sizzle.getText;
+jQuery.isXMLDoc = Sizzle.isXML;
+jQuery.contains = Sizzle.contains;
 
-return;
-
-window.Sizzle = Sizzle;
 
 })();
+
+
 var runtil = /Until$/,
 	rparentsprev = /^(?:parents|prevUntil|prevAll)/,
 	// Note: This RegExp should be improved, or likely pulled from Sizzle
 	rmultiselector = /,/,
-	slice = Array.prototype.slice;
-
-// Implement the identical functionality for filter and not
-var winnow = function( elements, qualifier, keep ) {
-	if ( jQuery.isFunction( qualifier ) ) {
-		return jQuery.grep(elements, function( elem, i ) {
-			return !!qualifier.call( elem, i, elem ) === keep;
-		});
-
-	} else if ( qualifier.nodeType ) {
-		return jQuery.grep(elements, function( elem, i ) {
-			return (elem === qualifier) === keep;
-		});
+	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
+	};
 
-	} else if ( typeof qualifier === "string" ) {
-		var filtered = jQuery.grep(elements, function( elem ) {
-			return elem.nodeType === 1;
-		});
+jQuery.fn.extend({
+	find: function( selector ) {
+		var self = this,
+			i, l;
 
-		if ( isSimple.test( qualifier ) ) {
-			return jQuery.filter(qualifier, filtered, !keep);
-		} else {
-			qualifier = jQuery.filter( qualifier, filtered );
+		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;
+					}
+				}
+			});
 		}
-	}
-
-	return jQuery.grep(elements, function( elem, i ) {
-		return (jQuery.inArray( elem, qualifier ) >= 0) === keep;
-	});
-};
 
-jQuery.fn.extend({
-	find: function( selector ) {
-		var ret = this.pushStack( "", "find", selector ), length = 0;
+		var ret = this.pushStack( "", "find", selector ),
+			length, n, r;
 
-		for ( var i = 0, l = this.length; i < l; i++ ) {
+		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 ( var n = length; n < ret.length; n++ ) {
-					for ( var r = 0; r < length; r++ ) {
+				for ( n = length; n < ret.length; n++ ) {
+					for ( r = 0; r < length; r++ ) {
 						if ( ret[r] === ret[n] ) {
 							ret.splice(n--, 1);
 							break;
@@ -3763,65 +5464,81 @@ jQuery.fn.extend({
 	filter: function( selector ) {
 		return this.pushStack( winnow(this, selector, true), "filter", selector );
 	},
-	
+
 	is: function( selector ) {
-		return !!selector && jQuery.filter( selector, this ).length > 0;
+		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 ret = [], cur = this[0], match, matches = {}, selector;
+			var level = 1;
 
-			if ( cur && selectors.length ) {
-				for ( var i = 0, l = selectors.length; i < l; i++ ) {
-					selector = selectors[i];
+			while ( cur && cur.ownerDocument && cur !== context ) {
+				for ( i = 0; i < selectors.length; i++ ) {
 
-					if ( !matches[selector] ) {
-						matches[selector] = jQuery.expr.match.POS.test( selector ) ? 
-							jQuery( selector, context || this.context ) :
-							selector;
+					if ( jQuery( cur ).is( selectors[ i ] ) ) {
+						ret.push({ selector: selectors[ i ], elem: cur, level: level });
 					}
 				}
 
-				while ( cur && cur.ownerDocument && cur !== context ) {
-					for ( selector in matches ) {
-						match = matches[selector];
-
-						if ( match.jquery ? match.index(cur) > -1 : jQuery(cur).is(match) ) {
-							ret.push({ selector: selector, elem: cur });
-							delete matches[selector];
-						}
-					}
-					cur = cur.parentNode;
-				}
+				cur = cur.parentNode;
+				level++;
 			}
 
 			return ret;
 		}
 
-		var pos = jQuery.expr.match.POS.test( selectors ) ? 
-			jQuery( selectors, context || this.context ) : null;
+		// String
+		var pos = POS.test( selectors ) || typeof selectors !== "string" ?
+				jQuery( selectors, context || this.context ) :
+				0;
 
-		return this.map(function( i, cur ) {
-			while ( cur && cur.ownerDocument && cur !== context ) {
-				if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selectors) ) {
-					return cur;
+		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;
+					}
 				}
-				cur = cur.parentNode;
 			}
-			return null;
-		});
+		}
+
+		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 ) {
-		if ( !elem || typeof elem === "string" ) {
-			return jQuery.inArray( this[0],
-				// If it receives a string, the selector is used
-				// If it receives nothing, the siblings are used
-				elem ? jQuery( elem ) : this.parent().children() );
+
+		// 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
@@ -3830,8 +5547,8 @@ jQuery.fn.extend({
 
 	add: function( selector, context ) {
 		var set = typeof selector === "string" ?
-				jQuery( selector, context || this.context ) :
-				jQuery.makeArray( selector ),
+				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] ) ?
@@ -3880,7 +5597,7 @@ jQuery.each({
 		return jQuery.dir( elem, "previousSibling", until );
 	},
 	siblings: function( elem ) {
-		return jQuery.sibling( elem.parentNode.firstChild, elem );
+		return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
 	},
 	children: function( elem ) {
 		return jQuery.sibling( elem.firstChild );
@@ -3893,7 +5610,7 @@ jQuery.each({
 }, function( name, fn ) {
 	jQuery.fn[ name ] = function( until, selector ) {
 		var ret = jQuery.map( this, fn, until );
-		
+
 		if ( !runtil.test( name ) ) {
 			selector = until;
 		}
@@ -3902,13 +5619,13 @@ jQuery.each({
 			ret = jQuery.filter( selector, ret );
 		}
 
-		ret = this.length > 1 ? jQuery.unique( ret ) : 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(",") );
+		return this.pushStack( ret, name, slice.call( arguments ).join(",") );
 	};
 });
 
@@ -3918,11 +5635,15 @@ jQuery.extend({
 			expr = ":not(" + expr + ")";
 		}
 
-		return jQuery.find.matches(expr, elems);
+		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];
+		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 );
@@ -3957,20 +5678,74 @@ jQuery.extend({
 		return r;
 	}
 });
-var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
+
+// 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 = /(<([\w:]+)[^>]*?)\/>/g,
-	rselfClosing = /^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,
+	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,
 	rtagName = /<([\w:]+)/,
 	rtbody = /";
-	},
+	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*", "" ],
 		legend: [ 1, "", "" ],
@@ -3980,7 +5755,8 @@ var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
 		col: [ 2, "", "
" ],
 		area: [ 1, "", "" ],
 		_default: [ 0, "", "" ]
-	};
+	},
+	safeFragment = createSafeFragment( document );
 
 wrapMap.optgroup = wrapMap.option;
 wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
@@ -3992,19 +5768,12 @@ if ( !jQuery.support.htmlSerialize ) {
 }
 
 jQuery.fn.extend({
-	text: function( text ) {
-		if ( jQuery.isFunction(text) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				self.text( text.call(this, i, self.text()) );
-			});
-		}
-
-		if ( typeof text !== "object" && text !== undefined ) {
-			return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
-		}
-
-		return jQuery.text( this );
+	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 ) {
@@ -4030,7 +5799,7 @@ jQuery.fn.extend({
 				}
 
 				return elem;
-			}).append(this);
+			}).append( this );
 		}
 
 		return this;
@@ -4044,7 +5813,8 @@ jQuery.fn.extend({
 		}
 
 		return this.each(function() {
-			var self = jQuery( this ), contents = self.contents();
+			var self = jQuery( this ),
+				contents = self.contents();
 
 			if ( contents.length ) {
 				contents.wrapAll( html );
@@ -4056,8 +5826,10 @@ jQuery.fn.extend({
 	},
 
 	wrap: function( html ) {
-		return this.each(function() {
-			jQuery( this ).wrapAll( html );
+		var isFunction = jQuery.isFunction( html );
+
+		return this.each(function(i) {
+			jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html );
 		});
 	},
 
@@ -4091,7 +5863,7 @@ jQuery.fn.extend({
 				this.parentNode.insertBefore( elem, this );
 			});
 		} else if ( arguments.length ) {
-			var set = jQuery(arguments[0]);
+			var set = jQuery.clean( arguments );
 			set.push.apply( set, this.toArray() );
 			return this.pushStack( set, "before", arguments );
 		}
@@ -4104,11 +5876,11 @@ jQuery.fn.extend({
 			});
 		} else if ( arguments.length ) {
 			var set = this.pushStack( this, "after", arguments );
-			set.push.apply( set, jQuery(arguments[0]).toArray() );
+			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++ ) {
@@ -4119,11 +5891,11 @@ jQuery.fn.extend({
 				}
 
 				if ( elem.parentNode ) {
-					 elem.parentNode.removeChild( elem );
+					elem.parentNode.removeChild( elem );
 				}
 			}
 		}
-		
+
 		return this;
 	},
 
@@ -4139,88 +5911,58 @@ jQuery.fn.extend({
 				elem.removeChild( elem.firstChild );
 			}
 		}
-		
+
 		return this;
 	},
 
-	clone: function( events ) {
-		// Do the clone
-		var ret = this.map(function() {
-			if ( !jQuery.support.noCloneEvent && !jQuery.isXMLDoc(this) ) {
-				// IE copies events bound via attachEvent when
-				// using cloneNode. Calling detachEvent on the
-				// clone will also remove the events from the orignal
-				// In order to get around this, we use innerHTML.
-				// Unfortunately, this means some modifications to
-				// attributes in IE that are actually only stored
-				// as properties will not be copied (such as the
-				// the name attribute on an input).
-				var html = this.outerHTML, ownerDocument = this.ownerDocument;
-				if ( !html ) {
-					var div = ownerDocument.createElement("div");
-					div.appendChild( this.cloneNode(true) );
-					html = div.innerHTML;
-				}
-
-				return jQuery.clean([html.replace(rinlinejQuery, "")
-					// Handle the case in IE 8 where action=/test/> self-closes a tag
-					.replace(/=([^="'>\s]+\/)>/g, '="$1">')
-					.replace(rleadingWhitespace, "")], ownerDocument)[0];
-			} else {
-				return this.cloneNode(true);
-			}
-		});
-
-		// Copy the events from the original to the clone
-		if ( events === true ) {
-			cloneCopyEvent( this, ret );
-			cloneCopyEvent( this.find("*"), ret.find("*") );
-		}
+	clone: function( dataAndEvents, deepDataAndEvents ) {
+		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
+		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
 
-		// Return the cloned set
-		return ret;
+		return this.map( function () {
+			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
+		});
 	},
 
 	html: function( value ) {
-		if ( value === undefined ) {
-			return this[0] && this[0].nodeType === 1 ?
-				this[0].innerHTML.replace(rinlinejQuery, "") :
-				null;
+		return jQuery.access( this, function( value ) {
+			var elem = this[0] || {},
+				i = 0,
+				l = this.length;
 
-		// See if we can take a shortcut and just use innerHTML
-		} else if ( typeof value === "string" && !rnocache.test( value ) &&
-			(jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value )) &&
-			!wrapMap[ (rtagName.exec( value ) || ["", ""])[1].toLowerCase() ] ) {
+			if ( value === undefined ) {
+				return elem.nodeType === 1 ?
+					elem.innerHTML.replace( rinlinejQuery, "" ) :
+					null;
+			}
 
-			value = value.replace(rxhtmlTag, fcloseTag);
 
-			try {
-				for ( var i = 0, l = this.length; i < l; i++ ) {
-					// Remove element nodes and prevent memory leaks
-					if ( this[i].nodeType === 1 ) {
-						jQuery.cleanData( this[i].getElementsByTagName("*") );
-						this[i].innerHTML = value;
-					}
-				}
+			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
+				( jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
+				!wrapMap[ ( rtagName.exec( value ) || ["", ""] )[1].toLowerCase() ] ) {
 
-			// If using innerHTML throws an exception, use the fallback method
-			} catch(e) {
-				this.empty().append( value );
-			}
+				value = value.replace( rxhtmlTag, "<$1>" );
 
-		} else if ( jQuery.isFunction( value ) ) {
-			this.each(function(i){
-				var self = jQuery(this), old = self.html();
-				self.empty().append(function(){
-					return value.call( this, i, old );
-				});
-			});
+				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;
+						}
+					}
 
-		} else {
-			this.empty().append( value );
-		}
+					elem = 0;
 
-		return this;
+				// 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 ) {
@@ -4235,13 +5977,14 @@ jQuery.fn.extend({
 			}
 
 			if ( typeof value !== "string" ) {
-				value = jQuery(value).detach();
+				value = jQuery( value ).detach();
 			}
 
 			return this.each(function() {
-				var next = this.nextSibling, parent = this.parentNode;
+				var next = this.nextSibling,
+					parent = this.parentNode;
 
-				jQuery(this).remove();
+				jQuery( this ).remove();
 
 				if ( next ) {
 					jQuery(next).before( value );
@@ -4250,7 +5993,9 @@ jQuery.fn.extend({
 				}
 			});
 		} else {
-			return this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value );
+			return this.length ?
+				this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value ) :
+				this;
 		}
 	},
 
@@ -4259,7 +6004,9 @@ jQuery.fn.extend({
 	},
 
 	domManip: function( args, table, callback ) {
-		var results, first, value = args[0], scripts = [], fragment, parent;
+		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 ) ) {
@@ -4284,11 +6031,11 @@ jQuery.fn.extend({
 				results = { fragment: parent };
 
 			} else {
-				results = buildFragment( args, this, scripts );
+				results = jQuery.buildFragment( args, this, scripts );
 			}
-			
+
 			fragment = results.fragment;
-			
+
 			if ( fragment.childNodes.length === 1 ) {
 				first = fragment = fragment.firstChild;
 			} else {
@@ -4298,120 +6045,327 @@ jQuery.fn.extend({
 			if ( first ) {
 				table = table && jQuery.nodeName( first, "tr" );
 
-				for ( var i = 0, l = this.length; i < l; i++ ) {
+				for ( var i = 0, l = this.length, lastIndex = l - 1; i < l; i++ ) {
 					callback.call(
 						table ?
 							root(this[i], first) :
 							this[i],
-						i > 0 || results.cacheable || this.length > 1  ?
-							fragment.cloneNode(true) :
+						// 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, evalScript );
+				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(orig, ret) {
-	var i = 0;
+function root( elem, cur ) {
+	return jQuery.nodeName(elem, "table") ?
+		(elem.getElementsByTagName("tbody")[0] ||
+		elem.appendChild(elem.ownerDocument.createElement("tbody"))) :
+		elem;
+}
 
-	ret.each(function() {
-		if ( this.nodeName !== (orig[i] && orig[i].nodeName) ) {
-			return;
-		}
+function cloneCopyEvent( src, dest ) {
+
+	if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
+		return;
+	}
 
-		var oldData = jQuery.data( orig[i++] ), curData = jQuery.data( this, oldData ), events = oldData && oldData.events;
+	var type, i, l,
+		oldData = jQuery._data( src ),
+		curData = jQuery._data( dest, oldData ),
+		events = oldData.events;
 
-		if ( events ) {
-			delete curData.handle;
-			curData.events = {};
+	if ( events ) {
+		delete curData.handle;
+		curData.events = {};
 
-			for ( var type in events ) {
-				for ( var handler in events[ type ] ) {
-					jQuery.event.add( this, type, events[ type ][ handler ], events[ type ][ handler ].data );
-				}
+		for ( type in events ) {
+			for ( i = 0, l = events[ type ].length; i < l; i++ ) {
+				jQuery.event.add( dest, type, events[ type ][ i ] );
 			}
 		}
-	});
-}
+	}
 
-function buildFragment( args, nodes, scripts ) {
-	var fragment, cacheable, cacheresults,
-		doc = (nodes && nodes[0] ? nodes[0].ownerDocument || nodes[0] : document);
+	// make the cloned public data object a copy from the original
+	if ( curData.data ) {
+		curData.data = jQuery.extend( {}, curData.data );
+	}
+}
 
-	// Only cache "small" (1/2 KB) 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

Task (add/modify/delete on)	Technical administrator	Application administrator	Moderator
User	yes	no	no
Group	yes	no	no
Property model	yes	no	no
Import	yes	no	no
Layer	yes	no	no
News	yes	yes	no
Area	yes	yes	no
Icon	yes	yes	no
Color/Color theme	yes	yes	no
Category/Subcategory	yes	yes	no
Point Of Interest	yes	yes	yes
Route	yes	yes	yes

Importing¶

Previous topic

Next topic

This Page

Administration pages presentation¶

Identification¶

Managing layers¶

Index

Index

Importing¶

Prerequisites¶

Create a custom project template¶

Compiling languages¶

Edition/moderation of items¶

Next topic

This Page

Chimère customisation¶

Customisation¶

Previous topic

This Page

Import/export¶

Importing¶

Common fields¶

KML import¶

Shapefile import¶

GeoRSS import¶

CSV import¶

OpenStreetMap import¶

Importing¶

Managing imported data¶

Exporting¶

Export to CSV/KML/Shapefile¶

Export to OSM¶

Next topic

This Page

Administration pages presentation¶

Main page¶

Managing news¶

Creating categories/subcategories¶

Edition/moderation of items¶

Editing or moderating items¶

Managing end user amendment¶

Importing¶

Common fields¶

Shapefile import¶

CSV import¶

OpenStreetMap import¶

Importing¶

Managing imported data¶

Exporting¶

Export to CSV/KML/Shapefile¶

Database configuration¶

Install the sources¶

Installing the sources¶

From an archive¶

From the git repository¶

Create a custom project template¶

Creating a custom project template¶

Compiling languages¶

Database initialisation¶

Webserver configuration¶

Apache configuration with mod_wsgi¶

Get new version of dependencies¶

Getting new versions of dependencies¶

Version 1.1 -> 1.2¶

Get the new sources¶

Getting the new sources¶

From a previous tarball installation¶

Version 1.1 -> 1.2¶

Force the upgrade of visitor’s web browser cache¶

Forcing the upgrade of visitor’s web browser cache¶

Managing imported data¶

Export to OSM¶

Installing the sources¶

From the git repository¶

From the Git repository¶

Getting new versions of dependencies¶

Getting the new sources¶

From a previous Git installation¶

From a previous tarball installation¶