From 5f086f6c88b24cb1f4d72972f36fd76912cbc782 Mon Sep 17 00:00:00 2001 From: Bret Runestad Date: Thu, 26 Feb 2015 20:06:45 -0500 Subject: [PATCH 01/13] Initial layout with user login --- Procfile | 1 + README.md | 119 ++--- manage.py | 29 ++ migrations/README | 1 + migrations/__pycache__/env.cpython-34.pyc | Bin 0 -> 1797 bytes migrations/alembic.ini | 45 ++ migrations/env.py | 73 +++ migrations/script.py.mako | 22 + migrations/versions/2c7418044df_.py | 33 ++ .../__pycache__/2c7418044df_.cpython-34.pyc | Bin 0 -> 968 bytes requirements.txt | 29 ++ stattracker/__init__.py | 33 ++ .../__pycache__/__init__.cpython-34.pyc | Bin 0 -> 1010 bytes .../__pycache__/extensions.cpython-34.pyc | Bin 0 -> 660 bytes stattracker/__pycache__/forms.cpython-34.pyc | Bin 0 -> 1128 bytes stattracker/__pycache__/models.cpython-34.pyc | Bin 0 -> 1643 bytes stattracker/extensions.py | 21 + stattracker/forms.py | 20 + stattracker/models.py | 33 ++ stattracker/static/.gitkeep | 0 stattracker/static/main.css | 0 stattracker/static/main.js | 0 stattracker/static/modernizr.js | 0 stattracker/static/normalize.css | 427 ++++++++++++++++++ stattracker/templates/index.html | 29 ++ stattracker/templates/layout.html | 31 ++ stattracker/templates/login.html | 18 + stattracker/templates/register.html | 32 ++ stattracker/views/__init__.py | 0 .../views/__pycache__/__init__.cpython-34.pyc | Bin 0 -> 154 bytes .../views/__pycache__/users.cpython-34.pyc | Bin 0 -> 2527 bytes stattracker/views/users.py | 62 +++ tests/__init__.py | 0 33 files changed, 970 insertions(+), 88 deletions(-) create mode 100644 Procfile create mode 100644 manage.py create mode 100755 migrations/README create mode 100644 migrations/__pycache__/env.cpython-34.pyc create mode 100644 migrations/alembic.ini create mode 100644 migrations/env.py create mode 100755 migrations/script.py.mako create mode 100644 migrations/versions/2c7418044df_.py create mode 100644 migrations/versions/__pycache__/2c7418044df_.cpython-34.pyc create mode 100644 requirements.txt create mode 100644 stattracker/__init__.py create mode 100644 stattracker/__pycache__/__init__.cpython-34.pyc create mode 100644 stattracker/__pycache__/extensions.cpython-34.pyc create mode 100644 stattracker/__pycache__/forms.cpython-34.pyc create mode 100644 stattracker/__pycache__/models.cpython-34.pyc create mode 100644 stattracker/extensions.py create mode 100644 stattracker/forms.py create mode 100644 stattracker/models.py create mode 100644 stattracker/static/.gitkeep create mode 100644 stattracker/static/main.css create mode 100644 stattracker/static/main.js create mode 100644 stattracker/static/modernizr.js create mode 100644 stattracker/static/normalize.css create mode 100644 stattracker/templates/index.html create mode 100644 stattracker/templates/layout.html create mode 100644 stattracker/templates/login.html create mode 100644 stattracker/templates/register.html create mode 100644 stattracker/views/__init__.py create mode 100644 stattracker/views/__pycache__/__init__.cpython-34.pyc create mode 100644 stattracker/views/__pycache__/users.cpython-34.pyc create mode 100644 stattracker/views/users.py create mode 100644 tests/__init__.py diff --git a/Procfile b/Procfile new file mode 100644 index 0000000..b3c7363 --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: gunicorn manager:app --log-file=- diff --git a/README.md b/README.md index 5e7bab7..f49671d 100644 --- a/README.md +++ b/README.md @@ -1,113 +1,56 @@ -# Stat Tracker +# stat_tracker -## Description -Build an application people can use to track any stats they want about themselves. +Quickstart +---------- -## Objectives +Run the following commands to bootstrap your environment. -### Learning Objectives -After completing this assignment, you should understand: +``` +cd stattracker +pip install -r requirements.txt +python manage.py db init +python manage.py server +``` -* ... -### Performance Objectives +Deployment +---------- -After completing this assignment, you should be able to: +In your production environment, make sure you have an application.cfg +file in your instance directory. -* ... -## Details +Shell +----- -### Deliverables +To open the interactive shell, run: -* A Git repo called stat-tracker containing at least: - * `README.md` file explaining how to run your project - * a `requirements.txt` file - * a way to seed your application with data -* An instance of your app running on Heroku + python manage.py shell -### Requirements +By default, you will have access to `app` and `db`. -* No PEP8 or Pyflakes warnings or errors -* Meets API specifications -## Normal Mode +Running Tests +------------- -You are going to build an application to track personal statistics. A personal statistic is a numerical record for a person in a time series by day. For example, let's say I wanted to track how many flights of stairs I walked up in a day. My last week might look like: +To run all tests, run: -Date | Flights ----------- | ------- -02/19/2015 | 8 -02/20/2015 | 6 -02/21/2015 | 7 -02/22/2015 | 6 -02/23/2015 | 8 -02/24/2015 | 4 -02/25/2015 | 6 + python manage.py test -Users of your application can create as many different things to track as they want. They should have an easy-to-use interface to track their stats, allowing them to enter the number for the current day or any previous day. -You should allow for: +Migrations +---------- -* User registration -* User login -* Creating a new stat to track -* Recording a stat for a day -* Editing a stat for a day -* Showing a chart for a stat for any series of dates, defined by a start and stop date. The default should be the last 30 days. +Whenever a database migration needs to be made, run the following commmand: -For the chart, you can use whatever you like. Matplotlib is our old friend, but can be unwieldy. [Bokeh](http://bokeh.pydata.org/en/latest/) and [Plotly](https://plot.ly/python/) are other good choices to use with HTML. + python manage.py db migrate -You should also have an API. One of the ways people expect to use this application is via their phone, so you'll need a REST API. +This will generate a new migration script. Then run: -### API Specification + python manage.py db upgrade -For your API, I'm specifying the endpoints you'll need and what they should do. The URLs I'm using are not prefixed: yours should be. -All the endpoints require authentication using HTTP Basic Auth. +to apply the migration. -Verb | URL | Action ------- | ---- | ------- -GET | /stats | Show a list of all stats I am tracking, and links to their individual pages -POST | /stats | Create a new stat for me to track. -GET | /stats/{id} | Show information about one stat I am tracking, and give me the data I have recorded for that stat. -PUT | /stats/{id} | Update one stat I am tracking, changing attributes such as name or type. Does not allow for changing tracked data. -DELETE | /stats/{id} | Delete a stat I am tracking. This should remove tracked data for that stat as well. -POST or PUT | /stats/{id}/data | Add tracked data for a day. The JSON sent with this should include the day tracked. You can also override the data for a day already recorded. -DELETE | /stats/{id}/data | Remove tracked data for a day. You should send JSON that includes the date to be removed. - -I am not specifying what the JSON these return should look like, but you should feel free to follow one of the many competing standards. [JSON API](http://jsonapi.org/) is very comprehensive. - - -## Hard Mode - -In addition to the requirements from **Normal Mode**: - -* Users should be able to record different types of stats. You can choose the types, but here are some suggestions: - * Clicker-style stats. The UI on these should change so you have a way to increase them by one via a button click. Good for tracking things as you're doing them. - * Time-goal stats. The stat has a beginning value, ending value, and ending date. Track as normal, but you should be able to see if you're on track to meet your goal. Examples: weight loss, building up for a long run. - * Yes-no stats. Did I do this today? This is often called the "Seinfeld calendar" or [chain calendar](http://chaincalendar.com/about). - * Stats on a scale instead of unbounded. Example: On a scale of 1 to 5, what's my happiness level today? - -* Make sure your interface [is responsive](https://developers.google.com/web/fundamentals/layouts/rwd-fundamentals/) and works well via mobile. - - -## Nightmare Mode - -* Give users a way to invite other users to collaborate/compete on a stat with them. Users can only add/edit their own data, but the stat charts will show everyone competing. - - -## Additional Resources - -* [JSON API](http://jsonapi.org/) -* [Bokeh](http://bokeh.pydata.org/en/latest/) -* [Plotly](https://plot.ly/python/) -* [Flask-RESTful](https://flask-restful.readthedocs.org/en/0.3.1/). A Flask plugin that could help or make this much worse. -* [RESTless](http://restless.readthedocs.org/en/latest/). Another Python library that could help or harm. -* [Kube](http://imperavi.com/kube/). A simpler CSS framework I've been using. -* [Peewee](https://peewee.readthedocs.org/en/latest/index.html). A less-featureful, but perhaps easier to use ORM. - -## Credit - -... +For a full migration command reference, run `python manage.py db --help`. diff --git a/manage.py b/manage.py new file mode 100644 index 0000000..99a2f41 --- /dev/null +++ b/manage.py @@ -0,0 +1,29 @@ +#!/usr/bin/env python +import os + +from flask.ext.script import Manager, Shell, Server +from flask.ext.migrate import MigrateCommand +from flask.ext.script.commands import ShowUrls, Clean + +from stattracker import create_app, db, models + + +app = create_app() +manager = Manager(app) +manager.add_command('server', Server()) +manager.add_command('db', MigrateCommand) +manager.add_command('show-urls', ShowUrls()) +manager.add_command('clean', Clean()) + + +@manager.shell +def make_shell_context(): + """ Creates a python REPL with several default imports + in the context of the app + """ + + return dict(app=app, db=db) + + +if __name__ == '__main__': + manager.run() diff --git a/migrations/README b/migrations/README new file mode 100755 index 0000000..98e4f9c --- /dev/null +++ b/migrations/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/migrations/__pycache__/env.cpython-34.pyc b/migrations/__pycache__/env.cpython-34.pyc new file mode 100644 index 0000000000000000000000000000000000000000..c0e77153488c807e5ad771b54790440b5ec1b5c7 GIT binary patch literal 1797 zcmZuxOK;>v5U#f8>3L@IV0lT+DU1ZeA3$i6Y!Hz`w0W#{nTzGvJu~*&?V-D!mv&F# z!ig(?fgiyS;LgccPFiK_NwlV!1{Yq}m?)m8O%{nhPxKmYponQQ_40S~?!?jPgQ zzaxq8#~=mB7)%*3;vGmG$XuAZ74Je?gRBnII%Ex)HY#Zi(k5grn6`ik7m_wi+aOvX z+K_l~yYf|sv;$cerd_l`O%I|5h%T8YeTbT5c$G9A31Y+Uq8^-%`+s6)FlJ@{GByieo4|-nNQ07Qm`fwB z%-AVMLe66;{F%x#AH}nHUe=a*o}!sIi&L>@Wyp2HLMc4&2g~J6Uw@wlX}A#C^`uZ~ z`QGXA;m+aSH~Zgy=Resw+u7YY-S?lJ9F)y0o-2$T(q-slxUd~9JPRc>Hw!^5RfAKVcv5J?1ODvf(Aozw;xb2x03 zJ|~%ts6!Pm4bKa+EX>O3JB@X*yGP?j*;rv?Fc-$pf>`?blJ2ftY+>1cQ_*tmTp*x) zqXMaekW9+HDx`nkn=w-!9{L5;5dZ#JyVranMJqB<3LE&@^cfs9rNLO-Nc0)!-Fc z*1@z}_Gq1#!U zs2=&*B0`N)1G24$X|4s1qDD1})F!D28WmY1qs{*!!q)L~ROv@Zpy{#^Yp|}G}SwF!&T*!x1B-rs-5V(Rta*Rt2sKLQuBXEeEl_ yL%dIu>p?ASRct|8U!tl=#aA>>^#@3XY{<6Qu-2~i8bkIGTW@wp-A7&KIsXFmEZ#f- literal 0 HcmV?d00001 diff --git a/migrations/alembic.ini b/migrations/alembic.ini new file mode 100644 index 0000000..f8ed480 --- /dev/null +++ b/migrations/alembic.ini @@ -0,0 +1,45 @@ +# A generic, single database configuration. + +[alembic] +# template used to generate migration files +# file_template = %%(rev)s_%%(slug)s + +# set to 'true' to run the environment during +# the 'revision' command, regardless of autogenerate +# revision_environment = false + + +# Logging configuration +[loggers] +keys = root,sqlalchemy,alembic + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARN +handlers = console +qualname = + +[logger_sqlalchemy] +level = WARN +handlers = +qualname = sqlalchemy.engine + +[logger_alembic] +level = INFO +handlers = +qualname = alembic + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S diff --git a/migrations/env.py b/migrations/env.py new file mode 100644 index 0000000..70961ce --- /dev/null +++ b/migrations/env.py @@ -0,0 +1,73 @@ +from __future__ import with_statement +from alembic import context +from sqlalchemy import engine_from_config, pool +from logging.config import fileConfig + +# this is the Alembic Config object, which provides +# access to the values within the .ini file in use. +config = context.config + +# Interpret the config file for Python logging. +# This line sets up loggers basically. +fileConfig(config.config_file_name) + +# add your model's MetaData object here +# for 'autogenerate' support +# from myapp import mymodel +# target_metadata = mymodel.Base.metadata +from flask import current_app +config.set_main_option('sqlalchemy.url', current_app.config.get('SQLALCHEMY_DATABASE_URI')) +target_metadata = current_app.extensions['migrate'].db.metadata + +# other values from the config, defined by the needs of env.py, +# can be acquired: +# my_important_option = config.get_main_option("my_important_option") +# ... etc. + +def run_migrations_offline(): + """Run migrations in 'offline' mode. + + This configures the context with just a URL + and not an Engine, though an Engine is acceptable + here as well. By skipping the Engine creation + we don't even need a DBAPI to be available. + + Calls to context.execute() here emit the given string to the + script output. + + """ + url = config.get_main_option("sqlalchemy.url") + context.configure(url=url) + + with context.begin_transaction(): + context.run_migrations() + +def run_migrations_online(): + """Run migrations in 'online' mode. + + In this scenario we need to create an Engine + and associate a connection with the context. + + """ + engine = engine_from_config( + config.get_section(config.config_ini_section), + prefix='sqlalchemy.', + poolclass=pool.NullPool) + + connection = engine.connect() + context.configure( + connection=connection, + target_metadata=target_metadata + ) + + try: + with context.begin_transaction(): + context.run_migrations() + finally: + connection.close() + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() + diff --git a/migrations/script.py.mako b/migrations/script.py.mako new file mode 100755 index 0000000..9570201 --- /dev/null +++ b/migrations/script.py.mako @@ -0,0 +1,22 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision} +Create Date: ${create_date} + +""" + +# revision identifiers, used by Alembic. +revision = ${repr(up_revision)} +down_revision = ${repr(down_revision)} + +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +def upgrade(): + ${upgrades if upgrades else "pass"} + + +def downgrade(): + ${downgrades if downgrades else "pass"} diff --git a/migrations/versions/2c7418044df_.py b/migrations/versions/2c7418044df_.py new file mode 100644 index 0000000..fb95588 --- /dev/null +++ b/migrations/versions/2c7418044df_.py @@ -0,0 +1,33 @@ +"""empty message + +Revision ID: 2c7418044df +Revises: None +Create Date: 2015-02-26 19:54:31.129057 + +""" + +# revision identifiers, used by Alembic. +revision = '2c7418044df' +down_revision = None + +from alembic import op +import sqlalchemy as sa + + +def upgrade(): + ### commands auto generated by Alembic - please adjust! ### + op.create_table('user', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('name', sa.String(length=255), nullable=False), + sa.Column('email', sa.String(length=255), nullable=False), + sa.Column('encrypted_password', sa.String(length=60), nullable=True), + sa.PrimaryKeyConstraint('id'), + sa.UniqueConstraint('email') + ) + ### end Alembic commands ### + + +def downgrade(): + ### commands auto generated by Alembic - please adjust! ### + op.drop_table('user') + ### end Alembic commands ### diff --git a/migrations/versions/__pycache__/2c7418044df_.cpython-34.pyc b/migrations/versions/__pycache__/2c7418044df_.cpython-34.pyc new file mode 100644 index 0000000000000000000000000000000000000000..9c988ebd114ecf28e51854c95770ab2e0b410163 GIT binary patch literal 968 zcmah{O>fgc5FKw4$8jB0pojw!3dbDUe2`KaRR}2+s30Ol+e*zx_Oz)&Rc4(je%+#Hrq(VE{9< z7R)SQ1ZD(S4Oktb8pL&&)xj#(1fmAaY+wywHhjiAOlQGff0{Cz4amJG*EQ)*o!H_lN7lXPv?J zcyly1GJU^?lr^8H3OE9z@o~etR4D`CWZklo;Nl1OmS&Q z$c!VhD56IZe`V@|#@yHu7ju1b`5P6P29IeNnR{FWGEX&UeoB?PNF=-5!SjQzBa0Rr zFDUEk>w?J;MU6d4qAV7sxhFKAV=#MP%TUbC+ItzsROWAaK1qbql7>Q?)k6`UW&C#M zE6DrET$*3+dWV>=>K#e0WhS`Nl=VWHh@48+!HE^gek8EaY5cv>ow`H2X&yv9RjU%sKv}qT3|7O{w5s#0;;3}9p qi)a*_@Hm%kq$raw$^IGJ*@+XDMf^n*vC2bZ*KErstCm;u+J6Ato#e0p literal 0 HcmV?d00001 diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..d9f3861 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,29 @@ +# Everything needed in production + +# Flask +Flask==0.10.1 +MarkupSafe==0.23 +Werkzeug==0.9.6 +Jinja2==2.7.3 +itsdangerous==0.24 + +# Database +Flask-SQLAlchemy==2.0 +SQLAlchemy==0.9.8 + +# Migrations +Flask-Migrate==1.3.0 + +# Forms +Flask-WTF==0.10.3 +WTForms==2.0.1 + +## Config +flask-appconfig==0.9.1 + +# Testing +pytest>=2.6.3 +webtest + +# Management script +Flask-Script diff --git a/stattracker/__init__.py b/stattracker/__init__.py new file mode 100644 index 0000000..94f769d --- /dev/null +++ b/stattracker/__init__.py @@ -0,0 +1,33 @@ +from flask import Flask, render_template +from flask.ext.wtf import CsrfProtect + +from .extensions import (db, + migrate, + config, + debug_toolbar, + bcrypt, + login_manager) +# from .views import stattracker + + +SQLALCHEMY_DATABASE_URI = "postgres://localhost/stattracker" +DEBUG = True +SECRET_KEY = 'development-key' + +from . import models +from .views.users import users + +def create_app(): + app = Flask("stattracker") + app.config.from_object(__name__) + app.register_blueprint(users) + + config.init_app(app) + db.init_app(app) + debug_toolbar.init_app(app) + migrate.init_app(app, db) + bcrypt.init_app(app) + login_manager.init_app(app) + login_manager.login_view = "users.login" + + return app diff --git a/stattracker/__pycache__/__init__.cpython-34.pyc b/stattracker/__pycache__/__init__.cpython-34.pyc new file mode 100644 index 0000000000000000000000000000000000000000..68dffde132b1f0fb33c7dd410ad2933500c6dc8c GIT binary patch literal 1010 zcmYjPzjMzpawt==m20#Ol9iSbMANTh zsrSHrAAr~b*#p|!oYw(yALKUBZR8=O5qtrl4)H1Ht2h{^+F{2!fq*^r(7|^ zWhoNF`@}|LtrqW8VfftK5|`~;FP+)8%$5pMtUoXEMYgnY%4e%3Gese0iL(A|uGXco zu_%^V&Sa7&ORlaTmxVS<#r4zSP!#h-d_X?bCNV}O^9!y{uD4Qt$wg60o|`8Ze2pS} zS)^QOT(wr3D?N9z-QxtI@i4}zzap5*=oD&=axxtp1upW$R1UqRWU|o0SwBI*l3{&$%@%I z`fCHm@cW$|Hq=`(WUTrr8(OL`>sV&Vp_aCAK7LPz}_+giBGwW--Pi^kQ)fPXZDE3;5d+_NDvp6jg0^`^3_ zC}+{8#{cC#n!Z0A9gbg3-k!08(aC6kG@Y>1Ma-$;y^>WuNF;?3CPm!^&apwbRSD=cg)vFZCW( zbWs+DJBjJTS2EibS9Ps2ZvO5^5WdXKzHyk%&+DSBE_lTYX;4p2o93*puFK-h`lOB0 zRMdHzvIp0S+nbHNbsPIZ@%}Q?^|19t)~*Ju``gW^W6?peM}t9hHMzbfGwxgqT1pRV zEE&8Rm1%;`750K14On%xn~=_+Jk|X}*vVkxO_S4uOhm`@;xm{8C54}7+jmwPyUmPr zW>-n;xY(AauJ+uBEh_ia8J^!rL*h@4-8lTnrrEdgv;JG2cU`fMF@%2NP5z&w#QP1l Cm9@$M literal 0 HcmV?d00001 diff --git a/stattracker/__pycache__/forms.cpython-34.pyc b/stattracker/__pycache__/forms.cpython-34.pyc new file mode 100644 index 0000000000000000000000000000000000000000..d8fed5209a330c4f23b0697faa57c22ad61282f1 GIT binary patch literal 1128 zcmaJ=J5L)y5T5lte0M&BLkLP0p>!^St0+x`C;~LdiVQT@oHpLIIdSVVyJrxzq{v^% zPsm@{HdUIWPnDTH9|S4NJx24o*>Ap?`~K_T#APy#3h z83RUk2g(j84>Avw51HS1JtzZEA!K1=`%rd4MUX|HV#s1p31kVV9%MaW$07g`!e=ZO zf@E-y=hzkcBM?5~4{Ur=&5H%0*Ile@lWSfUg4dNcHfr&Y zhp~bDQM3s>G@!Jf57BIkv{7V4sM zgj;`%gz6sRa(w9&HT$9^D!-Pxm=#l(Z@Wqw!{_pDyB&(zRV!2PDqc@7?lvcKDS5ry zemoxbb)O1vkk};gFdXaCxHRokbMAmNVo(!V`WcBG5)XrFwCCj8MnOOgeU-A8NV>;D zykoY>Ty#9#$l_Va&1HU5&vXa#Y!@{eT7!bl%C^_8y&3&1X78d_@0&HccIAUQvbrJi?E(| zS(z5HlyhzFU}DGNceOSzvR7G&NpRVgvl)lrhyOXkbBuZl(GV@LsYh=epz~Oq#l8(V zg6-Y3+N`WU*9~u-dTjhn3X zqEb4qkC!Vu%qywV7C}Y~gb|Tv_8@1huAe@XXBhRb5So|(@huHgmdp9 zr5+OhuXVtLAkPYJNU9K^;eV`fLxg)DF98pm_%MYWp(6_vffI0*j7i~*oF0*$kOprN z-FlSlk(!X&bEbV#c&AREk~#pNhbF{n?09LiLYh^2tyeGYM7B+pl{2FYT{d@rvqxCA zc`h$<{k844Wd<_tPO-kjWq^fkF2N$_16=yp$~&{ebSdll`^qR#H~^EfX$+S|t@BIA zW+x`RV+8xg{{yUa%!t=vO3;*+QC_aPoR&Xt)D6OupT<&-U3=u$~zyk9C zj>dn%uHipkk4HfKFb)07W{kMDf8Lm^ zoZEn14R7W0WFE5ih&{rksg~L_t1fAe+3-0FZZlhgtJ7T@ZV~k%L?j;L_l0=qMSc|Q zLpu9eJh3DFs?lYgRb}0w>nhD~E!h3bT-Mjea5;9p({PWmqxvS7IXEa*X21*M78y;s pOW`oQsqMYs?&UVw0_JeKyAz&v33|#cw&u1r4IYW9nEDTbe*jq6YlHv* literal 0 HcmV?d00001 diff --git a/stattracker/extensions.py b/stattracker/extensions.py new file mode 100644 index 0000000..3e41b0c --- /dev/null +++ b/stattracker/extensions.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +"""Extensions module.""" + +from flask.ext.sqlalchemy import SQLAlchemy +db = SQLAlchemy() + +from flask.ext.migrate import Migrate +migrate = Migrate() + +from flask.ext.debugtoolbar import DebugToolbarExtension +debug_toolbar = DebugToolbarExtension() + +from flask.ext.bcrypt import Bcrypt +bcrypt = Bcrypt() + +from flask.ext.login import LoginManager +login_manager = LoginManager() + +# Change this to HerokuConfig if using Heroku. +from flask.ext.appconfig import AppConfig +config = AppConfig() diff --git a/stattracker/forms.py b/stattracker/forms.py new file mode 100644 index 0000000..d55687f --- /dev/null +++ b/stattracker/forms.py @@ -0,0 +1,20 @@ +from flask_wtf import Form +from wtforms import StringField, PasswordField +from wtforms.fields.html5 import EmailField +from wtforms.validators import DataRequired, Email, EqualTo, URL + + +class LoginForm(Form): + email = StringField('Email', validators=[DataRequired(), Email()]) + password = PasswordField('Password', validators=[DataRequired()]) + + +class RegistrationForm(Form): + name = StringField('Name', validators=[DataRequired()]) + email = EmailField('Email', validators=[DataRequired(), Email()]) + password = PasswordField( + 'Password', + validators=[DataRequired(), + EqualTo('password_verification', + message="Passwords must match")]) + password_verification = PasswordField('Repeat password') diff --git a/stattracker/models.py b/stattracker/models.py new file mode 100644 index 0000000..a2a431d --- /dev/null +++ b/stattracker/models.py @@ -0,0 +1,33 @@ +from .extensions import db + +"""Add your models here.""" + +from . import db, bcrypt, login_manager +from flask.ext.login import UserMixin +from sqlalchemy import func + + +@login_manager.user_loader +def load_user(id): + return User.query.get(id) + +class User(db.Model, UserMixin): + id = db.Column(db.Integer, primary_key=True, autoincrement=True) + name = db.Column(db.String(255), nullable=False) + email = db.Column(db.String(255), unique=True, nullable=False) + encrypted_password = db.Column(db.String(60)) + + def get_password(self): + return getattr(self, "_password", None) + + def set_password(self, password): + self._password = password + self.encrypted_password = bcrypt.generate_password_hash(password) + + password = property(get_password, set_password) + + def check_password(self, password): + return bcrypt.check_password_hash(self.encrypted_password, password) + + def __repr__(self): + return "".format(self.email) diff --git a/stattracker/static/.gitkeep b/stattracker/static/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/stattracker/static/main.css b/stattracker/static/main.css new file mode 100644 index 0000000..e69de29 diff --git a/stattracker/static/main.js b/stattracker/static/main.js new file mode 100644 index 0000000..e69de29 diff --git a/stattracker/static/modernizr.js b/stattracker/static/modernizr.js new file mode 100644 index 0000000..e69de29 diff --git a/stattracker/static/normalize.css b/stattracker/static/normalize.css new file mode 100644 index 0000000..81c6f31 --- /dev/null +++ b/stattracker/static/normalize.css @@ -0,0 +1,427 @@ +/*! normalize.css v3.0.2 | MIT License | git.io/normalize */ + +/** + * 1. Set default font family to sans-serif. + * 2. Prevent iOS text size adjust after orientation change, without disabling + * user zoom. + */ + +html { + font-family: sans-serif; /* 1 */ + -ms-text-size-adjust: 100%; /* 2 */ + -webkit-text-size-adjust: 100%; /* 2 */ +} + +/** + * Remove default margin. + */ + +body { + margin: 0; +} + +/* HTML5 display definitions + ========================================================================== */ + +/** + * Correct `block` display not defined for any HTML5 element in IE 8/9. + * Correct `block` display not defined for `details` or `summary` in IE 10/11 + * and Firefox. + * Correct `block` display not defined for `main` in IE 11. + */ + +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +main, +menu, +nav, +section, +summary { + display: block; +} + +/** + * 1. Correct `inline-block` display not defined in IE 8/9. + * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera. + */ + +audio, +canvas, +progress, +video { + display: inline-block; /* 1 */ + vertical-align: baseline; /* 2 */ +} + +/** + * Prevent modern browsers from displaying `audio` without controls. + * Remove excess height in iOS 5 devices. + */ + +audio:not([controls]) { + display: none; + height: 0; +} + +/** + * Address `[hidden]` styling not present in IE 8/9/10. + * Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22. + */ + +[hidden], +template { + display: none; +} + +/* Links + ========================================================================== */ + +/** + * Remove the gray background color from active links in IE 10. + */ + +a { + background-color: transparent; +} + +/** + * Improve readability when focused and also mouse hovered in all browsers. + */ + +a:active, +a:hover { + outline: 0; +} + +/* Text-level semantics + ========================================================================== */ + +/** + * Address styling not present in IE 8/9/10/11, Safari, and Chrome. + */ + +abbr[title] { + border-bottom: 1px dotted; +} + +/** + * Address style set to `bolder` in Firefox 4+, Safari, and Chrome. + */ + +b, +strong { + font-weight: bold; +} + +/** + * Address styling not present in Safari and Chrome. + */ + +dfn { + font-style: italic; +} + +/** + * Address variable `h1` font-size and margin within `section` and `article` + * contexts in Firefox 4+, Safari, and Chrome. + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +/** + * Address styling not present in IE 8/9. + */ + +mark { + background: #ff0; + color: #000; +} + +/** + * Address inconsistent and variable font size in all browsers. + */ + +small { + font-size: 80%; +} + +/** + * Prevent `sub` and `sup` affecting `line-height` in all browsers. + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sup { + top: -0.5em; +} + +sub { + bottom: -0.25em; +} + +/* Embedded content + ========================================================================== */ + +/** + * Remove border when inside `a` element in IE 8/9/10. + */ + +img { + border: 0; +} + +/** + * Correct overflow not hidden in IE 9/10/11. + */ + +svg:not(:root) { + overflow: hidden; +} + +/* Grouping content + ========================================================================== */ + +/** + * Address margin not present in IE 8/9 and Safari. + */ + +figure { + margin: 1em 40px; +} + +/** + * Address differences between Firefox and other browsers. + */ + +hr { + -moz-box-sizing: content-box; + box-sizing: content-box; + height: 0; +} + +/** + * Contain overflow in all browsers. + */ + +pre { + overflow: auto; +} + +/** + * Address odd `em`-unit font size rendering in all browsers. + */ + +code, +kbd, +pre, +samp { + font-family: monospace, monospace; + font-size: 1em; +} + +/* Forms + ========================================================================== */ + +/** + * Known limitation: by default, Chrome and Safari on OS X allow very limited + * styling of `select`, unless a `border` property is set. + */ + +/** + * 1. Correct color not being inherited. + * Known issue: affects color of disabled elements. + * 2. Correct font properties not being inherited. + * 3. Address margins set differently in Firefox 4+, Safari, and Chrome. + */ + +button, +input, +optgroup, +select, +textarea { + color: inherit; /* 1 */ + font: inherit; /* 2 */ + margin: 0; /* 3 */ +} + +/** + * Address `overflow` set to `hidden` in IE 8/9/10/11. + */ + +button { + overflow: visible; +} + +/** + * Address inconsistent `text-transform` inheritance for `button` and `select`. + * All other form control elements do not inherit `text-transform` values. + * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera. + * Correct `select` style inheritance in Firefox. + */ + +button, +select { + text-transform: none; +} + +/** + * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` + * and `video` controls. + * 2. Correct inability to style clickable `input` types in iOS. + * 3. Improve usability and consistency of cursor style between image-type + * `input` and others. + */ + +button, +html input[type="button"], /* 1 */ +input[type="reset"], +input[type="submit"] { + -webkit-appearance: button; /* 2 */ + cursor: pointer; /* 3 */ +} + +/** + * Re-set default cursor for disabled elements. + */ + +button[disabled], +html input[disabled] { + cursor: default; +} + +/** + * Remove inner padding and border in Firefox 4+. + */ + +button::-moz-focus-inner, +input::-moz-focus-inner { + border: 0; + padding: 0; +} + +/** + * Address Firefox 4+ setting `line-height` on `input` using `!important` in + * the UA stylesheet. + */ + +input { + line-height: normal; +} + +/** + * It's recommended that you don't attempt to style these elements. + * Firefox's implementation doesn't respect box-sizing, padding, or width. + * + * 1. Address box sizing set to `content-box` in IE 8/9/10. + * 2. Remove excess padding in IE 8/9/10. + */ + +input[type="checkbox"], +input[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Fix the cursor style for Chrome's increment/decrement buttons. For certain + * `font-size` values of the `input`, it causes the cursor style of the + * decrement button to change from `default` to `text`. + */ + +input[type="number"]::-webkit-inner-spin-button, +input[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +/** + * 1. Address `appearance` set to `searchfield` in Safari and Chrome. + * 2. Address `box-sizing` set to `border-box` in Safari and Chrome + * (include `-moz` to future-proof). + */ + +input[type="search"] { + -webkit-appearance: textfield; /* 1 */ + -moz-box-sizing: content-box; + -webkit-box-sizing: content-box; /* 2 */ + box-sizing: content-box; +} + +/** + * Remove inner padding and search cancel button in Safari and Chrome on OS X. + * Safari (but not Chrome) clips the cancel button when the search input has + * padding (and `textfield` appearance). + */ + +input[type="search"]::-webkit-search-cancel-button, +input[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * Define consistent border, margin, and padding. + */ + +fieldset { + border: 1px solid #c0c0c0; + margin: 0 2px; + padding: 0.35em 0.625em 0.75em; +} + +/** + * 1. Correct `color` not being inherited in IE 8/9/10/11. + * 2. Remove padding so people aren't caught out if they zero out fieldsets. + */ + +legend { + border: 0; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Remove default vertical scrollbar in IE 8/9/10/11. + */ + +textarea { + overflow: auto; +} + +/** + * Don't inherit the `font-weight` (applied by a rule above). + * NOTE: the default cannot safely be changed in Chrome and Safari on OS X. + */ + +optgroup { + font-weight: bold; +} + +/* Tables + ========================================================================== */ + +/** + * Remove most spacing between table cells. + */ + +table { + border-collapse: collapse; + border-spacing: 0; +} + +td, +th { + padding: 0; +} \ No newline at end of file diff --git a/stattracker/templates/index.html b/stattracker/templates/index.html new file mode 100644 index 0000000..a27b6b1 --- /dev/null +++ b/stattracker/templates/index.html @@ -0,0 +1,29 @@ +{% extends "layout.html" %} + +{% block body %} + +
+ {% if current_user.is_authenticated() %} + Welcome {{ current_user.name }} +
+ +
+ Logout +
+{% endif %} + +{% if not current_user.is_authenticated() %} + +
+ Login +
+{% endif %} + + + + + + +{% endblock %} diff --git a/stattracker/templates/layout.html b/stattracker/templates/layout.html new file mode 100644 index 0000000..1755fbb --- /dev/null +++ b/stattracker/templates/layout.html @@ -0,0 +1,31 @@ + + + + + + + + + + + +
+ {% block header %} +
+

Application To Be Named Later

+
+ {% endblock %} + + {% block body %}{% endblock %} + + {% block footer %} +
+ Copyright (c) 2013 +
+ {% endblock %} +
+ + + + + diff --git a/stattracker/templates/login.html b/stattracker/templates/login.html new file mode 100644 index 0000000..bd0cf93 --- /dev/null +++ b/stattracker/templates/login.html @@ -0,0 +1,18 @@ +{% extends "layout.html" %} + +{% block body %} +
+ {{ form.hidden_tag() }} +
+ {{ form.email.label }} {{ form.email(size=20) }} +
+
+ {{ form.password.label }} {{ form.password(size=20) }} +
+ +
+
+ +{% endblock %} diff --git a/stattracker/templates/register.html b/stattracker/templates/register.html new file mode 100644 index 0000000..9a2ef66 --- /dev/null +++ b/stattracker/templates/register.html @@ -0,0 +1,32 @@ +{% extends "layout.html" %} + +{% block body %} +
+ {{ form.hidden_tag() }} +
+ {{ form.name.label }} {{ form.name(size=20) }} +
+
+ {{ form.email.label }} {{ form.email(size=20) }} +
+
+ {{ form.password.label }} {{ form.password(size=20) }} +
+
+ {{ form.password_verification.label }} {{ form.password_verification(size=20) }} +
+ +
+{% for message in get_flashed_messages() %} +
+ {{ message }} +
+{% endfor %} + +{% for message in get_flashed_messages() %} +
+ {{ message }} +
+{% endfor %} + +{% endblock %} diff --git a/stattracker/views/__init__.py b/stattracker/views/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/stattracker/views/__pycache__/__init__.cpython-34.pyc b/stattracker/views/__pycache__/__init__.cpython-34.pyc new file mode 100644 index 0000000000000000000000000000000000000000..c565e671ee514970e94a36a2465feb5c795bdf47 GIT binary patch literal 154 zcmaFI!^`z)(fbevAb1QSV1Nn9bZ zmK2rdr52YYrs!uD<>yr<7NzI|c_q3fMTyDTsYPH8j9r$QT3)OlAD@|*SrQ+wS5SG2 T!zMRBr8Fni4rD*LLhY9HAkIgaxuoAVN7H#3KnpLIz<&#E57$-fpjFJrBFO zH?}wS$&vU1dP6T0+00U+rsAOT1PgaT3rLI+Y8LKjjGLJv|OLLbr!gcV4u5LQ9(8V8aZ zq;&}EkTxJ}KspEE9HdPMn`GgF^dMU3*~GDl0`_DAY1~W z1js6=OK?I_EQ4Bx@e0TqoX~t7WCNZ7_ruE|=Rh_=w%{2JugomxLAF75KrX<@Axj|_ zK`zZ!U7eYce*ub?FN0h;y~}Q|%?!x@D}JtkygKu<3i2APcUPZtO1ssf{#i0nyBKGt zXrs!c!huogZW0+)_*+S&w~HDo8KWASqKay7qBM0Tm<+aZEb5xp47TD#b-kjI;kG+&yrFLEoNI~<899J$$biuzaV<6(|z(fL-5Vr?)oac*bG z$or0+`}_#~LiC5ci`j?$d`_2cP-83^l$iCdvo>wSw6lZWwn>w&K$q_S0(gmjZ1duN zpWW*ICMtuIjCL5wevEl`7@_Rb$lRtdhC2%FVAg*Ut9{+KvGjHi3*SD3AFeqRaBzj% zqPibp7H6ZOounBixJs9e^)Yo0zK0`#F?|J`0Nj840Dg4fn7%F?dg2gW{(D{$m-|A-toAokvXM|&N3M4Yd8-Rbp*T*n|vl0YHmr~@ip5OJIK zruC=q9S66Ar+1Fmh=)pPL7O2AG2#;>lYs1FKR<# zW|Si(Vk=gO#4EhkxBkv^jmtdSv}6s+XSHcYlgue&*F{UX0&h@%TIpL(ifXFNb}n_{ ze(_+V@V@zaePhVR{Na>xh&GkKQisY;89b)k%(96;bJ{3pV~>-^^EP28AjVZ|Op^le zCvL|zYf$Hm5<4_$8aAl{gdx?kE~(c9(}M9lj7exNPwk$7A>~pHr~t$q+xpfvqnH-h zsa;5luJ9>g$6~!(TcZS}QJhRK6Zaz}gE$NHWH?k>Z%vZquvd5)C3!kmQf3L8-rU%Z zOkmdqRLI>(>-`*Qtq!u>1jC%fHZ;9ysYgpazDCLEE+OZ-SbP#Cv7~AZ@@$|dn`vxt zfp7SvZmM6M^la!L*gV9WJnfNf#8pL-{`_!T4R;2!hZeP259?%Wfk7r5D|TswBdQ#M zgN(ebtkqxFu^|;6Z|qe(d|P=|k7kjAQx{F~x>ywr`n%z@oQA;nX?|K|M(CJ11A?tx zx-1ZvsZ#g6z~CO!w&!5ngmLQv z#yp;9^o41kP16HPVhLm-mN-34Rn`Erct-FN<4bR~8Nu~6%gD6%X~2~X_G7ahm~%cO zDUo2N!v|F)4+C{TN4jRLqf}v!b9d{9d=hL&PgJm}R2IwKNxGhWQ>@taY!KZ`>VZbgW8V zkyEK5J}QegpP)NEIvaXcEM=UQ;W=L2WTOV%RvGU}+bxDZpVZo(0yb4eCC#NubSeMZ zV8B%w3~-TG`$)=C_9a&8mL+F#xA9)swB3HW^N+~kBvBvJKWCs>!FNfp9kC)hPTN`a M+tpj`rdY203tuTYVE_OC literal 0 HcmV?d00001 diff --git a/stattracker/views/users.py b/stattracker/views/users.py new file mode 100644 index 0000000..7af1e17 --- /dev/null +++ b/stattracker/views/users.py @@ -0,0 +1,62 @@ +from flask import Blueprint, render_template, flash, redirect, request, url_for, send_file +from flask.ext.login import login_user, logout_user, current_user, login_required + +from ..extensions import db +from ..forms import LoginForm, RegistrationForm +from ..models import User + +users = Blueprint("users", __name__) + +@users.route("/") +def index(): + return render_template("index.html") + + +def flash_errors(form, category="warning"): + '''Flash all errors for a form.''' + for field, errors in form.errors.items(): + for error in errors: + flash("{0} - {1}" + .format(getattr(form, field).label.text, error), category) + +@users.route("/login", methods=["GET", "POST"]) +def login(): + form = LoginForm() + if form.validate_on_submit(): + user = User.query.filter_by(email=form.email.data).first() + if user and user.check_password(form.password.data): + login_user(user) + flash("Logged in successfully.") + return redirect(request.args.get("next") or url_for("users.index")) + else: + flash("That email or password is not correct.") + + flash_errors(form) + return render_template("login.html", form=form) + +@users.route('/logout') +@login_required +def logout(): + logout_user() + return redirect(url_for('users.index')) + + +@users.route("/register", methods=["GET", "POST"]) +def register(): + form = RegistrationForm() + if form.validate_on_submit(): + user = User.query.filter_by(email=form.email.data).first() + if user: + flash("A user with that email address already exists.") + else: + user = User(name=form.name.data, + email=form.email.data, + password=form.password.data) + db.session.add(user) + db.session.commit() + login_user(user) + flash("You have been registered and logged in.") + return redirect(url_for("users.index")) + else: + flash_errors(form) + return render_template("register.html", form=form) diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 0000000..e69de29 From 341e3dc5678c3bdc77a552318880ffec688d94bb Mon Sep 17 00:00:00 2001 From: Bret Runestad Date: Sun, 1 Mar 2015 14:01:58 -0500 Subject: [PATCH 02/13] app mostly functional --- manage.py | 21 ++++ stattracker/__init__.py | 2 + .../__pycache__/__init__.cpython-34.pyc | Bin 1010 -> 1087 bytes stattracker/__pycache__/forms.cpython-34.pyc | Bin 1128 -> 1573 bytes stattracker/__pycache__/models.cpython-34.pyc | Bin 1643 -> 2720 bytes stattracker/forms.py | 9 +- stattracker/models.py | 20 ++++ stattracker/templates/add_stats.html | 30 +++++ stattracker/templates/create_enterprise.html | 28 +++++ stattracker/templates/edit_stats.html | 38 +++++++ stattracker/templates/enterprise_stats.html | 37 +++++++ stattracker/templates/index.html | 41 ++++++- stattracker/templates/layout.html | 9 +- .../__pycache__/enterprises.cpython-34.pyc | Bin 0 -> 4530 bytes .../views/__pycache__/users.cpython-34.pyc | Bin 2527 -> 2682 bytes stattracker/views/enterprises.py | 103 ++++++++++++++++++ stattracker/views/users.py | 8 +- 17 files changed, 336 insertions(+), 10 deletions(-) create mode 100644 stattracker/templates/add_stats.html create mode 100644 stattracker/templates/create_enterprise.html create mode 100644 stattracker/templates/edit_stats.html create mode 100644 stattracker/templates/enterprise_stats.html create mode 100644 stattracker/views/__pycache__/enterprises.cpython-34.pyc create mode 100644 stattracker/views/enterprises.py diff --git a/manage.py b/manage.py index 99a2f41..ea366bc 100644 --- a/manage.py +++ b/manage.py @@ -6,6 +6,10 @@ from flask.ext.script.commands import ShowUrls, Clean from stattracker import create_app, db, models +from stattracker.models import Enterprise, Stat + +import datetime +import random app = create_app() @@ -25,5 +29,22 @@ def make_shell_context(): return dict(app=app, db=db) +@manager.command +def seed(activity, unit): + """Seed first user with activities and stats""" + e = Enterprise(ent_name=activity, ent_unit=unit, user_id=1) + db.session.add(e) + db.session.commit() + today = datetime.datetime.now().date() + day = datetime.timedelta(days=1) + date = today - day + seeds = random.randint(20, 60) + for x in range(seeds): + db.session.add(Stat(value=random.randint(0, 10), recorded_at=date, enterprise_id=e.id)) + db.session.commit() + date = date - day + print("{} stats added.".format(seeds)) + + if __name__ == '__main__': manager.run() diff --git a/stattracker/__init__.py b/stattracker/__init__.py index 94f769d..bdf5448 100644 --- a/stattracker/__init__.py +++ b/stattracker/__init__.py @@ -16,11 +16,13 @@ from . import models from .views.users import users +from .views.enterprises import enterprises def create_app(): app = Flask("stattracker") app.config.from_object(__name__) app.register_blueprint(users) + app.register_blueprint(enterprises) config.init_app(app) db.init_app(app) diff --git a/stattracker/__pycache__/__init__.cpython-34.pyc b/stattracker/__pycache__/__init__.cpython-34.pyc index 68dffde132b1f0fb33c7dd410ad2933500c6dc8c..fc5a8439fdd9adf7367389001a2d51c8b796eef5 100644 GIT binary patch delta 382 zcmYjMJxjzu6rA@Wcgf|0oL-`>284hdBG||wg1v=`MH&k?!W}u4Bx+-KR$>!!zd`U9 z*y;bc*52ZNfiFQ}_wk0Ao!!}e%kGyM{WxxKcW-%K8NfHR#lnxIi?=Fz*)*Vf$ks3& zAQ^y^4dvh&NCGGqXR%j(er(6Iu+y6|&F}JYkrr3~X(UAAaoohs>sQ*jegY;dC_9)D zs3c6fkgZmjy0CQ7`xB*!8Ot?WHyuqVM(N&%gHYtc98GW4eU=_JlNYN3 PA^AMCIwZxuJmd2(pYuU4 delta 307 zcmdnb@rhme9S<+p?8Wax?3fuC9y1^TCLr4Zh>NF9RPGYwVo2d;XklQ85@tx@VF=db zop^4$crr{mBai{q&)^JF-#&RYqfTTABSRJ&Lk$B%Gb00I2|F@}1DV4K{sua@Q}t diff --git a/stattracker/__pycache__/forms.cpython-34.pyc b/stattracker/__pycache__/forms.cpython-34.pyc index d8fed5209a330c4f23b0697faa57c22ad61282f1..69ff26ddd7b3a2ff2cf0340ae5264e443cc20acf 100644 GIT binary patch literal 1573 zcma)6v2xQu5Z$vRTaxA22_a+{U@~+rNGd9rj0+MP#>2!3g&NHfosA|sE8LyQByIQ^ zet}Q9mI?|AN-B0w79kKAWNT;d?P<09_MN^ay}144+u;`v;1m3E`RI@E)*sR2_-9Z8 zNCqhbM(Y-oEs!3h9!MWjA7lV&P{%wd+aNoTcIvecWe75YGy)kz8iVXY+69?FngDyA z2avbnJtl2~U~q{^d+vJ;{r*Uimh8#tlCZZx@9UxeZ** zcJ|&bczIY^@95ygF}wPo=h&E&`ZGrHJOQcWuaEYOS?5qWsjHTEfyy5ARmk*$B(GD`-cXy7oP_9CwboEu$m^2zuG+$S?2^K&@X zr*Ww^fy9nlB|{9Vh|C(9J7j(is`l0iyN!lQ)|511n@GCH+W3oDpSkEY`YG**wv+iU z`cbTZ>J?{F>vd&sZiG5jg%(b<8<^Hnco7}V3$sO(j)$GUHy?_*aZ0w%Ti`=C_IVc* zQ}U&>Hkl&iT5l}`MzrM~nm>D^={u=R@FNjUP|Q?u8oc7=0&5I@uQ9+ZHo)_@5I0tI zALCSmruQaH(Rw^wO`~ba^+|SSrivoAgB~4_dg5-blsa8s;@eaDQt9nCMwXAA4AQkG wbanc#&T*}Z7*n{@2a24ECstupkUx;0XPiYe3fZbyQ_R!l1HsTHc2Qsxk8~^|S delta 481 zcmZutyH3L}6uoZZ#Cf#zrK$`t(4|?rA(jd;pmyt0BqVQ@oI<3y1*fPZNHDNg{sIOD z#*ToY9+2hU$8)B<>eKg%}!$n5NX(Q024 z0U#_$DM$yn1FPDG)CI|aGmsu|52O#=2N?hlfb<0g;lQ1_=s-;1)&d?vU$`LHs>^=6 zMGzhgBmV>ABa+*_sghA44~8?9OwM{qy!fu@ZSp`|{X%+e$HLPoS!(sOqS2T=NY@ZHA(d>=Nbco5C^(P=W_4)LmAs?R oNt=VsWNU8^EpPyZ4*vz@tShJDDvb|`QDmqslLjf1J*z=~064c*@Bjb+ diff --git a/stattracker/__pycache__/models.cpython-34.pyc b/stattracker/__pycache__/models.cpython-34.pyc index 3c2cd1ef7f8e3684d43c579f32a4c29171bf720a..1a97265b2c69922e3cada530d005bf843fede447 100644 GIT binary patch delta 976 zcmaiy&ubG=5XWbe-E6u)lC@GBp{O-lS*@{1L6IUJG(8BtG$1UY-N;9@KxpKSSQtqu{}tH)l3UvxkC7-j~grnfIMHpZ(<=uhf4#uJwKWPwQ_9 z;3woh20cHZm3;e9e|L9RSRib853Evy0~^Lg2wd0|4hT03xVbX%QO#%eov zESU3izfL}DPe)@7f+dheIM6dSG9@z;C^RlWKzQ)M-KDB~C1$C5f8(A~mV zCzIGyM*5#1RH zgQ*1N9MmNcI?VR1-2N1{4WcxM?PO76X)x{ZPg)txPA^K8@jB`Zq$)p*QrU_RWniOh_fSX?QX5;8 z8Ibdn`8!9W$J^}06A!FKPp6K2o01r2!W4Mqwb{s#BYS>z^22DCva4)Q?vyr`8I7l} OX`bd4SM;@W=k0&z%*LAl delta 85 zcmZ1=`kF`i9S<+p+MVx1t}rt&JZ3-wtU$H{5EnO2RBm8P;bI8Z".format(self.email) + + +class Enterprise(db.Model): + id = db.Column(db.Integer, primary_key=True, autoincrement=True) + ent_name = db.Column(db.String(255), nullable=False) + ent_unit = db.Column(db.String(255)) + user_id = db.Column(db.Integer, db.ForeignKey('user.id')) + user = db.relationship('User', + backref=db.backref('enterprises', lazy='dynamic')) + + def __repr__(self): + return "".format(self.ent_name) + +class Stat(db.Model): + id = db.Column(db.Integer, primary_key=True, autoincrement=True) + value = db.Column(db.Float, nullable=False) + recorded_at = db.Column(db.DateTime, nullable=False) + enterprise_id = db.Column(db.Integer, db.ForeignKey('enterprise.id')) + enterprise = db.relationship('Enterprise', + backref=db.backref('stats', lazy='dynamic')) diff --git a/stattracker/templates/add_stats.html b/stattracker/templates/add_stats.html new file mode 100644 index 0000000..ce36198 --- /dev/null +++ b/stattracker/templates/add_stats.html @@ -0,0 +1,30 @@ +{% extends "layout.html" %} + +{% block body %} +
+
+ +

{{ enterprise.ent_name }}

+ +
+ {{ form.hidden_tag() }} +
+ {{ enterprise.ent_unit }} {{ form.value(size=40) }} + +
+
+ + + + + {% for message in get_flashed_messages() %} +
+ {{ message }} +
+ {% endfor %} + + {% endblock %} diff --git a/stattracker/templates/create_enterprise.html b/stattracker/templates/create_enterprise.html new file mode 100644 index 0000000..abbb8ed --- /dev/null +++ b/stattracker/templates/create_enterprise.html @@ -0,0 +1,28 @@ +{% extends "layout.html" %} + +{% block body %} +
+
+
+ {{ form.hidden_tag() }} +
+ {{ form.ent_name.label }} {{ form.ent_name(size=40) }} + +
+
+ {{ form.ent_unit.label }} {{ form.ent_unit(size=40) }} +
+
+ + + {% for message in get_flashed_messages() %} +
+ {{ message }} +
+ {% endfor %} + + {% endblock %} diff --git a/stattracker/templates/edit_stats.html b/stattracker/templates/edit_stats.html new file mode 100644 index 0000000..96b7642 --- /dev/null +++ b/stattracker/templates/edit_stats.html @@ -0,0 +1,38 @@ +{% extends "layout.html" %} + +{% block body %} + + +
+

{{ enterprise.ent_name }}

+
+ + + + + + + + + + + {% for stat in enterprise.stats[:30] %} + + + + + +
Date {{ enterprise.ent_unit }} Edit Delete
{{ stat.recorded_at.date() }} {{ stat.value }} Edit + Delete +
+{% endfor %} + +
+
+
+
+
+ +
+ +{% endblock %} diff --git a/stattracker/templates/enterprise_stats.html b/stattracker/templates/enterprise_stats.html new file mode 100644 index 0000000..f67c773 --- /dev/null +++ b/stattracker/templates/enterprise_stats.html @@ -0,0 +1,37 @@ +{% extends "layout.html" %} + +{% block body %} + + + + +
+

{{ enterprise.ent_name }}

+
+ + + + + + + + + {% for stat in enterprise.stats[:30] %} + + + + + +
Date {{ enterprise.ent_unit }}
{{ stat.recorded_at.date() }} {{ stat.value }}
+ {% endfor %} + + +
+
+
+
+
+ +
+ +{% endblock %} diff --git a/stattracker/templates/index.html b/stattracker/templates/index.html index a27b6b1..6759eef 100644 --- a/stattracker/templates/index.html +++ b/stattracker/templates/index.html @@ -2,28 +2,59 @@ {% block body %} + +{% if not current_user.is_authenticated() %} +
+ Login +
+{% endif %} + + + {% if current_user.is_authenticated() %} +
Welcome {{ current_user.name }}
-{% endif %} -{% if not current_user.is_authenticated() %} +
- Login +

Your Enterprises

-{% endif %} +{% for enterprise in enterprise_list %} +
+ {{ enterprise.ent_name }} +
+ + + +
+
+
+{% endfor %} +{% endif %} + + {% endblock %} diff --git a/stattracker/templates/layout.html b/stattracker/templates/layout.html index 1755fbb..479434c 100644 --- a/stattracker/templates/layout.html +++ b/stattracker/templates/layout.html @@ -4,7 +4,7 @@ - + Stat Tracker @@ -20,7 +20,12 @@

Application To Be Named Later

{% block footer %}
- Copyright (c) 2013 +
+ Copyright (c) 2015 +
+
+ BretIsSad Productions +
{% endblock %}
diff --git a/stattracker/views/__pycache__/enterprises.cpython-34.pyc b/stattracker/views/__pycache__/enterprises.cpython-34.pyc new file mode 100644 index 0000000000000000000000000000000000000000..a6f72e8f48e2f6b8dcd32064eb7dd3e8252c0c7f GIT binary patch literal 4530 zcmcIoOLH5?5$@T=Yw;jKiliuswh+CXbxNR|I8NdyiX&Ne*-6nUL$Ry2q}qVkA-Ui# z0L?7)fW?zkzUP$RkYkSdD|5}smt1nwDPPY51WZy%s!{>5jhUUE-kJWozv<;a>W%8) z;XfbLmx=yP3!fs|AK}vL4pD@!poAzD6bMQk3LHvZ3S3GH6ci{eQc$F{L_vwtG6iK4 zJjbD=La9fAM`@LUDy20FYLwO~s6)f0s6a`B(j^L(@_vz$WlEbAG$~!7V1?3E3RWpS zN5Q#VqeRIXrRx-|Q@TOH2BqgIIG;bSOvxstn-py3{R$-)D7{F*#k}uPa*6s|6ud=J zP*f%PHoe4VE>l#as7_IXUSWqVl9#Ff1B#X?TBfK;(F*N5^il{3omGm?(JMlizrmH6 z^4eL->lAG)C|{i^pPwr4vk_}{lcEa?n%8EU7tb<#iK49q)u2FP-HuOV^JnHy2zT^6@{_Kk#Q^R_uwzMff?W#dM*zfUL z_`@kw#&r*uegyICD|$iH#}}v*ef;P?J#^>@UzeVJKrdX}YSU4HGKcf6?^0Ia87~lf z4)u%FFVTwvw_m`3L*nsO`ucH`zDA;Te0Q?-3H!R$O_G*WYN&Jz?rn8hrtOLM&8?%> z&DJ;X9qjWUF5k%Yws_luA%q(^KJH|-riL*Q{w^P?nc|O8V;U!RkV#>b`zNN4yCf4S^G&W zpX%)er?yAWP2EONn6GyU)^!PjoGsB1>IPbq)$N{=SX4NlY09b04u+97?x*)3n8NSB z=sf80H2yF^$H07xPKInII)bNX*r;R*0^f0|UtluhHb6id$dssG#w_y0*MT&qa_eIAq@0bd<5DvPj%v<9@%!vYDhH*5h zaYMIbWZ1LG#;HBG53)2-E$qi{suld0)hFE~=Ex0)gHVrm(>POW7*Ox>XaOT#^&{@r zxbMV~V*i@5mRciUjN6SOQ|b*>*lpJ7%0)1!xxJ zdZI2?an(f=U^YcnsP}Py(%8m>w{L?`K8&L~J;BQOaFFs!@8QyagUBpgeTxh{%22o# zN!&rgz~@-)E6U(yVeeSbfMkvkMgbaRn7^u9z%&H=5Qns>) z=c>(5Ry#Mt6X{!Ki&4eudVJJOA0Wg_;dcDmjwu41u{1TX;!s603Xyq@xg$>jz676y zoH}|AwE79WU@D`b1}~~)vOb@$+sFE98(RLFh29jwzQ|n{Ij&Z5U)^M}&f=#m+AKC8 zj5`=UwLyX`<(nKE>K2RlSp1m9SwT_A)p==ococZmCj-MfUfvZb>MaOzS4AEY92B#V z@I(oJ>JG+{=}ZxMWN@Y|Mu!UpW`=vXG>bE%1Juh2jBwzb7szLT3JOL(BQ7Ev2uN0@ zT;X*5;*R*e#sx0re4Y z>^CfUUB0^zA!lvev-Wvozl8eYz8Tl)zS--i_x(MN_$##E7zOqeWsU%G0RNmL_+S>G z0AxN6TZD%C*0yarTQ2wyT#q2KY7GL>Bb?B|x5HeIuq(1LW_-&KtWn`wipi=8y__4W zJH{RE_9qt~9LQD@4-Q)gUESK1a?l!&n9ZX$j%|Agypa>s&)HG`jt*AxoS%p48fMsF zpVNY=kA|Z$*Kr{hbS43?zZY15;mzr0$^yUQ8^=^|D#GW1#1XBzlpsX-x>yDS@R88K zq0n@u9PlYdC(Z3hCNg_N%<}>`Nc01U{~mjQjpLllDkgGUY4t0NzsNkws!SMDBzlzYdt}hvjmts=S1e$^J#gC@lJFVf*ke?`$T<)-lVlyDjlan*h}Kx zp>B^*iq1|>rs?B~=g;Vz_6&B2*nNc>$X1>oW4lNTMDVG*wk(BfxKOp8%K7p*xN-L3 z9JOAAOKpPLPVP_KK(U0lx1Pqih_tW=q%DDJJI8D0DviUL?_< z9C}=$j*Ti`s1KmzJH~0>Qr5HIck1ivZRTiHGow2p+vEp$G`TiEGsE6NS7q(n$*|W= z^c^&26aI%)@u`YJ>2v&?wJh~p4Ezz-bUj8qGXe+2UYflYHx(mjDk7@Ex0mdhf|l}7RiNk>=TvNp ztg21P7A87yp?@-AnZSG0R-)AGYzf(YEh*%HwekeOsZbIxAH%EC*bl>bzVn@@t7!_zwoDCJU~8Es2>@ zIz%REb&l^?ciBS6mN!m3w7v>f@Xo`YO5$C-Z*VIp<-h7n%rlkHR^(x*HrWina+spR zi>b8Ls;x}yfvoQFIFppkPrLsG2ikD7MRDae)-_J#9Y$Bb3-P|V;xxq-u?5)_%MSiZ Tn_|6zYh_)mbDOV~cPjq^ak<5^ literal 0 HcmV?d00001 diff --git a/stattracker/views/__pycache__/users.cpython-34.pyc b/stattracker/views/__pycache__/users.cpython-34.pyc index 6d547684af051bafec786e48cd891ac781aa237d..05ae30328bce30de3503f3f01ad0e44cd0f3bfca 100644 GIT binary patch delta 874 zcma)4OHUI~6h7xpr!$n+R+v_x5D`LfOn4X+2ohpqSm;8d$U-)ghPlEt(^k$*6JvZV z%EFZinV;aw=+3Qc{SUKo;liCU8aE^w&uK-7D`#@QdtTq1@18p!2M?XeFZn|5vh(fk zcN^dnoOn#Oukwo44kll$Hyqe<05yVdfi6Qw!Bz!y1?p$Ox1q!FKJas}4`Oc(f!_~) z9{d9Avpd|YJoq|(e&mScNTKGEGWeB0JfT*51<5jw<7jdZ-#t@lW;4>1=GL3BrUw*6 zIyKuIi4JjY`$#gfk>PbsG_Nzn0Cj{804+hRpl(1t13pT;16VgD^@Pi^;4APAcr4O! zqvx}d4If~`&D>l|Gt%r)E@=At;p}eQ2-BkeE5!?gD0VIC=ay+Hh`d@m-sN<#U5m9( z1IeCQE~iE<49VaU7pcPAE1+r;sLfM6b^w*fDwY(DCGXYGD`z>9nwqFZRAsvdqY};E z4{On`*Ud$P9Ep1TQ7oW=#|9 zYbR)qa3*pXK=olB&#}B5zZ0sUa!8BGMAo}-Ozc`+eOYF=+Oc$s$wuNIqNFSERe^P>DC16F4n!La(^<0v843OSCMokkswjx&JzdO?roKM$>%q!Jf8O znSRq9OMci-_h^8f)b_k)t)V@SWRR&zEL_u=wCOfj6l+O9xF_axd|Z3A(em4&UX!0M Yl6$?xGb&*PE2^lfeMM`!n8$MVH|x`?TL1t6 delta 663 zcmZ9I%TE(g6voe)={#*M%CsVnN@yq!Vu|2_U?Qk1H#Je%keCTF7pN(1JkusZf*aVG znBd)+xN_y%jSE-)8MAT0UR}8$G4Y%!i4Bw7-~H}+-S5s>@MF08GhguA-+!$Qy8x#! z@L8-^c_m9H)pskX5Ml>Z07nLFlt7i>Wf@`@jyUc??87mL-na(wC5ZD77vPwWBmK&g zKaWrT2`#6bXI>K*jnC8|KMXA+eCTBRmHQ)sdK0FdLKBEf|qg?hZG#Uqf zvmL9~_1*4XD?~Cm{~0LYjRI|$>#nqdL1nGXzxPI1r(0Pp%mL!_rZfz#JQI<=J z97*_(aOXG{&_tU0@-g=mv7&!l)gZNA^%U)=-gdLqRTRD0r<%TDKe;`{9hryFpbG0W zC(pTfmDTF(G}~qU!Jfbc{nd_U`+lW4Q<))~t2({zG)I#h155{L@zVnbv8Ero%UIWk z?&D>-CJbnZH@YdfA_xVuf|}r#U``;D=&qpt-mA}FG)#9S_1{kB#3i-UO!%R5`nfmb zEOALA9M^BXH>;@|MeWT!6-9KF!>L7VSy5T0WV07UEefPPVy5UzY4;e*c%qluF I#XOeme+Aiqb^rhX diff --git a/stattracker/views/enterprises.py b/stattracker/views/enterprises.py new file mode 100644 index 0000000..85428bc --- /dev/null +++ b/stattracker/views/enterprises.py @@ -0,0 +1,103 @@ +from flask import Blueprint, render_template, flash, redirect, request, url_for, send_file +from flask.ext.login import login_user, logout_user, current_user, login_required + +from ..extensions import db +from ..forms import LoginForm, RegistrationForm, EnterpriseForm, StatForm +from ..models import User, Enterprise, Stat + +from datetime import datetime +from io import BytesIO +import matplotlib.pyplot as plt + +enterprises = Blueprint("enterprises", __name__) + +def flash_errors(form, category="warning"): + '''Flash all errors for a form.''' + for field, errors in form.errors.items(): + for error in errors: + flash("{0} - {1}".format(getattr(form, field).label.text, error), category) + +@enterprises.route("/create_enterprise", methods=["GET", "POST"]) +@login_required +def create_enterprise(): + form = EnterpriseForm() + if form.validate_on_submit(): + enterprise = Enterprise(ent_name=form.ent_name.data, + ent_unit=form.ent_unit.data, + user_id=current_user.id) + db.session.add(enterprise) + db.session.commit() + return redirect(url_for("users.index")) + flash_errors(form) + return render_template("create_enterprise.html", form=form) + +@enterprises.route("/add/", methods = ["GET", "POST"]) +@login_required +def add_stats(id): + enterprise = Enterprise.query.get(id) + form = StatForm() + if form.validate_on_submit(): + stat = Stat(value=form.value.data, + recorded_at=datetime.now().date(), + enterprise_id=enterprise.id) + db.session.add(stat) + db.session.commit() + return redirect(url_for("users.index")) + flash_errors(form) + return render_template("add_stats.html", + form=form, + enterprise=enterprise, + post_url= url_for('enterprises.add_stats', id=enterprise.id)) + +@enterprises.route("/view/", methods = ["GET"]) +@login_required +def view_stats(ent_id): + enterprise = Enterprise.query.get(ent_id) + stat_list = Stat.query.filter_by(enterprise_id = ent_id).all() + return render_template("enterprise_stats.html", enterprise=enterprise, stat_list=stat_list) + +@enterprises.route("/editpage/", methods=["GET", "POST"]) +@login_required +def edit_page(id): + enterprise = Enterprise.query.get(id) + stat_list = Stat.query.filter_by(enterprise_id = id).all() + return render_template("edit_stats.html", enterprise=enterprise, stat_list=stat_list) + +@enterprises.route("/editstat/", methods=["GET", "POST"]) +@login_required +def edit_stats(id): + stat = Stat.query.get(id) + enterprise = Enterprise.query.get(stat.enterprise_id) + form = StatForm(obj=stat) + if form.validate_on_submit(): + form.populate_obj(stat) + db.session.add(stat) + db.session.commit() + flash("The link has been updated.") + return redirect(url_for("index")) + + return render_template("add_stats.html", + form=form, + enterprise=enterprise, + post_url= url_for('enterprises.add_stats', id=enterprise.id)) + +@enterprises.route("/delete/", methods = ["GET", "POST"]) +def delete_stats(id): + stat = Stat.query.get(id) + enterprise = Enterprise.query.get(stat.enterprise_id) + db.session.delete(stat) + db.session.commit() + return redirect(url_for("index")) + +@enterprises.route("/enterprises/_clicks.png") +def enterprise_chart(id): + enterprise = Enterprise.query.get(id) + dates = [stat.recorded_at for stat in enterprise.stats] + values = [stat.value for stat in enterprise.stats] + + fig = BytesIO() + plt.plot_date(x=dates, y=values, fmt="-") + plt.savefig(fig) + plt.clf() + fig.seek(0) + return send_file(fig, mimetype="image/png") diff --git a/stattracker/views/users.py b/stattracker/views/users.py index 7af1e17..a94e361 100644 --- a/stattracker/views/users.py +++ b/stattracker/views/users.py @@ -3,13 +3,17 @@ from ..extensions import db from ..forms import LoginForm, RegistrationForm -from ..models import User +from ..models import User, Enterprise users = Blueprint("users", __name__) @users.route("/") def index(): - return render_template("index.html") + if current_user.is_authenticated(): + enterprise_list = Enterprise.query.filter_by(user = current_user).all() + return render_template("index.html", enterprise_list=enterprise_list) + else: + return render_template("index.html") def flash_errors(form, category="warning"): From 6593141e28b1ea17312fc2493e103c0e65be8efd Mon Sep 17 00:00:00 2001 From: Bret Runestad Date: Sun, 1 Mar 2015 15:58:16 -0500 Subject: [PATCH 03/13] trying to push to heroku --- migrations/versions/1a163d3f0d7_.py | 26 +++++ migrations/versions/1cf81d9509f_.py | 33 ++++++ migrations/versions/3f88f89198f_.py | 34 +++++++ migrations/versions/46c70e0e089_.py | 26 +++++ .../__pycache__/1a163d3f0d7_.cpython-34.pyc | Bin 0 -> 779 bytes .../__pycache__/1cf81d9509f_.cpython-34.pyc | Bin 0 -> 1001 bytes .../__pycache__/3f88f89198f_.cpython-34.pyc | Bin 0 -> 1023 bytes .../__pycache__/46c70e0e089_.cpython-34.pyc | Bin 0 -> 622 bytes requirements.txt | 3 + stattracker/__init__.py | 2 + .../__pycache__/__init__.cpython-34.pyc | Bin 1087 -> 1175 bytes stattracker/__pycache__/models.cpython-34.pyc | Bin 2720 -> 2922 bytes stattracker/extensions.py | 7 +- stattracker/models.py | 6 ++ stattracker/templates/add_stats.html | 7 +- stattracker/templates/edit_stats.html | 5 +- stattracker/templates/enterprise_stats.html | 4 +- stattracker/templates/index.html | 1 + .../views/__pycache__/api.cpython-34.pyc | Bin 0 -> 3618 bytes .../__pycache__/enterprises.cpython-34.pyc | Bin 4530 -> 4573 bytes stattracker/views/api.py | 96 ++++++++++++++++++ stattracker/views/enterprises.py | 4 +- 22 files changed, 245 insertions(+), 9 deletions(-) create mode 100644 migrations/versions/1a163d3f0d7_.py create mode 100644 migrations/versions/1cf81d9509f_.py create mode 100644 migrations/versions/3f88f89198f_.py create mode 100644 migrations/versions/46c70e0e089_.py create mode 100644 migrations/versions/__pycache__/1a163d3f0d7_.cpython-34.pyc create mode 100644 migrations/versions/__pycache__/1cf81d9509f_.cpython-34.pyc create mode 100644 migrations/versions/__pycache__/3f88f89198f_.cpython-34.pyc create mode 100644 migrations/versions/__pycache__/46c70e0e089_.cpython-34.pyc create mode 100644 stattracker/views/__pycache__/api.cpython-34.pyc create mode 100644 stattracker/views/api.py diff --git a/migrations/versions/1a163d3f0d7_.py b/migrations/versions/1a163d3f0d7_.py new file mode 100644 index 0000000..b4efd87 --- /dev/null +++ b/migrations/versions/1a163d3f0d7_.py @@ -0,0 +1,26 @@ +"""empty message + +Revision ID: 1a163d3f0d7 +Revises: 46c70e0e089 +Create Date: 2015-02-28 15:15:17.961304 + +""" + +# revision identifiers, used by Alembic. +revision = '1a163d3f0d7' +down_revision = '46c70e0e089' + +from alembic import op +import sqlalchemy as sa + + +def upgrade(): + ### commands auto generated by Alembic - please adjust! ### + op.drop_constraint('stat_recorded_at_key', 'stat', type_='unique') + ### end Alembic commands ### + + +def downgrade(): + ### commands auto generated by Alembic - please adjust! ### + op.create_unique_constraint('stat_recorded_at_key', 'stat', ['recorded_at']) + ### end Alembic commands ### diff --git a/migrations/versions/1cf81d9509f_.py b/migrations/versions/1cf81d9509f_.py new file mode 100644 index 0000000..6d76fb1 --- /dev/null +++ b/migrations/versions/1cf81d9509f_.py @@ -0,0 +1,33 @@ +"""empty message + +Revision ID: 1cf81d9509f +Revises: 2c7418044df +Create Date: 2015-02-27 13:46:49.710443 + +""" + +# revision identifiers, used by Alembic. +revision = '1cf81d9509f' +down_revision = '2c7418044df' + +from alembic import op +import sqlalchemy as sa + + +def upgrade(): + ### commands auto generated by Alembic - please adjust! ### + op.create_table('enterprise', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('ent_name', sa.String(length=255), nullable=False), + sa.Column('ent_unit', sa.String(length=255), nullable=True), + sa.Column('user_id', sa.Integer(), nullable=True), + sa.ForeignKeyConstraint(['user_id'], ['user.id'], ), + sa.PrimaryKeyConstraint('id') + ) + ### end Alembic commands ### + + +def downgrade(): + ### commands auto generated by Alembic - please adjust! ### + op.drop_table('enterprise') + ### end Alembic commands ### diff --git a/migrations/versions/3f88f89198f_.py b/migrations/versions/3f88f89198f_.py new file mode 100644 index 0000000..943d9fa --- /dev/null +++ b/migrations/versions/3f88f89198f_.py @@ -0,0 +1,34 @@ +"""empty message + +Revision ID: 3f88f89198f +Revises: 1cf81d9509f +Create Date: 2015-02-27 21:38:03.681698 + +""" + +# revision identifiers, used by Alembic. +revision = '3f88f89198f' +down_revision = '1cf81d9509f' + +from alembic import op +import sqlalchemy as sa + + +def upgrade(): + ### commands auto generated by Alembic - please adjust! ### + op.create_table('stat', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('value', sa.Float(), nullable=False), + sa.Column('recorded_at', sa.DateTime(), nullable=False), + sa.Column('enterprise_id', sa.Integer(), nullable=True), + sa.ForeignKeyConstraint(['enterprise_id'], ['enterprise.id'], ), + sa.PrimaryKeyConstraint('id'), + sa.UniqueConstraint('recorded_at') + ) + ### end Alembic commands ### + + +def downgrade(): + ### commands auto generated by Alembic - please adjust! ### + op.drop_table('stat') + ### end Alembic commands ### diff --git a/migrations/versions/46c70e0e089_.py b/migrations/versions/46c70e0e089_.py new file mode 100644 index 0000000..0d52ad4 --- /dev/null +++ b/migrations/versions/46c70e0e089_.py @@ -0,0 +1,26 @@ +"""empty message + +Revision ID: 46c70e0e089 +Revises: 3f88f89198f +Create Date: 2015-02-28 11:50:09.646566 + +""" + +# revision identifiers, used by Alembic. +revision = '46c70e0e089' +down_revision = '3f88f89198f' + +from alembic import op +import sqlalchemy as sa + + +def upgrade(): + ### commands auto generated by Alembic - please adjust! ### + pass + ### end Alembic commands ### + + +def downgrade(): + ### commands auto generated by Alembic - please adjust! ### + pass + ### end Alembic commands ### diff --git a/migrations/versions/__pycache__/1a163d3f0d7_.cpython-34.pyc b/migrations/versions/__pycache__/1a163d3f0d7_.cpython-34.pyc new file mode 100644 index 0000000000000000000000000000000000000000..634ab7d42dce09ee6f05ea531338f0c3e0df1e5d GIT binary patch literal 779 zcmZ{iJ#W-77{{Ny-{r2nNJt>2Fy3&@y|j1j2_d9*0f`$ZELoy7etM+MTkTv?5L@{& zd>|IDOe_qHOgv6F5hQTzM}Ir^-~K)J_u-!V<;jmXA9aAQ&?(f1=hVbY3Jf5is6n6s z(;?7-8Nf_P4aiIgOwd%{g4BY*21eC^PqfAX)&tgWGzkmNM(&3T%*v|vG87`(pzFTI zn?xiR9%_h^s@nklh9eLBk zm8#4Ak75f{`ZmqFl#H?}|m@gqnCvp#r!h+6K6#z1201GI2Jt z*7AXZ+dL3Z*k<3$<9MJ_5HC3*E3c%R0b z@bi`bRv;JtIme1`b0i<;C%nk(h%;Zgj%ihVh1}1Q4Ua0ym+)_BNh3O>;eJ_5XIs)F zhW8bWx=GOafZ|`YCJp?LcB8?qLAR=C%{5n3xyp_lbdYyskK*P|!j`v#_y@36u5#$J z;(gwn?jdz|r@KRX)R#^evLX&c+2g-oh1^r~DbwvEkxrCicAms-QeAPKMrr&Gvs&sR hY9P7t`sdcYr&+j*qzEuIXmrEFUgxOY>(Plflq}G!ag2b0cIRNX z-QDdTHah!*-m^ikzjxR{;=bpNH`a2QjkO%N*by`>L(=Ie%BFk@1+&Oim?N%n(kED`s&VT*U0exES(9kT7G%Oho$f_7ApKEYAej=f;^S zCVftCa$}FvrYlPsrxxaF`#Q^Hhzg87OygN1jB|?hA|{P}rX?4V**ZxjxWrY{%-( zQQbmXGLmHsG)WSNAPz5CGM9Bsksm%!c5iL>d6Lpu%w9OiRW$^=WLq}bv}&bV F{V(@3@2da+ literal 0 HcmV?d00001 diff --git a/migrations/versions/__pycache__/3f88f89198f_.cpython-34.pyc b/migrations/versions/__pycache__/3f88f89198f_.cpython-34.pyc new file mode 100644 index 0000000000000000000000000000000000000000..202fc73cdd8dd8d0548efab00dc1a44a9cc845d6 GIT binary patch literal 1023 zcmZuwO>fgc5FKyg*l|)+L@N#)@HI$nKB^WcLI^2UrGlssw3l2g*E>nK_#@r5i_&ZO z0sIa4NqgnQ1&J#s#&&2^skZlNc4zj@&fD?t_J-4X@#pkg4d5rNJ&f!(G}K!H4lp4! zU}6AgFk!%J!0QmzAg;rt4n{FIAu?go08XC;Uulm8+y>q(Z8A*w)NyX67|*kX8>3Re z3?1hqUJE7C#63P7xqDO3n|j0k(3@5cR3o<^PQ5-K?)QdMXDl(u&^;s=xr1JRf2TLt z8N74{{n4H`>h0|wc>RN+=Qxwr8kcUZar~l+pkrv3&QHR^{{J{+jA^JJ1R203Rck=T z;F79irBR0^2~ifmWX8&6mM-%lSEF<_9&%at32j&rl4uspD0Q>IWtErIW3a3a(<~Gw zdufyIP-uFh>naN}%>>tWl1EW+9^sKTuY)K@-I5rlk|XyiWCN27w^?=AQ$&nH_sArmE&F9caTpgaS4Clch3|`)jgM($vi=-jdz7ilSLqTx2SZ7 z*u&2#yRn$bAfxV4-D}!X8f*9N@6H$6%I6fs@o{mrn*_j`#6f$q3Hgy z6N){zoj{sbg0mA@Cr5`>YB^k{^Gd6`Dk^J>!gQ0TUy||&&uOX(a$xc)VW+7r-{)!Q z``VVPA3<*v@&4`93L=cpMYu|)uA(3cFEC!n7EzRkFUcOvZNG|Bo=5oFqFB`?Xw(`; LgKZk^TKmyIX)E^( literal 0 HcmV?d00001 diff --git a/migrations/versions/__pycache__/46c70e0e089_.cpython-34.pyc b/migrations/versions/__pycache__/46c70e0e089_.cpython-34.pyc new file mode 100644 index 0000000000000000000000000000000000000000..92d025e3af7f73832d0d5a6ba126db9bde091297 GIT binary patch literal 622 zcmah_Jx_yB6um$TEw+hHuB;s@w6;izF(!7=L7V^q_RU(x79@W&@KjY8vZ?HPK zm~?S)@;>}1n-AW}IeGV<`|;jtn=h-?<%a_B3YDWGKg26e5GX)^s6e0qRUuG;YCvm{ zXpq(*sDUDN9g;c(I#B!#c)}b5Xai`o#VES={|D`i5EYi63~>^>H8HnWb$ zzBO>8J%{1vjlLh4@U7jc=S{s)Z{$tQBhE<9tTBRb^_||Z>-4*Q&+7I3q2oKF9e3ak zUDq^&jfz*XQSo@giJ+qtYBoQMB>z3Q131DfY6v*9PYc{k@Ix@Fu><7-ZGoK4vGm{O8TSK-clSs05s22r*p3(Kv8%5}tl zJ6pF@VRg(bnlyWum8RP$e@zYKon~Q#AtHMVio1j) q(G5$Ng(^td8<$>{s^x~t(vAHzql<(c$OzFw&^2Ar)lH?Pwe&BVP3YiF?qt>n`?kU0iq&s z23&#}B1Q;<5|A-Nz(~%Ea$YD4K_fFplWN}7a)Q$V8uThzX4hQmq)He$Q6!xHMbi~& zITn6zB-}IaYFcd3eOu$5sS<~-2rWN2_byF6ao9c+dh)>9SW8lNylrGp*dPK_v5FdD zg=MTQl+46BxgE2foJ!9}wmkOSNoY~L&}skI6t%4Tr#i{B)E)*r_T9bgx58B-1FOuE Lmyy7#6i;A35iw9H delta 328 zcmbQvxt~M%9S<*;fzhXsiOdWPj~S2v6Oioy#Kp@dD$f$+W=P>-XklQ85@kr?WeC>f zn|SY-crr{mBai{q&)^JFKV|YEM$7sVMuseQh8hNjW=00a5)NbzCo+c%$^j~AW&*0@ zMwaA3;-oM!l<+Xb^McF_)@1g(#a&#ISW;4yn4FzjRK;CdoLW?@my@5KnWxED#58#k zlkMauOqPtIljWF$G(|xUlK>J7j6942jJ%AzOh62TU^XKsQ;|4O&QDWp@@(ccnqW>5 fNDmSr2ISu2u*uC&Da}c>1NpdEXmSIK2qO~!dA&Q& diff --git a/stattracker/__pycache__/models.cpython-34.pyc b/stattracker/__pycache__/models.cpython-34.pyc index 1a97265b2c69922e3cada530d005bf843fede447..a0847da0891f3f881123361e22cd118fc4d236e4 100644 GIT binary patch delta 420 zcmXYsze~eV5XbMeX_BT1T7NZA{6(jrR;@MQCWtPAg9^GxsLey4Xi_feU={jDJaBUG zKM)bYN$?+VbIIcF;Ns-wB`wE&`8?j;_wF7hzo(2J(=y)i_wZ4BGR9T*CcoH;yit$j zeQrd4s;B)t0Bli4izGsUTYw7ypMjea13x#Q9QgSG<-u3LJ#Y$pSfZXp=RxcRtt&pD zZXn`B>qZwqBAo=7#SDtx*me+e z?4XEveOM$vl)60D>_TQPds>w>~jgh6yJ zI=GNdRnlFtK`5v7+QcY<$z~{QN|V_+Q+?joH(4zyA#aE1bKh&lxR&->bo+2Gx)z)A hrRY>$`dO!p=)TO#9$KL*|B3-~<*Z(jePfQ5{{bXmWOo1n delta 294 zcmaDQwm_8Y9S<+p0mV-tKiM{N39~V7ntY!zc5*daICHS3z~qN)Nt180C{EVokZ`@l zk(yT$pO=`Ms>xU+&cMJ>!~-XIK`ccep##LlOhAHxu}auAuOzjopeVCARWCliD7By{ zK7O(smzqbnV#pJT6v4Tv^cdWJ~QPOPf==4Vo7Fx zUU5cdL6J64$1N6++~lVm%0hfVE)Sy|5J~_s52FOrW*JTgM&&5(qSWO4qLkE>_{5ST y1CTYmK&L~U0yMVBXmUN5rnCuA2IPohkUu~MNk9!MGMRjsE057+vJtmABR2rWp-r0r diff --git a/stattracker/extensions.py b/stattracker/extensions.py index 3e41b0c..5a14624 100644 --- a/stattracker/extensions.py +++ b/stattracker/extensions.py @@ -17,5 +17,8 @@ login_manager = LoginManager() # Change this to HerokuConfig if using Heroku. -from flask.ext.appconfig import AppConfig -config = AppConfig() +# from flask.ext.appconfig import AppConfig +# config = AppConfig() + +from flask.ext.appconfig import HerokuConfig +config = HerokuConfig() diff --git a/stattracker/models.py b/stattracker/models.py index 6c9d80a..a87c923 100644 --- a/stattracker/models.py +++ b/stattracker/models.py @@ -41,6 +41,12 @@ class Enterprise(db.Model): user = db.relationship('User', backref=db.backref('enterprises', lazy='dynamic')) + def to_dict(self): + return {"id": self.id, + "ent_name": self.ent_name, + "ent_unit": self.ent_unit, + "user_id": self.user_id} + def __repr__(self): return "".format(self.ent_name) diff --git a/stattracker/templates/add_stats.html b/stattracker/templates/add_stats.html index ce36198..501f40e 100644 --- a/stattracker/templates/add_stats.html +++ b/stattracker/templates/add_stats.html @@ -9,11 +9,14 @@

{{ enterprise.ent_name }}

{{ form.hidden_tag() }}
- {{ enterprise.ent_unit }} {{ form.value(size=40) }} - + {{ form.value(size=20) }} {{ enterprise.ent_unit }}
+ +
+
+
diff --git a/stattracker/templates/edit_stats.html b/stattracker/templates/edit_stats.html index 96b7642..9295df2 100644 --- a/stattracker/templates/edit_stats.html +++ b/stattracker/templates/edit_stats.html @@ -2,6 +2,7 @@ {% block body %} +

{{ enterprise.ent_name }}

@@ -24,9 +25,11 @@

{{ enterprise.ent_name }}

Edit Delete - + {% endfor %} + +


diff --git a/stattracker/templates/enterprise_stats.html b/stattracker/templates/enterprise_stats.html index f67c773..acba17d 100644 --- a/stattracker/templates/enterprise_stats.html +++ b/stattracker/templates/enterprise_stats.html @@ -2,7 +2,7 @@ {% block body %} - +
@@ -22,8 +22,8 @@

{{ enterprise.ent_name }}

{{ stat.recorded_at.date() }} {{ stat.value }} - {% endfor %} +
diff --git a/stattracker/templates/index.html b/stattracker/templates/index.html index 6759eef..4e2316c 100644 --- a/stattracker/templates/index.html +++ b/stattracker/templates/index.html @@ -47,6 +47,7 @@

Your Enterprises

+

diff --git a/stattracker/views/__pycache__/api.cpython-34.pyc b/stattracker/views/__pycache__/api.cpython-34.pyc new file mode 100644 index 0000000000000000000000000000000000000000..6ef3fe1d3a5599bfde1218360f6acf44b77f1f9c GIT binary patch literal 3618 zcmai0TaQ~w5w3IbWjyxSab_l&T%GJL!7JhkkPT=FVYS%}utKv44+0$#9i4HvXO8Dw zobKZ!Gt4|?1qcCRe+JS%@C)FXztFGy6s^PyZ~FpY^|9mZfW(oz-CbQ>U0wB6b^Wv1 zYW)4z|JuE@O7uCs_Ej)`4^77ok-*QPgeZ75b|`Qx-KE5()T6+o)Th9wv_e6J(kca2 zN^2C?aXM@fUyRSH%y_eoSJX;Rvvphf8#1#6VHDQK5#RZ2RPo}=I# zrCkcTCACJ$c}mwQSf_M@f{jvcosvyTFHmp+^A!>e`UE;(BSzE3=%2jIWOy?2STBV>g%A$R2am5~_SDvY8sz<1V;N+(ew7}X!>vHu=fN%hyFx#>aw&Gwkj14 z9o9*`#na)E>RRewsqlCKhi!rP)T6?m@5AATKB?F)yR>!UQCOi2dcNZDEXQZ`d|;V8 z+L~191qO0({+5b&b(c9)*atH{yGkv zsZ58A*TMZHA4Q3NF!*m#eMfa6r|+sB{?r@X-C%-K5*S6M`MR_YGmjQprooG5u;!(s`+h&E2n-6ouNLJk5 zg|`5HpQ)xIX6aP()OyGlQ4v{X%g(CWV$N{k6TXhNiaF|SjN?y%g%RU{KmLEE={hE* zUaTOpluxCCl^s*=`+s^a?8de^t5$QCMYG}{SMjkFx4=+p<*ILB{7NBKhT&*U_e%_5 zt_ecVT2JkAByvoe4O8cw zltrmD^=YK_vs?*Nk!chszNK2&d)a9_>K-T~CiBN`W1m_p z-Npa_gB5VeQ)@AGoeEgUW;rKoa5{q3u*?tMucDM5u)^IT*MOjBb9Kw(8l}Whr7oA>Bqy} zuUv#JWiRq$49ZA>vWG6IO}@noXbk<~Qg{**+z@_;t3R<<{h+*bQRS$@jTy8c4f~ZH z^)3XC7Eot7Tmvq)Nj%kWH<~LlKYoWpW31OalQqf49!q z=gY?ZB-X_!Pp1za@dBC@F1h(jFOs!3Ey)Ueaz;6yyyM@xM{MU5tPnxF!zTY7^gt6*~`O+E(k zi+4-?o{AQsO5)7Z;QHtus-q#cvZPh|qh&1CXws%hhj%cT=ks%=y1+=+K8ojgj&)R4 z5Lc{oeTABe-^&fq9aL5}uVtP2p?tc?#-B z!;g1*^ZI9CYLN~L`MlUweVEVGQ3R!&nRiTcq}4c-S+ti(@yK{6k>WoCk;k`o4`PTf zqvWV}5Mh$wP;u1TlQQd-z88aF1&4?BMSb}X2tV!)=CD{QW!zYp`cLq{@$=EYU}Lbv zQhi?*p?xI2#+p@U-RA1*Lw(oK@ty9A$%V{JmTpmA3KOHtPG#bSA+p;J%mVhiRk^KLU@w zgpS-AUiP+g87bxllFT|V+;LjYJ1#OhEVBMuve~|m67}6!Jorl3b1XhYTNH$Ni}7GA zaSRB8V&4qFX4rRjkieJG)?g#%D!hB=t_?bSQIrdO%l~y1OMA@cacGg-bu6X-mZ|PV zTHd>>N@t9dNFORzt`y7MHU*bPyJYm|S5C zmp)cpB_U}&MEpz1?_F#&ZS9cU3m~?0@b2@ zu+7>W{UJjNM1G$v@JvPJGoXrdk9E*l6Is9CWYP8exWX)v4>(8b9=fK}bniMH_lmRW XY`Pt<*=>7G|8ixc*{t7cG|&GBVbLP~ literal 0 HcmV?d00001 diff --git a/stattracker/views/__pycache__/enterprises.cpython-34.pyc b/stattracker/views/__pycache__/enterprises.cpython-34.pyc index a6f72e8f48e2f6b8dcd32064eb7dd3e8252c0c7f..724a73186e382b4759ed13c7d87f3ec827f7becd 100644 GIT binary patch delta 178 zcmdm_d{>$C9S<+p^2*O4CL1}|aZjGhu0Ht&_ccbh$?JKPxL6q&7@UE)ICk=VF5Sr- zyvl|tObj(l3|ZU^&5VrAj10k=%zjm(sd*)-MFmBf#i_-5sVSKy@db(LsYUugotiw8 zZFsGiiu5NJ^SUy6Y~IPckx|MMC{bh!B2?gnDv0GZxrP5GW9Z~KfrE^JlNAJwx!pj* L9v}iJDi{I)vV1Pw delta 142 zcmcbsyh)k!9S<*8Ud-nZo{gOAxS4LTPTtS`mC=3jRvslTW(EcZXCN*Pnf#C^K(LvS z0f>S%nf!`efufq+lNouWCfD#POkT+A#OS&C3GYTmDKDT*ku8W&ffK4AmiOfK{5KiH ZCU*)PWDJ_@EojW`4ifeR5kOJF5CFQhBn 1: + response.status_code = retval[1] + if len(retval) > 2: + for key, value in retval[2].items(): + response.headers[key] = value + return response + else: + return jsonify(retval) + return decorated_function + +api = Blueprint('api', __name__) + + +def json_response(code, data): + return (json.dumps(data), code, {"Content-Type": "application/json"}) + + +@api.app_errorhandler(401) +def unauthorized(request): + return ("", 401, {"Content-Type": "application/json"}) + + +@login_manager.request_loader +def authorize_user(request): + authorization = request.authorization + if authorization: + email = authorization['username'] + password = authorization['password'] + + user = User.query.filter_by(email=email).first() + if user.check_password(password): + return user + + +def require_authorization(): + user = authorize_user(request) + if user: + login_user(user) + else: + abort(401) + + +@api.route("/activities", methods=["GET", "POST"]) +def activities(): + if request.method == "POST": + return create_activity() + + enterprises = Enterprise.query.all() + enterprises = [enterprise.to_dict() for enterprise in enterprises] + return jsonify({"activities": enterprises}) + + +def create_bookmark(): + """Creates a new enterprise from a JSON request.""" + require_authorization() + body = request.get_data(as_text=True) + data = json.loads(body) + form = EnterpriseForm(data=data, formdata=None, csrf_enabled=False) + if form.validate(): + enterprise = Enterprise.query.filter_by(url=form.ent_name.data).first() + if enterprise: + return json_response(400, {"ent_value": "This activity has already been created."}) + else: + enterprise = Enterprise(**form.data) + db.session.add(enterprise) + db.session.commit() + return (json.dumps(enterprise.to_dict()), 201, {"Location": url_for(".create_enterprise", id=enterprise.id)}) + else: + return json_response(400, form.errors) + + +@api.route("/activities/") +def enterprise(id): + enterprise = Enterprise.query.get_or_404(id) + return jsonify(enterprise.to_dict()) diff --git a/stattracker/views/enterprises.py b/stattracker/views/enterprises.py index 85428bc..4ae5c32 100644 --- a/stattracker/views/enterprises.py +++ b/stattracker/views/enterprises.py @@ -74,7 +74,7 @@ def edit_stats(id): db.session.add(stat) db.session.commit() flash("The link has been updated.") - return redirect(url_for("index")) + return redirect(url_for("users.index")) return render_template("add_stats.html", form=form, @@ -87,7 +87,7 @@ def delete_stats(id): enterprise = Enterprise.query.get(stat.enterprise_id) db.session.delete(stat) db.session.commit() - return redirect(url_for("index")) + return redirect(url_for("enterprises.edit_page", id=enterprise.id)) @enterprises.route("/enterprises/_clicks.png") def enterprise_chart(id): From 6e02fed6cc51c56f7d64b14b4381d4612b885b63 Mon Sep 17 00:00:00 2001 From: Bret Runestad Date: Sun, 1 Mar 2015 18:34:59 -0500 Subject: [PATCH 04/13] flaskr css --- migrations/__pycache__/env.cpython-34.pyc | Bin 1797 -> 1797 bytes migrations/versions/10d7ae15d93_.py | 51 ++++++++++++++++++ migrations/versions/1a163d3f0d7_.py | 26 --------- migrations/versions/1cf81d9509f_.py | 33 ------------ migrations/versions/2c7418044df_.py | 33 ------------ migrations/versions/3f88f89198f_.py | 34 ------------ migrations/versions/46c70e0e089_.py | 26 --------- .../__pycache__/10d7ae15d93_.cpython-34.pyc | Bin 0 -> 1501 bytes .../__pycache__/1a163d3f0d7_.cpython-34.pyc | Bin 779 -> 0 bytes .../__pycache__/1cf81d9509f_.cpython-34.pyc | Bin 1001 -> 0 bytes .../__pycache__/2c7418044df_.cpython-34.pyc | Bin 968 -> 0 bytes .../__pycache__/3f88f89198f_.cpython-34.pyc | Bin 1023 -> 0 bytes .../__pycache__/46c70e0e089_.cpython-34.pyc | Bin 622 -> 0 bytes .../__pycache__/__init__.cpython-34.pyc | Bin 1175 -> 1175 bytes .../__pycache__/extensions.cpython-34.pyc | Bin 660 -> 660 bytes stattracker/extensions.py | 8 +-- stattracker/static/normalize.css | 2 +- stattracker/static/style.css | 18 +++++++ stattracker/templates/layout.html | 2 +- .../__pycache__/enterprises.cpython-34.pyc | Bin 4573 -> 4575 bytes .../views/__pycache__/users.cpython-34.pyc | Bin 2682 -> 2698 bytes stattracker/views/enterprises.py | 23 +++++++- stattracker/views/users.py | 2 +- 23 files changed, 97 insertions(+), 161 deletions(-) create mode 100644 migrations/versions/10d7ae15d93_.py delete mode 100644 migrations/versions/1a163d3f0d7_.py delete mode 100644 migrations/versions/1cf81d9509f_.py delete mode 100644 migrations/versions/2c7418044df_.py delete mode 100644 migrations/versions/3f88f89198f_.py delete mode 100644 migrations/versions/46c70e0e089_.py create mode 100644 migrations/versions/__pycache__/10d7ae15d93_.cpython-34.pyc delete mode 100644 migrations/versions/__pycache__/1a163d3f0d7_.cpython-34.pyc delete mode 100644 migrations/versions/__pycache__/1cf81d9509f_.cpython-34.pyc delete mode 100644 migrations/versions/__pycache__/2c7418044df_.cpython-34.pyc delete mode 100644 migrations/versions/__pycache__/3f88f89198f_.cpython-34.pyc delete mode 100644 migrations/versions/__pycache__/46c70e0e089_.cpython-34.pyc create mode 100644 stattracker/static/style.css diff --git a/migrations/__pycache__/env.cpython-34.pyc b/migrations/__pycache__/env.cpython-34.pyc index c0e77153488c807e5ad771b54790440b5ec1b5c7..277b17050f7fc905a3dbbc0e8f71a0f9f7080498 100644 GIT binary patch delta 16 XcmZqWYvp5q$HU9Dv-9&t_J3>uF4zVz delta 16 XcmZqWYvp5q$HU7tWAFQo?ElyRFBJwq diff --git a/migrations/versions/10d7ae15d93_.py b/migrations/versions/10d7ae15d93_.py new file mode 100644 index 0000000..a9c962e --- /dev/null +++ b/migrations/versions/10d7ae15d93_.py @@ -0,0 +1,51 @@ +"""empty message + +Revision ID: 10d7ae15d93 +Revises: None +Create Date: 2015-03-01 16:50:58.048849 + +""" + +# revision identifiers, used by Alembic. +revision = '10d7ae15d93' +down_revision = None + +from alembic import op +import sqlalchemy as sa + + +def upgrade(): + ### commands auto generated by Alembic - please adjust! ### + op.create_table('user', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('name', sa.String(length=255), nullable=False), + sa.Column('email', sa.String(length=255), nullable=False), + sa.Column('encrypted_password', sa.String(length=60), nullable=True), + sa.PrimaryKeyConstraint('id'), + sa.UniqueConstraint('email') + ) + op.create_table('enterprise', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('ent_name', sa.String(length=255), nullable=False), + sa.Column('ent_unit', sa.String(length=255), nullable=True), + sa.Column('user_id', sa.Integer(), nullable=True), + sa.ForeignKeyConstraint(['user_id'], ['user.id'], ), + sa.PrimaryKeyConstraint('id') + ) + op.create_table('stat', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('value', sa.Float(), nullable=False), + sa.Column('recorded_at', sa.DateTime(), nullable=False), + sa.Column('enterprise_id', sa.Integer(), nullable=True), + sa.ForeignKeyConstraint(['enterprise_id'], ['enterprise.id'], ), + sa.PrimaryKeyConstraint('id') + ) + ### end Alembic commands ### + + +def downgrade(): + ### commands auto generated by Alembic - please adjust! ### + op.drop_table('stat') + op.drop_table('enterprise') + op.drop_table('user') + ### end Alembic commands ### diff --git a/migrations/versions/1a163d3f0d7_.py b/migrations/versions/1a163d3f0d7_.py deleted file mode 100644 index b4efd87..0000000 --- a/migrations/versions/1a163d3f0d7_.py +++ /dev/null @@ -1,26 +0,0 @@ -"""empty message - -Revision ID: 1a163d3f0d7 -Revises: 46c70e0e089 -Create Date: 2015-02-28 15:15:17.961304 - -""" - -# revision identifiers, used by Alembic. -revision = '1a163d3f0d7' -down_revision = '46c70e0e089' - -from alembic import op -import sqlalchemy as sa - - -def upgrade(): - ### commands auto generated by Alembic - please adjust! ### - op.drop_constraint('stat_recorded_at_key', 'stat', type_='unique') - ### end Alembic commands ### - - -def downgrade(): - ### commands auto generated by Alembic - please adjust! ### - op.create_unique_constraint('stat_recorded_at_key', 'stat', ['recorded_at']) - ### end Alembic commands ### diff --git a/migrations/versions/1cf81d9509f_.py b/migrations/versions/1cf81d9509f_.py deleted file mode 100644 index 6d76fb1..0000000 --- a/migrations/versions/1cf81d9509f_.py +++ /dev/null @@ -1,33 +0,0 @@ -"""empty message - -Revision ID: 1cf81d9509f -Revises: 2c7418044df -Create Date: 2015-02-27 13:46:49.710443 - -""" - -# revision identifiers, used by Alembic. -revision = '1cf81d9509f' -down_revision = '2c7418044df' - -from alembic import op -import sqlalchemy as sa - - -def upgrade(): - ### commands auto generated by Alembic - please adjust! ### - op.create_table('enterprise', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('ent_name', sa.String(length=255), nullable=False), - sa.Column('ent_unit', sa.String(length=255), nullable=True), - sa.Column('user_id', sa.Integer(), nullable=True), - sa.ForeignKeyConstraint(['user_id'], ['user.id'], ), - sa.PrimaryKeyConstraint('id') - ) - ### end Alembic commands ### - - -def downgrade(): - ### commands auto generated by Alembic - please adjust! ### - op.drop_table('enterprise') - ### end Alembic commands ### diff --git a/migrations/versions/2c7418044df_.py b/migrations/versions/2c7418044df_.py deleted file mode 100644 index fb95588..0000000 --- a/migrations/versions/2c7418044df_.py +++ /dev/null @@ -1,33 +0,0 @@ -"""empty message - -Revision ID: 2c7418044df -Revises: None -Create Date: 2015-02-26 19:54:31.129057 - -""" - -# revision identifiers, used by Alembic. -revision = '2c7418044df' -down_revision = None - -from alembic import op -import sqlalchemy as sa - - -def upgrade(): - ### commands auto generated by Alembic - please adjust! ### - op.create_table('user', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('name', sa.String(length=255), nullable=False), - sa.Column('email', sa.String(length=255), nullable=False), - sa.Column('encrypted_password', sa.String(length=60), nullable=True), - sa.PrimaryKeyConstraint('id'), - sa.UniqueConstraint('email') - ) - ### end Alembic commands ### - - -def downgrade(): - ### commands auto generated by Alembic - please adjust! ### - op.drop_table('user') - ### end Alembic commands ### diff --git a/migrations/versions/3f88f89198f_.py b/migrations/versions/3f88f89198f_.py deleted file mode 100644 index 943d9fa..0000000 --- a/migrations/versions/3f88f89198f_.py +++ /dev/null @@ -1,34 +0,0 @@ -"""empty message - -Revision ID: 3f88f89198f -Revises: 1cf81d9509f -Create Date: 2015-02-27 21:38:03.681698 - -""" - -# revision identifiers, used by Alembic. -revision = '3f88f89198f' -down_revision = '1cf81d9509f' - -from alembic import op -import sqlalchemy as sa - - -def upgrade(): - ### commands auto generated by Alembic - please adjust! ### - op.create_table('stat', - sa.Column('id', sa.Integer(), nullable=False), - sa.Column('value', sa.Float(), nullable=False), - sa.Column('recorded_at', sa.DateTime(), nullable=False), - sa.Column('enterprise_id', sa.Integer(), nullable=True), - sa.ForeignKeyConstraint(['enterprise_id'], ['enterprise.id'], ), - sa.PrimaryKeyConstraint('id'), - sa.UniqueConstraint('recorded_at') - ) - ### end Alembic commands ### - - -def downgrade(): - ### commands auto generated by Alembic - please adjust! ### - op.drop_table('stat') - ### end Alembic commands ### diff --git a/migrations/versions/46c70e0e089_.py b/migrations/versions/46c70e0e089_.py deleted file mode 100644 index 0d52ad4..0000000 --- a/migrations/versions/46c70e0e089_.py +++ /dev/null @@ -1,26 +0,0 @@ -"""empty message - -Revision ID: 46c70e0e089 -Revises: 3f88f89198f -Create Date: 2015-02-28 11:50:09.646566 - -""" - -# revision identifiers, used by Alembic. -revision = '46c70e0e089' -down_revision = '3f88f89198f' - -from alembic import op -import sqlalchemy as sa - - -def upgrade(): - ### commands auto generated by Alembic - please adjust! ### - pass - ### end Alembic commands ### - - -def downgrade(): - ### commands auto generated by Alembic - please adjust! ### - pass - ### end Alembic commands ### diff --git a/migrations/versions/__pycache__/10d7ae15d93_.cpython-34.pyc b/migrations/versions/__pycache__/10d7ae15d93_.cpython-34.pyc new file mode 100644 index 0000000000000000000000000000000000000000..6db18d7857b28e446f914518535ea5ee9c727196 GIT binary patch literal 1501 zcma)6O>fgc5S?`rCvg*+mXu2c1a1MfNoWIYR3W5Rl?tLlv|Mtr9PcW1vDfLY(<;4& z3qOUw!Oz$$2hxj>_&E(Ys^%|U7WI-r zC1O%~UFJA%*?Ay?m{$(=T9rnfKJ!?kNw+sf2_{>W!POl|3}A%9DDdxmMp; zt2Zi*r>$na)!bUIZ*FaEZaYqUVW!C871D<)QC8gZwLAGZ=51;1rb+NGv!t zO0<)PA&NFahZY&9G6rK5qPF2kIU=Wk+`j<%8GtjXurR5B7s(+fo|8NnyIH{7hL(9M>jAvLbnZ(}*xoj}`c{9FkQhGMO zjlXPCbD5P5vz0$E!$3ACTda86<&gyEo8|$% zIHewfC|kk?@(~)a@?@1fFy8_xO`}z^GLBX;uOm@G^o^a?V=_Da7@g@(;{r{#$86Rl zNa-~r=DA28iV_|X1#MDjs@7=c4i#~4H1X>hjJ*2@Q+XO+a3f$HLy0d@6i_5ZA|9ew z&8w{I(%5%hl@sIFoGR)w?ljDLA&WYJKW-?`LND}BSTqnTSi*=j#pd?U?L;x{hwOP4 Su~O5wQ#P@!5-Fq#cYgsaq*!DC literal 0 HcmV?d00001 diff --git a/migrations/versions/__pycache__/1a163d3f0d7_.cpython-34.pyc b/migrations/versions/__pycache__/1a163d3f0d7_.cpython-34.pyc deleted file mode 100644 index 634ab7d42dce09ee6f05ea531338f0c3e0df1e5d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 779 zcmZ{iJ#W-77{{Ny-{r2nNJt>2Fy3&@y|j1j2_d9*0f`$ZELoy7etM+MTkTv?5L@{& zd>|IDOe_qHOgv6F5hQTzM}Ir^-~K)J_u-!V<;jmXA9aAQ&?(f1=hVbY3Jf5is6n6s z(;?7-8Nf_P4aiIgOwd%{g4BY*21eC^PqfAX)&tgWGzkmNM(&3T%*v|vG87`(pzFTI zn?xiR9%_h^s@nklh9eLBk zm8#4Ak75f{`ZmqFl#H?}|m@gqnCvp#r!h+6K6#z1201GI2Jt z*7AXZ+dL3Z*k<3$<9MJ_5HC3*E3c%R0b z@bi`bRv;JtIme1`b0i<;C%nk(h%;Zgj%ihVh1}1Q4Ua0ym+)_BNh3O>;eJ_5XIs)F zhW8bWx=GOafZ|`YCJp?LcB8?qLAR=C%{5n3xyp_lbdYyskK*P|!j`v#_y@36u5#$J z;(gwn?jdz|r@KRX)R#^evLX&c+2g-oh1^r~DbwvEkxrCicAms-QeAPKMrr&Gvs&sR hY9P7t`sdcYr&+j*qzEuIXmrEFUgxOY>(Plflq}G!ag2b0cIRNX z-QDdTHah!*-m^ikzjxR{;=bpNH`a2QjkO%N*by`>L(=Ie%BFk@1+&Oim?N%n(kED`s&VT*U0exES(9kT7G%Oho$f_7ApKEYAej=f;^S zCVftCa$}FvrYlPsrxxaF`#Q^Hhzg87OygN1jB|?hA|{P}rX?4V**ZxjxWrY{%-( zQQbmXGLmHsG)WSNAPz5CGM9Bsksm%!c5iL>d6Lpu%w9OiRW$^=WLq}bv}&bV F{V(@3@2da+ diff --git a/migrations/versions/__pycache__/2c7418044df_.cpython-34.pyc b/migrations/versions/__pycache__/2c7418044df_.cpython-34.pyc deleted file mode 100644 index 9c988ebd114ecf28e51854c95770ab2e0b410163..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 968 zcmah{O>fgc5FKw4$8jB0pojw!3dbDUe2`KaRR}2+s30Ol+e*zx_Oz)&Rc4(je%+#Hrq(VE{9< z7R)SQ1ZD(S4Oktb8pL&&)xj#(1fmAaY+wywHhjiAOlQGff0{Cz4amJG*EQ)*o!H_lN7lXPv?J zcyly1GJU^?lr^8H3OE9z@o~etR4D`CWZklo;Nl1OmS&Q z$c!VhD56IZe`V@|#@yHu7ju1b`5P6P29IeNnR{FWGEX&UeoB?PNF=-5!SjQzBa0Rr zFDUEk>w?J;MU6d4qAV7sxhFKAV=#MP%TUbC+ItzsROWAaK1qbql7>Q?)k6`UW&C#M zE6DrET$*3+dWV>=>K#e0WhS`Nl=VWHh@48+!HE^gek8EaY5cv>ow`H2X&yv9RjU%sKv}qT3|7O{w5s#0;;3}9p qi)a*_@Hm%kq$raw$^IGJ*@+XDMf^n*vC2bZ*KErstCm;u+J6Ato#e0p diff --git a/migrations/versions/__pycache__/3f88f89198f_.cpython-34.pyc b/migrations/versions/__pycache__/3f88f89198f_.cpython-34.pyc deleted file mode 100644 index 202fc73cdd8dd8d0548efab00dc1a44a9cc845d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1023 zcmZuwO>fgc5FKyg*l|)+L@N#)@HI$nKB^WcLI^2UrGlssw3l2g*E>nK_#@r5i_&ZO z0sIa4NqgnQ1&J#s#&&2^skZlNc4zj@&fD?t_J-4X@#pkg4d5rNJ&f!(G}K!H4lp4! zU}6AgFk!%J!0QmzAg;rt4n{FIAu?go08XC;Uulm8+y>q(Z8A*w)NyX67|*kX8>3Re z3?1hqUJE7C#63P7xqDO3n|j0k(3@5cR3o<^PQ5-K?)QdMXDl(u&^;s=xr1JRf2TLt z8N74{{n4H`>h0|wc>RN+=Qxwr8kcUZar~l+pkrv3&QHR^{{J{+jA^JJ1R203Rck=T z;F79irBR0^2~ifmWX8&6mM-%lSEF<_9&%at32j&rl4uspD0Q>IWtErIW3a3a(<~Gw zdufyIP-uFh>naN}%>>tWl1EW+9^sKTuY)K@-I5rlk|XyiWCN27w^?=AQ$&nH_sArmE&F9caTpgaS4Clch3|`)jgM($vi=-jdz7ilSLqTx2SZ7 z*u&2#yRn$bAfxV4-D}!X8f*9N@6H$6%I6fs@o{mrn*_j`#6f$q3Hgy z6N){zoj{sbg0mA@Cr5`>YB^k{^Gd6`Dk^J>!gQ0TUy||&&uOX(a$xc)VW+7r-{)!Q z``VVPA3<*v@&4`93L=cpMYu|)uA(3cFEC!n7EzRkFUcOvZNG|Bo=5oFqFB`?Xw(`; LgKZk^TKmyIX)E^( diff --git a/migrations/versions/__pycache__/46c70e0e089_.cpython-34.pyc b/migrations/versions/__pycache__/46c70e0e089_.cpython-34.pyc deleted file mode 100644 index 92d025e3af7f73832d0d5a6ba126db9bde091297..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 622 zcmah_Jx_yB6um$TEw+hHuB;s@w6;izF(!7=L7V^q_RU(x79@W&@KjY8vZ?HPK zm~?S)@;>}1n-AW}IeGV<`|;jtn=h-?<%a_B3YDWGKg26e5GX)^s6e0qRUuG;YCvm{ zXpq(*sDUDN9g;c(I#B!#c)}b5Xai`o#VES={|D`i5EYi63~>^>H8HnWb$ zzBO>8J%{1vjlLh4@U7jc=S{s)Z{$tQBhE<9tTBRb^_||Z>-4*Q&+7I3q2oKF9e3ak zUDq^&jfz*XQSo@giJ+qtYBoQMB>z3Q131DfY6v*9PYc{k@Ix@Fu><7-ZGoK4vGm{O8TSK-clSs05s22r*p3(Kv8%5}tl zJ6pF@VRg(bnlyWum8RP$e@zYKon~Q#AtHMVio1j) q(G5$Ng(^td8<$>{s^x~t(vAHzql<(c$OzFw&^2Ar)lH?Pwe&BQnTT}%KxiUtD! delta 19 bcmbQjI)#<%9S<+pkwx!A{xELj>S6)_MbHO3 diff --git a/stattracker/extensions.py b/stattracker/extensions.py index 5a14624..4130391 100644 --- a/stattracker/extensions.py +++ b/stattracker/extensions.py @@ -17,8 +17,8 @@ login_manager = LoginManager() # Change this to HerokuConfig if using Heroku. -# from flask.ext.appconfig import AppConfig -# config = AppConfig() +from flask.ext.appconfig import AppConfig +config = AppConfig() -from flask.ext.appconfig import HerokuConfig -config = HerokuConfig() +# from flask.ext.appconfig import HerokuConfig +# config = HerokuConfig() diff --git a/stattracker/static/normalize.css b/stattracker/static/normalize.css index 81c6f31..458eea1 100644 --- a/stattracker/static/normalize.css +++ b/stattracker/static/normalize.css @@ -424,4 +424,4 @@ table { td, th { padding: 0; -} \ No newline at end of file +} diff --git a/stattracker/static/style.css b/stattracker/static/style.css new file mode 100644 index 0000000..48269e4 --- /dev/null +++ b/stattracker/static/style.css @@ -0,0 +1,18 @@ +body { font-family: sans-serif; background: #eee; } +a, h1, h2 { color: #377ba8; } +h1, h2 { font-family: 'Georgia', serif; margin: 0; } +h1 { border-bottom: 2px solid #eee; } +h2 { font-size: 1.2em; } + +.page { margin: 2em auto; width: 35em; border: 5px solid #ccc; + padding: 0.8em; background: white; } + .entries { list-style: none; margin: 0; padding: 0; } + .entries li { margin: 0.8em 1.2em; } + .entries li h2 { margin-left: -1em; } + .add-entry { font-size: 0.9em; border-bottom: 1px solid #ccc; } + .add-entry dl { font-weight: bold; } + .metanav { text-align: right; font-size: 0.8em; padding: 0.3em; + margin-bottom: 1em; background: #fafafa; } + .flash { background: #cee5F5; padding: 0.5em; + border: 1px solid #aacbe2; } + .error { background: #f0d6d6; padding: 0.5em; } diff --git a/stattracker/templates/layout.html b/stattracker/templates/layout.html index 479434c..617804b 100644 --- a/stattracker/templates/layout.html +++ b/stattracker/templates/layout.html @@ -6,7 +6,7 @@ Stat Tracker - +
diff --git a/stattracker/views/__pycache__/enterprises.cpython-34.pyc b/stattracker/views/__pycache__/enterprises.cpython-34.pyc index 724a73186e382b4759ed13c7d87f3ec827f7becd..2e527d22d8bcecf0f1b817509ed6f27103a73e81 100644 GIT binary patch delta 92 zcmcbsd|#RC9S<*8d;8~*3xXTDYPlI1CwFk$vht^?`JHYyqSL|WB%q`fm}vr6?F~(1JobO delta 72 zcmV-O0Js0&Bi$nk?hFkIr+M>KG!L-~eG35slZXpFldA_Aliv#llg|envjPmy0RdFA e(hX7p0bi3P503$0leG`I0bH|h5N!bi5hnaBs$17DrKPS!z*nYKkUfkr+_VN`@kt$xO`gEMiPWa+6b;|B5RB zMQ^dD78T_e70CeE5JGlxC5tkn*5aU5mzHP(*~KhCf`OTxvB+YvBReC|0w)eD zMw7|49G+Gnqcuf}1b|eL0f-O;5fUIm5=7{M2tyEI1R_8t6NPEDI1}3nI{6KiQ8<2LLo_N~8b) delta 387 zcmeAY{UyTrj)#}aROD00=Z%~;OcE>%3=GadTdj%$1E0EEeB1Hl~sz@J1 z2!aR+5FrU7bU}mxh%f{ZAd`wLK!ovR0Zu(4Tp7=4%4jorD(3=CS&%lcx6D8+a}Z$z MBG8>bIgU#Q06(WhivR!s diff --git a/stattracker/views/enterprises.py b/stattracker/views/enterprises.py index 4ae5c32..edd8b46 100644 --- a/stattracker/views/enterprises.py +++ b/stattracker/views/enterprises.py @@ -76,10 +76,29 @@ def edit_stats(id): flash("The link has been updated.") return redirect(url_for("users.index")) - return render_template("add_stats.html", + return render_template("edit_stats.html", form=form, enterprise=enterprise, - post_url= url_for('enterprises.add_stats', id=enterprise.id)) + post_url= url_for('enterprises.edit_stats', id=stat.id)) + +# @app.route('/edit/', methods=["GET", "POST"]) +# @login_required +# def edit_link(small_link): +# note_link = Link.query.filter(Link.short_link == small_link).first() +# form = CreateLinkForm(obj=note_link) +# if form.validate_on_submit(): +# form.populate_obj(note_link) +# db.session.commit() +# flash("Your edits have been made.") +# return redirect(url_for('show_links')) +# else: +# flash_errors(form) +# +# return render_template("edit_link.html", form=form, +# update_url=url_for('edit_link', +# small_link=note_link.short_link)) + + @enterprises.route("/delete/", methods = ["GET", "POST"]) def delete_stats(id): diff --git a/stattracker/views/users.py b/stattracker/views/users.py index a94e361..da4a813 100644 --- a/stattracker/views/users.py +++ b/stattracker/views/users.py @@ -11,7 +11,7 @@ def index(): if current_user.is_authenticated(): enterprise_list = Enterprise.query.filter_by(user = current_user).all() - return render_template("index.html", enterprise_list=enterprise_list) + return render_template("index.html", enterprise_list=reversed(enterprise_list)) else: return render_template("index.html") From d461ec495e7d46a6638b9f0defd90ccb549951bb Mon Sep 17 00:00:00 2001 From: Bret Runestad Date: Sun, 1 Mar 2015 22:11:11 -0500 Subject: [PATCH 05/13] website complete --- stattracker/__pycache__/forms.cpython-34.pyc | Bin 1573 -> 1662 bytes stattracker/forms.py | 3 +- stattracker/templates/add_stats.html | 11 ++++- stattracker/templates/edit_stats.html | 16 +++++-- stattracker/templates/enterprise_stats.html | 8 +++- stattracker/templates/index.html | 9 +++- .../__pycache__/enterprises.cpython-34.pyc | Bin 4575 -> 4797 bytes .../views/__pycache__/users.cpython-34.pyc | Bin 2698 -> 2698 bytes stattracker/views/enterprises.py | 43 ++++++------------ 9 files changed, 51 insertions(+), 39 deletions(-) diff --git a/stattracker/__pycache__/forms.cpython-34.pyc b/stattracker/__pycache__/forms.cpython-34.pyc index 69ff26ddd7b3a2ff2cf0340ae5264e443cc20acf..e4f40770deb6ec44719682116a2ea5b8647bdc38 100644 GIT binary patch delta 742 zcmZuuJ8u&~5dQXFzQ;N*Cl`~5C`t-&k&c3bS442SD@Xw88gyb;ktJUe)<=-ifE50K zwG9Oo5(O1XO~davDwLjv9++{QfWRxwr`g$W=9``QAb-mB@3I-6z5lU$+XK$<*P%P^ zkqy2K*YE6>A@UGH0m?%^LK!2EQ6|U}loGi_*+kxi*j7GNfHy=8pao7`n&nVla4lVAMyLd1lPpjSmpWnW${vdF^YHDlSujlx+N;wlK?7{mQEw6w^R1pa>mk7m8LOkbBUy7YE9P4sZhO zaa`oI77sfezYce*qUs))GWQ=B{TKQ;d8nV!AhlZEtVSJYo$%i_ebTG_Bjy{L@8)<~ zi5aIpEvktVS)sh8KmAK#IFfbd>~sIVV;c6Zft){RTfdf-3+3 delta 671 zcmZuuJ#Q015PfqWoBLSDPK=GQ0tBdBgoXxz6p(kdYH)IH5girf#3|V~=^MhNm`epV1uhHxGreG!g!LH2 zsgk0a2J9b_;xDB(HR?+ic==&;xYK9iB>i>z{AgNlkJ))VT5~IV^B<$Z*(%Q=7m!NJ z8xP1yWa-0fSn9D5U6OmVr;VSFWL?y +

-

{{ enterprise.ent_name }}

+

{{ enterprise.ent_name }}

+ +
{{ form.hidden_tag() }}
{{ form.value(size=20) }} {{ enterprise.ent_unit }}
+
+ {{ form.recorded_at(size=20) }} +

@@ -28,6 +36,5 @@

{{ enterprise.ent_name }}

{% endblock %} diff --git a/stattracker/templates/edit_stats.html b/stattracker/templates/edit_stats.html index 9295df2..34af966 100644 --- a/stattracker/templates/edit_stats.html +++ b/stattracker/templates/edit_stats.html @@ -1,13 +1,17 @@ {% extends "layout.html" %} {% block body %} - + +
-

{{ enterprise.ent_name }}

+

{{ enterprise.ent_name }}

+
+ @@ -17,7 +21,7 @@

{{ enterprise.ent_name }}

- {% for stat in enterprise.stats[:30] %} + {% for stat in stat_list %} @@ -30,6 +34,12 @@

{{ enterprise.ent_name }}

Delete
{{ stat.recorded_at.date() }}
+{% for message in get_flashed_messages() %} +
+ {{ message }} +
+{% endfor %} +


diff --git a/stattracker/templates/enterprise_stats.html b/stattracker/templates/enterprise_stats.html index acba17d..7c477f2 100644 --- a/stattracker/templates/enterprise_stats.html +++ b/stattracker/templates/enterprise_stats.html @@ -4,11 +4,15 @@ +
+
-

{{ enterprise.ent_name }}

+

{{ enterprise.ent_name }}

+
+ @@ -16,7 +20,7 @@

{{ enterprise.ent_name }}

- {% for stat in enterprise.stats[:30] %} + {% for stat in stat_list %} diff --git a/stattracker/templates/index.html b/stattracker/templates/index.html index 4e2316c..1aa172d 100644 --- a/stattracker/templates/index.html +++ b/stattracker/templates/index.html @@ -1,7 +1,7 @@ {% extends "layout.html" %} {% block body %} - +
{% if not current_user.is_authenticated() %}
@@ -24,18 +24,23 @@
+
+
+

Your Enterprises

+
{% for enterprise in enterprise_list %}
- {{ enterprise.ent_name }} +

{{ enterprise.ent_name }}

diff --git a/stattracker/views/__pycache__/enterprises.cpython-34.pyc b/stattracker/views/__pycache__/enterprises.cpython-34.pyc index 2e527d22d8bcecf0f1b817509ed6f27103a73e81..c469c0734ab8555cbf88adc0f39d195191dec503 100644 GIT binary patch delta 1488 zcmb_c&u<$=6n?Y2{;}g-+ezc3NdvKpO=2R7pn_2Pn^Z(CB7&y9Tz=0DQi3{Sy4LFbs2nmq*1KkzpqkWIkfZ*%T$P`Ek7b#L&B9+gUo$u4W zpfp6Lf8djmlvXH>Xy2!Yg2Z?n^G3o{$<#;%qzcE2gh1Aosq^M8e~MmGMN%aWs4}Oi z(5;fBDwC`Htxjb3O6{fDx zvM-iDo{2;x>LM2NLW)on@#%~9yK+mGkg<+GyA385*MJmd6TpkKK*p!E$S6TU&XFlI z7s^q9vP_tlVHd*JKahF`8|k;$oM+R38HFG92SB^i+Z&a4wQ`O-;w$lq^=$krJ&F$%79K#TOxyC*-^_vqFhKUGro~cgK)0B28{)WZbNYB zCj^IF2rifDI2D4cZ0a=>GxB$P>4Sw^catVdt$DYbHG4^NuldPPbxoqqJZMa6GEsfA zGwj|;997Wcf~U{f$CXpBc4nO_CPd;i!)N5QyY^qoH!wlv3#H_OJLg86djO^IrjI z!>(1&zmM+l!{VW}1-^#-^f=wPF|Hq8EEWYOrBgtz8{AD7hHBj7gNCE~Tb+{qt-1ju z#oF_tYuh!was%gS$7hQ@XWHz&3)91&c`zZ_KWeAW#!p@GQNg`DdJZWge>gDPey^*y zi+h7^FB#}ngzZdyd+9^ohda$h&x%NUhSJ!CFPCB^9I~C1tnmu1Okar`U#+ z9x4{kbMWjRAlQrGp-@5Zy$O5qEQkladGftUv_ZVc?mT8@-_AGh``&k$`+Uy$W?IJn z{*T4ut^?zZO5X`;r^K<^z59&tPU29~h!9^Tev~*7!ZqUSWRDQv!00HXL5UxOxw4}W zZW7-jew;KEvPTJRt!+%DJVAIDaXRn|yhWbGlVw^raR5ohwG+h?9gXl_NY;sC{6?U3 zk1EA{Of;f7GqxGHEEx8xj=Lp}qSLfTM6@A0O$Z5<>c-Qs!zpoBT+*KOB&kUg)PiA9 zovQG#3Gr6T8Y(0gU<3tO@`#b@g?sKmkt&wjtPSqlh=@`B>WwJtfn+v@;W~yCgiv4g z%G_nkE8C$`Dwml8n|WnPb*p^YbJ!J3oD_%pP{(P?X2e(hzi=x?c61U?{3ke@!qcZQ zG-25Y&RdwDj0=ca5S_7%c&%FWpjBp6+>6gFUDxfyvW@ly> z*pNC|gvXH=SioE4Hp&Uo!QX$>!we0T!^TKJUQ;$>K2$bV{CeNwx|=C`)yJ9jQjl43 z-D+mDhFUqp^>$I~w(EF&Ip8H8h&3}Yb`46ar-4?N)tDE!!SG3ftUKQ&6=@Sl>NP4p zn3KK8Pcy5dNz%AvN(@-%Gkq{6N|L6i4XuKWVnM4UBCTeb6`nOjAGMPwj;w)G+(2^x zHRum;02WG$d1YQqnf>v+*?t=_7taY6Pt$SnBA!dF0bpPtYy@Eukj;sY@ykXO_6qp* zCE(q^E4%N6VK4_6je;$~jScA}xzJEK3LD@}AYW<)z5#8df#7QBn^*QN!2e>OrA%lE zwtE|JnB*agGZ}I?yMq_N5rLqSkZy$(+IzLaf6|ML!e*#dyo$@WYi?clDy21dq*h(a z$Nq9i*eT^>z4(VxEAu72R^H&tDECrSd`~<)vw<*42*^a5rh)W+Nk1_1KzLp6>4F$a ZX8R@}gUw(-cGxV2ISi1LTu`!u+An;n_N@Q_ diff --git a/stattracker/views/__pycache__/users.cpython-34.pyc b/stattracker/views/__pycache__/users.cpython-34.pyc index 28e3d157bc1d24e77294225618c145b447376583..c70642024271c6a331bd7877c9a7da1998c6acad 100644 GIT binary patch delta 15 WcmeAY?Gj~s$HU8&wQVC?3l{(-;{>|^ delta 15 WcmeAY?Gj~s$HU8I-?EXdg$n>9=LB8= diff --git a/stattracker/views/enterprises.py b/stattracker/views/enterprises.py index edd8b46..a2cd63c 100644 --- a/stattracker/views/enterprises.py +++ b/stattracker/views/enterprises.py @@ -38,11 +38,11 @@ def add_stats(id): form = StatForm() if form.validate_on_submit(): stat = Stat(value=form.value.data, - recorded_at=datetime.now().date(), + recorded_at=form.recorded_at.data, enterprise_id=enterprise.id) db.session.add(stat) db.session.commit() - return redirect(url_for("users.index")) + return redirect(url_for("enterprises.view_stats", ent_id=enterprise.id)) flash_errors(form) return render_template("add_stats.html", form=form, @@ -53,59 +53,42 @@ def add_stats(id): @login_required def view_stats(ent_id): enterprise = Enterprise.query.get(ent_id) - stat_list = Stat.query.filter_by(enterprise_id = ent_id).all() - return render_template("enterprise_stats.html", enterprise=enterprise, stat_list=stat_list) + stat_list = Stat.query.filter_by(enterprise_id = ent_id).order_by(Stat.recorded_at).all() + return render_template("enterprise_stats.html", enterprise=enterprise, stat_list=reversed(stat_list)) @enterprises.route("/editpage/", methods=["GET", "POST"]) @login_required def edit_page(id): enterprise = Enterprise.query.get(id) - stat_list = Stat.query.filter_by(enterprise_id = id).all() - return render_template("edit_stats.html", enterprise=enterprise, stat_list=stat_list) + stat_list = Stat.query.filter_by(enterprise_id = id).order_by(Stat.recorded_at).all() + return render_template("edit_stats.html", enterprise=enterprise, stat_list=reversed(stat_list)) @enterprises.route("/editstat/", methods=["GET", "POST"]) @login_required def edit_stats(id): stat = Stat.query.get(id) enterprise = Enterprise.query.get(stat.enterprise_id) + stat_list = Stat.query.filter_by(enterprise_id = ent_id).order_by(Stat.recorded_at).all() form = StatForm(obj=stat) if form.validate_on_submit(): form.populate_obj(stat) db.session.add(stat) db.session.commit() - flash("The link has been updated.") - return redirect(url_for("users.index")) + flash("The stat has been updated.") + return redirect(url_for("enterprises.edit_page", id=enterprise.id)) - return render_template("edit_stats.html", + return render_template("add_stats.html", form=form, enterprise=enterprise, post_url= url_for('enterprises.edit_stats', id=stat.id)) -# @app.route('/edit/', methods=["GET", "POST"]) -# @login_required -# def edit_link(small_link): -# note_link = Link.query.filter(Link.short_link == small_link).first() -# form = CreateLinkForm(obj=note_link) -# if form.validate_on_submit(): -# form.populate_obj(note_link) -# db.session.commit() -# flash("Your edits have been made.") -# return redirect(url_for('show_links')) -# else: -# flash_errors(form) -# -# return render_template("edit_link.html", form=form, -# update_url=url_for('edit_link', -# small_link=note_link.short_link)) - - - @enterprises.route("/delete/", methods = ["GET", "POST"]) def delete_stats(id): stat = Stat.query.get(id) enterprise = Enterprise.query.get(stat.enterprise_id) db.session.delete(stat) db.session.commit() + flash("The stat has been deleted.") return redirect(url_for("enterprises.edit_page", id=enterprise.id)) @enterprises.route("/enterprises/_clicks.png") @@ -115,7 +98,9 @@ def enterprise_chart(id): values = [stat.value for stat in enterprise.stats] fig = BytesIO() - plt.plot_date(x=dates, y=values, fmt="-") + # plt.plot_date(x=dates, y=values, fmt="-") + plt.bar(dates, values) + plt.ylabel(enterprise.ent_unit) plt.savefig(fig) plt.clf() fig.seek(0) From 9f35c67b41716121601270f96c3ecf11402db1b4 Mon Sep 17 00:00:00 2001 From: Bret Runestad Date: Mon, 2 Mar 2015 12:03:58 -0500 Subject: [PATCH 06/13] corrected Procfile --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index b3c7363..e36c8dc 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web: gunicorn manager:app --log-file=- +web: gunicorn manage:app --log-file=- From 8db47ac1653b78d10d1b5f7cad343afbdd130b20 Mon Sep 17 00:00:00 2001 From: Bret Runestad Date: Mon, 2 Mar 2015 20:10:12 -0500 Subject: [PATCH 07/13] heroku setup --- Procfile | 2 +- requirements.txt | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Procfile b/Procfile index e36c8dc..b3c7363 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web: gunicorn manage:app --log-file=- +web: gunicorn manager:app --log-file=- diff --git a/requirements.txt b/requirements.txt index af35414..a83cd6a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -28,5 +28,13 @@ webtest # Management script Flask-Script +## Heroku +gunicorn==19.2.1 +psycopg2==2.6 + +# Login and users +Flask-Login==0.2.11 +Flask-Bcrypt==0.6.2 + matplotlib io From 571731868621ed46e98e8905c5b2fe4e2b2441b6 Mon Sep 17 00:00:00 2001 From: Bret Runestad Date: Mon, 2 Mar 2015 21:41:52 -0500 Subject: [PATCH 08/13] updated api --- stattracker/__pycache__/models.cpython-34.pyc | Bin 2922 -> 3114 bytes stattracker/models.py | 6 + .../views/__pycache__/api.cpython-34.pyc | Bin 3618 -> 6597 bytes stattracker/views/api.py | 186 +++++++++++++++--- 4 files changed, 160 insertions(+), 32 deletions(-) diff --git a/stattracker/__pycache__/models.cpython-34.pyc b/stattracker/__pycache__/models.cpython-34.pyc index a0847da0891f3f881123361e22cd118fc4d236e4..15e594b5e799d88d649504153768abc41066fb67 100644 GIT binary patch delta 284 zcmaDQwn~EQ9S<*8fymd8LXM4Gx}1z_Cf{eYnOwq|#-GB=(89nFCBTrv#}KT^Klv`F z<76{-|9aN4#GKO9Tiivd$@xVosVVV^CAWA}^GZ^S3W_p|Q{yvJG+Bzc85kIfEI@=M zh_C_@nv6x_AT|%2;03XafP^g&7jpm!21Z^+E+DMp2`))2(JRT1PsvO!@zWG6QUXdA zDFcbgeH@aiw^-eB@)JwIHr(QHNi0bX$;?fK*kue-39@i)AJQ>2fkIn0%knW^xH<8gsBF@8p-9j?8|V0+ZiyX?fgY zElbQPO})k8l30=&l9`)&i@PW_Ilm|+H6=c=q{x_of#DW!YFKN|6ar jtVkP3L~$V`CI@oM3Ge^~c^KswC4f+lk%w_|Blk)G;&d!V diff --git a/stattracker/models.py b/stattracker/models.py index a87c923..f529a50 100644 --- a/stattracker/models.py +++ b/stattracker/models.py @@ -57,3 +57,9 @@ class Stat(db.Model): enterprise_id = db.Column(db.Integer, db.ForeignKey('enterprise.id')) enterprise = db.relationship('Enterprise', backref=db.backref('stats', lazy='dynamic')) + + def to_dict(self): + return {"id": self.id, + "value": self.value, + "recorded_at": self.recorded_at, + "enterprise_id": self.enterprise_id} diff --git a/stattracker/views/__pycache__/api.cpython-34.pyc b/stattracker/views/__pycache__/api.cpython-34.pyc index 6ef3fe1d3a5599bfde1218360f6acf44b77f1f9c..e29c5595a162d24611defe8824078f01e37db7ee 100644 GIT binary patch literal 6597 zcmcgwOOG5^6+Tt{eogm0{kA)?9jBAbj8Pop1Y;79?T`>Afu6)klhD-kt+A`!)jhsd zZD(3G2stYd3K0^2fE8<$JqtGcg}XrlBxE76W0MVh=iKVa&#(cfs-FN^YvNRjIjDf~IqBWg{`4z(O;35@LGu)1H>lpcq)ICnBN~$()JV9!f)SS$%%iPCE&68Rn zwMc4-Zn&81r~{-9j;B0M>JX{JGUeoW%8_Ks4M)b~0LRATPwgFpHSHLjAhp> z<1skQ2Z|k5Rn_M><^n>r{4QFlf1I2j~=UsRxf$%^Q@EPs2@ z2Py7~Q`Ai-I_hSaCni(6SyEZ9zU$I`{G}+)Q8!QB0;wF`gH4jtEh4A;SRqZ_65V4n zAl@rY&A#wivyopnm6wuxh^j}~%U%?8>iQ^7`;Y}X$_(SJf{`~iq;Ny@sF>{z!Ft0qW}wut&&7-`UJ%;>kmS7`bAcb)gcpm zv*E4_6dP$-)k3C#RWw5Y7+T>n8^taREi!oo+Ha4KEE;$ogQ7e#a>_Vy#nop~9+g(T zP8{3`;=qqgF7$yt1^K^xb;G3Jc)hu?=OPo#y@jdP)N$BbF6kw{1z^#%;9^+06lbZM zW60bW9|cSKK<<2n@rDKR%n!Ia5O^L?zewx_5LLi|PhvPjOa6X52t& zz86kgnjSCOcRo|ycaWDbCE^9h1?t>`&U{*b8?_EM@sE|2Ls~Kl1C*Cyet^QD8V~|({{f{y2w(tE1Xj`i+{FxeX)iJxFh3vy06$=b6zN}3 zj8LE;jzD6C^9UT8AQfJzM8A@O@eFmV)U734;w1H1UdQ3X&2dk6p6kE~LJZ(0Mx-E7 z26ru@-9daIZl+&LHsw8*I8tfi8qG#+w7jN$FZQFlSMU3G>r-jhxAY)H>#NPz*XxPz zT`@T?YRCTj@rFJK@tHgvaL9gW9lkcwTW!DZZT5V1&7|O-gI@!vqca;f11xV%YNvkF zL#2mJ)lPlW_xtsZ96+tK3fR1T$AjyC_-8CWnp?45SagEWZ^^E&0dMRr8wbQIgnna4~n@}mgbz`-kJvM_`Y z#Ja?Tp5u%ISS=^Yf*l7sYNSnibD(ytaMCOs{Y@UUmyYxcXj?~$*ujyTbLK#kM?gZ4 zfrb_U-kMW!o^xf~Xkix}tzJY-^g^I6O(-CR1vsrCMIB_8g8*kspowz>z=2%xfgmD= zq+piui!R18Q-<}5%t$UVBU!*-1S_G$Fw4*upwr00mra%ORT)Wy*>LrFoZh54R@pDF z3+Ms0O&I9-bn{1%kIC>Nk-m&6AfE}tm?A@Dpxfupp3^hvw3H(nOnJSY)hbJ~krKUH z<-Nfp_i2!|>LFRWNzFOOp}hl+Oqhg%jE@Q3{0RPfuW~juB91Nf_mDNR)|az7^lO|k#aI=5pG$jHV5+_f;$7ST$xh>sDolzEstQ9o z?ZAzZzEWeB)8% zw8|`OQg6JuF_AUPd?M?&QP~qJ9pz97ElgSL3vJx)N*Hy4jp9>%De2pw7#1>_2m25q za;1nGK1wcHO6u{X47zmkR z1v*DL%QnvC0xw|+LjP7K=jag3yp348L|}z(g-1C3i$X85hMmnX8tjGPmSU3OGfWcT z4QJ2vJ@jEUcm4Jsopd})w~C~54t_ia7{~hvdVL4IZ}&e=g5XadpD#PdCrjd*eOI~d zBxifXRUUB`X3nqiY67lOLXPtI_DA{C?<}7VmrpCPTT{|_iD~5{y2WP-iDag%Ia+w7 zFJVZXVOQtaz>8NJ3;Vd#r1AWUOr8hDLFk)&6zgp+S&uc1lqFdCF(4+v$}Vnwh1=Nl z#h;ntTO3kdJ+jIk8!2J2HD2}~$iAG7=ZpH{&H?MOczoDq8C)Q7op@6*ube&Uou%zba#v2Vd`>pmbal z`2Up{{`PbT{~7*$hu#(#RmMJ+rER0+nJbKnJN6ZBN?4`QHa*jFoB zw9iq_XMpQdj=GJp78*a{5=Ss!7*-PUZeqrlMb0~z^D&aVP{+urxD)KS72t(2qj_Y9 zUzz;l=xKtEzoYV%(ecx-9UT)s+{=$sfXD-H3XQ5j<1haQXb38n#<4@49b4TxIe_cY zR8-qXMf!`PWfFbpH=!mQdi*ay!KZ)Xm)~asg~N|o1`3aCJgrajb{vM{vsTZGZfVAj zd^xb8B!3aIuQU$BHGk?cRT;U0H|&ah($xj-;;#nyK!NY7y~u`H{QXR918ak;?MqT~ zK!i^w@8jz%zYHTi%fsZgSlAl&JMmzE1?G8FzAZ1yc3Us-7$#)HpL*N!R=nx;RS%_O z+&q)KuiN})MdK<@ILkd5Js2XIU0wB6b^Wv1 zYW)4z|JuE@O7uCs_Ej)`4^77ok-*QPgeZ75b|`Qx-KE5()T6+o)Th9wv_e6J(kca2 zN^2C?aXM@fUyRSH%y_eoSJX;Rvvphf8#1#6VHDQK5#RZ2RPo}=I# zrCkcTCACJ$c}mwQSf_M@f{jvcosvyTFHmp+^A!>e`UE;(BSzE3=%2jIWOy?2STBV>g%A$R2am5~_SDvY8sz<1V;N+(ew7}X!>vHu=fN%hyFx#>aw&Gwkj14 z9o9*`#na)E>RRewsqlCKhi!rP)T6?m@5AATKB?F)yR>!UQCOi2dcNZDEXQZ`d|;V8 z+L~191qO0({+5b&b(c9)*atH{yGkv zsZ58A*TMZHA4Q3NF!*m#eMfa6r|+sB{?r@X-C%-K5*S6M`MR_YGmjQprooG5u;!(s`+h&E2n-6ouNLJk5 zg|`5HpQ)xIX6aP()OyGlQ4v{X%g(CWV$N{k6TXhNiaF|SjN?y%g%RU{KmLEE={hE* zUaTOpluxCCl^s*=`+s^a?8de^t5$QCMYG}{SMjkFx4=+p<*ILB{7NBKhT&*U_e%_5 zt_ecVT2JkAByvoe4O8cw zltrmD^=YK_vs?*Nk!chszNK2&d)a9_>K-T~CiBN`W1m_p z-Npa_gB5VeQ)@AGoeEgUW;rKoa5{q3u*?tMucDM5u)^IT*MOjBb9Kw(8l}Whr7oA>Bqy} zuUv#JWiRq$49ZA>vWG6IO}@noXbk<~Qg{**+z@_;t3R<<{h+*bQRS$@jTy8c4f~ZH z^)3XC7Eot7Tmvq)Nj%kWH<~LlKYoWpW31OalQqf49!q z=gY?ZB-X_!Pp1za@dBC@F1h(jFOs!3Ey)Ueaz;6yyyM@xM{MU5tPnxF!zTY7^gt6*~`O+E(k zi+4-?o{AQsO5)7Z;QHtus-q#cvZPh|qh&1CXws%hhj%cT=ks%=y1+=+K8ojgj&)R4 z5Lc{oeTABe-^&fq9aL5}uVtP2p?tc?#-B z!;g1*^ZI9CYLN~L`MlUweVEVGQ3R!&nRiTcq}4c-S+ti(@yK{6k>WoCk;k`o4`PTf zqvWV}5Mh$wP;u1TlQQd-z88aF1&4?BMSb}X2tV!)=CD{QW!zYp`cLq{@$=EYU}Lbv zQhi?*p?xI2#+p@U-RA1*Lw(oK@ty9A$%V{JmTpmA3KOHtPG#bSA+p;J%mVhiRk^KLU@w zgpS-AUiP+g87bxllFT|V+;LjYJ1#OhEVBMuve~|m67}6!Jorl3b1XhYTNH$Ni}7GA zaSRB8V&4qFX4rRjkieJG)?g#%D!hB=t_?bSQIrdO%l~y1OMA@cacGg-bu6X-mZ|PV zTHd>>N@t9dNFORzt`y7MHU*bPyJYm|S5C zmp)cpB_U}&MEpz1?_F#&ZS9cU3m~?0@b2@ zu+7>W{UJjNM1G$v@JvPJGoXrdk9E*l6Is9CWYP8exWX)v4>(8b9=fK}bniMH_lmRW XY`Pt<*=>7G|8ixc*{t7cG|&GBVbLP~ diff --git a/stattracker/views/api.py b/stattracker/views/api.py index 17d3b24..020cb8e 100644 --- a/stattracker/views/api.py +++ b/stattracker/views/api.py @@ -2,7 +2,7 @@ import json from flask import Blueprint, jsonify, request, abort, url_for, Response, g -from flask.ext.login import login_user +from flask.ext.login import login_user, current_user from ..models import Enterprise, User, Stat from ..forms import EnterpriseForm, StatForm @@ -11,23 +11,23 @@ from functools import wraps -def returns_json(f): - @wraps(f) - def decorated_function(*args, **kwargs): - retval = f(*args, **kwargs) - if type(retval) is Response: - return retval - elif type(retval) is tuple: - response = jsonify(retval[0]) - if len(retval) > 1: - response.status_code = retval[1] - if len(retval) > 2: - for key, value in retval[2].items(): - response.headers[key] = value - return response - else: - return jsonify(retval) - return decorated_function +# def returns_json(f): +# @wraps(f) +# def decorated_function(*args, **kwargs): +# retval = f(*args, **kwargs) +# if type(retval) is Response: +# return retval +# elif type(retval) is tuple: +# response = jsonify(retval[0]) +# if len(retval) > 1: +# response.status_code = retval[1] +# if len(retval) > 2: +# for key, value in retval[2].items(): +# response.headers[key] = value +# return response +# else: +# return jsonify(retval) +# return decorated_function api = Blueprint('api', __name__) @@ -43,14 +43,15 @@ def unauthorized(request): @login_manager.request_loader def authorize_user(request): - authorization = request.authorization - if authorization: - email = authorization['username'] - password = authorization['password'] - + api_key = request.headers.get('Authorization') + if api_key: + api_key = api_key.replace('Basic ', '', 1) + api_key = base64.b64decode(api_key).decode("utf-8") + email, password = api_key.split(":") user = User.query.filter_by(email=email).first() if user.check_password(password): return user + return None def require_authorization(): @@ -62,16 +63,19 @@ def require_authorization(): @api.route("/activities", methods=["GET", "POST"]) -def activities(): +def user_activities(): if request.method == "POST": - return create_activity() - - enterprises = Enterprise.query.all() - enterprises = [enterprise.to_dict() for enterprise in enterprises] - return jsonify({"activities": enterprises}) + return add_activity() + else: + enterprises = Enterprise.query.filter_by(user_id=current_user.id) + enterprises = [enterprise.to_dict() for enterprise in enterprises] + # for enterprise in enterprises: + # enterprise["location"] = request.url_root + url_for(".enterprise", + # enterprise_id=enterprise["id"]) + return jsonify({"activities": enterprises}) -def create_bookmark(): +def add_activity(): """Creates a new enterprise from a JSON request.""" require_authorization() body = request.get_data(as_text=True) @@ -90,7 +94,125 @@ def create_bookmark(): return json_response(400, form.errors) -@api.route("/activities/") +@api.route("/activities/", methods=["GET"]) def enterprise(id): + # require_authorization() enterprise = Enterprise.query.get_or_404(id) - return jsonify(enterprise.to_dict()) + stats = Stat.query.filter_by(enterprise_id=enterprise.id).all() + enterprise = enterprise.to_dict() + enterprise["stats"] = [stat.to_dict() for stat in stats] + return jsonify(enterprise), 201 + +@api.route("/activities/", methods=["POST"]) +def edit_enterprise(request, id): + body = request.get_data(as_text=True) + data = json.loads(body) + enterprise = Enterprise.query.get_or_404(id) + form = EnterpriseForm(data=data, formdata=None, csrf_enabled=False) + if form.validate(): + enterprise.ent_name = form.ent_name.data + db.session.commit() + return(json.dumps(enterprise.to_dict()), 201) + else: + return json_response(400, form.errors) + +@api.route("/activities/", methods=["DELETE"]) +def delete_enterprise(id): + enterprise = Enterprise.query.get_or_404(id) + stats = Stat.query.filter_by(enterprise_id=id) + for stat in stats: + db.session.delete(stat) + db.session.commit() + db.session.delete(enterprise) + db.session.commit() + return json_response(201, "Deleted Activity") + + + +@api.route("/api/v1/activities//data", methods=["POST", + "PUT", + "DELETE"]) +def modify_stat(id): + # require_authorization() + if request.method == "POST": + return add_stat(request, id) + elif request.method == "PUT": + return update_stat(request, id) + elif request.method == "DELETE": + return delete_stat(request, id) + + +def add_stat(request, id): + body = request.get_data(as_text=True) + data = json.loads(body) + if "date" in data.keys(): + try: + date = datetime.strptime(data["date"], "%Y-%m-%d") + stat = Stat.query.filter_by(enterprise_id=id).filter_by( + recorded_at=date).first() + if stat: + stat.value = data["value"] + db.session.commit() + else: + stat = Stat(enterprise_id=id, + recorded_at=date, + value=data["value"]) + db.session.add(stat) + db.session.commit() + return json_response(201, stat.to_dict()) + except ValueError: + return json_response(400, "Invalid date format.") + else: + stat = Stat.query.filter_by(enterprise_id=id).filter_by( + recorded_at=datetime.today().date()).first() + if stat: + stat.value = data["value"] + db.session.commit() + return json_response(201, stat.to_dict()) + else: + stat = Stat(enterprise_id=id, + recorded_at=date, + value=data["value"]) + db.session.add(stat) + db.session.commit() + return json_response(201, stat.to_dict()) + + +def update_stat(request, id): + body = request.get_data(as_text=True) + data = json.loads(body) + if "date" not in data.keys(): + return json_response(400, "Date required.") + else: + try: + date = datetime.strptime(data["date"], "%Y-%m-%d") + stat = Stat.query.filter_by(enterprise_id=id).filter_by( + recorded_at=date).first() + if not stat: + return json_response(400, "Stat not found.") + else: + stat.value = data["value"] + db.session.commit() + return json_response(201, stat.to_dict()) + except ValueError: + return json_response(400, "Invalid date format.") + + +def delete_stat(request, id): + body = request.get_data(as_text=True) + data = json.loads(body) + if "date" not in data.keys(): + return json_response(400, "Date required.") + else: + try: + date = datetime.strptime(data["date"], "%Y-%m-%d") + stat = Stat.query.filter_by(enterprise_id=id).filter_by( + recorded_at=date).first() + if not stat: + return json_response(400, "Stat not found.") + else: + db.session.delete(stat) + db.session.commit() + return json_response(201, "Activity stat deleted.") + except ValueError: + return json_response(400, "Invalid date format.") From 80e2bf7bf6c7654b071bdbd845c3cffa4a661e96 Mon Sep 17 00:00:00 2001 From: Bret Runestad Date: Tue, 3 Mar 2015 20:21:23 -0500 Subject: [PATCH 09/13] api worked out, jquery started --- stattracker/static/jquery-2.1.3.js | 9205 +++++++++++++++++ stattracker/static/main.js | 17 + stattracker/templates/index.html | 1 + stattracker/templates/layout.html | 2 +- .../views/__pycache__/api.cpython-34.pyc | Bin 6597 -> 6335 bytes .../__pycache__/enterprises.cpython-34.pyc | Bin 4797 -> 4792 bytes stattracker/views/api.py | 87 +- stattracker/views/enterprises.py | 2 +- 8 files changed, 9259 insertions(+), 55 deletions(-) create mode 100644 stattracker/static/jquery-2.1.3.js diff --git a/stattracker/static/jquery-2.1.3.js b/stattracker/static/jquery-2.1.3.js new file mode 100644 index 0000000..79d631f --- /dev/null +++ b/stattracker/static/jquery-2.1.3.js @@ -0,0 +1,9205 @@ +/*! + * jQuery JavaScript Library v2.1.3 + * http://jquery.com/ + * + * Includes Sizzle.js + * http://sizzlejs.com/ + * + * Copyright 2005, 2014 jQuery Foundation, Inc. and other contributors + * Released under the MIT license + * http://jquery.org/license + * + * Date: 2014-12-18T15:11Z + */ + +(function( global, factory ) { + + if ( typeof module === "object" && typeof module.exports === "object" ) { + // For CommonJS and CommonJS-like environments where a proper `window` + // is present, execute the factory and get jQuery. + // For environments that do not have a `window` with a `document` + // (such as Node.js), expose a factory as module.exports. + // This accentuates the need for the creation of a real `window`. + // e.g. var jQuery = require("jquery")(window); + // See ticket #14549 for more info. + module.exports = global.document ? + factory( global, true ) : + function( w ) { + if ( !w.document ) { + throw new Error( "jQuery requires a window with a document" ); + } + return factory( w ); + }; + } else { + factory( global ); + } + +// Pass this if window is not defined yet +}(typeof window !== "undefined" ? window : this, function( window, noGlobal ) { + +// Support: Firefox 18+ +// Can't be in strict mode, several libs including ASP.NET trace +// the stack via arguments.caller.callee and Firefox dies if +// you try to trace through "use strict" call chains. (#13335) +// + +var arr = []; + +var slice = arr.slice; + +var concat = arr.concat; + +var push = arr.push; + +var indexOf = arr.indexOf; + +var class2type = {}; + +var toString = class2type.toString; + +var hasOwn = class2type.hasOwnProperty; + +var support = {}; + + + +var + // Use the correct document accordingly with window argument (sandbox) + document = window.document, + + version = "2.1.3", + + // Define a local copy of jQuery + jQuery = function( selector, context ) { + // The jQuery object is actually just the init constructor 'enhanced' + // Need init if jQuery is called (just allow error to be thrown if not included) + return new jQuery.fn.init( selector, context ); + }, + + // Support: Android<4.1 + // Make sure we trim BOM and NBSP + rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, + + // Matches dashed string for camelizing + rmsPrefix = /^-ms-/, + rdashAlpha = /-([\da-z])/gi, + + // Used by jQuery.camelCase as callback to replace() + fcamelCase = function( all, letter ) { + return letter.toUpperCase(); + }; + +jQuery.fn = jQuery.prototype = { + // The current version of jQuery being used + jquery: version, + + constructor: jQuery, + + // Start with an empty selector + selector: "", + + // The default length of a jQuery object is 0 + length: 0, + + toArray: function() { + return slice.call( this ); + }, + + // Get the Nth element in the matched element set OR + // Get the whole matched element set as a clean array + get: function( num ) { + return num != null ? + + // Return just the one element from the set + ( num < 0 ? this[ num + this.length ] : this[ num ] ) : + + // Return all the elements in a clean array + slice.call( this ); + }, + + // Take an array of elements and push it onto the stack + // (returning the new matched element set) + pushStack: function( elems ) { + + // Build a new jQuery matched element set + var ret = jQuery.merge( this.constructor(), elems ); + + // Add the old object onto the stack (as a reference) + ret.prevObject = this; + ret.context = this.context; + + // Return the newly-formed element set + return ret; + }, + + // Execute a callback for every element in the matched set. + // (You can seed the arguments with an array of args, but this is + // only used internally.) + each: function( callback, args ) { + return jQuery.each( this, callback, args ); + }, + + map: function( callback ) { + return this.pushStack( jQuery.map(this, function( elem, i ) { + return callback.call( elem, i, elem ); + })); + }, + + slice: function() { + return this.pushStack( slice.apply( this, arguments ) ); + }, + + first: function() { + return this.eq( 0 ); + }, + + last: function() { + return this.eq( -1 ); + }, + + eq: function( i ) { + var len = this.length, + j = +i + ( i < 0 ? len : 0 ); + return this.pushStack( j >= 0 && j < len ? [ this[j] ] : [] ); + }, + + end: function() { + return this.prevObject || this.constructor(null); + }, + + // For internal use only. + // Behaves like an Array's method, not like a jQuery method. + push: push, + sort: arr.sort, + splice: arr.splice +}; + +jQuery.extend = jQuery.fn.extend = function() { + var options, name, src, copy, copyIsArray, clone, + target = arguments[0] || {}, + i = 1, + length = arguments.length, + deep = false; + + // Handle a deep copy situation + if ( typeof target === "boolean" ) { + deep = target; + + // Skip the boolean and the target + target = arguments[ i ] || {}; + i++; + } + + // Handle case when target is a string or something (possible in deep copy) + if ( typeof target !== "object" && !jQuery.isFunction(target) ) { + target = {}; + } + + // Extend jQuery itself if only one argument is passed + if ( i === length ) { + target = this; + i--; + } + + for ( ; i < length; i++ ) { + // Only deal with non-null/undefined values + if ( (options = arguments[ i ]) != null ) { + // Extend the base object + for ( name in options ) { + src = target[ name ]; + copy = options[ name ]; + + // Prevent never-ending loop + if ( target === copy ) { + continue; + } + + // Recurse if we're merging plain objects or arrays + if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) { + if ( copyIsArray ) { + copyIsArray = false; + clone = src && jQuery.isArray(src) ? src : []; + + } else { + clone = src && jQuery.isPlainObject(src) ? src : {}; + } + + // Never move original objects, clone them + target[ name ] = jQuery.extend( deep, clone, copy ); + + // Don't bring in undefined values + } else if ( copy !== undefined ) { + target[ name ] = copy; + } + } + } + } + + // Return the modified object + return target; +}; + +jQuery.extend({ + // Unique for each copy of jQuery on the page + expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ), + + // Assume jQuery is ready without the ready module + isReady: true, + + error: function( msg ) { + throw new Error( msg ); + }, + + noop: function() {}, + + isFunction: function( obj ) { + return jQuery.type(obj) === "function"; + }, + + isArray: Array.isArray, + + isWindow: function( obj ) { + return obj != null && obj === obj.window; + }, + + isNumeric: function( obj ) { + // parseFloat NaNs numeric-cast false positives (null|true|false|"") + // ...but misinterprets leading-number strings, particularly hex literals ("0x...") + // subtraction forces infinities to NaN + // adding 1 corrects loss of precision from parseFloat (#15100) + return !jQuery.isArray( obj ) && (obj - parseFloat( obj ) + 1) >= 0; + }, + + isPlainObject: function( obj ) { + // Not plain objects: + // - Any object or value whose internal [[Class]] property is not "[object Object]" + // - DOM nodes + // - window + if ( jQuery.type( obj ) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) { + return false; + } + + if ( obj.constructor && + !hasOwn.call( obj.constructor.prototype, "isPrototypeOf" ) ) { + return false; + } + + // If the function hasn't returned already, we're confident that + // |obj| is a plain object, created by {} or constructed with new Object + return true; + }, + + isEmptyObject: function( obj ) { + var name; + for ( name in obj ) { + return false; + } + return true; + }, + + type: function( obj ) { + if ( obj == null ) { + return obj + ""; + } + // Support: Android<4.0, iOS<6 (functionish RegExp) + return typeof obj === "object" || typeof obj === "function" ? + class2type[ toString.call(obj) ] || "object" : + typeof obj; + }, + + // Evaluates a script in a global context + globalEval: function( code ) { + var script, + indirect = eval; + + code = jQuery.trim( code ); + + if ( code ) { + // If the code includes a valid, prologue position + // strict mode pragma, execute code by injecting a + // script tag into the document. + if ( code.indexOf("use strict") === 1 ) { + script = document.createElement("script"); + script.text = code; + document.head.appendChild( script ).parentNode.removeChild( script ); + } else { + // Otherwise, avoid the DOM node creation, insertion + // and removal by using an indirect global eval + indirect( code ); + } + } + }, + + // Convert dashed to camelCase; used by the css and data modules + // Support: IE9-11+ + // 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.toLowerCase() === name.toLowerCase(); + }, + + // args is for internal usage only + each: function( obj, callback, args ) { + var value, + i = 0, + length = obj.length, + isArray = isArraylike( obj ); + + if ( args ) { + if ( isArray ) { + for ( ; i < length; i++ ) { + value = callback.apply( obj[ i ], args ); + + if ( value === false ) { + break; + } + } + } else { + for ( i in obj ) { + value = callback.apply( obj[ i ], args ); + + if ( value === false ) { + break; + } + } + } + + // A special, fast, case for the most common use of each + } else { + if ( isArray ) { + for ( ; i < length; i++ ) { + value = callback.call( obj[ i ], i, obj[ i ] ); + + if ( value === false ) { + break; + } + } + } else { + for ( i in obj ) { + value = callback.call( obj[ i ], i, obj[ i ] ); + + if ( value === false ) { + break; + } + } + } + } + + return obj; + }, + + // Support: Android<4.1 + trim: function( text ) { + return text == null ? + "" : + ( text + "" ).replace( rtrim, "" ); + }, + + // results is for internal usage only + makeArray: function( arr, results ) { + var ret = results || []; + + if ( arr != null ) { + if ( isArraylike( Object(arr) ) ) { + jQuery.merge( ret, + typeof arr === "string" ? + [ arr ] : arr + ); + } else { + push.call( ret, arr ); + } + } + + return ret; + }, + + inArray: function( elem, arr, i ) { + return arr == null ? -1 : indexOf.call( arr, elem, i ); + }, + + merge: function( first, second ) { + var len = +second.length, + j = 0, + i = first.length; + + for ( ; j < len; j++ ) { + first[ i++ ] = second[ j ]; + } + + first.length = i; + + return first; + }, + + grep: function( elems, callback, invert ) { + var callbackInverse, + matches = [], + i = 0, + length = elems.length, + callbackExpect = !invert; + + // Go through the array, only saving the items + // that pass the validator function + for ( ; i < length; i++ ) { + callbackInverse = !callback( elems[ i ], i ); + if ( callbackInverse !== callbackExpect ) { + matches.push( elems[ i ] ); + } + } + + return matches; + }, + + // arg is for internal usage only + map: function( elems, callback, arg ) { + var value, + i = 0, + length = elems.length, + isArray = isArraylike( elems ), + ret = []; + + // Go through the array, translating each of the items to their new values + if ( isArray ) { + for ( ; i < length; i++ ) { + value = callback( elems[ i ], i, arg ); + + if ( value != null ) { + ret.push( value ); + } + } + + // Go through every key on the object, + } else { + for ( i in elems ) { + value = callback( elems[ i ], i, arg ); + + if ( value != null ) { + ret.push( value ); + } + } + } + + // Flatten any nested arrays + return concat.apply( [], ret ); + }, + + // A global GUID counter for objects + guid: 1, + + // Bind a function to a context, optionally partially applying any + // arguments. + proxy: function( fn, context ) { + var tmp, args, proxy; + + if ( typeof context === "string" ) { + tmp = fn[ context ]; + context = fn; + fn = tmp; + } + + // Quick check to determine if target is callable, in the spec + // this throws a TypeError, but we will just return undefined. + if ( !jQuery.isFunction( fn ) ) { + return undefined; + } + + // Simulated bind + args = slice.call( arguments, 2 ); + proxy = function() { + return fn.apply( context || this, args.concat( slice.call( arguments ) ) ); + }; + + // Set the guid of unique handler to the same of original handler, so it can be removed + proxy.guid = fn.guid = fn.guid || jQuery.guid++; + + return proxy; + }, + + now: Date.now, + + // jQuery.support is not used in Core but other projects attach their + // properties to it so it needs to exist. + support: support +}); + +// Populate the class2type map +jQuery.each("Boolean Number String Function Array Date RegExp Object Error".split(" "), function(i, name) { + class2type[ "[object " + name + "]" ] = name.toLowerCase(); +}); + +function isArraylike( obj ) { + var length = obj.length, + type = jQuery.type( obj ); + + if ( type === "function" || jQuery.isWindow( obj ) ) { + return false; + } + + if ( obj.nodeType === 1 && length ) { + return true; + } + + return type === "array" || length === 0 || + typeof length === "number" && length > 0 && ( length - 1 ) in obj; +} +var Sizzle = +/*! + * Sizzle CSS Selector Engine v2.2.0-pre + * http://sizzlejs.com/ + * + * Copyright 2008, 2014 jQuery Foundation, Inc. and other contributors + * Released under the MIT license + * http://jquery.org/license + * + * Date: 2014-12-16 + */ +(function( window ) { + +var i, + support, + Expr, + getText, + isXML, + tokenize, + compile, + select, + outermostContext, + sortInput, + hasDuplicate, + + // Local document vars + setDocument, + document, + docElem, + documentIsHTML, + rbuggyQSA, + rbuggyMatches, + matches, + contains, + + // Instance-specific data + expando = "sizzle" + 1 * new Date(), + preferredDoc = window.document, + dirruns = 0, + done = 0, + classCache = createCache(), + tokenCache = createCache(), + compilerCache = createCache(), + sortOrder = function( a, b ) { + if ( a === b ) { + hasDuplicate = true; + } + return 0; + }, + + // General-purpose constants + MAX_NEGATIVE = 1 << 31, + + // Instance methods + hasOwn = ({}).hasOwnProperty, + arr = [], + pop = arr.pop, + push_native = arr.push, + push = arr.push, + slice = arr.slice, + // Use a stripped-down indexOf as it's faster than native + // http://jsperf.com/thor-indexof-vs-for/5 + indexOf = function( list, elem ) { + var i = 0, + len = list.length; + for ( ; i < len; i++ ) { + if ( list[i] === elem ) { + return i; + } + } + return -1; + }, + + booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped", + + // Regular expressions + + // Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace + whitespace = "[\\x20\\t\\r\\n\\f]", + // http://www.w3.org/TR/css3-syntax/#characters + characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+", + + // Loosely modeled on CSS identifier characters + // An unquoted value should be a CSS identifier http://www.w3.org/TR/css3-selectors/#attribute-selectors + // Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier + identifier = characterEncoding.replace( "w", "w#" ), + + // Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors + attributes = "\\[" + whitespace + "*(" + characterEncoding + ")(?:" + whitespace + + // Operator (capture 2) + "*([*^$|!~]?=)" + whitespace + + // "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]" + "*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace + + "*\\]", + + pseudos = ":(" + characterEncoding + ")(?:\\((" + + // To reduce the number of selectors needing tokenize in the preFilter, prefer arguments: + // 1. quoted (capture 3; capture 4 or capture 5) + "('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" + + // 2. simple (capture 6) + "((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" + + // 3. anything else (capture 2) + ".*" + + ")\\)|)", + + // Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter + rwhitespace = new RegExp( whitespace + "+", "g" ), + rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ), + + rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ), + rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ), + + rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*?)" + whitespace + "*\\]", "g" ), + + rpseudo = new RegExp( pseudos ), + ridentifier = new RegExp( "^" + identifier + "$" ), + + matchExpr = { + "ID": new RegExp( "^#(" + characterEncoding + ")" ), + "CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ), + "TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ), + "ATTR": new RegExp( "^" + attributes ), + "PSEUDO": new RegExp( "^" + pseudos ), + "CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace + + "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace + + "*(\\d+)|))" + whitespace + "*\\)|)", "i" ), + "bool": new RegExp( "^(?:" + booleans + ")$", "i" ), + // For use in libraries implementing .is() + // We use this for POS matching in `select` + "needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + + whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" ) + }, + + rinputs = /^(?:input|select|textarea|button)$/i, + rheader = /^h\d$/i, + + rnative = /^[^{]+\{\s*\[native \w/, + + // Easily-parseable/retrievable ID or TAG or CLASS selectors + rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/, + + rsibling = /[+~]/, + rescape = /'|\\/g, + + // CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters + runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ), + funescape = function( _, escaped, escapedWhitespace ) { + var high = "0x" + escaped - 0x10000; + // NaN means non-codepoint + // Support: Firefox<24 + // Workaround erroneous numeric interpretation of +"0x" + return high !== high || escapedWhitespace ? + escaped : + high < 0 ? + // BMP codepoint + String.fromCharCode( high + 0x10000 ) : + // Supplemental Plane codepoint (surrogate pair) + String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 ); + }, + + // Used for iframes + // See setDocument() + // Removing the function wrapper causes a "Permission Denied" + // error in IE + unloadHandler = function() { + setDocument(); + }; + +// Optimize for push.apply( _, NodeList ) +try { + push.apply( + (arr = slice.call( preferredDoc.childNodes )), + preferredDoc.childNodes + ); + // Support: Android<4.0 + // Detect silently failing push.apply + arr[ preferredDoc.childNodes.length ].nodeType; +} catch ( e ) { + push = { apply: arr.length ? + + // Leverage slice if possible + function( target, els ) { + push_native.apply( target, slice.call(els) ); + } : + + // Support: IE<9 + // Otherwise append directly + function( target, els ) { + var j = target.length, + i = 0; + // Can't trust NodeList.length + while ( (target[j++] = els[i++]) ) {} + target.length = j - 1; + } + }; +} + +function Sizzle( selector, context, results, seed ) { + var match, elem, m, nodeType, + // QSA vars + i, groups, old, nid, newContext, newSelector; + + if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) { + setDocument( context ); + } + + context = context || document; + results = results || []; + nodeType = context.nodeType; + + if ( typeof selector !== "string" || !selector || + nodeType !== 1 && nodeType !== 9 && nodeType !== 11 ) { + + return results; + } + + if ( !seed && documentIsHTML ) { + + // Try to shortcut find operations when possible (e.g., not under DocumentFragment) + if ( nodeType !== 11 && (match = rquickExpr.exec( selector )) ) { + // Speed-up: Sizzle("#ID") + if ( (m = match[1]) ) { + if ( nodeType === 9 ) { + elem = context.getElementById( m ); + // Check parentNode to catch when Blackberry 4.6 returns + // nodes that are no longer in the document (jQuery #6963) + if ( elem && elem.parentNode ) { + // Handle the case where IE, Opera, and Webkit return items + // by name instead of ID + if ( elem.id === m ) { + results.push( elem ); + return results; + } + } else { + return results; + } + } else { + // Context is not a document + if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) && + contains( context, elem ) && elem.id === m ) { + results.push( elem ); + return results; + } + } + + // Speed-up: Sizzle("TAG") + } else if ( match[2] ) { + push.apply( results, context.getElementsByTagName( selector ) ); + return results; + + // Speed-up: Sizzle(".CLASS") + } else if ( (m = match[3]) && support.getElementsByClassName ) { + push.apply( results, context.getElementsByClassName( m ) ); + return results; + } + } + + // QSA path + if ( support.qsa && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) { + nid = old = expando; + newContext = context; + newSelector = nodeType !== 1 && selector; + + // 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 + if ( nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) { + groups = tokenize( selector ); + + if ( (old = context.getAttribute("id")) ) { + nid = old.replace( rescape, "\\$&" ); + } else { + context.setAttribute( "id", nid ); + } + nid = "[id='" + nid + "'] "; + + i = groups.length; + while ( i-- ) { + groups[i] = nid + toSelector( groups[i] ); + } + newContext = rsibling.test( selector ) && testContext( context.parentNode ) || context; + newSelector = groups.join(","); + } + + if ( newSelector ) { + try { + push.apply( results, + newContext.querySelectorAll( newSelector ) + ); + return results; + } catch(qsaError) { + } finally { + if ( !old ) { + context.removeAttribute("id"); + } + } + } + } + } + + // All others + return select( selector.replace( rtrim, "$1" ), context, results, seed ); +} + +/** + * Create key-value caches of limited size + * @returns {Function(string, Object)} Returns the Object data after storing it on itself with + * property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength) + * deleting the oldest entry + */ +function createCache() { + var keys = []; + + function cache( key, value ) { + // Use (key + " ") to avoid collision with native prototype properties (see Issue #157) + if ( keys.push( key + " " ) > Expr.cacheLength ) { + // Only keep the most recent entries + delete cache[ keys.shift() ]; + } + return (cache[ key + " " ] = value); + } + return cache; +} + +/** + * Mark a function for special use by Sizzle + * @param {Function} fn The function to mark + */ +function markFunction( fn ) { + fn[ expando ] = true; + return fn; +} + +/** + * Support testing using an element + * @param {Function} fn Passed the created div and expects a boolean result + */ +function assert( fn ) { + var div = document.createElement("div"); + + try { + return !!fn( div ); + } catch (e) { + return false; + } finally { + // Remove from its parent by default + if ( div.parentNode ) { + div.parentNode.removeChild( div ); + } + // release memory in IE + div = null; + } +} + +/** + * Adds the same handler for all of the specified attrs + * @param {String} attrs Pipe-separated list of attributes + * @param {Function} handler The method that will be applied + */ +function addHandle( attrs, handler ) { + var arr = attrs.split("|"), + i = attrs.length; + + while ( i-- ) { + Expr.attrHandle[ arr[i] ] = handler; + } +} + +/** + * Checks document order of two siblings + * @param {Element} a + * @param {Element} b + * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b + */ +function siblingCheck( a, b ) { + var cur = b && a, + diff = cur && a.nodeType === 1 && b.nodeType === 1 && + ( ~b.sourceIndex || MAX_NEGATIVE ) - + ( ~a.sourceIndex || MAX_NEGATIVE ); + + // Use IE sourceIndex if available on both nodes + if ( diff ) { + return diff; + } + + // Check if b follows a + if ( cur ) { + while ( (cur = cur.nextSibling) ) { + if ( cur === b ) { + return -1; + } + } + } + + return a ? 1 : -1; +} + +/** + * Returns a function to use in pseudos for input types + * @param {String} type + */ +function createInputPseudo( type ) { + return function( elem ) { + var name = elem.nodeName.toLowerCase(); + return name === "input" && elem.type === type; + }; +} + +/** + * Returns a function to use in pseudos for buttons + * @param {String} type + */ +function createButtonPseudo( type ) { + return function( elem ) { + var name = elem.nodeName.toLowerCase(); + return (name === "input" || name === "button") && elem.type === type; + }; +} + +/** + * Returns a function to use in pseudos for positionals + * @param {Function} fn + */ +function createPositionalPseudo( fn ) { + return markFunction(function( argument ) { + argument = +argument; + return markFunction(function( seed, matches ) { + var j, + matchIndexes = fn( [], seed.length, argument ), + i = matchIndexes.length; + + // Match elements found at the specified indexes + while ( i-- ) { + if ( seed[ (j = matchIndexes[i]) ] ) { + seed[j] = !(matches[j] = seed[j]); + } + } + }); + }); +} + +/** + * Checks a node for validity as a Sizzle context + * @param {Element|Object=} context + * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value + */ +function testContext( context ) { + return context && typeof context.getElementsByTagName !== "undefined" && context; +} + +// Expose support vars for convenience +support = Sizzle.support = {}; + +/** + * Detects XML nodes + * @param {Element|Object} elem An element or a document + * @returns {Boolean} True iff elem is a non-HTML XML node + */ +isXML = Sizzle.isXML = function( elem ) { + // documentElement is verified for cases where it doesn't yet exist + // (such as loading iframes in IE - #4833) + var documentElement = elem && (elem.ownerDocument || elem).documentElement; + return documentElement ? documentElement.nodeName !== "HTML" : false; +}; + +/** + * Sets document-related variables once based on the current document + * @param {Element|Object} [doc] An element or document object to use to set the document + * @returns {Object} Returns the current document + */ +setDocument = Sizzle.setDocument = function( node ) { + var hasCompare, parent, + doc = node ? node.ownerDocument || node : preferredDoc; + + // If no document and documentElement is available, return + if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) { + return document; + } + + // Set our document + document = doc; + docElem = doc.documentElement; + parent = doc.defaultView; + + // Support: IE>8 + // If iframe document is assigned to "document" variable and if iframe has been reloaded, + // IE will throw "permission denied" error when accessing "document" variable, see jQuery #13936 + // IE6-8 do not support the defaultView property so parent will be undefined + if ( parent && parent !== parent.top ) { + // IE11 does not have attachEvent, so all must suffer + if ( parent.addEventListener ) { + parent.addEventListener( "unload", unloadHandler, false ); + } else if ( parent.attachEvent ) { + parent.attachEvent( "onunload", unloadHandler ); + } + } + + /* Support tests + ---------------------------------------------------------------------- */ + documentIsHTML = !isXML( doc ); + + /* Attributes + ---------------------------------------------------------------------- */ + + // Support: IE<8 + // Verify that getAttribute really returns attributes and not properties + // (excepting IE8 booleans) + support.attributes = assert(function( div ) { + div.className = "i"; + return !div.getAttribute("className"); + }); + + /* getElement(s)By* + ---------------------------------------------------------------------- */ + + // Check if getElementsByTagName("*") returns only elements + support.getElementsByTagName = assert(function( div ) { + div.appendChild( doc.createComment("") ); + return !div.getElementsByTagName("*").length; + }); + + // Support: IE<9 + support.getElementsByClassName = rnative.test( doc.getElementsByClassName ); + + // Support: IE<10 + // Check if getElementById returns elements by name + // The broken getElementById methods don't pick up programatically-set names, + // so use a roundabout getElementsByName test + support.getById = assert(function( div ) { + docElem.appendChild( div ).id = expando; + return !doc.getElementsByName || !doc.getElementsByName( expando ).length; + }); + + // ID find and filter + if ( support.getById ) { + Expr.find["ID"] = function( id, context ) { + if ( typeof context.getElementById !== "undefined" && documentIsHTML ) { + var m = context.getElementById( id ); + // Check parentNode to catch when Blackberry 4.6 returns + // nodes that are no longer in the document #6963 + return m && m.parentNode ? [ m ] : []; + } + }; + Expr.filter["ID"] = function( id ) { + var attrId = id.replace( runescape, funescape ); + return function( elem ) { + return elem.getAttribute("id") === attrId; + }; + }; + } else { + // Support: IE6/7 + // getElementById is not reliable as a find shortcut + delete Expr.find["ID"]; + + Expr.filter["ID"] = function( id ) { + var attrId = id.replace( runescape, funescape ); + return function( elem ) { + var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id"); + return node && node.value === attrId; + }; + }; + } + + // Tag + Expr.find["TAG"] = support.getElementsByTagName ? + function( tag, context ) { + if ( typeof context.getElementsByTagName !== "undefined" ) { + return context.getElementsByTagName( tag ); + + // DocumentFragment nodes don't have gEBTN + } else if ( support.qsa ) { + return context.querySelectorAll( tag ); + } + } : + + function( tag, context ) { + var elem, + tmp = [], + i = 0, + // By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too + results = context.getElementsByTagName( tag ); + + // Filter out possible comments + if ( tag === "*" ) { + while ( (elem = results[i++]) ) { + if ( elem.nodeType === 1 ) { + tmp.push( elem ); + } + } + + return tmp; + } + return results; + }; + + // Class + Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) { + if ( documentIsHTML ) { + return context.getElementsByClassName( className ); + } + }; + + /* QSA/matchesSelector + ---------------------------------------------------------------------- */ + + // QSA and matchesSelector support + + // matchesSelector(:active) reports false when true (IE9/Opera 11.5) + rbuggyMatches = []; + + // qSa(:focus) reports false when true (Chrome 21) + // We allow this because of a bug in IE8/9 that throws an error + // whenever `document.activeElement` is accessed on an iframe + // So, we allow :focus to pass through QSA all the time to avoid the IE error + // See http://bugs.jquery.com/ticket/13378 + rbuggyQSA = []; + + if ( (support.qsa = rnative.test( doc.querySelectorAll )) ) { + // Build QSA regex + // Regex strategy adopted from Diego Perini + assert(function( div ) { + // Select is set to empty string on purpose + // This is to test IE's treatment of not explicitly + // setting a boolean content attribute, + // since its presence should be enough + // http://bugs.jquery.com/ticket/12359 + docElem.appendChild( div ).innerHTML = "" + + ""; + + // Support: IE8, Opera 11-12.16 + // Nothing should be selected when empty strings follow ^= or $= or *= + // The test attribute must be unknown in Opera but "safe" for WinRT + // http://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section + if ( div.querySelectorAll("[msallowcapture^='']").length ) { + rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" ); + } + + // Support: IE8 + // Boolean attributes and "value" are not treated correctly + if ( !div.querySelectorAll("[selected]").length ) { + rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" ); + } + + // Support: Chrome<29, Android<4.2+, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.7+ + if ( !div.querySelectorAll( "[id~=" + expando + "-]" ).length ) { + rbuggyQSA.push("~="); + } + + // Webkit/Opera - :checked should return selected option elements + // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked + // IE8 throws error here and will not see later tests + if ( !div.querySelectorAll(":checked").length ) { + rbuggyQSA.push(":checked"); + } + + // Support: Safari 8+, iOS 8+ + // https://bugs.webkit.org/show_bug.cgi?id=136851 + // In-page `selector#id sibing-combinator selector` fails + if ( !div.querySelectorAll( "a#" + expando + "+*" ).length ) { + rbuggyQSA.push(".#.+[+~]"); + } + }); + + assert(function( div ) { + // Support: Windows 8 Native Apps + // The type and name attributes are restricted during .innerHTML assignment + var input = doc.createElement("input"); + input.setAttribute( "type", "hidden" ); + div.appendChild( input ).setAttribute( "name", "D" ); + + // Support: IE8 + // Enforce case-sensitivity of name attribute + if ( div.querySelectorAll("[name=d]").length ) { + rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" ); + } + + // FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled) + // IE8 throws error here and will not see later tests + if ( !div.querySelectorAll(":enabled").length ) { + rbuggyQSA.push( ":enabled", ":disabled" ); + } + + // Opera 10-11 does not throw on post-comma invalid pseudos + div.querySelectorAll("*,:x"); + rbuggyQSA.push(",.*:"); + }); + } + + if ( (support.matchesSelector = rnative.test( (matches = docElem.matches || + docElem.webkitMatchesSelector || + docElem.mozMatchesSelector || + docElem.oMatchesSelector || + docElem.msMatchesSelector) )) ) { + + assert(function( div ) { + // Check to see if it's possible to do matchesSelector + // on a disconnected node (IE 9) + support.disconnectedMatch = matches.call( div, "div" ); + + // This should fail with an exception + // Gecko does not error, returns false instead + matches.call( div, "[s!='']:x" ); + rbuggyMatches.push( "!=", pseudos ); + }); + } + + rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") ); + rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") ); + + /* Contains + ---------------------------------------------------------------------- */ + hasCompare = rnative.test( docElem.compareDocumentPosition ); + + // Element contains another + // Purposefully does not implement inclusive descendent + // As in, an element does not contain itself + contains = hasCompare || rnative.test( docElem.contains ) ? + function( a, b ) { + var adown = a.nodeType === 9 ? a.documentElement : a, + bup = b && b.parentNode; + return a === bup || !!( bup && bup.nodeType === 1 && ( + adown.contains ? + adown.contains( bup ) : + a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16 + )); + } : + function( a, b ) { + if ( b ) { + while ( (b = b.parentNode) ) { + if ( b === a ) { + return true; + } + } + } + return false; + }; + + /* Sorting + ---------------------------------------------------------------------- */ + + // Document order sorting + sortOrder = hasCompare ? + function( a, b ) { + + // Flag for duplicate removal + if ( a === b ) { + hasDuplicate = true; + return 0; + } + + // Sort on method existence if only one input has compareDocumentPosition + var compare = !a.compareDocumentPosition - !b.compareDocumentPosition; + if ( compare ) { + return compare; + } + + // Calculate position if both inputs belong to the same document + compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ? + a.compareDocumentPosition( b ) : + + // Otherwise we know they are disconnected + 1; + + // Disconnected nodes + if ( compare & 1 || + (!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) { + + // Choose the first element that is related to our preferred document + if ( a === doc || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) { + return -1; + } + if ( b === doc || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) { + return 1; + } + + // Maintain original order + return sortInput ? + ( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) : + 0; + } + + return compare & 4 ? -1 : 1; + } : + function( a, b ) { + // Exit early if the nodes are identical + if ( a === b ) { + hasDuplicate = true; + return 0; + } + + var cur, + i = 0, + aup = a.parentNode, + bup = b.parentNode, + ap = [ a ], + bp = [ b ]; + + // Parentless nodes are either documents or disconnected + if ( !aup || !bup ) { + return a === doc ? -1 : + b === doc ? 1 : + aup ? -1 : + bup ? 1 : + sortInput ? + ( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) : + 0; + + // If the nodes are siblings, we can do a quick check + } else if ( aup === bup ) { + return siblingCheck( a, b ); + } + + // Otherwise we need full lists of their ancestors for comparison + cur = a; + while ( (cur = cur.parentNode) ) { + ap.unshift( cur ); + } + cur = b; + while ( (cur = cur.parentNode) ) { + bp.unshift( cur ); + } + + // Walk down the tree looking for a discrepancy + while ( ap[i] === bp[i] ) { + i++; + } + + return i ? + // Do a sibling check if the nodes have a common ancestor + siblingCheck( ap[i], bp[i] ) : + + // Otherwise nodes in our document sort first + ap[i] === preferredDoc ? -1 : + bp[i] === preferredDoc ? 1 : + 0; + }; + + return doc; +}; + +Sizzle.matches = function( expr, elements ) { + return Sizzle( expr, null, null, elements ); +}; + +Sizzle.matchesSelector = function( elem, expr ) { + // Set document vars if needed + if ( ( elem.ownerDocument || elem ) !== document ) { + setDocument( elem ); + } + + // Make sure that attribute selectors are quoted + expr = expr.replace( rattributeQuotes, "='$1']" ); + + if ( support.matchesSelector && documentIsHTML && + ( !rbuggyMatches || !rbuggyMatches.test( expr ) ) && + ( !rbuggyQSA || !rbuggyQSA.test( expr ) ) ) { + + try { + var ret = matches.call( elem, expr ); + + // IE 9's matchesSelector returns false on disconnected nodes + if ( ret || support.disconnectedMatch || + // As well, disconnected nodes are said to be in a document + // fragment in IE 9 + elem.document && elem.document.nodeType !== 11 ) { + return ret; + } + } catch (e) {} + } + + return Sizzle( expr, document, null, [ elem ] ).length > 0; +}; + +Sizzle.contains = function( context, elem ) { + // Set document vars if needed + if ( ( context.ownerDocument || context ) !== document ) { + setDocument( context ); + } + return contains( context, elem ); +}; + +Sizzle.attr = function( elem, name ) { + // Set document vars if needed + if ( ( elem.ownerDocument || elem ) !== document ) { + setDocument( elem ); + } + + var fn = Expr.attrHandle[ name.toLowerCase() ], + // Don't get fooled by Object.prototype properties (jQuery #13807) + val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ? + fn( elem, name, !documentIsHTML ) : + undefined; + + return val !== undefined ? + val : + support.attributes || !documentIsHTML ? + elem.getAttribute( name ) : + (val = elem.getAttributeNode(name)) && val.specified ? + val.value : + null; +}; + +Sizzle.error = function( msg ) { + throw new Error( "Syntax error, unrecognized expression: " + msg ); +}; + +/** + * Document sorting and removing duplicates + * @param {ArrayLike} results + */ +Sizzle.uniqueSort = function( results ) { + var elem, + duplicates = [], + j = 0, + i = 0; + + // Unless we *know* we can detect duplicates, assume their presence + hasDuplicate = !support.detectDuplicates; + sortInput = !support.sortStable && results.slice( 0 ); + results.sort( sortOrder ); + + if ( hasDuplicate ) { + while ( (elem = results[i++]) ) { + if ( elem === results[ i ] ) { + j = duplicates.push( i ); + } + } + while ( j-- ) { + results.splice( duplicates[ j ], 1 ); + } + } + + // Clear input after sorting to release objects + // See https://github.com/jquery/sizzle/pull/225 + sortInput = null; + + return results; +}; + +/** + * Utility function for retrieving the text value of an array of DOM nodes + * @param {Array|Element} elem + */ +getText = Sizzle.getText = function( elem ) { + var node, + ret = "", + i = 0, + nodeType = elem.nodeType; + + if ( !nodeType ) { + // If no nodeType, this is expected to be an array + while ( (node = elem[i++]) ) { + // Do not traverse comment nodes + ret += getText( node ); + } + } else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) { + // Use textContent for elements + // innerText usage removed for consistency of new lines (jQuery #11153) + if ( typeof elem.textContent === "string" ) { + return elem.textContent; + } else { + // Traverse its children + for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) { + ret += getText( elem ); + } + } + } else if ( nodeType === 3 || nodeType === 4 ) { + return elem.nodeValue; + } + // Do not include comment or processing instruction nodes + + return ret; +}; + +Expr = Sizzle.selectors = { + + // Can be adjusted by the user + cacheLength: 50, + + createPseudo: markFunction, + + match: matchExpr, + + attrHandle: {}, + + find: {}, + + relative: { + ">": { dir: "parentNode", first: true }, + " ": { dir: "parentNode" }, + "+": { dir: "previousSibling", first: true }, + "~": { dir: "previousSibling" } + }, + + preFilter: { + "ATTR": function( match ) { + match[1] = match[1].replace( runescape, funescape ); + + // Move the given value to match[3] whether quoted or unquoted + match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape ); + + if ( match[2] === "~=" ) { + match[3] = " " + match[3] + " "; + } + + return match.slice( 0, 4 ); + }, + + "CHILD": function( match ) { + /* matches from matchExpr["CHILD"] + 1 type (only|nth|...) + 2 what (child|of-type) + 3 argument (even|odd|\d*|\d*n([+-]\d+)?|...) + 4 xn-component of xn+y argument ([+-]?\d*n|) + 5 sign of xn-component + 6 x of xn-component + 7 sign of y-component + 8 y of y-component + */ + match[1] = match[1].toLowerCase(); + + if ( match[1].slice( 0, 3 ) === "nth" ) { + // nth-* requires argument + if ( !match[3] ) { + Sizzle.error( match[0] ); + } + + // numeric x and y parameters for Expr.filter.CHILD + // remember that false/true cast respectively to 0/1 + match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) ); + match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" ); + + // other types prohibit arguments + } else if ( match[3] ) { + Sizzle.error( match[0] ); + } + + return match; + }, + + "PSEUDO": function( match ) { + var excess, + unquoted = !match[6] && match[2]; + + if ( matchExpr["CHILD"].test( match[0] ) ) { + return null; + } + + // Accept quoted arguments as-is + if ( match[3] ) { + match[2] = match[4] || match[5] || ""; + + // Strip excess characters from unquoted arguments + } else if ( unquoted && rpseudo.test( unquoted ) && + // Get excess from tokenize (recursively) + (excess = tokenize( unquoted, true )) && + // advance to the next closing parenthesis + (excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) { + + // excess is a negative index + match[0] = match[0].slice( 0, excess ); + match[2] = unquoted.slice( 0, excess ); + } + + // Return only captures needed by the pseudo filter method (type and argument) + return match.slice( 0, 3 ); + } + }, + + filter: { + + "TAG": function( nodeNameSelector ) { + var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase(); + return nodeNameSelector === "*" ? + function() { return true; } : + function( elem ) { + return elem.nodeName && elem.nodeName.toLowerCase() === nodeName; + }; + }, + + "CLASS": function( className ) { + var pattern = classCache[ className + " " ]; + + return pattern || + (pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) && + classCache( className, function( elem ) { + return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== "undefined" && elem.getAttribute("class") || "" ); + }); + }, + + "ATTR": function( name, operator, check ) { + return function( elem ) { + var result = Sizzle.attr( elem, name ); + + if ( result == null ) { + return operator === "!="; + } + if ( !operator ) { + return true; + } + + result += ""; + + return operator === "=" ? result === check : + operator === "!=" ? result !== check : + operator === "^=" ? check && result.indexOf( check ) === 0 : + operator === "*=" ? check && result.indexOf( check ) > -1 : + operator === "$=" ? check && result.slice( -check.length ) === check : + operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 : + operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" : + false; + }; + }, + + "CHILD": function( type, what, argument, first, last ) { + var simple = type.slice( 0, 3 ) !== "nth", + forward = type.slice( -4 ) !== "last", + ofType = what === "of-type"; + + return first === 1 && last === 0 ? + + // Shortcut for :nth-*(n) + function( elem ) { + return !!elem.parentNode; + } : + + function( elem, context, xml ) { + var cache, outerCache, node, diff, nodeIndex, start, + dir = simple !== forward ? "nextSibling" : "previousSibling", + parent = elem.parentNode, + name = ofType && elem.nodeName.toLowerCase(), + useCache = !xml && !ofType; + + if ( parent ) { + + // :(first|last|only)-(child|of-type) + if ( simple ) { + while ( dir ) { + node = elem; + while ( (node = node[ dir ]) ) { + if ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) { + return false; + } + } + // Reverse direction for :only-* (if we haven't yet done so) + start = dir = type === "only" && !start && "nextSibling"; + } + return true; + } + + start = [ forward ? parent.firstChild : parent.lastChild ]; + + // non-xml :nth-child(...) stores cache data on `parent` + if ( forward && useCache ) { + // Seek `elem` from a previously-cached index + outerCache = parent[ expando ] || (parent[ expando ] = {}); + cache = outerCache[ type ] || []; + nodeIndex = cache[0] === dirruns && cache[1]; + diff = cache[0] === dirruns && cache[2]; + node = nodeIndex && parent.childNodes[ nodeIndex ]; + + while ( (node = ++nodeIndex && node && node[ dir ] || + + // Fallback to seeking `elem` from the start + (diff = nodeIndex = 0) || start.pop()) ) { + + // When found, cache indexes on `parent` and break + if ( node.nodeType === 1 && ++diff && node === elem ) { + outerCache[ type ] = [ dirruns, nodeIndex, diff ]; + break; + } + } + + // Use previously-cached element index if available + } else if ( useCache && (cache = (elem[ expando ] || (elem[ expando ] = {}))[ type ]) && cache[0] === dirruns ) { + diff = cache[1]; + + // xml :nth-child(...) or :nth-last-child(...) or :nth(-last)?-of-type(...) + } else { + // Use the same loop as above to seek `elem` from the start + while ( (node = ++nodeIndex && node && node[ dir ] || + (diff = nodeIndex = 0) || start.pop()) ) { + + if ( ( ofType ? node.nodeName.toLowerCase() === name : node.nodeType === 1 ) && ++diff ) { + // Cache the index of each encountered element + if ( useCache ) { + (node[ expando ] || (node[ expando ] = {}))[ type ] = [ dirruns, diff ]; + } + + if ( node === elem ) { + break; + } + } + } + } + + // Incorporate the offset, then check against cycle size + diff -= last; + return diff === first || ( diff % first === 0 && diff / first >= 0 ); + } + }; + }, + + "PSEUDO": function( pseudo, argument ) { + // pseudo-class names are case-insensitive + // http://www.w3.org/TR/selectors/#pseudo-classes + // Prioritize by case sensitivity in case custom pseudos are added with uppercase letters + // Remember that setFilters inherits from pseudos + var args, + fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] || + Sizzle.error( "unsupported pseudo: " + pseudo ); + + // The user may use createPseudo to indicate that + // arguments are needed to create the filter function + // just as Sizzle does + if ( fn[ expando ] ) { + return fn( argument ); + } + + // But maintain support for old signatures + if ( fn.length > 1 ) { + args = [ pseudo, pseudo, "", argument ]; + return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ? + markFunction(function( seed, matches ) { + var idx, + matched = fn( seed, argument ), + i = matched.length; + while ( i-- ) { + idx = indexOf( seed, matched[i] ); + seed[ idx ] = !( matches[ idx ] = matched[i] ); + } + }) : + function( elem ) { + return fn( elem, 0, args ); + }; + } + + return fn; + } + }, + + pseudos: { + // Potentially complex pseudos + "not": markFunction(function( selector ) { + // Trim the selector passed to compile + // to avoid treating leading and trailing + // spaces as combinators + var input = [], + results = [], + matcher = compile( selector.replace( rtrim, "$1" ) ); + + return matcher[ expando ] ? + markFunction(function( seed, matches, context, xml ) { + var elem, + unmatched = matcher( seed, null, xml, [] ), + i = seed.length; + + // Match elements unmatched by `matcher` + while ( i-- ) { + if ( (elem = unmatched[i]) ) { + seed[i] = !(matches[i] = elem); + } + } + }) : + function( elem, context, xml ) { + input[0] = elem; + matcher( input, null, xml, results ); + // Don't keep the element (issue #299) + input[0] = null; + return !results.pop(); + }; + }), + + "has": markFunction(function( selector ) { + return function( elem ) { + return Sizzle( selector, elem ).length > 0; + }; + }), + + "contains": markFunction(function( text ) { + text = text.replace( runescape, funescape ); + return function( elem ) { + return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1; + }; + }), + + // "Whether an element is represented by a :lang() selector + // is based solely on the element's language value + // being equal to the identifier C, + // or beginning with the identifier C immediately followed by "-". + // The matching of C against the element's language value is performed case-insensitively. + // The identifier C does not have to be a valid language name." + // http://www.w3.org/TR/selectors/#lang-pseudo + "lang": markFunction( function( lang ) { + // lang value must be a valid identifier + if ( !ridentifier.test(lang || "") ) { + Sizzle.error( "unsupported lang: " + lang ); + } + lang = lang.replace( runescape, funescape ).toLowerCase(); + return function( elem ) { + var elemLang; + do { + if ( (elemLang = documentIsHTML ? + elem.lang : + elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) { + + elemLang = elemLang.toLowerCase(); + return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0; + } + } while ( (elem = elem.parentNode) && elem.nodeType === 1 ); + return false; + }; + }), + + // Miscellaneous + "target": function( elem ) { + var hash = window.location && window.location.hash; + return hash && hash.slice( 1 ) === elem.id; + }, + + "root": function( elem ) { + return elem === docElem; + }, + + "focus": function( elem ) { + return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex); + }, + + // Boolean properties + "enabled": function( elem ) { + return elem.disabled === false; + }, + + "disabled": function( elem ) { + return elem.disabled === true; + }, + + "checked": function( elem ) { + // In CSS3, :checked should return both checked and selected elements + // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked + var nodeName = elem.nodeName.toLowerCase(); + return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected); + }, + + "selected": function( elem ) { + // Accessing this property makes selected-by-default + // options in Safari work properly + if ( elem.parentNode ) { + elem.parentNode.selectedIndex; + } + + return elem.selected === true; + }, + + // Contents + "empty": function( elem ) { + // http://www.w3.org/TR/selectors/#empty-pseudo + // :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5), + // but not by others (comment: 8; processing instruction: 7; etc.) + // nodeType < 6 works because attributes (2) do not appear as children + for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) { + if ( elem.nodeType < 6 ) { + return false; + } + } + return true; + }, + + "parent": function( elem ) { + return !Expr.pseudos["empty"]( elem ); + }, + + // Element/input types + "header": function( elem ) { + return rheader.test( elem.nodeName ); + }, + + "input": function( elem ) { + return rinputs.test( elem.nodeName ); + }, + + "button": function( elem ) { + var name = elem.nodeName.toLowerCase(); + return name === "input" && elem.type === "button" || name === "button"; + }, + + "text": function( elem ) { + var attr; + return elem.nodeName.toLowerCase() === "input" && + elem.type === "text" && + + // Support: IE<8 + // New HTML5 attribute values (e.g., "search") appear with elem.type === "text" + ( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" ); + }, + + // Position-in-collection + "first": createPositionalPseudo(function() { + return [ 0 ]; + }), + + "last": createPositionalPseudo(function( matchIndexes, length ) { + return [ length - 1 ]; + }), + + "eq": createPositionalPseudo(function( matchIndexes, length, argument ) { + return [ argument < 0 ? argument + length : argument ]; + }), + + "even": createPositionalPseudo(function( matchIndexes, length ) { + var i = 0; + for ( ; i < length; i += 2 ) { + matchIndexes.push( i ); + } + return matchIndexes; + }), + + "odd": createPositionalPseudo(function( matchIndexes, length ) { + var i = 1; + for ( ; i < length; i += 2 ) { + matchIndexes.push( i ); + } + return matchIndexes; + }), + + "lt": createPositionalPseudo(function( matchIndexes, length, argument ) { + var i = argument < 0 ? argument + length : argument; + for ( ; --i >= 0; ) { + matchIndexes.push( i ); + } + return matchIndexes; + }), + + "gt": createPositionalPseudo(function( matchIndexes, length, argument ) { + var i = argument < 0 ? argument + length : argument; + for ( ; ++i < length; ) { + matchIndexes.push( i ); + } + return matchIndexes; + }) + } +}; + +Expr.pseudos["nth"] = Expr.pseudos["eq"]; + +// Add button/input type pseudos +for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) { + Expr.pseudos[ i ] = createInputPseudo( i ); +} +for ( i in { submit: true, reset: true } ) { + Expr.pseudos[ i ] = createButtonPseudo( i ); +} + +// Easy API for creating new setFilters +function setFilters() {} +setFilters.prototype = Expr.filters = Expr.pseudos; +Expr.setFilters = new setFilters(); + +tokenize = Sizzle.tokenize = function( selector, parseOnly ) { + var matched, match, tokens, type, + soFar, groups, preFilters, + cached = tokenCache[ selector + " " ]; + + if ( cached ) { + return parseOnly ? 0 : cached.slice( 0 ); + } + + soFar = selector; + groups = []; + preFilters = Expr.preFilter; + + while ( soFar ) { + + // Comma and first run + if ( !matched || (match = rcomma.exec( soFar )) ) { + if ( match ) { + // Don't consume trailing commas as valid + soFar = soFar.slice( match[0].length ) || soFar; + } + groups.push( (tokens = []) ); + } + + matched = false; + + // Combinators + if ( (match = rcombinators.exec( soFar )) ) { + matched = match.shift(); + tokens.push({ + value: matched, + // Cast descendant combinators to space + type: match[0].replace( rtrim, " " ) + }); + soFar = soFar.slice( matched.length ); + } + + // Filters + for ( type in Expr.filter ) { + if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] || + (match = preFilters[ type ]( match ))) ) { + matched = match.shift(); + tokens.push({ + value: matched, + type: type, + matches: match + }); + soFar = soFar.slice( matched.length ); + } + } + + if ( !matched ) { + break; + } + } + + // Return the length of the invalid excess + // if we're just parsing + // Otherwise, throw an error or return tokens + return parseOnly ? + soFar.length : + soFar ? + Sizzle.error( selector ) : + // Cache the tokens + tokenCache( selector, groups ).slice( 0 ); +}; + +function toSelector( tokens ) { + var i = 0, + len = tokens.length, + selector = ""; + for ( ; i < len; i++ ) { + selector += tokens[i].value; + } + return selector; +} + +function addCombinator( matcher, combinator, base ) { + var dir = combinator.dir, + checkNonElements = base && dir === "parentNode", + doneName = done++; + + return combinator.first ? + // Check against closest ancestor/preceding element + function( elem, context, xml ) { + while ( (elem = elem[ dir ]) ) { + if ( elem.nodeType === 1 || checkNonElements ) { + return matcher( elem, context, xml ); + } + } + } : + + // Check against all ancestor/preceding elements + function( elem, context, xml ) { + var oldCache, outerCache, + newCache = [ dirruns, doneName ]; + + // We can't set arbitrary data on XML nodes, so they don't benefit from dir caching + if ( xml ) { + while ( (elem = elem[ dir ]) ) { + if ( elem.nodeType === 1 || checkNonElements ) { + if ( matcher( elem, context, xml ) ) { + return true; + } + } + } + } else { + while ( (elem = elem[ dir ]) ) { + if ( elem.nodeType === 1 || checkNonElements ) { + outerCache = elem[ expando ] || (elem[ expando ] = {}); + if ( (oldCache = outerCache[ dir ]) && + oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) { + + // Assign to newCache so results back-propagate to previous elements + return (newCache[ 2 ] = oldCache[ 2 ]); + } else { + // Reuse newcache so results back-propagate to previous elements + outerCache[ dir ] = newCache; + + // A match means we're done; a fail means we have to keep checking + if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) { + return true; + } + } + } + } + } + }; +} + +function elementMatcher( matchers ) { + return matchers.length > 1 ? + function( elem, context, xml ) { + var i = matchers.length; + while ( i-- ) { + if ( !matchers[i]( elem, context, xml ) ) { + return false; + } + } + return true; + } : + matchers[0]; +} + +function multipleContexts( selector, contexts, results ) { + var i = 0, + len = contexts.length; + for ( ; i < len; i++ ) { + Sizzle( selector, contexts[i], results ); + } + return results; +} + +function condense( unmatched, map, filter, context, xml ) { + var elem, + newUnmatched = [], + i = 0, + len = unmatched.length, + mapped = map != null; + + for ( ; i < len; i++ ) { + if ( (elem = unmatched[i]) ) { + if ( !filter || filter( elem, context, xml ) ) { + newUnmatched.push( elem ); + if ( mapped ) { + map.push( i ); + } + } + } + } + + return newUnmatched; +} + +function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) { + if ( postFilter && !postFilter[ expando ] ) { + postFilter = setMatcher( postFilter ); + } + if ( postFinder && !postFinder[ expando ] ) { + postFinder = setMatcher( postFinder, postSelector ); + } + return markFunction(function( seed, results, context, xml ) { + var temp, i, elem, + preMap = [], + postMap = [], + preexisting = results.length, + + // Get initial elements from seed or context + elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ), + + // Prefilter to get matcher input, preserving a map for seed-results synchronization + matcherIn = preFilter && ( seed || !selector ) ? + condense( elems, preMap, preFilter, context, xml ) : + elems, + + matcherOut = matcher ? + // If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results, + postFinder || ( seed ? preFilter : preexisting || postFilter ) ? + + // ...intermediate processing is necessary + [] : + + // ...otherwise use results directly + results : + matcherIn; + + // Find primary matches + if ( matcher ) { + matcher( matcherIn, matcherOut, context, xml ); + } + + // Apply postFilter + if ( postFilter ) { + temp = condense( matcherOut, postMap ); + postFilter( temp, [], context, xml ); + + // Un-match failing elements by moving them back to matcherIn + i = temp.length; + while ( i-- ) { + if ( (elem = temp[i]) ) { + matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem); + } + } + } + + if ( seed ) { + if ( postFinder || preFilter ) { + if ( postFinder ) { + // Get the final matcherOut by condensing this intermediate into postFinder contexts + temp = []; + i = matcherOut.length; + while ( i-- ) { + if ( (elem = matcherOut[i]) ) { + // Restore matcherIn since elem is not yet a final match + temp.push( (matcherIn[i] = elem) ); + } + } + postFinder( null, (matcherOut = []), temp, xml ); + } + + // Move matched elements from seed to results to keep them synchronized + i = matcherOut.length; + while ( i-- ) { + if ( (elem = matcherOut[i]) && + (temp = postFinder ? indexOf( seed, elem ) : preMap[i]) > -1 ) { + + seed[temp] = !(results[temp] = elem); + } + } + } + + // Add elements to results, through postFinder if defined + } else { + matcherOut = condense( + matcherOut === results ? + matcherOut.splice( preexisting, matcherOut.length ) : + matcherOut + ); + if ( postFinder ) { + postFinder( null, results, matcherOut, xml ); + } else { + push.apply( results, matcherOut ); + } + } + }); +} + +function matcherFromTokens( tokens ) { + var checkContext, matcher, j, + len = tokens.length, + leadingRelative = Expr.relative[ tokens[0].type ], + implicitRelative = leadingRelative || Expr.relative[" "], + i = leadingRelative ? 1 : 0, + + // The foundational matcher ensures that elements are reachable from top-level context(s) + matchContext = addCombinator( function( elem ) { + return elem === checkContext; + }, implicitRelative, true ), + matchAnyContext = addCombinator( function( elem ) { + return indexOf( checkContext, elem ) > -1; + }, implicitRelative, true ), + matchers = [ function( elem, context, xml ) { + var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || ( + (checkContext = context).nodeType ? + matchContext( elem, context, xml ) : + matchAnyContext( elem, context, xml ) ); + // Avoid hanging onto element (issue #299) + checkContext = null; + return ret; + } ]; + + for ( ; i < len; i++ ) { + if ( (matcher = Expr.relative[ tokens[i].type ]) ) { + matchers = [ addCombinator(elementMatcher( matchers ), matcher) ]; + } else { + matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches ); + + // Return special upon seeing a positional matcher + if ( matcher[ expando ] ) { + // Find the next relative operator (if any) for proper handling + j = ++i; + for ( ; j < len; j++ ) { + if ( Expr.relative[ tokens[j].type ] ) { + break; + } + } + return setMatcher( + i > 1 && elementMatcher( matchers ), + i > 1 && toSelector( + // If the preceding token was a descendant combinator, insert an implicit any-element `*` + tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" }) + ).replace( rtrim, "$1" ), + matcher, + i < j && matcherFromTokens( tokens.slice( i, j ) ), + j < len && matcherFromTokens( (tokens = tokens.slice( j )) ), + j < len && toSelector( tokens ) + ); + } + matchers.push( matcher ); + } + } + + return elementMatcher( matchers ); +} + +function matcherFromGroupMatchers( elementMatchers, setMatchers ) { + var bySet = setMatchers.length > 0, + byElement = elementMatchers.length > 0, + superMatcher = function( seed, context, xml, results, outermost ) { + var elem, j, matcher, + matchedCount = 0, + i = "0", + unmatched = seed && [], + setMatched = [], + contextBackup = outermostContext, + // We must always have either seed elements or outermost context + elems = seed || byElement && Expr.find["TAG"]( "*", outermost ), + // Use integer dirruns iff this is the outermost matcher + dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1), + len = elems.length; + + if ( outermost ) { + outermostContext = context !== document && context; + } + + // Add elements passing elementMatchers directly to results + // Keep `i` a string if there are no elements so `matchedCount` will be "00" below + // Support: IE<9, Safari + // Tolerate NodeList properties (IE: "length"; Safari: ) matching elements by id + for ( ; i !== len && (elem = elems[i]) != null; i++ ) { + if ( byElement && elem ) { + j = 0; + while ( (matcher = elementMatchers[j++]) ) { + if ( matcher( elem, context, xml ) ) { + results.push( elem ); + break; + } + } + if ( outermost ) { + dirruns = dirrunsUnique; + } + } + + // Track unmatched elements for set filters + if ( bySet ) { + // They will have gone through all possible matchers + if ( (elem = !matcher && elem) ) { + matchedCount--; + } + + // Lengthen the array for every element, matched or not + if ( seed ) { + unmatched.push( elem ); + } + } + } + + // Apply set filters to unmatched elements + matchedCount += i; + if ( bySet && i !== matchedCount ) { + j = 0; + while ( (matcher = setMatchers[j++]) ) { + matcher( unmatched, setMatched, context, xml ); + } + + if ( seed ) { + // Reintegrate element matches to eliminate the need for sorting + if ( matchedCount > 0 ) { + while ( i-- ) { + if ( !(unmatched[i] || setMatched[i]) ) { + setMatched[i] = pop.call( results ); + } + } + } + + // Discard index placeholder values to get only actual matches + setMatched = condense( setMatched ); + } + + // Add matches to results + push.apply( results, setMatched ); + + // Seedless set matches succeeding multiple successful matchers stipulate sorting + if ( outermost && !seed && setMatched.length > 0 && + ( matchedCount + setMatchers.length ) > 1 ) { + + Sizzle.uniqueSort( results ); + } + } + + // Override manipulation of globals by nested matchers + if ( outermost ) { + dirruns = dirrunsUnique; + outermostContext = contextBackup; + } + + return unmatched; + }; + + return bySet ? + markFunction( superMatcher ) : + superMatcher; +} + +compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) { + var i, + setMatchers = [], + elementMatchers = [], + cached = compilerCache[ selector + " " ]; + + if ( !cached ) { + // Generate a function of recursive functions that can be used to check each element + if ( !match ) { + match = tokenize( selector ); + } + i = match.length; + while ( i-- ) { + cached = matcherFromTokens( match[i] ); + if ( cached[ expando ] ) { + setMatchers.push( cached ); + } else { + elementMatchers.push( cached ); + } + } + + // Cache the compiled function + cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) ); + + // Save selector and tokenization + cached.selector = selector; + } + return cached; +}; + +/** + * A low-level selection function that works with Sizzle's compiled + * selector functions + * @param {String|Function} selector A selector or a pre-compiled + * selector function built with Sizzle.compile + * @param {Element} context + * @param {Array} [results] + * @param {Array} [seed] A set of elements to match against + */ +select = Sizzle.select = function( selector, context, results, seed ) { + var i, tokens, token, type, find, + compiled = typeof selector === "function" && selector, + match = !seed && tokenize( (selector = compiled.selector || selector) ); + + results = results || []; + + // Try to minimize operations if there is no seed and only one group + if ( match.length === 1 ) { + + // Take a shortcut and set the context if the root selector is an ID + tokens = match[0] = match[0].slice( 0 ); + if ( tokens.length > 2 && (token = tokens[0]).type === "ID" && + support.getById && context.nodeType === 9 && documentIsHTML && + Expr.relative[ tokens[1].type ] ) { + + context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0]; + if ( !context ) { + return results; + + // Precompiled matchers will still verify ancestry, so step up a level + } else if ( compiled ) { + context = context.parentNode; + } + + selector = selector.slice( tokens.shift().value.length ); + } + + // Fetch a seed set for right-to-left matching + i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length; + while ( i-- ) { + token = tokens[i]; + + // Abort if we hit a combinator + if ( Expr.relative[ (type = token.type) ] ) { + break; + } + if ( (find = Expr.find[ type ]) ) { + // Search, expanding context for leading sibling combinators + if ( (seed = find( + token.matches[0].replace( runescape, funescape ), + rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context + )) ) { + + // If seed is empty or no tokens remain, we can return early + tokens.splice( i, 1 ); + selector = seed.length && toSelector( tokens ); + if ( !selector ) { + push.apply( results, seed ); + return results; + } + + break; + } + } + } + } + + // Compile and execute a filtering function if one is not provided + // Provide `match` to avoid retokenization if we modified the selector above + ( compiled || compile( selector, match ) )( + seed, + context, + !documentIsHTML, + results, + rsibling.test( selector ) && testContext( context.parentNode ) || context + ); + return results; +}; + +// One-time assignments + +// Sort stability +support.sortStable = expando.split("").sort( sortOrder ).join("") === expando; + +// Support: Chrome 14-35+ +// Always assume duplicates if they aren't passed to the comparison function +support.detectDuplicates = !!hasDuplicate; + +// Initialize against the default document +setDocument(); + +// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27) +// Detached nodes confoundingly follow *each other* +support.sortDetached = assert(function( div1 ) { + // Should return 1, but returns 4 (following) + return div1.compareDocumentPosition( document.createElement("div") ) & 1; +}); + +// Support: IE<8 +// Prevent attribute/property "interpolation" +// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx +if ( !assert(function( div ) { + div.innerHTML = ""; + return div.firstChild.getAttribute("href") === "#" ; +}) ) { + addHandle( "type|href|height|width", function( elem, name, isXML ) { + if ( !isXML ) { + return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 ); + } + }); +} + +// Support: IE<9 +// Use defaultValue in place of getAttribute("value") +if ( !support.attributes || !assert(function( div ) { + div.innerHTML = ""; + div.firstChild.setAttribute( "value", "" ); + return div.firstChild.getAttribute( "value" ) === ""; +}) ) { + addHandle( "value", function( elem, name, isXML ) { + if ( !isXML && elem.nodeName.toLowerCase() === "input" ) { + return elem.defaultValue; + } + }); +} + +// Support: IE<9 +// Use getAttributeNode to fetch booleans when getAttribute lies +if ( !assert(function( div ) { + return div.getAttribute("disabled") == null; +}) ) { + addHandle( booleans, function( elem, name, isXML ) { + var val; + if ( !isXML ) { + return elem[ name ] === true ? name.toLowerCase() : + (val = elem.getAttributeNode( name )) && val.specified ? + val.value : + null; + } + }); +} + +return Sizzle; + +})( window ); + + + +jQuery.find = Sizzle; +jQuery.expr = Sizzle.selectors; +jQuery.expr[":"] = jQuery.expr.pseudos; +jQuery.unique = Sizzle.uniqueSort; +jQuery.text = Sizzle.getText; +jQuery.isXMLDoc = Sizzle.isXML; +jQuery.contains = Sizzle.contains; + + + +var rneedsContext = jQuery.expr.match.needsContext; + +var rsingleTag = (/^<(\w+)\s*\/?>(?:<\/\1>|)$/); + + + +var risSimple = /^.[^:#\[\.,]*$/; + +// Implement the identical functionality for filter and not +function winnow( elements, qualifier, not ) { + if ( jQuery.isFunction( qualifier ) ) { + return jQuery.grep( elements, function( elem, i ) { + /* jshint -W018 */ + return !!qualifier.call( elem, i, elem ) !== not; + }); + + } + + if ( qualifier.nodeType ) { + return jQuery.grep( elements, function( elem ) { + return ( elem === qualifier ) !== not; + }); + + } + + if ( typeof qualifier === "string" ) { + if ( risSimple.test( qualifier ) ) { + return jQuery.filter( qualifier, elements, not ); + } + + qualifier = jQuery.filter( qualifier, elements ); + } + + return jQuery.grep( elements, function( elem ) { + return ( indexOf.call( qualifier, elem ) >= 0 ) !== not; + }); +} + +jQuery.filter = function( expr, elems, not ) { + var elem = elems[ 0 ]; + + if ( not ) { + expr = ":not(" + expr + ")"; + } + + return elems.length === 1 && elem.nodeType === 1 ? + jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] : + jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) { + return elem.nodeType === 1; + })); +}; + +jQuery.fn.extend({ + find: function( selector ) { + var i, + len = this.length, + ret = [], + self = this; + + if ( typeof selector !== "string" ) { + return this.pushStack( jQuery( selector ).filter(function() { + for ( i = 0; i < len; i++ ) { + if ( jQuery.contains( self[ i ], this ) ) { + return true; + } + } + }) ); + } + + for ( i = 0; i < len; i++ ) { + jQuery.find( selector, self[ i ], ret ); + } + + // Needed because $( selector, context ) becomes $( context ).find( selector ) + ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret ); + ret.selector = this.selector ? this.selector + " " + selector : selector; + return ret; + }, + filter: function( selector ) { + return this.pushStack( winnow(this, selector || [], false) ); + }, + not: function( selector ) { + return this.pushStack( winnow(this, selector || [], true) ); + }, + is: function( selector ) { + return !!winnow( + this, + + // If this is a positional/relative selector, check membership in the returned set + // so $("p:first").is("p:last") won't return true for a doc with two "p". + typeof selector === "string" && rneedsContext.test( selector ) ? + jQuery( selector ) : + selector || [], + false + ).length; + } +}); + + +// Initialize a jQuery object + + +// A central reference to the root jQuery(document) +var rootjQuery, + + // A simple way to check for HTML strings + // Prioritize #id over to avoid XSS via location.hash (#9521) + // Strict HTML recognition (#11290: must start with <) + rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/, + + init = jQuery.fn.init = function( selector, context ) { + var match, elem; + + // HANDLE: $(""), $(null), $(undefined), $(false) + if ( !selector ) { + return this; + } + + // Handle HTML strings + if ( typeof selector === "string" ) { + if ( selector[0] === "<" && selector[ 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 = rquickExpr.exec( selector ); + } + + // Match html or make sure no context is specified for #id + if ( match && (match[1] || !context) ) { + + // HANDLE: $(html) -> $(array) + if ( match[1] ) { + context = context instanceof jQuery ? context[0] : context; + + // Option to run scripts is true for back-compat + // Intentionally let the error be thrown if parseHTML is not present + jQuery.merge( this, jQuery.parseHTML( + match[1], + context && context.nodeType ? context.ownerDocument || context : document, + true + ) ); + + // HANDLE: $(html, props) + if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) { + for ( match in context ) { + // Properties of context are called as methods if possible + if ( jQuery.isFunction( this[ match ] ) ) { + this[ match ]( context[ match ] ); + + // ...and otherwise set as attributes + } else { + this.attr( match, context[ match ] ); + } + } + } + + return this; + + // HANDLE: $(#id) + } else { + elem = document.getElementById( match[2] ); + + // Support: Blackberry 4.6 + // gEBID returns nodes no longer in the document (#6963) + if ( elem && elem.parentNode ) { + // Inject the element directly into the jQuery object + this.length = 1; + this[0] = elem; + } + + this.context = document; + this.selector = selector; + return this; + } + + // HANDLE: $(expr, $(...)) + } else if ( !context || context.jquery ) { + return ( context || rootjQuery ).find( selector ); + + // HANDLE: $(expr, context) + // (which is just equivalent to: $(context).find(expr) + } else { + return this.constructor( context ).find( selector ); + } + + // HANDLE: $(DOMElement) + } else if ( selector.nodeType ) { + this.context = this[0] = selector; + this.length = 1; + return this; + + // HANDLE: $(function) + // Shortcut for document ready + } else if ( jQuery.isFunction( selector ) ) { + return typeof rootjQuery.ready !== "undefined" ? + rootjQuery.ready( selector ) : + // Execute immediately if ready is not present + selector( jQuery ); + } + + if ( selector.selector !== undefined ) { + this.selector = selector.selector; + this.context = selector.context; + } + + return jQuery.makeArray( selector, this ); + }; + +// Give the init function the jQuery prototype for later instantiation +init.prototype = jQuery.fn; + +// Initialize central reference +rootjQuery = jQuery( document ); + + +var rparentsprev = /^(?:parents|prev(?:Until|All))/, + // Methods guaranteed to produce a unique set when starting from a unique set + guaranteedUnique = { + children: true, + contents: true, + next: true, + prev: true + }; + +jQuery.extend({ + dir: function( elem, dir, until ) { + var matched = [], + truncate = until !== undefined; + + while ( (elem = elem[ dir ]) && elem.nodeType !== 9 ) { + if ( elem.nodeType === 1 ) { + if ( truncate && jQuery( elem ).is( until ) ) { + break; + } + matched.push( elem ); + } + } + return matched; + }, + + sibling: function( n, elem ) { + var matched = []; + + for ( ; n; n = n.nextSibling ) { + if ( n.nodeType === 1 && n !== elem ) { + matched.push( n ); + } + } + + return matched; + } +}); + +jQuery.fn.extend({ + has: function( target ) { + var targets = jQuery( target, this ), + l = targets.length; + + return this.filter(function() { + var i = 0; + for ( ; i < l; i++ ) { + if ( jQuery.contains( this, targets[i] ) ) { + return true; + } + } + }); + }, + + closest: function( selectors, context ) { + var cur, + i = 0, + l = this.length, + matched = [], + pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ? + jQuery( selectors, context || this.context ) : + 0; + + for ( ; i < l; i++ ) { + for ( cur = this[i]; cur && cur !== context; cur = cur.parentNode ) { + // Always skip document fragments + if ( cur.nodeType < 11 && (pos ? + pos.index(cur) > -1 : + + // Don't pass non-elements to Sizzle + cur.nodeType === 1 && + jQuery.find.matchesSelector(cur, selectors)) ) { + + matched.push( cur ); + break; + } + } + } + + return this.pushStack( matched.length > 1 ? jQuery.unique( matched ) : matched ); + }, + + // Determine the position of an element within the set + index: function( elem ) { + + // No argument, return index in parent + if ( !elem ) { + return ( this[ 0 ] && this[ 0 ].parentNode ) ? this.first().prevAll().length : -1; + } + + // Index in selector + if ( typeof elem === "string" ) { + return indexOf.call( jQuery( elem ), this[ 0 ] ); + } + + // Locate the position of the desired element + return indexOf.call( this, + + // If it receives a jQuery object, the first element is used + elem.jquery ? elem[ 0 ] : elem + ); + }, + + add: function( selector, context ) { + return this.pushStack( + jQuery.unique( + jQuery.merge( this.get(), jQuery( selector, context ) ) + ) + ); + }, + + addBack: function( selector ) { + return this.add( selector == null ? + this.prevObject : this.prevObject.filter(selector) + ); + } +}); + +function sibling( cur, dir ) { + while ( (cur = cur[dir]) && cur.nodeType !== 1 ) {} + return cur; +} + +jQuery.each({ + parent: function( elem ) { + var parent = elem.parentNode; + return parent && parent.nodeType !== 11 ? parent : null; + }, + parents: function( elem ) { + return jQuery.dir( elem, "parentNode" ); + }, + parentsUntil: function( elem, i, until ) { + return jQuery.dir( elem, "parentNode", until ); + }, + next: function( elem ) { + return sibling( elem, "nextSibling" ); + }, + prev: function( elem ) { + return sibling( elem, "previousSibling" ); + }, + nextAll: function( elem ) { + return jQuery.dir( elem, "nextSibling" ); + }, + prevAll: function( elem ) { + return jQuery.dir( elem, "previousSibling" ); + }, + nextUntil: function( elem, i, until ) { + return jQuery.dir( elem, "nextSibling", until ); + }, + prevUntil: function( elem, i, until ) { + return jQuery.dir( elem, "previousSibling", until ); + }, + siblings: function( elem ) { + return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem ); + }, + children: function( elem ) { + return jQuery.sibling( elem.firstChild ); + }, + contents: function( elem ) { + return elem.contentDocument || jQuery.merge( [], elem.childNodes ); + } +}, function( name, fn ) { + jQuery.fn[ name ] = function( until, selector ) { + var matched = jQuery.map( this, fn, until ); + + if ( name.slice( -5 ) !== "Until" ) { + selector = until; + } + + if ( selector && typeof selector === "string" ) { + matched = jQuery.filter( selector, matched ); + } + + if ( this.length > 1 ) { + // Remove duplicates + if ( !guaranteedUnique[ name ] ) { + jQuery.unique( matched ); + } + + // Reverse order for parents* and prev-derivatives + if ( rparentsprev.test( name ) ) { + matched.reverse(); + } + } + + return this.pushStack( matched ); + }; +}); +var rnotwhite = (/\S+/g); + + + +// String to Object options format cache +var optionsCache = {}; + +// Convert String-formatted options into Object-formatted ones and store in cache +function createOptions( options ) { + var object = optionsCache[ options ] = {}; + jQuery.each( options.match( rnotwhite ) || [], function( _, flag ) { + object[ flag ] = true; + }); + return object; +} + +/* + * Create a callback list using the following parameters: + * + * options: an optional list of space-separated options that will change how + * the callback list behaves or a more traditional option object + * + * By default a callback list will act like an event callback list and can be + * "fired" multiple times. + * + * Possible options: + * + * 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( options ) { + + // Convert options from String-formatted to Object-formatted if needed + // (we check in cache first) + options = typeof options === "string" ? + ( optionsCache[ options ] || createOptions( options ) ) : + jQuery.extend( {}, options ); + + var // 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, + // Actual callback list + list = [], + // Stack of fire calls for repeatable lists + stack = !options.once && [], + // Fire callbacks + fire = function( data ) { + memory = options.memory && data; + fired = true; + firingIndex = firingStart || 0; + firingStart = 0; + firingLength = list.length; + firing = true; + for ( ; list && firingIndex < firingLength; firingIndex++ ) { + if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) { + memory = false; // To prevent further calls using add + break; + } + } + firing = false; + if ( list ) { + if ( stack ) { + if ( stack.length ) { + fire( stack.shift() ); + } + } else if ( memory ) { + list = []; + } else { + self.disable(); + } + } + }, + // Actual Callbacks object + self = { + // Add a callback or a collection of callbacks to the list + add: function() { + if ( list ) { + // First, we save the current length + var start = list.length; + (function add( args ) { + jQuery.each( args, function( _, arg ) { + var type = jQuery.type( arg ); + if ( type === "function" ) { + if ( !options.unique || !self.has( arg ) ) { + list.push( arg ); + } + } else if ( arg && arg.length && type !== "string" ) { + // Inspect recursively + add( arg ); + } + }); + })( 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 + } else if ( memory ) { + firingStart = start; + fire( memory ); + } + } + return this; + }, + // Remove a callback from the list + remove: function() { + if ( list ) { + jQuery.each( arguments, function( _, arg ) { + var index; + while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) { + list.splice( index, 1 ); + // Handle firing indexes + if ( firing ) { + if ( index <= firingLength ) { + firingLength--; + } + if ( index <= firingIndex ) { + firingIndex--; + } + } + } + }); + } + return this; + }, + // Check if a given callback is in the list. + // If no argument is given, return whether or not list has callbacks attached. + has: function( fn ) { + return fn ? jQuery.inArray( fn, list ) > -1 : !!( list && list.length ); + }, + // Remove all callbacks from the list + empty: function() { + list = []; + firingLength = 0; + 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 ) { + 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 ( list && ( !fired || stack ) ) { + args = args || []; + args = [ context, args.slice ? args.slice() : args ]; + if ( firing ) { + stack.push( args ); + } else { + fire( 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; +}; + + +jQuery.extend({ + + Deferred: function( func ) { + var tuples = [ + // action, add listener, listener list, final state + [ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ], + [ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ], + [ "notify", "progress", jQuery.Callbacks("memory") ] + ], + state = "pending", + promise = { + state: function() { + return state; + }, + always: function() { + deferred.done( arguments ).fail( arguments ); + return this; + }, + then: function( /* fnDone, fnFail, fnProgress */ ) { + var fns = arguments; + return jQuery.Deferred(function( newDefer ) { + jQuery.each( tuples, function( i, tuple ) { + var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ]; + // deferred[ done | fail | progress ] for forwarding actions to newDefer + deferred[ tuple[1] ](function() { + var returned = fn && fn.apply( this, arguments ); + if ( returned && jQuery.isFunction( returned.promise ) ) { + returned.promise() + .done( newDefer.resolve ) + .fail( newDefer.reject ) + .progress( newDefer.notify ); + } else { + newDefer[ tuple[ 0 ] + "With" ]( this === promise ? newDefer.promise() : this, fn ? [ returned ] : arguments ); + } + }); + }); + fns = null; + }).promise(); + }, + // Get a promise for this deferred + // If obj is provided, the promise aspect is added to the object + promise: function( obj ) { + return obj != null ? jQuery.extend( obj, promise ) : promise; + } + }, + deferred = {}; + + // Keep pipe for back-compat + promise.pipe = promise.then; + + // Add list-specific methods + jQuery.each( tuples, function( i, tuple ) { + var list = tuple[ 2 ], + stateString = tuple[ 3 ]; + + // promise[ done | fail | progress ] = list.add + promise[ tuple[1] ] = list.add; + + // Handle state + if ( stateString ) { + list.add(function() { + // state = [ resolved | rejected ] + state = stateString; + + // [ reject_list | resolve_list ].disable; progress_list.lock + }, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock ); + } + + // deferred[ resolve | reject | notify ] + deferred[ tuple[0] ] = function() { + deferred[ tuple[0] + "With" ]( this === deferred ? promise : this, arguments ); + return this; + }; + deferred[ tuple[0] + "With" ] = list.fireWith; + }); + + // Make the deferred a promise + promise.promise( deferred ); + + // Call given func if any + if ( func ) { + func.call( deferred, deferred ); + } + + // All done! + return deferred; + }, + + // Deferred helper + when: function( subordinate /* , ..., subordinateN */ ) { + var i = 0, + resolveValues = slice.call( arguments ), + length = resolveValues.length, + + // the count of uncompleted subordinates + remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0, + + // the master Deferred. If resolveValues consist of only a single Deferred, just use that. + deferred = remaining === 1 ? subordinate : jQuery.Deferred(), + + // Update function for both resolve and progress values + updateFunc = function( i, contexts, values ) { + return function( value ) { + contexts[ i ] = this; + values[ i ] = arguments.length > 1 ? slice.call( arguments ) : value; + if ( values === progressValues ) { + deferred.notifyWith( contexts, values ); + } else if ( !( --remaining ) ) { + deferred.resolveWith( contexts, values ); + } + }; + }, + + progressValues, progressContexts, resolveContexts; + + // Add listeners to Deferred subordinates; treat others as resolved + if ( length > 1 ) { + progressValues = new Array( length ); + progressContexts = new Array( length ); + resolveContexts = new Array( length ); + for ( ; i < length; i++ ) { + if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) { + resolveValues[ i ].promise() + .done( updateFunc( i, resolveContexts, resolveValues ) ) + .fail( deferred.reject ) + .progress( updateFunc( i, progressContexts, progressValues ) ); + } else { + --remaining; + } + } + } + + // If we're not waiting on anything, resolve the master + if ( !remaining ) { + deferred.resolveWith( resolveContexts, resolveValues ); + } + + return deferred.promise(); + } +}); + + +// The deferred used on DOM ready +var readyList; + +jQuery.fn.ready = function( fn ) { + // Add the callback + jQuery.ready.promise().done( fn ); + + return this; +}; + +jQuery.extend({ + // Is the DOM ready to be used? Set to true once it occurs. + isReady: false, + + // A counter to track how many items to wait for before + // the ready event fires. See #6781 + readyWait: 1, + + // Hold (or release) the ready event + holdReady: function( hold ) { + if ( hold ) { + jQuery.readyWait++; + } else { + jQuery.ready( true ); + } + }, + + // Handle when the DOM is ready + ready: function( wait ) { + + // Abort if there are pending holds or we're already ready + if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) { + return; + } + + // Remember that the DOM is ready + jQuery.isReady = true; + + // If a normal DOM Ready event fired, decrement, and wait if need be + if ( wait !== true && --jQuery.readyWait > 0 ) { + return; + } + + // If there are functions bound, to execute + readyList.resolveWith( document, [ jQuery ] ); + + // Trigger any bound ready events + if ( jQuery.fn.triggerHandler ) { + jQuery( document ).triggerHandler( "ready" ); + jQuery( document ).off( "ready" ); + } + } +}); + +/** + * The ready event handler and self cleanup method + */ +function completed() { + document.removeEventListener( "DOMContentLoaded", completed, false ); + window.removeEventListener( "load", completed, false ); + jQuery.ready(); +} + +jQuery.ready.promise = function( obj ) { + if ( !readyList ) { + + readyList = jQuery.Deferred(); + + // Catch cases where $(document).ready() is called after the browser event has already occurred. + // We once tried to use readyState "interactive" here, but it caused issues like the one + // discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15 + if ( document.readyState === "complete" ) { + // Handle it asynchronously to allow scripts the opportunity to delay ready + setTimeout( jQuery.ready ); + + } else { + + // Use the handy event callback + document.addEventListener( "DOMContentLoaded", completed, false ); + + // A fallback to window.onload, that will always work + window.addEventListener( "load", completed, false ); + } + } + return readyList.promise( obj ); +}; + +// Kick off the DOM ready check even if the user does not +jQuery.ready.promise(); + + + + +// Multifunctional method to get and set values of a collection +// The value/s can optionally be executed if it's a function +var access = jQuery.access = function( elems, fn, key, value, chainable, emptyGet, raw ) { + var i = 0, + len = elems.length, + bulk = key == null; + + // Sets many values + if ( jQuery.type( key ) === "object" ) { + chainable = true; + for ( i in key ) { + jQuery.access( elems, fn, i, key[i], true, emptyGet, raw ); + } + + // Sets one value + } else if ( value !== undefined ) { + chainable = true; + + if ( !jQuery.isFunction( value ) ) { + raw = true; + } + + if ( bulk ) { + // Bulk operations run against the entire set + if ( raw ) { + fn.call( elems, value ); + fn = null; + + // ...except when executing function values + } else { + bulk = fn; + fn = function( elem, key, value ) { + return bulk.call( jQuery( elem ), value ); + }; + } + } + + if ( fn ) { + for ( ; i < len; i++ ) { + fn( elems[i], key, raw ? value : value.call( elems[i], i, fn( elems[i], key ) ) ); + } + } + } + + return chainable ? + elems : + + // Gets + bulk ? + fn.call( elems ) : + len ? fn( elems[0], key ) : emptyGet; +}; + + +/** + * Determines whether an object can have data + */ +jQuery.acceptData = function( owner ) { + // Accepts only: + // - Node + // - Node.ELEMENT_NODE + // - Node.DOCUMENT_NODE + // - Object + // - Any + /* jshint -W018 */ + return owner.nodeType === 1 || owner.nodeType === 9 || !( +owner.nodeType ); +}; + + +function Data() { + // Support: Android<4, + // Old WebKit does not have Object.preventExtensions/freeze method, + // return new empty object instead with no [[set]] accessor + Object.defineProperty( this.cache = {}, 0, { + get: function() { + return {}; + } + }); + + this.expando = jQuery.expando + Data.uid++; +} + +Data.uid = 1; +Data.accepts = jQuery.acceptData; + +Data.prototype = { + key: function( owner ) { + // We can accept data for non-element nodes in modern browsers, + // but we should not, see #8335. + // Always return the key for a frozen object. + if ( !Data.accepts( owner ) ) { + return 0; + } + + var descriptor = {}, + // Check if the owner object already has a cache key + unlock = owner[ this.expando ]; + + // If not, create one + if ( !unlock ) { + unlock = Data.uid++; + + // Secure it in a non-enumerable, non-writable property + try { + descriptor[ this.expando ] = { value: unlock }; + Object.defineProperties( owner, descriptor ); + + // Support: Android<4 + // Fallback to a less secure definition + } catch ( e ) { + descriptor[ this.expando ] = unlock; + jQuery.extend( owner, descriptor ); + } + } + + // Ensure the cache object + if ( !this.cache[ unlock ] ) { + this.cache[ unlock ] = {}; + } + + return unlock; + }, + set: function( owner, data, value ) { + var prop, + // There may be an unlock assigned to this node, + // if there is no entry for this "owner", create one inline + // and set the unlock as though an owner entry had always existed + unlock = this.key( owner ), + cache = this.cache[ unlock ]; + + // Handle: [ owner, key, value ] args + if ( typeof data === "string" ) { + cache[ data ] = value; + + // Handle: [ owner, { properties } ] args + } else { + // Fresh assignments by object are shallow copied + if ( jQuery.isEmptyObject( cache ) ) { + jQuery.extend( this.cache[ unlock ], data ); + // Otherwise, copy the properties one-by-one to the cache object + } else { + for ( prop in data ) { + cache[ prop ] = data[ prop ]; + } + } + } + return cache; + }, + get: function( owner, key ) { + // Either a valid cache is found, or will be created. + // New caches will be created and the unlock returned, + // allowing direct access to the newly created + // empty data object. A valid owner object must be provided. + var cache = this.cache[ this.key( owner ) ]; + + return key === undefined ? + cache : cache[ key ]; + }, + access: function( owner, key, value ) { + var stored; + // In cases where either: + // + // 1. No key was specified + // 2. A string key was specified, but no value provided + // + // Take the "read" path and allow the get method to determine + // which value to return, respectively either: + // + // 1. The entire cache object + // 2. The data stored at the key + // + if ( key === undefined || + ((key && typeof key === "string") && value === undefined) ) { + + stored = this.get( owner, key ); + + return stored !== undefined ? + stored : this.get( owner, jQuery.camelCase(key) ); + } + + // [*]When the key is not a string, or both a key and value + // are specified, set or extend (existing objects) with either: + // + // 1. An object of properties + // 2. A key and value + // + this.set( owner, key, value ); + + // Since the "set" path can have two possible entry points + // return the expected data based on which path was taken[*] + return value !== undefined ? value : key; + }, + remove: function( owner, key ) { + var i, name, camel, + unlock = this.key( owner ), + cache = this.cache[ unlock ]; + + if ( key === undefined ) { + this.cache[ unlock ] = {}; + + } else { + // Support array or space separated string of keys + if ( jQuery.isArray( key ) ) { + // If "name" is an array of keys... + // When data is initially created, via ("key", "val") signature, + // keys will be converted to camelCase. + // Since there is no way to tell _how_ a key was added, remove + // both plain key and camelCase key. #12786 + // This will only penalize the array argument path. + name = key.concat( key.map( jQuery.camelCase ) ); + } else { + camel = jQuery.camelCase( key ); + // Try the string as a key before any manipulation + if ( key in cache ) { + name = [ key, camel ]; + } else { + // If a key with the spaces exists, use it. + // Otherwise, create an array by matching non-whitespace + name = camel; + name = name in cache ? + [ name ] : ( name.match( rnotwhite ) || [] ); + } + } + + i = name.length; + while ( i-- ) { + delete cache[ name[ i ] ]; + } + } + }, + hasData: function( owner ) { + return !jQuery.isEmptyObject( + this.cache[ owner[ this.expando ] ] || {} + ); + }, + discard: function( owner ) { + if ( owner[ this.expando ] ) { + delete this.cache[ owner[ this.expando ] ]; + } + } +}; +var data_priv = new Data(); + +var data_user = new Data(); + + + +// Implementation Summary +// +// 1. Enforce API surface and semantic compatibility with 1.9.x branch +// 2. Improve the module's maintainability by reducing the storage +// paths to a single mechanism. +// 3. Use the same single mechanism to support "private" and "user" data. +// 4. _Never_ expose "private" data to user code (TODO: Drop _data, _removeData) +// 5. Avoid exposing implementation details on user objects (eg. expando properties) +// 6. Provide a clear path for implementation upgrade to WeakMap in 2014 + +var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/, + rmultiDash = /([A-Z])/g; + +function dataAttr( elem, key, data ) { + var name; + + // If nothing was found internally, try to fetch any + // data from the HTML5 data-* attribute + if ( data === undefined && elem.nodeType === 1 ) { + 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 : + // Only convert to a number if it doesn't change the string + +data + "" === data ? +data : + rbrace.test( data ) ? jQuery.parseJSON( data ) : + data; + } catch( e ) {} + + // Make sure we set the data so it isn't changed later + data_user.set( elem, key, data ); + } else { + data = undefined; + } + } + return data; +} + +jQuery.extend({ + hasData: function( elem ) { + return data_user.hasData( elem ) || data_priv.hasData( elem ); + }, + + data: function( elem, name, data ) { + return data_user.access( elem, name, data ); + }, + + removeData: function( elem, name ) { + data_user.remove( elem, name ); + }, + + // TODO: Now that all calls to _data and _removeData have been replaced + // with direct calls to data_priv methods, these can be deprecated. + _data: function( elem, name, data ) { + return data_priv.access( elem, name, data ); + }, + + _removeData: function( elem, name ) { + data_priv.remove( elem, name ); + } +}); + +jQuery.fn.extend({ + data: function( key, value ) { + var i, name, data, + elem = this[ 0 ], + attrs = elem && elem.attributes; + + // Gets all values + if ( key === undefined ) { + if ( this.length ) { + data = data_user.get( elem ); + + if ( elem.nodeType === 1 && !data_priv.get( elem, "hasDataAttrs" ) ) { + i = attrs.length; + while ( i-- ) { + + // Support: IE11+ + // The attrs elements can be null (#14894) + if ( attrs[ i ] ) { + name = attrs[ i ].name; + if ( name.indexOf( "data-" ) === 0 ) { + name = jQuery.camelCase( name.slice(5) ); + dataAttr( elem, name, data[ name ] ); + } + } + } + data_priv.set( elem, "hasDataAttrs", true ); + } + } + + return data; + } + + // Sets multiple values + if ( typeof key === "object" ) { + return this.each(function() { + data_user.set( this, key ); + }); + } + + return access( this, function( value ) { + var data, + camelKey = jQuery.camelCase( key ); + + // The calling jQuery object (element matches) is not empty + // (and therefore has an element appears at this[ 0 ]) and the + // `value` parameter was not undefined. An empty jQuery object + // will result in `undefined` for elem = this[ 0 ] which will + // throw an exception if an attempt to read a data cache is made. + if ( elem && value === undefined ) { + // Attempt to get data from the cache + // with the key as-is + data = data_user.get( elem, key ); + if ( data !== undefined ) { + return data; + } + + // Attempt to get data from the cache + // with the key camelized + data = data_user.get( elem, camelKey ); + if ( data !== undefined ) { + return data; + } + + // Attempt to "discover" the data in + // HTML5 custom data-* attrs + data = dataAttr( elem, camelKey, undefined ); + if ( data !== undefined ) { + return data; + } + + // We tried really hard, but the data doesn't exist. + return; + } + + // Set the data... + this.each(function() { + // First, attempt to store a copy or reference of any + // data that might've been store with a camelCased key. + var data = data_user.get( this, camelKey ); + + // For HTML5 data-* attribute interop, we have to + // store property names with dashes in a camelCase form. + // This might not apply to all properties...* + data_user.set( this, camelKey, value ); + + // *... In the case of properties that might _actually_ + // have dashes, we need to also store a copy of that + // unchanged property. + if ( key.indexOf("-") !== -1 && data !== undefined ) { + data_user.set( this, key, value ); + } + }); + }, null, value, arguments.length > 1, null, true ); + }, + + removeData: function( key ) { + return this.each(function() { + data_user.remove( this, key ); + }); + } +}); + + +jQuery.extend({ + queue: function( elem, type, data ) { + var queue; + + if ( elem ) { + type = ( type || "fx" ) + "queue"; + queue = data_priv.get( elem, type ); + + // Speed up dequeue by getting out quickly if this is just a lookup + if ( data ) { + if ( !queue || jQuery.isArray( data ) ) { + queue = data_priv.access( elem, type, jQuery.makeArray(data) ); + } else { + queue.push( data ); + } + } + return queue || []; + } + }, + + dequeue: function( elem, type ) { + type = type || "fx"; + + var queue = jQuery.queue( elem, type ), + startLength = queue.length, + fn = queue.shift(), + hooks = jQuery._queueHooks( elem, type ), + next = function() { + jQuery.dequeue( elem, type ); + }; + + // If the fx queue is dequeued, always remove the progress sentinel + if ( fn === "inprogress" ) { + fn = queue.shift(); + startLength--; + } + + if ( fn ) { + + // Add a progress sentinel to prevent the fx queue from being + // automatically dequeued + if ( type === "fx" ) { + queue.unshift( "inprogress" ); + } + + // Clear up the last queue stop function + delete hooks.stop; + fn.call( elem, next, hooks ); + } + + if ( !startLength && hooks ) { + hooks.empty.fire(); + } + }, + + // Not public - generate a queueHooks object, or return the current one + _queueHooks: function( elem, type ) { + var key = type + "queueHooks"; + return data_priv.get( elem, key ) || data_priv.access( elem, key, { + empty: jQuery.Callbacks("once memory").add(function() { + data_priv.remove( elem, [ type + "queue", key ] ); + }) + }); + } +}); + +jQuery.fn.extend({ + queue: function( type, data ) { + var setter = 2; + + if ( typeof type !== "string" ) { + data = type; + type = "fx"; + setter--; + } + + if ( arguments.length < setter ) { + return jQuery.queue( this[0], type ); + } + + return data === undefined ? + this : + this.each(function() { + var queue = jQuery.queue( this, type, data ); + + // Ensure a hooks for this queue + jQuery._queueHooks( this, type ); + + if ( type === "fx" && queue[0] !== "inprogress" ) { + jQuery.dequeue( this, type ); + } + }); + }, + dequeue: function( type ) { + return this.each(function() { + jQuery.dequeue( this, type ); + }); + }, + 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, obj ) { + var tmp, + count = 1, + defer = jQuery.Deferred(), + elements = this, + i = this.length, + resolve = function() { + if ( !( --count ) ) { + defer.resolveWith( elements, [ elements ] ); + } + }; + + if ( typeof type !== "string" ) { + obj = type; + type = undefined; + } + type = type || "fx"; + + while ( i-- ) { + tmp = data_priv.get( elements[ i ], type + "queueHooks" ); + if ( tmp && tmp.empty ) { + count++; + tmp.empty.add( resolve ); + } + } + resolve(); + return defer.promise( obj ); + } +}); +var pnum = (/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/).source; + +var cssExpand = [ "Top", "Right", "Bottom", "Left" ]; + +var isHidden = function( elem, el ) { + // isHidden might be called from jQuery#filter function; + // in that case, element will be second argument + elem = el || elem; + return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem ); + }; + +var rcheckableType = (/^(?:checkbox|radio)$/i); + + + +(function() { + var fragment = document.createDocumentFragment(), + div = fragment.appendChild( document.createElement( "div" ) ), + input = document.createElement( "input" ); + + // Support: Safari<=5.1 + // Check state lost if the name is set (#11217) + // Support: Windows Web Apps (WWA) + // `name` and `type` must use .setAttribute for WWA (#14901) + input.setAttribute( "type", "radio" ); + input.setAttribute( "checked", "checked" ); + input.setAttribute( "name", "t" ); + + div.appendChild( input ); + + // Support: Safari<=5.1, Android<4.2 + // Older WebKit doesn't clone checked state correctly in fragments + support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked; + + // Support: IE<=11+ + // Make sure textarea (and checkbox) defaultValue is properly cloned + div.innerHTML = ""; + support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue; +})(); +var strundefined = typeof undefined; + + + +support.focusinBubbles = "onfocusin" in window; + + +var + rkeyEvent = /^key/, + rmouseEvent = /^(?:mouse|pointer|contextmenu)|click/, + rfocusMorph = /^(?:focusinfocus|focusoutblur)$/, + rtypenamespace = /^([^.]*)(?:\.(.+)|)$/; + +function returnTrue() { + return true; +} + +function returnFalse() { + return false; +} + +function safeActiveElement() { + try { + return document.activeElement; + } catch ( err ) { } +} + +/* + * Helper functions for managing events -- not part of the public interface. + * Props to Dean Edwards' addEvent library for many of the ideas. + */ +jQuery.event = { + + global: {}, + + add: function( elem, types, handler, data, selector ) { + + var handleObjIn, eventHandle, tmp, + events, t, handleObj, + special, handlers, type, namespaces, origType, + elemData = data_priv.get( elem ); + + // Don't attach events to noData or text/comment nodes (but allow plain objects) + if ( !elemData ) { + return; + } + + // Caller can pass in an object of custom data in lieu of the handler + if ( handler.handler ) { + handleObjIn = handler; + handler = handleObjIn.handler; + selector = handleObjIn.selector; + } + + // Make sure that the handler has a unique ID, used to find/remove it later + if ( !handler.guid ) { + handler.guid = jQuery.guid++; + } + + // Init the element's event structure and main handler, if this is the first + if ( !(events = elemData.events) ) { + events = elemData.events = {}; + } + if ( !(eventHandle = elemData.handle) ) { + eventHandle = elemData.handle = 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 !== strundefined && jQuery.event.triggered !== e.type ? + jQuery.event.dispatch.apply( elem, arguments ) : undefined; + }; + } + + // Handle multiple events separated by a space + types = ( types || "" ).match( rnotwhite ) || [ "" ]; + t = types.length; + while ( t-- ) { + tmp = rtypenamespace.exec( types[t] ) || []; + type = origType = tmp[1]; + namespaces = ( tmp[2] || "" ).split( "." ).sort(); + + // There *must* be a type, no attaching namespace-only handlers + if ( !type ) { + continue; + } + + // If event changes its type, use the special event handlers for the changed type + special = jQuery.event.special[ type ] || {}; + + // If selector defined, determine special event api type, otherwise given type + type = ( selector ? special.delegateType : special.bindType ) || type; + + // Update special based on newly reset type + special = jQuery.event.special[ type ] || {}; + + // handleObj is passed to all event handlers + handleObj = jQuery.extend({ + type: type, + origType: origType, + data: data, + handler: handler, + guid: handler.guid, + selector: selector, + needsContext: selector && jQuery.expr.match.needsContext.test( selector ), + namespace: namespaces.join(".") + }, handleObjIn ); + + // Init the event handler queue if we're the first + if ( !(handlers = events[ type ]) ) { + handlers = events[ type ] = []; + handlers.delegateCount = 0; + + // Only use addEventListener if the special events handler returns false + if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) { + if ( elem.addEventListener ) { + elem.addEventListener( type, eventHandle, false ); + } + } + } + + if ( special.add ) { + special.add.call( elem, handleObj ); + + if ( !handleObj.handler.guid ) { + handleObj.handler.guid = handler.guid; + } + } + + // Add to the element's handler list, delegates in front + if ( selector ) { + handlers.splice( handlers.delegateCount++, 0, handleObj ); + } else { + handlers.push( handleObj ); + } + + // Keep track of which events have ever been used, for event optimization + jQuery.event.global[ type ] = true; + } + + }, + + // Detach an event or set of events from an element + remove: function( elem, types, handler, selector, mappedTypes ) { + + var j, origCount, tmp, + events, t, handleObj, + special, handlers, type, namespaces, origType, + elemData = data_priv.hasData( elem ) && data_priv.get( elem ); + + if ( !elemData || !(events = elemData.events) ) { + return; + } + + // Once for each type.namespace in types; type may be omitted + types = ( types || "" ).match( rnotwhite ) || [ "" ]; + t = types.length; + while ( t-- ) { + tmp = rtypenamespace.exec( types[t] ) || []; + type = origType = tmp[1]; + namespaces = ( tmp[2] || "" ).split( "." ).sort(); + + // 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; + handlers = events[ type ] || []; + tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ); + + // Remove matching events + origCount = j = handlers.length; + while ( j-- ) { + handleObj = handlers[ j ]; + + if ( ( mappedTypes || origType === handleObj.origType ) && + ( !handler || handler.guid === handleObj.guid ) && + ( !tmp || tmp.test( handleObj.namespace ) ) && + ( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) { + handlers.splice( j, 1 ); + + if ( handleObj.selector ) { + handlers.delegateCount--; + } + if ( special.remove ) { + special.remove.call( elem, handleObj ); + } + } + } + + // Remove generic event handler if we removed something and no more handlers exist + // (avoids potential for endless recursion during removal of special event handlers) + if ( origCount && !handlers.length ) { + if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) { + jQuery.removeEvent( elem, type, elemData.handle ); + } + + delete events[ type ]; + } + } + + // Remove the expando if it's no longer used + if ( jQuery.isEmptyObject( events ) ) { + delete elemData.handle; + data_priv.remove( elem, "events" ); + } + }, + + trigger: function( event, data, elem, onlyHandlers ) { + + var i, cur, tmp, bubbleType, ontype, handle, special, + eventPath = [ elem || document ], + type = hasOwn.call( event, "type" ) ? event.type : event, + namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : []; + + cur = tmp = elem = elem || document; + + // Don't do events on text and comment nodes + if ( elem.nodeType === 3 || elem.nodeType === 8 ) { + return; + } + + // 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 ) { + // Namespaced trigger; create a regexp to match event type in handle() + namespaces = type.split("."); + type = namespaces.shift(); + namespaces.sort(); + } + ontype = type.indexOf(":") < 0 && "on" + type; + + // Caller can pass in a jQuery.Event object, Object, or just an event type string + event = event[ jQuery.expando ] ? + event : + new jQuery.Event( type, typeof event === "object" && event ); + + // Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true) + event.isTrigger = onlyHandlers ? 2 : 3; + event.namespace = namespaces.join("."); + event.namespace_re = event.namespace ? + new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) : + null; + + // Clean up the event in case it is being reused + event.result = undefined; + if ( !event.target ) { + event.target = elem; + } + + // Clone any incoming data and prepend the event, creating the handler arg list + data = data == null ? + [ event ] : + jQuery.makeArray( data, [ event ] ); + + // Allow special events to draw outside the lines + special = jQuery.event.special[ type ] || {}; + if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) { + return; + } + + // Determine event propagation path in advance, per W3C events spec (#9951) + // Bubble up to document, then to window; watch for a global ownerDocument var (#9724) + if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) { + + bubbleType = special.delegateType || type; + if ( !rfocusMorph.test( bubbleType + type ) ) { + cur = cur.parentNode; + } + for ( ; cur; cur = cur.parentNode ) { + eventPath.push( cur ); + tmp = cur; + } + + // Only add window if we got to document (e.g., not plain obj or detached DOM) + if ( tmp === (elem.ownerDocument || document) ) { + eventPath.push( tmp.defaultView || tmp.parentWindow || window ); + } + } + + // Fire handlers on the event path + i = 0; + while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) { + + event.type = i > 1 ? + bubbleType : + special.bindType || type; + + // jQuery handler + handle = ( data_priv.get( cur, "events" ) || {} )[ event.type ] && data_priv.get( cur, "handle" ); + if ( handle ) { + handle.apply( cur, data ); + } + + // Native handler + handle = ontype && cur[ ontype ]; + if ( handle && handle.apply && jQuery.acceptData( cur ) ) { + event.result = handle.apply( cur, data ); + if ( event.result === false ) { + event.preventDefault(); + } + } + } + event.type = type; + + // If nobody prevented the default action, do it now + if ( !onlyHandlers && !event.isDefaultPrevented() ) { + + if ( (!special._default || special._default.apply( eventPath.pop(), data ) === false) && + jQuery.acceptData( elem ) ) { + + // Call a native DOM method on the target with the same name name as the event. + // Don't do default actions on window, that's where global variables be (#6170) + if ( ontype && jQuery.isFunction( elem[ type ] ) && !jQuery.isWindow( elem ) ) { + + // Don't re-trigger an onFOO event when we call its FOO() method + tmp = elem[ ontype ]; + + if ( tmp ) { + elem[ ontype ] = null; + } + + // Prevent re-triggering of the same event, since we already bubbled it above + jQuery.event.triggered = type; + elem[ type ](); + jQuery.event.triggered = undefined; + + if ( tmp ) { + elem[ ontype ] = tmp; + } + } + } + } + + return event.result; + }, + + dispatch: function( event ) { + + // Make a writable jQuery.Event from the native event object + event = jQuery.event.fix( event ); + + var i, j, ret, matched, handleObj, + handlerQueue = [], + args = slice.call( arguments ), + handlers = ( data_priv.get( this, "events" ) || {} )[ event.type ] || [], + special = jQuery.event.special[ event.type ] || {}; + + // Use the fix-ed jQuery.Event rather than the (read-only) native event + args[0] = event; + event.delegateTarget = this; + + // Call the preDispatch hook for the mapped type, and let it bail if desired + if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) { + return; + } + + // Determine handlers + handlerQueue = jQuery.event.handlers.call( this, event, handlers ); + + // Run delegates first; they may want to stop propagation beneath us + i = 0; + while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) { + event.currentTarget = matched.elem; + + j = 0; + while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) { + + // Triggered event must either 1) have no namespace, or 2) have namespace(s) + // a subset or equal to those in the bound event (both can have no namespace). + if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) { + + event.handleObj = handleObj; + event.data = handleObj.data; + + ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler ) + .apply( matched.elem, args ); + + if ( ret !== undefined ) { + if ( (event.result = ret) === false ) { + event.preventDefault(); + event.stopPropagation(); + } + } + } + } + } + + // Call the postDispatch hook for the mapped type + if ( special.postDispatch ) { + special.postDispatch.call( this, event ); + } + + return event.result; + }, + + handlers: function( event, handlers ) { + var i, matches, sel, handleObj, + handlerQueue = [], + delegateCount = handlers.delegateCount, + cur = event.target; + + // Find delegate handlers + // Black-hole SVG instance trees (#13180) + // Avoid non-left-click bubbling in Firefox (#3861) + if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) { + + for ( ; cur !== this; cur = cur.parentNode || this ) { + + // Don't process clicks on disabled elements (#6911, #8165, #11382, #11764) + if ( cur.disabled !== true || event.type !== "click" ) { + matches = []; + for ( i = 0; i < delegateCount; i++ ) { + handleObj = handlers[ i ]; + + // Don't conflict with Object.prototype properties (#13203) + sel = handleObj.selector + " "; + + if ( matches[ sel ] === undefined ) { + matches[ sel ] = handleObj.needsContext ? + jQuery( sel, this ).index( cur ) >= 0 : + jQuery.find( sel, this, null, [ cur ] ).length; + } + if ( matches[ sel ] ) { + matches.push( handleObj ); + } + } + if ( matches.length ) { + handlerQueue.push({ elem: cur, handlers: matches }); + } + } + } + } + + // Add the remaining (directly-bound) handlers + if ( delegateCount < handlers.length ) { + handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) }); + } + + return handlerQueue; + }, + + // Includes some event props shared by KeyEvent and MouseEvent + props: "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 offsetX offsetY pageX pageY screenX screenY toElement".split(" "), + filter: function( event, original ) { + var eventDoc, doc, body, + button = original.button; + + // 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 which for click: 1 === left; 2 === middle; 3 === right + // Note: button is not normalized, so don't use it + if ( !event.which && button !== undefined ) { + event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) ); + } + + return event; + } + }, + + fix: function( event ) { + if ( event[ jQuery.expando ] ) { + return event; + } + + // Create a writable copy of the event object and normalize some properties + var i, prop, copy, + type = event.type, + originalEvent = event, + fixHook = this.fixHooks[ type ]; + + if ( !fixHook ) { + this.fixHooks[ type ] = fixHook = + rmouseEvent.test( type ) ? this.mouseHooks : + rkeyEvent.test( type ) ? this.keyHooks : + {}; + } + copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props; + + event = new jQuery.Event( originalEvent ); + + i = copy.length; + while ( i-- ) { + prop = copy[ i ]; + event[ prop ] = originalEvent[ prop ]; + } + + // Support: Cordova 2.5 (WebKit) (#13255) + // All events should have a target; Cordova deviceready doesn't + if ( !event.target ) { + event.target = document; + } + + // Support: Safari 6.0+, Chrome<28 + // Target should not be a text node (#504, #13143) + if ( event.target.nodeType === 3 ) { + event.target = event.target.parentNode; + } + + return fixHook.filter ? fixHook.filter( event, originalEvent ) : event; + }, + + special: { + load: { + // Prevent triggered image.load events from bubbling to window.load + noBubble: true + }, + focus: { + // Fire native event if possible so blur/focus sequence is correct + trigger: function() { + if ( this !== safeActiveElement() && this.focus ) { + this.focus(); + return false; + } + }, + delegateType: "focusin" + }, + blur: { + trigger: function() { + if ( this === safeActiveElement() && this.blur ) { + this.blur(); + return false; + } + }, + delegateType: "focusout" + }, + click: { + // For checkbox, fire native event so checked state will be right + trigger: function() { + if ( this.type === "checkbox" && this.click && jQuery.nodeName( this, "input" ) ) { + this.click(); + return false; + } + }, + + // For cross-browser consistency, don't fire native .click() on links + _default: function( event ) { + return jQuery.nodeName( event.target, "a" ); + } + }, + + beforeunload: { + postDispatch: function( event ) { + + // Support: Firefox 20+ + // Firefox doesn't alert if the returnValue field is not set. + if ( event.result !== undefined && event.originalEvent ) { + event.originalEvent.returnValue = event.result; + } + } + } + }, + + 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(); + } + } +}; + +jQuery.removeEvent = function( elem, type, handle ) { + if ( elem.removeEventListener ) { + elem.removeEventListener( type, handle, false ); + } +}; + +jQuery.Event = function( src, props ) { + // Allow instantiation without the 'new' keyword + if ( !(this instanceof jQuery.Event) ) { + return new jQuery.Event( src, props ); + } + + // Event object + if ( src && src.type ) { + this.originalEvent = src; + this.type = src.type; + + // Events bubbling up the document may have been marked as prevented + // by a handler lower down the tree; reflect the correct value. + this.isDefaultPrevented = src.defaultPrevented || + src.defaultPrevented === undefined && + // Support: Android<4.0 + src.returnValue === false ? + returnTrue : + returnFalse; + + // Event type + } else { + this.type = src; + } + + // Put explicitly provided properties onto the event object + if ( props ) { + jQuery.extend( this, props ); + } + + // Create a timestamp if incoming event doesn't have one + this.timeStamp = src && src.timeStamp || jQuery.now(); + + // Mark it as fixed + this[ jQuery.expando ] = true; +}; + +// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding +// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html +jQuery.Event.prototype = { + isDefaultPrevented: returnFalse, + isPropagationStopped: returnFalse, + isImmediatePropagationStopped: returnFalse, + + preventDefault: function() { + var e = this.originalEvent; + + this.isDefaultPrevented = returnTrue; + + if ( e && e.preventDefault ) { + e.preventDefault(); + } + }, + stopPropagation: function() { + var e = this.originalEvent; + + this.isPropagationStopped = returnTrue; + + if ( e && e.stopPropagation ) { + e.stopPropagation(); + } + }, + stopImmediatePropagation: function() { + var e = this.originalEvent; + + this.isImmediatePropagationStopped = returnTrue; + + if ( e && e.stopImmediatePropagation ) { + e.stopImmediatePropagation(); + } + + this.stopPropagation(); + } +}; + +// Create mouseenter/leave events using mouseover/out and event-time checks +// Support: Chrome 15+ +jQuery.each({ + mouseenter: "mouseover", + mouseleave: "mouseout", + pointerenter: "pointerover", + pointerleave: "pointerout" +}, function( orig, fix ) { + jQuery.event.special[ orig ] = { + delegateType: fix, + bindType: fix, + + handle: function( event ) { + var ret, + target = this, + related = event.relatedTarget, + handleObj = event.handleObj; + + // 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; + } + }; +}); + +// Support: Firefox, Chrome, Safari +// Create "bubbling" focus and blur events +if ( !support.focusinBubbles ) { + jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) { + + // Attach a single capturing handler on the document while someone wants focusin/focusout + var handler = function( event ) { + jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true ); + }; + + jQuery.event.special[ fix ] = { + setup: function() { + var doc = this.ownerDocument || this, + attaches = data_priv.access( doc, fix ); + + if ( !attaches ) { + doc.addEventListener( orig, handler, true ); + } + data_priv.access( doc, fix, ( attaches || 0 ) + 1 ); + }, + teardown: function() { + var doc = this.ownerDocument || this, + attaches = data_priv.access( doc, fix ) - 1; + + if ( !attaches ) { + doc.removeEventListener( orig, handler, true ); + data_priv.remove( doc, fix ); + + } else { + data_priv.access( doc, fix, attaches ); + } + } + }; + }); +} + +jQuery.fn.extend({ + + on: function( types, selector, data, fn, /*INTERNAL*/ one ) { + var origFn, type; + + // Types can be a map of types/handlers + if ( typeof types === "object" ) { + // ( types-Object, selector, data ) + if ( typeof selector !== "string" ) { + // ( types-Object, data ) + data = data || selector; + selector = undefined; + } + for ( type in types ) { + this.on( type, selector, data, types[ type ], one ); + } + return this; + } + + if ( data == null && fn == null ) { + // ( types, fn ) + fn = selector; + data = selector = undefined; + } else if ( fn == null ) { + if ( typeof selector === "string" ) { + // ( types, selector, fn ) + fn = data; + data = undefined; + } else { + // ( types, data, fn ) + fn = data; + data = selector; + selector = undefined; + } + } + if ( fn === false ) { + fn = returnFalse; + } else if ( !fn ) { + return this; + } + + if ( one === 1 ) { + origFn = fn; + fn = function( event ) { + // Can use an empty set, since event contains the info + jQuery().off( event ); + return origFn.apply( this, arguments ); + }; + // Use same guid so caller can remove using origFn + fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ ); + } + return this.each( function() { + jQuery.event.add( this, types, fn, data, selector ); + }); + }, + one: function( types, selector, data, fn ) { + return this.on( types, selector, data, fn, 1 ); + }, + off: function( types, selector, fn ) { + var handleObj, type; + if ( types && types.preventDefault && types.handleObj ) { + // ( event ) dispatched jQuery.Event + 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 ( 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 ); + }); + }, + + trigger: function( type, data ) { + return this.each(function() { + jQuery.event.trigger( type, data, this ); + }); + }, + triggerHandler: function( type, data ) { + var elem = this[0]; + if ( elem ) { + return jQuery.event.trigger( type, data, elem, true ); + } + } +}); + + +var + rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi, + rtagName = /<([\w:]+)/, + rhtml = /<|&#?\w+;/, + rnoInnerhtml = /<(?:script|style|link)/i, + // checked="checked" or checked + rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i, + rscriptType = /^$|\/(?:java|ecma)script/i, + rscriptTypeMasked = /^true\/(.*)/, + rcleanScript = /^\s*\s*$/g, + + // We have to close these tags to support XHTML (#13200) + wrapMap = { + + // Support: IE9 + option: [ 1, "" ], + + thead: [ 1, "
{{ enterprise.ent_unit }}
{{ stat.recorded_at.date() }}
", "
" ], + col: [ 2, "", "
" ], + tr: [ 2, "", "
" ], + td: [ 3, "", "
" ], + + _default: [ 0, "", "" ] + }; + +// Support: IE9 +wrapMap.optgroup = wrapMap.option; + +wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; +wrapMap.th = wrapMap.td; + +// Support: 1.x compatibility +// Manipulating tables requires a tbody +function manipulationTarget( elem, content ) { + return jQuery.nodeName( elem, "table" ) && + jQuery.nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ? + + elem.getElementsByTagName("tbody")[0] || + elem.appendChild( elem.ownerDocument.createElement("tbody") ) : + elem; +} + +// Replace/restore the type attribute of script elements for safe DOM manipulation +function disableScript( elem ) { + elem.type = (elem.getAttribute("type") !== null) + "/" + elem.type; + return elem; +} +function restoreScript( elem ) { + var match = rscriptTypeMasked.exec( elem.type ); + + if ( match ) { + elem.type = match[ 1 ]; + } else { + elem.removeAttribute("type"); + } + + return elem; +} + +// Mark scripts as having already been evaluated +function setGlobalEval( elems, refElements ) { + var i = 0, + l = elems.length; + + for ( ; i < l; i++ ) { + data_priv.set( + elems[ i ], "globalEval", !refElements || data_priv.get( refElements[ i ], "globalEval" ) + ); + } +} + +function cloneCopyEvent( src, dest ) { + var i, l, type, pdataOld, pdataCur, udataOld, udataCur, events; + + if ( dest.nodeType !== 1 ) { + return; + } + + // 1. Copy private data: events, handlers, etc. + if ( data_priv.hasData( src ) ) { + pdataOld = data_priv.access( src ); + pdataCur = data_priv.set( dest, pdataOld ); + events = pdataOld.events; + + if ( events ) { + delete pdataCur.handle; + pdataCur.events = {}; + + for ( type in events ) { + for ( i = 0, l = events[ type ].length; i < l; i++ ) { + jQuery.event.add( dest, type, events[ type ][ i ] ); + } + } + } + } + + // 2. Copy user data + if ( data_user.hasData( src ) ) { + udataOld = data_user.access( src ); + udataCur = jQuery.extend( {}, udataOld ); + + data_user.set( dest, udataCur ); + } +} + +function getAll( context, tag ) { + var ret = context.getElementsByTagName ? context.getElementsByTagName( tag || "*" ) : + context.querySelectorAll ? context.querySelectorAll( tag || "*" ) : + []; + + return tag === undefined || tag && jQuery.nodeName( context, tag ) ? + jQuery.merge( [ context ], ret ) : + ret; +} + +// Fix IE bugs, see support tests +function fixInput( src, dest ) { + var nodeName = dest.nodeName.toLowerCase(); + + // Fails to persist the checked state of a cloned checkbox or radio button. + if ( nodeName === "input" && rcheckableType.test( src.type ) ) { + dest.checked = src.checked; + + // Fails to return the selected option to the default selected state when cloning options + } else if ( nodeName === "input" || nodeName === "textarea" ) { + dest.defaultValue = src.defaultValue; + } +} + +jQuery.extend({ + clone: function( elem, dataAndEvents, deepDataAndEvents ) { + var i, l, srcElements, destElements, + clone = elem.cloneNode( true ), + inPage = jQuery.contains( elem.ownerDocument, elem ); + + // Fix IE cloning issues + if ( !support.noCloneChecked && ( elem.nodeType === 1 || elem.nodeType === 11 ) && + !jQuery.isXMLDoc( elem ) ) { + + // We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2 + destElements = getAll( clone ); + srcElements = getAll( elem ); + + for ( i = 0, l = srcElements.length; i < l; i++ ) { + fixInput( srcElements[ i ], destElements[ i ] ); + } + } + + // Copy the events from the original to the clone + if ( dataAndEvents ) { + if ( deepDataAndEvents ) { + srcElements = srcElements || getAll( elem ); + destElements = destElements || getAll( clone ); + + for ( i = 0, l = srcElements.length; i < l; i++ ) { + cloneCopyEvent( srcElements[ i ], destElements[ i ] ); + } + } else { + cloneCopyEvent( elem, clone ); + } + } + + // Preserve script evaluation history + destElements = getAll( clone, "script" ); + if ( destElements.length > 0 ) { + setGlobalEval( destElements, !inPage && getAll( elem, "script" ) ); + } + + // Return the cloned set + return clone; + }, + + buildFragment: function( elems, context, scripts, selection ) { + var elem, tmp, tag, wrap, contains, j, + fragment = context.createDocumentFragment(), + nodes = [], + i = 0, + l = elems.length; + + for ( ; i < l; i++ ) { + elem = elems[ i ]; + + if ( elem || elem === 0 ) { + + // Add nodes directly + if ( jQuery.type( elem ) === "object" ) { + // Support: QtWebKit, PhantomJS + // push.apply(_, arraylike) throws on ancient WebKit + jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem ); + + // Convert non-html into a text node + } else if ( !rhtml.test( elem ) ) { + nodes.push( context.createTextNode( elem ) ); + + // Convert html into DOM nodes + } else { + tmp = tmp || fragment.appendChild( context.createElement("div") ); + + // Deserialize a standard representation + tag = ( rtagName.exec( elem ) || [ "", "" ] )[ 1 ].toLowerCase(); + wrap = wrapMap[ tag ] || wrapMap._default; + tmp.innerHTML = wrap[ 1 ] + elem.replace( rxhtmlTag, "<$1>" ) + wrap[ 2 ]; + + // Descend through wrappers to the right content + j = wrap[ 0 ]; + while ( j-- ) { + tmp = tmp.lastChild; + } + + // Support: QtWebKit, PhantomJS + // push.apply(_, arraylike) throws on ancient WebKit + jQuery.merge( nodes, tmp.childNodes ); + + // Remember the top-level container + tmp = fragment.firstChild; + + // Ensure the created nodes are orphaned (#12392) + tmp.textContent = ""; + } + } + } + + // Remove wrapper from fragment + fragment.textContent = ""; + + i = 0; + while ( (elem = nodes[ i++ ]) ) { + + // #4087 - If origin and destination elements are the same, and this is + // that element, do not do anything + if ( selection && jQuery.inArray( elem, selection ) !== -1 ) { + continue; + } + + contains = jQuery.contains( elem.ownerDocument, elem ); + + // Append to fragment + tmp = getAll( fragment.appendChild( elem ), "script" ); + + // Preserve script evaluation history + if ( contains ) { + setGlobalEval( tmp ); + } + + // Capture executables + if ( scripts ) { + j = 0; + while ( (elem = tmp[ j++ ]) ) { + if ( rscriptType.test( elem.type || "" ) ) { + scripts.push( elem ); + } + } + } + } + + return fragment; + }, + + cleanData: function( elems ) { + var data, elem, type, key, + special = jQuery.event.special, + i = 0; + + for ( ; (elem = elems[ i ]) !== undefined; i++ ) { + if ( jQuery.acceptData( elem ) ) { + key = elem[ data_priv.expando ]; + + if ( key && (data = data_priv.cache[ key ]) ) { + if ( data.events ) { + for ( type in data.events ) { + if ( special[ type ] ) { + jQuery.event.remove( elem, type ); + + // This is a shortcut to avoid jQuery.event.remove's overhead + } else { + jQuery.removeEvent( elem, type, data.handle ); + } + } + } + if ( data_priv.cache[ key ] ) { + // Discard any remaining `private` data + delete data_priv.cache[ key ]; + } + } + } + // Discard any remaining `user` data + delete data_user.cache[ elem[ data_user.expando ] ]; + } + } +}); + +jQuery.fn.extend({ + text: function( value ) { + return access( this, function( value ) { + return value === undefined ? + jQuery.text( this ) : + this.empty().each(function() { + if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { + this.textContent = value; + } + }); + }, null, value, arguments.length ); + }, + + append: function() { + return this.domManip( arguments, function( elem ) { + if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { + var target = manipulationTarget( this, elem ); + target.appendChild( elem ); + } + }); + }, + + prepend: function() { + return this.domManip( arguments, function( elem ) { + if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { + var target = manipulationTarget( this, elem ); + target.insertBefore( elem, target.firstChild ); + } + }); + }, + + before: function() { + return this.domManip( arguments, function( elem ) { + if ( this.parentNode ) { + this.parentNode.insertBefore( elem, this ); + } + }); + }, + + after: function() { + return this.domManip( arguments, function( elem ) { + if ( this.parentNode ) { + this.parentNode.insertBefore( elem, this.nextSibling ); + } + }); + }, + + remove: function( selector, keepData /* Internal Use Only */ ) { + var elem, + elems = selector ? jQuery.filter( selector, this ) : this, + i = 0; + + for ( ; (elem = elems[i]) != null; i++ ) { + if ( !keepData && elem.nodeType === 1 ) { + jQuery.cleanData( getAll( elem ) ); + } + + if ( elem.parentNode ) { + if ( keepData && jQuery.contains( elem.ownerDocument, elem ) ) { + setGlobalEval( getAll( elem, "script" ) ); + } + elem.parentNode.removeChild( elem ); + } + } + + return this; + }, + + empty: function() { + var elem, + i = 0; + + for ( ; (elem = this[i]) != null; i++ ) { + if ( elem.nodeType === 1 ) { + + // Prevent memory leaks + jQuery.cleanData( getAll( elem, false ) ); + + // Remove any remaining nodes + elem.textContent = ""; + } + } + + return this; + }, + + clone: function( dataAndEvents, deepDataAndEvents ) { + dataAndEvents = dataAndEvents == null ? false : dataAndEvents; + deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents; + + return this.map(function() { + return jQuery.clone( this, dataAndEvents, deepDataAndEvents ); + }); + }, + + html: function( value ) { + return access( this, function( value ) { + var elem = this[ 0 ] || {}, + i = 0, + l = this.length; + + if ( value === undefined && elem.nodeType === 1 ) { + return elem.innerHTML; + } + + // See if we can take a shortcut and just use innerHTML + if ( typeof value === "string" && !rnoInnerhtml.test( value ) && + !wrapMap[ ( rtagName.exec( value ) || [ "", "" ] )[ 1 ].toLowerCase() ] ) { + + value = value.replace( rxhtmlTag, "<$1>" ); + + try { + for ( ; i < l; i++ ) { + elem = this[ i ] || {}; + + // Remove element nodes and prevent memory leaks + if ( elem.nodeType === 1 ) { + jQuery.cleanData( getAll( elem, false ) ); + elem.innerHTML = value; + } + } + + elem = 0; + + // If using innerHTML throws an exception, use the fallback method + } catch( e ) {} + } + + if ( elem ) { + this.empty().append( value ); + } + }, null, value, arguments.length ); + }, + + replaceWith: function() { + var arg = arguments[ 0 ]; + + // Make the changes, replacing each context element with the new content + this.domManip( arguments, function( elem ) { + arg = this.parentNode; + + jQuery.cleanData( getAll( this ) ); + + if ( arg ) { + arg.replaceChild( elem, this ); + } + }); + + // Force removal if there was no new content (e.g., from empty arguments) + return arg && (arg.length || arg.nodeType) ? this : this.remove(); + }, + + detach: function( selector ) { + return this.remove( selector, true ); + }, + + domManip: function( args, callback ) { + + // Flatten any nested arrays + args = concat.apply( [], args ); + + var fragment, first, scripts, hasScripts, node, doc, + i = 0, + l = this.length, + set = this, + iNoClone = l - 1, + value = args[ 0 ], + isFunction = jQuery.isFunction( value ); + + // We can't cloneNode fragments that contain checked, in WebKit + if ( isFunction || + ( l > 1 && typeof value === "string" && + !support.checkClone && rchecked.test( value ) ) ) { + return this.each(function( index ) { + var self = set.eq( index ); + if ( isFunction ) { + args[ 0 ] = value.call( this, index, self.html() ); + } + self.domManip( args, callback ); + }); + } + + if ( l ) { + fragment = jQuery.buildFragment( args, this[ 0 ].ownerDocument, false, this ); + first = fragment.firstChild; + + if ( fragment.childNodes.length === 1 ) { + fragment = first; + } + + if ( first ) { + scripts = jQuery.map( getAll( fragment, "script" ), disableScript ); + hasScripts = scripts.length; + + // Use the original fragment for the last item instead of the first because it can end up + // being emptied incorrectly in certain situations (#8070). + for ( ; i < l; i++ ) { + node = fragment; + + if ( i !== iNoClone ) { + node = jQuery.clone( node, true, true ); + + // Keep references to cloned scripts for later restoration + if ( hasScripts ) { + // Support: QtWebKit + // jQuery.merge because push.apply(_, arraylike) throws + jQuery.merge( scripts, getAll( node, "script" ) ); + } + } + + callback.call( this[ i ], node, i ); + } + + if ( hasScripts ) { + doc = scripts[ scripts.length - 1 ].ownerDocument; + + // Reenable scripts + jQuery.map( scripts, restoreScript ); + + // Evaluate executable scripts on first document insertion + for ( i = 0; i < hasScripts; i++ ) { + node = scripts[ i ]; + if ( rscriptType.test( node.type || "" ) && + !data_priv.access( node, "globalEval" ) && jQuery.contains( doc, node ) ) { + + if ( node.src ) { + // Optional AJAX dependency, but won't run scripts if not present + if ( jQuery._evalUrl ) { + jQuery._evalUrl( node.src ); + } + } else { + jQuery.globalEval( node.textContent.replace( rcleanScript, "" ) ); + } + } + } + } + } + } + + return this; + } +}); + +jQuery.each({ + appendTo: "append", + prependTo: "prepend", + insertBefore: "before", + insertAfter: "after", + replaceAll: "replaceWith" +}, function( name, original ) { + jQuery.fn[ name ] = function( selector ) { + var elems, + ret = [], + insert = jQuery( selector ), + last = insert.length - 1, + i = 0; + + for ( ; i <= last; i++ ) { + elems = i === last ? this : this.clone( true ); + jQuery( insert[ i ] )[ original ]( elems ); + + // Support: QtWebKit + // .get() because push.apply(_, arraylike) throws + push.apply( ret, elems.get() ); + } + + return this.pushStack( ret ); + }; +}); + + +var iframe, + elemdisplay = {}; + +/** + * Retrieve the actual display of a element + * @param {String} name nodeName of the element + * @param {Object} doc Document object + */ +// Called only from within defaultDisplay +function actualDisplay( name, doc ) { + var style, + elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ), + + // getDefaultComputedStyle might be reliably used only on attached element + display = window.getDefaultComputedStyle && ( style = window.getDefaultComputedStyle( elem[ 0 ] ) ) ? + + // Use of this method is a temporary fix (more like optimization) until something better comes along, + // since it was removed from specification and supported only in FF + style.display : jQuery.css( elem[ 0 ], "display" ); + + // We don't have any data stored on the element, + // so use "detach" method as fast way to get rid of the element + elem.detach(); + + return display; +} + +/** + * Try to determine the default display value of an element + * @param {String} nodeName + */ +function defaultDisplay( nodeName ) { + var doc = document, + display = elemdisplay[ nodeName ]; + + if ( !display ) { + display = actualDisplay( nodeName, doc ); + + // If the simple way fails, read from inside an iframe + if ( display === "none" || !display ) { + + // Use the already-created iframe if possible + iframe = (iframe || jQuery( "