From a62293aff9884d9a4b3a5f6e323fffdd7c1d6a10 Mon Sep 17 00:00:00 2001
From: John Glover <j@johnglover.net>
Date: Tue, 24 Jul 2012 16:29:56 +0100
Subject: [PATCH 001/130] Add basic datastore extension skeleton with create
 logic/auth functions and tests.

---
 ckanext/datastore/__init__.py              |  0
 ckanext/datastore/db.py                    | 25 +++++++++
 ckanext/datastore/logic/__init__.py        |  0
 ckanext/datastore/logic/action/__init__.py |  0
 ckanext/datastore/logic/action/create.py   | 43 ++++++++++++++++
 ckanext/datastore/logic/auth/__init__.py   |  0
 ckanext/datastore/logic/auth/create.py     | 12 +++++
 ckanext/datastore/logic/schema.py          | 22 ++++++++
 ckanext/datastore/plugin.py                | 17 +++++++
 ckanext/datastore/tests/__init__.py        |  0
 ckanext/datastore/tests/test_datastore.py  | 59 ++++++++++++++++++++++
 setup.py                                   |  1 +
 12 files changed, 179 insertions(+)
 create mode 100644 ckanext/datastore/__init__.py
 create mode 100644 ckanext/datastore/db.py
 create mode 100644 ckanext/datastore/logic/__init__.py
 create mode 100644 ckanext/datastore/logic/action/__init__.py
 create mode 100644 ckanext/datastore/logic/action/create.py
 create mode 100644 ckanext/datastore/logic/auth/__init__.py
 create mode 100644 ckanext/datastore/logic/auth/create.py
 create mode 100644 ckanext/datastore/logic/schema.py
 create mode 100644 ckanext/datastore/plugin.py
 create mode 100644 ckanext/datastore/tests/__init__.py
 create mode 100644 ckanext/datastore/tests/test_datastore.py

diff --git a/ckanext/datastore/__init__.py b/ckanext/datastore/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
new file mode 100644
index 00000000000..19845d05361
--- /dev/null
+++ b/ckanext/datastore/db.py
@@ -0,0 +1,25 @@
+
+
+def create(resource_id, fields, rows):
+    '''
+    The first row will be used to guess types not in the fields and the
+    guessed types will be added to the headers permanently.
+    Consecutive rows have to conform to the field definitions.
+
+    rows can be empty so that you can just set the fields.
+
+    fields are optional but needed if you want to do type hinting or
+    add extra information for certain columns or to explicitly
+    define ordering.
+
+    eg [{"id": "dob", "label": ""Date of Birth",
+         "type": "timestamp" ,"concept": "day"},
+        {"name": "some_stuff": ..].
+
+    A header items values can not be changed after it has been defined
+    nor can the ordering of them be changed. They can be extended though.
+
+    Any error results in total failure! For now pass back the actual error.
+    Should be transactional.
+    '''
+    pass
diff --git a/ckanext/datastore/logic/__init__.py b/ckanext/datastore/logic/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/ckanext/datastore/logic/action/__init__.py b/ckanext/datastore/logic/action/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/ckanext/datastore/logic/action/create.py b/ckanext/datastore/logic/action/create.py
new file mode 100644
index 00000000000..c7e02d70237
--- /dev/null
+++ b/ckanext/datastore/logic/action/create.py
@@ -0,0 +1,43 @@
+import logging
+import ckan.logic as logic
+import ckan.logic.action
+import ckan.lib.dictization
+import ckan.plugins as p
+import ckanext.datastore.logic.schema
+import ckanext.datastore.db as db
+
+log = logging.getLogger(__name__)
+
+_validate = ckan.lib.navl.dictization_functions.validate
+_check_access = logic.check_access
+_get_or_bust = logic.get_or_bust
+
+
+def datastore_create(context, data_dict):
+    '''Adds a new table to the datastore.
+
+    :param resource_id: resource id that the data is going to be stored under.
+    :type resource_id: string
+    :param fields: fields/columns and their extra metadata.
+    :type fields: list of dictionaries
+    :param records: the data, eg: [{"dob": "2005", "some_stuff": ['a', b']}]
+    :type records: list of dictionaries
+
+    :returns: the newly created data object.
+    :rtype: dictionary
+
+    '''
+    model = _get_or_bust(context, 'model')
+    resource_id = _get_or_bust(data_dict, 'resource_id')
+    fields = data_dict.get('fields')
+    records = _get_or_bust(data_dict, 'records')
+
+    _check_access('datastore_create', context, data_dict)
+
+    schema = ckanext.datastore.logic.schema.default_datastore_create_schema()
+    data, errors = _validate(data_dict, schema, context)
+    if errors:
+        model.Session.rollback()
+        raise p.toolkit.ValidationError(errors)
+
+    return db.create(resource_id, fields, records)
diff --git a/ckanext/datastore/logic/auth/__init__.py b/ckanext/datastore/logic/auth/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/ckanext/datastore/logic/auth/create.py b/ckanext/datastore/logic/auth/create.py
new file mode 100644
index 00000000000..d5db8d0ebdf
--- /dev/null
+++ b/ckanext/datastore/logic/auth/create.py
@@ -0,0 +1,12 @@
+import ckan.plugins as p
+
+
+def datastore_create(context, data_dict):
+    model = context['model']
+    user = context['user']
+    userobj = model.User.get(user)
+
+    if userobj:
+        return {'success': True}
+    return {'success': False,
+            'msg': p.toolkit._('You must be logged in to use the datastore.')}
diff --git a/ckanext/datastore/logic/schema.py b/ckanext/datastore/logic/schema.py
new file mode 100644
index 00000000000..b8aaa29b6df
--- /dev/null
+++ b/ckanext/datastore/logic/schema.py
@@ -0,0 +1,22 @@
+from ckan.lib.navl.validators import (not_empty,
+                                      not_missing,
+                                      empty,
+                                      ignore_missing,
+                                      ignore)
+
+
+def default_fields_schema():
+    return {
+        'id': [not_missing, not_empty, unicode],
+        'type': [not_missing, not_empty, unicode],
+        'label': [ignore_missing, unicode],
+    }
+
+
+def default_datastore_create_schema():
+    return {
+        'resource_id': [not_missing, not_empty, unicode],
+        'fields': default_fields_schema(),
+        'records': [ignore],
+        '__extras': [empty],
+    }
diff --git a/ckanext/datastore/plugin.py b/ckanext/datastore/plugin.py
new file mode 100644
index 00000000000..2cb6730d714
--- /dev/null
+++ b/ckanext/datastore/plugin.py
@@ -0,0 +1,17 @@
+import ckan.plugins as p
+import ckanext.datastore.logic.action.create as action_create
+import ckanext.datastore.logic.auth.create as auth_create
+
+
+class DatastorePlugin(p.SingletonPlugin):
+    '''
+    Datastore plugin.
+    '''
+    p.implements(p.IActions)
+    p.implements(p.IAuthFunctions)
+
+    def get_actions(self):
+        return {'datastore_create': action_create.datastore_create}
+
+    def get_auth_functions(self):
+        return {'datastore_create': auth_create.datastore_create}
diff --git a/ckanext/datastore/tests/__init__.py b/ckanext/datastore/tests/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/ckanext/datastore/tests/test_datastore.py b/ckanext/datastore/tests/test_datastore.py
new file mode 100644
index 00000000000..71dad80b1b9
--- /dev/null
+++ b/ckanext/datastore/tests/test_datastore.py
@@ -0,0 +1,59 @@
+import json
+import ckan.plugins as p
+import ckan.lib.create_test_data as ctd
+import ckan.model as model
+import ckan.tests as tests
+
+
+class TestDatastore(tests.WsgiAppCase):
+    sysadmin_user = None
+    normal_user = None
+
+    @classmethod
+    def setup_class(cls):
+        p.load('datastore')
+        ctd.CreateTestData.create()
+        cls.sysadmin_user = model.User.get('testsysadmin')
+        cls.normal_user = model.User.get('annafan')
+
+    @classmethod
+    def teardown_class(cls):
+        model.repo.rebuild_db()
+
+    def test_create_empty_fails(self):
+        postparams = '%s=1' % json.dumps({})
+        res = self.app.post('/api/action/datastore_create', params=postparams,
+                            status=409)
+        res_dict = json.loads(res.body)
+        assert res_dict['success'] is False
+
+    def test_create_requires_auth(self):
+        resource = model.Package.get('annakarenina').resources[0]
+        data = {
+            'resource_id': resource.id
+        }
+        postparams = '%s=1' % json.dumps(data)
+        res = self.app.post('/api/action/datastore_create', params=postparams,
+                            status=403)
+        res_dict = json.loads(res.body)
+        assert res_dict['success'] is False
+
+    def test_create_basic(self):
+        resource = model.Package.get('annakarenina').resources[0]
+        data = {
+            'resource_id': resource.id,
+            'fields': [{'id': 'book', 'label': 'Name', 'type': 'text'},
+                       {'id': 'author', 'label': 'Author ', 'type': 'text'}],
+            'records': [{'book': 'annakarenina', 'author': 'tolstoy'},
+                        {'book': 'warandpeace', 'author': 'tolstoy'}]
+        }
+        postparams = '%s=1' % json.dumps(data)
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
+        res = self.app.post('/api/action/datastore_create', params=postparams,
+                            extra_environ=auth)
+        res_dict = json.loads(res.body)
+
+        assert res_dict['success'] is True
+        assert res_dict['result']['resource_id'] == data['resource_id']
+        assert res_dict['result']['fields'] == data['fields']
+        assert res_dict['result']['records'] == data['records']
diff --git a/setup.py b/setup.py
index 74187be3b0c..02ee9ea1142 100644
--- a/setup.py
+++ b/setup.py
@@ -107,6 +107,7 @@
     multilingual_tag=ckanext.multilingual.plugin:MultilingualTag
     organizations=ckanext.organizations.forms:OrganizationForm
     organizations_dataset=ckanext.organizations.forms:OrganizationDatasetForm
+    datastore=ckanext.datastore.plugin:DatastorePlugin
     test_tag_vocab_plugin=ckanext.test_tag_vocab_plugin:MockVocabTagsPlugin
 
     [ckan.system_plugins]

From 1a8709debf5d6b4e89162cc8a38c912585d2d376 Mon Sep 17 00:00:00 2001
From: John Glover <j@johnglover.net>
Date: Tue, 24 Jul 2012 17:12:26 +0100
Subject: [PATCH 002/130] Bug fix: records field can be empty.

---
 ckanext/datastore/logic/action/create.py | 2 +-
 ckanext/datastore/logic/schema.py        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ckanext/datastore/logic/action/create.py b/ckanext/datastore/logic/action/create.py
index c7e02d70237..da6491b0e63 100644
--- a/ckanext/datastore/logic/action/create.py
+++ b/ckanext/datastore/logic/action/create.py
@@ -30,7 +30,7 @@ def datastore_create(context, data_dict):
     model = _get_or_bust(context, 'model')
     resource_id = _get_or_bust(data_dict, 'resource_id')
     fields = data_dict.get('fields')
-    records = _get_or_bust(data_dict, 'records')
+    records = data_dict.get('records')
 
     _check_access('datastore_create', context, data_dict)
 
diff --git a/ckanext/datastore/logic/schema.py b/ckanext/datastore/logic/schema.py
index b8aaa29b6df..595d753d169 100644
--- a/ckanext/datastore/logic/schema.py
+++ b/ckanext/datastore/logic/schema.py
@@ -14,6 +14,7 @@ def default_fields_schema():
 
 
 def default_datastore_create_schema():
+    # TODO: resource_id should have a resource_id_exists validator
     return {
         'resource_id': [not_missing, not_empty, unicode],
         'fields': default_fields_schema(),

From ee0cb2dae07281430b784880284999b9c806f7e7 Mon Sep 17 00:00:00 2001
From: kindly <kindly@gmail.com>
Date: Wed, 25 Jul 2012 00:38:24 +0100
Subject: [PATCH 003/130] [2733] add engines and basic transaction scaffolding
 for create

---
 ckanext/datastore/db.py                  | 76 +++++++++++++++++++++++-
 ckanext/datastore/logic/action/create.py | 17 +++---
 2 files changed, 84 insertions(+), 9 deletions(-)

diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
index 19845d05361..4951987e660 100644
--- a/ckanext/datastore/db.py
+++ b/ckanext/datastore/db.py
@@ -1,6 +1,57 @@
+import sqlalchemy
+from pylons import config
 
+_pg_types = {}
+_type_names = set()
+_engines = {}
 
-def create(resource_id, fields, rows):
+def _get_engine(context, data_dict):
+    ''' Get either read or write engine'''
+    connection_type = data_dict.get('connection_type', 'write')
+    engine = _engines.get(connection_type)
+
+    if not engine:
+        config_option = 'ckan.datastore_{}_url'.format(connection_type)
+        url = config.get(config_option)
+        assert url, 'Config option ' + config_option + ' not defined'
+        engine = sqlalchemy.create_engine(url)
+        _engines[connection_type] = engine
+    return engine
+
+def _cache_types(context, data_dict=None):
+    if not _pg_types:
+        connection = context['connection']
+        results = connection.execute(
+            'select oid, typname from pg_type;'
+        )
+        for result in results:
+            _pg_types[result[0]] = result[1]
+            _type_names.add(result[1])
+
+def _get_type(context, oid):
+    _cache_types(context)
+    return _pg_types[oid]
+
+def check_fields(context, fields):
+    _cache_types(context)
+    ## check if fieds are in in _type_names
+    pass
+
+def create_table(context, data_dict):
+    '''create table from combination of fields and first row of data'''
+    check_fields(context, data_dict.get('fields'))
+    pass
+
+def alter_table(context, data_dict):
+    '''alter table from combination of fields and first row of data'''
+    check_fields(context, data_dict.get('fields'))
+    pass
+
+def insert_data(context, data_dict):
+    '''insert all data from records'''
+    pass
+
+def create(context, data_dict):
     '''
     The first row will be used to guess types not in the fields and the
     guessed types will be added to the headers permanently.
@@ -22,4 +73,25 @@ def create(resource_id, fields, rows):
     Any error results in total failure! For now pass back the actual error.
     Should be transactional.
     '''
-    pass
+
+    engine = _get_engine(context, {'connection_type': 'write'})
+    context['connection'] = engine.connect()
+    ## close connection at all cost.
+    try:
+        ## check if table already existes
+        trans = context['connection'].begin()
+        result = context['connection'].execute(
+            'select * from pg_tables where tablename = %s',
+             data_dict['resource_id']
+        ).fetchone()
+        if not result:
+            create_table(context, data_dict)
+        else:
+            alter_table(context, data_dict)
+        insert_data(context, data_dict)
+    except:
+        trans.rollback()
+        raise
+    finally:
+        context['connection'].close()
+
diff --git a/ckanext/datastore/logic/action/create.py b/ckanext/datastore/logic/action/create.py
index c7e02d70237..ca0321bf8fb 100644
--- a/ckanext/datastore/logic/action/create.py
+++ b/ckanext/datastore/logic/action/create.py
@@ -30,14 +30,17 @@ def datastore_create(context, data_dict):
     model = _get_or_bust(context, 'model')
     resource_id = _get_or_bust(data_dict, 'resource_id')
     fields = data_dict.get('fields')
-    records = _get_or_bust(data_dict, 'records')
+    records = data_dict.get('records')
 
     _check_access('datastore_create', context, data_dict)
 
-    schema = ckanext.datastore.logic.schema.default_datastore_create_schema()
-    data, errors = _validate(data_dict, schema, context)
-    if errors:
-        model.Session.rollback()
-        raise p.toolkit.ValidationError(errors)
+    # Not sure need schema as will be too dificulut to make 
+    # as records could be deeply nested..
 
-    return db.create(resource_id, fields, records)
+    #schema = ckanext.datastore.logic.schema.default_datastore_create_schema()
+    #data, errors = _validate(data_dict, schema, context)
+    #if errors:
+    #    model.Session.rollback()
+    #    raise p.toolkit.ValidationError(errors)
+
+    return db.create(context, data_dict)

From 9bb2462a8a913e8d0ea75234113bb04f468e70c9 Mon Sep 17 00:00:00 2001
From: John Glover <j@johnglover.net>
Date: Wed, 25 Jul 2012 10:34:31 +0100
Subject: [PATCH 004/130] Check for datastore_write_url at startup, pass to db
 from logic functions. Don't validate fields and records.

---
 ckanext/datastore/db.py                  | 35 ++++++++++++++----------
 ckanext/datastore/logic/action/create.py | 21 +++++++-------
 ckanext/datastore/logic/schema.py        | 11 +-------
 ckanext/datastore/plugin.py              | 11 ++++++++
 4 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
index 4951987e660..dccd1c2cfe8 100644
--- a/ckanext/datastore/db.py
+++ b/ckanext/datastore/db.py
@@ -1,23 +1,25 @@
 import sqlalchemy
-from pylons import config
 
 _pg_types = {}
 _type_names = set()
 _engines = {}
 
+
+class InvalidType(Exception):
+    pass
+
+
 def _get_engine(context, data_dict):
-    ''' Get either read or write engine'''
-    connection_type = data_dict.get('connection_type', 'write')
-    engine = _engines.get(connection_type)
+    '''Get either read or write engine'''
+    connection_url = data_dict['connection_url']
+    engine = _engines.get(connection_url)
 
     if not engine:
-        config_option = 'ckan.datastore_{}_url'.format(connection_type)
-        url = config.get(config_option)
-        assert url, 'Config option ' + config_option + ' not defined'
-        engine = sqlalchemy.create_engine(url)
-        _engines[connection_type] = engine
+        engine = sqlalchemy.create_engine(connection_url)
+        _engines[connection_url] = engine
     return engine
 
+
 def _cache_types(context, data_dict=None):
     if not _pg_types:
         connection = context['connection']
@@ -28,29 +30,35 @@ def _cache_types(context, data_dict=None):
             _pg_types[result[0]] = result[1]
             _type_names.add(result[1])
 
+
 def _get_type(context, oid):
     _cache_types(context)
     return _pg_types[oid]
 
+
 def check_fields(context, fields):
     _cache_types(context)
     ## check if fieds are in in _type_names
     pass
 
+
 def create_table(context, data_dict):
     '''create table from combination of fields and first row of data'''
     check_fields(context, data_dict.get('fields'))
     pass
 
+
 def alter_table(context, data_dict):
     '''alter table from combination of fields and first row of data'''
     check_fields(context, data_dict.get('fields'))
     pass
 
+
 def insert_data(context, data_dict):
     '''insert all data from records'''
     pass
 
+
 def create(context, data_dict):
     '''
     The first row will be used to guess types not in the fields and the
@@ -73,12 +81,12 @@ def create(context, data_dict):
     Any error results in total failure! For now pass back the actual error.
     Should be transactional.
     '''
-
-    engine = _get_engine(context, {'connection_type': 'write'})
+    engine = _get_engine(context, data_dict)
     context['connection'] = engine.connect()
-    ## close connection at all cost.
+
+    # close connection at all cost.
     try:
-        ## check if table already existes
+        # check if table already existes
         trans = context['connection'].begin()
         result = context['connection'].execute(
             'select * from pg_tables where tablename = %s',
@@ -94,4 +102,3 @@ def create(context, data_dict):
         raise
     finally:
         context['connection'].close()
-
diff --git a/ckanext/datastore/logic/action/create.py b/ckanext/datastore/logic/action/create.py
index ca0321bf8fb..879ec7d32e6 100644
--- a/ckanext/datastore/logic/action/create.py
+++ b/ckanext/datastore/logic/action/create.py
@@ -1,4 +1,5 @@
 import logging
+import pylons
 import ckan.logic as logic
 import ckan.logic.action
 import ckan.lib.dictization
@@ -28,19 +29,19 @@ def datastore_create(context, data_dict):
 
     '''
     model = _get_or_bust(context, 'model')
-    resource_id = _get_or_bust(data_dict, 'resource_id')
-    fields = data_dict.get('fields')
-    records = data_dict.get('records')
 
     _check_access('datastore_create', context, data_dict)
 
-    # Not sure need schema as will be too dificulut to make 
-    # as records could be deeply nested..
+    # TODO: remove this check for resource ID when the resource_id_exists
+    #       validator has been created.
+    _get_or_bust(data_dict, 'resource_id')
 
-    #schema = ckanext.datastore.logic.schema.default_datastore_create_schema()
-    #data, errors = _validate(data_dict, schema, context)
-    #if errors:
-    #    model.Session.rollback()
-    #    raise p.toolkit.ValidationError(errors)
+    schema = ckanext.datastore.logic.schema.default_datastore_create_schema()
+    data, errors = _validate(data_dict, schema, context)
+    if errors:
+        model.Session.rollback()
+        raise p.toolkit.ValidationError(errors)
+
+    data_dict['connection_url'] = pylons.config['ckan.datastore_write_url']
 
     return db.create(context, data_dict)
diff --git a/ckanext/datastore/logic/schema.py b/ckanext/datastore/logic/schema.py
index 595d753d169..7c1f170e95e 100644
--- a/ckanext/datastore/logic/schema.py
+++ b/ckanext/datastore/logic/schema.py
@@ -1,23 +1,14 @@
 from ckan.lib.navl.validators import (not_empty,
                                       not_missing,
                                       empty,
-                                      ignore_missing,
                                       ignore)
 
 
-def default_fields_schema():
-    return {
-        'id': [not_missing, not_empty, unicode],
-        'type': [not_missing, not_empty, unicode],
-        'label': [ignore_missing, unicode],
-    }
-
-
 def default_datastore_create_schema():
     # TODO: resource_id should have a resource_id_exists validator
     return {
         'resource_id': [not_missing, not_empty, unicode],
-        'fields': default_fields_schema(),
+        'fields': [ignore],
         'records': [ignore],
         '__extras': [empty],
     }
diff --git a/ckanext/datastore/plugin.py b/ckanext/datastore/plugin.py
index 2cb6730d714..ab2fee05fb2 100644
--- a/ckanext/datastore/plugin.py
+++ b/ckanext/datastore/plugin.py
@@ -3,13 +3,24 @@
 import ckanext.datastore.logic.auth.create as auth_create
 
 
+class DatastoreException(Exception):
+    pass
+
+
 class DatastorePlugin(p.SingletonPlugin):
     '''
     Datastore plugin.
     '''
+    p.implements(p.IConfigurable, inherit=True)
     p.implements(p.IActions)
     p.implements(p.IAuthFunctions)
 
+    def configure(self, config):
+        # check for ckan.datastore_write_url
+        if (not 'ckan.datastore_write_url' in config):
+            error_msg = 'ckan.datastore_write_url not found in config'
+            raise DatastoreException(error_msg)
+
     def get_actions(self):
         return {'datastore_create': action_create.datastore_create}
 

From cce90af7663ab747426ad9165879ebd6c2c025da Mon Sep 17 00:00:00 2001
From: John Glover <j@johnglover.net>
Date: Wed, 25 Jul 2012 11:30:46 +0100
Subject: [PATCH 005/130] Check field types, raise an error if any are invalid.

---
 ckanext/datastore/db.py                   | 10 ++++++----
 ckanext/datastore/logic/action/create.py  |  5 ++++-
 ckanext/datastore/tests/test_datastore.py | 14 ++++++++++++++
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
index dccd1c2cfe8..7b4850edea0 100644
--- a/ckanext/datastore/db.py
+++ b/ckanext/datastore/db.py
@@ -10,7 +10,7 @@ class InvalidType(Exception):
 
 
 def _get_engine(context, data_dict):
-    '''Get either read or write engine'''
+    'Get either read or write engine.'
     connection_url = data_dict['connection_url']
     engine = _engines.get(connection_url)
 
@@ -20,7 +20,7 @@ def _get_engine(context, data_dict):
     return engine
 
 
-def _cache_types(context, data_dict=None):
+def _cache_types(context):
     if not _pg_types:
         connection = context['connection']
         results = connection.execute(
@@ -37,9 +37,11 @@ def _get_type(context, oid):
 
 
 def check_fields(context, fields):
+    'Check if field types are valid.'
     _cache_types(context)
-    ## check if fieds are in in _type_names
-    pass
+    for field in fields:
+        if not field['type'] in _type_names:
+            raise InvalidType('%s is not a valid type' % field['type'])
 
 
 def create_table(context, data_dict):
diff --git a/ckanext/datastore/logic/action/create.py b/ckanext/datastore/logic/action/create.py
index 879ec7d32e6..f2a59d144b5 100644
--- a/ckanext/datastore/logic/action/create.py
+++ b/ckanext/datastore/logic/action/create.py
@@ -44,4 +44,7 @@ def datastore_create(context, data_dict):
 
     data_dict['connection_url'] = pylons.config['ckan.datastore_write_url']
 
-    return db.create(context, data_dict)
+    try:
+        return db.create(context, data_dict)
+    except db.InvalidType as e:
+        raise p.toolkit.ValidationError({'fields': e.message})
diff --git a/ckanext/datastore/tests/test_datastore.py b/ckanext/datastore/tests/test_datastore.py
index 71dad80b1b9..efa98e3788a 100644
--- a/ckanext/datastore/tests/test_datastore.py
+++ b/ckanext/datastore/tests/test_datastore.py
@@ -38,6 +38,20 @@ def test_create_requires_auth(self):
         res_dict = json.loads(res.body)
         assert res_dict['success'] is False
 
+    def test_create_invalid_field(self):
+        resource = model.Package.get('annakarenina').resources[0]
+        data = {
+            'resource_id': resource.id,
+            'fields': [{'id': 'book', 'label': 'Name', 'type': 'INVALID'},
+                       {'id': 'author', 'label': 'Author ', 'type': 'INVALID'}]
+        }
+        postparams = '%s=1' % json.dumps(data)
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
+        res = self.app.post('/api/action/datastore_create', params=postparams,
+                            extra_environ=auth, status=409)
+        res_dict = json.loads(res.body)
+        assert res_dict['success'] is False
+
     def test_create_basic(self):
         resource = model.Package.get('annakarenina').resources[0]
         data = {

From c1926898a885a1e46e7e3931275228dc49cd471c Mon Sep 17 00:00:00 2001
From: John Glover <j@johnglover.net>
Date: Wed, 25 Jul 2012 14:59:42 +0100
Subject: [PATCH 006/130] [#2733] Add basic create table functionality.

---
 ckanext/datastore/db.py                   | 72 +++++++++++++++++++++--
 ckanext/datastore/logic/action/create.py  |  5 +-
 ckanext/datastore/tests/test_datastore.py | 44 +++++++++++---
 3 files changed, 102 insertions(+), 19 deletions(-)

diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
index 7b4850edea0..e388bd3694e 100644
--- a/ckanext/datastore/db.py
+++ b/ckanext/datastore/db.py
@@ -1,12 +1,20 @@
 import sqlalchemy
+import ckan.plugins as p
 
 _pg_types = {}
 _type_names = set()
 _engines = {}
 
 
-class InvalidType(Exception):
-    pass
+def _is_valid_field_name(name):
+    '''
+    Check that field name is valid:
+    * can't start with underscore
+    * can't contain double quote (")
+    '''
+    if name.startswith('_') or '"' in name:
+        return False
+    return True
 
 
 def _get_engine(context, data_dict):
@@ -36,24 +44,75 @@ def _get_type(context, oid):
     return _pg_types[oid]
 
 
+def _guess_type(field):
+    'Simple guess type of field, only allowed are integer, numeric and text'
+    data_types = set([int, float])
+
+    for data_type in list(data_types):
+        try:
+            data_type(field)
+        except (TypeError, ValueError):
+            data_types.discard(data_type)
+            if not data_types:
+                break
+
+    if int in data_types:
+        return 'integer'
+    elif float in data_types:
+        return 'numeric'
+    else:
+        return 'text'
+
+
 def check_fields(context, fields):
     'Check if field types are valid.'
     _cache_types(context)
     for field in fields:
         if not field['type'] in _type_names:
-            raise InvalidType('%s is not a valid type' % field['type'])
+            raise p.toolkit.ValidationError({
+                'fields': '{0} is not a valid field type'.format(field['type'])
+            })
+        elif not _is_valid_field_name(field['id']):
+            raise p.toolkit.ValidationError({
+                'fields': '{0} is not a valid field name'.format(field['id'])
+            })
 
 
 def create_table(context, data_dict):
-    '''create table from combination of fields and first row of data'''
+    'Create table from combination of fields and first row of data.'
     check_fields(context, data_dict.get('fields'))
-    pass
+
+    create_string = 'create table "{0}" ('.format(data_dict['resource_id'])
+
+    # add datastore fields: _id and _full_text
+    create_string += '_id serial primary key, '
+    create_string += '_full_text tsvector, '
+
+    # add fields
+    for field in data_dict.get('fields'):
+        create_string += '"{0}" {1}, '.format(field['id'], field['type'])
+
+    # check first row of data for additional fields
+    field_ids = [field['id'] for field in data_dict.get('fields', [])]
+    records = data_dict.get('records')
+    if records:
+        extra_field_ids = records[0].keys()
+        for field_id in extra_field_ids:
+            if not field_id in field_ids:
+                field_type = _guess_type(records[0][field_id])
+                create_string += '"{0}" {1}, '.format(field_id, field_type)
+
+    # remove last 2 characters (a comma and a space)
+    # and close the create table statement
+    create_string = create_string[0:len(create_string) - 2]
+    create_string += ');'
+
+    context['connection'].execute(create_string)
 
 
 def alter_table(context, data_dict):
     '''alter table from combination of fields and first row of data'''
     check_fields(context, data_dict.get('fields'))
-    pass
 
 
 def insert_data(context, data_dict):
@@ -99,6 +158,7 @@ def create(context, data_dict):
         else:
             alter_table(context, data_dict)
         insert_data(context, data_dict)
+        return data_dict
     except:
         trans.rollback()
         raise
diff --git a/ckanext/datastore/logic/action/create.py b/ckanext/datastore/logic/action/create.py
index f2a59d144b5..879ec7d32e6 100644
--- a/ckanext/datastore/logic/action/create.py
+++ b/ckanext/datastore/logic/action/create.py
@@ -44,7 +44,4 @@ def datastore_create(context, data_dict):
 
     data_dict['connection_url'] = pylons.config['ckan.datastore_write_url']
 
-    try:
-        return db.create(context, data_dict)
-    except db.InvalidType as e:
-        raise p.toolkit.ValidationError({'fields': e.message})
+    return db.create(context, data_dict)
diff --git a/ckanext/datastore/tests/test_datastore.py b/ckanext/datastore/tests/test_datastore.py
index efa98e3788a..271bc5222b5 100644
--- a/ckanext/datastore/tests/test_datastore.py
+++ b/ckanext/datastore/tests/test_datastore.py
@@ -20,30 +20,45 @@ def setup_class(cls):
     def teardown_class(cls):
         model.repo.rebuild_db()
 
+    def test_create_requires_auth(self):
+        resource = model.Package.get('annakarenina').resources[0]
+        data = {
+            'resource_id': resource.id
+        }
+        postparams = '%s=1' % json.dumps(data)
+        res = self.app.post('/api/action/datastore_create', params=postparams,
+                            status=403)
+        res_dict = json.loads(res.body)
+        assert res_dict['success'] is False
+
     def test_create_empty_fails(self):
         postparams = '%s=1' % json.dumps({})
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
         res = self.app.post('/api/action/datastore_create', params=postparams,
-                            status=409)
+                            extra_environ=auth, status=409)
         res_dict = json.loads(res.body)
         assert res_dict['success'] is False
 
-    def test_create_requires_auth(self):
+    def test_create_invalid_field_type(self):
         resource = model.Package.get('annakarenina').resources[0]
         data = {
-            'resource_id': resource.id
+            'resource_id': resource.id,
+            'fields': [{'id': 'book', 'type': 'INVALID'},
+                       {'id': 'author', 'type': 'INVALID'}]
         }
         postparams = '%s=1' % json.dumps(data)
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
         res = self.app.post('/api/action/datastore_create', params=postparams,
-                            status=403)
+                            extra_environ=auth, status=409)
         res_dict = json.loads(res.body)
         assert res_dict['success'] is False
 
-    def test_create_invalid_field(self):
+    def test_create_invalid_field_name(self):
         resource = model.Package.get('annakarenina').resources[0]
         data = {
             'resource_id': resource.id,
-            'fields': [{'id': 'book', 'label': 'Name', 'type': 'INVALID'},
-                       {'id': 'author', 'label': 'Author ', 'type': 'INVALID'}]
+            'fields': [{'id': '_book', 'type': 'text'},
+                       {'id': '_author', 'type': 'text'}]
         }
         postparams = '%s=1' % json.dumps(data)
         auth = {'Authorization': str(self.sysadmin_user.apikey)}
@@ -52,12 +67,23 @@ def test_create_invalid_field(self):
         res_dict = json.loads(res.body)
         assert res_dict['success'] is False
 
+        data = {
+            'resource_id': resource.id,
+            'fields': [{'id': '"book"', 'type': 'text'},
+                       {'id': '"author', 'type': 'text'}]
+        }
+        postparams = '%s=1' % json.dumps(data)
+        res = self.app.post('/api/action/datastore_create', params=postparams,
+                            extra_environ=auth, status=409)
+        res_dict = json.loads(res.body)
+        assert res_dict['success'] is False
+
     def test_create_basic(self):
         resource = model.Package.get('annakarenina').resources[0]
         data = {
             'resource_id': resource.id,
-            'fields': [{'id': 'book', 'label': 'Name', 'type': 'text'},
-                       {'id': 'author', 'label': 'Author ', 'type': 'text'}],
+            'fields': [{'id': 'book', 'type': 'text'},
+                       {'id': 'author', 'type': 'text'}],
             'records': [{'book': 'annakarenina', 'author': 'tolstoy'},
                         {'book': 'warandpeace', 'author': 'tolstoy'}]
         }

From 3a91c400bbedfb601cd7a616eadd16d8125d6c5f Mon Sep 17 00:00:00 2001
From: John Glover <j@johnglover.net>
Date: Wed, 25 Jul 2012 15:41:33 +0100
Subject: [PATCH 007/130] [#2733] Bug fix: commit transaction.

---
 ckanext/datastore/db.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
index e388bd3694e..c8c119cf69f 100644
--- a/ckanext/datastore/db.py
+++ b/ckanext/datastore/db.py
@@ -158,6 +158,7 @@ def create(context, data_dict):
         else:
             alter_table(context, data_dict)
         insert_data(context, data_dict)
+        trans.commit()
         return data_dict
     except:
         trans.rollback()

From 5ca857cabe6ef95e128173649af0b2cd450e7899 Mon Sep 17 00:00:00 2001
From: John Glover <j@johnglover.net>
Date: Wed, 25 Jul 2012 16:42:18 +0100
Subject: [PATCH 008/130] [#2733] Add insert_data function and update tests.

---
 ckanext/datastore/db.py                   | 56 ++++++++++++++++++++++-
 ckanext/datastore/tests/test_datastore.py | 25 ++++++++++
 2 files changed, 80 insertions(+), 1 deletion(-)

diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
index c8c119cf69f..eb70e5b5505 100644
--- a/ckanext/datastore/db.py
+++ b/ckanext/datastore/db.py
@@ -64,6 +64,20 @@ def _guess_type(field):
         return 'text'
 
 
+def _get_fields(context, data_dict):
+    fields = []
+    all_fields = context['connection'].execute(
+        'select * from "{0}" limit 1'.format(data_dict['resource_id'])
+    )
+    for field in all_fields.cursor.description:
+        if not field[0].startswith('_'):
+            fields.append({
+                'name': field[0],
+                'type': _get_type(context, field[1])
+            })
+    return fields
+
+
 def check_fields(context, fields):
     'Check if field types are valid.'
     _cache_types(context)
@@ -117,7 +131,47 @@ def alter_table(context, data_dict):
 
 def insert_data(context, data_dict):
     '''insert all data from records'''
-    pass
+    if not data_dict.get('records'):
+        return
+
+    fields = _get_fields(context, data_dict)
+    insert_string = ''
+
+    for record in data_dict['records']:
+        # check that number of record values is correct
+        # TODO: is this necessary?
+        if not len(record.keys()) == len(fields):
+            error_msg = 'Field count ({0}) does not match table ({1})'.format(
+                len(record.keys()), len(fields)
+            )
+            raise p.toolkit.ValidationError({
+                'records': error_msg
+            })
+
+        insert_string += 'insert into "{0}" ('.format(data_dict['resource_id'])
+
+        for field in fields:
+            insert_string += '"{0}", '.format(field['name'])
+        insert_string = insert_string[0:len(insert_string) - 2]
+        insert_string += ') '
+
+        insert_string += 'values ('
+
+        for field in fields:
+            if not field['name'] in record:
+                raise p.toolkit.ValidationError({
+                    'records': 'Field {0} not found'.format(field['name'])
+                })
+
+            if field['type'] == 'text':
+                insert_string += "'{0}', ".format(record[field['name']])
+            else:
+                insert_string += '{0}, '.format(record[field['name']])
+
+        insert_string = insert_string[0:len(insert_string) - 2]
+        insert_string += ');'
+
+    context['connection'].execute(insert_string)
 
 
 def create(context, data_dict):
diff --git a/ckanext/datastore/tests/test_datastore.py b/ckanext/datastore/tests/test_datastore.py
index 271bc5222b5..adfaa873d3b 100644
--- a/ckanext/datastore/tests/test_datastore.py
+++ b/ckanext/datastore/tests/test_datastore.py
@@ -78,6 +78,23 @@ def test_create_invalid_field_name(self):
         res_dict = json.loads(res.body)
         assert res_dict['success'] is False
 
+    def test_create_invalid_record_field(self):
+        resource = model.Package.get('annakarenina').resources[0]
+        data = {
+            'resource_id': resource.id,
+            'fields': [{'id': 'book', 'type': 'text'},
+                       {'id': 'author', 'type': 'text'}],
+            'records': [{'book': 'annakarenina', 'author': 'tolstoy'},
+                        {'book': 'warandpeace', 'published': '1869'}]
+        }
+        postparams = '%s=1' % json.dumps(data)
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
+        res = self.app.post('/api/action/datastore_create', params=postparams,
+                            extra_environ=auth, status=409)
+        res_dict = json.loads(res.body)
+
+        assert res_dict['success'] is False
+
     def test_create_basic(self):
         resource = model.Package.get('annakarenina').resources[0]
         data = {
@@ -97,3 +114,11 @@ def test_create_basic(self):
         assert res_dict['result']['resource_id'] == data['resource_id']
         assert res_dict['result']['fields'] == data['fields']
         assert res_dict['result']['records'] == data['records']
+
+        c = model.Session.connection()
+        results = c.execute('select * from "{0}"'.format(resource.id))
+
+        assert results.rowcount == 2
+        for i, row in enumerate(results):
+            assert data['records'][i]['book'] == row['book']
+            assert data['records'][i]['author'] == row['author']

From 0f3319b2fdf43ff25e56a45f9c06bafba4abc6ca Mon Sep 17 00:00:00 2001
From: John Glover <j@johnglover.net>
Date: Wed, 25 Jul 2012 16:54:03 +0100
Subject: [PATCH 009/130] [#2733] Refactor: tidy up insert sql statement.

---
 ckanext/datastore/db.py | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
index eb70e5b5505..4cbee51c0b2 100644
--- a/ckanext/datastore/db.py
+++ b/ckanext/datastore/db.py
@@ -135,7 +135,6 @@ def insert_data(context, data_dict):
         return
 
     fields = _get_fields(context, data_dict)
-    insert_string = ''
 
     for record in data_dict['records']:
         # check that number of record values is correct
@@ -148,14 +147,8 @@ def insert_data(context, data_dict):
                 'records': error_msg
             })
 
-        insert_string += 'insert into "{0}" ('.format(data_dict['resource_id'])
-
-        for field in fields:
-            insert_string += '"{0}", '.format(field['name'])
-        insert_string = insert_string[0:len(insert_string) - 2]
-        insert_string += ') '
-
-        insert_string += 'values ('
+        sql_columns = ", ".join(['"%s"' % f['name'] for f in fields])
+        sql_values = []
 
         for field in fields:
             if not field['name'] in record:
@@ -164,14 +157,19 @@ def insert_data(context, data_dict):
                 })
 
             if field['type'] == 'text':
-                insert_string += "'{0}', ".format(record[field['name']])
+                sql_values.append("'{0}'".format(record[field['name']]))
             else:
-                insert_string += '{0}, '.format(record[field['name']])
+                sql_values.append('{0}'.format(record[field['name']]))
 
-        insert_string = insert_string[0:len(insert_string) - 2]
-        insert_string += ');'
+        sql_values = ", ".join(['%s' % v for v in sql_values])
+
+        sql_string = 'insert into "{0}" ({1}) values ({2});'.format(
+            data_dict['resource_id'],
+            sql_columns,
+            sql_values
+        )
 
-    context['connection'].execute(insert_string)
+        context['connection'].execute(sql_string)
 
 
 def create(context, data_dict):

From a5d44a1dcfd45f031bb9365258def080fd02dec5 Mon Sep 17 00:00:00 2001
From: John Glover <j@johnglover.net>
Date: Wed, 25 Jul 2012 17:12:17 +0100
Subject: [PATCH 010/130] [#2733] Refactor: tidy up create sql statement.

---
 ckanext/datastore/db.py | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
index 4cbee51c0b2..18d0216fe3e 100644
--- a/ckanext/datastore/db.py
+++ b/ckanext/datastore/db.py
@@ -96,32 +96,35 @@ def create_table(context, data_dict):
     'Create table from combination of fields and first row of data.'
     check_fields(context, data_dict.get('fields'))
 
-    create_string = 'create table "{0}" ('.format(data_dict['resource_id'])
-
-    # add datastore fields: _id and _full_text
-    create_string += '_id serial primary key, '
-    create_string += '_full_text tsvector, '
-
-    # add fields
-    for field in data_dict.get('fields'):
-        create_string += '"{0}" {1}, '.format(field['id'], field['type'])
+    datastore_fields = [
+        {'id': '_id', 'type': 'serial primary key'},
+        {'id': '_full_text', 'type': 'tsvector'},
+    ]
 
     # check first row of data for additional fields
+    extra_fields = []
     field_ids = [field['id'] for field in data_dict.get('fields', [])]
     records = data_dict.get('records')
+
     if records:
         extra_field_ids = records[0].keys()
         for field_id in extra_field_ids:
             if not field_id in field_ids:
-                field_type = _guess_type(records[0][field_id])
-                create_string += '"{0}" {1}, '.format(field_id, field_type)
+                extra_fields.append({
+                    'id': field_id,
+                    'type': _guess_type(records[0][field_id])
+                })
+
+    fields = datastore_fields + data_dict.get('fields', []) + extra_fields
+    sql_fields = ", ".join(['"{0}" {1}'.format(f['id'], f['type'])
+                            for f in fields])
 
-    # remove last 2 characters (a comma and a space)
-    # and close the create table statement
-    create_string = create_string[0:len(create_string) - 2]
-    create_string += ');'
+    sql_string = 'create table "{0}" ({1});'.format(
+        data_dict['resource_id'],
+        sql_fields
+    )
 
-    context['connection'].execute(create_string)
+    context['connection'].execute(sql_string)
 
 
 def alter_table(context, data_dict):

From 981cf79e83153bdc4cd75d288939c70077d2b595 Mon Sep 17 00:00:00 2001
From: kindly <kindly@gmail.com>
Date: Sun, 29 Jul 2012 01:22:53 +0100
Subject: [PATCH 011/130] create finished apart from table update

---
 ckanext/datastore/db.py                   | 128 +++++++++++++++-------
 ckanext/datastore/logic/action/create.py  |   8 --
 ckanext/datastore/logic/auth/create.py    |   3 +
 ckanext/datastore/tests/test_datastore.py |  84 +++++++++++++-
 4 files changed, 173 insertions(+), 50 deletions(-)

diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
index 18d0216fe3e..273557f9e8b 100644
--- a/ckanext/datastore/db.py
+++ b/ckanext/datastore/db.py
@@ -1,10 +1,16 @@
 import sqlalchemy
 import ckan.plugins as p
+import json
+import datetime
 
 _pg_types = {}
 _type_names = set()
 _engines = {}
 
+_iso_formats = ['%Y-%m-%d',
+                '%Y-%m-%d %H:%M:%S',
+                '%Y-%m-%dT%H:%M:%S']
+
 
 def _is_valid_field_name(name):
     '''
@@ -23,7 +29,7 @@ def _get_engine(context, data_dict):
     engine = _engines.get(connection_url)
 
     if not engine:
-        engine = sqlalchemy.create_engine(connection_url)
+        engine = sqlalchemy.create_engine(connection_url, echo=True)
         _engines[connection_url] = engine
     return engine
 
@@ -55,13 +61,19 @@ def _guess_type(field):
             data_types.discard(data_type)
             if not data_types:
                 break
-
     if int in data_types:
         return 'integer'
     elif float in data_types:
         return 'numeric'
-    else:
-        return 'text'
+
+    ##try iso dates
+    for format in _iso_formats:
+        try:
+            datetime.datetime.strptime(field, format)
+            return 'timestamp'
+        except ValueError:
+            continue
+    return 'text'
 
 
 def _get_fields(context, data_dict):
@@ -72,17 +84,29 @@ def _get_fields(context, data_dict):
     for field in all_fields.cursor.description:
         if not field[0].startswith('_'):
             fields.append({
-                'name': field[0],
+                'id': field[0],
                 'type': _get_type(context, field[1])
             })
     return fields
 
+def json_get_values(obj, current_list=None):
+    if current_list is None:
+        current_list = []
+    if isinstance(obj, basestring):
+        current_list.append(obj)
+    if isinstance(obj, list):
+        for item in obj:
+            json_get_values(item, current_list)
+    if isinstance(obj, dict):
+        for item in dict.values():
+            json_get_values(item, current_list)
+    return current_list
 
 def check_fields(context, fields):
     'Check if field types are valid.'
     _cache_types(context)
     for field in fields:
-        if not field['type'] in _type_names:
+        if field.get('type') and not field['type'] in _type_names:
             raise p.toolkit.ValidationError({
                 'fields': '{0} is not a valid field type'.format(field['type'])
             })
@@ -103,19 +127,34 @@ def create_table(context, data_dict):
 
     # check first row of data for additional fields
     extra_fields = []
+    supplied_fields = data_dict.get('fields', [])
     field_ids = [field['id'] for field in data_dict.get('fields', [])]
     records = data_dict.get('records')
 
+    # if type is field is not given try and guess or throw an error
+    for field in supplied_fields:
+        if 'type' not in field:
+            if not records or field['id'] not in records[0]:
+                raise p.toolkit.ValidationError({
+                    'fields': '{} type not guessable'.format(field['id'])
+                })
+            field['type'] = _guess_type(records[0][field['id']])
+
     if records:
-        extra_field_ids = records[0].keys()
-        for field_id in extra_field_ids:
+        # check record for sanity
+        if not isinstance(records[0], dict):
+            raise p.toolkit.ValidationError({
+                'records': 'The first row is not a json object'
+            })
+        supplied_field_ids = records[0].keys()
+        for field_id in supplied_field_ids:
             if not field_id in field_ids:
                 extra_fields.append({
                     'id': field_id,
                     'type': _guess_type(records[0][field_id])
                 })
 
-    fields = datastore_fields + data_dict.get('fields', []) + extra_fields
+    fields = datastore_fields + supplied_fields + extra_fields
     sql_fields = ", ".join(['"{0}" {1}'.format(f['id'], f['type'])
                             for f in fields])
 
@@ -130,6 +169,7 @@ def create_table(context, data_dict):
 def alter_table(context, data_dict):
     '''alter table from combination of fields and first row of data'''
     check_fields(context, data_dict.get('fields'))
+    fields = _get_fields(context, data_dict)
 
 
 def insert_data(context, data_dict):
@@ -138,41 +178,51 @@ def insert_data(context, data_dict):
         return
 
     fields = _get_fields(context, data_dict)
+    field_names = [field['id'] for field in fields] + ['_full_text']
+    sql_columns = ", ".join(['"%s"' % name for name in field_names])
+
+    rows = []
+
+    ## clean up and validate data
+    for num, record in enumerate(data_dict['records']):
 
-    for record in data_dict['records']:
-        # check that number of record values is correct
-        # TODO: is this necessary?
-        if not len(record.keys()) == len(fields):
-            error_msg = 'Field count ({0}) does not match table ({1})'.format(
-                len(record.keys()), len(fields)
-            )
+        # check record for sanity
+        if not isinstance(record, dict):
             raise p.toolkit.ValidationError({
-                'records': error_msg
+                'records': 'row {} is not a json object'.format(num)
+            })
+        ## check for extra fields in data
+        extra_keys = set(record.keys()) - set(field_names)
+        if extra_keys:
+            raise p.toolkit.ValidationError({
+                'records': 'row {} has extra keys "{}"'.format(
+                    num,
+                    ', '.join(list(extra_keys))
+                )
             })
 
-        sql_columns = ", ".join(['"%s"' % f['name'] for f in fields])
-        sql_values = []
-
+        full_text = []
+        row = []
         for field in fields:
-            if not field['name'] in record:
-                raise p.toolkit.ValidationError({
-                    'records': 'Field {0} not found'.format(field['name'])
-                })
-
-            if field['type'] == 'text':
-                sql_values.append("'{0}'".format(record[field['name']]))
-            else:
-                sql_values.append('{0}'.format(record[field['name']]))
-
-        sql_values = ", ".join(['%s' % v for v in sql_values])
-
-        sql_string = 'insert into "{0}" ({1}) values ({2});'.format(
-            data_dict['resource_id'],
-            sql_columns,
-            sql_values
-        )
+            value = record.get(field['id'])
+            if isinstance(value, (dict, list)):
+                full_text.extend(json_get_values(value))
+                value = json.dumps(value)
+            elif field['type'].lower() == 'text' and value:
+                full_text.append(value)
+            row.append(value)
+
+        row.append(' '.join(full_text))
+        rows.append(row)
+
+    sql_string = 'insert into "{0}" ({1}) values ({2});'.format(
+        data_dict['resource_id'],
+        sql_columns,
+        ', '.join(['%s' for field in field_names])
+    )
 
-        context['connection'].execute(sql_string)
+    
+    context['connection'].execute(sql_string, rows)
 
 
 def create(context, data_dict):
@@ -187,7 +237,7 @@ def create(context, data_dict):
     add extra information for certain columns or to explicitly
     define ordering.
 
-    eg [{"id": "dob", "label": ""Date of Birth",
+    eg [datetime.datetime.strptime(field, format){"id": "dob", "label": ""Date of Birth",
          "type": "timestamp" ,"concept": "day"},
         {"name": "some_stuff": ..].
 
diff --git a/ckanext/datastore/logic/action/create.py b/ckanext/datastore/logic/action/create.py
index 879ec7d32e6..ec29c1c0cf4 100644
--- a/ckanext/datastore/logic/action/create.py
+++ b/ckanext/datastore/logic/action/create.py
@@ -32,16 +32,8 @@ def datastore_create(context, data_dict):
 
     _check_access('datastore_create', context, data_dict)
 
-    # TODO: remove this check for resource ID when the resource_id_exists
-    #       validator has been created.
     _get_or_bust(data_dict, 'resource_id')
 
-    schema = ckanext.datastore.logic.schema.default_datastore_create_schema()
-    data, errors = _validate(data_dict, schema, context)
-    if errors:
-        model.Session.rollback()
-        raise p.toolkit.ValidationError(errors)
-
     data_dict['connection_url'] = pylons.config['ckan.datastore_write_url']
 
     return db.create(context, data_dict)
diff --git a/ckanext/datastore/logic/auth/create.py b/ckanext/datastore/logic/auth/create.py
index d5db8d0ebdf..2c51e55055b 100644
--- a/ckanext/datastore/logic/auth/create.py
+++ b/ckanext/datastore/logic/auth/create.py
@@ -1,4 +1,7 @@
 import ckan.plugins as p
+import ckan.logic as logic
+
+_check_access = logic.check_access
 
 
 def datastore_create(context, data_dict):
diff --git a/ckanext/datastore/tests/test_datastore.py b/ckanext/datastore/tests/test_datastore.py
index adfaa873d3b..b68c9c95fa4 100644
--- a/ckanext/datastore/tests/test_datastore.py
+++ b/ckanext/datastore/tests/test_datastore.py
@@ -3,6 +3,7 @@
 import ckan.lib.create_test_data as ctd
 import ckan.model as model
 import ckan.tests as tests
+import ckanext.datastore.db as db
 
 
 class TestDatastore(tests.WsgiAppCase):
@@ -92,9 +93,42 @@ def test_create_invalid_record_field(self):
         res = self.app.post('/api/action/datastore_create', params=postparams,
                             extra_environ=auth, status=409)
         res_dict = json.loads(res.body)
+        assert res_dict['success'] is False
+
+    def test_bad_records(self):
+        resource = model.Package.get('annakarenina').resources[0]
+        data = {
+            'resource_id': resource.id,
+            'fields': [{'id': 'book', 'type': 'text'},
+                       {'id': 'author', 'type': 'text'}],
+            'records': ['bad'] # treat author as null
+        }
+        postparams = '%s=1' % json.dumps(data)
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
+        res = self.app.post('/api/action/datastore_create', params=postparams,
+                            extra_environ=auth, status=409)
+        res_dict = json.loads(res.body)
+
+        assert res_dict['success'] is False
+
+        resource = model.Package.get('annakarenina').resources[0]
+        data = {
+            'resource_id': resource.id,
+            'fields': [{'id': 'book', 'type': 'text'},
+                       {'id': 'author', 'type': 'text'}],
+            'records': [{'book': 'annakarenina', 'author': 'tolstoy'},
+                        [],
+                        {'book': 'warandpeace'}] # treat author as null
+        }
+        postparams = '%s=1' % json.dumps(data)
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
+        res = self.app.post('/api/action/datastore_create', params=postparams,
+                            extra_environ=auth, status=409)
+        res_dict = json.loads(res.body)
 
         assert res_dict['success'] is False
 
+
     def test_create_basic(self):
         resource = model.Package.get('annakarenina').resources[0]
         data = {
@@ -102,7 +136,8 @@ def test_create_basic(self):
             'fields': [{'id': 'book', 'type': 'text'},
                        {'id': 'author', 'type': 'text'}],
             'records': [{'book': 'annakarenina', 'author': 'tolstoy'},
-                        {'book': 'warandpeace', 'author': 'tolstoy'}]
+                        {'book': 'crime', 'author': ['tolstoy', 'dostoevsky']},
+                        {'book': 'warandpeace'}] # treat author as null
         }
         postparams = '%s=1' % json.dumps(data)
         auth = {'Authorization': str(self.sysadmin_user.apikey)}
@@ -118,7 +153,50 @@ def test_create_basic(self):
         c = model.Session.connection()
         results = c.execute('select * from "{0}"'.format(resource.id))
 
+        assert results.rowcount == 3
+        for i, row in enumerate(results):
+            assert data['records'][i].get('book') == row['book']
+            assert (data['records'][i].get('author') == row['author'] 
+                    or data['records'][i].get('author') == json.loads(row['author']))
+
+        results = c.execute('''select * from "{0}" where _full_text @@ 'warandpeace' '''.format(resource.id))
+        assert results.rowcount == 1
+
+        results = c.execute('''select * from "{0}" where _full_text @@ 'tolstoy' '''.format(resource.id))
         assert results.rowcount == 2
+
+    def test_guess_types(self):
+        resource = model.Package.get('annakarenina').resources[1]
+        data = {
+            'resource_id': resource.id,
+            'fields': [{'id': 'author', 'type': 'text'},
+                       {'id': 'count'},
+                       {'id': 'book'},
+                       {'id': 'date'}],
+            'records': [{'book': 'annakarenina', 'author': 'tolstoy', 'count': 1,
+                         'date': '2005-12-01', 'count2' : 2},
+                        {'book': 'crime', 'author': ['tolstoy', 'dostoevsky']},
+                        {'book': 'warandpeace'}] # treat author as null
+        }
+        postparams = '%s=1' % json.dumps(data)
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
+        res = self.app.post('/api/action/datastore_create', params=postparams,
+                            extra_environ=auth)
+        res_dict = json.loads(res.body)
+
+        c = model.Session.connection()
+        results = c.execute('''select * from "{0}" '''.format(resource.id))
+        
+        types = [db._pg_types[field[1]] for field in results.cursor.description]
+
+        assert types == [u'int4', u'tsvector', u'text', u'int4', u'text', u'timestamp', u'int4'], types
+
+        assert results.rowcount == 3
         for i, row in enumerate(results):
-            assert data['records'][i]['book'] == row['book']
-            assert data['records'][i]['author'] == row['author']
+            assert data['records'][i].get('book') == row['book']
+            assert (data['records'][i].get('author') == row['author'] 
+                    or data['records'][i].get('author') == json.loads(row['author']))
+        
+
+
+

From ac3d2610ac4d26603f370d695f501e7bd02ed0ef Mon Sep 17 00:00:00 2001
From: kindly <kindly@gmail.com>
Date: Sun, 29 Jul 2012 01:47:22 +0100
Subject: [PATCH 012/130] change auth to resource update

---
 ckanext/datastore/logic/action/create.py |  6 ++++++
 ckanext/datastore/logic/auth/create.py   | 14 +++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/ckanext/datastore/logic/action/create.py b/ckanext/datastore/logic/action/create.py
index ec29c1c0cf4..de518ac0ad7 100644
--- a/ckanext/datastore/logic/action/create.py
+++ b/ckanext/datastore/logic/action/create.py
@@ -34,6 +34,12 @@ def datastore_create(context, data_dict):
 
     _get_or_bust(data_dict, 'resource_id')
 
+    #schema = ckanext.datastore.logic.schema.default_datastore_create_schema()
+    #data, errors = _validate(data_dict, schema, context)
+    #if errors:
+    #    model.Session.rollback()
+    #    raise p.toolkit.ValidationError(errors)
+
     data_dict['connection_url'] = pylons.config['ckan.datastore_write_url']
 
     return db.create(context, data_dict)
diff --git a/ckanext/datastore/logic/auth/create.py b/ckanext/datastore/logic/auth/create.py
index 2c51e55055b..a13210a82da 100644
--- a/ckanext/datastore/logic/auth/create.py
+++ b/ckanext/datastore/logic/auth/create.py
@@ -1,15 +1,15 @@
 import ckan.plugins as p
 import ckan.logic as logic
+from ckan.lib.base import _
 
 _check_access = logic.check_access
 
-
 def datastore_create(context, data_dict):
-    model = context['model']
-    user = context['user']
-    userobj = model.User.get(user)
+    data_dict['id'] = data_dict.get('resource_id')
+
+    authorized = _check_access('resource_update', context, data_dict)
 
-    if userobj:
+    if not authorized:
+        return {'success': False, 'msg': _('User %s not authorized to read edit %s') % (str(user), resource.id)}
+    else:
         return {'success': True}
-    return {'success': False,
-            'msg': p.toolkit._('You must be logged in to use the datastore.')}

From 1195ca73ab20727e29bf239f716ca50bb41bca9b Mon Sep 17 00:00:00 2001
From: kindly <kindly@gmail.com>
Date: Mon, 30 Jul 2012 01:12:38 +0100
Subject: [PATCH 013/130] [2722] finish datastore create

---
 ckanext/datastore/db.py                   |  56 ++++++++-
 ckanext/datastore/tests/test_datastore.py | 132 +++++++++++++++++++++-
 2 files changed, 180 insertions(+), 8 deletions(-)

diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
index 273557f9e8b..5e16314783c 100644
--- a/ckanext/datastore/db.py
+++ b/ckanext/datastore/db.py
@@ -118,7 +118,6 @@ def check_fields(context, fields):
 
 def create_table(context, data_dict):
     'Create table from combination of fields and first row of data.'
-    check_fields(context, data_dict.get('fields'))
 
     datastore_fields = [
         {'id': '_id', 'type': 'serial primary key'},
@@ -128,6 +127,7 @@ def create_table(context, data_dict):
     # check first row of data for additional fields
     extra_fields = []
     supplied_fields = data_dict.get('fields', [])
+    check_fields(context, supplied_fields)
     field_ids = [field['id'] for field in data_dict.get('fields', [])]
     records = data_dict.get('records')
 
@@ -168,8 +168,56 @@ def create_table(context, data_dict):
 
 def alter_table(context, data_dict):
     '''alter table from combination of fields and first row of data'''
-    check_fields(context, data_dict.get('fields'))
-    fields = _get_fields(context, data_dict)
+    supplied_fields = data_dict.get('fields', [])
+    current_fields = _get_fields(context, data_dict)
+    if not supplied_fields:
+        supplied_fields = current_fields
+    check_fields(context, supplied_fields)
+    field_ids = [field['id'] for field in supplied_fields]
+    records = data_dict.get('records')
+    new_fields = []
+
+    for num, field in enumerate(supplied_fields):
+        # check to see if field definition is the same or an
+        # extension of current fields
+        if num < len(current_fields):
+            if field['id'] <> current_fields[num]['id']:
+                raise p.toolkit.ValidationError({
+                    'fields': ('Supplied field "{}" not '
+                              'present or in wrong order').format(field['id'])
+                })
+            ## no need to check type as field already defined.
+            continue
+
+        if 'type' not in field:
+            if not records or field['id'] not in records[0]:
+                raise p.toolkit.ValidationError({
+                    'fields': '{} type not guessable'.format(field['id'])
+                })
+            field['type'] = _guess_type(records[0][field['id']])
+        new_fields.append(field)
+
+    if records:
+        # check record for sanity
+        if not isinstance(records[0], dict):
+            raise p.toolkit.ValidationError({
+                'records': 'The first row is not a json object'
+            })
+        supplied_field_ids = records[0].keys()
+        for field_id in supplied_field_ids:
+            if not field_id in field_ids:
+                new_fields.append({
+                    'id': field_id,
+                    'type': _guess_type(records[0][field_id])
+                })
+
+
+    for field in new_fields:
+        sql = 'alter table "{}" add "{}" {}'.format(
+            data_dict['resource_id'],
+            field['id'],
+            field['type'])
+        context['connection'].execute(sql)
 
 
 def insert_data(context, data_dict):
@@ -221,7 +269,7 @@ def insert_data(context, data_dict):
         ', '.join(['%s' for field in field_names])
     )
 
-    
+
     context['connection'].execute(sql_string, rows)
 
 
diff --git a/ckanext/datastore/tests/test_datastore.py b/ckanext/datastore/tests/test_datastore.py
index b68c9c95fa4..95c87552ef4 100644
--- a/ckanext/datastore/tests/test_datastore.py
+++ b/ckanext/datastore/tests/test_datastore.py
@@ -156,7 +156,7 @@ def test_create_basic(self):
         assert results.rowcount == 3
         for i, row in enumerate(results):
             assert data['records'][i].get('book') == row['book']
-            assert (data['records'][i].get('author') == row['author'] 
+            assert (data['records'][i].get('author') == row['author']
                     or data['records'][i].get('author') == json.loads(row['author']))
 
         results = c.execute('''select * from "{0}" where _full_text @@ 'warandpeace' '''.format(resource.id))
@@ -164,6 +164,68 @@ def test_create_basic(self):
 
         results = c.execute('''select * from "{0}" where _full_text @@ 'tolstoy' '''.format(resource.id))
         assert results.rowcount == 2
+        model.Session.remove()
+
+        #######  insert again simple
+        data2 = {
+            'resource_id': resource.id,
+            'records': [{'book': 'hagji murat', 'author': 'tolstoy'}]
+        }
+
+        postparams = '%s=1' % json.dumps(data2)
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
+        res = self.app.post('/api/action/datastore_create', params=postparams,
+                            extra_environ=auth)
+        res_dict = json.loads(res.body)
+
+        assert res_dict['success'] is True
+
+        c = model.Session.connection()
+        results = c.execute('select * from "{0}"'.format(resource.id))
+
+        assert results.rowcount == 4
+
+        all_data = data['records'] + data2['records']
+        for i, row in enumerate(results):
+            assert all_data[i].get('book') == row['book']
+            assert (all_data[i].get('author') == row['author']
+                    or all_data[i].get('author') == json.loads(row['author']))
+
+        results = c.execute('''select * from "{0}" where _full_text @@ 'tolstoy' '''.format(resource.id))
+        assert results.rowcount == 3
+        model.Session.remove()
+
+        #######  insert again extra field
+        data3 = {
+            'resource_id': resource.id,
+            'records': [{'book': 'crime and punsihment',
+                         'author': 'dostoevsky', 'rating': 'good'}]
+        }
+
+        postparams = '%s=1' % json.dumps(data3)
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
+        res = self.app.post('/api/action/datastore_create', params=postparams,
+                            extra_environ=auth)
+        res_dict = json.loads(res.body)
+
+        assert res_dict['success'] is True
+
+        c = model.Session.connection()
+        results = c.execute('select * from "{0}"'.format(resource.id))
+
+        assert results.rowcount == 5
+
+        all_data = data['records'] + data2['records'] + data3['records']
+        print all_data
+        for i, row in enumerate(results):
+            assert all_data[i].get('book') == row['book'], (i, all_data[i].get('book'), row['book'])
+            assert (all_data[i].get('author') == row['author']
+                    or all_data[i].get('author') == json.loads(row['author']))
+
+        results = c.execute('''select * from "{0}" where _full_text @@ 'dostoevsky' '''.format(resource.id))
+        assert results.rowcount == 2
+        model.Session.remove()
+
 
     def test_guess_types(self):
         resource = model.Package.get('annakarenina').resources[1]
@@ -186,7 +248,7 @@ def test_guess_types(self):
 
         c = model.Session.connection()
         results = c.execute('''select * from "{0}" '''.format(resource.id))
-        
+
         types = [db._pg_types[field[1]] for field in results.cursor.description]
 
         assert types == [u'int4', u'tsvector', u'text', u'int4', u'text', u'timestamp', u'int4'], types
@@ -194,9 +256,71 @@ def test_guess_types(self):
         assert results.rowcount == 3
         for i, row in enumerate(results):
             assert data['records'][i].get('book') == row['book']
-            assert (data['records'][i].get('author') == row['author'] 
+            assert (data['records'][i].get('author') == row['author']
                     or data['records'][i].get('author') == json.loads(row['author']))
-        
+        model.Session.remove()
 
+        ### extend types
 
+        data = {
+            'resource_id': resource.id,
+            'fields': [{'id': 'author', 'type': 'text'},
+                       {'id': 'count'},
+                       {'id': 'book'},
+                       {'id': 'date'},
+                       {'id': 'count2'},
+                       {'id': 'extra', 'type':'text'},
+                       {'id': 'date2'},
+                      ],
+            'records': [{'book': 'annakarenina', 'author': 'tolstoy', 'count': 1,
+                         'date': '2005-12-01', 'count2' : 2, 'count3': 432,
+                         'date2': '2005-12-01'}]
+        }
 
+        postparams = '%s=1' % json.dumps(data)
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
+        res = self.app.post('/api/action/datastore_create', params=postparams,
+                            extra_environ=auth)
+        res_dict = json.loads(res.body)
+
+        c = model.Session.connection()
+        results = c.execute('''select * from "{0}" '''.format(resource.id))
+
+        types = [db._pg_types[field[1]] for field in results.cursor.description]
+
+        assert types == [u'int4', #id
+                         u'tsvector', #fulltext
+                         u'text', #author
+                         u'int4', #count
+                         u'text', #book
+                         u'timestamp', #date
+                         u'int4', #count2
+                         u'text', #extra
+                         u'timestamp', #date2
+                         u'int4', #count3
+                        ], types
+
+        ### fields resupplied in wrong order
+
+        data = {
+            'resource_id': resource.id,
+            'fields': [{'id': 'author', 'type': 'text'},
+                       {'id': 'count'},
+                       {'id': 'date'},  ## date and book in wrong order
+                       {'id': 'book'},
+                       {'id': 'count2'},
+                       {'id': 'extra', 'type':'text'},
+                       {'id': 'date2'},
+                      ],
+            'records': [{'book': 'annakarenina', 'author': 'tolstoy', 'count': 1,
+                         'date': '2005-12-01', 'count2' : 2, 'count3': 432,
+                         'date2': '2005-12-01'}]
+        }
+
+        postparams = '%s=1' % json.dumps(data)
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
+        res = self.app.post('/api/action/datastore_create', params=postparams,
+                            extra_environ=auth, status=409)
+        res_dict = json.loads(res.body)
+
+        assert res_dict['success'] is False

From 785cd095c655d8922992d47bf5df78bc2bf93552 Mon Sep 17 00:00:00 2001
From: kindly <kindly@gmail.com>
Date: Mon, 30 Jul 2012 02:21:26 +0100
Subject: [PATCH 014/130] [2733] start delete

---
 ckanext/datastore/db.py                | 60 ++++++++++++++++++++++++++
 ckanext/datastore/logic/auth/create.py |  4 +-
 2 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
index 5e16314783c..5d4cbfa3772 100644
--- a/ckanext/datastore/db.py
+++ b/ckanext/datastore/db.py
@@ -272,6 +272,37 @@ def insert_data(context, data_dict):
 
     context['connection'].execute(sql_string, rows)
 
+def delete_data(context, data_dict):
+    filter = data_dict.get('filter')
+
+    if not isinstance(filter, dict):
+        raise p.toolkit.ValidationError({
+            'filter': 'Not a json object'}
+        )
+
+    fields = _get_fields(context, data_dict)
+    field_ids = set([field['id'] for field in fields])
+
+    where_clauses = []
+    values = []
+    for field, value in filter.iteritems():
+        if field not in field_ids:
+            raise p.toolkit.ValidationError({
+                'filter': 'field "{}" not in table'}
+            )
+        where_clauses.append('"{}" = %s'.format(field))
+        values.append(value)
+
+    where_clause = ' and '.join(where_clauses)
+
+    context['connection'].execute(
+        'delete from "{}" where {}'.format(
+            data_dict['resource_id'],
+            where_clause
+        ),
+        values
+    )
+
 
 def create(context, data_dict):
     '''
@@ -318,3 +349,32 @@ def create(context, data_dict):
         raise
     finally:
         context['connection'].close()
+
+def delete(context, data_dict):
+    engine = _get_engine(context, data_dict)
+    context['connection'] = engine.connect()
+
+    try:
+        # check if table existes
+        trans = context['connection'].begin()
+        result = context['connection'].execute(
+            'select * from pg_tables where tablename = %s',
+             data_dict['resource_id']
+        ).fetchone()
+        if not result:
+            raise p.toolkit.ValidationError({
+                'resource_id': 'table for {0} does not exist'.format(
+                    data_dict['resource_id'])
+            })
+        if not 'filter' in data_dict:
+            context['connection'].execute('drop table "{}"'.format(data_dict))
+        else:
+            delete_data(context, data_dict)
+
+        trans.commit()
+        return data_dict
+    except:
+        trans.rollback()
+        raise
+    finally:
+        context['connection'].close()
diff --git a/ckanext/datastore/logic/auth/create.py b/ckanext/datastore/logic/auth/create.py
index a13210a82da..f833df841c0 100644
--- a/ckanext/datastore/logic/auth/create.py
+++ b/ckanext/datastore/logic/auth/create.py
@@ -6,10 +6,12 @@
 
 def datastore_create(context, data_dict):
     data_dict['id'] = data_dict.get('resource_id')
+    user = context.get('user')
 
     authorized = _check_access('resource_update', context, data_dict)
 
     if not authorized:
-        return {'success': False, 'msg': _('User %s not authorized to read edit %s') % (str(user), resource.id)}
+        return {'success': False,
+                'msg': _('User %s not authorized to read edit %s') % (str(user), data_dict['id'])}
     else:
         return {'success': True}

From 5f9cae9ba7dc3a009f66fef27b88f23227d16306 Mon Sep 17 00:00:00 2001
From: kindly <kindly@gmail.com>
Date: Mon, 30 Jul 2012 10:00:53 +0100
Subject: [PATCH 015/130] [2733] add delete logic files

---
 ckanext/datastore/db.py                  |  2 +-
 ckanext/datastore/logic/action/delete.py | 37 ++++++++++++++++++++++++
 ckanext/datastore/logic/auth/delete.py   | 17 +++++++++++
 3 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 ckanext/datastore/logic/action/delete.py
 create mode 100644 ckanext/datastore/logic/auth/delete.py

diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
index 5d4cbfa3772..061deb89e0a 100644
--- a/ckanext/datastore/db.py
+++ b/ckanext/datastore/db.py
@@ -363,7 +363,7 @@ def delete(context, data_dict):
         ).fetchone()
         if not result:
             raise p.toolkit.ValidationError({
-                'resource_id': 'table for {0} does not exist'.format(
+                'resource_id': 'table for resource {0} does not exist'.format(
                     data_dict['resource_id'])
             })
         if not 'filter' in data_dict:
diff --git a/ckanext/datastore/logic/action/delete.py b/ckanext/datastore/logic/action/delete.py
new file mode 100644
index 00000000000..5243bf3b7f9
--- /dev/null
+++ b/ckanext/datastore/logic/action/delete.py
@@ -0,0 +1,37 @@
+import logging
+import pylons
+import ckan.logic as logic
+import ckan.logic.action
+import ckan.lib.dictization
+import ckan.plugins as p
+import ckanext.datastore.logic.schema
+import ckanext.datastore.db as db
+
+log = logging.getLogger(__name__)
+
+_validate = ckan.lib.navl.dictization_functions.validate
+_check_access = logic.check_access
+_get_or_bust = logic.get_or_bust
+
+
+def datastore_delete(context, data_dict):
+    '''Adds a new table to the datastore.
+
+    :param resource_id: resource id that the data is going to be stored under.
+    :type resource_id: string
+    :param filter: Filter to do deleting on over eg {'name': 'fred'} if missing 
+    delete whole table
+
+    :returns: original filters sent.
+    :rtype: dictionary
+
+    '''
+    model = _get_or_bust(context, 'model')
+
+    _check_access('datastore_delete', context, data_dict)
+
+    _get_or_bust(data_dict, 'resource_id')
+
+    data_dict['connection_url'] = pylons.config['ckan.datastore_write_url']
+
+    return db.delete(context, data_dict)
diff --git a/ckanext/datastore/logic/auth/delete.py b/ckanext/datastore/logic/auth/delete.py
new file mode 100644
index 00000000000..2e3992cf873
--- /dev/null
+++ b/ckanext/datastore/logic/auth/delete.py
@@ -0,0 +1,17 @@
+import ckan.plugins as p
+import ckan.logic as logic
+from ckan.lib.base import _
+
+_check_access = logic.check_access
+
+def datastore_delete(context, data_dict):
+    data_dict['id'] = data_dict.get('resource_id')
+    user = context.get('user')
+
+    authorized = _check_access('resource_update', context, data_dict)
+
+    if not authorized:
+        return {'success': False,
+                'msg': _('User %s not authorized to read edit %s') % (str(user), data_dict['id'])}
+    else:
+        return {'success': True}

From 8a93747b541aac6a3d87f04c96c89af67919a6cd Mon Sep 17 00:00:00 2001
From: John Glover <j@johnglover.net>
Date: Mon, 30 Jul 2012 11:13:10 +0100
Subject: [PATCH 016/130] [#2733] Datastore PEP8 cleanup.

---
 ckanext/datastore/db.py                   | 13 +++---
 ckanext/datastore/logic/action/create.py  | 14 ++-----
 ckanext/datastore/logic/auth/create.py    |  5 ++-
 ckanext/datastore/tests/test_datastore.py | 49 +++++++++++------------
 4 files changed, 37 insertions(+), 44 deletions(-)

diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
index 061deb89e0a..be077274987 100644
--- a/ckanext/datastore/db.py
+++ b/ckanext/datastore/db.py
@@ -89,6 +89,7 @@ def _get_fields(context, data_dict):
             })
     return fields
 
+
 def json_get_values(obj, current_list=None):
     if current_list is None:
         current_list = []
@@ -102,6 +103,7 @@ def json_get_values(obj, current_list=None):
             json_get_values(item, current_list)
     return current_list
 
+
 def check_fields(context, fields):
     'Check if field types are valid.'
     _cache_types(context)
@@ -181,7 +183,7 @@ def alter_table(context, data_dict):
         # check to see if field definition is the same or an
         # extension of current fields
         if num < len(current_fields):
-            if field['id'] <> current_fields[num]['id']:
+            if field['id'] != current_fields[num]['id']:
                 raise p.toolkit.ValidationError({
                     'fields': ('Supplied field "{}" not '
                               'present or in wrong order').format(field['id'])
@@ -211,7 +213,6 @@ def alter_table(context, data_dict):
                     'type': _guess_type(records[0][field_id])
                 })
 
-
     for field in new_fields:
         sql = 'alter table "{}" add "{}" {}'.format(
             data_dict['resource_id'],
@@ -269,9 +270,9 @@ def insert_data(context, data_dict):
         ', '.join(['%s' for field in field_names])
     )
 
-
     context['connection'].execute(sql_string, rows)
 
+
 def delete_data(context, data_dict):
     filter = data_dict.get('filter')
 
@@ -316,9 +317,8 @@ def create(context, data_dict):
     add extra information for certain columns or to explicitly
     define ordering.
 
-    eg [datetime.datetime.strptime(field, format){"id": "dob", "label": ""Date of Birth",
-         "type": "timestamp" ,"concept": "day"},
-        {"name": "some_stuff": ..].
+    eg: [{"id": "dob", "type": "timestamp"},
+         {"id": "name", "type": "text"}]
 
     A header items values can not be changed after it has been defined
     nor can the ordering of them be changed. They can be extended though.
@@ -350,6 +350,7 @@ def create(context, data_dict):
     finally:
         context['connection'].close()
 
+
 def delete(context, data_dict):
     engine = _get_engine(context, data_dict)
     context['connection'] = engine.connect()
diff --git a/ckanext/datastore/logic/action/create.py b/ckanext/datastore/logic/action/create.py
index de518ac0ad7..58ef8ce96dc 100644
--- a/ckanext/datastore/logic/action/create.py
+++ b/ckanext/datastore/logic/action/create.py
@@ -3,8 +3,6 @@
 import ckan.logic as logic
 import ckan.logic.action
 import ckan.lib.dictization
-import ckan.plugins as p
-import ckanext.datastore.logic.schema
 import ckanext.datastore.db as db
 
 log = logging.getLogger(__name__)
@@ -28,17 +26,11 @@ def datastore_create(context, data_dict):
     :rtype: dictionary
 
     '''
-    model = _get_or_bust(context, 'model')
-
-    _check_access('datastore_create', context, data_dict)
-
+    _get_or_bust(context, 'model')
     _get_or_bust(data_dict, 'resource_id')
+    # TODO: check that resource_id exists in database
 
-    #schema = ckanext.datastore.logic.schema.default_datastore_create_schema()
-    #data, errors = _validate(data_dict, schema, context)
-    #if errors:
-    #    model.Session.rollback()
-    #    raise p.toolkit.ValidationError(errors)
+    _check_access('datastore_create', context, data_dict)
 
     data_dict['connection_url'] = pylons.config['ckan.datastore_write_url']
 
diff --git a/ckanext/datastore/logic/auth/create.py b/ckanext/datastore/logic/auth/create.py
index f833df841c0..f5c881a930c 100644
--- a/ckanext/datastore/logic/auth/create.py
+++ b/ckanext/datastore/logic/auth/create.py
@@ -1,9 +1,9 @@
-import ckan.plugins as p
 import ckan.logic as logic
 from ckan.lib.base import _
 
 _check_access = logic.check_access
 
+
 def datastore_create(context, data_dict):
     data_dict['id'] = data_dict.get('resource_id')
     user = context.get('user')
@@ -12,6 +12,7 @@ def datastore_create(context, data_dict):
 
     if not authorized:
         return {'success': False,
-                'msg': _('User %s not authorized to read edit %s') % (str(user), data_dict['id'])}
+                'msg': _('User %s not authorized to read edit %s') % \
+                    (str(user), data_dict['id'])}
     else:
         return {'success': True}
diff --git a/ckanext/datastore/tests/test_datastore.py b/ckanext/datastore/tests/test_datastore.py
index 95c87552ef4..bf5c7c7adf3 100644
--- a/ckanext/datastore/tests/test_datastore.py
+++ b/ckanext/datastore/tests/test_datastore.py
@@ -118,7 +118,7 @@ def test_bad_records(self):
                        {'id': 'author', 'type': 'text'}],
             'records': [{'book': 'annakarenina', 'author': 'tolstoy'},
                         [],
-                        {'book': 'warandpeace'}] # treat author as null
+                        {'book': 'warandpeace'}]  # treat author as null
         }
         postparams = '%s=1' % json.dumps(data)
         auth = {'Authorization': str(self.sysadmin_user.apikey)}
@@ -128,7 +128,6 @@ def test_bad_records(self):
 
         assert res_dict['success'] is False
 
-
     def test_create_basic(self):
         resource = model.Package.get('annakarenina').resources[0]
         data = {
@@ -137,7 +136,7 @@ def test_create_basic(self):
                        {'id': 'author', 'type': 'text'}],
             'records': [{'book': 'annakarenina', 'author': 'tolstoy'},
                         {'book': 'crime', 'author': ['tolstoy', 'dostoevsky']},
-                        {'book': 'warandpeace'}] # treat author as null
+                        {'book': 'warandpeace'}]  # treat author as null
         }
         postparams = '%s=1' % json.dumps(data)
         auth = {'Authorization': str(self.sysadmin_user.apikey)}
@@ -226,7 +225,6 @@ def test_create_basic(self):
         assert results.rowcount == 2
         model.Session.remove()
 
-
     def test_guess_types(self):
         resource = model.Package.get('annakarenina').resources[1]
         data = {
@@ -235,10 +233,10 @@ def test_guess_types(self):
                        {'id': 'count'},
                        {'id': 'book'},
                        {'id': 'date'}],
-            'records': [{'book': 'annakarenina', 'author': 'tolstoy', 'count': 1,
-                         'date': '2005-12-01', 'count2' : 2},
+            'records': [{'book': 'annakarenina', 'author': 'tolstoy',
+                         'count': 1, 'date': '2005-12-01', 'count2': 2},
                         {'book': 'crime', 'author': ['tolstoy', 'dostoevsky']},
-                        {'book': 'warandpeace'}] # treat author as null
+                        {'book': 'warandpeace'}]  # treat author as null
         }
         postparams = '%s=1' % json.dumps(data)
         auth = {'Authorization': str(self.sysadmin_user.apikey)}
@@ -251,7 +249,8 @@ def test_guess_types(self):
 
         types = [db._pg_types[field[1]] for field in results.cursor.description]
 
-        assert types == [u'int4', u'tsvector', u'text', u'int4', u'text', u'timestamp', u'int4'], types
+        assert types == [u'int4', u'tsvector', u'text', u'int4',
+                         u'text', u'timestamp', u'int4'], types
 
         assert results.rowcount == 3
         for i, row in enumerate(results):
@@ -272,9 +271,9 @@ def test_guess_types(self):
                        {'id': 'extra', 'type':'text'},
                        {'id': 'date2'},
                       ],
-            'records': [{'book': 'annakarenina', 'author': 'tolstoy', 'count': 1,
-                         'date': '2005-12-01', 'count2' : 2, 'count3': 432,
-                         'date2': '2005-12-01'}]
+            'records': [{'book': 'annakarenina', 'author': 'tolstoy',
+                         'count': 1, 'date': '2005-12-01', 'count2': 2,
+                         'count3': 432, 'date2': '2005-12-01'}]
         }
 
         postparams = '%s=1' % json.dumps(data)
@@ -288,16 +287,16 @@ def test_guess_types(self):
 
         types = [db._pg_types[field[1]] for field in results.cursor.description]
 
-        assert types == [u'int4', #id
-                         u'tsvector', #fulltext
-                         u'text', #author
-                         u'int4', #count
-                         u'text', #book
-                         u'timestamp', #date
-                         u'int4', #count2
-                         u'text', #extra
-                         u'timestamp', #date2
-                         u'int4', #count3
+        assert types == [u'int4',  # id
+                         u'tsvector',  # fulltext
+                         u'text',  # author
+                         u'int4',  # count
+                         u'text',  # book
+                         u'timestamp',  # date
+                         u'int4',  # count2
+                         u'text',  # extra
+                         u'timestamp',  # date2
+                         u'int4',  # count3
                         ], types
 
         ### fields resupplied in wrong order
@@ -306,15 +305,15 @@ def test_guess_types(self):
             'resource_id': resource.id,
             'fields': [{'id': 'author', 'type': 'text'},
                        {'id': 'count'},
-                       {'id': 'date'},  ## date and book in wrong order
+                       {'id': 'date'},  # date and book in wrong order
                        {'id': 'book'},
                        {'id': 'count2'},
                        {'id': 'extra', 'type':'text'},
                        {'id': 'date2'},
                       ],
-            'records': [{'book': 'annakarenina', 'author': 'tolstoy', 'count': 1,
-                         'date': '2005-12-01', 'count2' : 2, 'count3': 432,
-                         'date2': '2005-12-01'}]
+            'records': [{'book': 'annakarenina', 'author': 'tolstoy',
+                         'count': 1, 'date': '2005-12-01', 'count2': 2,
+                         'count3': 432, 'date2': '2005-12-01'}]
         }
 
         postparams = '%s=1' % json.dumps(data)

From 5daba25f33b9b7c2021c0a879e65e7be3f81e43c Mon Sep 17 00:00:00 2001
From: John Glover <j@johnglover.net>
Date: Mon, 30 Jul 2012 11:50:29 +0100
Subject: [PATCH 017/130] [#2733] Fix datastore delete (no filters).

Add basic datastore delete test.

Fix bug in create/delete: make sure extra information
that was put into the data_dict is not returned
from the logic function.
---
 ckanext/datastore/db.py                   |  4 ++-
 ckanext/datastore/logic/action/create.py  |  5 ++-
 ckanext/datastore/logic/action/delete.py  | 20 +++++------
 ckanext/datastore/logic/auth/delete.py    |  5 +--
 ckanext/datastore/plugin.py               |  8 +++--
 ckanext/datastore/tests/test_datastore.py | 44 ++++++++++++++++++++++-
 6 files changed, 69 insertions(+), 17 deletions(-)

diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
index be077274987..1ab51c991fa 100644
--- a/ckanext/datastore/db.py
+++ b/ckanext/datastore/db.py
@@ -368,7 +368,9 @@ def delete(context, data_dict):
                     data_dict['resource_id'])
             })
         if not 'filter' in data_dict:
-            context['connection'].execute('drop table "{}"'.format(data_dict))
+            context['connection'].execute(
+                'drop table "{}"'.format(data_dict['resource_id'])
+            )
         else:
             delete_data(context, data_dict)
 
diff --git a/ckanext/datastore/logic/action/create.py b/ckanext/datastore/logic/action/create.py
index 58ef8ce96dc..86f22245449 100644
--- a/ckanext/datastore/logic/action/create.py
+++ b/ckanext/datastore/logic/action/create.py
@@ -34,4 +34,7 @@ def datastore_create(context, data_dict):
 
     data_dict['connection_url'] = pylons.config['ckan.datastore_write_url']
 
-    return db.create(context, data_dict)
+    result = db.create(context, data_dict)
+    result.pop('id')
+    result.pop('connection_url')
+    return result
diff --git a/ckanext/datastore/logic/action/delete.py b/ckanext/datastore/logic/action/delete.py
index 5243bf3b7f9..9abc0e4700b 100644
--- a/ckanext/datastore/logic/action/delete.py
+++ b/ckanext/datastore/logic/action/delete.py
@@ -3,8 +3,6 @@
 import ckan.logic as logic
 import ckan.logic.action
 import ckan.lib.dictization
-import ckan.plugins as p
-import ckanext.datastore.logic.schema
 import ckanext.datastore.db as db
 
 log = logging.getLogger(__name__)
@@ -15,23 +13,25 @@
 
 
 def datastore_delete(context, data_dict):
-    '''Adds a new table to the datastore.
+    '''Deletes a table from the datastore.
 
-    :param resource_id: resource id that the data is going to be stored under.
+    :param resource_id: resource id that the data will be deleted from.
     :type resource_id: string
-    :param filter: Filter to do deleting on over eg {'name': 'fred'} if missing 
-    delete whole table
+    :param filter: filter to do deleting on over (eg {'name': 'fred'}).
+                   If missing delete whole table.
 
     :returns: original filters sent.
     :rtype: dictionary
 
     '''
-    model = _get_or_bust(context, 'model')
+    _get_or_bust(context, 'model')
+    _get_or_bust(data_dict, 'resource_id')
 
     _check_access('datastore_delete', context, data_dict)
 
-    _get_or_bust(data_dict, 'resource_id')
-
     data_dict['connection_url'] = pylons.config['ckan.datastore_write_url']
 
-    return db.delete(context, data_dict)
+    result = db.delete(context, data_dict)
+    result.pop('id')
+    result.pop('connection_url')
+    return result
diff --git a/ckanext/datastore/logic/auth/delete.py b/ckanext/datastore/logic/auth/delete.py
index 2e3992cf873..ebd9a57e667 100644
--- a/ckanext/datastore/logic/auth/delete.py
+++ b/ckanext/datastore/logic/auth/delete.py
@@ -1,9 +1,9 @@
-import ckan.plugins as p
 import ckan.logic as logic
 from ckan.lib.base import _
 
 _check_access = logic.check_access
 
+
 def datastore_delete(context, data_dict):
     data_dict['id'] = data_dict.get('resource_id')
     user = context.get('user')
@@ -12,6 +12,7 @@ def datastore_delete(context, data_dict):
 
     if not authorized:
         return {'success': False,
-                'msg': _('User %s not authorized to read edit %s') % (str(user), data_dict['id'])}
+                'msg': _('User %s not authorized to read edit %s') % \
+                    (str(user), data_dict['id'])}
     else:
         return {'success': True}
diff --git a/ckanext/datastore/plugin.py b/ckanext/datastore/plugin.py
index ab2fee05fb2..c6984c70dda 100644
--- a/ckanext/datastore/plugin.py
+++ b/ckanext/datastore/plugin.py
@@ -1,6 +1,8 @@
 import ckan.plugins as p
 import ckanext.datastore.logic.action.create as action_create
+import ckanext.datastore.logic.action.delete as action_delete
 import ckanext.datastore.logic.auth.create as auth_create
+import ckanext.datastore.logic.auth.delete as auth_delete
 
 
 class DatastoreException(Exception):
@@ -22,7 +24,9 @@ def configure(self, config):
             raise DatastoreException(error_msg)
 
     def get_actions(self):
-        return {'datastore_create': action_create.datastore_create}
+        return {'datastore_create': action_create.datastore_create,
+                'datastore_delete': action_delete.datastore_delete}
 
     def get_auth_functions(self):
-        return {'datastore_create': auth_create.datastore_create}
+        return {'datastore_create': auth_create.datastore_create,
+                'datastore_delete': auth_delete.datastore_delete}
diff --git a/ckanext/datastore/tests/test_datastore.py b/ckanext/datastore/tests/test_datastore.py
index bf5c7c7adf3..ae51e180660 100644
--- a/ckanext/datastore/tests/test_datastore.py
+++ b/ckanext/datastore/tests/test_datastore.py
@@ -6,7 +6,7 @@
 import ckanext.datastore.db as db
 
 
-class TestDatastore(tests.WsgiAppCase):
+class TestDatastoreCreate(tests.WsgiAppCase):
     sysadmin_user = None
     normal_user = None
 
@@ -323,3 +323,45 @@ def test_guess_types(self):
         res_dict = json.loads(res.body)
 
         assert res_dict['success'] is False
+
+
+class TestDatastoreDelete(tests.WsgiAppCase):
+    sysadmin_user = None
+    normal_user = None
+
+    @classmethod
+    def setup_class(cls):
+        p.load('datastore')
+        ctd.CreateTestData.create()
+        cls.sysadmin_user = model.User.get('testsysadmin')
+        cls.normal_user = model.User.get('annafan')
+
+    @classmethod
+    def teardown_class(cls):
+        model.repo.rebuild_db()
+
+    def setup(self):
+        resource = model.Package.get('annakarenina').resources[0]
+        self.data = {
+            'resource_id': resource.id,
+            'fields': [{'id': 'book', 'type': 'text'},
+                       {'id': 'author', 'type': 'text'}],
+            'records': [{'book': 'annakarenina', 'author': 'tolstoy'},
+                        {'book': 'crime', 'author': ['tolstoy', 'dostoevsky']}]
+        }
+        postparams = '%s=1' % json.dumps(self.data)
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
+        res = self.app.post('/api/action/datastore_create', params=postparams,
+                            extra_environ=auth)
+        res_dict = json.loads(res.body)
+        assert res_dict['success'] is True
+
+    def test_delete_basic(self):
+        data = {'resource_id': self.data['resource_id']}
+        postparams = '%s=1' % json.dumps(data)
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
+        res = self.app.post('/api/action/datastore_delete', params=postparams,
+                            extra_environ=auth)
+        res_dict = json.loads(res.body)
+        assert res_dict['success'] is True
+        assert res_dict['result'] == data

From 7e31f903d23185ac3f34a2b50174e0a10db105eb Mon Sep 17 00:00:00 2001
From: John Glover <j@johnglover.net>
Date: Mon, 30 Jul 2012 12:06:13 +0100
Subject: [PATCH 018/130] [#2733] Update basic delete test: make sure table has
 actually been deleted.

---
 ckanext/datastore/tests/test_datastore.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/ckanext/datastore/tests/test_datastore.py b/ckanext/datastore/tests/test_datastore.py
index ae51e180660..0b858a72bfe 100644
--- a/ckanext/datastore/tests/test_datastore.py
+++ b/ckanext/datastore/tests/test_datastore.py
@@ -1,4 +1,5 @@
 import json
+import sqlalchemy
 import ckan.plugins as p
 import ckan.lib.create_test_data as ctd
 import ckan.model as model
@@ -357,7 +358,8 @@ def setup(self):
         assert res_dict['success'] is True
 
     def test_delete_basic(self):
-        data = {'resource_id': self.data['resource_id']}
+        id = self.data['resource_id']
+        data = {'resource_id': id}
         postparams = '%s=1' % json.dumps(data)
         auth = {'Authorization': str(self.sysadmin_user.apikey)}
         res = self.app.post('/api/action/datastore_delete', params=postparams,
@@ -365,3 +367,14 @@ def test_delete_basic(self):
         res_dict = json.loads(res.body)
         assert res_dict['success'] is True
         assert res_dict['result'] == data
+
+        c = model.Session.connection()
+
+        try:
+            # check that data was actually deleted: this should raise a
+            # ProgrammingError as the table should not exist any more
+            c.execute('select * from "{0}";'.format(id))
+            raise Exception("Data not deleted")
+        except sqlalchemy.exc.ProgrammingError as e:
+            expected_msg = 'relation "{}" does not exist'.format(id)
+            assert expected_msg in str(e)

From 81816553cc282c8b80de684843e572dff45f2e5c Mon Sep 17 00:00:00 2001
From: John Glover <j@johnglover.net>
Date: Mon, 30 Jul 2012 14:16:05 +0100
Subject: [PATCH 019/130] [#2733] Check that resource ID exists for
 create/delete logic functions. Add test for deleting invalid resource ID.

---
 ckanext/datastore/logic/action/create.py  | 18 ++++++++--------
 ckanext/datastore/logic/action/delete.py  | 17 +++++++--------
 ckanext/datastore/tests/test_datastore.py | 25 ++++++++++++++++-------
 3 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/ckanext/datastore/logic/action/create.py b/ckanext/datastore/logic/action/create.py
index 86f22245449..73272aaafa7 100644
--- a/ckanext/datastore/logic/action/create.py
+++ b/ckanext/datastore/logic/action/create.py
@@ -1,14 +1,10 @@
 import logging
 import pylons
 import ckan.logic as logic
-import ckan.logic.action
-import ckan.lib.dictization
+import ckan.plugins as p
 import ckanext.datastore.db as db
 
 log = logging.getLogger(__name__)
-
-_validate = ckan.lib.navl.dictization_functions.validate
-_check_access = logic.check_access
 _get_or_bust = logic.get_or_bust
 
 
@@ -26,11 +22,15 @@ def datastore_create(context, data_dict):
     :rtype: dictionary
 
     '''
-    _get_or_bust(context, 'model')
-    _get_or_bust(data_dict, 'resource_id')
-    # TODO: check that resource_id exists in database
+    model = _get_or_bust(context, 'model')
+    id = _get_or_bust(data_dict, 'resource_id')
+
+    if not model.Resource.get(id):
+        raise p.toolkit.ObjectNotFound(p.toolkit._(
+            'Resource "{}" was not found.'.format(id)
+        ))
 
-    _check_access('datastore_create', context, data_dict)
+    p.toolkit.check_access('datastore_create', context, data_dict)
 
     data_dict['connection_url'] = pylons.config['ckan.datastore_write_url']
 
diff --git a/ckanext/datastore/logic/action/delete.py b/ckanext/datastore/logic/action/delete.py
index 9abc0e4700b..25ec50887c0 100644
--- a/ckanext/datastore/logic/action/delete.py
+++ b/ckanext/datastore/logic/action/delete.py
@@ -1,14 +1,10 @@
 import logging
 import pylons
 import ckan.logic as logic
-import ckan.logic.action
-import ckan.lib.dictization
+import ckan.plugins as p
 import ckanext.datastore.db as db
 
 log = logging.getLogger(__name__)
-
-_validate = ckan.lib.navl.dictization_functions.validate
-_check_access = logic.check_access
 _get_or_bust = logic.get_or_bust
 
 
@@ -24,10 +20,15 @@ def datastore_delete(context, data_dict):
     :rtype: dictionary
 
     '''
-    _get_or_bust(context, 'model')
-    _get_or_bust(data_dict, 'resource_id')
+    model = _get_or_bust(context, 'model')
+    id = _get_or_bust(data_dict, 'resource_id')
+
+    if not model.Resource.get(id):
+        raise p.toolkit.ObjectNotFound(p.toolkit._(
+            'Resource "{}" was not found.'.format(id)
+        ))
 
-    _check_access('datastore_delete', context, data_dict)
+    p.toolkit.check_access('datastore_delete', context, data_dict)
 
     data_dict['connection_url'] = pylons.config['ckan.datastore_write_url']
 
diff --git a/ckanext/datastore/tests/test_datastore.py b/ckanext/datastore/tests/test_datastore.py
index 0b858a72bfe..8c85b5ec819 100644
--- a/ckanext/datastore/tests/test_datastore.py
+++ b/ckanext/datastore/tests/test_datastore.py
@@ -336,20 +336,20 @@ def setup_class(cls):
         ctd.CreateTestData.create()
         cls.sysadmin_user = model.User.get('testsysadmin')
         cls.normal_user = model.User.get('annafan')
-
-    @classmethod
-    def teardown_class(cls):
-        model.repo.rebuild_db()
-
-    def setup(self):
         resource = model.Package.get('annakarenina').resources[0]
-        self.data = {
+        cls.data = {
             'resource_id': resource.id,
             'fields': [{'id': 'book', 'type': 'text'},
                        {'id': 'author', 'type': 'text'}],
             'records': [{'book': 'annakarenina', 'author': 'tolstoy'},
                         {'book': 'crime', 'author': ['tolstoy', 'dostoevsky']}]
         }
+
+    @classmethod
+    def teardown_class(cls):
+        model.repo.rebuild_db()
+
+    def _create(self):
         postparams = '%s=1' % json.dumps(self.data)
         auth = {'Authorization': str(self.sysadmin_user.apikey)}
         res = self.app.post('/api/action/datastore_create', params=postparams,
@@ -358,6 +358,7 @@ def setup(self):
         assert res_dict['success'] is True
 
     def test_delete_basic(self):
+        self._create()
         id = self.data['resource_id']
         data = {'resource_id': id}
         postparams = '%s=1' % json.dumps(data)
@@ -378,3 +379,13 @@ def test_delete_basic(self):
         except sqlalchemy.exc.ProgrammingError as e:
             expected_msg = 'relation "{}" does not exist'.format(id)
             assert expected_msg in str(e)
+
+        model.Session.remove()
+
+    def test_delete_invalid_resource_id(self):
+        postparams = '%s=1' % json.dumps({'resource_id': 'bad'})
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
+        res = self.app.post('/api/action/datastore_delete', params=postparams,
+                            extra_environ=auth, status=404)
+        res_dict = json.loads(res.body)
+        assert res_dict['success'] is False

From e1c00b7b9bf02e4d9aa06a30fb77617a8b8d3684 Mon Sep 17 00:00:00 2001
From: John Glover <j@johnglover.net>
Date: Mon, 30 Jul 2012 14:21:13 +0100
Subject: [PATCH 020/130] [#2733] Remove schema for now as not used.

---
 ckanext/datastore/logic/schema.py | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 ckanext/datastore/logic/schema.py

diff --git a/ckanext/datastore/logic/schema.py b/ckanext/datastore/logic/schema.py
deleted file mode 100644
index 7c1f170e95e..00000000000
--- a/ckanext/datastore/logic/schema.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from ckan.lib.navl.validators import (not_empty,
-                                      not_missing,
-                                      empty,
-                                      ignore)
-
-
-def default_datastore_create_schema():
-    # TODO: resource_id should have a resource_id_exists validator
-    return {
-        'resource_id': [not_missing, not_empty, unicode],
-        'fields': [ignore],
-        'records': [ignore],
-        '__extras': [empty],
-    }

From d8fb53323ce4ddf3a8a845c01e6f685aa6ba2d32 Mon Sep 17 00:00:00 2001
From: John Glover <j@johnglover.net>
Date: Mon, 30 Jul 2012 15:21:45 +0100
Subject: [PATCH 021/130] [#2733] Test datastore delete filters.

---
 ckanext/datastore/db.py                   | 12 ++--
 ckanext/datastore/tests/test_datastore.py | 74 ++++++++++++++++++++---
 2 files changed, 73 insertions(+), 13 deletions(-)

diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
index 1ab51c991fa..929680e7111 100644
--- a/ckanext/datastore/db.py
+++ b/ckanext/datastore/db.py
@@ -274,11 +274,11 @@ def insert_data(context, data_dict):
 
 
 def delete_data(context, data_dict):
-    filter = data_dict.get('filter')
+    filters = data_dict.get('filters')
 
-    if not isinstance(filter, dict):
+    if not isinstance(filters, dict):
         raise p.toolkit.ValidationError({
-            'filter': 'Not a json object'}
+            'filters': 'Not a json object'}
         )
 
     fields = _get_fields(context, data_dict)
@@ -286,10 +286,10 @@ def delete_data(context, data_dict):
 
     where_clauses = []
     values = []
-    for field, value in filter.iteritems():
+    for field, value in filters.iteritems():
         if field not in field_ids:
             raise p.toolkit.ValidationError({
-                'filter': 'field "{}" not in table'}
+                'filters': 'field "{}" not in table'}
             )
         where_clauses.append('"{}" = %s'.format(field))
         values.append(value)
@@ -367,7 +367,7 @@ def delete(context, data_dict):
                 'resource_id': 'table for resource {0} does not exist'.format(
                     data_dict['resource_id'])
             })
-        if not 'filter' in data_dict:
+        if not 'filters' in data_dict:
             context['connection'].execute(
                 'drop table "{}"'.format(data_dict['resource_id'])
             )
diff --git a/ckanext/datastore/tests/test_datastore.py b/ckanext/datastore/tests/test_datastore.py
index 8c85b5ec819..b9d9afad75d 100644
--- a/ckanext/datastore/tests/test_datastore.py
+++ b/ckanext/datastore/tests/test_datastore.py
@@ -342,7 +342,7 @@ def setup_class(cls):
             'fields': [{'id': 'book', 'type': 'text'},
                        {'id': 'author', 'type': 'text'}],
             'records': [{'book': 'annakarenina', 'author': 'tolstoy'},
-                        {'book': 'crime', 'author': ['tolstoy', 'dostoevsky']}]
+                        {'book': 'warandpeace', 'author': 'tolstoy'}]
         }
 
     @classmethod
@@ -356,11 +356,10 @@ def _create(self):
                             extra_environ=auth)
         res_dict = json.loads(res.body)
         assert res_dict['success'] is True
+        return res_dict
 
-    def test_delete_basic(self):
-        self._create()
-        id = self.data['resource_id']
-        data = {'resource_id': id}
+    def _delete(self):
+        data = {'resource_id': self.data['resource_id']}
         postparams = '%s=1' % json.dumps(data)
         auth = {'Authorization': str(self.sysadmin_user.apikey)}
         res = self.app.post('/api/action/datastore_delete', params=postparams,
@@ -368,16 +367,21 @@ def test_delete_basic(self):
         res_dict = json.loads(res.body)
         assert res_dict['success'] is True
         assert res_dict['result'] == data
+        return res_dict
 
+    def test_delete_basic(self):
+        self._create()
+        self._delete()
+        resource_id = self.data['resource_id']
         c = model.Session.connection()
 
         try:
             # check that data was actually deleted: this should raise a
             # ProgrammingError as the table should not exist any more
-            c.execute('select * from "{0}";'.format(id))
+            c.execute('select * from "{0}";'.format(resource_id))
             raise Exception("Data not deleted")
         except sqlalchemy.exc.ProgrammingError as e:
-            expected_msg = 'relation "{}" does not exist'.format(id)
+            expected_msg = 'relation "{}" does not exist'.format(resource_id)
             assert expected_msg in str(e)
 
         model.Session.remove()
@@ -389,3 +393,59 @@ def test_delete_invalid_resource_id(self):
                             extra_environ=auth, status=404)
         res_dict = json.loads(res.body)
         assert res_dict['success'] is False
+
+    def test_delete_filters(self):
+        self._create()
+        resource_id = self.data['resource_id']
+
+        # try and delete just the 'warandpeace' row
+        data = {'resource_id': resource_id,
+                'filters': {'book': 'warandpeace'}}
+        postparams = '%s=1' % json.dumps(data)
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
+        res = self.app.post('/api/action/datastore_delete', params=postparams,
+                            extra_environ=auth)
+        res_dict = json.loads(res.body)
+        assert res_dict['success'] is True
+
+        c = model.Session.connection()
+        result = c.execute('select * from "{0}";'.format(resource_id))
+        results = [r for r in result]
+        assert len(results) == 1
+        assert results[0].book == 'annakarenina'
+        model.Session.remove()
+
+        # shouldn't delete anything
+        data = {'resource_id': resource_id,
+                'filters': {'book': 'annakarenina', 'author': 'bad'}}
+        postparams = '%s=1' % json.dumps(data)
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
+        res = self.app.post('/api/action/datastore_delete', params=postparams,
+                            extra_environ=auth)
+        res_dict = json.loads(res.body)
+        assert res_dict['success'] is True
+
+        c = model.Session.connection()
+        result = c.execute('select * from "{0}";'.format(resource_id))
+        results = [r for r in result]
+        assert len(results) == 1
+        assert results[0].book == 'annakarenina'
+        model.Session.remove()
+
+        # delete the 'annakarenina' row
+        data = {'resource_id': resource_id,
+                'filters': {'book': 'annakarenina', 'author': 'tolstoy'}}
+        postparams = '%s=1' % json.dumps(data)
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
+        res = self.app.post('/api/action/datastore_delete', params=postparams,
+                            extra_environ=auth)
+        res_dict = json.loads(res.body)
+        assert res_dict['success'] is True
+
+        c = model.Session.connection()
+        result = c.execute('select * from "{0}";'.format(resource_id))
+        results = [r for r in result]
+        assert len(results) == 0
+        model.Session.remove()
+
+        self._delete()

From 99e53587423e4a972ba1c4253b5aaf6475b0bd2f Mon Sep 17 00:00:00 2001
From: John Glover <j@johnglover.net>
Date: Tue, 31 Jul 2012 09:37:26 +0100
Subject: [PATCH 022/130] [#2733] Add code skeleton for datastore_search.

---
 ckanext/datastore/db.py                   | 24 ++++++++++
 ckanext/datastore/logic/action/get.py     | 57 +++++++++++++++++++++++
 ckanext/datastore/logic/auth/create.py    |  9 ++--
 ckanext/datastore/logic/auth/delete.py    |  9 ++--
 ckanext/datastore/logic/auth/get.py       | 15 ++++++
 ckanext/datastore/plugin.py               |  8 +++-
 ckanext/datastore/tests/test_datastore.py | 39 ++++++++++++++++
 7 files changed, 147 insertions(+), 14 deletions(-)
 create mode 100644 ckanext/datastore/logic/action/get.py
 create mode 100644 ckanext/datastore/logic/auth/get.py

diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
index 929680e7111..c87e1a2a555 100644
--- a/ckanext/datastore/db.py
+++ b/ckanext/datastore/db.py
@@ -305,6 +305,10 @@ def delete_data(context, data_dict):
     )
 
 
+def search_data(context, data_dict):
+    return data_dict
+
+
 def create(context, data_dict):
     '''
     The first row will be used to guess types not in the fields and the
@@ -381,3 +385,23 @@ def delete(context, data_dict):
         raise
     finally:
         context['connection'].close()
+
+
+def search(context, data_dict):
+    engine = _get_engine(context, data_dict)
+    context['connection'] = engine.connect()
+
+    try:
+        # check if table existes
+        result = context['connection'].execute(
+            'select * from pg_tables where tablename = %s',
+             data_dict['resource_id']
+        ).fetchone()
+        if not result:
+            raise p.toolkit.ValidationError({
+                'resource_id': 'table for resource {0} does not exist'.format(
+                    data_dict['resource_id'])
+            })
+        return search_data(context, data_dict)
+    finally:
+        context['connection'].close()
diff --git a/ckanext/datastore/logic/action/get.py b/ckanext/datastore/logic/action/get.py
new file mode 100644
index 00000000000..72ef2e5da2e
--- /dev/null
+++ b/ckanext/datastore/logic/action/get.py
@@ -0,0 +1,57 @@
+import logging
+import pylons
+import ckan.logic as logic
+import ckan.plugins as p
+import ckanext.datastore.db as db
+
+log = logging.getLogger(__name__)
+_get_or_bust = logic.get_or_bust
+
+
+def datastore_search(context, data_dict):
+    '''Search a datastore table.
+
+    :param resource_id: id of the data that is going to be selected.
+    :type resource_id: string
+    :param filters: matching conditions to select.
+    :type filters: dictionary
+    :param q: full text query
+    :type q: string
+    :param limit: maximum number of rows to return (default: 100)
+    :type limit: int
+    :param offset: offset the number of rows
+    :type offset: int
+    :param fields: ordered list of fields to return
+                   (default: all fields in original order)
+    :type fields: list of strings
+    :param sort: comma separated field names with ordering
+                 eg: "fieldname1, fieldname2 desc"
+    :type sort: string
+
+    :returns: a dictionary containing the search parameters and the
+              search results.
+              keys: fields: same as datastore_create accepts
+                    offset: query offset value
+                    limit: query limit value
+                    filters: query filters
+                    total: number of total matching records
+                    records: list of matching results
+    :rtype: dictionary
+
+    '''
+    model = _get_or_bust(context, 'model')
+    id = _get_or_bust(data_dict, 'resource_id')
+
+    if not model.Resource.get(id):
+        raise p.toolkit.ObjectNotFound(p.toolkit._(
+            'Resource "{}" was not found.'.format(id)
+        ))
+
+    p.toolkit.check_access('datastore_search', context, data_dict)
+
+    data_dict['connection_url'] = pylons.config['ckan.datastore_write_url']
+
+    result = db.search(context, data_dict)
+    result.pop('id')
+    result.pop('connection_url')
+    return result
diff --git a/ckanext/datastore/logic/auth/create.py b/ckanext/datastore/logic/auth/create.py
index f5c881a930c..095e358713a 100644
--- a/ckanext/datastore/logic/auth/create.py
+++ b/ckanext/datastore/logic/auth/create.py
@@ -1,18 +1,15 @@
-import ckan.logic as logic
-from ckan.lib.base import _
-
-_check_access = logic.check_access
+import ckan.plugins as p
 
 
 def datastore_create(context, data_dict):
     data_dict['id'] = data_dict.get('resource_id')
     user = context.get('user')
 
-    authorized = _check_access('resource_update', context, data_dict)
+    authorized = p.toolkit.check_access('resource_update', context, data_dict)
 
     if not authorized:
         return {'success': False,
-                'msg': _('User %s not authorized to read edit %s') % \
+                'msg': p.toolkit._('User %s not authorized to read edit %s') %\
                     (str(user), data_dict['id'])}
     else:
         return {'success': True}
diff --git a/ckanext/datastore/logic/auth/delete.py b/ckanext/datastore/logic/auth/delete.py
index ebd9a57e667..186fc24e4f0 100644
--- a/ckanext/datastore/logic/auth/delete.py
+++ b/ckanext/datastore/logic/auth/delete.py
@@ -1,18 +1,15 @@
-import ckan.logic as logic
-from ckan.lib.base import _
-
-_check_access = logic.check_access
+import ckan.plugins as p
 
 
 def datastore_delete(context, data_dict):
     data_dict['id'] = data_dict.get('resource_id')
     user = context.get('user')
 
-    authorized = _check_access('resource_update', context, data_dict)
+    authorized = p.toolkit.check_access('resource_update', context, data_dict)
 
     if not authorized:
         return {'success': False,
-                'msg': _('User %s not authorized to read edit %s') % \
+                'msg': p.toolkit._('User %s not authorized to read edit %s') %\
                     (str(user), data_dict['id'])}
     else:
         return {'success': True}
diff --git a/ckanext/datastore/logic/auth/get.py b/ckanext/datastore/logic/auth/get.py
new file mode 100644
index 00000000000..1db46b0597e
--- /dev/null
+++ b/ckanext/datastore/logic/auth/get.py
@@ -0,0 +1,15 @@
+import ckan.plugins as p
+
+
+def datastore_search(context, data_dict):
+    data_dict['id'] = data_dict.get('resource_id')
+    user = context.get('user')
+
+    authorized = p.toolkit.check_access('resource_update', context, data_dict)
+
+    if not authorized:
+        return {'success': False,
+                'msg': p.toolkit._('User %s not authorized to read edit %s') %\
+                    (str(user), data_dict['id'])}
+    else:
+        return {'success': True}
diff --git a/ckanext/datastore/plugin.py b/ckanext/datastore/plugin.py
index c6984c70dda..a995c28ad72 100644
--- a/ckanext/datastore/plugin.py
+++ b/ckanext/datastore/plugin.py
@@ -1,8 +1,10 @@
 import ckan.plugins as p
 import ckanext.datastore.logic.action.create as action_create
 import ckanext.datastore.logic.action.delete as action_delete
+import ckanext.datastore.logic.action.get as action_get
 import ckanext.datastore.logic.auth.create as auth_create
 import ckanext.datastore.logic.auth.delete as auth_delete
+import ckanext.datastore.logic.auth.get as auth_get
 
 
 class DatastoreException(Exception):
@@ -25,8 +27,10 @@ def configure(self, config):
 
     def get_actions(self):
         return {'datastore_create': action_create.datastore_create,
-                'datastore_delete': action_delete.datastore_delete}
+                'datastore_delete': action_delete.datastore_delete,
+                'datastore_search': action_get.datastore_search}
 
     def get_auth_functions(self):
         return {'datastore_create': auth_create.datastore_create,
-                'datastore_delete': auth_delete.datastore_delete}
+                'datastore_delete': auth_delete.datastore_delete,
+                'datastore_search': auth_get.datastore_search}
diff --git a/ckanext/datastore/tests/test_datastore.py b/ckanext/datastore/tests/test_datastore.py
index b9d9afad75d..2f56eb89cd6 100644
--- a/ckanext/datastore/tests/test_datastore.py
+++ b/ckanext/datastore/tests/test_datastore.py
@@ -449,3 +449,42 @@ def test_delete_filters(self):
         model.Session.remove()
 
         self._delete()
+
+
+class TestDatastoreSearch(tests.WsgiAppCase):
+    sysadmin_user = None
+    normal_user = None
+
+    @classmethod
+    def setup_class(cls):
+        p.load('datastore')
+        ctd.CreateTestData.create()
+        cls.sysadmin_user = model.User.get('testsysadmin')
+        cls.normal_user = model.User.get('annafan')
+        resource = model.Package.get('annakarenina').resources[0]
+        cls.data = {
+            'resource_id': resource.id,
+            'fields': [{'id': 'book', 'type': 'text'},
+                       {'id': 'author', 'type': 'text'}],
+            'records': [{'book': 'annakarenina', 'author': 'tolstoy'},
+                        {'book': 'warandpeace', 'author': 'tolstoy'}]
+        }
+        postparams = '%s=1' % json.dumps(cls.data)
+        auth = {'Authorization': str(cls.sysadmin_user.apikey)}
+        res = cls.app.post('/api/action/datastore_create', params=postparams,
+                           extra_environ=auth)
+        res_dict = json.loads(res.body)
+        assert res_dict['success'] is True
+
+    @classmethod
+    def teardown_class(cls):
+        model.repo.rebuild_db()
+
+    def test_search_basic(self):
+        data = {'resource_id': self.data['resource_id']}
+        postparams = '%s=1' % json.dumps(data)
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
+        res = self.app.post('/api/action/datastore_search', params=postparams,
+                            extra_environ=auth)
+        res_dict = json.loads(res.body)
+        assert res_dict['success'] is True

From 50b636b3839c0101d69514a860536e2c75c08f60 Mon Sep 17 00:00:00 2001
From: John Glover <j@johnglover.net>
Date: Tue, 31 Jul 2012 09:54:39 +0100
Subject: [PATCH 023/130] [#2733] Refactor: Move auth/action into single files,
 currently small functions with duplicated code.

---
 ckanext/datastore/logic/action.py          | 119 +++++++++++++++++++++
 ckanext/datastore/logic/action/__init__.py |   0
 ckanext/datastore/logic/action/create.py   |  40 -------
 ckanext/datastore/logic/action/delete.py   |  38 -------
 ckanext/datastore/logic/action/get.py      |  57 ----------
 ckanext/datastore/logic/auth.py            |  29 +++++
 ckanext/datastore/logic/auth/__init__.py   |   0
 ckanext/datastore/logic/auth/create.py     |  15 ---
 ckanext/datastore/logic/auth/delete.py     |  15 ---
 ckanext/datastore/logic/auth/get.py        |  15 ---
 ckanext/datastore/plugin.py                |  20 ++--
 11 files changed, 156 insertions(+), 192 deletions(-)
 create mode 100644 ckanext/datastore/logic/action.py
 delete mode 100644 ckanext/datastore/logic/action/__init__.py
 delete mode 100644 ckanext/datastore/logic/action/create.py
 delete mode 100644 ckanext/datastore/logic/action/delete.py
 delete mode 100644 ckanext/datastore/logic/action/get.py
 create mode 100644 ckanext/datastore/logic/auth.py
 delete mode 100644 ckanext/datastore/logic/auth/__init__.py
 delete mode 100644 ckanext/datastore/logic/auth/create.py
 delete mode 100644 ckanext/datastore/logic/auth/delete.py
 delete mode 100644 ckanext/datastore/logic/auth/get.py

diff --git a/ckanext/datastore/logic/action.py b/ckanext/datastore/logic/action.py
new file mode 100644
index 00000000000..e75d4e21323
--- /dev/null
+++ b/ckanext/datastore/logic/action.py
@@ -0,0 +1,119 @@
+import logging
+import pylons
+import ckan.logic as logic
+import ckan.plugins as p
+import ckanext.datastore.db as db
+
+log = logging.getLogger(__name__)
+_get_or_bust = logic.get_or_bust
+
+
+def datastore_create(context, data_dict):
+    '''Adds a new table to the datastore.
+
+    :param resource_id: resource id that the data is going to be stored under.
+    :type resource_id: string
+    :param fields: fields/columns and their extra metadata.
+    :type fields: list of dictionaries
+    :param records: the data, eg: [{"dob": "2005", "some_stuff": ['a', b']}]
+    :type records: list of dictionaries
+
+    :returns: the newly created data object.
+    :rtype: dictionary
+
+    '''
+    model = _get_or_bust(context, 'model')
+    id = _get_or_bust(data_dict, 'resource_id')
+
+    if not model.Resource.get(id):
+        raise p.toolkit.ObjectNotFound(p.toolkit._(
+            'Resource "{}" was not found.'.format(id)
+        ))
+
+    p.toolkit.check_access('datastore_create', context, data_dict)
+
+    data_dict['connection_url'] = pylons.config['ckan.datastore_write_url']
+
+    result = db.create(context, data_dict)
+    result.pop('id')
+    result.pop('connection_url')
+    return result
+
+
+def datastore_delete(context, data_dict):
+    '''Deletes a table from the datastore.
+
+    :param resource_id: resource id that the data will be deleted from.
+    :type resource_id: string
+    :param filter: filter to do deleting on over (eg {'name': 'fred'}).
+                   If missing delete whole table.
+
+    :returns: original filters sent.
+    :rtype: dictionary
+
+    '''
+    model = _get_or_bust(context, 'model')
+    id = _get_or_bust(data_dict, 'resource_id')
+
+    if not model.Resource.get(id):
+        raise p.toolkit.ObjectNotFound(p.toolkit._(
+            'Resource "{}" was not found.'.format(id)
+        ))
+
+    p.toolkit.check_access('datastore_delete', context, data_dict)
+
+    data_dict['connection_url'] = pylons.config['ckan.datastore_write_url']
+
+    result = db.delete(context, data_dict)
+    result.pop('id')
+    result.pop('connection_url')
+    return result
+
+
+def datastore_search(context, data_dict):
+    '''Search a datastore table.
+
+    :param resource_id: id of the data that is going to be selected.
+    :type resource_id: string
+    :param filters: matching conditions to select.
+    :type filters: dictionary
+    :param q: full text query
+    :type q: string
+    :param limit: maximum number of rows to return (default: 100)
+    :type limit: int
+    :param offset: offset the number of rows
+    :type offset: int
+    :param fields: ordered list of fields to return
+                   (default: all fields in original order)
+    :type fields: list of strings
+    :param sort: comma separated field names with ordering
+                 eg: "fieldname1, fieldname2 desc"
+    :type sort: string
+
+    :returns: a dictionary containing the search parameters and the
+              search results.
+              keys: fields: same as datastore_create accepts
+                    offset: query offset value
+                    limit: query limit value
+                    filters: query filters
+                    total: number of total matching records
+                    records: list of matching results
+    :rtype: dictionary
+
+    '''
+    model = _get_or_bust(context, 'model')
+    id = _get_or_bust(data_dict, 'resource_id')
+
+    if not model.Resource.get(id):
+        raise p.toolkit.ObjectNotFound(p.toolkit._(
+            'Resource "{}" was not found.'.format(id)
+        ))
+
+    p.toolkit.check_access('datastore_search', context, data_dict)
+
+    data_dict['connection_url'] = pylons.config['ckan.datastore_write_url']
+
+    result = db.search(context, data_dict)
+    result.pop('id')
+    result.pop('connection_url')
+    return result
diff --git a/ckanext/datastore/logic/action/__init__.py b/ckanext/datastore/logic/action/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/ckanext/datastore/logic/action/create.py b/ckanext/datastore/logic/action/create.py
deleted file mode 100644
index 73272aaafa7..00000000000
--- a/ckanext/datastore/logic/action/create.py
+++ /dev/null
@@ -1,40 +0,0 @@
-import logging
-import pylons
-import ckan.logic as logic
-import ckan.plugins as p
-import ckanext.datastore.db as db
-
-log = logging.getLogger(__name__)
-_get_or_bust = logic.get_or_bust
-
-
-def datastore_create(context, data_dict):
-    '''Adds a new table to the datastore.
-
-    :param resource_id: resource id that the data is going to be stored under.
-    :type resource_id: string
-    :param fields: fields/columns and their extra metadata.
-    :type fields: list of dictionaries
-    :param records: the data, eg: [{"dob": "2005", "some_stuff": ['a', b']}]
-    :type records: list of dictionaries
-
-    :returns: the newly created data object.
-    :rtype: dictionary
-
-    '''
-    model = _get_or_bust(context, 'model')
-    id = _get_or_bust(data_dict, 'resource_id')
-
-    if not model.Resource.get(id):
-        raise p.toolkit.ObjectNotFound(p.toolkit._(
-            'Resource "{}" was not found.'.format(id)
-        ))
-
-    p.toolkit.check_access('datastore_create', context, data_dict)
-
-    data_dict['connection_url'] = pylons.config['ckan.datastore_write_url']
-
-    result = db.create(context, data_dict)
-    result.pop('id')
-    result.pop('connection_url')
-    return result
diff --git a/ckanext/datastore/logic/action/delete.py b/ckanext/datastore/logic/action/delete.py
deleted file mode 100644
index 25ec50887c0..00000000000
--- a/ckanext/datastore/logic/action/delete.py
+++ /dev/null
@@ -1,38 +0,0 @@
-import logging
-import pylons
-import ckan.logic as logic
-import ckan.plugins as p
-import ckanext.datastore.db as db
-
-log = logging.getLogger(__name__)
-_get_or_bust = logic.get_or_bust
-
-
-def datastore_delete(context, data_dict):
-    '''Deletes a table from the datastore.
-
-    :param resource_id: resource id that the data will be deleted from.
-    :type resource_id: string
-    :param filter: filter to do deleting on over (eg {'name': 'fred'}).
-                   If missing delete whole table.
-
-    :returns: original filters sent.
-    :rtype: dictionary
-
-    '''
-    model = _get_or_bust(context, 'model')
-    id = _get_or_bust(data_dict, 'resource_id')
-
-    if not model.Resource.get(id):
-        raise p.toolkit.ObjectNotFound(p.toolkit._(
-            'Resource "{}" was not found.'.format(id)
-        ))
-
-    p.toolkit.check_access('datastore_delete', context, data_dict)
-
-    data_dict['connection_url'] = pylons.config['ckan.datastore_write_url']
-
-    result = db.delete(context, data_dict)
-    result.pop('id')
-    result.pop('connection_url')
-    return result
diff --git a/ckanext/datastore/logic/action/get.py b/ckanext/datastore/logic/action/get.py
deleted file mode 100644
index 72ef2e5da2e..00000000000
--- a/ckanext/datastore/logic/action/get.py
+++ /dev/null
@@ -1,57 +0,0 @@
-import logging
-import pylons
-import ckan.logic as logic
-import ckan.plugins as p
-import ckanext.datastore.db as db
-
-log = logging.getLogger(__name__)
-_get_or_bust = logic.get_or_bust
-
-
-def datastore_search(context, data_dict):
-    '''Search a datastore table.
-
-    :param resource_id: id of the data that is going to be selected.
-    :type resource_id: string
-    :param filters: matching conditions to select.
-    :type filters: dictionary
-    :param q: full text query
-    :type q: string
-    :param limit: maximum number of rows to return (default: 100)
-    :type limit: int
-    :param offset: offset the number of rows
-    :type offset: int
-    :param fields: ordered list of fields to return
-                   (default: all fields in original order)
-    :type fields: list of strings
-    :param sort: comma separated field names with ordering
-                 eg: "fieldname1, fieldname2 desc"
-    :type sort: string
-
-    :returns: a dictionary containing the search parameters and the
-              search results.
-              keys: fields: same as datastore_create accepts
-                    offset: query offset value
-                    limit: query limit value
-                    filters: query filters
-                    total: number of total matching records
-                    records: list of matching results
-    :rtype: dictionary
-
-    '''
-    model = _get_or_bust(context, 'model')
-    id = _get_or_bust(data_dict, 'resource_id')
-
-    if not model.Resource.get(id):
-        raise p.toolkit.ObjectNotFound(p.toolkit._(
-            'Resource "{}" was not found.'.format(id)
-        ))
-
-    p.toolkit.check_access('datastore_search', context, data_dict)
-
-    data_dict['connection_url'] = pylons.config['ckan.datastore_write_url']
-
-    result = db.search(context, data_dict)
-    result.pop('id')
-    result.pop('connection_url')
-    return result
diff --git a/ckanext/datastore/logic/auth.py b/ckanext/datastore/logic/auth.py
new file mode 100644
index 00000000000..88ec645cd69
--- /dev/null
+++ b/ckanext/datastore/logic/auth.py
@@ -0,0 +1,29 @@
+import ckan.plugins as p
+
+
+def _datastore_auth(context, data_dict):
+    data_dict['id'] = data_dict.get('resource_id')
+    user = context.get('user')
+
+    authorized = p.toolkit.check_access('resource_update', context, data_dict)
+
+    if not authorized:
+        return {
+            'success': False,
+            'msg': p.toolkit._('User {} not authorized to update resource {}'\
+                    .format(str(user), data_dict['id']))
+        }
+    else:
+        return {'success': True}
+
+
+def datastore_create(context, data_dict):
+    return _datastore_auth(context, data_dict)
+
+
+def datastore_delete(context, data_dict):
+    return _datastore_auth(context, data_dict)
+
+
+def datastore_search(context, data_dict):
+    return _datastore_auth(context, data_dict)
diff --git a/ckanext/datastore/logic/auth/__init__.py b/ckanext/datastore/logic/auth/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/ckanext/datastore/logic/auth/create.py b/ckanext/datastore/logic/auth/create.py
deleted file mode 100644
index 095e358713a..00000000000
--- a/ckanext/datastore/logic/auth/create.py
+++ /dev/null
@@ -1,15 +0,0 @@
-import ckan.plugins as p
-
-
-def datastore_create(context, data_dict):
-    data_dict['id'] = data_dict.get('resource_id')
-    user = context.get('user')
-
-    authorized = p.toolkit.check_access('resource_update', context, data_dict)
-
-    if not authorized:
-        return {'success': False,
-                'msg': p.toolkit._('User %s not authorized to read edit %s') %\
-                    (str(user), data_dict['id'])}
-    else:
-        return {'success': True}
diff --git a/ckanext/datastore/logic/auth/delete.py b/ckanext/datastore/logic/auth/delete.py
deleted file mode 100644
index 186fc24e4f0..00000000000
--- a/ckanext/datastore/logic/auth/delete.py
+++ /dev/null
@@ -1,15 +0,0 @@
-import ckan.plugins as p
-
-
-def datastore_delete(context, data_dict):
-    data_dict['id'] = data_dict.get('resource_id')
-    user = context.get('user')
-
-    authorized = p.toolkit.check_access('resource_update', context, data_dict)
-
-    if not authorized:
-        return {'success': False,
-                'msg': p.toolkit._('User %s not authorized to read edit %s') %\
-                    (str(user), data_dict['id'])}
-    else:
-        return {'success': True}
diff --git a/ckanext/datastore/logic/auth/get.py b/ckanext/datastore/logic/auth/get.py
deleted file mode 100644
index 1db46b0597e..00000000000
--- a/ckanext/datastore/logic/auth/get.py
+++ /dev/null
@@ -1,15 +0,0 @@
-import ckan.plugins as p
-
-
-def datastore_search(context, data_dict):
-    data_dict['id'] = data_dict.get('resource_id')
-    user = context.get('user')
-
-    authorized = p.toolkit.check_access('resource_update', context, data_dict)
-
-    if not authorized:
-        return {'success': False,
-                'msg': p.toolkit._('User %s not authorized to read edit %s') %\
-                    (str(user), data_dict['id'])}
-    else:
-        return {'success': True}
diff --git a/ckanext/datastore/plugin.py b/ckanext/datastore/plugin.py
index a995c28ad72..849ba69c906 100644
--- a/ckanext/datastore/plugin.py
+++ b/ckanext/datastore/plugin.py
@@ -1,10 +1,6 @@
 import ckan.plugins as p
-import ckanext.datastore.logic.action.create as action_create
-import ckanext.datastore.logic.action.delete as action_delete
-import ckanext.datastore.logic.action.get as action_get
-import ckanext.datastore.logic.auth.create as auth_create
-import ckanext.datastore.logic.auth.delete as auth_delete
-import ckanext.datastore.logic.auth.get as auth_get
+import ckanext.datastore.logic.action as action
+import ckanext.datastore.logic.auth as auth
 
 
 class DatastoreException(Exception):
@@ -26,11 +22,11 @@ def configure(self, config):
             raise DatastoreException(error_msg)
 
     def get_actions(self):
-        return {'datastore_create': action_create.datastore_create,
-                'datastore_delete': action_delete.datastore_delete,
-                'datastore_search': action_get.datastore_search}
+        return {'datastore_create': action.datastore_create,
+                'datastore_delete': action.datastore_delete,
+                'datastore_search': action.datastore_search}
 
     def get_auth_functions(self):
-        return {'datastore_create': auth_create.datastore_create,
-                'datastore_delete': auth_delete.datastore_delete,
-                'datastore_search': auth_get.datastore_search}
+        return {'datastore_create': auth.datastore_create,
+                'datastore_delete': auth.datastore_delete,
+                'datastore_search': auth.datastore_search}

From 68574937d3023367f22607b9c3e4b35e30db4ae2 Mon Sep 17 00:00:00 2001
From: John Glover <j@johnglover.net>
Date: Tue, 31 Jul 2012 14:36:20 +0100
Subject: [PATCH 024/130] [#2733] Add basic search (just processing filters and
 fields parameters).

---
 ckanext/datastore/db.py                   | 53 ++++++++++++++++++++---
 ckanext/datastore/logic/action.py         |  2 +-
 ckanext/datastore/tests/test_datastore.py | 41 ++++++++++++++++++
 3 files changed, 89 insertions(+), 7 deletions(-)

diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
index c87e1a2a555..c17e5ee9a87 100644
--- a/ckanext/datastore/db.py
+++ b/ckanext/datastore/db.py
@@ -273,19 +273,18 @@ def insert_data(context, data_dict):
     context['connection'].execute(sql_string, rows)
 
 
-def delete_data(context, data_dict):
-    filters = data_dict.get('filters')
+def _where_from_filters(field_ids, data_dict):
+    'Return a SQL WHERE clause from data_dict filters'
+    filters = data_dict.get('filters', {})
 
     if not isinstance(filters, dict):
         raise p.toolkit.ValidationError({
             'filters': 'Not a json object'}
         )
 
-    fields = _get_fields(context, data_dict)
-    field_ids = set([field['id'] for field in fields])
-
     where_clauses = []
     values = []
+
     for field, value in filters.iteritems():
         if field not in field_ids:
             raise p.toolkit.ValidationError({
@@ -295,17 +294,59 @@ def delete_data(context, data_dict):
         values.append(value)
 
     where_clause = ' and '.join(where_clauses)
+    return where_clause, values
+
+
+def delete_data(context, data_dict):
+    fields = _get_fields(context, data_dict)
+    field_ids = set([field['id'] for field in fields])
+    where_clause, where_values = _where_from_filters(field_ids, data_dict)
 
     context['connection'].execute(
         'delete from "{}" where {}'.format(
             data_dict['resource_id'],
             where_clause
         ),
-        values
+        where_values
     )
 
 
 def search_data(context, data_dict):
+    all_fields = _get_fields(context, data_dict)
+    all_field_ids = set([field['id'] for field in all_fields])
+
+    fields = data_dict.get('fields')
+
+    if fields:
+        check_fields(context, fields)
+        field_ids = set([field['id'] for field in fields])
+
+        for field in field_ids:
+            if not field in all_field_ids:
+                raise p.toolkit.ValidationError({
+                    'fields': 'field "{}" not in table'.format(field)}
+                )
+    else:
+        fields = all_fields
+        field_ids = all_field_ids
+
+    select_columns = ', '.join(field_ids)
+
+    where_clause, where_values = _where_from_filters(all_field_ids, data_dict)
+
+    sql_string = 'select {} from "{}"'.format(
+        select_columns, data_dict['resource_id']
+    )
+
+    if where_clause:
+        sql_string += ' where {}'.format(where_clause)
+
+    results = context['connection'].execute(sql_string, where_values)
+
+    data_dict['total'] = results.rowcount
+    records = [(dict((f, r[f]) for f in field_ids)) for r in results]
+    data_dict['records'] = records
+
     return data_dict
 
 
diff --git a/ckanext/datastore/logic/action.py b/ckanext/datastore/logic/action.py
index e75d4e21323..aa856b7a10c 100644
--- a/ckanext/datastore/logic/action.py
+++ b/ckanext/datastore/logic/action.py
@@ -85,7 +85,7 @@ def datastore_search(context, data_dict):
     :type offset: int
     :param fields: ordered list of fields to return
                    (default: all fields in original order)
-    :type fields: list of strings
+    :type fields: list of dictionaries
     :param sort: comma separated field names with ordering
                  eg: "fieldname1, fieldname2 desc"
     :type sort: string
diff --git a/ckanext/datastore/tests/test_datastore.py b/ckanext/datastore/tests/test_datastore.py
index 2f56eb89cd6..c49d3f970ea 100644
--- a/ckanext/datastore/tests/test_datastore.py
+++ b/ckanext/datastore/tests/test_datastore.py
@@ -488,3 +488,44 @@ def test_search_basic(self):
                             extra_environ=auth)
         res_dict = json.loads(res.body)
         assert res_dict['success'] is True
+        result = res_dict['result']
+        assert result['total'] == len(self.data['records'])
+        assert result['records'] == self.data['records']
+
+    def test_search_invalid_field(self):
+        data = {'resource_id': self.data['resource_id'],
+                'fields': [{'id': 'bad'}]}
+        postparams = '%s=1' % json.dumps(data)
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
+        res = self.app.post('/api/action/datastore_search', params=postparams,
+                            extra_environ=auth, status=409)
+        res_dict = json.loads(res.body)
+        assert res_dict['success'] is False
+
+    def test_search_fields(self):
+        data = {'resource_id': self.data['resource_id'],
+                'fields': [{'id': 'book'}]}
+        postparams = '%s=1' % json.dumps(data)
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
+        res = self.app.post('/api/action/datastore_search', params=postparams,
+                            extra_environ=auth)
+        res_dict = json.loads(res.body)
+        assert res_dict['success'] is True
+        result = res_dict['result']
+        assert result['total'] == len(self.data['records'])
+        assert result['records'] == [{'book': 'annakarenina'},
+                                     {'book': 'warandpeace'}]
+
+    def test_search_filters(self):
+        data = {'resource_id': self.data['resource_id'],
+                'filters': {'book': 'annakarenina'}}
+        postparams = '%s=1' % json.dumps(data)
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
+        res = self.app.post('/api/action/datastore_search', params=postparams,
+                            extra_environ=auth)
+        res_dict = json.loads(res.body)
+        assert res_dict['success'] is True
+        result = res_dict['result']
+        assert result['total'] == 1
+        assert result['records'] == [{'book': 'annakarenina',
+                                      'author': 'tolstoy'}]

From 23447062f6c4d0e88ffdbb8665d0e85b1a392678 Mon Sep 17 00:00:00 2001
From: John Glover <j@johnglover.net>
Date: Tue, 31 Jul 2012 15:28:31 +0100
Subject: [PATCH 025/130] [#2733] Implement datastore_search offset and limit.

---
 ckanext/datastore/db.py                   | 25 +++++++++++--------
 ckanext/datastore/tests/test_datastore.py | 29 +++++++++++++++++++++++
 2 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
index c17e5ee9a87..ed7249fe8f3 100644
--- a/ckanext/datastore/db.py
+++ b/ckanext/datastore/db.py
@@ -294,6 +294,8 @@ def _where_from_filters(field_ids, data_dict):
         values.append(value)
 
     where_clause = ' and '.join(where_clauses)
+    if where_clause:
+        where_clause = 'where ' + where_clause
     return where_clause, values
 
 
@@ -303,7 +305,7 @@ def delete_data(context, data_dict):
     where_clause, where_values = _where_from_filters(field_ids, data_dict)
 
     context['connection'].execute(
-        'delete from "{}" where {}'.format(
+        'delete from "{}" {}'.format(
             data_dict['resource_id'],
             where_clause
         ),
@@ -331,19 +333,22 @@ def search_data(context, data_dict):
         field_ids = all_field_ids
 
     select_columns = ', '.join(field_ids)
-
     where_clause, where_values = _where_from_filters(all_field_ids, data_dict)
+    limit = data_dict.get('limit', 100)
+    offset = data_dict.get('offset', 0)
 
-    sql_string = 'select {} from "{}"'.format(
-        select_columns, data_dict['resource_id']
-    )
-
-    if where_clause:
-        sql_string += ' where {}'.format(where_clause)
-
+    sql_string = '''select {}, count(*) over() as full_count
+                    from "{}" {} limit {} offset {}'''\
+        .format(select_columns, data_dict['resource_id'], where_clause,
+                limit, offset)
     results = context['connection'].execute(sql_string, where_values)
+    results = [r for r in results]
+
+    if results:
+        data_dict['total'] = results[0]['full_count']
+    else:
+        data_dict['total'] = 0
 
-    data_dict['total'] = results.rowcount
     records = [(dict((f, r[f]) for f in field_ids)) for r in results]
     data_dict['records'] = records
 
diff --git a/ckanext/datastore/tests/test_datastore.py b/ckanext/datastore/tests/test_datastore.py
index c49d3f970ea..c0077eb6abc 100644
--- a/ckanext/datastore/tests/test_datastore.py
+++ b/ckanext/datastore/tests/test_datastore.py
@@ -529,3 +529,32 @@ def test_search_filters(self):
         assert result['total'] == 1
         assert result['records'] == [{'book': 'annakarenina',
                                       'author': 'tolstoy'}]
+
+    def test_search_limit(self):
+        data = {'resource_id': self.data['resource_id'],
+                'limit': 1}
+        postparams = '%s=1' % json.dumps(data)
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
+        res = self.app.post('/api/action/datastore_search', params=postparams,
+                            extra_environ=auth)
+        res_dict = json.loads(res.body)
+        assert res_dict['success'] is True
+        result = res_dict['result']
+        assert result['total'] == 2
+        assert result['records'] == [{'book': 'annakarenina',
+                                      'author': 'tolstoy'}]
+
+    def test_search_offset(self):
+        data = {'resource_id': self.data['resource_id'],
+                'limit': 1,
+                'offset': 1}
+        postparams = '%s=1' % json.dumps(data)
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
+        res = self.app.post('/api/action/datastore_search', params=postparams,
+                            extra_environ=auth)
+        res_dict = json.loads(res.body)
+        assert res_dict['success'] is True
+        result = res_dict['result']
+        assert result['total'] == 2
+        assert result['records'] == [{'book': 'warandpeace',
+                                      'author': 'tolstoy'}]

From e3918114010e60c88fe0884c2572b688cfe6dd1d Mon Sep 17 00:00:00 2001
From: John Glover <j@johnglover.net>
Date: Tue, 31 Jul 2012 16:32:34 +0100
Subject: [PATCH 026/130] [#2733] Implement full text search in
 datastore_search ('q').

---
 ckanext/datastore/db.py                   | 12 +++++++----
 ckanext/datastore/tests/test_datastore.py | 26 +++++++++++++++++++++++
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
index ed7249fe8f3..3dec899a1ee 100644
--- a/ckanext/datastore/db.py
+++ b/ckanext/datastore/db.py
@@ -273,8 +273,8 @@ def insert_data(context, data_dict):
     context['connection'].execute(sql_string, rows)
 
 
-def _where_from_filters(field_ids, data_dict):
-    'Return a SQL WHERE clause from data_dict filters'
+def _where(field_ids, data_dict):
+    'Return a SQL WHERE clause from data_dict filters and q'
     filters = data_dict.get('filters', {})
 
     if not isinstance(filters, dict):
@@ -293,6 +293,10 @@ def _where_from_filters(field_ids, data_dict):
         where_clauses.append('"{}" = %s'.format(field))
         values.append(value)
 
+    q = data_dict.get('q')
+    if q:
+        where_clauses.append('_full_text @@ to_tsquery(\'{}\')'.format(q))
+
     where_clause = ' and '.join(where_clauses)
     if where_clause:
         where_clause = 'where ' + where_clause
@@ -302,7 +306,7 @@ def _where_from_filters(field_ids, data_dict):
 def delete_data(context, data_dict):
     fields = _get_fields(context, data_dict)
     field_ids = set([field['id'] for field in fields])
-    where_clause, where_values = _where_from_filters(field_ids, data_dict)
+    where_clause, where_values = _where(field_ids, data_dict)
 
     context['connection'].execute(
         'delete from "{}" {}'.format(
@@ -333,7 +337,7 @@ def search_data(context, data_dict):
         field_ids = all_field_ids
 
     select_columns = ', '.join(field_ids)
-    where_clause, where_values = _where_from_filters(all_field_ids, data_dict)
+    where_clause, where_values = _where(all_field_ids, data_dict)
     limit = data_dict.get('limit', 100)
     offset = data_dict.get('offset', 0)
 
diff --git a/ckanext/datastore/tests/test_datastore.py b/ckanext/datastore/tests/test_datastore.py
index c0077eb6abc..a4474e35b82 100644
--- a/ckanext/datastore/tests/test_datastore.py
+++ b/ckanext/datastore/tests/test_datastore.py
@@ -558,3 +558,29 @@ def test_search_offset(self):
         assert result['total'] == 2
         assert result['records'] == [{'book': 'warandpeace',
                                       'author': 'tolstoy'}]
+
+    def test_search_full_text(self):
+        data = {'resource_id': self.data['resource_id'],
+                'q': 'annakarenina'}
+        postparams = '%s=1' % json.dumps(data)
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
+        res = self.app.post('/api/action/datastore_search', params=postparams,
+                            extra_environ=auth)
+        res_dict = json.loads(res.body)
+        assert res_dict['success'] is True
+        result = res_dict['result']
+        assert result['total'] == 1
+        assert result['records'] == [{'book': 'annakarenina',
+                                      'author': 'tolstoy'}]
+
+        data = {'resource_id': self.data['resource_id'],
+                'q': 'tolstoy'}
+        postparams = '%s=1' % json.dumps(data)
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
+        res = self.app.post('/api/action/datastore_search', params=postparams,
+                            extra_environ=auth)
+        res_dict = json.loads(res.body)
+        assert res_dict['success'] is True
+        result = res_dict['result']
+        assert result['total'] == 2
+        assert result['records'] == self.data['records']

From 67e6f4c385a414d19192a93f6fd8553593886cba Mon Sep 17 00:00:00 2001
From: John Glover <j@johnglover.net>
Date: Tue, 31 Jul 2012 17:14:12 +0100
Subject: [PATCH 027/130] [#2733] Implement datastore_search sort parameter.

---
 ckanext/datastore/db.py                   |  9 ++++--
 ckanext/datastore/tests/test_datastore.py | 35 ++++++++++++++++++++++-
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
index 3dec899a1ee..207bb7a45e0 100644
--- a/ckanext/datastore/db.py
+++ b/ckanext/datastore/db.py
@@ -341,10 +341,15 @@ def search_data(context, data_dict):
     limit = data_dict.get('limit', 100)
     offset = data_dict.get('offset', 0)
 
+    if data_dict.get('sort'):
+        sort = 'order by {}'.format(data_dict['sort'])
+    else:
+        sort = ''
+
     sql_string = '''select {}, count(*) over() as full_count
-                    from "{}" {} limit {} offset {}'''\
+                    from "{}" {} {} limit {} offset {}'''\
         .format(select_columns, data_dict['resource_id'], where_clause,
-                limit, offset)
+                sort, limit, offset)
     results = context['connection'].execute(sql_string, where_values)
     results = [r for r in results]
 
diff --git a/ckanext/datastore/tests/test_datastore.py b/ckanext/datastore/tests/test_datastore.py
index a4474e35b82..6f4d3fa3d07 100644
--- a/ckanext/datastore/tests/test_datastore.py
+++ b/ckanext/datastore/tests/test_datastore.py
@@ -530,6 +530,40 @@ def test_search_filters(self):
         assert result['records'] == [{'book': 'annakarenina',
                                       'author': 'tolstoy'}]
 
+    def test_search_sort(self):
+        data = {'resource_id': self.data['resource_id'],
+                'sort': 'book asc'}
+        postparams = '%s=1' % json.dumps(data)
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
+        res = self.app.post('/api/action/datastore_search', params=postparams,
+                            extra_environ=auth)
+        res_dict = json.loads(res.body)
+        assert res_dict['success'] is True
+        result = res_dict['result']
+        assert result['total'] == 2
+
+        expected_records = [
+            {'book': 'annakarenina', 'author': 'tolstoy'},
+            {'book': 'warandpeace', 'author': 'tolstoy'}
+        ]
+        assert result['records'] == expected_records
+
+        data = {'resource_id': self.data['resource_id'],
+                'sort': 'book desc'}
+        postparams = '%s=1' % json.dumps(data)
+        res = self.app.post('/api/action/datastore_search', params=postparams,
+                            extra_environ=auth)
+        res_dict = json.loads(res.body)
+        assert res_dict['success'] is True
+        result = res_dict['result']
+        assert result['total'] == 2
+
+        expected_records = [
+            {'book': 'warandpeace', 'author': 'tolstoy'},
+            {'book': 'annakarenina', 'author': 'tolstoy'}
+        ]
+        assert result['records'] == expected_records
+
     def test_search_limit(self):
         data = {'resource_id': self.data['resource_id'],
                 'limit': 1}
@@ -576,7 +610,6 @@ def test_search_full_text(self):
         data = {'resource_id': self.data['resource_id'],
                 'q': 'tolstoy'}
         postparams = '%s=1' % json.dumps(data)
-        auth = {'Authorization': str(self.sysadmin_user.apikey)}
         res = self.app.post('/api/action/datastore_search', params=postparams,
                             extra_environ=auth)
         res_dict = json.loads(res.body)

From b264dcbc84a912b0476dba3f126c88209ab3b428 Mon Sep 17 00:00:00 2001
From: John Glover <j@johnglover.net>
Date: Tue, 31 Jul 2012 17:31:39 +0100
Subject: [PATCH 028/130] [#2733] Check that limit and offset are integers.

---
 ckanext/datastore/db.py                   | 12 ++++++++++++
 ckanext/datastore/tests/test_datastore.py | 20 ++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
index 207bb7a45e0..bcf84df8d77 100644
--- a/ckanext/datastore/db.py
+++ b/ckanext/datastore/db.py
@@ -23,6 +23,15 @@ def _is_valid_field_name(name):
     return True
 
 
+def _validate_int(i, field_name):
+    try:
+        int(i)
+    except ValueError:
+        raise p.toolkit.ValidationError({
+            'field_name': '{} is not an integer'.format(i)
+        })
+
+
 def _get_engine(context, data_dict):
     'Get either read or write engine.'
     connection_url = data_dict['connection_url']
@@ -341,6 +350,9 @@ def search_data(context, data_dict):
     limit = data_dict.get('limit', 100)
     offset = data_dict.get('offset', 0)
 
+    _validate_int(limit, 'limit')
+    _validate_int(offset, 'offset')
+
     if data_dict.get('sort'):
         sort = 'order by {}'.format(data_dict['sort'])
     else:
diff --git a/ckanext/datastore/tests/test_datastore.py b/ckanext/datastore/tests/test_datastore.py
index 6f4d3fa3d07..40136f8fc15 100644
--- a/ckanext/datastore/tests/test_datastore.py
+++ b/ckanext/datastore/tests/test_datastore.py
@@ -578,6 +578,16 @@ def test_search_limit(self):
         assert result['records'] == [{'book': 'annakarenina',
                                       'author': 'tolstoy'}]
 
+    def test_search_invalid_limit(self):
+        data = {'resource_id': self.data['resource_id'],
+                'limit': 'bad'}
+        postparams = '%s=1' % json.dumps(data)
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
+        res = self.app.post('/api/action/datastore_search', params=postparams,
+                            extra_environ=auth, status=409)
+        res_dict = json.loads(res.body)
+        assert res_dict['success'] is False
+
     def test_search_offset(self):
         data = {'resource_id': self.data['resource_id'],
                 'limit': 1,
@@ -593,6 +603,16 @@ def test_search_offset(self):
         assert result['records'] == [{'book': 'warandpeace',
                                       'author': 'tolstoy'}]
 
+    def test_search_invalid_offset(self):
+        data = {'resource_id': self.data['resource_id'],
+                'offset': 'bad'}
+        postparams = '%s=1' % json.dumps(data)
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
+        res = self.app.post('/api/action/datastore_search', params=postparams,
+                            extra_environ=auth, status=409)
+        res_dict = json.loads(res.body)
+        assert res_dict['success'] is False
+
     def test_search_full_text(self):
         data = {'resource_id': self.data['resource_id'],
                 'q': 'annakarenina'}

From 697ed53a35f7a177c08203dd5f6b45e3c3414ae4 Mon Sep 17 00:00:00 2001
From: John Glover <j@johnglover.net>
Date: Tue, 31 Jul 2012 17:41:01 +0100
Subject: [PATCH 029/130] [#2733] Bug fix: pass 'q' as %s instead of inserting
 value into string.

---
 ckanext/datastore/db.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
index bcf84df8d77..4c8e17ec351 100644
--- a/ckanext/datastore/db.py
+++ b/ckanext/datastore/db.py
@@ -304,7 +304,8 @@ def _where(field_ids, data_dict):
 
     q = data_dict.get('q')
     if q:
-        where_clauses.append('_full_text @@ to_tsquery(\'{}\')'.format(q))
+        where_clauses.append('_full_text @@ to_tsquery(%s)'.format(q))
+        values.append(q)
 
     where_clause = ' and '.join(where_clauses)
     if where_clause:

From abd25e415cd49be39d2814ef3924fff127b12621 Mon Sep 17 00:00:00 2001
From: John Glover <j@johnglover.net>
Date: Tue, 31 Jul 2012 17:56:28 +0100
Subject: [PATCH 030/130] [#2733] Tidy up: remove unneeded 'factor' call.

---
 ckanext/datastore/db.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
index 4c8e17ec351..6e218729365 100644
--- a/ckanext/datastore/db.py
+++ b/ckanext/datastore/db.py
@@ -304,7 +304,7 @@ def _where(field_ids, data_dict):
 
     q = data_dict.get('q')
     if q:
-        where_clauses.append('_full_text @@ to_tsquery(%s)'.format(q))
+        where_clauses.append('_full_text @@ to_tsquery(%s)')
         values.append(q)
 
     where_clause = ' and '.join(where_clauses)

From 90239263877217f742042c5ddf2ccbd5beba29dc Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Mon, 6 Aug 2012 18:34:59 +0100
Subject: [PATCH 031/130] [#2618] Debug status now sets fanstatic response

---
 ckan/config/middleware.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckan/config/middleware.py b/ckan/config/middleware.py
index 16496bc0a97..ecd2065406e 100644
--- a/ckan/config/middleware.py
+++ b/ckan/config/middleware.py
@@ -69,7 +69,7 @@ def make_app(global_conf, full_stack=True, static_files=True, **app_conf):
     #app = QueueLogMiddleware(app)
     
     # Fanstatic
-    if config.get('ckan.include_support', '').lower()[:3] == 'dev':
+    if asbool(config.get('debug', False)):
         fanstatic_config = {
             'versioning' : True,
             'recompute_hashes' : True,

From 61984f932e1a4b5088733c688945d78b57412d44 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Mon, 6 Aug 2012 18:35:55 +0100
Subject: [PATCH 032/130] [#2618] Fanstatic auto setup changes

---
 ckan/html_resources/__init__.py | 64 +++++++++++++++++++--------------
 1 file changed, 38 insertions(+), 26 deletions(-)

diff --git a/ckan/html_resources/__init__.py b/ckan/html_resources/__init__.py
index cb3abf7f65a..97ae7b676b9 100644
--- a/ckan/html_resources/__init__.py
+++ b/ckan/html_resources/__init__.py
@@ -121,7 +121,7 @@ def __init__(self, library, relpath,
         if argument is None:
             continue
         elif isinstance(argument, basestring):
-            mode_resource = Resource(library, argument, bottom=bottom, renderer=renderer)
+            mode_resource = Resource(library, argument, bottom=bottom, renderer=renderer, dont_bundle=dont_bundle)
         else:
             # The dependencies of a mode resource should be the same
             # or a subset of the dependencies this mode replaces.
@@ -172,7 +172,7 @@ def min_path(path):
         if f.endswith('.css'):
             return path[:-4] + '.min.css'
 
-    def minify(filename, min_function):
+    def minify(filename, resource_path, min_function):
         ''' Minify file path using min_function. '''
         # if the minified file was modified after the source file we can
         # assume that it is up-to-date
@@ -187,10 +187,10 @@ def minify(filename, min_function):
         f.close()
         print 'minified %s' % path
 
-    def create_resource(filename, path, filepath):
+    def create_resource(path, lib_name):
         ''' create the fanstatic Resource '''
         # resource_name is name of the file without the .js/.css
-        resource_name = '.'.join(filename.split('.')[:-1])
+        rel_path, filename = os.path.split(path)
         kw = {}
         path_min = min_path(os.path.join(resource_path, filename))
         if os.path.exists(path_min):
@@ -200,12 +200,12 @@ def create_resource(filename, path, filepath):
             renderer = core.render_js
         if filename.endswith('.css'):
             renderer = core.render_css
-        if resource_name in depends:
+        if path in depends:
             dependencies = []
-            for dependency in depends[resource_name]:
-                dependencies.append(getattr(module, dependency))
+            for dependency in depends[path]:
+                dependencies.append(getattr(module, '%s/%s' % (lib_name, dependency)))
             kw['depends'] = dependencies
-        if resource_name in dont_bundle:
+        if path in dont_bundle:
             kw['dont_bundle'] = True
         # FIXME needs config.ini options enabled
         if False:
@@ -215,11 +215,12 @@ def create_resource(filename, path, filepath):
                                         condition=condition,
                                         renderer=renderer,
                                         other_browsers=other_browsers)
-
+        filename = os.path.join(rel_path, filename)
         resource = Resource(library, filename, **kw)
         # add the resource to this module
-        fanstatic_name = '%s/%s' % (filepath, resource_name)
+        fanstatic_name = '%s/%s' % (lib_name, filename)
         setattr(module, fanstatic_name, resource)
+        return resource
 
     order = []
     dont_bundle = []
@@ -248,27 +249,35 @@ def create_resource(filename, path, filepath):
     module = sys.modules[__name__]
 
     # process each .js/.css file found
+    file_list = []
     for dirname, dirnames, filenames in os.walk(resource_path):
-        for x in reversed(order):
-            if x in filenames:
-                filenames.remove(x)
-                filenames.insert(0, x)
         for f in filenames:
+            rel_path = dirname[len(path):]
+            if rel_path:
+                rel_path = rel_path[1:]
+            filepath = os.path.join(rel_path, f)
             if f.endswith('.js') and not f.endswith('.min.js'):
-                minify(f, jsmin)
-                create_resource(f, resource_path, path)
+                minify(f, dirname, jsmin)
+                file_list.append(filepath)
             if f.endswith('.css') and not f.endswith('.min.css'):
-                minify(f, cssmin)
-                create_resource(f, resource_path, path)
+                minify(f, dirname, cssmin)
+                file_list.append(filepath)
+
+    for x in reversed(order):
+        if x in file_list:
+            file_list.remove(x)
+            file_list.insert(0, x)
+    for f in file_list:
+        create_resource(f, name)
 
     # add groups
     for group_name in groups:
         members = []
         for member in groups[group_name]:
-            fanstatic_name = '%s/%s' % (path, member)
+            fanstatic_name = '%s/%s' % (name, member)
             members.append(getattr(module, fanstatic_name))
         group = Group(members)
-        fanstatic_name = '%s/%s' % (path, group_name)
+        fanstatic_name = '%s/%s' % (name, group_name)
         setattr(module, fanstatic_name, group)
     # finally add the library to this module
     setattr(module, name, library)
@@ -276,10 +285,13 @@ def create_resource(filename, path, filepath):
     registry = get_library_registry()
     registry.add(library)
 
+base_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'public', 'base', 'javascript'))
+create_library('base', base_path)
+
 
-# create our libraries here from any subdirectories
-for dirname, dirnames, filenames in os.walk(os.path.dirname(__file__)):
-    if dirname == os.path.dirname(__file__):
-        continue
-    lib_name = os.path.basename(dirname)
-    create_library(lib_name, lib_name)
+### create our libraries here from any subdirectories
+##for dirname, dirnames, filenames in os.walk(os.path.dirname(__file__)):
+##    if dirname == os.path.dirname(__file__):
+##        continue
+##    lib_name = os.path.basename(dirname)
+##    create_library(lib_name, lib_name)

From 9a0a27254b4e718cd6a006890c45103a73e7779b Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Mon, 6 Aug 2012 18:37:48 +0100
Subject: [PATCH 033/130] [#2618] Use fanstatic

---
 ckan/templates/snippets/scripts.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ckan/templates/snippets/scripts.html b/ckan/templates/snippets/scripts.html
index 2e32fe5b4d6..c28eb846482 100644
--- a/ckan/templates/snippets/scripts.html
+++ b/ckan/templates/snippets/scripts.html
@@ -6,7 +6,7 @@
 <script src="{% url_for_static "/base/vendor/bootstrap/js/bootstrap-alert.js" %}"></script>
 <script src="{% url_for_static "/base/vendor/bootstrap/js/bootstrap-tab.js" %}"></script>
 <script src="{% url_for_static "/base/vendor/bootstrap/js/bootstrap-button.js" %}"></script>
-<script src="{% url_for_static "/base/javascript/plugins/jquery.inherit.js" %}"></script>
+{#  <script src="{% url_for_static "/base/javascript/plugins/jquery.inherit.js" %}"></script>
 <script src="{% url_for_static "/base/javascript/plugins/jquery.proxy-all.js" %}"></script>
 <script src="{% url_for_static "/base/javascript/plugins/jquery.url-helpers.js" %}"></script>
 <script src="{% url_for_static "/base/javascript/plugins/jquery.date-helpers.js" %}"></script>
@@ -26,4 +26,5 @@
 <script src="{% url_for_static '/base/javascript/modules/confirm-delete.js' %}"></script>
 <script src="{% url_for_static '/base/javascript/modules/api-info.js' %}"></script>
 <script src="{% url_for_static '/base/javascript/modules/autocomplete.js' %}"></script>
-<script src="{% url_for_static '/base/javascript/modules/custom-fields.js' %}"></script>
+<script src="{% url_for_static '/base/javascript/modules/custom-fields.js' %}"></script> #}
+{% resource 'base/main' %}

From e54665fa9bc7c71add89520e87bf10a4c8da9dff Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Tue, 7 Aug 2012 10:39:58 +0100
Subject: [PATCH 034/130] [#2375] Minor pep8 fix

---
 ckan/controllers/home.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckan/controllers/home.py b/ckan/controllers/home.py
index 7a69075e9df..e2eea51a79d 100644
--- a/ckan/controllers/home.py
+++ b/ckan/controllers/home.py
@@ -141,7 +141,7 @@ def _form_to_db_schema(group_type=None):
             # We get all the packages or at least too many so
             # limit it to just 2
             group_dict['packages'] = group_dict['packages'][:2]
-            return {'group_dict' :group_dict}
+            return {'group_dict': group_dict}
 
         global dirty_cached_group_stuff
         if not dirty_cached_group_stuff:

From a995360a33eb9815c561e2ed35816ff07d5c9080 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Tue, 7 Aug 2012 10:40:54 +0100
Subject: [PATCH 035/130] [#2618] Bundle patches for fanstatic

---
 ckan/html_resources/__init__.py | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/ckan/html_resources/__init__.py b/ckan/html_resources/__init__.py
index 97ae7b676b9..3da2c7c57ea 100644
--- a/ckan/html_resources/__init__.py
+++ b/ckan/html_resources/__init__.py
@@ -157,8 +157,33 @@ def __init__(self, library, relpath,
     self.library.register(self)
 
 core.Resource.__init__ = __init__
-# Fanstatic Patch #
 
+def render(self, library_url):
+
+
+    paths = [resource.relpath for resource in self._resources]
+    # URL may become too long:
+    # http://www.boutell.com/newfaq/misc/urllength.html
+    relpath = ''.join([core.BUNDLE_PREFIX, ';'.join(paths)])
+
+    return self.renderer('%s/%s' % (library_url, relpath))
+
+core.Bundle.render = render
+def fits(self, resource):
+    if resource.dont_bundle:
+        return False
+    # an empty resource fits anything
+    if not self._resources:
+        return True
+    # a resource fits if it's like the resources already inside
+    bundle_resource = self._resources[0]
+    return (resource.library is bundle_resource.library and
+            resource.renderer is bundle_resource.renderer and
+            (resource.ext == '.js' or
+             resource.dirname == bundle_resource.dirname))
+
+core.Bundle.fits = fits
+# Fanstatic Patch #
 
 def create_library(name, path):
     ''' Creates a fanstatic library `name` with the contents of a

From 43ef93bbf4dbb8c027bc0358f5396113e707b0a9 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Tue, 7 Aug 2012 11:25:19 +0100
Subject: [PATCH 036/130] [#2618] Allow resource order to be forced

---
 ckan/html_resources/__init__.py | 38 ++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/ckan/html_resources/__init__.py b/ckan/html_resources/__init__.py
index 3da2c7c57ea..3c7090d91c8 100644
--- a/ckan/html_resources/__init__.py
+++ b/ckan/html_resources/__init__.py
@@ -67,7 +67,8 @@ def __init__(self, library, relpath,
              renderer=None,
              debug=None,
              dont_bundle=False,
-             minified=None):
+             minified=None,
+             order=0):
     self.library = library
     fullpath = os.path.normpath(os.path.join(library.path, relpath))
     if core._resource_file_existence_checking and not os.path.exists(fullpath):
@@ -79,6 +80,7 @@ def __init__(self, library, relpath,
         self.dirname += '/'
     self.bottom = bottom
     self.dont_bundle = dont_bundle
+    self.forced_order = order
 
     self.ext = os.path.splitext(self.relpath)[1]
     if renderer is None:
@@ -183,6 +185,40 @@ def fits(self, resource):
              resource.dirname == bundle_resource.dirname))
 
 core.Bundle.fits = fits
+
+def sort_resources(resources):
+    """Sort resources for inclusion on web page.
+
+    A number of rules are followed:
+
+    * resources are always grouped per renderer (.js, .css, etc)
+    * resources that depend on other resources are sorted later
+    * resources are grouped by library, if the dependencies allow it
+    * libraries are sorted by name, if dependencies allow it
+    * resources are sorted by resource path if they both would be
+      sorted the same otherwise.
+
+    The only purpose of sorting on library is so we can
+    group resources per library, so that bundles can later be created
+    of them if bundling support is enabled.
+
+    Note this sorting algorithm guarantees a consistent ordering, no
+    matter in what order resources were needed.
+    """
+    for resource in resources:
+        resource.library.init_library_nr()
+
+    def key(resource):
+        return (
+            resource.order,
+            resource.forced_order,
+            resource.library.library_nr,
+            resource.library.name,
+            resource.dependency_nr,
+            resource.relpath)
+    return sorted(resources, key=key)
+
+core.sort_resources = sort_resources
 # Fanstatic Patch #
 
 def create_library(name, path):

From ebb0524517dd0f33ad8247d2372261f0853d39bb Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Tue, 7 Aug 2012 11:25:57 +0100
Subject: [PATCH 037/130] [#2618] Set resource order on lib creation

---
 ckan/html_resources/__init__.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ckan/html_resources/__init__.py b/ckan/html_resources/__init__.py
index 3c7090d91c8..c5cf50f0d60 100644
--- a/ckan/html_resources/__init__.py
+++ b/ckan/html_resources/__init__.py
@@ -248,7 +248,7 @@ def minify(filename, resource_path, min_function):
         f.close()
         print 'minified %s' % path
 
-    def create_resource(path, lib_name):
+    def create_resource(path, lib_name, count):
         ''' create the fanstatic Resource '''
         # resource_name is name of the file without the .js/.css
         rel_path, filename = os.path.split(path)
@@ -268,6 +268,7 @@ def create_resource(path, lib_name):
             kw['depends'] = dependencies
         if path in dont_bundle:
             kw['dont_bundle'] = True
+        kw['order'] = count
         # FIXME needs config.ini options enabled
         if False:
             other_browsers = False
@@ -328,8 +329,10 @@ def create_resource(path, lib_name):
         if x in file_list:
             file_list.remove(x)
             file_list.insert(0, x)
+    count = 0
     for f in file_list:
-        create_resource(f, name)
+        create_resource(f, name, count)
+        count += 1
 
     # add groups
     for group_name in groups:

From 1259a518f688bc2ce1c1c0dbdf959e4ca49de615 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Tue, 7 Aug 2012 13:33:06 +0100
Subject: [PATCH 038/130] [#2618] Better naming in fanstatic patch

---
 ckan/html_resources/__init__.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ckan/html_resources/__init__.py b/ckan/html_resources/__init__.py
index c5cf50f0d60..05b6ef4f505 100644
--- a/ckan/html_resources/__init__.py
+++ b/ckan/html_resources/__init__.py
@@ -68,7 +68,7 @@ def __init__(self, library, relpath,
              debug=None,
              dont_bundle=False,
              minified=None,
-             order=0):
+             custom_order=0):
     self.library = library
     fullpath = os.path.normpath(os.path.join(library.path, relpath))
     if core._resource_file_existence_checking and not os.path.exists(fullpath):
@@ -80,7 +80,7 @@ def __init__(self, library, relpath,
         self.dirname += '/'
     self.bottom = bottom
     self.dont_bundle = dont_bundle
-    self.forced_order = order
+    self.custom_order = custom_order
 
     self.ext = os.path.splitext(self.relpath)[1]
     if renderer is None:
@@ -211,7 +211,7 @@ def sort_resources(resources):
     def key(resource):
         return (
             resource.order,
-            resource.forced_order,
+            resource.custom_order,
             resource.library.library_nr,
             resource.library.name,
             resource.dependency_nr,

From 26f43360ab66972709a55b5fbd1c3d910d3660ae Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Tue, 7 Aug 2012 13:42:34 +0100
Subject: [PATCH 039/130] [#2618] Custom render order added to Fanstatic
 Resource

---
 ckan/html_resources/__init__.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ckan/html_resources/__init__.py b/ckan/html_resources/__init__.py
index 05b6ef4f505..deda49ad425 100644
--- a/ckan/html_resources/__init__.py
+++ b/ckan/html_resources/__init__.py
@@ -68,6 +68,7 @@ def __init__(self, library, relpath,
              debug=None,
              dont_bundle=False,
              minified=None,
+             custom_renderer_order=None,
              custom_order=0):
     self.library = library
     fullpath = os.path.normpath(os.path.join(library.path, relpath))
@@ -99,6 +100,8 @@ def __init__(self, library, relpath,
         self.order, _ = core.inclusion_renderers.get(
             self.ext, (sys.maxint, None))
 
+    if custom_renderer_order:
+        self.order = custom_renderer_order
     assert not isinstance(depends, basestring)
     self.depends = set()
     if depends is not None:

From 81025bfca9b24db2287ce7d020742d9214ae5ba8 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Tue, 7 Aug 2012 14:09:28 +0100
Subject: [PATCH 040/130] [#2618] Better passing of vars in fanstatic

---
 ckan/html_resources/__init__.py | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/ckan/html_resources/__init__.py b/ckan/html_resources/__init__.py
index deda49ad425..dc7caed56a6 100644
--- a/ckan/html_resources/__init__.py
+++ b/ckan/html_resources/__init__.py
@@ -60,16 +60,20 @@ def __call__(self, url):
 
 # Fanstatic Patch #
 # FIXME add full license info & push upstream
-def __init__(self, library, relpath,
-             depends=None,
-             supersedes=None,
-             bottom=False,
-             renderer=None,
-             debug=None,
-             dont_bundle=False,
-             minified=None,
-             custom_renderer_order=None,
-             custom_order=0):
+def __init__(self, library, relpath, **kw):
+
+    depends = kw.get('depends', None)
+    supersedes = kw.get('supersedes', None)
+    bottom = kw.get('bottom', False)
+    renderer = kw.get('renderer', None)
+    dont_bundle = kw.get('dont_bundle', False)
+    custom_renderer_order = kw.get('custom_renderer_order', None)
+    custom_order = kw.get('custom_order', 0)
+
+    # we don't want to pass these again
+    minified = kw.pop('minified', None)
+    debug = kw.pop('debug', None)
+
     self.library = library
     fullpath = os.path.normpath(os.path.join(library.path, relpath))
     if core._resource_file_existence_checking and not os.path.exists(fullpath):
@@ -126,7 +130,7 @@ def __init__(self, library, relpath,
         if argument is None:
             continue
         elif isinstance(argument, basestring):
-            mode_resource = Resource(library, argument, bottom=bottom, renderer=renderer, dont_bundle=dont_bundle)
+            mode_resource = Resource(library, argument, **kw)
         else:
             # The dependencies of a mode resource should be the same
             # or a subset of the dependencies this mode replaces.

From bd96d4d8968b6055e0f28b13d091338c54f4b5e5 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Tue, 7 Aug 2012 14:10:36 +0100
Subject: [PATCH 041/130] [#2618] Use correct param when creating resource

---
 ckan/html_resources/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckan/html_resources/__init__.py b/ckan/html_resources/__init__.py
index dc7caed56a6..e36ce9bc720 100644
--- a/ckan/html_resources/__init__.py
+++ b/ckan/html_resources/__init__.py
@@ -275,7 +275,7 @@ def create_resource(path, lib_name, count):
             kw['depends'] = dependencies
         if path in dont_bundle:
             kw['dont_bundle'] = True
-        kw['order'] = count
+        kw['custom_order'] = count
         # FIXME needs config.ini options enabled
         if False:
             other_browsers = False

From acfe3b2690e45068e4f2c7c52c846c852494a543 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Tue, 7 Aug 2012 14:11:14 +0100
Subject: [PATCH 042/130] [#2618] Get minified files in sub dirs

---
 ckan/html_resources/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckan/html_resources/__init__.py b/ckan/html_resources/__init__.py
index e36ce9bc720..65e1bbfe4ba 100644
--- a/ckan/html_resources/__init__.py
+++ b/ckan/html_resources/__init__.py
@@ -260,6 +260,7 @@ def create_resource(path, lib_name, count):
         # resource_name is name of the file without the .js/.css
         rel_path, filename = os.path.split(path)
         kw = {}
+        filename = os.path.join(rel_path, filename)
         path_min = min_path(os.path.join(resource_path, filename))
         if os.path.exists(path_min):
             kw['minified'] = min_path(filename)
@@ -284,7 +285,6 @@ def create_resource(path, lib_name, count):
                                         condition=condition,
                                         renderer=renderer,
                                         other_browsers=other_browsers)
-        filename = os.path.join(rel_path, filename)
         resource = Resource(library, filename, **kw)
         # add the resource to this module
         fanstatic_name = '%s/%s' % (lib_name, filename)

From f411b79d9eecb734461405722068451371e74394 Mon Sep 17 00:00:00 2001
From: kindly <kindly@gmail.com>
Date: Tue, 7 Aug 2012 16:32:34 +0100
Subject: [PATCH 043/130] [#2733] parse and validate sort

---
 ckanext/datastore/db.py                   | 47 ++++++++++++++++++++---
 ckanext/datastore/tests/test_datastore.py |  4 +-
 2 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
index 4c8e17ec351..f38911f9bab 100644
--- a/ckanext/datastore/db.py
+++ b/ckanext/datastore/db.py
@@ -2,6 +2,7 @@
 import ckan.plugins as p
 import json
 import datetime
+import shlex
 
 _pg_types = {}
 _type_names = set()
@@ -304,7 +305,7 @@ def _where(field_ids, data_dict):
 
     q = data_dict.get('q')
     if q:
-        where_clauses.append('_full_text @@ to_tsquery(%s)'.format(q))
+        where_clauses.append('_full_text @@ to_tsquery(%s)')
         values.append(q)
 
     where_clause = ' and '.join(where_clauses)
@@ -312,6 +313,45 @@ def _where(field_ids, data_dict):
         where_clause = 'where ' + where_clause
     return where_clause, values
 
+def _sort(context, sort, field_ids):
+
+    if not sort:
+        return ''
+
+    if isinstance(sort, basestring):
+        clauses = sort.split(',')
+    elif isinstance(sort, list):
+        clauses = sort
+    else:
+        raise p.toolkit.ValidationError({
+            'sort': 'sort is not a list or a string'
+        })
+
+    clause_parsed = []
+
+    for clause in clauses:
+        clause_parts = shlex.split(clause)
+        if len(clause_parts) == 1:
+            field, sort = clause_parts[0], 'asc'
+        elif len(clause_parts) == 2:
+            field, sort = clause_parts
+        else:
+            raise p.toolkit.ValidationError({
+                'sort': 'not valid syntax for sort clause'
+            })
+        if field not in field_ids:
+            raise p.toolkit.ValidationError({
+                'sort': 'field {} not it table'.format(field)
+            })
+        if sort.lower() not in ('asc', 'desc'):
+            raise p.toolkit.ValidationError({
+                'sort': 'sorting can only be asc or desc'
+            })
+        clause_parsed.append('"{}" {}'.format(field, sort))
+
+    if clause_parsed:
+        return "order by " + ", ".join(clause_parsed)
+
 
 def delete_data(context, data_dict):
     fields = _get_fields(context, data_dict)
@@ -354,10 +394,7 @@ def search_data(context, data_dict):
     _validate_int(limit, 'limit')
     _validate_int(offset, 'offset')
 
-    if data_dict.get('sort'):
-        sort = 'order by {}'.format(data_dict['sort'])
-    else:
-        sort = ''
+    sort = _sort(context, data_dict.get('sort'), field_ids)
 
     sql_string = '''select {}, count(*) over() as full_count
                     from "{}" {} {} limit {} offset {}'''\
diff --git a/ckanext/datastore/tests/test_datastore.py b/ckanext/datastore/tests/test_datastore.py
index 40136f8fc15..85b1d961857 100644
--- a/ckanext/datastore/tests/test_datastore.py
+++ b/ckanext/datastore/tests/test_datastore.py
@@ -532,7 +532,7 @@ def test_search_filters(self):
 
     def test_search_sort(self):
         data = {'resource_id': self.data['resource_id'],
-                'sort': 'book asc'}
+                'sort': 'book asc, author desc'}
         postparams = '%s=1' % json.dumps(data)
         auth = {'Authorization': str(self.sysadmin_user.apikey)}
         res = self.app.post('/api/action/datastore_search', params=postparams,
@@ -549,7 +549,7 @@ def test_search_sort(self):
         assert result['records'] == expected_records
 
         data = {'resource_id': self.data['resource_id'],
-                'sort': 'book desc'}
+                'sort': ['book desc', '"author" asc']}
         postparams = '%s=1' % json.dumps(data)
         res = self.app.post('/api/action/datastore_search', params=postparams,
                             extra_environ=auth)

From 2fc489dc9913babb7d9d04a08c7f4c9c216850b9 Mon Sep 17 00:00:00 2001
From: kindly <kindly@gmail.com>
Date: Tue, 7 Aug 2012 20:03:25 +0100
Subject: [PATCH 044/130] [#2733] make search permission more liberal

---
 ckanext/datastore/logic/auth.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/datastore/logic/auth.py b/ckanext/datastore/logic/auth.py
index 88ec645cd69..0cac0f18f31 100644
--- a/ckanext/datastore/logic/auth.py
+++ b/ckanext/datastore/logic/auth.py
@@ -26,4 +26,4 @@ def datastore_delete(context, data_dict):
 
 
 def datastore_search(context, data_dict):
-    return _datastore_auth(context, data_dict)
+    return {'success': True}

From aedb12450977a102be479611044af184ee98e2b9 Mon Sep 17 00:00:00 2001
From: kindly <kindly@gmail.com>
Date: Tue, 7 Aug 2012 23:09:14 +0100
Subject: [PATCH 045/130] [#2733] fix issue with auth change

---
 ckanext/datastore/logic/action.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/datastore/logic/action.py b/ckanext/datastore/logic/action.py
index aa856b7a10c..2be78a60522 100644
--- a/ckanext/datastore/logic/action.py
+++ b/ckanext/datastore/logic/action.py
@@ -114,6 +114,6 @@ def datastore_search(context, data_dict):
     data_dict['connection_url'] = pylons.config['ckan.datastore_write_url']
 
     result = db.search(context, data_dict)
-    result.pop('id')
+    result.pop('id', None)
     result.pop('connection_url')
     return result

From 97782d9d30dd93e9b1dcf05066375f0e9e15c9d1 Mon Sep 17 00:00:00 2001
From: kindly <kindly@gmail.com>
Date: Wed, 8 Aug 2012 22:10:10 +0100
Subject: [PATCH 046/130] [#2733] add json type

---
 ckanext/datastore/db.py                   | 81 ++++++++++++++++-------
 ckanext/datastore/tests/test_datastore.py | 80 +++++++++++-----------
 2 files changed, 96 insertions(+), 65 deletions(-)

diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
index f38911f9bab..d6088e30616 100644
--- a/ckanext/datastore/db.py
+++ b/ckanext/datastore/db.py
@@ -1,5 +1,6 @@
 import sqlalchemy
 import ckan.plugins as p
+import psycopg2.extras
 import json
 import datetime
 import shlex
@@ -53,6 +54,15 @@ def _cache_types(context):
         for result in results:
             _pg_types[result[0]] = result[1]
             _type_names.add(result[1])
+        if '_json' not in _type_names:
+            connection.execute('create type "_json" as (json text, extra text)')
+            _pg_types.clear()
+            ## redo cache types with json now availiable.
+            return _cache_types(context)
+
+        psycopg2.extras.register_composite('_json', connection.connection,
+                                           True)
+
 
 
 def _get_type(context, oid):
@@ -64,6 +74,8 @@ def _guess_type(field):
     'Simple guess type of field, only allowed are integer, numeric and text'
     data_types = set([int, float])
 
+    if isinstance(field, (dict, list)):
+        return '_json'
     for data_type in list(data_types):
         try:
             data_type(field)
@@ -109,14 +121,13 @@ def json_get_values(obj, current_list=None):
         for item in obj:
             json_get_values(item, current_list)
     if isinstance(obj, dict):
-        for item in dict.values():
+        for item in obj.values():
             json_get_values(item, current_list)
     return current_list
 
 
 def check_fields(context, fields):
     'Check if field types are valid.'
-    _cache_types(context)
     for field in fields:
         if field.get('type') and not field['type'] in _type_names:
             raise p.toolkit.ValidationError({
@@ -127,6 +138,16 @@ def check_fields(context, fields):
                 'fields': '{0} is not a valid field name'.format(field['id'])
             })
 
+def convert(data, type):
+    if data is None:
+        return None
+    if type == '_json':
+        return json.loads(data[0])
+    if isinstance(data, datetime.datetime):
+        return data.isoformat()
+    if isinstance(data, (int, float)):
+        return data
+    return unicode(data)
 
 def create_table(context, data_dict):
     'Create table from combination of fields and first row of data.'
@@ -237,11 +258,11 @@ def insert_data(context, data_dict):
         return
 
     fields = _get_fields(context, data_dict)
-    field_names = [field['id'] for field in fields] + ['_full_text']
-    sql_columns = ", ".join(['"%s"' % name for name in field_names])
+    field_names = [field['id'] for field in fields]
+    sql_columns = ", ".join(['"%s"' % name for name in field_names] 
+                            + ['_full_text'])
 
     rows = []
-
     ## clean up and validate data
     for num, record in enumerate(data_dict['records']):
 
@@ -255,7 +276,7 @@ def insert_data(context, data_dict):
         if extra_keys:
             raise p.toolkit.ValidationError({
                 'records': 'row {} has extra keys "{}"'.format(
-                    num,
+                    num + 1,
                     ', '.join(list(extra_keys))
                 )
             })
@@ -264,9 +285,10 @@ def insert_data(context, data_dict):
         row = []
         for field in fields:
             value = record.get(field['id'])
-            if isinstance(value, (dict, list)):
+            if field['type'].lower() == '_json' and value:
                 full_text.extend(json_get_values(value))
-                value = json.dumps(value)
+                ## a tuple with an empty second value
+                value = (json.dumps(value), '')
             elif field['type'].lower() == 'text' and value:
                 full_text.append(value)
             row.append(value)
@@ -277,7 +299,7 @@ def insert_data(context, data_dict):
     sql_string = 'insert into "{0}" ({1}) values ({2});'.format(
         data_dict['resource_id'],
         sql_columns,
-        ', '.join(['%s' for field in field_names])
+        ', '.join(['%s' for field in field_names + ['_full_text']])
     )
 
     context['connection'].execute(sql_string, rows)
@@ -369,13 +391,13 @@ def delete_data(context, data_dict):
 
 def search_data(context, data_dict):
     all_fields = _get_fields(context, data_dict)
-    all_field_ids = set([field['id'] for field in all_fields])
+    all_field_ids = [field['id'] for field in all_fields]
+    all_field_ids.insert(0,'_id')
 
     fields = data_dict.get('fields')
 
     if fields:
-        check_fields(context, fields)
-        field_ids = set([field['id'] for field in fields])
+        field_ids = fields
 
         for field in field_ids:
             if not field in all_field_ids:
@@ -383,7 +405,6 @@ def search_data(context, data_dict):
                     'fields': 'field "{}" not in table'.format(field)}
                 )
     else:
-        fields = all_fields
         field_ids = all_field_ids
 
     select_columns = ', '.join(field_ids)
@@ -396,24 +417,35 @@ def search_data(context, data_dict):
 
     sort = _sort(context, data_dict.get('sort'), field_ids)
 
-    sql_string = '''select {}, count(*) over() as full_count
+    sql_string = '''select {}, count(*) over() as "_full_count"
                     from "{}" {} {} limit {} offset {}'''\
         .format(select_columns, data_dict['resource_id'], where_clause,
                 sort, limit, offset)
     results = context['connection'].execute(sql_string, where_values)
-    results = [r for r in results]
-
-    if results:
-        data_dict['total'] = results[0]['full_count']
-    else:
-        data_dict['total'] = 0
 
-    records = [(dict((f, r[f]) for f in field_ids)) for r in results]
+    result_fields = []
+    for field in results.cursor.description:
+        result_fields.append({
+            'id': field[0],
+            'type': _get_type(context, field[1])
+        })
+    result_fields.pop() # remove _full_count
+
+    data_dict['total'] = 0
+
+    records = []
+    for row in results:
+        converted_row = {}
+        if not data_dict['total']:
+            data_dict['total'] = row['_full_count']
+        for field in result_fields:
+            converted_row[field['id']] = convert(row[field['id']],
+                                                 field['type'])
+        records.append(converted_row)
     data_dict['records'] = records
-
+    data_dict['fields'] = result_fields
     return data_dict
 
-
 def create(context, data_dict):
     '''
     The first row will be used to guess types not in the fields and the
@@ -437,6 +469,7 @@ def create(context, data_dict):
     '''
     engine = _get_engine(context, data_dict)
     context['connection'] = engine.connect()
+    _cache_types(context)
 
     # close connection at all cost.
     try:
@@ -463,6 +496,7 @@ def create(context, data_dict):
 def delete(context, data_dict):
     engine = _get_engine(context, data_dict)
     context['connection'] = engine.connect()
+    _cache_types(context)
 
     try:
         # check if table existes
@@ -495,6 +529,7 @@ def delete(context, data_dict):
 def search(context, data_dict):
     engine = _get_engine(context, data_dict)
     context['connection'] = engine.connect()
+    _cache_types(context)
 
     try:
         # check if table existes
diff --git a/ckanext/datastore/tests/test_datastore.py b/ckanext/datastore/tests/test_datastore.py
index 85b1d961857..1cb6105a5dd 100644
--- a/ckanext/datastore/tests/test_datastore.py
+++ b/ckanext/datastore/tests/test_datastore.py
@@ -134,9 +134,10 @@ def test_create_basic(self):
         data = {
             'resource_id': resource.id,
             'fields': [{'id': 'book', 'type': 'text'},
-                       {'id': 'author', 'type': 'text'}],
-            'records': [{'book': 'annakarenina', 'author': 'tolstoy'},
+                       {'id': 'author', 'type': '_json'}],
+            'records': [
                         {'book': 'crime', 'author': ['tolstoy', 'dostoevsky']},
+                        {'book': 'annakarenina', 'author': ['tolstoy', 'putin']},
                         {'book': 'warandpeace'}]  # treat author as null
         }
         postparams = '%s=1' % json.dumps(data)
@@ -156,8 +157,7 @@ def test_create_basic(self):
         assert results.rowcount == 3
         for i, row in enumerate(results):
             assert data['records'][i].get('book') == row['book']
-            assert (data['records'][i].get('author') == row['author']
-                    or data['records'][i].get('author') == json.loads(row['author']))
+            assert data['records'][i].get('author') == (json.loads(row['author'][0]) if row['author'] else None)
 
         results = c.execute('''select * from "{0}" where _full_text @@ 'warandpeace' '''.format(resource.id))
         assert results.rowcount == 1
@@ -169,7 +169,7 @@ def test_create_basic(self):
         #######  insert again simple
         data2 = {
             'resource_id': resource.id,
-            'records': [{'book': 'hagji murat', 'author': 'tolstoy'}]
+            'records': [{'book': 'hagji murat', 'author': ['tolstoy']}]
         }
 
         postparams = '%s=1' % json.dumps(data2)
@@ -188,8 +188,7 @@ def test_create_basic(self):
         all_data = data['records'] + data2['records']
         for i, row in enumerate(results):
             assert all_data[i].get('book') == row['book']
-            assert (all_data[i].get('author') == row['author']
-                    or all_data[i].get('author') == json.loads(row['author']))
+            assert all_data[i].get('author') == (json.loads(row['author'][0]) if row['author'] else None)
 
         results = c.execute('''select * from "{0}" where _full_text @@ 'tolstoy' '''.format(resource.id))
         assert results.rowcount == 3
@@ -199,7 +198,7 @@ def test_create_basic(self):
         data3 = {
             'resource_id': resource.id,
             'records': [{'book': 'crime and punsihment',
-                         'author': 'dostoevsky', 'rating': 'good'}]
+                         'author': ['dostoevsky'], 'rating': 'good'}]
         }
 
         postparams = '%s=1' % json.dumps(data3)
@@ -216,11 +215,9 @@ def test_create_basic(self):
         assert results.rowcount == 5
 
         all_data = data['records'] + data2['records'] + data3['records']
-        print all_data
         for i, row in enumerate(results):
             assert all_data[i].get('book') == row['book'], (i, all_data[i].get('book'), row['book'])
-            assert (all_data[i].get('author') == row['author']
-                    or all_data[i].get('author') == json.loads(row['author']))
+            assert all_data[i].get('author') == (json.loads(row['author'][0]) if row['author'] else None)
 
         results = c.execute('''select * from "{0}" where _full_text @@ 'dostoevsky' '''.format(resource.id))
         assert results.rowcount == 2
@@ -230,7 +227,7 @@ def test_guess_types(self):
         resource = model.Package.get('annakarenina').resources[1]
         data = {
             'resource_id': resource.id,
-            'fields': [{'id': 'author', 'type': 'text'},
+            'fields': [{'id': 'author', 'type': '_json'},
                        {'id': 'count'},
                        {'id': 'book'},
                        {'id': 'date'}],
@@ -250,14 +247,13 @@ def test_guess_types(self):
 
         types = [db._pg_types[field[1]] for field in results.cursor.description]
 
-        assert types == [u'int4', u'tsvector', u'text', u'int4',
+        assert types == [u'int4', u'tsvector', u'_json', u'int4',
                          u'text', u'timestamp', u'int4'], types
 
         assert results.rowcount == 3
         for i, row in enumerate(results):
             assert data['records'][i].get('book') == row['book']
-            assert (data['records'][i].get('author') == row['author']
-                    or data['records'][i].get('author') == json.loads(row['author']))
+            assert data['records'][i].get('author') == (json.loads(row['author'][0]) if row['author'] else None) 
         model.Session.remove()
 
         ### extend types
@@ -274,7 +270,7 @@ def test_guess_types(self):
                       ],
             'records': [{'book': 'annakarenina', 'author': 'tolstoy',
                          'count': 1, 'date': '2005-12-01', 'count2': 2,
-                         'count3': 432, 'date2': '2005-12-01'}]
+                         'nested': [1,2], 'date2': '2005-12-01'}]
         }
 
         postparams = '%s=1' % json.dumps(data)
@@ -290,14 +286,14 @@ def test_guess_types(self):
 
         assert types == [u'int4',  # id
                          u'tsvector',  # fulltext
-                         u'text',  # author
+                         u'_json',  # author
                          u'int4',  # count
                          u'text',  # book
                          u'timestamp',  # date
                          u'int4',  # count2
                          u'text',  # extra
                          u'timestamp',  # date2
-                         u'int4',  # count3
+                         u'_json',  # count3
                         ], types
 
         ### fields resupplied in wrong order
@@ -466,8 +462,9 @@ def setup_class(cls):
             'resource_id': resource.id,
             'fields': [{'id': 'book', 'type': 'text'},
                        {'id': 'author', 'type': 'text'}],
-            'records': [{'book': 'annakarenina', 'author': 'tolstoy'},
-                        {'book': 'warandpeace', 'author': 'tolstoy'}]
+            'records': [{'book': 'annakarenina', 'author': 'tolstoy', 'published': '2005-03-01', 'nested': ['b', {'moo': 'moo'}]},
+                        {'book': 'warandpeace', 'author': 'tolstoy', 'nested': {'a':'b'}}
+                       ]
         }
         postparams = '%s=1' % json.dumps(cls.data)
         auth = {'Authorization': str(cls.sysadmin_user.apikey)}
@@ -476,6 +473,14 @@ def setup_class(cls):
         res_dict = json.loads(res.body)
         assert res_dict['success'] is True
 
+        cls.expected_records = [{u'published': u'2005-03-01T00:00:00',
+                                u'_id': 1,
+                                u'nested': [u'b', {u'moo': u'moo'}], u'book': u'annakarenina', u'author': u'tolstoy'},
+                                {u'published': None,
+                                 u'_id': 2,
+                                 u'nested': {u'a': u'b'}, u'book': u'warandpeace', u'author': u'tolstoy'}]
+
+
     @classmethod
     def teardown_class(cls):
         model.repo.rebuild_db()
@@ -490,7 +495,7 @@ def test_search_basic(self):
         assert res_dict['success'] is True
         result = res_dict['result']
         assert result['total'] == len(self.data['records'])
-        assert result['records'] == self.data['records']
+        assert result['records'] == self.expected_records
 
     def test_search_invalid_field(self):
         data = {'resource_id': self.data['resource_id'],
@@ -504,7 +509,7 @@ def test_search_invalid_field(self):
 
     def test_search_fields(self):
         data = {'resource_id': self.data['resource_id'],
-                'fields': [{'id': 'book'}]}
+                'fields': ['book']}
         postparams = '%s=1' % json.dumps(data)
         auth = {'Authorization': str(self.sysadmin_user.apikey)}
         res = self.app.post('/api/action/datastore_search', params=postparams,
@@ -514,7 +519,7 @@ def test_search_fields(self):
         result = res_dict['result']
         assert result['total'] == len(self.data['records'])
         assert result['records'] == [{'book': 'annakarenina'},
-                                     {'book': 'warandpeace'}]
+                                     {'book': 'warandpeace'}], result['records']
 
     def test_search_filters(self):
         data = {'resource_id': self.data['resource_id'],
@@ -527,8 +532,7 @@ def test_search_filters(self):
         assert res_dict['success'] is True
         result = res_dict['result']
         assert result['total'] == 1
-        assert result['records'] == [{'book': 'annakarenina',
-                                      'author': 'tolstoy'}]
+        assert result['records'] == [self.expected_records[0]]
 
     def test_search_sort(self):
         data = {'resource_id': self.data['resource_id'],
@@ -542,11 +546,7 @@ def test_search_sort(self):
         result = res_dict['result']
         assert result['total'] == 2
 
-        expected_records = [
-            {'book': 'annakarenina', 'author': 'tolstoy'},
-            {'book': 'warandpeace', 'author': 'tolstoy'}
-        ]
-        assert result['records'] == expected_records
+        assert result['records'] == self.expected_records, result['records']
 
         data = {'resource_id': self.data['resource_id'],
                 'sort': ['book desc', '"author" asc']}
@@ -558,11 +558,7 @@ def test_search_sort(self):
         result = res_dict['result']
         assert result['total'] == 2
 
-        expected_records = [
-            {'book': 'warandpeace', 'author': 'tolstoy'},
-            {'book': 'annakarenina', 'author': 'tolstoy'}
-        ]
-        assert result['records'] == expected_records
+        assert result['records'] == self.expected_records[::-1]
 
     def test_search_limit(self):
         data = {'resource_id': self.data['resource_id'],
@@ -575,8 +571,7 @@ def test_search_limit(self):
         assert res_dict['success'] is True
         result = res_dict['result']
         assert result['total'] == 2
-        assert result['records'] == [{'book': 'annakarenina',
-                                      'author': 'tolstoy'}]
+        assert result['records'] == [self.expected_records[0]]
 
     def test_search_invalid_limit(self):
         data = {'resource_id': self.data['resource_id'],
@@ -600,8 +595,7 @@ def test_search_offset(self):
         assert res_dict['success'] is True
         result = res_dict['result']
         assert result['total'] == 2
-        assert result['records'] == [{'book': 'warandpeace',
-                                      'author': 'tolstoy'}]
+        assert result['records'] == [self.expected_records[1]]
 
     def test_search_invalid_offset(self):
         data = {'resource_id': self.data['resource_id'],
@@ -624,8 +618,7 @@ def test_search_full_text(self):
         assert res_dict['success'] is True
         result = res_dict['result']
         assert result['total'] == 1
-        assert result['records'] == [{'book': 'annakarenina',
-                                      'author': 'tolstoy'}]
+        assert result['records'] == [self.expected_records[0]]
 
         data = {'resource_id': self.data['resource_id'],
                 'q': 'tolstoy'}
@@ -636,4 +629,7 @@ def test_search_full_text(self):
         assert res_dict['success'] is True
         result = res_dict['result']
         assert result['total'] == 2
-        assert result['records'] == self.data['records']
+        assert result['records'] == self.expected_records, result['records']
+
+        assert result['fields'] == [{u'type': u'int4', u'id': u'_id'}, {u'type': u'text', u'id': u'book'}, {u'type': u'text', u'id': u'author'}, {u'type': u'timestamp', u'id': u'published'}, {u'type': u'_json', u'id': u'nested'}], result['fields']
+

From e5d95b7b47160545af1ea0aebac16327447954b4 Mon Sep 17 00:00:00 2001
From: kindly <kindly@gmail.com>
Date: Thu, 9 Aug 2012 02:44:54 +0100
Subject: [PATCH 047/130] [#2733] add extra date types, make sure side effect
 free queries

---
 ckanext/datastore/db.py           | 23 ++++++++++++++++-------
 ckanext/datastore/logic/action.py |  1 +
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
index d6088e30616..dd1d8fc4155 100644
--- a/ckanext/datastore/db.py
+++ b/ckanext/datastore/db.py
@@ -9,10 +9,15 @@
 _type_names = set()
 _engines = {}
 
-_iso_formats = ['%Y-%m-%d',
+_date_formats = ['%Y-%m-%d',
                 '%Y-%m-%d %H:%M:%S',
-                '%Y-%m-%dT%H:%M:%S']
-
+                '%Y-%m-%dT%H:%M:%S',
+                '%Y-%m-%dT%H:%M:%SZ',
+                '%d/%m/%Y',
+                '%m/%d/%Y',
+                '%d-%m-%Y',
+                '%m-%d-%Y',
+                ]
 
 def _is_valid_field_name(name):
     '''
@@ -73,9 +78,12 @@ def _get_type(context, oid):
 def _guess_type(field):
     'Simple guess type of field, only allowed are integer, numeric and text'
     data_types = set([int, float])
-
     if isinstance(field, (dict, list)):
         return '_json'
+    if isinstance(field, int):
+        return 'int'
+    if isinstance(field, float):
+        return 'float'
     for data_type in list(data_types):
         try:
             data_type(field)
@@ -89,7 +97,7 @@ def _guess_type(field):
         return 'numeric'
 
     ##try iso dates
-    for format in _iso_formats:
+    for format in _date_formats:
         try:
             datetime.datetime.strptime(field, format)
             return 'timestamp'
@@ -259,7 +267,7 @@ def insert_data(context, data_dict):
 
     fields = _get_fields(context, data_dict)
     field_names = [field['id'] for field in fields]
-    sql_columns = ", ".join(['"%s"' % name for name in field_names] 
+    sql_columns = ", ".join(['"%s"' % name for name in field_names]
                             + ['_full_text'])
 
     rows = []
@@ -407,7 +415,8 @@ def search_data(context, data_dict):
     else:
         field_ids = all_field_ids
 
-    select_columns = ', '.join(field_ids)
+    select_columns = ', '.join(['"{}"'.format(field_id)
+                                for field_id in field_ids])
     where_clause, where_values = _where(all_field_ids, data_dict)
     limit = data_dict.get('limit', 100)
     offset = data_dict.get('offset', 0)
diff --git a/ckanext/datastore/logic/action.py b/ckanext/datastore/logic/action.py
index 2be78a60522..489a954e8ec 100644
--- a/ckanext/datastore/logic/action.py
+++ b/ckanext/datastore/logic/action.py
@@ -70,6 +70,7 @@ def datastore_delete(context, data_dict):
     return result
 
 
+@logic.side_effect_free
 def datastore_search(context, data_dict):
     '''Search a datastore table.
 

From 5501b1350e9cd92b6d956ff0f2e71df9e1702f65 Mon Sep 17 00:00:00 2001
From: Daniel Lewis <daniel@vanirsystems.com>
Date: Fri, 10 Aug 2012 09:57:39 +0100
Subject: [PATCH 048/130] modified: doc/datastore.rst

Changed datastore.rst to detail most recent datastore api changes
---
 doc/datastore.rst | 77 +++++++++++------------------------------------
 1 file changed, 17 insertions(+), 60 deletions(-)

diff --git a/doc/datastore.rst b/doc/datastore.rst
index 9f3de6a919c..04a940d8cd5 100644
--- a/doc/datastore.rst
+++ b/doc/datastore.rst
@@ -33,80 +33,42 @@ queries over the spreadsheet contents.
 The DataStore Data API
 ======================
 
-The DataStore's Data API, which derives from the underlying ElasticSearch
-data-table, is RESTful and JSON-based with extensive query capabilities.
+The DataStore's Data API, which derives from the underlying data-table, is RESTful and JSON-based with extensive query capabilities.
 
 Each resource in a CKAN instance has an associated DataStore 'table'. This
 table will be accessible via a web interface at::
 
   /api/data/{resource-id}
 
-This interface to this data is *exactly* the same as that provided by
-ElasticSearch to documents of a specific type in one of its indices.
-
 For a detailed tutorial on using this API see :doc:`using-data-api`.
 
 Installation and Configuration
 ==============================
 
-The DataStore uses ElasticSearch_ as the persistence and query layer with CKAN
-wrapping this with a thin authorization and authentication layer.
-
-It also requires the use of Nginx as your webserver as its XSendfile_ feature
-is used to transparently hand off data requests to ElasticSeach internally.
-
-.. _ElasticSearch: http://www.elasticsearch.org/
-.. _XSendfile: http://wiki.nginx.org/XSendfile
-
-1. Install ElasticSearch_
--------------------------
-
-Please see the ElasticSearch_ documentation.
-
-2. Configure Nginx
-------------------
+The DataStore in previous lives required a custom setup of ElasticSearch and Nginx, but that is no more, as it can use any relational database management system (PostgreSQL for example).
 
-As previously mentioned, Nginx will be used on top of CKAN to forward
-requests to Elastic Search. CKAN will still be served by Apache or the
-development server (Paster), but all requests will be forwarded to it
-by Ngnix.
-
-This is an example of an Nginx configuration file. Note the two locations
-defined, `/` will point to the server running CKAN (Apache or Paster), and
-`/elastic/` to the Elastic Search instance::
+To enable datastore features in CKAN
+------------------------------------
 
-    server {
-            listen   80 default;
-            server_name  localhost;
+In your config file...
 
-            access_log  /var/log/nginx/localhost.access.log;
+Enable the ckan datastore::
 
-            location / {
-                    # location of apache or ckan under paster
-                    proxy_pass   http://127.0.0.1:8080;
-                    proxy_set_header Host $host;
-            }
-            location /elastic/ {
-                    internal;
-                    # location of elastic search
-                    proxy_pass http://:127.0.0.1:9200/;
-                    proxy_set_header Host $host;
-                    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            }
-    }
+ ckan.datastore.enabled = 1
+ 
+Ensure that the datastore extension is enabled::
 
-.. note:: update the proxy_pass field value to point to your ElasticSearch
-          instance (if it is not localhost and default port).
+ ckan.plugins = datastore
+ 
+Ensure that the ckan.datastore_write_url variable is set::
 
-Remember that after setting up Nginx, you need to access CKAN via its port
-(80), not the Apache or Paster (5000) one, otherwise the DataStore won't work.
+ ckan.datastore_write_url = postgresql://ckanuser:pass@localhost/ckantest
+ 
+To test you can create a new datastore, so on linux command line do::
 
-3. Enable datastore features in CKAN
-------------------------------------
+ curl -X POST http://127.0.0.1:5000/api/3/action/datastore_create -H "Authorization: {YOUR-API-KEY}" -d "{\"resource_id\": \"{PRE-EXISTING-RESOURCE-ID}\", \"fields\": [ {\"id\": \"a\"}, {\"id\": \"b\"} ], \"records\": [ { \"a\": 1, \"b\": \"xyz\"}, {\"a\": 2, \"b\": \"zzz\"} ]}"
 
-In your config file set::
 
- ckan.datastore.enabled = 1
 
 .. _datastorer:
 
@@ -130,11 +92,6 @@ How It Works (Technically)
 
 1. Request arrives at e.g. /dataset/{id}/resource/{resource-id}/data
 2. CKAN checks authentication and authorization.
-3. (Assuming OK) CKAN hands (internally) to ElasticSearch which handles the
+3. (Assuming OK) CKAN hands (internally) to the database querying system which handles the
    request 
 
-   * To do this we use Nginx's Sendfile / Accel-Redirect feature. This allows
-     us to hand off a user request *directly* to ElasticSearch after the
-     authentication and authorization. This avoids the need to proxy the
-     request and results through CKAN code.
-

From fdec7089b49a3dcd1859e11222427609b4d7a418 Mon Sep 17 00:00:00 2001
From: Daniel Lewis <daniel@vanirsystems.com>
Date: Fri, 10 Aug 2012 12:45:48 +0100
Subject: [PATCH 049/130] Modified datastore.rst and changed using-data-api.rst
 to reflect new datastore api

---
 doc/datastore.rst      |  21 +-
 doc/using-data-api.rst | 664 ++++++++---------------------------------
 2 files changed, 128 insertions(+), 557 deletions(-)

diff --git a/doc/datastore.rst b/doc/datastore.rst
index 04a940d8cd5..77fd981d2df 100644
--- a/doc/datastore.rst
+++ b/doc/datastore.rst
@@ -33,7 +33,8 @@ queries over the spreadsheet contents.
 The DataStore Data API
 ======================
 
-The DataStore's Data API, which derives from the underlying data-table, is RESTful and JSON-based with extensive query capabilities.
+The DataStore's Data API, which derives from the underlying data-table, 
+is RESTful and JSON-based with extensive query capabilities.
 
 Each resource in a CKAN instance has an associated DataStore 'table'. This
 table will be accessible via a web interface at::
@@ -45,28 +46,26 @@ For a detailed tutorial on using this API see :doc:`using-data-api`.
 Installation and Configuration
 ==============================
 
-The DataStore in previous lives required a custom setup of ElasticSearch and Nginx, but that is no more, as it can use any relational database management system (PostgreSQL for example).
+The DataStore in previous lives required a custom setup of ElasticSearch and Nginx, 
+but that is no more, as it can use any relational database management system 
+(PostgreSQL for example).
 
 To enable datastore features in CKAN
 ------------------------------------
 
-In your config file...
-
-Enable the ckan datastore::
-
- ckan.datastore.enabled = 1
- 
-Ensure that the datastore extension is enabled::
+In your config file ensure that the datastore extension is enabled::
 
  ckan.plugins = datastore
  
-Ensure that the ckan.datastore_write_url variable is set::
+Also ensure that the ckan.datastore_write_url variable is set::
 
  ckan.datastore_write_url = postgresql://ckanuser:pass@localhost/ckantest
  
 To test you can create a new datastore, so on linux command line do::
 
- curl -X POST http://127.0.0.1:5000/api/3/action/datastore_create -H "Authorization: {YOUR-API-KEY}" -d "{\"resource_id\": \"{PRE-EXISTING-RESOURCE-ID}\", \"fields\": [ {\"id\": \"a\"}, {\"id\": \"b\"} ], \"records\": [ { \"a\": 1, \"b\": \"xyz\"}, {\"a\": 2, \"b\": \"zzz\"} ]}"
+ curl -X POST http://127.0.0.1:5000/api/3/action/datastore_create -H "Authorization: {YOUR-API-KEY}" -d "
+    {\"resource_id\": \"{RESOURCE-ID}\", \"fields\": [ {\"id\": \"a\"}, {\"id\": \"b\"} ], 
+    \"records\": [ { \"a\": 1, \"b\": \"xyz\"}, {\"a\": 2, \"b\": \"zzz\"} ]}"
 
 
 
diff --git a/doc/using-data-api.rst b/doc/using-data-api.rst
index f0a96172d08..ce7c72acebe 100644
--- a/doc/using-data-api.rst
+++ b/doc/using-data-api.rst
@@ -8,599 +8,171 @@ The following provides an introduction to using the CKAN :doc:`DataStore
 Introduction
 ============
 
-Each 'table' in the DataStore is an ElasticSearch_ index type ('table'). As
-such the Data API for each CKAN resource is directly equivalent to a single
-index 'type' in ElasticSearch (we tend to refer to it as a 'table').
-
-This means you can (usually) directly re-use `ElasticSearch client libraries`_
-when connecting to a Data API endpoint. It also means that what follows is, in
-essence, a tutorial in using the ElasticSearch_ API.
-
-The following short set of slides provide a brief overview and introduction to
-the DataStore and the Data API.
+The DataStore API allows tabular data to be stored inside CKAN quickly and easily. It is accessible through an interface accessible over HTTP and can be interacted with using JSON (the JavaScript Object Notation).
 
 .. raw:: html
 
    <iframe src="https://docs.google.com/presentation/embed?id=1UhEqvEPoL_VWO5okYiEPfZTLcLYWqtvRRmB1NBsWXY8&#038;start=false&#038;loop=false&#038;delayms=3000" frameborder="0" width="480" height="389" allowfullscreen="true" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe>
 
-.. _ElasticSearch: http://elasticsearch.org/
-.. _ElasticSearch client libraries: http://www.elasticsearch.org/guide/appendix/clients.html
 
 Quickstart
 ==========
 
-``{{endpoint}}`` refers to the data API endpoint (or ElasticSearch index /
-table). For example, on the DataHub_ this gold prices data resource
-http://datahub.io/dataset/gold-prices/resource/b9aae52b-b082-4159-b46f-7bb9c158d013
-would have its Data API endpoint at:
-http://datahub.io/api/data/b9aae52b-b082-4159-b46f-7bb9c158d013. If you were
-just using ElasticSearch standalone an example of an endpoint would be:
-http://localhost:9200/gold-prices/monthly-price-table.
-
-.. note::  every resource on a CKAN instance for which a DataStore table is
-           enabled provides links to its Data API endpoint via the Data API
-           button at the top right of the resource page.
-
-Key urls:
+There are several endpoints into the DataStore API, they are:
 
-* Query: ``{{endpoint}}/_search`` (in ElasticSearch < 0.19 this will return an
-  error if visited without a query parameter)
+* datastore_create: ``http://{YOUR-CKAN-INSTALLATION}/api/3/action/datastore_create``
+* datastore_search: ``http://{YOUR-CKAN-INSTALLATION}/api/3/action/datastore_search``
+* datastore_delete: ``http://{YOUR-CKAN-INSTALLATION}/api/3/action/datastore_delete``
 
-  * Query example: ``{{endpoint}}/_search?size=5&pretty=true``
+API Reference
+-------------
 
-* Schema (Mapping): ``{{endpoint}}/_mapping``
+datastore_create
+~~~~~~~~~~~~~~~~
 
-.. _DataHub: http://datahub.io/
-
-Examples
---------
-
-cURL (or Browser)
-~~~~~~~~~~~~~~~~~
-
-The following examples utilize the cURL_ command line utility. If you prefer,
-you you can just open the relevant urls in your browser::
-
-  // query for documents / rows with title field containing 'jones'
-  // added pretty=true to get the json results pretty printed
-  curl {{endpoint}}/_search?q=title:jones&size=5&pretty=true
-
-Adding some data (requires an :ref:`API Key <get-api-key>`)::
-
-  // requires an API key
-  // Data (argument to -d) should be a JSON document
-  curl -X POST -H "Authorization: {{YOUR-API-KEY}}" {{endpoint}} -d '{
-    "title": "jones",
-    "amount": 5.7
-  }'
-
-.. _cURL: http://curl.haxx.se/
-
-Javascript
-~~~~~~~~~~
-
-A simple ajax (JSONP) request to the data API using jQuery::
-
-  var data = {
-    size: 5 // get 5 results
-    q: 'title:jones' // query on the title field for 'jones'
-  };
-  $.ajax({
-    url: {{endpoint}}/_search,
-    dataType: 'jsonp',
-    success: function(data) {
-      alert('Total results found: ' + data.hits.total)
-    }
-  });
-
-The Data API supports CORs so you can also write to it (this requires the json2_ library for ``JSON.stringify``)::
-
-  var data = {
-    title: 'jones',
-    amount: 5.7
-  };
-  $.ajax({
-    url: {{endpoint}},
-    type: 'POST',
-    data: JSON.stringify(data),
-    success: function(data) {
-      alert('Uploaded ok')
-    }
-  });
-
-.. _json2: https://github.com/douglascrockford/JSON-js/blob/master/json2.js
-
-Python
-~~~~~~
+The datastore_create API endpoint allows a user to post JSON data to 
+be stored against a resource, the JSON must be in the following form::
 
-.. note:: You can also use the `DataStore Python client library`_.
+ {
+    resource_id: resource_id, # the data is going to be stored against.
+    fields: [], # a list of dictionaries of fields/columns and their extra metadata.
+    records: [], # a list of dictionaries of the data eg  [{"dob": "2005", "some_stuff": ['a', b']}, ..]
+ }
 
-.. _DataStore Python client library: http://github.com/okfn/datastore-client
 
-::
+datastore_search
+~~~~~~~~~~~~~~~~
 
-  import urllib2
-  import json
-
-  # =================================
-  # Store data in the DataStore table
-
-  url = '{{endpoint}}'
-  data = {
-      'title': 'jones',
-      'amount': 5.7
-      }
-  # have to send the data as JSON
-  data = json.dumps(data)
-  # need to add your API key (and have authorization to write to this endpoint)
-  headers = {'Authorization': 'YOUR-API-KEY'}
-
-  req = urllib2.Request(url, data, headers)
-  out = urllib2.urlopen(req)
-  print out.read()
-
-  # =========================
-  # Query the DataStore table
-
-  url = '{{endpoint}}/_search?q=title:jones&size=5'
-  req = urllib2.Request(url)
-  out = urllib2.urlopen(req)
-  data = out.read()
-  print data
-  # returned data is JSON
-  data = json.loads(data)
-  # total number of results
-  print data['hits']['total']
-
-Querying
-========
-
-Basic Queries Using Only the Query String
------------------------------------------
-
-Basic queries can be done using only query string parameters in the URL. For
-example, the following searches for text 'hello' in any field in any document
-and returns at most 5 results::
-
-  {{endpoint}}/_search?q=hello&size=5
-
-Basic queries like this have the advantage that they only involve accessing a
-URL and thus, for example, can be performed just using any web browser.
-However, this method is limited and does not give you access to most of the
-more powerful query features.
-
-Basic queries use the `q` query string parameter which supports the `Lucene
-query parser syntax`_ and hence filters on specific fields (e.g. `fieldname:value`), wildcards (e.g. `abc*`) and more.
-
-.. _Lucene query parser syntax: http://lucene.apache.org/core/old_versioned_docs/versions/3_0_0/queryparsersyntax.html
-
-There are a variety of other options (e.g. size, from etc) that you can also
-specify to customize the query and its results. Full details can be found in
-the `ElasticSearch URI request docs`_.
-
-.. _ElasticSearch URI request docs: http://www.elasticsearch.org/guide/reference/api/search/uri-request.html
-
-Full Query API
---------------
-
-More powerful and complex queries, including those that involve faceting and
-statistical operations, should use the full ElasticSearch query language and API.
-
-In the query language queries are written as a JSON structure and is then sent
-to the query endpoint (details of the query langague below). There are two
-options for how a query is sent to the search endpoint:
-
-1. Either as the value of a source query parameter e.g.::
-
-    {{endpoint}}/_search?source={Query-as-JSON}
-
-2. Or in the request body, e.g.::
-
-    curl -XGET {{endpoint}}/_search -d 'Query-as-JSON'
-
-   For example::
-
-    curl -XGET {{endpoint}}/_search -d '{
-        "query" : {
-            "term" : { "user": "kimchy" }
-        }
-    }'
+The datastore_search API endpoint allows a user to search data at a resource, 
+the JSON for searching must be in the following form::
 
+ {
+     resource_id: # the resource id to be searched against
+     filters : # dictionary of matching conditions to select e.g  {'key1': 'a. 'key2': 'b'}  
+        # this will be equivalent to "select * from table where key1 = 'a' and key2 = 'b' "
+     q: # full text query
+     limit: # limit the amount of rows to size defaults to 20
+     offset: # offset the amount of rows
+     fields:  # list of fields return in that order, defaults (empty or not present) to all fields in fields order.
+     sort: 
+ }
 
-Query Language
-==============
+datastore_delete
+~~~~~~~~~~~~~~~~
 
-Queries are JSON objects with the following structure (each of the main
-sections has more detail below)::
+The datastore_delete API endpoint allows a user to delete from a resource, 
+the JSON for searching must be in the following form::
 
-    {
-        size: # number of results to return (defaults to 10)
-        from: # offset into results (defaults to 0)
-        fields: # list of document fields that should be returned - http://elasticsearch.org/guide/reference/api/search/fields.html
-        sort: # define sort order - see http://elasticsearch.org/guide/reference/api/search/sort.html
+ {
+    resource_id: resource_id # the data that is going to be deleted.
+    filters: # dictionary of matching conditions to delete
+       		# e.g  {'key1': 'a. 'key2': 'b'}  
+       		# this will be equivalent to "delete from table where key1 = 'a' and key2 = 'b' "
+ }
 
-        query: {
-            # "query" object following the Query DSL: http://elasticsearch.org/guide/reference/query-dsl/
-            # details below
-        },
-
-        facets: {
-            # facets specifications
-            # Facets provide summary information about a particular field or fields in the data
-        }
-
-        # special case for situations where you want to apply filter/query to results but *not* to facets
-        filter: {
-            # filter objects
-            # a filter is a simple "filter" (query) on a specific field.
-            # Simple means e.g. checking against a specific value or range of values
-        },
-    }
-
-Query results look like::
-
-    {
-        # some info about the query (which shards it used, how long it took etc)
-        ...
-        # the results
-        hits: {
-            total: # total number of matching documents
-            hits: [
-                # list of "hits" returned
-                {
-                    _id: # id of document
-                    score: # the search index score
-                    _source: {
-                        # document 'source' (i.e. the original JSON document you sent to the index
-                    }
-                }
-            ]
-        }
-        # facets if these were requested
-        facets: {
-            ...
-        }
-    }
-
-Query DSL: Overview
--------------------
-
-Query objects are built up of sub-components. These sub-components are either
-basic or compound. Compound sub-components may contains other sub-components
-while basic may not. Example::
-
-    {
-        "query": {
-            # compound component
-            "bool": {
-                # compound component
-                "must": {
-                    # basic component
-                    "term": {
-                        "user": "jones"
-                    }
-                }
-                # compound component
-                "must_not": {
-                    # basic component
-                    "range" : {
-                        "age" : {
-                            "from" : 10,
-                            "to" : 20
-                        }
-                    } 
-                }
-            }
-        }
-    }
-
-In addition, and somewhat confusingly, ElasticSearch distinguishes between
-sub-components that are "queries" and those that are "filters". Filters, are
-really special kind of queries that are: mostly basic (though boolean
-compounding is alllowed); limited to one field or operation and which, as such,
-are especially performant.
-
-Examples, of filters are (full list on RHS at the bottom of the query-dsl_ page):
-
-  * term: filter on a value for a field
-  * range: filter for a field having a range of values (>=, <= etc)
-  * geo_bbox: geo bounding box
-  * geo_distance: geo distance
-
-.. _query-dsl: http://elasticsearch.org/guide/reference/query-dsl/
-
-Rather than attempting to set out all the constraints and options of the
-query-dsl we now offer a variety of examples.
 
 Examples
 --------
 
-Match all / Find Everything
-~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-::
+Some of the following commands require obtaining an :ref:`API Key <get-api-key>`.
 
-    {
-        "query": {
-            "match_all": {}
-        }
-    }
-
-Classic Search-Box Style Full-Text Query
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This will perform a full-text style query across all fields. The query string
-supports the `Lucene query parser syntax`_ and hence filters on specific fields
-(e.g. `fieldname:value`), wildcards (e.g. `abc*`) as well as a variety of
-options. For full details see the query-string_ documentation.
-
-::
-
-    {
-        "query": {
-            "query_string": {
-                "query": {query string}
-            }
-        }
-    }
-
-.. _query-string: http://elasticsearch.org/guide/reference/query-dsl/query-string-query.html
-
-Filter on One Field
-~~~~~~~~~~~~~~~~~~~
-
-::
+cURL (or Browser)
+~~~~~~~~~~~~~~~~~
 
-    {
-        "query": {
-            "term": {
-                {field-name}: {value}
-            }
-        }
-    }
-
-High performance equivalent using filters::
-
-    {
-        "query": {
-            "constant_score": {
-                "filter": {
-                    "term": {
-                        # note that value should be *lower-cased*
-                        {field-name}: {value}
-                    }
-                }
-            }
-    }
-
-Find all documents with value in a range
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This can be used both for text ranges (e.g. A to Z), numeric ranges (10-20) and
-for dates (ElasticSearch will converts dates to ISO 8601 format so you can
-search as 1900-01-01 to 1920-02-03).
-
-::
-
-    {
-        "query": {
-            "constant_score": {
-                "filter": {
-                    "range": {
-                        {field-name}: {
-                            "from": {lower-value}
-                            "to": {upper-value}
-                        }
-                    }
-                }
-            }
-        }
-    }
+The following examples utilize the cURL_ command line utility. If you prefer,
+you you can just open the relevant urls in your browser::
 
-For more details see `range filters`_.
+  # This creates a datastore
+  curl -X POST {ENDPOINT:datastore_create} -H "Authorization: {YOUR-API-KEY}" -d "
+    {\"resource_id\": \"{RESOURCE-ID}\", \"fields\": [ {\"id\": \"a\"}, {\"id\": \"b\"} ], 
+    \"records\": [ { \"a\": 1, \"b\": \"xyz\"}, {\"a\": 2, \"b\": \"zzz\"} ]}"
 
-.. _range filters: http://elasticsearch.org/guide/reference/query-dsl/range-filter.html
+  #This queries a datastore
+  curl -X POST {ENDPOINT:datastore_search} -H "Authorization: {YOUR-API-KEY}" -d "
+    {\"resource_id\": \"{RESOURCE-ID}\" }"
 
-Full-Text Query plus Filter on a Field
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.. _cURL: http://curl.haxx.se/
 
-::
+Javascript
+~~~~~~~~~~
 
-    {
-        "query": {
-            "query_string": {
-                "query": {query string}
-            },
-            "term": {
-                {field}: {value}
-            }
+..
+    A simple ajax (JSONP) request to the data API using jQuery::
+
+      var data = {
+        size: 5 // get 5 results
+        q: 'title:jones' // query on the title field for 'jones'
+      };
+      $.ajax({
+        url: {{endpoint}}/_search,
+        dataType: 'jsonp',
+        success: function(data) {
+          alert('Total results found: ' + data.hits.total)
         }
-    }
-
-
-Filter on two fields
-~~~~~~~~~~~~~~~~~~~~
-
-Note that you cannot, unfortunately, have a simple and query by adding two
-filters inside the query element. Instead you need an 'and' clause in a filter
-(which in turn requires nesting in 'filtered'). You could also achieve the same
-result here using a `bool query`_.
-
-.. _bool query: http://elasticsearch.org/guide/reference/query-dsl/bool-query.html
-
-::
-
-    {
-        "query": {
-            "filtered": {
-                "query": {
-                    "match_all": {}
-                },
-                "filter": {
-                    "and": [
-                        {
-                            "range" : {
-                                "b" : { 
-                                    "from" : 4, 
-                                    "to" : "8"
-                                }
-                            },
-                        },
-                        {
-                            "term": {
-                                "a": "john"
-                            }
-                        }
-                    ]
-                }
-            }
+      });
+
+    The Data API supports CORs so you can also write to it (this requires the json2_ library for ``JSON.stringify``)::
+
+      var data = {
+        title: 'jones',
+        amount: 5.7
+      };
+      $.ajax({
+        url: {{endpoint}},
+        type: 'POST',
+        data: JSON.stringify(data),
+        success: function(data) {
+          alert('Uploaded ok')
         }
-    }
-
-Geospatial Query to find results near a given point
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This uses the `Geo Distance filter`_. It requires that indexed documents have a field of `geo point type`_.
-
-.. _Geo Distance filter: http://www.elasticsearch.org/guide/reference/query-dsl/geo-distance-filter.html
-.. _geo point type: http://www.elasticsearch.org/guide/reference/mapping/geo-point-type.html
-
-Source data (a point in San Francisco!)::
-
-  # This should be in lat,lon order
-  {
-    ...
-    "Location": "37.7809035011582, -122.412119695795"
-  }
-  
-There are alternative formats to provide lon/lat locations e.g. (see ElasticSearch documentation for more)::
-
-  # Note this must have lon,lat order (opposite of previous example!)
-  {
-    "Location":[-122.414753390488, 37.7762147914147]
-  }
-
-  # or ...
-  {
-    "Location": {
-      "lon": -122.414753390488,
-      "lat": 37.7762147914147
-    }
-  }
-
-We also need a mapping to specify that Location field is of type geo_point as this will not usually get guessed from the data (see below for more on mappings)::
-
-  "properties": {
-      "Location": {
-          "type": "geo_point"
-       }
-       ...
-  }
-
-Now the actual query::
-
-    {
-        "query": {
-            "filtered" : {
-                "query" : {
-                    "match_all" : {}
-                },
-                "filter" : {
-                    "geo_distance" : {
-                        "distance" : "20km",
-                        "Location" : {
-                            "lat" : 37.776,
-                            "lon" : -122.41
-                        }
-                    }
-                }
-            }
-        }
-    }    
-
-Note that you can specify the query using specific lat, lon attributes even
-though original data did not have this structure (you can also use a query
-similar to the original structure if you wish - see `Geo distance filter`_ for
-more information).
-
-
-Facets
-------
-
-Facets provide a way to get summary information about then data in an
-elasticsearch table, for example counts of distinct values.
-
-ElasticSearch (and hence the Data API) provides rich faceting capabilities:
-http://www.elasticsearch.org/guide/reference/api/search/facets/
+      });
 
-There are various kinds of facets available, for example (full list on the facets page):
+    .. _json2: https://github.com/douglascrockford/JSON-js/blob/master/json2.js
 
-* Terms_ - counts by distinct terms (values) in a field
-* Range_ - counts for a given set of ranges in a field
-* Histogram_ and `Date Histogram`_ - counts by constant interval ranges
-* Statistical_ - statistical summary of a field (mean, sum etc)
-* `Terms Stats`_ - statistical summary on one field (stats field) for distinct
-  terms in another field. For example, spending stats per department or per
-  region.
-* `Geo Distance`_: counts by distance ranges from a given point
-
-Note that you can apply multiple facets per query.
-
-.. _Terms: http://www.elasticsearch.org/guide/reference/api/search/facets/terms-facet.html
-.. _Range: http://www.elasticsearch.org/guide/reference/api/search/facets/range-facet.html
-.. _Histogram: http://www.elasticsearch.org/guide/reference/api/search/facets/histogram-facet.html
-.. _Date Histogram: http://www.elasticsearch.org/guide/reference/api/search/facets/date-histogram-facet.html
-.. _Statistical: http://www.elasticsearch.org/guide/reference/api/search/facets/statistical-facet.html
-.. _Terms Stats: http://www.elasticsearch.org/guide/reference/api/search/facets/terms-stats-facet.html
-.. _Geo Distance: http://www.elasticsearch.org/guide/reference/api/search/facets/geo-distance-facet.html
-
-
-Adding, Updating and Deleting Data
-==================================
-
-ElasticSeach, and hence the Data API, have a standard RESTful API. Thus::
-
-  POST      {{endpoint}}         : INSERT
-  PUT/POST  {{endpoint}}/{{id}}  : UPDATE (or INSERT)
-  DELETE    {{endpoint}}/{{id}}  : DELETE
-
-For more on INSERT and UPDATE see the `Index API`_ documentation.
-
-.. _Index API: http://elasticsearch.org/guide/reference/api/index_.html
-
-There is also support bulk insert and updates via the `Bulk API`_.
+Python
+~~~~~~
 
-.. _Bulk API: http://elasticsearch.org/guide/reference/api/bulk.html
+..
+    note:: You can also use the `DataStore Python client library`_.
 
-.. note:: The `DataStore Python client library`_ has support for inserting,
-          updating (in bulk) and deleting. There is also support for these
-          operations in the ReclineJS javascript library.
+    _DataStore Python client library: http://github.com/okfn/datastore-client
 
+    ::
 
-Schema Mapping
-==============
+      import urllib2
+      import json
 
-As the ElasticSearch documentation states:
+      # =================================
+      # Store data in the DataStore table
 
-  Mapping is the process of defining how a document should be mapped to the
-  Search Engine, including its searchable characteristics such as which fields
-  are searchable and if/how they are tokenized. In ElasticSearch, an index may
-  store documents of different “mapping types”. ElasticSearch allows one to
-  associate multiple mapping definitions for each mapping type.
+      url = '{{endpoint}}'
+      data = {
+          'title': 'jones',
+          'amount': 5.7
+          }
+      # have to send the data as JSON
+      data = json.dumps(data)
+      # need to add your API key (and have authorization to write to this endpoint)
+      headers = {'Authorization': 'YOUR-API-KEY'}
 
-  Explicit mapping is defined on an index/type level. By default, there isn't a
-  need to define an explicit mapping, since one is automatically created and
-  registered when a new type or new field is introduced (with no performance
-  overhead) and have sensible defaults. Only when the defaults need to be
-  overridden must a mapping definition be provided.
+      req = urllib2.Request(url, data, headers)
+      out = urllib2.urlopen(req)
+      print out.read()
 
-Relevant docs: http://elasticsearch.org/guide/reference/mapping/.
+      # =========================
+      # Query the DataStore table
 
+      url = '{{endpoint}}/_search?q=title:jones&size=5'
+      req = urllib2.Request(url)
+      out = urllib2.urlopen(req)
+      data = out.read()
+      print data
+      # returned data is JSON
+      data = json.loads(data)
+      # total number of results
+      print data['hits']['total']
 
-JSONP support
-=============
 
-JSONP support is available on any request via a simple callback query string parameter::
+PHP
+~~~~~~
 
-  ?callback=my_callback_name
 

From ab7ded798bde1b09ed3769c6b8f91ee44fd411a9 Mon Sep 17 00:00:00 2001
From: Daniel Lewis <daniel@vanirsystems.com>
Date: Fri, 10 Aug 2012 14:45:18 +0100
Subject: [PATCH 050/130] Added python code to using-data-api.rst and made some
 other minor adjustments on the page, including some detail about creating a
 dataset+resource

---
 doc/using-data-api.rst | 105 +++++++++++++++++++++++++----------------
 1 file changed, 65 insertions(+), 40 deletions(-)

diff --git a/doc/using-data-api.rst b/doc/using-data-api.rst
index ce7c72acebe..5f676ed81c8 100644
--- a/doc/using-data-api.rst
+++ b/doc/using-data-api.rst
@@ -24,6 +24,33 @@ There are several endpoints into the DataStore API, they are:
 * datastore_search: ``http://{YOUR-CKAN-INSTALLATION}/api/3/action/datastore_search``
 * datastore_delete: ``http://{YOUR-CKAN-INSTALLATION}/api/3/action/datastore_delete``
 
+Before going into detail about the API and the examples, it is useful to create a resource first so that you can store data against it in the Datastore. This can be done either through the CKAN Graphical User Interface.
+
+Using the data API, we need to send JSON with this structure::
+
+  { 
+    id: Uuid, 
+    name: Name-String, 
+    title: String, 
+    version: String, 
+    url: String, 
+    resources: [ { url: String, format: String, description: String, hash: String }, ...], 
+    author: String, 
+    author_email: String, 
+    maintainer: String, 
+    maintainer_email: String, 
+    license_id: String, 
+    tags: Tag-List, 
+    notes: String, 
+    extras: { Name-String: String, ... } 
+ }
+
+To the following endpoint:
+
+* Dataset Model Endpoint: ``http://{YOUR-CKAN-INSTALLATION}/api/rest/dataset``
+
+More details about creating a resource through the Data API are available on the :ref:`CKAN API page <api>`
+
 API Reference
 -------------
 
@@ -96,6 +123,8 @@ you you can just open the relevant urls in your browser::
 Javascript
 ~~~~~~~~~~
 
+Coming soon...
+
 ..
     A simple ajax (JSONP) request to the data API using jQuery::
 
@@ -131,48 +160,44 @@ Javascript
 Python
 ~~~~~~
 
-..
-    note:: You can also use the `DataStore Python client library`_.
-
-    _DataStore Python client library: http://github.com/okfn/datastore-client
-
-    ::
-
-      import urllib2
-      import json
-
-      # =================================
-      # Store data in the DataStore table
-
-      url = '{{endpoint}}'
-      data = {
-          'title': 'jones',
-          'amount': 5.7
-          }
-      # have to send the data as JSON
-      data = json.dumps(data)
-      # need to add your API key (and have authorization to write to this endpoint)
-      headers = {'Authorization': 'YOUR-API-KEY'}
-
-      req = urllib2.Request(url, data, headers)
-      out = urllib2.urlopen(req)
-      print out.read()
-
-      # =========================
-      # Query the DataStore table
-
-      url = '{{endpoint}}/_search?q=title:jones&size=5'
-      req = urllib2.Request(url)
-      out = urllib2.urlopen(req)
-      data = out.read()
-      print data
-      # returned data is JSON
-      data = json.loads(data)
-      # total number of results
-      print data['hits']['total']
-
+Using the Python Requests_ library we can create a datastore like this::
+
+ #! /usr/bin/env python
+ 
+ import requests
+ import json 
+ 
+ auth_key = '<your-api-key>' 
+ 
+ url = "http://127.0.0.1:5000/api/3/action/" # An example "action" endpoint
+ 
+ datastore_structure = {
+                         'resource_id': '<existing-resource-id>', 
+                         'fields': [ {"id": "a"}, {"id": "b"} ], 
+                         "records": [ { "a": 1, "b": "xyz"}, {"a": 2, "b": "zzz"} ]
+                       }
+ headers = {'content-type': 'application/json', 'Authorization': auth_key}
+ r = requests.post(url + 'datastore_create', data=json.dumps(datastore_structure), headers=headers)
+ print "done, and now for a quick search\n"
+
+ datastore_structure = {
+                         'resource_id': '<existing-resource-id>'
+                       }
+ headers = {'content-type': 'application/json', 'Authorization': auth_key}
+ r = requests.post(url + 'datastore_search', data=json.dumps(datastore_structure), headers=headers) 
+ 
+ print r.text
+ 
+ print "done\n"
+
+
+Python urllib2 version Coming soon...
+
+
+.. _Requests: http://docs.python-requests.org/
 
 PHP
 ~~~~~~
 
+Coming soon...
 

From 31a751969c5209a5db7c9dd4d4c96497c5efb16d Mon Sep 17 00:00:00 2001
From: Daniel Lewis <daniel@vanirsystems.com>
Date: Mon, 13 Aug 2012 11:26:49 +0100
Subject: [PATCH 051/130] Changed around some things in datastore and using the
 data api pages, as requested by Rufus

---
 doc/datastore.rst      | 48 ++++++++++++++++++++++++++++++++++++++++++
 doc/using-data-api.rst | 48 +-----------------------------------------
 2 files changed, 49 insertions(+), 47 deletions(-)

diff --git a/doc/datastore.rst b/doc/datastore.rst
index 77fd981d2df..26a81103b53 100644
--- a/doc/datastore.rst
+++ b/doc/datastore.rst
@@ -94,3 +94,51 @@ How It Works (Technically)
 3. (Assuming OK) CKAN hands (internally) to the database querying system which handles the
    request 
 
+.. _datastoreapiref:
+
+API Reference
+-------------
+
+datastore_create
+~~~~~~~~~~~~~~~~
+
+The datastore_create API endpoint allows a user to post JSON data to 
+be stored against a resource, the JSON must be in the following form::
+
+ {
+    resource_id: resource_id, # the data is going to be stored against.
+    fields: [], # a list of dictionaries of fields/columns and their extra metadata.
+    records: [], # a list of dictionaries of the data eg  [{"dob": "2005", "some_stuff": ['a', b']}, ..]
+ }
+
+
+datastore_search
+~~~~~~~~~~~~~~~~
+
+The datastore_search API endpoint allows a user to search data at a resource, 
+the JSON for searching must be in the following form::
+
+ {
+     resource_id: # the resource id to be searched against
+     filters : # dictionary of matching conditions to select e.g  {'key1': 'a. 'key2': 'b'}  
+        # this will be equivalent to "select * from table where key1 = 'a' and key2 = 'b' "
+     q: # full text query
+     limit: # limit the amount of rows to size defaults to 20
+     offset: # offset the amount of rows
+     fields:  # list of fields return in that order, defaults (empty or not present) to all fields in fields order.
+     sort: 
+ }
+
+datastore_delete
+~~~~~~~~~~~~~~~~
+
+The datastore_delete API endpoint allows a user to delete from a resource, 
+the JSON for searching must be in the following form::
+
+ {
+    resource_id: resource_id # the data that is going to be deleted.
+    filters: # dictionary of matching conditions to delete
+       		# e.g  {'key1': 'a. 'key2': 'b'}  
+       		# this will be equivalent to "delete from table where key1 = 'a' and key2 = 'b' "
+ }
+
diff --git a/doc/using-data-api.rst b/doc/using-data-api.rst
index 5f676ed81c8..73dcb1df959 100644
--- a/doc/using-data-api.rst
+++ b/doc/using-data-api.rst
@@ -49,53 +49,7 @@ To the following endpoint:
 
 * Dataset Model Endpoint: ``http://{YOUR-CKAN-INSTALLATION}/api/rest/dataset``
 
-More details about creating a resource through the Data API are available on the :ref:`CKAN API page <api>`
-
-API Reference
--------------
-
-datastore_create
-~~~~~~~~~~~~~~~~
-
-The datastore_create API endpoint allows a user to post JSON data to 
-be stored against a resource, the JSON must be in the following form::
-
- {
-    resource_id: resource_id, # the data is going to be stored against.
-    fields: [], # a list of dictionaries of fields/columns and their extra metadata.
-    records: [], # a list of dictionaries of the data eg  [{"dob": "2005", "some_stuff": ['a', b']}, ..]
- }
-
-
-datastore_search
-~~~~~~~~~~~~~~~~
-
-The datastore_search API endpoint allows a user to search data at a resource, 
-the JSON for searching must be in the following form::
-
- {
-     resource_id: # the resource id to be searched against
-     filters : # dictionary of matching conditions to select e.g  {'key1': 'a. 'key2': 'b'}  
-        # this will be equivalent to "select * from table where key1 = 'a' and key2 = 'b' "
-     q: # full text query
-     limit: # limit the amount of rows to size defaults to 20
-     offset: # offset the amount of rows
-     fields:  # list of fields return in that order, defaults (empty or not present) to all fields in fields order.
-     sort: 
- }
-
-datastore_delete
-~~~~~~~~~~~~~~~~
-
-The datastore_delete API endpoint allows a user to delete from a resource, 
-the JSON for searching must be in the following form::
-
- {
-    resource_id: resource_id # the data that is going to be deleted.
-    filters: # dictionary of matching conditions to delete
-       		# e.g  {'key1': 'a. 'key2': 'b'}  
-       		# this will be equivalent to "delete from table where key1 = 'a' and key2 = 'b' "
- }
+More details about creating a resource through the Data API are available on the :ref:`CKAN API page <api>`. More information about the Datastore API can be found on the :ref:`datastore page <datastoreapiref>`.
 
 
 Examples

From 0525c9862129a85e55b859e6236614b55075d891 Mon Sep 17 00:00:00 2001
From: Daniel Lewis <daniel@vanirsystems.com>
Date: Mon, 13 Aug 2012 12:35:26 +0100
Subject: [PATCH 052/130] Using Data API documentation now reflects GET-based
 datastore_search, and also includes a Python URLLib2 example

---
 doc/using-data-api.rst | 47 +++++++++++++++++++++++++++++++++++++-----
 1 file changed, 42 insertions(+), 5 deletions(-)

diff --git a/doc/using-data-api.rst b/doc/using-data-api.rst
index 73dcb1df959..6cf023183f6 100644
--- a/doc/using-data-api.rst
+++ b/doc/using-data-api.rst
@@ -69,8 +69,7 @@ you you can just open the relevant urls in your browser::
     \"records\": [ { \"a\": 1, \"b\": \"xyz\"}, {\"a\": 2, \"b\": \"zzz\"} ]}"
 
   #This queries a datastore
-  curl -X POST {ENDPOINT:datastore_search} -H "Authorization: {YOUR-API-KEY}" -d "
-    {\"resource_id\": \"{RESOURCE-ID}\" }"
+  curl {ENDPOINT:datastore_search}?resource_id={RESOURCE-ID} -H "Authorization: {YOUR-API-KEY}"
 
 .. _cURL: http://curl.haxx.se/
 
@@ -114,6 +113,47 @@ Coming soon...
 Python
 ~~~~~~
 
+A Python URLLib2 datastore_create and datastore_search would look like::
+
+ #! /usr/bin/env python
+ import urllib
+ import urllib2
+ import json
+
+ auth_key = '{YOUR-AUTH-KEY}'
+
+ # In python using urllib2 for datastore_create it is...
+
+ url = "http://127.0.0.1:5000/api/3/action/"
+
+ datastore_structure = {
+                        'resource_id': '{RESOURCE-ID}', 
+                        'fields': [ {"id": "a"}, {"id": "b"} ], 
+                        "records": [ { "a": 12, "b": "abc"}, {"a": 2, "b": "zzz"} ]
+                      }
+ headers = {'content-type': 'application/json', 'Authorization': auth_key}
+
+
+
+ req = urllib2.Request(url + 'datastore_create', data=json.dumps(datastore_structure), headers=headers)
+ response = urllib2.urlopen(req)
+
+
+ # in python for datastore_search using urllib2....
+
+ datastore_structure = {
+                        'resource_id': '{RESOURCE-ID}'
+                      }
+
+ url_values = urllib.urlencode(datastore_structure)
+ req = urllib2.Request(url + 'datastore_search?' + url_values, headers=headers)
+ response = urllib2.urlopen(req)
+
+ print response.read()
+
+ print "done\n"
+
+
 Using the Python Requests_ library we can create a datastore like this::
 
  #! /usr/bin/env python
@@ -145,9 +185,6 @@ Using the Python Requests_ library we can create a datastore like this::
  print "done\n"
 
 
-Python urllib2 version Coming soon...
-
-
 .. _Requests: http://docs.python-requests.org/
 
 PHP

From f9f8b3049ff956eaead72b161644745493a76c5f Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Tue, 14 Aug 2012 11:18:08 +0100
Subject: [PATCH 053/130] [#2618] Rename config.ini resource.config to avoid
 .gitignore rules

---
 ckan/html_resources/__init__.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ckan/html_resources/__init__.py b/ckan/html_resources/__init__.py
index 65e1bbfe4ba..6a0b0f27515 100644
--- a/ckan/html_resources/__init__.py
+++ b/ckan/html_resources/__init__.py
@@ -1,5 +1,5 @@
 ''' This file creates fanstatic resources from the sub directories. The
-directory can contain a config.ini to specify how the resources should
+directory can contain a resource.config to specify how the resources should
 be treated. minified copies of the resources are created if the resource
 has a later modification time than existing minified versions.
 
@@ -7,7 +7,7 @@
 ckan setup.py file.
 
 
-config.ini (example)
+resource.config (example)
 ==========
 # all resources are named without their file extension
 [main]
@@ -230,7 +230,7 @@ def key(resource):
 
 def create_library(name, path):
     ''' Creates a fanstatic library `name` with the contents of a
-    directory `path` using config.ini if found. Files are minified
+    directory `path` using resource.config if found. Files are minified
     if needed. '''
 
     def min_path(path):
@@ -277,7 +277,7 @@ def create_resource(path, lib_name, count):
         if path in dont_bundle:
             kw['dont_bundle'] = True
         kw['custom_order'] = count
-        # FIXME needs config.ini options enabled
+        # FIXME needs resource.config options enabled
         if False:
             other_browsers = False
             condition = ''
@@ -296,10 +296,10 @@ def create_resource(path, lib_name, count):
     depends = {}
     groups = {}
 
-    # parse the config.ini file if it exists
+    # parse the resource.config file if it exists
     resource_path = os.path.dirname(__file__)
     resource_path = os.path.join(resource_path, path)
-    config_path = os.path.join(resource_path, 'config.ini')
+    config_path = os.path.join(resource_path, 'resource.config')
     if os.path.exists(config_path):
         config = ConfigParser.RawConfigParser()
         config.read(config_path)

From 07305f6894f696b5b830cdbf3fc3c7b9b86cece2 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Tue, 14 Aug 2012 11:18:37 +0100
Subject: [PATCH 054/130] [#2618] Add resource.config for javascript dir

---
 ckan/public/base/javascript/resource.config | 25 +++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 ckan/public/base/javascript/resource.config

diff --git a/ckan/public/base/javascript/resource.config b/ckan/public/base/javascript/resource.config
new file mode 100644
index 00000000000..604e623432f
--- /dev/null
+++ b/ckan/public/base/javascript/resource.config
@@ -0,0 +1,25 @@
+
+[groups]
+
+main =
+    plugins/jquery.inherit.js
+    plugins/jquery.proxy-all.js
+    plugins/jquery.url-helpers.js
+    plugins/jquery.date-helpers.js
+    plugins/jquery.slug.js
+    plugins/jquery.slug-preview.js
+    plugins/jquery.form-warning.js
+    sandbox.js
+    module.js
+    pubsub.js
+    client.js
+    notify.js
+    i18n.js
+    main.js
+    modules/select-switch.js
+    modules/slug-preview.js
+    modules/basic-form.js
+    modules/confirm-delete.js
+    modules/api-info.js
+    modules/autocomplete.js
+    modules/custom-fields.js

From 0c700248d634e15f1a15cbb6380fcee404221601 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Tue, 14 Aug 2012 11:19:06 +0100
Subject: [PATCH 055/130] [#2618] Use order of groups if supplied

---
 ckan/html_resources/__init__.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ckan/html_resources/__init__.py b/ckan/html_resources/__init__.py
index 6a0b0f27515..66864a33233 100644
--- a/ckan/html_resources/__init__.py
+++ b/ckan/html_resources/__init__.py
@@ -332,6 +332,12 @@ def create_resource(path, lib_name, count):
                 minify(f, dirname, cssmin)
                 file_list.append(filepath)
 
+    # if groups are defined make sure the order supplied there is honored
+    for group in groups:
+        for resource in groups[group]:
+            if resource not in order:
+                order.append(resource)
+
     for x in reversed(order):
         if x in file_list:
             file_list.remove(x)

From 4e8195a4dcfa28fef8018b832155bff77a1bdf0e Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Tue, 14 Aug 2012 12:03:12 +0100
Subject: [PATCH 056/130] [#2618] Improve ordering of libs

---
 ckan/html_resources/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckan/html_resources/__init__.py b/ckan/html_resources/__init__.py
index 66864a33233..001b7187e9f 100644
--- a/ckan/html_resources/__init__.py
+++ b/ckan/html_resources/__init__.py
@@ -218,9 +218,9 @@ def sort_resources(resources):
     def key(resource):
         return (
             resource.order,
-            resource.custom_order,
             resource.library.library_nr,
             resource.library.name,
+            resource.custom_order,
             resource.dependency_nr,
             resource.relpath)
     return sorted(resources, key=key)

From 987dde50d52a330641f737ba89f6e9e736d1c012 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Tue, 14 Aug 2012 12:04:41 +0100
Subject: [PATCH 057/130] [#2618] Look at html shim and other vender stuff

---
 ckan/config/middleware.py       | 2 +-
 ckan/html_resources/__init__.py | 3 +++
 ckan/templates/base.html        | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ckan/config/middleware.py b/ckan/config/middleware.py
index ecd2065406e..a3fb74e9839 100644
--- a/ckan/config/middleware.py
+++ b/ckan/config/middleware.py
@@ -69,7 +69,7 @@ def make_app(global_conf, full_stack=True, static_files=True, **app_conf):
     #app = QueueLogMiddleware(app)
     
     # Fanstatic
-    if asbool(config.get('debug', False)):
+    if not asbool(config.get('debug', False)):
         fanstatic_config = {
             'versioning' : True,
             'recompute_hashes' : True,
diff --git a/ckan/html_resources/__init__.py b/ckan/html_resources/__init__.py
index 001b7187e9f..e11f9ee9da0 100644
--- a/ckan/html_resources/__init__.py
+++ b/ckan/html_resources/__init__.py
@@ -288,6 +288,7 @@ def create_resource(path, lib_name, count):
         resource = Resource(library, filename, **kw)
         # add the resource to this module
         fanstatic_name = '%s/%s' % (lib_name, filename)
+        print 'create resource %s' % fanstatic_name
         setattr(module, fanstatic_name, resource)
         return resource
 
@@ -365,6 +366,8 @@ def create_resource(path, lib_name, count):
 base_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'public', 'base', 'javascript'))
 create_library('base', base_path)
 
+base_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'public', 'base', 'vendor'))
+create_library('vendor', base_path)
 
 ### create our libraries here from any subdirectories
 ##for dirname, dirnames, filenames in os.walk(os.path.dirname(__file__)):
diff --git a/ckan/templates/base.html b/ckan/templates/base.html
index 6c2b8c3cc25..eae6cc1c43f 100644
--- a/ckan/templates/base.html
+++ b/ckan/templates/base.html
@@ -55,7 +55,8 @@
     #}
     {%- block html5shim -%}
       {# Temporary link until we get resource helper working #}
-      <!--[if lte IE 8]><script src="{% url_for_static '/base/vendor/html5.js' %}"></script><![endif]-->
+      {#      <!--[if lte IE 8]><script src="{% url_for_static '/base/vendor/html5.js' %}"></script><![endif]--> #}
+      {% resource 'vendor/html5.js' %}
     {%- endblock -%}
 
     {#

From b8eb66d861121c3cb7775370d7ff742c600321c7 Mon Sep 17 00:00:00 2001
From: Rufus Pollock <rufus.pollock@okfn.org>
Date: Tue, 14 Aug 2012 14:55:53 +0100
Subject: [PATCH 058/130] [doc/datastore][s]: minor refactoring and tidying of
 the docs.

---
 doc/datastore.rst      | 43 +++++++++---------------------------------
 doc/using-data-api.rst |  6 +-----
 2 files changed, 10 insertions(+), 39 deletions(-)

diff --git a/doc/datastore.rst b/doc/datastore.rst
index 26a81103b53..aac6cb2c67a 100644
--- a/doc/datastore.rst
+++ b/doc/datastore.rst
@@ -6,16 +6,6 @@ The CKAN DataStore provides a database for structured storage of data together
 with a powerful Web-accesible Data API, all seamlessly integrated into the CKAN
 interface and authorization system.
 
-Overview
-========
-
-The following short set of slides provide a brief overview and introduction to
-the DataStore and the Data API.
-
-.. raw:: html
-
-   <iframe src="https://docs.google.com/presentation/embed?id=1UhEqvEPoL_VWO5okYiEPfZTLcLYWqtvRRmB1NBsWXY8&#038;start=false&#038;loop=false&#038;delayms=3000" frameborder="0" width="480" height="389" allowfullscreen="true" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe>
-
 Relationship to FileStore
 =========================
 
@@ -36,12 +26,9 @@ The DataStore Data API
 The DataStore's Data API, which derives from the underlying data-table, 
 is RESTful and JSON-based with extensive query capabilities.
 
-Each resource in a CKAN instance has an associated DataStore 'table'. This
-table will be accessible via a web interface at::
-
-  /api/data/{resource-id}
-
-For a detailed tutorial on using this API see :doc:`using-data-api`.
+Each resource in a CKAN instance can have an associated DataStore 'table'. The
+basic API for accessing the DataStore is detailed below. For a detailed
+tutorial on using this API see :doc:`using-data-api`.
 
 Installation and Configuration
 ==============================
@@ -63,18 +50,16 @@ Also ensure that the ckan.datastore_write_url variable is set::
  
 To test you can create a new datastore, so on linux command line do::
 
- curl -X POST http://127.0.0.1:5000/api/3/action/datastore_create -H "Authorization: {YOUR-API-KEY}" -d "
-    {\"resource_id\": \"{RESOURCE-ID}\", \"fields\": [ {\"id\": \"a\"}, {\"id\": \"b\"} ], 
-    \"records\": [ { \"a\": 1, \"b\": \"xyz\"}, {\"a\": 2, \"b\": \"zzz\"} ]}"
+ curl -X POST http://127.0.0.1:5000/api/3/action/datastore_create -H "Authorization: {YOUR-API-KEY}"
+   -d '{"resource_id": "{RESOURCE-ID}", "fields": [ {"id": "a"}, {"id": "b"} ], 
+    "records": [ { "a": 1, "b": "xyz"}, {"a": 2, "b": "zzz"} ]}'
 
 
-
-.. _datastorer:
-
 DataStorer: Automatically Add Data to the DataStore
 ===================================================
 
-Often, one wants data that is added to CKAN (whether it is linked to or uploaded to the :doc:`FileStore <filestore>`) to be automatically added to the
+Often, one wants data that is added to CKAN (whether it is linked to or
+uploaded to the :doc:`FileStore <filestore>`) to be automatically added to the
 DataStore. This requires some processing, to extract the data from your files
 and to add it to the DataStore in the format the DataStore can handle.
 
@@ -83,18 +68,8 @@ performed by a DataStorer, a queue process that runs asynchronously and can be
 triggered by uploads or other activities. The DataStorer is an extension and can
 be found, along with installation instructions, at:
 
-https://github.com/okfn/ckanext-datastorer
-
-
-How It Works (Technically)
-==========================
-
-1. Request arrives at e.g. /dataset/{id}/resource/{resource-id}/data
-2. CKAN checks authentication and authorization.
-3. (Assuming OK) CKAN hands (internally) to the database querying system which handles the
-   request 
+.. _datastorer: https://github.com/okfn/ckanext-datastorer
 
-.. _datastoreapiref:
 
 API Reference
 -------------
diff --git a/doc/using-data-api.rst b/doc/using-data-api.rst
index 6cf023183f6..ac5b2cc97e6 100644
--- a/doc/using-data-api.rst
+++ b/doc/using-data-api.rst
@@ -10,10 +10,6 @@ Introduction
 
 The DataStore API allows tabular data to be stored inside CKAN quickly and easily. It is accessible through an interface accessible over HTTP and can be interacted with using JSON (the JavaScript Object Notation).
 
-.. raw:: html
-
-   <iframe src="https://docs.google.com/presentation/embed?id=1UhEqvEPoL_VWO5okYiEPfZTLcLYWqtvRRmB1NBsWXY8&#038;start=false&#038;loop=false&#038;delayms=3000" frameborder="0" width="480" height="389" allowfullscreen="true" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe>
-
 
 Quickstart
 ==========
@@ -49,7 +45,7 @@ To the following endpoint:
 
 * Dataset Model Endpoint: ``http://{YOUR-CKAN-INSTALLATION}/api/rest/dataset``
 
-More details about creating a resource through the Data API are available on the :ref:`CKAN API page <api>`. More information about the Datastore API can be found on the :ref:`datastore page <datastoreapiref>`.
+More details about creating a resource through the Data API are available on the :ref:`CKAN API page <api>`. More information about the Datastore API can be found on the :doc:`datastore page <datastore>`.
 
 
 Examples

From 067431895f98496e6ad15a46357620bdbc7e9cde Mon Sep 17 00:00:00 2001
From: kindly <kindly@gmail.com>
Date: Wed, 15 Aug 2012 11:10:02 +0100
Subject: [PATCH 059/130] [#2733] add 60 second query time out

---
 ckanext/datastore/db.py | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
index dd1d8fc4155..8c85267d46a 100644
--- a/ckanext/datastore/db.py
+++ b/ckanext/datastore/db.py
@@ -478,12 +478,15 @@ def create(context, data_dict):
     '''
     engine = _get_engine(context, data_dict)
     context['connection'] = engine.connect()
+    timeout = context.get('query_timeout', 60000)
     _cache_types(context)
 
     # close connection at all cost.
     try:
         # check if table already existes
         trans = context['connection'].begin()
+        context['connection'].execute(
+            'set local statement_timeout to {}'.format(timeout))
         result = context['connection'].execute(
             'select * from pg_tables where tablename = %s',
              data_dict['resource_id']
@@ -495,8 +498,11 @@ def create(context, data_dict):
         insert_data(context, data_dict)
         trans.commit()
         return data_dict
-    except:
-        trans.rollback()
+    except Exception, e:
+        if 'due to statement timeout' in str(e):
+            raise p.toolkit.ValidationError({
+                'query': 'Query took too long'
+            })
         raise
     finally:
         context['connection'].close()
@@ -528,7 +534,7 @@ def delete(context, data_dict):
 
         trans.commit()
         return data_dict
-    except:
+    except Exception, e:
         trans.rollback()
         raise
     finally:
@@ -538,10 +544,13 @@ def delete(context, data_dict):
 def search(context, data_dict):
     engine = _get_engine(context, data_dict)
     context['connection'] = engine.connect()
+    timeout = context.get('query_timeout', 60000)
     _cache_types(context)
 
     try:
         # check if table existes
+        context['connection'].execute(
+            'set local statement_timeout to {}'.format(timeout))
         result = context['connection'].execute(
             'select * from pg_tables where tablename = %s',
              data_dict['resource_id']
@@ -552,5 +561,11 @@ def search(context, data_dict):
                     data_dict['resource_id'])
             })
         return search_data(context, data_dict)
+    except Exception, e:
+        if 'due to statement timeout' in str(e):
+            raise p.toolkit.ValidationError({
+                'query': 'Search took too long'
+            })
+        raise
     finally:
         context['connection'].close()

From 3daacbea6712b448f47fe4342a85e077ad74466f Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Wed, 15 Aug 2012 17:21:24 +0100
Subject: [PATCH 060/130] [#2618] Prints to logging in html_resources

---
 ckan/html_resources/__init__.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ckan/html_resources/__init__.py b/ckan/html_resources/__init__.py
index e11f9ee9da0..261ecdfe535 100644
--- a/ckan/html_resources/__init__.py
+++ b/ckan/html_resources/__init__.py
@@ -28,6 +28,7 @@
 '''
 import os.path
 import sys
+import logging
 import ConfigParser
 
 from fanstatic import Library, Resource, Group, get_library_registry
@@ -35,6 +36,8 @@
 from ckan.include.rjsmin import jsmin
 from ckan.include.rcssmin import cssmin
 
+log = logging.getLogger(__name__)
+
 # TODO
 # loop through dirs to setup
 # warn on no entry point provided for fanstatic
@@ -253,7 +256,7 @@ def minify(filename, resource_path, min_function):
         f = open(path_min, 'w')
         f.write(min_function(source))
         f.close()
-        print 'minified %s' % path
+        log.info('minified %s' % path)
 
     def create_resource(path, lib_name, count):
         ''' create the fanstatic Resource '''
@@ -288,7 +291,7 @@ def create_resource(path, lib_name, count):
         resource = Resource(library, filename, **kw)
         # add the resource to this module
         fanstatic_name = '%s/%s' % (lib_name, filename)
-        print 'create resource %s' % fanstatic_name
+        log.info('create resource %s' % fanstatic_name)
         setattr(module, fanstatic_name, resource)
         return resource
 

From 861c24a28d20ba36a5774a8a946452ceba70b86d Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Wed, 15 Aug 2012 17:25:10 +0100
Subject: [PATCH 061/130] [#2618] Add IE conditionals via config

---
 ckan/html_resources/__init__.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/ckan/html_resources/__init__.py b/ckan/html_resources/__init__.py
index 261ecdfe535..ce50ec3df04 100644
--- a/ckan/html_resources/__init__.py
+++ b/ckan/html_resources/__init__.py
@@ -281,9 +281,9 @@ def create_resource(path, lib_name, count):
             kw['dont_bundle'] = True
         kw['custom_order'] = count
         # FIXME needs resource.config options enabled
-        if False:
-            other_browsers = False
-            condition = ''
+        if path in IE_conditionals:
+            other_browsers = ('others' in IE_conditionals[path])
+            condition = IE_conditionals[path][0]
             kw['renderer'] = IEConditionalRenderer(
                                         condition=condition,
                                         renderer=renderer,
@@ -299,6 +299,7 @@ def create_resource(path, lib_name, count):
     dont_bundle = []
     depends = {}
     groups = {}
+    IE_conditionals = {}
 
     # parse the resource.config file if it exists
     resource_path = os.path.dirname(__file__)
@@ -317,6 +318,14 @@ def create_resource(path, lib_name, count):
         if config.has_section('groups'):
             items = config.items('groups')
             groups = dict((n, v.split()) for (n, v) in items)
+        if config.has_section('IE conditional'):
+            items = config.items('IE conditional')
+            for (n, v) in items:
+                files = v.split()
+                for f in files:
+                    if f not in IE_conditionals:
+                        IE_conditionals[f] = []
+                    IE_conditionals[f].append(n)
 
     library = Library(name, path)
     module = sys.modules[__name__]

From 405ab3fa3348d8291f18140a0a305c9344974050 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Wed, 15 Aug 2012 17:25:38 +0100
Subject: [PATCH 062/130] [#2618] dependencies for groups

---
 ckan/html_resources/__init__.py | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/ckan/html_resources/__init__.py b/ckan/html_resources/__init__.py
index ce50ec3df04..9bc0d8c70f7 100644
--- a/ckan/html_resources/__init__.py
+++ b/ckan/html_resources/__init__.py
@@ -275,7 +275,11 @@ def create_resource(path, lib_name, count):
         if path in depends:
             dependencies = []
             for dependency in depends[path]:
-                dependencies.append(getattr(module, '%s/%s' % (lib_name, dependency)))
+                try:
+                    res = getattr(module, '%s/%s' % (name, dependency))
+                except AttributeError:
+                    res = getattr(module, '%s' % dependency)
+                dependencies.append(res)
             kw['depends'] = dependencies
         if path in dont_bundle:
             kw['dont_bundle'] = True
@@ -327,6 +331,16 @@ def create_resource(path, lib_name, count):
                         IE_conditionals[f] = []
                     IE_conditionals[f].append(n)
 
+
+    for group in groups:
+        if group in depends:
+            for resource in groups[group]:
+                if resource not in depends:
+                    depends[resource] = []
+                for dep in depends[group]:
+                    if dep not in depends[resource]:
+                        depends[resource].append(dep)
+
     library = Library(name, path)
     module = sys.modules[__name__]
 
@@ -366,6 +380,13 @@ def create_resource(path, lib_name, count):
         for member in groups[group_name]:
             fanstatic_name = '%s/%s' % (name, member)
             members.append(getattr(module, fanstatic_name))
+        if group_name in depends:
+            for dependency in depends[group_name]:
+                try:
+                    res = getattr(module, '%s/%s' % (name, dependency))
+                except AttributeError:
+                    res = getattr(module, '%s' % dependency)
+                members = [res] + members #.append(res)
         group = Group(members)
         fanstatic_name = '%s/%s' % (name, group_name)
         setattr(module, fanstatic_name, group)

From 1c62a1e591f821d9fb3c450a60d4f695ce6cc754 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Wed, 15 Aug 2012 17:26:35 +0100
Subject: [PATCH 063/130] [#2618] Upgrade templates

---
 ckan/html_resources/__init__.py           | 9 ++++++---
 ckan/templates/package/resource_read.html | 4 +++-
 ckan/templates/snippets/scripts.html      | 5 ++++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ckan/html_resources/__init__.py b/ckan/html_resources/__init__.py
index 9bc0d8c70f7..14159c74c63 100644
--- a/ckan/html_resources/__init__.py
+++ b/ckan/html_resources/__init__.py
@@ -396,12 +396,15 @@ def create_resource(path, lib_name, count):
     registry = get_library_registry()
     registry.add(library)
 
-base_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'public', 'base', 'javascript'))
-create_library('base', base_path)
-
 base_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'public', 'base', 'vendor'))
 create_library('vendor', base_path)
 
+base_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'public', 'base', 'datapreview'))
+create_library('datapreview', base_path)
+
+base_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'public', 'base', 'javascript'))
+create_library('base', base_path)
+
 ### create our libraries here from any subdirectories
 ##for dirname, dirnames, filenames in os.walk(os.path.dirname(__file__)):
 ##    if dirname == os.path.dirname(__file__):
diff --git a/ckan/templates/package/resource_read.html b/ckan/templates/package/resource_read.html
index 521c130bfaa..505bae2a1a4 100644
--- a/ckan/templates/package/resource_read.html
+++ b/ckan/templates/package/resource_read.html
@@ -130,6 +130,7 @@ <h2 class="module-heading"><i class="icon-medium icon-info-sign"></i> Resource I
 
 {% block scripts %}
   {{ super() }}
+  {#
   <script src="{% url_for_static '/base/datapreview/vendor/underscore/1.1.6/underscore.js' %}"></script>
   <script src="{% url_for_static '/base/datapreview/vendor/backbone/0.5.1/backbone.js' %}"></script>
   <script src="{% url_for_static '/base/datapreview/vendor/mustache/0.5.0-dev/mustache.js' %}"></script>
@@ -145,7 +146,8 @@ <h2 class="module-heading"><i class="icon-medium icon-info-sign"></i> Resource I
 
   <script src="{% url_for_static '/base/datapreview/vendor/recline/recline.js' %}"></script>
   <script src="{% url_for_static '/base/datapreview/datapreview.js' %}"></script>
-
+  #}
+  {% resource 'datapreview/datapreview' %}
   <script>
     var preload_resource = {{ h.literal(c.resource_json) }};
     var embedPath = "{{ h.url_for(controller='package', action='resource_embedded_dataviewer', id=c.package.id, resource_id=c.resource.id, qualified=True) }}";
diff --git a/ckan/templates/snippets/scripts.html b/ckan/templates/snippets/scripts.html
index 2024127caea..263c9927da7 100644
--- a/ckan/templates/snippets/scripts.html
+++ b/ckan/templates/snippets/scripts.html
@@ -1,4 +1,5 @@
-<script src="{% url_for_static "/base/vendor/jquery.js" %}"></script>
+{# <script src="{% url_for_static "/base/vendor/jquery.js" %}"></script> #}
+{#
 <script src="{% url_for_static "/base/vendor/jed.js" %}"></script>
 <script src="{% url_for_static "/base/vendor/select2/select2.js" %}"></script>
 <script src="{% url_for_static "/base/vendor/bootstrap/js/bootstrap-transition.js" %}"></script>
@@ -6,7 +7,9 @@
 <script src="{% url_for_static "/base/vendor/bootstrap/js/bootstrap-alert.js" %}"></script>
 <script src="{% url_for_static "/base/vendor/bootstrap/js/bootstrap-tab.js" %}"></script>
 <script src="{% url_for_static "/base/vendor/bootstrap/js/bootstrap-button.js" %}"></script>
+#}
 
+{% resource 'vendor/vendor' %}
 {#  <script src="{% url_for_static "/base/javascript/plugins/jquery.inherit.js" %}"></script>
 <script src="{% url_for_static "/base/javascript/plugins/jquery.proxy-all.js" %}"></script>
 <script src="{% url_for_static "/base/javascript/plugins/jquery.url-helpers.js" %}"></script>

From 36667990f3255ce9f8da73e43ea2abbfa817e0ee Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Wed, 15 Aug 2012 17:28:00 +0100
Subject: [PATCH 064/130] [#2618] Update/add config files for resources

---
 ckan/public/base/datapreview/resource.config | 34 ++++++++++++++++++++
 ckan/public/base/javascript/resource.config  |  5 ++-
 ckan/public/base/vendor/resource.config      | 28 ++++++++++++++++
 3 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 ckan/public/base/datapreview/resource.config
 create mode 100644 ckan/public/base/vendor/resource.config

diff --git a/ckan/public/base/datapreview/resource.config b/ckan/public/base/datapreview/resource.config
new file mode 100644
index 00000000000..6388b4d0d74
--- /dev/null
+++ b/ckan/public/base/datapreview/resource.config
@@ -0,0 +1,34 @@
+[IE conditional]
+
+lte IE 8 = vendor/leaflet/0.3.1/leaflet.ie.css
+
+[depends]
+
+datapreview = vendor/jquery.js
+
+[groups]
+
+datapreview =
+    vendor/underscore/1.1.6/underscore.js
+    vendor/backbone/0.5.1/backbone.js
+    vendor/mustache/0.5.0-dev/mustache.js
+    vendor/bootstrap/2.0.3/bootstrap.js
+    vendor/jquery.mustache/jquery.mustache.js
+
+    vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js
+    vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js
+    vendor/slickgrid/2.0.1/slick.grid.js
+    vendor/flot/0.7/jquery.flot.js
+    vendor/moment/1.6.2/moment.js
+    vendor/leaflet/0.3.1/leaflet.js
+
+    vendor/recline/recline.js
+    datapreview.js
+
+    vendor/slickgrid/2.0.1/slick.grid.css
+    vendor/leaflet/0.3.1/leaflet.css
+
+    vendor/leaflet/0.3.1/leaflet.ie.css
+
+    vendor/recline/css/recline.css
+    css/datapreview.css
diff --git a/ckan/public/base/javascript/resource.config b/ckan/public/base/javascript/resource.config
index 16193be1218..3e3ef8b1653 100644
--- a/ckan/public/base/javascript/resource.config
+++ b/ckan/public/base/javascript/resource.config
@@ -1,3 +1,6 @@
+[depends]
+
+main = vendor/jquery.js
 
 [groups]
 
@@ -19,7 +22,7 @@ main =
     modules/select-switch.js
     modules/slug-preview.js
     modules/basic-form.js
-    modules/confirm-delete.js
+    modules/confirm-action.js
     modules/api-info.js
     modules/autocomplete.js
     modules/custom-fields.js
diff --git a/ckan/public/base/vendor/resource.config b/ckan/public/base/vendor/resource.config
new file mode 100644
index 00000000000..ead36aee9a3
--- /dev/null
+++ b/ckan/public/base/vendor/resource.config
@@ -0,0 +1,28 @@
+[main]
+dont_bundle =
+    jquery.js
+
+order =
+    jquery.js
+    jed.js
+
+[depends]
+
+vendor = jquery.js
+
+[groups]
+
+#    jquery.js
+
+bootstrap =
+    bootstrap/js/bootstrap-transition.js
+    bootstrap/js/bootstrap-modal.js
+    bootstrap/js/bootstrap-alert.js
+    bootstrap/js/bootstrap-tab.js
+    bootstrap/js/bootstrap-button.js
+
+vendor =
+    jed.js
+    select2/select2.js
+    bootstrap
+

From d43d88cd5060e126541fee48515b715a2e3406ae Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Wed, 15 Aug 2012 17:30:14 +0100
Subject: [PATCH 065/130] [#2618] Add "unminified" js files

---
 .../vendor/bootstrap/2.0.3/bootstrap.js       |   6 +
 .../2.0.1/jquery-ui-1.8.16.custom.js          | 611 ++++++++++++++++++
 .../slickgrid/2.0.1/jquery.event.drag-2.0.js  |   6 +
 .../vendor/slickgrid/2.0.1/slick.grid.js      |  84 +++
 4 files changed, 707 insertions(+)
 create mode 100644 ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.js
 create mode 100644 ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js
 create mode 100644 ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js
 create mode 100644 ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.js

diff --git a/ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.js b/ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.js
new file mode 100644
index 00000000000..1f87730a3ae
--- /dev/null
+++ b/ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.js
@@ -0,0 +1,6 @@
+/*!
+* Bootstrap.js by @fat & @mdo
+* Copyright 2012 Twitter, Inc.
+* http://www.apache.org/licenses/LICENSE-2.0.txt
+*/
+!function(a){a(function(){"use strict",a.support.transition=function(){var a=function(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd",msTransition:"MSTransitionEnd",transition:"transitionend"},c;for(c in b)if(a.style[c]!==undefined)return b[c]}();return a&&{end:a}}()})}(window.jQuery),!function(a){"use strict";var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype.close=function(b){function f(){e.trigger("closed").remove()}var c=a(this),d=c.attr("data-target"),e;d||(d=c.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),e=a(d),b&&b.preventDefault(),e.length||(e=c.hasClass("alert")?c:c.parent()),e.trigger(b=a.Event("close"));if(b.isDefaultPrevented())return;e.removeClass("in"),a.support.transition&&e.hasClass("fade")?e.on(a.support.transition.end,f):f()},a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("alert");e||d.data("alert",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.alert.Constructor=c,a(function(){a("body").on("click.alert.data-api",b,c.prototype.close)})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.button.defaults,c)};b.prototype.setState=function(a){var b="disabled",c=this.$element,d=c.data(),e=c.is("input")?"val":"html";a+="Text",d.resetText||c.data("resetText",c[e]()),c[e](d[a]||this.options[a]),setTimeout(function(){a=="loadingText"?c.addClass(b).attr(b,b):c.removeClass(b).removeAttr(b)},0)},b.prototype.toggle=function(){var a=this.$element.parent('[data-toggle="buttons-radio"]');a&&a.find(".active").removeClass("active"),this.$element.toggleClass("active")},a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("button"),f=typeof c=="object"&&c;e||d.data("button",e=new b(this,f)),c=="toggle"?e.toggle():c&&e.setState(c)})},a.fn.button.defaults={loadingText:"loading..."},a.fn.button.Constructor=b,a(function(){a("body").on("click.button.data-api","[data-toggle^=button]",function(b){var c=a(b.target);c.hasClass("btn")||(c=c.closest(".btn")),c.button("toggle")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=c,this.options.slide&&this.slide(this.options.slide),this.options.pause=="hover"&&this.$element.on("mouseenter",a.proxy(this.pause,this)).on("mouseleave",a.proxy(this.cycle,this))};b.prototype={cycle:function(b){return b||(this.paused=!1),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},to:function(b){var c=this.$element.find(".active"),d=c.parent().children(),e=d.index(c),f=this;if(b>d.length-1||b<0)return;return this.sliding?this.$element.one("slid",function(){f.to(b)}):e==b?this.pause().cycle():this.slide(b>e?"next":"prev",a(d[b]))},pause:function(a){return a||(this.paused=!0),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(b,c){var d=this.$element.find(".active"),e=c||d[b](),f=this.interval,g=b=="next"?"left":"right",h=b=="next"?"first":"last",i=this,j=a.Event("slide");this.sliding=!0,f&&this.pause(),e=e.length?e:this.$element.find(".item")[h]();if(e.hasClass("active"))return;if(a.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(j);if(j.isDefaultPrevented())return;e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),this.$element.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid")},0)})}else{this.$element.trigger(j);if(j.isDefaultPrevented())return;d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return f&&this.cycle(),this}},a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("carousel"),f=a.extend({},a.fn.carousel.defaults,typeof c=="object"&&c);e||d.data("carousel",e=new b(this,f)),typeof c=="number"?e.to(c):typeof c=="string"||(c=f.slide)?e[c]():f.interval&&e.cycle()})},a.fn.carousel.defaults={interval:5e3,pause:"hover"},a.fn.carousel.Constructor=b,a(function(){a("body").on("click.carousel.data-api","[data-slide]",function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=!e.data("modal")&&a.extend({},e.data(),c.data());e.carousel(f),b.preventDefault()})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.collapse.defaults,c),this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.prototype={constructor:b,dimension:function(){var a=this.$element.hasClass("width");return a?"width":"height"},show:function(){var b,c,d,e;if(this.transitioning)return;b=this.dimension(),c=a.camelCase(["scroll",b].join("-")),d=this.$parent&&this.$parent.find("> .accordion-group > .in");if(d&&d.length){e=d.data("collapse");if(e&&e.transitioning)return;d.collapse("hide"),e||d.data("collapse",null)}this.$element[b](0),this.transition("addClass",a.Event("show"),"shown"),this.$element[b](this.$element[0][c])},hide:function(){var b;if(this.transitioning)return;b=this.dimension(),this.reset(this.$element[b]()),this.transition("removeClass",a.Event("hide"),"hidden"),this.$element[b](0)},reset:function(a){var b=this.dimension();return this.$element.removeClass("collapse")[b](a||"auto")[0].offsetWidth,this.$element[a!==null?"addClass":"removeClass"]("collapse"),this},transition:function(b,c,d){var e=this,f=function(){c.type=="show"&&e.reset(),e.transitioning=0,e.$element.trigger(d)};this.$element.trigger(c);if(c.isDefaultPrevented())return;this.transitioning=1,this.$element[b]("in"),a.support.transition&&this.$element.hasClass("collapse")?this.$element.one(a.support.transition.end,f):f()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("collapse"),f=typeof c=="object"&&c;e||d.data("collapse",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.collapse.defaults={toggle:!0},a.fn.collapse.Constructor=b,a(function(){a("body").on("click.collapse.data-api","[data-toggle=collapse]",function(b){var c=a(this),d,e=c.attr("data-target")||b.preventDefault()||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""),f=a(e).data("collapse")?"toggle":c.data();a(e).collapse(f)})})}(window.jQuery),!function(a){function d(){a(b).parent().removeClass("open")}"use strict";var b='[data-toggle="dropdown"]',c=function(b){var c=a(b).on("click.dropdown.data-api",this.toggle);a("html").on("click.dropdown.data-api",function(){c.parent().removeClass("open")})};c.prototype={constructor:c,toggle:function(b){var c=a(this),e,f,g;if(c.is(".disabled, :disabled"))return;return f=c.attr("data-target"),f||(f=c.attr("href"),f=f&&f.replace(/.*(?=#[^\s]*$)/,"")),e=a(f),e.length||(e=c.parent()),g=e.hasClass("open"),d(),g||e.toggleClass("open"),!1}},a.fn.dropdown=function(b){return this.each(function(){var d=a(this),e=d.data("dropdown");e||d.data("dropdown",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.dropdown.Constructor=c,a(function(){a("html").on("click.dropdown.data-api",d),a("body").on("click.dropdown",".dropdown form",function(a){a.stopPropagation()}).on("click.dropdown.data-api",b,c.prototype.toggle)})}(window.jQuery),!function(a){function c(){var b=this,c=setTimeout(function(){b.$element.off(a.support.transition.end),d.call(b)},500);this.$element.one(a.support.transition.end,function(){clearTimeout(c),d.call(b)})}function d(a){this.$element.hide().trigger("hidden"),e.call(this)}function e(b){var c=this,d=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var e=a.support.transition&&d;this.$backdrop=a('<div class="modal-backdrop '+d+'" />').appendTo(document.body),this.options.backdrop!="static"&&this.$backdrop.click(a.proxy(this.hide,this)),e&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),e?this.$backdrop.one(a.support.transition.end,b):b()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(a.support.transition.end,a.proxy(f,this)):f.call(this)):b&&b()}function f(){this.$backdrop.remove(),this.$backdrop=null}function g(){var b=this;this.isShown&&this.options.keyboard?a(document).on("keyup.dismiss.modal",function(a){a.which==27&&b.hide()}):this.isShown||a(document).off("keyup.dismiss.modal")}"use strict";var b=function(b,c){this.options=c,this.$element=a(b).delegate('[data-dismiss="modal"]',"click.dismiss.modal",a.proxy(this.hide,this))};b.prototype={constructor:b,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var b=this,c=a.Event("show");this.$element.trigger(c);if(this.isShown||c.isDefaultPrevented())return;a("body").addClass("modal-open"),this.isShown=!0,g.call(this),e.call(this,function(){var c=a.support.transition&&b.$element.hasClass("fade");b.$element.parent().length||b.$element.appendTo(document.body),b.$element.show(),c&&b.$element[0].offsetWidth,b.$element.addClass("in"),c?b.$element.one(a.support.transition.end,function(){b.$element.trigger("shown")}):b.$element.trigger("shown")})},hide:function(b){b&&b.preventDefault();var e=this;b=a.Event("hide"),this.$element.trigger(b);if(!this.isShown||b.isDefaultPrevented())return;this.isShown=!1,a("body").removeClass("modal-open"),g.call(this),this.$element.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?c.call(this):d.call(this)}},a.fn.modal=function(c){return this.each(function(){var d=a(this),e=d.data("modal"),f=a.extend({},a.fn.modal.defaults,d.data(),typeof c=="object"&&c);e||d.data("modal",e=new b(this,f)),typeof c=="string"?e[c]():f.show&&e.show()})},a.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},a.fn.modal.Constructor=b,a(function(){a("body").on("click.modal.data-api",'[data-toggle="modal"]',function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=e.data("modal")?"toggle":a.extend({},e.data(),c.data());b.preventDefault(),e.modal(f)})})}(window.jQuery),!function(a){"use strict";var b=function(a,b){this.init("tooltip",a,b)};b.prototype={constructor:b,init:function(b,c,d){var e,f;this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.enabled=!0,this.options.trigger!="manual"&&(e=this.options.trigger=="hover"?"mouseenter":"focus",f=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(e,this.options.selector,a.proxy(this.enter,this)),this.$element.on(f,this.options.selector,a.proxy(this.leave,this))),this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(b){return b=a.extend({},a.fn[this.type].defaults,b,this.$element.data()),b.delay&&typeof b.delay=="number"&&(b.delay={show:b.delay,hide:b.delay}),b},enter:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);if(!c.options.delay||!c.options.delay.show)return c.show();clearTimeout(this.timeout),c.hoverState="in",this.timeout=setTimeout(function(){c.hoverState=="in"&&c.show()},c.options.delay.show)},leave:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);if(!c.options.delay||!c.options.delay.hide)return c.hide();clearTimeout(this.timeout),c.hoverState="out",this.timeout=setTimeout(function(){c.hoverState=="out"&&c.hide()},c.options.delay.hide)},show:function(){var a,b,c,d,e,f,g;if(this.hasContent()&&this.enabled){a=this.tip(),this.setContent(),this.options.animation&&a.addClass("fade"),f=typeof this.options.placement=="function"?this.options.placement.call(this,a[0],this.$element[0]):this.options.placement,b=/in/.test(f),a.remove().css({top:0,left:0,display:"block"}).appendTo(b?this.$element:document.body),c=this.getPosition(b),d=a[0].offsetWidth,e=a[0].offsetHeight;switch(b?f.split(" ")[1]:f){case"bottom":g={top:c.top+c.height,left:c.left+c.width/2-d/2};break;case"top":g={top:c.top-e,left:c.left+c.width/2-d/2};break;case"left":g={top:c.top+c.height/2-e/2,left:c.left-d};break;case"right":g={top:c.top+c.height/2-e/2,left:c.left+c.width}}a.css(g).addClass(f).addClass("in")}},isHTML:function(a){return typeof a!="string"||a.charAt(0)==="<"&&a.charAt(a.length-1)===">"&&a.length>=3||/^(?:[^<]*<[\w\W]+>[^>]*$)/.exec(a)},setContent:function(){var a=this.tip(),b=this.getTitle();a.find(".tooltip-inner")[this.isHTML(b)?"html":"text"](b),a.removeClass("fade in top bottom left right")},hide:function(){function d(){var b=setTimeout(function(){c.off(a.support.transition.end).remove()},500);c.one(a.support.transition.end,function(){clearTimeout(b),c.remove()})}var b=this,c=this.tip();c.removeClass("in"),a.support.transition&&this.$tip.hasClass("fade")?d():c.remove()},fixTitle:function(){var a=this.$element;(a.attr("title")||typeof a.attr("data-original-title")!="string")&&a.attr("data-original-title",a.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(b){return a.extend({},b?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||(typeof c.title=="function"?c.title.call(b[0]):c.title),a},tip:function(){return this.$tip=this.$tip||a(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(){this[this.tip().hasClass("in")?"hide":"show"]()}},a.fn.tooltip=function(c){return this.each(function(){var d=a(this),e=d.data("tooltip"),f=typeof c=="object"&&c;e||d.data("tooltip",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.tooltip.Constructor=b,a.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover",title:"",delay:0}}(window.jQuery),!function(a){"use strict";var b=function(a,b){this.init("popover",a,b)};b.prototype=a.extend({},a.fn.tooltip.Constructor.prototype,{constructor:b,setContent:function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.isHTML(b)?"html":"text"](b),a.find(".popover-content > *")[this.isHTML(c)?"html":"text"](c),a.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-content")||(typeof c.content=="function"?c.content.call(b[0]):c.content),a},tip:function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip}}),a.fn.popover=function(c){return this.each(function(){var d=a(this),e=d.data("popover"),f=typeof c=="object"&&c;e||d.data("popover",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.popover.Constructor=b,a.fn.popover.defaults=a.extend({},a.fn.tooltip.defaults,{placement:"right",content:"",template:'<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'})}(window.jQuery),!function(a){function b(b,c){var d=a.proxy(this.process,this),e=a(b).is("body")?a(window):a(b),f;this.options=a.extend({},a.fn.scrollspy.defaults,c),this.$scrollElement=e.on("scroll.scroll.data-api",d),this.selector=(this.options.target||(f=a(b).attr("href"))&&f.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=a("body"),this.refresh(),this.process()}"use strict",b.prototype={constructor:b,refresh:function(){var b=this,c;this.offsets=a([]),this.targets=a([]),c=this.$body.find(this.selector).map(function(){var b=a(this),c=b.data("target")||b.attr("href"),d=/^#\w/.test(c)&&a(c);return d&&c.length&&[[d.position().top,c]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){b.offsets.push(this[0]),b.targets.push(this[1])})},process:function(){var a=this.$scrollElement.scrollTop()+this.options.offset,b=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,c=b-this.$scrollElement.height(),d=this.offsets,e=this.targets,f=this.activeTarget,g;if(a>=c)return f!=(g=e.last()[0])&&this.activate(g);for(g=d.length;g--;)f!=e[g]&&a>=d[g]&&(!d[g+1]||a<=d[g+1])&&this.activate(e[g])},activate:function(b){var c,d;this.activeTarget=b,a(this.selector).parent(".active").removeClass("active"),d=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',c=a(d).parent("li").addClass("active"),c.parent(".dropdown-menu")&&(c=c.closest("li.dropdown").addClass("active")),c.trigger("activate")}},a.fn.scrollspy=function(c){return this.each(function(){var d=a(this),e=d.data("scrollspy"),f=typeof c=="object"&&c;e||d.data("scrollspy",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.scrollspy.Constructor=b,a.fn.scrollspy.defaults={offset:10},a(function(){a('[data-spy="scroll"]').each(function(){var b=a(this);b.scrollspy(b.data())})})}(window.jQuery),!function(a){"use strict";var b=function(b){this.element=a(b)};b.prototype={constructor:b,show:function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.attr("data-target"),e,f,g;d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,""));if(b.parent("li").hasClass("active"))return;e=c.find(".active a").last()[0],g=a.Event("show",{relatedTarget:e}),b.trigger(g);if(g.isDefaultPrevented())return;f=a(d),this.activate(b.parent("li"),c),this.activate(f,f.parent(),function(){b.trigger({type:"shown",relatedTarget:e})})},activate:function(b,c,d){function g(){e.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),f?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var e=c.find("> .active"),f=d&&a.support.transition&&e.hasClass("fade");f?e.one(a.support.transition.end,g):g(),e.removeClass("in")}},a.fn.tab=function(c){return this.each(function(){var d=a(this),e=d.data("tab");e||d.data("tab",e=new b(this)),typeof c=="string"&&e[c]()})},a.fn.tab.Constructor=b,a(function(){a("body").on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(b){b.preventDefault(),a(this).tab("show")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.typeahead.defaults,c),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.$menu=a(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};b.prototype={constructor:b,select:function(){var a=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(a)).change(),this.hide()},updater:function(a){return a},show:function(){var b=a.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:b.top+b.height,left:b.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(b){var c=this,d,e;return this.query=this.$element.val(),this.query?(d=a.grep(this.source,function(a){return c.matcher(a)}),d=this.sorter(d),d.length?this.render(d.slice(0,this.options.items)).show():this.shown?this.hide():this):this.shown?this.hide():this},matcher:function(a){return~a.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(a){var b=[],c=[],d=[],e;while(e=a.shift())e.toLowerCase().indexOf(this.query.toLowerCase())?~e.indexOf(this.query)?c.push(e):d.push(e):b.push(e);return b.concat(c,d)},highlighter:function(a){var b=this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&");return a.replace(new RegExp("("+b+")","ig"),function(a,b){return"<strong>"+b+"</strong>"})},render:function(b){var c=this;return b=a(b).map(function(b,d){return b=a(c.options.item).attr("data-value",d),b.find("a").html(c.highlighter(d)),b[0]}),b.first().addClass("active"),this.$menu.html(b),this},next:function(b){var c=this.$menu.find(".active").removeClass("active"),d=c.next();d.length||(d=a(this.$menu.find("li")[0])),d.addClass("active")},prev:function(a){var b=this.$menu.find(".active").removeClass("active"),c=b.prev();c.length||(c=this.$menu.find("li").last()),c.addClass("active")},listen:function(){this.$element.on("blur",a.proxy(this.blur,this)).on("keypress",a.proxy(this.keypress,this)).on("keyup",a.proxy(this.keyup,this)),(a.browser.webkit||a.browser.msie)&&this.$element.on("keydown",a.proxy(this.keypress,this)),this.$menu.on("click",a.proxy(this.click,this)).on("mouseenter","li",a.proxy(this.mouseenter,this))},keyup:function(a){switch(a.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}a.stopPropagation(),a.preventDefault()},keypress:function(a){if(!this.shown)return;switch(a.keyCode){case 9:case 13:case 27:a.preventDefault();break;case 38:if(a.type!="keydown")break;a.preventDefault(),this.prev();break;case 40:if(a.type!="keydown")break;a.preventDefault(),this.next()}a.stopPropagation()},blur:function(a){var b=this;setTimeout(function(){b.hide()},150)},click:function(a){a.stopPropagation(),a.preventDefault(),this.select()},mouseenter:function(b){this.$menu.find(".active").removeClass("active"),a(b.currentTarget).addClass("active")}},a.fn.typeahead=function(c){return this.each(function(){var d=a(this),e=d.data("typeahead"),f=typeof c=="object"&&c;e||d.data("typeahead",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.typeahead.defaults={source:[],items:8,menu:'<ul class="typeahead dropdown-menu"></ul>',item:'<li><a href="#"></a></li>'},a.fn.typeahead.Constructor=b,a(function(){a("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(b){var c=a(this);if(c.data("typeahead"))return;b.preventDefault(),c.typeahead(c.data())})})}(window.jQuery);
\ No newline at end of file
diff --git a/ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js b/ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js
new file mode 100644
index 00000000000..7e3093a59f1
--- /dev/null
+++ b/ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js
@@ -0,0 +1,611 @@
+/*!
+ * jQuery UI 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI
+ */
+(function(c,j){function k(a,b){var d=a.nodeName.toLowerCase();if("area"===d){b=a.parentNode;d=b.name;if(!a.href||!d||b.nodeName.toLowerCase()!=="map")return false;a=c("img[usemap=#"+d+"]")[0];return!!a&&l(a)}return(/input|select|textarea|button|object/.test(d)?!a.disabled:"a"==d?a.href||b:b)&&l(a)}function l(a){return!c(a).parents().andSelf().filter(function(){return c.curCSS(this,"visibility")==="hidden"||c.expr.filters.hidden(this)}).length}c.ui=c.ui||{};if(!c.ui.version){c.extend(c.ui,{version:"1.8.16",
+keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}});c.fn.extend({propAttr:c.fn.prop||c.fn.attr,_focus:c.fn.focus,focus:function(a,b){return typeof a==="number"?this.each(function(){var d=
+this;setTimeout(function(){c(d).focus();b&&b.call(d)},a)}):this._focus.apply(this,arguments)},scrollParent:function(){var a;a=c.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(c.curCSS(this,"position",1))&&/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(c.curCSS(this,
+"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||!a.length?c(document):a},zIndex:function(a){if(a!==j)return this.css("zIndex",a);if(this.length){a=c(this[0]);for(var b;a.length&&a[0]!==document;){b=a.css("position");if(b==="absolute"||b==="relative"||b==="fixed"){b=parseInt(a.css("zIndex"),10);if(!isNaN(b)&&b!==0)return b}a=a.parent()}}return 0},disableSelection:function(){return this.bind((c.support.selectstart?"selectstart":
+"mousedown")+".ui-disableSelection",function(a){a.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}});c.each(["Width","Height"],function(a,b){function d(f,g,m,n){c.each(e,function(){g-=parseFloat(c.curCSS(f,"padding"+this,true))||0;if(m)g-=parseFloat(c.curCSS(f,"border"+this+"Width",true))||0;if(n)g-=parseFloat(c.curCSS(f,"margin"+this,true))||0});return g}var e=b==="Width"?["Left","Right"]:["Top","Bottom"],h=b.toLowerCase(),i={innerWidth:c.fn.innerWidth,innerHeight:c.fn.innerHeight,
+outerWidth:c.fn.outerWidth,outerHeight:c.fn.outerHeight};c.fn["inner"+b]=function(f){if(f===j)return i["inner"+b].call(this);return this.each(function(){c(this).css(h,d(this,f)+"px")})};c.fn["outer"+b]=function(f,g){if(typeof f!=="number")return i["outer"+b].call(this,f);return this.each(function(){c(this).css(h,d(this,f,true,g)+"px")})}});c.extend(c.expr[":"],{data:function(a,b,d){return!!c.data(a,d[3])},focusable:function(a){return k(a,!isNaN(c.attr(a,"tabindex")))},tabbable:function(a){var b=c.attr(a,
+"tabindex"),d=isNaN(b);return(d||b>=0)&&k(a,!d)}});c(function(){var a=document.body,b=a.appendChild(b=document.createElement("div"));c.extend(b.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0});c.support.minHeight=b.offsetHeight===100;c.support.selectstart="onselectstart"in b;a.removeChild(b).style.display="none"});c.extend(c.ui,{plugin:{add:function(a,b,d){a=c.ui[a].prototype;for(var e in d){a.plugins[e]=a.plugins[e]||[];a.plugins[e].push([b,d[e]])}},call:function(a,b,d){if((b=a.plugins[b])&&
+a.element[0].parentNode)for(var e=0;e<b.length;e++)a.options[b[e][0]]&&b[e][1].apply(a.element,d)}},contains:function(a,b){return document.compareDocumentPosition?a.compareDocumentPosition(b)&16:a!==b&&a.contains(b)},hasScroll:function(a,b){if(c(a).css("overflow")==="hidden")return false;b=b&&b==="left"?"scrollLeft":"scrollTop";var d=false;if(a[b]>0)return true;a[b]=1;d=a[b]>0;a[b]=0;return d},isOverAxis:function(a,b,d){return a>b&&a<b+d},isOver:function(a,b,d,e,h,i){return c.ui.isOverAxis(a,d,h)&&
+c.ui.isOverAxis(b,e,i)}})}})(jQuery);
+;/*!
+ * jQuery UI Widget 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Widget
+ */
+(function(b,j){if(b.cleanData){var k=b.cleanData;b.cleanData=function(a){for(var c=0,d;(d=a[c])!=null;c++)try{b(d).triggerHandler("remove")}catch(e){}k(a)}}else{var l=b.fn.remove;b.fn.remove=function(a,c){return this.each(function(){if(!c)if(!a||b.filter(a,[this]).length)b("*",this).add([this]).each(function(){try{b(this).triggerHandler("remove")}catch(d){}});return l.call(b(this),a,c)})}}b.widget=function(a,c,d){var e=a.split(".")[0],f;a=a.split(".")[1];f=e+"-"+a;if(!d){d=c;c=b.Widget}b.expr[":"][f]=
+function(h){return!!b.data(h,a)};b[e]=b[e]||{};b[e][a]=function(h,g){arguments.length&&this._createWidget(h,g)};c=new c;c.options=b.extend(true,{},c.options);b[e][a].prototype=b.extend(true,c,{namespace:e,widgetName:a,widgetEventPrefix:b[e][a].prototype.widgetEventPrefix||a,widgetBaseClass:f},d);b.widget.bridge(a,b[e][a])};b.widget.bridge=function(a,c){b.fn[a]=function(d){var e=typeof d==="string",f=Array.prototype.slice.call(arguments,1),h=this;d=!e&&f.length?b.extend.apply(null,[true,d].concat(f)):
+d;if(e&&d.charAt(0)==="_")return h;e?this.each(function(){var g=b.data(this,a),i=g&&b.isFunction(g[d])?g[d].apply(g,f):g;if(i!==g&&i!==j){h=i;return false}}):this.each(function(){var g=b.data(this,a);g?g.option(d||{})._init():b.data(this,a,new c(d,this))});return h}};b.Widget=function(a,c){arguments.length&&this._createWidget(a,c)};b.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",options:{disabled:false},_createWidget:function(a,c){b.data(c,this.widgetName,this);this.element=b(c);this.options=
+b.extend(true,{},this.options,this._getCreateOptions(),a);var d=this;this.element.bind("remove."+this.widgetName,function(){d.destroy()});this._create();this._trigger("create");this._init()},_getCreateOptions:function(){return b.metadata&&b.metadata.get(this.element[0])[this.widgetName]},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName);this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+
+"-disabled ui-state-disabled")},widget:function(){return this.element},option:function(a,c){var d=a;if(arguments.length===0)return b.extend({},this.options);if(typeof a==="string"){if(c===j)return this.options[a];d={};d[a]=c}this._setOptions(d);return this},_setOptions:function(a){var c=this;b.each(a,function(d,e){c._setOption(d,e)});return this},_setOption:function(a,c){this.options[a]=c;if(a==="disabled")this.widget()[c?"addClass":"removeClass"](this.widgetBaseClass+"-disabled ui-state-disabled").attr("aria-disabled",
+c);return this},enable:function(){return this._setOption("disabled",false)},disable:function(){return this._setOption("disabled",true)},_trigger:function(a,c,d){var e=this.options[a];c=b.Event(c);c.type=(a===this.widgetEventPrefix?a:this.widgetEventPrefix+a).toLowerCase();d=d||{};if(c.originalEvent){a=b.event.props.length;for(var f;a;){f=b.event.props[--a];c[f]=c.originalEvent[f]}}this.element.trigger(c,d);return!(b.isFunction(e)&&e.call(this.element[0],c,d)===false||c.isDefaultPrevented())}}})(jQuery);
+;/*!
+ * jQuery UI Mouse 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Mouse
+ *
+ * Depends:
+ *	jquery.ui.widget.js
+ */
+(function(b){var d=false;b(document).mouseup(function(){d=false});b.widget("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseInit:function(){var a=this;this.element.bind("mousedown."+this.widgetName,function(c){return a._mouseDown(c)}).bind("click."+this.widgetName,function(c){if(true===b.data(c.target,a.widgetName+".preventClickEvent")){b.removeData(c.target,a.widgetName+".preventClickEvent");c.stopImmediatePropagation();return false}});this.started=false},_mouseDestroy:function(){this.element.unbind("."+
+this.widgetName)},_mouseDown:function(a){if(!d){this._mouseStarted&&this._mouseUp(a);this._mouseDownEvent=a;var c=this,f=a.which==1,g=typeof this.options.cancel=="string"&&a.target.nodeName?b(a.target).closest(this.options.cancel).length:false;if(!f||g||!this._mouseCapture(a))return true;this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet)this._mouseDelayTimer=setTimeout(function(){c.mouseDelayMet=true},this.options.delay);if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a)){this._mouseStarted=
+this._mouseStart(a)!==false;if(!this._mouseStarted){a.preventDefault();return true}}true===b.data(a.target,this.widgetName+".preventClickEvent")&&b.removeData(a.target,this.widgetName+".preventClickEvent");this._mouseMoveDelegate=function(e){return c._mouseMove(e)};this._mouseUpDelegate=function(e){return c._mouseUp(e)};b(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);a.preventDefault();return d=true}},_mouseMove:function(a){if(b.browser.msie&&
+!(document.documentMode>=9)&&!a.button)return this._mouseUp(a);if(this._mouseStarted){this._mouseDrag(a);return a.preventDefault()}if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a))(this._mouseStarted=this._mouseStart(this._mouseDownEvent,a)!==false)?this._mouseDrag(a):this._mouseUp(a);return!this._mouseStarted},_mouseUp:function(a){b(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=
+false;a.target==this._mouseDownEvent.target&&b.data(a.target,this.widgetName+".preventClickEvent",true);this._mouseStop(a)}return false},_mouseDistanceMet:function(a){return Math.max(Math.abs(this._mouseDownEvent.pageX-a.pageX),Math.abs(this._mouseDownEvent.pageY-a.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return true}})})(jQuery);
+;/*
+ * jQuery UI Position 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Position
+ */
+(function(c){c.ui=c.ui||{};var n=/left|center|right/,o=/top|center|bottom/,t=c.fn.position,u=c.fn.offset;c.fn.position=function(b){if(!b||!b.of)return t.apply(this,arguments);b=c.extend({},b);var a=c(b.of),d=a[0],g=(b.collision||"flip").split(" "),e=b.offset?b.offset.split(" "):[0,0],h,k,j;if(d.nodeType===9){h=a.width();k=a.height();j={top:0,left:0}}else if(d.setTimeout){h=a.width();k=a.height();j={top:a.scrollTop(),left:a.scrollLeft()}}else if(d.preventDefault){b.at="left top";h=k=0;j={top:b.of.pageY,
+left:b.of.pageX}}else{h=a.outerWidth();k=a.outerHeight();j=a.offset()}c.each(["my","at"],function(){var f=(b[this]||"").split(" ");if(f.length===1)f=n.test(f[0])?f.concat(["center"]):o.test(f[0])?["center"].concat(f):["center","center"];f[0]=n.test(f[0])?f[0]:"center";f[1]=o.test(f[1])?f[1]:"center";b[this]=f});if(g.length===1)g[1]=g[0];e[0]=parseInt(e[0],10)||0;if(e.length===1)e[1]=e[0];e[1]=parseInt(e[1],10)||0;if(b.at[0]==="right")j.left+=h;else if(b.at[0]==="center")j.left+=h/2;if(b.at[1]==="bottom")j.top+=
+k;else if(b.at[1]==="center")j.top+=k/2;j.left+=e[0];j.top+=e[1];return this.each(function(){var f=c(this),l=f.outerWidth(),m=f.outerHeight(),p=parseInt(c.curCSS(this,"marginLeft",true))||0,q=parseInt(c.curCSS(this,"marginTop",true))||0,v=l+p+(parseInt(c.curCSS(this,"marginRight",true))||0),w=m+q+(parseInt(c.curCSS(this,"marginBottom",true))||0),i=c.extend({},j),r;if(b.my[0]==="right")i.left-=l;else if(b.my[0]==="center")i.left-=l/2;if(b.my[1]==="bottom")i.top-=m;else if(b.my[1]==="center")i.top-=
+m/2;i.left=Math.round(i.left);i.top=Math.round(i.top);r={left:i.left-p,top:i.top-q};c.each(["left","top"],function(s,x){c.ui.position[g[s]]&&c.ui.position[g[s]][x](i,{targetWidth:h,targetHeight:k,elemWidth:l,elemHeight:m,collisionPosition:r,collisionWidth:v,collisionHeight:w,offset:e,my:b.my,at:b.at})});c.fn.bgiframe&&f.bgiframe();f.offset(c.extend(i,{using:b.using}))})};c.ui.position={fit:{left:function(b,a){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();b.left=
+d>0?b.left-d:Math.max(b.left-a.collisionPosition.left,b.left)},top:function(b,a){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();b.top=d>0?b.top-d:Math.max(b.top-a.collisionPosition.top,b.top)}},flip:{left:function(b,a){if(a.at[0]!=="center"){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();var g=a.my[0]==="left"?-a.elemWidth:a.my[0]==="right"?a.elemWidth:0,e=a.at[0]==="left"?a.targetWidth:-a.targetWidth,h=-2*a.offset[0];b.left+=
+a.collisionPosition.left<0?g+e+h:d>0?g+e+h:0}},top:function(b,a){if(a.at[1]!=="center"){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();var g=a.my[1]==="top"?-a.elemHeight:a.my[1]==="bottom"?a.elemHeight:0,e=a.at[1]==="top"?a.targetHeight:-a.targetHeight,h=-2*a.offset[1];b.top+=a.collisionPosition.top<0?g+e+h:d>0?g+e+h:0}}}};if(!c.offset.setOffset){c.offset.setOffset=function(b,a){if(/static/.test(c.curCSS(b,"position")))b.style.position="relative";var d=c(b),
+g=d.offset(),e=parseInt(c.curCSS(b,"top",true),10)||0,h=parseInt(c.curCSS(b,"left",true),10)||0;g={top:a.top-g.top+e,left:a.left-g.left+h};"using"in a?a.using.call(b,g):d.css(g)};c.fn.offset=function(b){var a=this[0];if(!a||!a.ownerDocument)return null;if(b)return this.each(function(){c.offset.setOffset(this,b)});return u.call(this)}}})(jQuery);
+;/*
+ * jQuery UI Draggable 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Draggables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(d){d.widget("ui.draggable",d.ui.mouse,{widgetEventPrefix:"drag",options:{addClasses:true,appendTo:"parent",axis:false,connectToSortable:false,containment:false,cursor:"auto",cursorAt:false,grid:false,handle:false,helper:"original",iframeFix:false,opacity:false,refreshPositions:false,revert:false,revertDuration:500,scope:"default",scroll:true,scrollSensitivity:20,scrollSpeed:20,snap:false,snapMode:"both",snapTolerance:20,stack:false,zIndex:false},_create:function(){if(this.options.helper==
+"original"&&!/^(?:r|a|f)/.test(this.element.css("position")))this.element[0].style.position="relative";this.options.addClasses&&this.element.addClass("ui-draggable");this.options.disabled&&this.element.addClass("ui-draggable-disabled");this._mouseInit()},destroy:function(){if(this.element.data("draggable")){this.element.removeData("draggable").unbind(".draggable").removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled");this._mouseDestroy();return this}},_mouseCapture:function(a){var b=
+this.options;if(this.helper||b.disabled||d(a.target).is(".ui-resizable-handle"))return false;this.handle=this._getHandle(a);if(!this.handle)return false;if(b.iframeFix)d(b.iframeFix===true?"iframe":b.iframeFix).each(function(){d('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>').css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1E3}).css(d(this).offset()).appendTo("body")});return true},_mouseStart:function(a){var b=this.options;
+this.helper=this._createHelper(a);this._cacheHelperProportions();if(d.ui.ddmanager)d.ui.ddmanager.current=this;this._cacheMargins();this.cssPosition=this.helper.css("position");this.scrollParent=this.helper.scrollParent();this.offset=this.positionAbs=this.element.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};d.extend(this.offset,{click:{left:a.pageX-this.offset.left,top:a.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});
+this.originalPosition=this.position=this._generatePosition(a);this.originalPageX=a.pageX;this.originalPageY=a.pageY;b.cursorAt&&this._adjustOffsetFromHelper(b.cursorAt);b.containment&&this._setContainment();if(this._trigger("start",a)===false){this._clear();return false}this._cacheHelperProportions();d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a);this.helper.addClass("ui-draggable-dragging");this._mouseDrag(a,true);d.ui.ddmanager&&d.ui.ddmanager.dragStart(this,a);return true},
+_mouseDrag:function(a,b){this.position=this._generatePosition(a);this.positionAbs=this._convertPositionTo("absolute");if(!b){b=this._uiHash();if(this._trigger("drag",a,b)===false){this._mouseUp({});return false}this.position=b.position}if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";d.ui.ddmanager&&d.ui.ddmanager.drag(this,a);return false},_mouseStop:function(a){var b=
+false;if(d.ui.ddmanager&&!this.options.dropBehaviour)b=d.ui.ddmanager.drop(this,a);if(this.dropped){b=this.dropped;this.dropped=false}if((!this.element[0]||!this.element[0].parentNode)&&this.options.helper=="original")return false;if(this.options.revert=="invalid"&&!b||this.options.revert=="valid"&&b||this.options.revert===true||d.isFunction(this.options.revert)&&this.options.revert.call(this.element,b)){var c=this;d(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,
+10),function(){c._trigger("stop",a)!==false&&c._clear()})}else this._trigger("stop",a)!==false&&this._clear();return false},_mouseUp:function(a){this.options.iframeFix===true&&d("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)});d.ui.ddmanager&&d.ui.ddmanager.dragStop(this,a);return d.ui.mouse.prototype._mouseUp.call(this,a)},cancel:function(){this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear();return this},_getHandle:function(a){var b=!this.options.handle||
+!d(this.options.handle,this.element).length?true:false;d(this.options.handle,this.element).find("*").andSelf().each(function(){if(this==a.target)b=true});return b},_createHelper:function(a){var b=this.options;a=d.isFunction(b.helper)?d(b.helper.apply(this.element[0],[a])):b.helper=="clone"?this.element.clone().removeAttr("id"):this.element;a.parents("body").length||a.appendTo(b.appendTo=="parent"?this.element[0].parentNode:b.appendTo);a[0]!=this.element[0]&&!/(fixed|absolute)/.test(a.css("position"))&&
+a.css("position","absolute");return a},_adjustOffsetFromHelper:function(a){if(typeof a=="string")a=a.split(" ");if(d.isArray(a))a={left:+a[0],top:+a[1]||0};if("left"in a)this.offset.click.left=a.left+this.margins.left;if("right"in a)this.offset.click.left=this.helperProportions.width-a.right+this.margins.left;if("top"in a)this.offset.click.top=a.top+this.margins.top;if("bottom"in a)this.offset.click.top=this.helperProportions.height-a.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=
+this.helper.offsetParent();var a=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0])){a.left+=this.scrollParent.scrollLeft();a.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&d.browser.msie)a={top:0,left:0};return{top:a.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:a.left+(parseInt(this.offsetParent.css("borderLeftWidth"),
+10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var a=this.element.position();return{top:a.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),
+10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var a=this.options;if(a.containment=="parent")a.containment=this.helper[0].parentNode;if(a.containment=="document"||a.containment=="window")this.containment=[a.containment=="document"?0:d(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,a.containment=="document"?0:d(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,
+(a.containment=="document"?0:d(window).scrollLeft())+d(a.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(a.containment=="document"?0:d(window).scrollTop())+(d(a.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(a.containment)&&a.containment.constructor!=Array){a=d(a.containment);var b=a[0];if(b){a.offset();var c=d(b).css("overflow")!=
+"hidden";this.containment=[(parseInt(d(b).css("borderLeftWidth"),10)||0)+(parseInt(d(b).css("paddingLeft"),10)||0),(parseInt(d(b).css("borderTopWidth"),10)||0)+(parseInt(d(b).css("paddingTop"),10)||0),(c?Math.max(b.scrollWidth,b.offsetWidth):b.offsetWidth)-(parseInt(d(b).css("borderLeftWidth"),10)||0)-(parseInt(d(b).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(c?Math.max(b.scrollHeight,b.offsetHeight):b.offsetHeight)-(parseInt(d(b).css("borderTopWidth"),
+10)||0)-(parseInt(d(b).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom];this.relative_container=a}}else if(a.containment.constructor==Array)this.containment=a.containment},_convertPositionTo:function(a,b){if(!b)b=this.position;a=a=="absolute"?1:-1;var c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,f=/(html|body)/i.test(c[0].tagName);return{top:b.top+
+this.offset.relative.top*a+this.offset.parent.top*a-(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():f?0:c.scrollTop())*a),left:b.left+this.offset.relative.left*a+this.offset.parent.left*a-(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():f?0:c.scrollLeft())*a)}},_generatePosition:function(a){var b=this.options,c=this.cssPosition=="absolute"&&
+!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,f=/(html|body)/i.test(c[0].tagName),e=a.pageX,h=a.pageY;if(this.originalPosition){var g;if(this.containment){if(this.relative_container){g=this.relative_container.offset();g=[this.containment[0]+g.left,this.containment[1]+g.top,this.containment[2]+g.left,this.containment[3]+g.top]}else g=this.containment;if(a.pageX-this.offset.click.left<g[0])e=g[0]+this.offset.click.left;
+if(a.pageY-this.offset.click.top<g[1])h=g[1]+this.offset.click.top;if(a.pageX-this.offset.click.left>g[2])e=g[2]+this.offset.click.left;if(a.pageY-this.offset.click.top>g[3])h=g[3]+this.offset.click.top}if(b.grid){h=b.grid[1]?this.originalPageY+Math.round((h-this.originalPageY)/b.grid[1])*b.grid[1]:this.originalPageY;h=g?!(h-this.offset.click.top<g[1]||h-this.offset.click.top>g[3])?h:!(h-this.offset.click.top<g[1])?h-b.grid[1]:h+b.grid[1]:h;e=b.grid[0]?this.originalPageX+Math.round((e-this.originalPageX)/
+b.grid[0])*b.grid[0]:this.originalPageX;e=g?!(e-this.offset.click.left<g[0]||e-this.offset.click.left>g[2])?e:!(e-this.offset.click.left<g[0])?e-b.grid[0]:e+b.grid[0]:e}}return{top:h-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():f?0:c.scrollTop()),left:e-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(d.browser.safari&&d.browser.version<
+526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():f?0:c.scrollLeft())}},_clear:function(){this.helper.removeClass("ui-draggable-dragging");this.helper[0]!=this.element[0]&&!this.cancelHelperRemoval&&this.helper.remove();this.helper=null;this.cancelHelperRemoval=false},_trigger:function(a,b,c){c=c||this._uiHash();d.ui.plugin.call(this,a,[b,c]);if(a=="drag")this.positionAbs=this._convertPositionTo("absolute");return d.Widget.prototype._trigger.call(this,a,b,
+c)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}});d.extend(d.ui.draggable,{version:"1.8.16"});d.ui.plugin.add("draggable","connectToSortable",{start:function(a,b){var c=d(this).data("draggable"),f=c.options,e=d.extend({},b,{item:c.element});c.sortables=[];d(f.connectToSortable).each(function(){var h=d.data(this,"sortable");if(h&&!h.options.disabled){c.sortables.push({instance:h,shouldRevert:h.options.revert});
+h.refreshPositions();h._trigger("activate",a,e)}})},stop:function(a,b){var c=d(this).data("draggable"),f=d.extend({},b,{item:c.element});d.each(c.sortables,function(){if(this.instance.isOver){this.instance.isOver=0;c.cancelHelperRemoval=true;this.instance.cancelHelperRemoval=false;if(this.shouldRevert)this.instance.options.revert=true;this.instance._mouseStop(a);this.instance.options.helper=this.instance.options._helper;c.options.helper=="original"&&this.instance.currentItem.css({top:"auto",left:"auto"})}else{this.instance.cancelHelperRemoval=
+false;this.instance._trigger("deactivate",a,f)}})},drag:function(a,b){var c=d(this).data("draggable"),f=this;d.each(c.sortables,function(){this.instance.positionAbs=c.positionAbs;this.instance.helperProportions=c.helperProportions;this.instance.offset.click=c.offset.click;if(this.instance._intersectsWith(this.instance.containerCache)){if(!this.instance.isOver){this.instance.isOver=1;this.instance.currentItem=d(f).clone().removeAttr("id").appendTo(this.instance.element).data("sortable-item",true);
+this.instance.options._helper=this.instance.options.helper;this.instance.options.helper=function(){return b.helper[0]};a.target=this.instance.currentItem[0];this.instance._mouseCapture(a,true);this.instance._mouseStart(a,true,true);this.instance.offset.click.top=c.offset.click.top;this.instance.offset.click.left=c.offset.click.left;this.instance.offset.parent.left-=c.offset.parent.left-this.instance.offset.parent.left;this.instance.offset.parent.top-=c.offset.parent.top-this.instance.offset.parent.top;
+c._trigger("toSortable",a);c.dropped=this.instance.element;c.currentItem=c.element;this.instance.fromOutside=c}this.instance.currentItem&&this.instance._mouseDrag(a)}else if(this.instance.isOver){this.instance.isOver=0;this.instance.cancelHelperRemoval=true;this.instance.options.revert=false;this.instance._trigger("out",a,this.instance._uiHash(this.instance));this.instance._mouseStop(a,true);this.instance.options.helper=this.instance.options._helper;this.instance.currentItem.remove();this.instance.placeholder&&
+this.instance.placeholder.remove();c._trigger("fromSortable",a);c.dropped=false}})}});d.ui.plugin.add("draggable","cursor",{start:function(){var a=d("body"),b=d(this).data("draggable").options;if(a.css("cursor"))b._cursor=a.css("cursor");a.css("cursor",b.cursor)},stop:function(){var a=d(this).data("draggable").options;a._cursor&&d("body").css("cursor",a._cursor)}});d.ui.plugin.add("draggable","opacity",{start:function(a,b){a=d(b.helper);b=d(this).data("draggable").options;if(a.css("opacity"))b._opacity=
+a.css("opacity");a.css("opacity",b.opacity)},stop:function(a,b){a=d(this).data("draggable").options;a._opacity&&d(b.helper).css("opacity",a._opacity)}});d.ui.plugin.add("draggable","scroll",{start:function(){var a=d(this).data("draggable");if(a.scrollParent[0]!=document&&a.scrollParent[0].tagName!="HTML")a.overflowOffset=a.scrollParent.offset()},drag:function(a){var b=d(this).data("draggable"),c=b.options,f=false;if(b.scrollParent[0]!=document&&b.scrollParent[0].tagName!="HTML"){if(!c.axis||c.axis!=
+"x")if(b.overflowOffset.top+b.scrollParent[0].offsetHeight-a.pageY<c.scrollSensitivity)b.scrollParent[0].scrollTop=f=b.scrollParent[0].scrollTop+c.scrollSpeed;else if(a.pageY-b.overflowOffset.top<c.scrollSensitivity)b.scrollParent[0].scrollTop=f=b.scrollParent[0].scrollTop-c.scrollSpeed;if(!c.axis||c.axis!="y")if(b.overflowOffset.left+b.scrollParent[0].offsetWidth-a.pageX<c.scrollSensitivity)b.scrollParent[0].scrollLeft=f=b.scrollParent[0].scrollLeft+c.scrollSpeed;else if(a.pageX-b.overflowOffset.left<
+c.scrollSensitivity)b.scrollParent[0].scrollLeft=f=b.scrollParent[0].scrollLeft-c.scrollSpeed}else{if(!c.axis||c.axis!="x")if(a.pageY-d(document).scrollTop()<c.scrollSensitivity)f=d(document).scrollTop(d(document).scrollTop()-c.scrollSpeed);else if(d(window).height()-(a.pageY-d(document).scrollTop())<c.scrollSensitivity)f=d(document).scrollTop(d(document).scrollTop()+c.scrollSpeed);if(!c.axis||c.axis!="y")if(a.pageX-d(document).scrollLeft()<c.scrollSensitivity)f=d(document).scrollLeft(d(document).scrollLeft()-
+c.scrollSpeed);else if(d(window).width()-(a.pageX-d(document).scrollLeft())<c.scrollSensitivity)f=d(document).scrollLeft(d(document).scrollLeft()+c.scrollSpeed)}f!==false&&d.ui.ddmanager&&!c.dropBehaviour&&d.ui.ddmanager.prepareOffsets(b,a)}});d.ui.plugin.add("draggable","snap",{start:function(){var a=d(this).data("draggable"),b=a.options;a.snapElements=[];d(b.snap.constructor!=String?b.snap.items||":data(draggable)":b.snap).each(function(){var c=d(this),f=c.offset();this!=a.element[0]&&a.snapElements.push({item:this,
+width:c.outerWidth(),height:c.outerHeight(),top:f.top,left:f.left})})},drag:function(a,b){for(var c=d(this).data("draggable"),f=c.options,e=f.snapTolerance,h=b.offset.left,g=h+c.helperProportions.width,n=b.offset.top,o=n+c.helperProportions.height,i=c.snapElements.length-1;i>=0;i--){var j=c.snapElements[i].left,l=j+c.snapElements[i].width,k=c.snapElements[i].top,m=k+c.snapElements[i].height;if(j-e<h&&h<l+e&&k-e<n&&n<m+e||j-e<h&&h<l+e&&k-e<o&&o<m+e||j-e<g&&g<l+e&&k-e<n&&n<m+e||j-e<g&&g<l+e&&k-e<o&&
+o<m+e){if(f.snapMode!="inner"){var p=Math.abs(k-o)<=e,q=Math.abs(m-n)<=e,r=Math.abs(j-g)<=e,s=Math.abs(l-h)<=e;if(p)b.position.top=c._convertPositionTo("relative",{top:k-c.helperProportions.height,left:0}).top-c.margins.top;if(q)b.position.top=c._convertPositionTo("relative",{top:m,left:0}).top-c.margins.top;if(r)b.position.left=c._convertPositionTo("relative",{top:0,left:j-c.helperProportions.width}).left-c.margins.left;if(s)b.position.left=c._convertPositionTo("relative",{top:0,left:l}).left-c.margins.left}var t=
+p||q||r||s;if(f.snapMode!="outer"){p=Math.abs(k-n)<=e;q=Math.abs(m-o)<=e;r=Math.abs(j-h)<=e;s=Math.abs(l-g)<=e;if(p)b.position.top=c._convertPositionTo("relative",{top:k,left:0}).top-c.margins.top;if(q)b.position.top=c._convertPositionTo("relative",{top:m-c.helperProportions.height,left:0}).top-c.margins.top;if(r)b.position.left=c._convertPositionTo("relative",{top:0,left:j}).left-c.margins.left;if(s)b.position.left=c._convertPositionTo("relative",{top:0,left:l-c.helperProportions.width}).left-c.margins.left}if(!c.snapElements[i].snapping&&
+(p||q||r||s||t))c.options.snap.snap&&c.options.snap.snap.call(c.element,a,d.extend(c._uiHash(),{snapItem:c.snapElements[i].item}));c.snapElements[i].snapping=p||q||r||s||t}else{c.snapElements[i].snapping&&c.options.snap.release&&c.options.snap.release.call(c.element,a,d.extend(c._uiHash(),{snapItem:c.snapElements[i].item}));c.snapElements[i].snapping=false}}}});d.ui.plugin.add("draggable","stack",{start:function(){var a=d(this).data("draggable").options;a=d.makeArray(d(a.stack)).sort(function(c,f){return(parseInt(d(c).css("zIndex"),
+10)||0)-(parseInt(d(f).css("zIndex"),10)||0)});if(a.length){var b=parseInt(a[0].style.zIndex)||0;d(a).each(function(c){this.style.zIndex=b+c});this[0].style.zIndex=b+a.length}}});d.ui.plugin.add("draggable","zIndex",{start:function(a,b){a=d(b.helper);b=d(this).data("draggable").options;if(a.css("zIndex"))b._zIndex=a.css("zIndex");a.css("zIndex",b.zIndex)},stop:function(a,b){a=d(this).data("draggable").options;a._zIndex&&d(b.helper).css("zIndex",a._zIndex)}})})(jQuery);
+;/*
+ * jQuery UI Droppable 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Droppables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.draggable.js
+ */
+(function(d){d.widget("ui.droppable",{widgetEventPrefix:"drop",options:{accept:"*",activeClass:false,addClasses:true,greedy:false,hoverClass:false,scope:"default",tolerance:"intersect"},_create:function(){var a=this.options,b=a.accept;this.isover=0;this.isout=1;this.accept=d.isFunction(b)?b:function(c){return c.is(b)};this.proportions={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight};d.ui.ddmanager.droppables[a.scope]=d.ui.ddmanager.droppables[a.scope]||[];d.ui.ddmanager.droppables[a.scope].push(this);
+a.addClasses&&this.element.addClass("ui-droppable")},destroy:function(){for(var a=d.ui.ddmanager.droppables[this.options.scope],b=0;b<a.length;b++)a[b]==this&&a.splice(b,1);this.element.removeClass("ui-droppable ui-droppable-disabled").removeData("droppable").unbind(".droppable");return this},_setOption:function(a,b){if(a=="accept")this.accept=d.isFunction(b)?b:function(c){return c.is(b)};d.Widget.prototype._setOption.apply(this,arguments)},_activate:function(a){var b=d.ui.ddmanager.current;this.options.activeClass&&
+this.element.addClass(this.options.activeClass);b&&this._trigger("activate",a,this.ui(b))},_deactivate:function(a){var b=d.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass);b&&this._trigger("deactivate",a,this.ui(b))},_over:function(a){var b=d.ui.ddmanager.current;if(!(!b||(b.currentItem||b.element)[0]==this.element[0]))if(this.accept.call(this.element[0],b.currentItem||b.element)){this.options.hoverClass&&this.element.addClass(this.options.hoverClass);
+this._trigger("over",a,this.ui(b))}},_out:function(a){var b=d.ui.ddmanager.current;if(!(!b||(b.currentItem||b.element)[0]==this.element[0]))if(this.accept.call(this.element[0],b.currentItem||b.element)){this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("out",a,this.ui(b))}},_drop:function(a,b){var c=b||d.ui.ddmanager.current;if(!c||(c.currentItem||c.element)[0]==this.element[0])return false;var e=false;this.element.find(":data(droppable)").not(".ui-draggable-dragging").each(function(){var g=
+d.data(this,"droppable");if(g.options.greedy&&!g.options.disabled&&g.options.scope==c.options.scope&&g.accept.call(g.element[0],c.currentItem||c.element)&&d.ui.intersect(c,d.extend(g,{offset:g.element.offset()}),g.options.tolerance)){e=true;return false}});if(e)return false;if(this.accept.call(this.element[0],c.currentItem||c.element)){this.options.activeClass&&this.element.removeClass(this.options.activeClass);this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("drop",
+a,this.ui(c));return this.element}return false},ui:function(a){return{draggable:a.currentItem||a.element,helper:a.helper,position:a.position,offset:a.positionAbs}}});d.extend(d.ui.droppable,{version:"1.8.16"});d.ui.intersect=function(a,b,c){if(!b.offset)return false;var e=(a.positionAbs||a.position.absolute).left,g=e+a.helperProportions.width,f=(a.positionAbs||a.position.absolute).top,h=f+a.helperProportions.height,i=b.offset.left,k=i+b.proportions.width,j=b.offset.top,l=j+b.proportions.height;
+switch(c){case "fit":return i<=e&&g<=k&&j<=f&&h<=l;case "intersect":return i<e+a.helperProportions.width/2&&g-a.helperProportions.width/2<k&&j<f+a.helperProportions.height/2&&h-a.helperProportions.height/2<l;case "pointer":return d.ui.isOver((a.positionAbs||a.position.absolute).top+(a.clickOffset||a.offset.click).top,(a.positionAbs||a.position.absolute).left+(a.clickOffset||a.offset.click).left,j,i,b.proportions.height,b.proportions.width);case "touch":return(f>=j&&f<=l||h>=j&&h<=l||f<j&&h>l)&&(e>=
+i&&e<=k||g>=i&&g<=k||e<i&&g>k);default:return false}};d.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(a,b){var c=d.ui.ddmanager.droppables[a.options.scope]||[],e=b?b.type:null,g=(a.currentItem||a.element).find(":data(droppable)").andSelf(),f=0;a:for(;f<c.length;f++)if(!(c[f].options.disabled||a&&!c[f].accept.call(c[f].element[0],a.currentItem||a.element))){for(var h=0;h<g.length;h++)if(g[h]==c[f].element[0]){c[f].proportions.height=0;continue a}c[f].visible=c[f].element.css("display")!=
+"none";if(c[f].visible){e=="mousedown"&&c[f]._activate.call(c[f],b);c[f].offset=c[f].element.offset();c[f].proportions={width:c[f].element[0].offsetWidth,height:c[f].element[0].offsetHeight}}}},drop:function(a,b){var c=false;d.each(d.ui.ddmanager.droppables[a.options.scope]||[],function(){if(this.options){if(!this.options.disabled&&this.visible&&d.ui.intersect(a,this,this.options.tolerance))c=c||this._drop.call(this,b);if(!this.options.disabled&&this.visible&&this.accept.call(this.element[0],a.currentItem||
+a.element)){this.isout=1;this.isover=0;this._deactivate.call(this,b)}}});return c},dragStart:function(a,b){a.element.parents(":not(body,html)").bind("scroll.droppable",function(){a.options.refreshPositions||d.ui.ddmanager.prepareOffsets(a,b)})},drag:function(a,b){a.options.refreshPositions&&d.ui.ddmanager.prepareOffsets(a,b);d.each(d.ui.ddmanager.droppables[a.options.scope]||[],function(){if(!(this.options.disabled||this.greedyChild||!this.visible)){var c=d.ui.intersect(a,this,this.options.tolerance);
+if(c=!c&&this.isover==1?"isout":c&&this.isover==0?"isover":null){var e;if(this.options.greedy){var g=this.element.parents(":data(droppable):eq(0)");if(g.length){e=d.data(g[0],"droppable");e.greedyChild=c=="isover"?1:0}}if(e&&c=="isover"){e.isover=0;e.isout=1;e._out.call(e,b)}this[c]=1;this[c=="isout"?"isover":"isout"]=0;this[c=="isover"?"_over":"_out"].call(this,b);if(e&&c=="isout"){e.isout=0;e.isover=1;e._over.call(e,b)}}}})},dragStop:function(a,b){a.element.parents(":not(body,html)").unbind("scroll.droppable");
+a.options.refreshPositions||d.ui.ddmanager.prepareOffsets(a,b)}}})(jQuery);
+;/*
+ * jQuery UI Resizable 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Resizables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(e){e.widget("ui.resizable",e.ui.mouse,{widgetEventPrefix:"resize",options:{alsoResize:false,animate:false,animateDuration:"slow",animateEasing:"swing",aspectRatio:false,autoHide:false,containment:false,ghost:false,grid:false,handles:"e,s,se",helper:false,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:1E3},_create:function(){var b=this,a=this.options;this.element.addClass("ui-resizable");e.extend(this,{_aspectRatio:!!a.aspectRatio,aspectRatio:a.aspectRatio,originalElement:this.element,
+_proportionallyResizeElements:[],_helper:a.helper||a.ghost||a.animate?a.helper||"ui-resizable-helper":null});if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)){/relative/.test(this.element.css("position"))&&e.browser.opera&&this.element.css({position:"relative",top:"auto",left:"auto"});this.element.wrap(e('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),
+top:this.element.css("top"),left:this.element.css("left")}));this.element=this.element.parent().data("resizable",this.element.data("resizable"));this.elementIsWrapper=true;this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")});this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0});this.originalResizeStyle=
+this.originalElement.css("resize");this.originalElement.css("resize","none");this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"}));this.originalElement.css({margin:this.originalElement.css("margin")});this._proportionallyResize()}this.handles=a.handles||(!e(".ui-resizable-handle",this.element).length?"e,s,se":{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",
+nw:".ui-resizable-nw"});if(this.handles.constructor==String){if(this.handles=="all")this.handles="n,e,s,w,se,sw,ne,nw";var c=this.handles.split(",");this.handles={};for(var d=0;d<c.length;d++){var f=e.trim(c[d]),g=e('<div class="ui-resizable-handle '+("ui-resizable-"+f)+'"></div>');/sw|se|ne|nw/.test(f)&&g.css({zIndex:++a.zIndex});"se"==f&&g.addClass("ui-icon ui-icon-gripsmall-diagonal-se");this.handles[f]=".ui-resizable-"+f;this.element.append(g)}}this._renderAxis=function(h){h=h||this.element;for(var i in this.handles){if(this.handles[i].constructor==
+String)this.handles[i]=e(this.handles[i],this.element).show();if(this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)){var j=e(this.handles[i],this.element),l=0;l=/sw|ne|nw|se|n|s/.test(i)?j.outerHeight():j.outerWidth();j=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join("");h.css(j,l);this._proportionallyResize()}e(this.handles[i])}};this._renderAxis(this.element);this._handles=e(".ui-resizable-handle",this.element).disableSelection();
+this._handles.mouseover(function(){if(!b.resizing){if(this.className)var h=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);b.axis=h&&h[1]?h[1]:"se"}});if(a.autoHide){this._handles.hide();e(this.element).addClass("ui-resizable-autohide").hover(function(){if(!a.disabled){e(this).removeClass("ui-resizable-autohide");b._handles.show()}},function(){if(!a.disabled)if(!b.resizing){e(this).addClass("ui-resizable-autohide");b._handles.hide()}})}this._mouseInit()},destroy:function(){this._mouseDestroy();
+var b=function(c){e(c).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};if(this.elementIsWrapper){b(this.element);var a=this.element;a.after(this.originalElement.css({position:a.css("position"),width:a.outerWidth(),height:a.outerHeight(),top:a.css("top"),left:a.css("left")})).remove()}this.originalElement.css("resize",this.originalResizeStyle);b(this.originalElement);return this},_mouseCapture:function(b){var a=
+false;for(var c in this.handles)if(e(this.handles[c])[0]==b.target)a=true;return!this.options.disabled&&a},_mouseStart:function(b){var a=this.options,c=this.element.position(),d=this.element;this.resizing=true;this.documentScroll={top:e(document).scrollTop(),left:e(document).scrollLeft()};if(d.is(".ui-draggable")||/absolute/.test(d.css("position")))d.css({position:"absolute",top:c.top,left:c.left});e.browser.opera&&/relative/.test(d.css("position"))&&d.css({position:"relative",top:"auto",left:"auto"});
+this._renderProxy();c=m(this.helper.css("left"));var f=m(this.helper.css("top"));if(a.containment){c+=e(a.containment).scrollLeft()||0;f+=e(a.containment).scrollTop()||0}this.offset=this.helper.offset();this.position={left:c,top:f};this.size=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalSize=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalPosition={left:c,top:f};this.sizeDiff=
+{width:d.outerWidth()-d.width(),height:d.outerHeight()-d.height()};this.originalMousePosition={left:b.pageX,top:b.pageY};this.aspectRatio=typeof a.aspectRatio=="number"?a.aspectRatio:this.originalSize.width/this.originalSize.height||1;a=e(".ui-resizable-"+this.axis).css("cursor");e("body").css("cursor",a=="auto"?this.axis+"-resize":a);d.addClass("ui-resizable-resizing");this._propagate("start",b);return true},_mouseDrag:function(b){var a=this.helper,c=this.originalMousePosition,d=this._change[this.axis];
+if(!d)return false;c=d.apply(this,[b,b.pageX-c.left||0,b.pageY-c.top||0]);this._updateVirtualBoundaries(b.shiftKey);if(this._aspectRatio||b.shiftKey)c=this._updateRatio(c,b);c=this._respectSize(c,b);this._propagate("resize",b);a.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"});!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize();this._updateCache(c);this._trigger("resize",b,this.ui());return false},
+_mouseStop:function(b){this.resizing=false;var a=this.options,c=this;if(this._helper){var d=this._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName);d=f&&e.ui.hasScroll(d[0],"left")?0:c.sizeDiff.height;f=f?0:c.sizeDiff.width;f={width:c.helper.width()-f,height:c.helper.height()-d};d=parseInt(c.element.css("left"),10)+(c.position.left-c.originalPosition.left)||null;var g=parseInt(c.element.css("top"),10)+(c.position.top-c.originalPosition.top)||null;a.animate||this.element.css(e.extend(f,
+{top:g,left:d}));c.helper.height(c.size.height);c.helper.width(c.size.width);this._helper&&!a.animate&&this._proportionallyResize()}e("body").css("cursor","auto");this.element.removeClass("ui-resizable-resizing");this._propagate("stop",b);this._helper&&this.helper.remove();return false},_updateVirtualBoundaries:function(b){var a=this.options,c,d,f;a={minWidth:k(a.minWidth)?a.minWidth:0,maxWidth:k(a.maxWidth)?a.maxWidth:Infinity,minHeight:k(a.minHeight)?a.minHeight:0,maxHeight:k(a.maxHeight)?a.maxHeight:
+Infinity};if(this._aspectRatio||b){b=a.minHeight*this.aspectRatio;d=a.minWidth/this.aspectRatio;c=a.maxHeight*this.aspectRatio;f=a.maxWidth/this.aspectRatio;if(b>a.minWidth)a.minWidth=b;if(d>a.minHeight)a.minHeight=d;if(c<a.maxWidth)a.maxWidth=c;if(f<a.maxHeight)a.maxHeight=f}this._vBoundaries=a},_updateCache:function(b){this.offset=this.helper.offset();if(k(b.left))this.position.left=b.left;if(k(b.top))this.position.top=b.top;if(k(b.height))this.size.height=b.height;if(k(b.width))this.size.width=
+b.width},_updateRatio:function(b){var a=this.position,c=this.size,d=this.axis;if(k(b.height))b.width=b.height*this.aspectRatio;else if(k(b.width))b.height=b.width/this.aspectRatio;if(d=="sw"){b.left=a.left+(c.width-b.width);b.top=null}if(d=="nw"){b.top=a.top+(c.height-b.height);b.left=a.left+(c.width-b.width)}return b},_respectSize:function(b){var a=this._vBoundaries,c=this.axis,d=k(b.width)&&a.maxWidth&&a.maxWidth<b.width,f=k(b.height)&&a.maxHeight&&a.maxHeight<b.height,g=k(b.width)&&a.minWidth&&
+a.minWidth>b.width,h=k(b.height)&&a.minHeight&&a.minHeight>b.height;if(g)b.width=a.minWidth;if(h)b.height=a.minHeight;if(d)b.width=a.maxWidth;if(f)b.height=a.maxHeight;var i=this.originalPosition.left+this.originalSize.width,j=this.position.top+this.size.height,l=/sw|nw|w/.test(c);c=/nw|ne|n/.test(c);if(g&&l)b.left=i-a.minWidth;if(d&&l)b.left=i-a.maxWidth;if(h&&c)b.top=j-a.minHeight;if(f&&c)b.top=j-a.maxHeight;if((a=!b.width&&!b.height)&&!b.left&&b.top)b.top=null;else if(a&&!b.top&&b.left)b.left=
+null;return b},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var b=this.helper||this.element,a=0;a<this._proportionallyResizeElements.length;a++){var c=this._proportionallyResizeElements[a];if(!this.borderDif){var d=[c.css("borderTopWidth"),c.css("borderRightWidth"),c.css("borderBottomWidth"),c.css("borderLeftWidth")],f=[c.css("paddingTop"),c.css("paddingRight"),c.css("paddingBottom"),c.css("paddingLeft")];this.borderDif=e.map(d,function(g,h){g=parseInt(g,10)||
+0;h=parseInt(f[h],10)||0;return g+h})}e.browser.msie&&(e(b).is(":hidden")||e(b).parents(":hidden").length)||c.css({height:b.height()-this.borderDif[0]-this.borderDif[2]||0,width:b.width()-this.borderDif[1]-this.borderDif[3]||0})}},_renderProxy:function(){var b=this.options;this.elementOffset=this.element.offset();if(this._helper){this.helper=this.helper||e('<div style="overflow:hidden;"></div>');var a=e.browser.msie&&e.browser.version<7,c=a?1:0;a=a?2:-1;this.helper.addClass(this._helper).css({width:this.element.outerWidth()+
+a,height:this.element.outerHeight()+a,position:"absolute",left:this.elementOffset.left-c+"px",top:this.elementOffset.top-c+"px",zIndex:++b.zIndex});this.helper.appendTo("body").disableSelection()}else this.helper=this.element},_change:{e:function(b,a){return{width:this.originalSize.width+a}},w:function(b,a){return{left:this.originalPosition.left+a,width:this.originalSize.width-a}},n:function(b,a,c){return{top:this.originalPosition.top+c,height:this.originalSize.height-c}},s:function(b,a,c){return{height:this.originalSize.height+
+c}},se:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[b,a,c]))},sw:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[b,a,c]))},ne:function(b,a,c){return e.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[b,a,c]))},nw:function(b,a,c){return e.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[b,a,c]))}},_propagate:function(b,a){e.ui.plugin.call(this,b,[a,this.ui()]);
+b!="resize"&&this._trigger(b,a,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}});e.extend(e.ui.resizable,{version:"1.8.16"});e.ui.plugin.add("resizable","alsoResize",{start:function(){var b=e(this).data("resizable").options,a=function(c){e(c).each(function(){var d=e(this);d.data("resizable-alsoresize",{width:parseInt(d.width(),
+10),height:parseInt(d.height(),10),left:parseInt(d.css("left"),10),top:parseInt(d.css("top"),10),position:d.css("position")})})};if(typeof b.alsoResize=="object"&&!b.alsoResize.parentNode)if(b.alsoResize.length){b.alsoResize=b.alsoResize[0];a(b.alsoResize)}else e.each(b.alsoResize,function(c){a(c)});else a(b.alsoResize)},resize:function(b,a){var c=e(this).data("resizable");b=c.options;var d=c.originalSize,f=c.originalPosition,g={height:c.size.height-d.height||0,width:c.size.width-d.width||0,top:c.position.top-
+f.top||0,left:c.position.left-f.left||0},h=function(i,j){e(i).each(function(){var l=e(this),q=e(this).data("resizable-alsoresize"),p={},r=j&&j.length?j:l.parents(a.originalElement[0]).length?["width","height"]:["width","height","top","left"];e.each(r,function(n,o){if((n=(q[o]||0)+(g[o]||0))&&n>=0)p[o]=n||null});if(e.browser.opera&&/relative/.test(l.css("position"))){c._revertToRelativePosition=true;l.css({position:"absolute",top:"auto",left:"auto"})}l.css(p)})};typeof b.alsoResize=="object"&&!b.alsoResize.nodeType?
+e.each(b.alsoResize,function(i,j){h(i,j)}):h(b.alsoResize)},stop:function(){var b=e(this).data("resizable"),a=b.options,c=function(d){e(d).each(function(){var f=e(this);f.css({position:f.data("resizable-alsoresize").position})})};if(b._revertToRelativePosition){b._revertToRelativePosition=false;typeof a.alsoResize=="object"&&!a.alsoResize.nodeType?e.each(a.alsoResize,function(d){c(d)}):c(a.alsoResize)}e(this).removeData("resizable-alsoresize")}});e.ui.plugin.add("resizable","animate",{stop:function(b){var a=
+e(this).data("resizable"),c=a.options,d=a._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName),g=f&&e.ui.hasScroll(d[0],"left")?0:a.sizeDiff.height;f={width:a.size.width-(f?0:a.sizeDiff.width),height:a.size.height-g};g=parseInt(a.element.css("left"),10)+(a.position.left-a.originalPosition.left)||null;var h=parseInt(a.element.css("top"),10)+(a.position.top-a.originalPosition.top)||null;a.element.animate(e.extend(f,h&&g?{top:h,left:g}:{}),{duration:c.animateDuration,easing:c.animateEasing,
+step:function(){var i={width:parseInt(a.element.css("width"),10),height:parseInt(a.element.css("height"),10),top:parseInt(a.element.css("top"),10),left:parseInt(a.element.css("left"),10)};d&&d.length&&e(d[0]).css({width:i.width,height:i.height});a._updateCache(i);a._propagate("resize",b)}})}});e.ui.plugin.add("resizable","containment",{start:function(){var b=e(this).data("resizable"),a=b.element,c=b.options.containment;if(a=c instanceof e?c.get(0):/parent/.test(c)?a.parent().get(0):c){b.containerElement=
+e(a);if(/document/.test(c)||c==document){b.containerOffset={left:0,top:0};b.containerPosition={left:0,top:0};b.parentData={element:e(document),left:0,top:0,width:e(document).width(),height:e(document).height()||document.body.parentNode.scrollHeight}}else{var d=e(a),f=[];e(["Top","Right","Left","Bottom"]).each(function(i,j){f[i]=m(d.css("padding"+j))});b.containerOffset=d.offset();b.containerPosition=d.position();b.containerSize={height:d.innerHeight()-f[3],width:d.innerWidth()-f[1]};c=b.containerOffset;
+var g=b.containerSize.height,h=b.containerSize.width;h=e.ui.hasScroll(a,"left")?a.scrollWidth:h;g=e.ui.hasScroll(a)?a.scrollHeight:g;b.parentData={element:a,left:c.left,top:c.top,width:h,height:g}}}},resize:function(b){var a=e(this).data("resizable"),c=a.options,d=a.containerOffset,f=a.position;b=a._aspectRatio||b.shiftKey;var g={top:0,left:0},h=a.containerElement;if(h[0]!=document&&/static/.test(h.css("position")))g=d;if(f.left<(a._helper?d.left:0)){a.size.width+=a._helper?a.position.left-d.left:
+a.position.left-g.left;if(b)a.size.height=a.size.width/c.aspectRatio;a.position.left=c.helper?d.left:0}if(f.top<(a._helper?d.top:0)){a.size.height+=a._helper?a.position.top-d.top:a.position.top;if(b)a.size.width=a.size.height*c.aspectRatio;a.position.top=a._helper?d.top:0}a.offset.left=a.parentData.left+a.position.left;a.offset.top=a.parentData.top+a.position.top;c=Math.abs((a._helper?a.offset.left-g.left:a.offset.left-g.left)+a.sizeDiff.width);d=Math.abs((a._helper?a.offset.top-g.top:a.offset.top-
+d.top)+a.sizeDiff.height);f=a.containerElement.get(0)==a.element.parent().get(0);g=/relative|absolute/.test(a.containerElement.css("position"));if(f&&g)c-=a.parentData.left;if(c+a.size.width>=a.parentData.width){a.size.width=a.parentData.width-c;if(b)a.size.height=a.size.width/a.aspectRatio}if(d+a.size.height>=a.parentData.height){a.size.height=a.parentData.height-d;if(b)a.size.width=a.size.height*a.aspectRatio}},stop:function(){var b=e(this).data("resizable"),a=b.options,c=b.containerOffset,d=b.containerPosition,
+f=b.containerElement,g=e(b.helper),h=g.offset(),i=g.outerWidth()-b.sizeDiff.width;g=g.outerHeight()-b.sizeDiff.height;b._helper&&!a.animate&&/relative/.test(f.css("position"))&&e(this).css({left:h.left-d.left-c.left,width:i,height:g});b._helper&&!a.animate&&/static/.test(f.css("position"))&&e(this).css({left:h.left-d.left-c.left,width:i,height:g})}});e.ui.plugin.add("resizable","ghost",{start:function(){var b=e(this).data("resizable"),a=b.options,c=b.size;b.ghost=b.originalElement.clone();b.ghost.css({opacity:0.25,
+display:"block",position:"relative",height:c.height,width:c.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof a.ghost=="string"?a.ghost:"");b.ghost.appendTo(b.helper)},resize:function(){var b=e(this).data("resizable");b.ghost&&b.ghost.css({position:"relative",height:b.size.height,width:b.size.width})},stop:function(){var b=e(this).data("resizable");b.ghost&&b.helper&&b.helper.get(0).removeChild(b.ghost.get(0))}});e.ui.plugin.add("resizable","grid",{resize:function(){var b=
+e(this).data("resizable"),a=b.options,c=b.size,d=b.originalSize,f=b.originalPosition,g=b.axis;a.grid=typeof a.grid=="number"?[a.grid,a.grid]:a.grid;var h=Math.round((c.width-d.width)/(a.grid[0]||1))*(a.grid[0]||1);a=Math.round((c.height-d.height)/(a.grid[1]||1))*(a.grid[1]||1);if(/^(se|s|e)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a}else if(/^(ne)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}else{if(/^(sw)$/.test(g)){b.size.width=d.width+h;b.size.height=
+d.height+a}else{b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}b.position.left=f.left-h}}});var m=function(b){return parseInt(b,10)||0},k=function(b){return!isNaN(parseInt(b,10))}})(jQuery);
+;/*
+ * jQuery UI Selectable 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Selectables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(e){e.widget("ui.selectable",e.ui.mouse,{options:{appendTo:"body",autoRefresh:true,distance:0,filter:"*",tolerance:"touch"},_create:function(){var c=this;this.element.addClass("ui-selectable");this.dragged=false;var f;this.refresh=function(){f=e(c.options.filter,c.element[0]);f.each(function(){var d=e(this),b=d.offset();e.data(this,"selectable-item",{element:this,$element:d,left:b.left,top:b.top,right:b.left+d.outerWidth(),bottom:b.top+d.outerHeight(),startselected:false,selected:d.hasClass("ui-selected"),
+selecting:d.hasClass("ui-selecting"),unselecting:d.hasClass("ui-unselecting")})})};this.refresh();this.selectees=f.addClass("ui-selectee");this._mouseInit();this.helper=e("<div class='ui-selectable-helper'></div>")},destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item");this.element.removeClass("ui-selectable ui-selectable-disabled").removeData("selectable").unbind(".selectable");this._mouseDestroy();return this},_mouseStart:function(c){var f=this;this.opos=[c.pageX,
+c.pageY];if(!this.options.disabled){var d=this.options;this.selectees=e(d.filter,this.element[0]);this._trigger("start",c);e(d.appendTo).append(this.helper);this.helper.css({left:c.clientX,top:c.clientY,width:0,height:0});d.autoRefresh&&this.refresh();this.selectees.filter(".ui-selected").each(function(){var b=e.data(this,"selectable-item");b.startselected=true;if(!c.metaKey){b.$element.removeClass("ui-selected");b.selected=false;b.$element.addClass("ui-unselecting");b.unselecting=true;f._trigger("unselecting",
+c,{unselecting:b.element})}});e(c.target).parents().andSelf().each(function(){var b=e.data(this,"selectable-item");if(b){var g=!c.metaKey||!b.$element.hasClass("ui-selected");b.$element.removeClass(g?"ui-unselecting":"ui-selected").addClass(g?"ui-selecting":"ui-unselecting");b.unselecting=!g;b.selecting=g;(b.selected=g)?f._trigger("selecting",c,{selecting:b.element}):f._trigger("unselecting",c,{unselecting:b.element});return false}})}},_mouseDrag:function(c){var f=this;this.dragged=true;if(!this.options.disabled){var d=
+this.options,b=this.opos[0],g=this.opos[1],h=c.pageX,i=c.pageY;if(b>h){var j=h;h=b;b=j}if(g>i){j=i;i=g;g=j}this.helper.css({left:b,top:g,width:h-b,height:i-g});this.selectees.each(function(){var a=e.data(this,"selectable-item");if(!(!a||a.element==f.element[0])){var k=false;if(d.tolerance=="touch")k=!(a.left>h||a.right<b||a.top>i||a.bottom<g);else if(d.tolerance=="fit")k=a.left>b&&a.right<h&&a.top>g&&a.bottom<i;if(k){if(a.selected){a.$element.removeClass("ui-selected");a.selected=false}if(a.unselecting){a.$element.removeClass("ui-unselecting");
+a.unselecting=false}if(!a.selecting){a.$element.addClass("ui-selecting");a.selecting=true;f._trigger("selecting",c,{selecting:a.element})}}else{if(a.selecting)if(c.metaKey&&a.startselected){a.$element.removeClass("ui-selecting");a.selecting=false;a.$element.addClass("ui-selected");a.selected=true}else{a.$element.removeClass("ui-selecting");a.selecting=false;if(a.startselected){a.$element.addClass("ui-unselecting");a.unselecting=true}f._trigger("unselecting",c,{unselecting:a.element})}if(a.selected)if(!c.metaKey&&
+!a.startselected){a.$element.removeClass("ui-selected");a.selected=false;a.$element.addClass("ui-unselecting");a.unselecting=true;f._trigger("unselecting",c,{unselecting:a.element})}}}});return false}},_mouseStop:function(c){var f=this;this.dragged=false;e(".ui-unselecting",this.element[0]).each(function(){var d=e.data(this,"selectable-item");d.$element.removeClass("ui-unselecting");d.unselecting=false;d.startselected=false;f._trigger("unselected",c,{unselected:d.element})});e(".ui-selecting",this.element[0]).each(function(){var d=
+e.data(this,"selectable-item");d.$element.removeClass("ui-selecting").addClass("ui-selected");d.selecting=false;d.selected=true;d.startselected=true;f._trigger("selected",c,{selected:d.element})});this._trigger("stop",c);this.helper.remove();return false}});e.extend(e.ui.selectable,{version:"1.8.16"})})(jQuery);
+;/*
+ * jQuery UI Sortable 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Sortables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(d){d.widget("ui.sortable",d.ui.mouse,{widgetEventPrefix:"sort",options:{appendTo:"parent",axis:false,connectWith:false,containment:false,cursor:"auto",cursorAt:false,dropOnEmpty:true,forcePlaceholderSize:false,forceHelperSize:false,grid:false,handle:false,helper:"original",items:"> *",opacity:false,placeholder:false,revert:false,scroll:true,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1E3},_create:function(){var a=this.options;this.containerCache={};this.element.addClass("ui-sortable");
+this.refresh();this.floating=this.items.length?a.axis==="x"||/left|right/.test(this.items[0].item.css("float"))||/inline|table-cell/.test(this.items[0].item.css("display")):false;this.offset=this.element.offset();this._mouseInit()},destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").removeData("sortable").unbind(".sortable");this._mouseDestroy();for(var a=this.items.length-1;a>=0;a--)this.items[a].item.removeData("sortable-item");return this},_setOption:function(a,b){if(a===
+"disabled"){this.options[a]=b;this.widget()[b?"addClass":"removeClass"]("ui-sortable-disabled")}else d.Widget.prototype._setOption.apply(this,arguments)},_mouseCapture:function(a,b){if(this.reverting)return false;if(this.options.disabled||this.options.type=="static")return false;this._refreshItems(a);var c=null,e=this;d(a.target).parents().each(function(){if(d.data(this,"sortable-item")==e){c=d(this);return false}});if(d.data(a.target,"sortable-item")==e)c=d(a.target);if(!c)return false;if(this.options.handle&&
+!b){var f=false;d(this.options.handle,c).find("*").andSelf().each(function(){if(this==a.target)f=true});if(!f)return false}this.currentItem=c;this._removeCurrentsFromItems();return true},_mouseStart:function(a,b,c){b=this.options;var e=this;this.currentContainer=this;this.refreshPositions();this.helper=this._createHelper(a);this._cacheHelperProportions();this._cacheMargins();this.scrollParent=this.helper.scrollParent();this.offset=this.currentItem.offset();this.offset={top:this.offset.top-this.margins.top,
+left:this.offset.left-this.margins.left};this.helper.css("position","absolute");this.cssPosition=this.helper.css("position");d.extend(this.offset,{click:{left:a.pageX-this.offset.left,top:a.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this._generatePosition(a);this.originalPageX=a.pageX;this.originalPageY=a.pageY;b.cursorAt&&this._adjustOffsetFromHelper(b.cursorAt);this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]};
+this.helper[0]!=this.currentItem[0]&&this.currentItem.hide();this._createPlaceholder();b.containment&&this._setContainment();if(b.cursor){if(d("body").css("cursor"))this._storedCursor=d("body").css("cursor");d("body").css("cursor",b.cursor)}if(b.opacity){if(this.helper.css("opacity"))this._storedOpacity=this.helper.css("opacity");this.helper.css("opacity",b.opacity)}if(b.zIndex){if(this.helper.css("zIndex"))this._storedZIndex=this.helper.css("zIndex");this.helper.css("zIndex",b.zIndex)}if(this.scrollParent[0]!=
+document&&this.scrollParent[0].tagName!="HTML")this.overflowOffset=this.scrollParent.offset();this._trigger("start",a,this._uiHash());this._preserveHelperProportions||this._cacheHelperProportions();if(!c)for(c=this.containers.length-1;c>=0;c--)this.containers[c]._trigger("activate",a,e._uiHash(this));if(d.ui.ddmanager)d.ui.ddmanager.current=this;d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a);this.dragging=true;this.helper.addClass("ui-sortable-helper");this._mouseDrag(a);
+return true},_mouseDrag:function(a){this.position=this._generatePosition(a);this.positionAbs=this._convertPositionTo("absolute");if(!this.lastPositionAbs)this.lastPositionAbs=this.positionAbs;if(this.options.scroll){var b=this.options,c=false;if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"){if(this.overflowOffset.top+this.scrollParent[0].offsetHeight-a.pageY<b.scrollSensitivity)this.scrollParent[0].scrollTop=c=this.scrollParent[0].scrollTop+b.scrollSpeed;else if(a.pageY-this.overflowOffset.top<
+b.scrollSensitivity)this.scrollParent[0].scrollTop=c=this.scrollParent[0].scrollTop-b.scrollSpeed;if(this.overflowOffset.left+this.scrollParent[0].offsetWidth-a.pageX<b.scrollSensitivity)this.scrollParent[0].scrollLeft=c=this.scrollParent[0].scrollLeft+b.scrollSpeed;else if(a.pageX-this.overflowOffset.left<b.scrollSensitivity)this.scrollParent[0].scrollLeft=c=this.scrollParent[0].scrollLeft-b.scrollSpeed}else{if(a.pageY-d(document).scrollTop()<b.scrollSensitivity)c=d(document).scrollTop(d(document).scrollTop()-
+b.scrollSpeed);else if(d(window).height()-(a.pageY-d(document).scrollTop())<b.scrollSensitivity)c=d(document).scrollTop(d(document).scrollTop()+b.scrollSpeed);if(a.pageX-d(document).scrollLeft()<b.scrollSensitivity)c=d(document).scrollLeft(d(document).scrollLeft()-b.scrollSpeed);else if(d(window).width()-(a.pageX-d(document).scrollLeft())<b.scrollSensitivity)c=d(document).scrollLeft(d(document).scrollLeft()+b.scrollSpeed)}c!==false&&d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,
+a)}this.positionAbs=this._convertPositionTo("absolute");if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";for(b=this.items.length-1;b>=0;b--){c=this.items[b];var e=c.item[0],f=this._intersectsWithPointer(c);if(f)if(e!=this.currentItem[0]&&this.placeholder[f==1?"next":"prev"]()[0]!=e&&!d.ui.contains(this.placeholder[0],e)&&(this.options.type=="semi-dynamic"?!d.ui.contains(this.element[0],
+e):true)){this.direction=f==1?"down":"up";if(this.options.tolerance=="pointer"||this._intersectsWithSides(c))this._rearrange(a,c);else break;this._trigger("change",a,this._uiHash());break}}this._contactContainers(a);d.ui.ddmanager&&d.ui.ddmanager.drag(this,a);this._trigger("sort",a,this._uiHash());this.lastPositionAbs=this.positionAbs;return false},_mouseStop:function(a,b){if(a){d.ui.ddmanager&&!this.options.dropBehaviour&&d.ui.ddmanager.drop(this,a);if(this.options.revert){var c=this;b=c.placeholder.offset();
+c.reverting=true;d(this.helper).animate({left:b.left-this.offset.parent.left-c.margins.left+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft),top:b.top-this.offset.parent.top-c.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){c._clear(a)})}else this._clear(a,b);return false}},cancel:function(){var a=this;if(this.dragging){this._mouseUp({target:null});this.options.helper=="original"?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):
+this.currentItem.show();for(var b=this.containers.length-1;b>=0;b--){this.containers[b]._trigger("deactivate",null,a._uiHash(this));if(this.containers[b].containerCache.over){this.containers[b]._trigger("out",null,a._uiHash(this));this.containers[b].containerCache.over=0}}}if(this.placeholder){this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.options.helper!="original"&&this.helper&&this.helper[0].parentNode&&this.helper.remove();d.extend(this,{helper:null,
+dragging:false,reverting:false,_noFinalSort:null});this.domPosition.prev?d(this.domPosition.prev).after(this.currentItem):d(this.domPosition.parent).prepend(this.currentItem)}return this},serialize:function(a){var b=this._getItemsAsjQuery(a&&a.connected),c=[];a=a||{};d(b).each(function(){var e=(d(a.item||this).attr(a.attribute||"id")||"").match(a.expression||/(.+)[-=_](.+)/);if(e)c.push((a.key||e[1]+"[]")+"="+(a.key&&a.expression?e[1]:e[2]))});!c.length&&a.key&&c.push(a.key+"=");return c.join("&")},
+toArray:function(a){var b=this._getItemsAsjQuery(a&&a.connected),c=[];a=a||{};b.each(function(){c.push(d(a.item||this).attr(a.attribute||"id")||"")});return c},_intersectsWith:function(a){var b=this.positionAbs.left,c=b+this.helperProportions.width,e=this.positionAbs.top,f=e+this.helperProportions.height,g=a.left,h=g+a.width,i=a.top,k=i+a.height,j=this.offset.click.top,l=this.offset.click.left;j=e+j>i&&e+j<k&&b+l>g&&b+l<h;return this.options.tolerance=="pointer"||this.options.forcePointerForContainers||
+this.options.tolerance!="pointer"&&this.helperProportions[this.floating?"width":"height"]>a[this.floating?"width":"height"]?j:g<b+this.helperProportions.width/2&&c-this.helperProportions.width/2<h&&i<e+this.helperProportions.height/2&&f-this.helperProportions.height/2<k},_intersectsWithPointer:function(a){var b=d.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,a.top,a.height);a=d.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,a.left,a.width);b=b&&a;a=this._getDragVerticalDirection();
+var c=this._getDragHorizontalDirection();if(!b)return false;return this.floating?c&&c=="right"||a=="down"?2:1:a&&(a=="down"?2:1)},_intersectsWithSides:function(a){var b=d.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,a.top+a.height/2,a.height);a=d.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,a.left+a.width/2,a.width);var c=this._getDragVerticalDirection(),e=this._getDragHorizontalDirection();return this.floating&&e?e=="right"&&a||e=="left"&&!a:c&&(c=="down"&&b||c=="up"&&!b)},
+_getDragVerticalDirection:function(){var a=this.positionAbs.top-this.lastPositionAbs.top;return a!=0&&(a>0?"down":"up")},_getDragHorizontalDirection:function(){var a=this.positionAbs.left-this.lastPositionAbs.left;return a!=0&&(a>0?"right":"left")},refresh:function(a){this._refreshItems(a);this.refreshPositions();return this},_connectWith:function(){var a=this.options;return a.connectWith.constructor==String?[a.connectWith]:a.connectWith},_getItemsAsjQuery:function(a){var b=[],c=[],e=this._connectWith();
+if(e&&a)for(a=e.length-1;a>=0;a--)for(var f=d(e[a]),g=f.length-1;g>=0;g--){var h=d.data(f[g],"sortable");if(h&&h!=this&&!h.options.disabled)c.push([d.isFunction(h.options.items)?h.options.items.call(h.element):d(h.options.items,h.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),h])}c.push([d.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):d(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),
+this]);for(a=c.length-1;a>=0;a--)c[a][0].each(function(){b.push(this)});return d(b)},_removeCurrentsFromItems:function(){for(var a=this.currentItem.find(":data(sortable-item)"),b=0;b<this.items.length;b++)for(var c=0;c<a.length;c++)a[c]==this.items[b].item[0]&&this.items.splice(b,1)},_refreshItems:function(a){this.items=[];this.containers=[this];var b=this.items,c=[[d.isFunction(this.options.items)?this.options.items.call(this.element[0],a,{item:this.currentItem}):d(this.options.items,this.element),
+this]],e=this._connectWith();if(e)for(var f=e.length-1;f>=0;f--)for(var g=d(e[f]),h=g.length-1;h>=0;h--){var i=d.data(g[h],"sortable");if(i&&i!=this&&!i.options.disabled){c.push([d.isFunction(i.options.items)?i.options.items.call(i.element[0],a,{item:this.currentItem}):d(i.options.items,i.element),i]);this.containers.push(i)}}for(f=c.length-1;f>=0;f--){a=c[f][1];e=c[f][0];h=0;for(g=e.length;h<g;h++){i=d(e[h]);i.data("sortable-item",a);b.push({item:i,instance:a,width:0,height:0,left:0,top:0})}}},refreshPositions:function(a){if(this.offsetParent&&
+this.helper)this.offset.parent=this._getParentOffset();for(var b=this.items.length-1;b>=0;b--){var c=this.items[b];if(!(c.instance!=this.currentContainer&&this.currentContainer&&c.item[0]!=this.currentItem[0])){var e=this.options.toleranceElement?d(this.options.toleranceElement,c.item):c.item;if(!a){c.width=e.outerWidth();c.height=e.outerHeight()}e=e.offset();c.left=e.left;c.top=e.top}}if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(b=
+this.containers.length-1;b>=0;b--){e=this.containers[b].element.offset();this.containers[b].containerCache.left=e.left;this.containers[b].containerCache.top=e.top;this.containers[b].containerCache.width=this.containers[b].element.outerWidth();this.containers[b].containerCache.height=this.containers[b].element.outerHeight()}return this},_createPlaceholder:function(a){var b=a||this,c=b.options;if(!c.placeholder||c.placeholder.constructor==String){var e=c.placeholder;c.placeholder={element:function(){var f=
+d(document.createElement(b.currentItem[0].nodeName)).addClass(e||b.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper")[0];if(!e)f.style.visibility="hidden";return f},update:function(f,g){if(!(e&&!c.forcePlaceholderSize)){g.height()||g.height(b.currentItem.innerHeight()-parseInt(b.currentItem.css("paddingTop")||0,10)-parseInt(b.currentItem.css("paddingBottom")||0,10));g.width()||g.width(b.currentItem.innerWidth()-parseInt(b.currentItem.css("paddingLeft")||0,10)-parseInt(b.currentItem.css("paddingRight")||
+0,10))}}}}b.placeholder=d(c.placeholder.element.call(b.element,b.currentItem));b.currentItem.after(b.placeholder);c.placeholder.update(b,b.placeholder)},_contactContainers:function(a){for(var b=null,c=null,e=this.containers.length-1;e>=0;e--)if(!d.ui.contains(this.currentItem[0],this.containers[e].element[0]))if(this._intersectsWith(this.containers[e].containerCache)){if(!(b&&d.ui.contains(this.containers[e].element[0],b.element[0]))){b=this.containers[e];c=e}}else if(this.containers[e].containerCache.over){this.containers[e]._trigger("out",
+a,this._uiHash(this));this.containers[e].containerCache.over=0}if(b)if(this.containers.length===1){this.containers[c]._trigger("over",a,this._uiHash(this));this.containers[c].containerCache.over=1}else if(this.currentContainer!=this.containers[c]){b=1E4;e=null;for(var f=this.positionAbs[this.containers[c].floating?"left":"top"],g=this.items.length-1;g>=0;g--)if(d.ui.contains(this.containers[c].element[0],this.items[g].item[0])){var h=this.items[g][this.containers[c].floating?"left":"top"];if(Math.abs(h-
+f)<b){b=Math.abs(h-f);e=this.items[g]}}if(e||this.options.dropOnEmpty){this.currentContainer=this.containers[c];e?this._rearrange(a,e,null,true):this._rearrange(a,null,this.containers[c].element,true);this._trigger("change",a,this._uiHash());this.containers[c]._trigger("change",a,this._uiHash(this));this.options.placeholder.update(this.currentContainer,this.placeholder);this.containers[c]._trigger("over",a,this._uiHash(this));this.containers[c].containerCache.over=1}}},_createHelper:function(a){var b=
+this.options;a=d.isFunction(b.helper)?d(b.helper.apply(this.element[0],[a,this.currentItem])):b.helper=="clone"?this.currentItem.clone():this.currentItem;a.parents("body").length||d(b.appendTo!="parent"?b.appendTo:this.currentItem[0].parentNode)[0].appendChild(a[0]);if(a[0]==this.currentItem[0])this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")};if(a[0].style.width==
+""||b.forceHelperSize)a.width(this.currentItem.width());if(a[0].style.height==""||b.forceHelperSize)a.height(this.currentItem.height());return a},_adjustOffsetFromHelper:function(a){if(typeof a=="string")a=a.split(" ");if(d.isArray(a))a={left:+a[0],top:+a[1]||0};if("left"in a)this.offset.click.left=a.left+this.margins.left;if("right"in a)this.offset.click.left=this.helperProportions.width-a.right+this.margins.left;if("top"in a)this.offset.click.top=a.top+this.margins.top;if("bottom"in a)this.offset.click.top=
+this.helperProportions.height-a.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var a=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0])){a.left+=this.scrollParent.scrollLeft();a.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&d.browser.msie)a=
+{top:0,left:0};return{top:a.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:a.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var a=this.currentItem.position();return{top:a.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),
+10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var a=this.options;if(a.containment=="parent")a.containment=this.helper[0].parentNode;if(a.containment=="document"||a.containment=="window")this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,d(a.containment=="document"?
+document:window).width()-this.helperProportions.width-this.margins.left,(d(a.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(a.containment)){var b=d(a.containment)[0];a=d(a.containment).offset();var c=d(b).css("overflow")!="hidden";this.containment=[a.left+(parseInt(d(b).css("borderLeftWidth"),10)||0)+(parseInt(d(b).css("paddingLeft"),10)||0)-this.margins.left,a.top+(parseInt(d(b).css("borderTopWidth"),
+10)||0)+(parseInt(d(b).css("paddingTop"),10)||0)-this.margins.top,a.left+(c?Math.max(b.scrollWidth,b.offsetWidth):b.offsetWidth)-(parseInt(d(b).css("borderLeftWidth"),10)||0)-(parseInt(d(b).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,a.top+(c?Math.max(b.scrollHeight,b.offsetHeight):b.offsetHeight)-(parseInt(d(b).css("borderTopWidth"),10)||0)-(parseInt(d(b).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}},_convertPositionTo:function(a,b){if(!b)b=
+this.position;a=a=="absolute"?1:-1;var c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,e=/(html|body)/i.test(c[0].tagName);return{top:b.top+this.offset.relative.top*a+this.offset.parent.top*a-(d.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():e?0:c.scrollTop())*a),left:b.left+this.offset.relative.left*a+this.offset.parent.left*a-(d.browser.safari&&
+this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():e?0:c.scrollLeft())*a)}},_generatePosition:function(a){var b=this.options,c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,e=/(html|body)/i.test(c[0].tagName);if(this.cssPosition=="relative"&&!(this.scrollParent[0]!=document&&this.scrollParent[0]!=this.offsetParent[0]))this.offset.relative=this._getRelativeOffset();
+var f=a.pageX,g=a.pageY;if(this.originalPosition){if(this.containment){if(a.pageX-this.offset.click.left<this.containment[0])f=this.containment[0]+this.offset.click.left;if(a.pageY-this.offset.click.top<this.containment[1])g=this.containment[1]+this.offset.click.top;if(a.pageX-this.offset.click.left>this.containment[2])f=this.containment[2]+this.offset.click.left;if(a.pageY-this.offset.click.top>this.containment[3])g=this.containment[3]+this.offset.click.top}if(b.grid){g=this.originalPageY+Math.round((g-
+this.originalPageY)/b.grid[1])*b.grid[1];g=this.containment?!(g-this.offset.click.top<this.containment[1]||g-this.offset.click.top>this.containment[3])?g:!(g-this.offset.click.top<this.containment[1])?g-b.grid[1]:g+b.grid[1]:g;f=this.originalPageX+Math.round((f-this.originalPageX)/b.grid[0])*b.grid[0];f=this.containment?!(f-this.offset.click.left<this.containment[0]||f-this.offset.click.left>this.containment[2])?f:!(f-this.offset.click.left<this.containment[0])?f-b.grid[0]:f+b.grid[0]:f}}return{top:g-
+this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(d.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():e?0:c.scrollTop()),left:f-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(d.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():e?0:c.scrollLeft())}},_rearrange:function(a,b,c,e){c?c[0].appendChild(this.placeholder[0]):b.item[0].parentNode.insertBefore(this.placeholder[0],
+this.direction=="down"?b.item[0]:b.item[0].nextSibling);this.counter=this.counter?++this.counter:1;var f=this,g=this.counter;window.setTimeout(function(){g==f.counter&&f.refreshPositions(!e)},0)},_clear:function(a,b){this.reverting=false;var c=[];!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem);this._noFinalSort=null;if(this.helper[0]==this.currentItem[0]){for(var e in this._storedCSS)if(this._storedCSS[e]=="auto"||this._storedCSS[e]=="static")this._storedCSS[e]=
+"";this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();this.fromOutside&&!b&&c.push(function(f){this._trigger("receive",f,this._uiHash(this.fromOutside))});if((this.fromOutside||this.domPosition.prev!=this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!=this.currentItem.parent()[0])&&!b)c.push(function(f){this._trigger("update",f,this._uiHash())});if(!d.ui.contains(this.element[0],this.currentItem[0])){b||c.push(function(f){this._trigger("remove",
+f,this._uiHash())});for(e=this.containers.length-1;e>=0;e--)if(d.ui.contains(this.containers[e].element[0],this.currentItem[0])&&!b){c.push(function(f){return function(g){f._trigger("receive",g,this._uiHash(this))}}.call(this,this.containers[e]));c.push(function(f){return function(g){f._trigger("update",g,this._uiHash(this))}}.call(this,this.containers[e]))}}for(e=this.containers.length-1;e>=0;e--){b||c.push(function(f){return function(g){f._trigger("deactivate",g,this._uiHash(this))}}.call(this,
+this.containers[e]));if(this.containers[e].containerCache.over){c.push(function(f){return function(g){f._trigger("out",g,this._uiHash(this))}}.call(this,this.containers[e]));this.containers[e].containerCache.over=0}}this._storedCursor&&d("body").css("cursor",this._storedCursor);this._storedOpacity&&this.helper.css("opacity",this._storedOpacity);if(this._storedZIndex)this.helper.css("zIndex",this._storedZIndex=="auto"?"":this._storedZIndex);this.dragging=false;if(this.cancelHelperRemoval){if(!b){this._trigger("beforeStop",
+a,this._uiHash());for(e=0;e<c.length;e++)c[e].call(this,a);this._trigger("stop",a,this._uiHash())}return false}b||this._trigger("beforeStop",a,this._uiHash());this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.helper[0]!=this.currentItem[0]&&this.helper.remove();this.helper=null;if(!b){for(e=0;e<c.length;e++)c[e].call(this,a);this._trigger("stop",a,this._uiHash())}this.fromOutside=false;return true},_trigger:function(){d.Widget.prototype._trigger.apply(this,arguments)===false&&this.cancel()},
+_uiHash:function(a){var b=a||this;return{helper:b.helper,placeholder:b.placeholder||d([]),position:b.position,originalPosition:b.originalPosition,offset:b.positionAbs,item:b.currentItem,sender:a?a.element:null}}});d.extend(d.ui.sortable,{version:"1.8.16"})})(jQuery);
+;/*
+ * jQuery UI Slider 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Slider
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(d){d.widget("ui.slider",d.ui.mouse,{widgetEventPrefix:"slide",options:{animate:false,distance:0,max:100,min:0,orientation:"horizontal",range:false,step:1,value:0,values:null},_create:function(){var a=this,b=this.options,c=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),f=b.values&&b.values.length||1,e=[];this._mouseSliding=this._keySliding=false;this._animateOff=true;this._handleIndex=null;this._detectOrientation();this._mouseInit();this.element.addClass("ui-slider ui-slider-"+
+this.orientation+" ui-widget ui-widget-content ui-corner-all"+(b.disabled?" ui-slider-disabled ui-disabled":""));this.range=d([]);if(b.range){if(b.range===true){if(!b.values)b.values=[this._valueMin(),this._valueMin()];if(b.values.length&&b.values.length!==2)b.values=[b.values[0],b.values[0]]}this.range=d("<div></div>").appendTo(this.element).addClass("ui-slider-range ui-widget-header"+(b.range==="min"||b.range==="max"?" ui-slider-range-"+b.range:""))}for(var j=c.length;j<f;j+=1)e.push("<a class='ui-slider-handle ui-state-default ui-corner-all' href='#'></a>");
+this.handles=c.add(d(e.join("")).appendTo(a.element));this.handle=this.handles.eq(0);this.handles.add(this.range).filter("a").click(function(g){g.preventDefault()}).hover(function(){b.disabled||d(this).addClass("ui-state-hover")},function(){d(this).removeClass("ui-state-hover")}).focus(function(){if(b.disabled)d(this).blur();else{d(".ui-slider .ui-state-focus").removeClass("ui-state-focus");d(this).addClass("ui-state-focus")}}).blur(function(){d(this).removeClass("ui-state-focus")});this.handles.each(function(g){d(this).data("index.ui-slider-handle",
+g)});this.handles.keydown(function(g){var k=true,l=d(this).data("index.ui-slider-handle"),i,h,m;if(!a.options.disabled){switch(g.keyCode){case d.ui.keyCode.HOME:case d.ui.keyCode.END:case d.ui.keyCode.PAGE_UP:case d.ui.keyCode.PAGE_DOWN:case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:k=false;if(!a._keySliding){a._keySliding=true;d(this).addClass("ui-state-active");i=a._start(g,l);if(i===false)return}break}m=a.options.step;i=a.options.values&&a.options.values.length?
+(h=a.values(l)):(h=a.value());switch(g.keyCode){case d.ui.keyCode.HOME:h=a._valueMin();break;case d.ui.keyCode.END:h=a._valueMax();break;case d.ui.keyCode.PAGE_UP:h=a._trimAlignValue(i+(a._valueMax()-a._valueMin())/5);break;case d.ui.keyCode.PAGE_DOWN:h=a._trimAlignValue(i-(a._valueMax()-a._valueMin())/5);break;case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:if(i===a._valueMax())return;h=a._trimAlignValue(i+m);break;case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:if(i===a._valueMin())return;h=a._trimAlignValue(i-
+m);break}a._slide(g,l,h);return k}}).keyup(function(g){var k=d(this).data("index.ui-slider-handle");if(a._keySliding){a._keySliding=false;a._stop(g,k);a._change(g,k);d(this).removeClass("ui-state-active")}});this._refreshValue();this._animateOff=false},destroy:function(){this.handles.remove();this.range.remove();this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-slider-disabled ui-widget ui-widget-content ui-corner-all").removeData("slider").unbind(".slider");this._mouseDestroy();
+return this},_mouseCapture:function(a){var b=this.options,c,f,e,j,g;if(b.disabled)return false;this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()};this.elementOffset=this.element.offset();c=this._normValueFromMouse({x:a.pageX,y:a.pageY});f=this._valueMax()-this._valueMin()+1;j=this;this.handles.each(function(k){var l=Math.abs(c-j.values(k));if(f>l){f=l;e=d(this);g=k}});if(b.range===true&&this.values(1)===b.min){g+=1;e=d(this.handles[g])}if(this._start(a,g)===false)return false;
+this._mouseSliding=true;j._handleIndex=g;e.addClass("ui-state-active").focus();b=e.offset();this._clickOffset=!d(a.target).parents().andSelf().is(".ui-slider-handle")?{left:0,top:0}:{left:a.pageX-b.left-e.width()/2,top:a.pageY-b.top-e.height()/2-(parseInt(e.css("borderTopWidth"),10)||0)-(parseInt(e.css("borderBottomWidth"),10)||0)+(parseInt(e.css("marginTop"),10)||0)};this.handles.hasClass("ui-state-hover")||this._slide(a,g,c);return this._animateOff=true},_mouseStart:function(){return true},_mouseDrag:function(a){var b=
+this._normValueFromMouse({x:a.pageX,y:a.pageY});this._slide(a,this._handleIndex,b);return false},_mouseStop:function(a){this.handles.removeClass("ui-state-active");this._mouseSliding=false;this._stop(a,this._handleIndex);this._change(a,this._handleIndex);this._clickOffset=this._handleIndex=null;return this._animateOff=false},_detectOrientation:function(){this.orientation=this.options.orientation==="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(a){var b;if(this.orientation==="horizontal"){b=
+this.elementSize.width;a=a.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)}else{b=this.elementSize.height;a=a.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)}b=a/b;if(b>1)b=1;if(b<0)b=0;if(this.orientation==="vertical")b=1-b;a=this._valueMax()-this._valueMin();return this._trimAlignValue(this._valueMin()+b*a)},_start:function(a,b){var c={handle:this.handles[b],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(b);
+c.values=this.values()}return this._trigger("start",a,c)},_slide:function(a,b,c){var f;if(this.options.values&&this.options.values.length){f=this.values(b?0:1);if(this.options.values.length===2&&this.options.range===true&&(b===0&&c>f||b===1&&c<f))c=f;if(c!==this.values(b)){f=this.values();f[b]=c;a=this._trigger("slide",a,{handle:this.handles[b],value:c,values:f});this.values(b?0:1);a!==false&&this.values(b,c,true)}}else if(c!==this.value()){a=this._trigger("slide",a,{handle:this.handles[b],value:c});
+a!==false&&this.value(c)}},_stop:function(a,b){var c={handle:this.handles[b],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(b);c.values=this.values()}this._trigger("stop",a,c)},_change:function(a,b){if(!this._keySliding&&!this._mouseSliding){var c={handle:this.handles[b],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(b);c.values=this.values()}this._trigger("change",a,c)}},value:function(a){if(arguments.length){this.options.value=
+this._trimAlignValue(a);this._refreshValue();this._change(null,0)}else return this._value()},values:function(a,b){var c,f,e;if(arguments.length>1){this.options.values[a]=this._trimAlignValue(b);this._refreshValue();this._change(null,a)}else if(arguments.length)if(d.isArray(arguments[0])){c=this.options.values;f=arguments[0];for(e=0;e<c.length;e+=1){c[e]=this._trimAlignValue(f[e]);this._change(null,e)}this._refreshValue()}else return this.options.values&&this.options.values.length?this._values(a):
+this.value();else return this._values()},_setOption:function(a,b){var c,f=0;if(d.isArray(this.options.values))f=this.options.values.length;d.Widget.prototype._setOption.apply(this,arguments);switch(a){case "disabled":if(b){this.handles.filter(".ui-state-focus").blur();this.handles.removeClass("ui-state-hover");this.handles.propAttr("disabled",true);this.element.addClass("ui-disabled")}else{this.handles.propAttr("disabled",false);this.element.removeClass("ui-disabled")}break;case "orientation":this._detectOrientation();
+this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation);this._refreshValue();break;case "value":this._animateOff=true;this._refreshValue();this._change(null,0);this._animateOff=false;break;case "values":this._animateOff=true;this._refreshValue();for(c=0;c<f;c+=1)this._change(null,c);this._animateOff=false;break}},_value:function(){var a=this.options.value;return a=this._trimAlignValue(a)},_values:function(a){var b,c;if(arguments.length){b=this.options.values[a];
+return b=this._trimAlignValue(b)}else{b=this.options.values.slice();for(c=0;c<b.length;c+=1)b[c]=this._trimAlignValue(b[c]);return b}},_trimAlignValue:function(a){if(a<=this._valueMin())return this._valueMin();if(a>=this._valueMax())return this._valueMax();var b=this.options.step>0?this.options.step:1,c=(a-this._valueMin())%b;a=a-c;if(Math.abs(c)*2>=b)a+=c>0?b:-b;return parseFloat(a.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max},_refreshValue:function(){var a=
+this.options.range,b=this.options,c=this,f=!this._animateOff?b.animate:false,e,j={},g,k,l,i;if(this.options.values&&this.options.values.length)this.handles.each(function(h){e=(c.values(h)-c._valueMin())/(c._valueMax()-c._valueMin())*100;j[c.orientation==="horizontal"?"left":"bottom"]=e+"%";d(this).stop(1,1)[f?"animate":"css"](j,b.animate);if(c.options.range===true)if(c.orientation==="horizontal"){if(h===0)c.range.stop(1,1)[f?"animate":"css"]({left:e+"%"},b.animate);if(h===1)c.range[f?"animate":"css"]({width:e-
+g+"%"},{queue:false,duration:b.animate})}else{if(h===0)c.range.stop(1,1)[f?"animate":"css"]({bottom:e+"%"},b.animate);if(h===1)c.range[f?"animate":"css"]({height:e-g+"%"},{queue:false,duration:b.animate})}g=e});else{k=this.value();l=this._valueMin();i=this._valueMax();e=i!==l?(k-l)/(i-l)*100:0;j[c.orientation==="horizontal"?"left":"bottom"]=e+"%";this.handle.stop(1,1)[f?"animate":"css"](j,b.animate);if(a==="min"&&this.orientation==="horizontal")this.range.stop(1,1)[f?"animate":"css"]({width:e+"%"},
+b.animate);if(a==="max"&&this.orientation==="horizontal")this.range[f?"animate":"css"]({width:100-e+"%"},{queue:false,duration:b.animate});if(a==="min"&&this.orientation==="vertical")this.range.stop(1,1)[f?"animate":"css"]({height:e+"%"},b.animate);if(a==="max"&&this.orientation==="vertical")this.range[f?"animate":"css"]({height:100-e+"%"},{queue:false,duration:b.animate})}}});d.extend(d.ui.slider,{version:"1.8.16"})})(jQuery);
+;/*
+ * jQuery UI Datepicker 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Datepicker
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ */
+(function(d,C){function M(){this.debug=false;this._curInst=null;this._keyEvent=false;this._disabledInputs=[];this._inDialog=this._datepickerShowing=false;this._mainDivId="ui-datepicker-div";this._inlineClass="ui-datepicker-inline";this._appendClass="ui-datepicker-append";this._triggerClass="ui-datepicker-trigger";this._dialogClass="ui-datepicker-dialog";this._disableClass="ui-datepicker-disabled";this._unselectableClass="ui-datepicker-unselectable";this._currentClass="ui-datepicker-current-day";this._dayOverClass=
+"ui-datepicker-days-cell-over";this.regional=[];this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su",
+"Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:false,showMonthAfterYear:false,yearSuffix:""};this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:false,hideIfNoPrevNext:false,navigationAsDateFormat:false,gotoCurrent:false,changeMonth:false,changeYear:false,yearRange:"c-10:c+10",showOtherMonths:false,selectOtherMonths:false,showWeek:false,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",
+minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:true,showButtonPanel:false,autoSize:false,disabled:false};d.extend(this._defaults,this.regional[""]);this.dpDiv=N(d('<div id="'+this._mainDivId+'" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))}function N(a){return a.bind("mouseout",
+function(b){b=d(b.target).closest("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a");b.length&&b.removeClass("ui-state-hover ui-datepicker-prev-hover ui-datepicker-next-hover")}).bind("mouseover",function(b){b=d(b.target).closest("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a");if(!(d.datepicker._isDisabledDatepicker(J.inline?a.parent()[0]:J.input[0])||!b.length)){b.parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");
+b.addClass("ui-state-hover");b.hasClass("ui-datepicker-prev")&&b.addClass("ui-datepicker-prev-hover");b.hasClass("ui-datepicker-next")&&b.addClass("ui-datepicker-next-hover")}})}function H(a,b){d.extend(a,b);for(var c in b)if(b[c]==null||b[c]==C)a[c]=b[c];return a}d.extend(d.ui,{datepicker:{version:"1.8.16"}});var B=(new Date).getTime(),J;d.extend(M.prototype,{markerClassName:"hasDatepicker",maxRows:4,log:function(){this.debug&&console.log.apply("",arguments)},_widgetDatepicker:function(){return this.dpDiv},
+setDefaults:function(a){H(this._defaults,a||{});return this},_attachDatepicker:function(a,b){var c=null;for(var e in this._defaults){var f=a.getAttribute("date:"+e);if(f){c=c||{};try{c[e]=eval(f)}catch(h){c[e]=f}}}e=a.nodeName.toLowerCase();f=e=="div"||e=="span";if(!a.id){this.uuid+=1;a.id="dp"+this.uuid}var i=this._newInst(d(a),f);i.settings=d.extend({},b||{},c||{});if(e=="input")this._connectDatepicker(a,i);else f&&this._inlineDatepicker(a,i)},_newInst:function(a,b){return{id:a[0].id.replace(/([^A-Za-z0-9_-])/g,
+"\\\\$1"),input:a,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:b,dpDiv:!b?this.dpDiv:N(d('<div class="'+this._inlineClass+' ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))}},_connectDatepicker:function(a,b){var c=d(a);b.append=d([]);b.trigger=d([]);if(!c.hasClass(this.markerClassName)){this._attachments(c,b);c.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp).bind("setData.datepicker",
+function(e,f,h){b.settings[f]=h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});this._autoSize(b);d.data(a,"datepicker",b);b.settings.disabled&&this._disableDatepicker(a)}},_attachments:function(a,b){var c=this._get(b,"appendText"),e=this._get(b,"isRTL");b.append&&b.append.remove();if(c){b.append=d('<span class="'+this._appendClass+'">'+c+"</span>");a[e?"before":"after"](b.append)}a.unbind("focus",this._showDatepicker);b.trigger&&b.trigger.remove();c=this._get(b,"showOn");if(c==
+"focus"||c=="both")a.focus(this._showDatepicker);if(c=="button"||c=="both"){c=this._get(b,"buttonText");var f=this._get(b,"buttonImage");b.trigger=d(this._get(b,"buttonImageOnly")?d("<img/>").addClass(this._triggerClass).attr({src:f,alt:c,title:c}):d('<button type="button"></button>').addClass(this._triggerClass).html(f==""?c:d("<img/>").attr({src:f,alt:c,title:c})));a[e?"before":"after"](b.trigger);b.trigger.click(function(){d.datepicker._datepickerShowing&&d.datepicker._lastInput==a[0]?d.datepicker._hideDatepicker():
+d.datepicker._showDatepicker(a[0]);return false})}},_autoSize:function(a){if(this._get(a,"autoSize")&&!a.inline){var b=new Date(2009,11,20),c=this._get(a,"dateFormat");if(c.match(/[DM]/)){var e=function(f){for(var h=0,i=0,g=0;g<f.length;g++)if(f[g].length>h){h=f[g].length;i=g}return i};b.setMonth(e(this._get(a,c.match(/MM/)?"monthNames":"monthNamesShort")));b.setDate(e(this._get(a,c.match(/DD/)?"dayNames":"dayNamesShort"))+20-b.getDay())}a.input.attr("size",this._formatDate(a,b).length)}},_inlineDatepicker:function(a,
+b){var c=d(a);if(!c.hasClass(this.markerClassName)){c.addClass(this.markerClassName).append(b.dpDiv).bind("setData.datepicker",function(e,f,h){b.settings[f]=h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});d.data(a,"datepicker",b);this._setDate(b,this._getDefaultDate(b),true);this._updateDatepicker(b);this._updateAlternate(b);b.settings.disabled&&this._disableDatepicker(a);b.dpDiv.css("display","block")}},_dialogDatepicker:function(a,b,c,e,f){a=this._dialogInst;if(!a){this.uuid+=
+1;this._dialogInput=d('<input type="text" id="'+("dp"+this.uuid)+'" style="position: absolute; top: -100px; width: 0px; z-index: -10;"/>');this._dialogInput.keydown(this._doKeyDown);d("body").append(this._dialogInput);a=this._dialogInst=this._newInst(this._dialogInput,false);a.settings={};d.data(this._dialogInput[0],"datepicker",a)}H(a.settings,e||{});b=b&&b.constructor==Date?this._formatDate(a,b):b;this._dialogInput.val(b);this._pos=f?f.length?f:[f.pageX,f.pageY]:null;if(!this._pos)this._pos=[document.documentElement.clientWidth/
+2-100+(document.documentElement.scrollLeft||document.body.scrollLeft),document.documentElement.clientHeight/2-150+(document.documentElement.scrollTop||document.body.scrollTop)];this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px");a.settings.onSelect=c;this._inDialog=true;this.dpDiv.addClass(this._dialogClass);this._showDatepicker(this._dialogInput[0]);d.blockUI&&d.blockUI(this.dpDiv);d.data(this._dialogInput[0],"datepicker",a);return this},_destroyDatepicker:function(a){var b=
+d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();d.removeData(a,"datepicker");if(e=="input"){c.append.remove();c.trigger.remove();b.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)}else if(e=="div"||e=="span")b.removeClass(this.markerClassName).empty()}},_enableDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=
+a.nodeName.toLowerCase();if(e=="input"){a.disabled=false;c.trigger.filter("button").each(function(){this.disabled=false}).end().filter("img").css({opacity:"1.0",cursor:""})}else if(e=="div"||e=="span"){b=b.children("."+this._inlineClass);b.children().removeClass("ui-state-disabled");b.find("select.ui-datepicker-month, select.ui-datepicker-year").removeAttr("disabled")}this._disabledInputs=d.map(this._disabledInputs,function(f){return f==a?null:f})}},_disableDatepicker:function(a){var b=d(a),c=d.data(a,
+"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();if(e=="input"){a.disabled=true;c.trigger.filter("button").each(function(){this.disabled=true}).end().filter("img").css({opacity:"0.5",cursor:"default"})}else if(e=="div"||e=="span"){b=b.children("."+this._inlineClass);b.children().addClass("ui-state-disabled");b.find("select.ui-datepicker-month, select.ui-datepicker-year").attr("disabled","disabled")}this._disabledInputs=d.map(this._disabledInputs,function(f){return f==
+a?null:f});this._disabledInputs[this._disabledInputs.length]=a}},_isDisabledDatepicker:function(a){if(!a)return false;for(var b=0;b<this._disabledInputs.length;b++)if(this._disabledInputs[b]==a)return true;return false},_getInst:function(a){try{return d.data(a,"datepicker")}catch(b){throw"Missing instance data for this datepicker";}},_optionDatepicker:function(a,b,c){var e=this._getInst(a);if(arguments.length==2&&typeof b=="string")return b=="defaults"?d.extend({},d.datepicker._defaults):e?b=="all"?
+d.extend({},e.settings):this._get(e,b):null;var f=b||{};if(typeof b=="string"){f={};f[b]=c}if(e){this._curInst==e&&this._hideDatepicker();var h=this._getDateDatepicker(a,true),i=this._getMinMaxDate(e,"min"),g=this._getMinMaxDate(e,"max");H(e.settings,f);if(i!==null&&f.dateFormat!==C&&f.minDate===C)e.settings.minDate=this._formatDate(e,i);if(g!==null&&f.dateFormat!==C&&f.maxDate===C)e.settings.maxDate=this._formatDate(e,g);this._attachments(d(a),e);this._autoSize(e);this._setDate(e,h);this._updateAlternate(e);
+this._updateDatepicker(e)}},_changeDatepicker:function(a,b,c){this._optionDatepicker(a,b,c)},_refreshDatepicker:function(a){(a=this._getInst(a))&&this._updateDatepicker(a)},_setDateDatepicker:function(a,b){if(a=this._getInst(a)){this._setDate(a,b);this._updateDatepicker(a);this._updateAlternate(a)}},_getDateDatepicker:function(a,b){(a=this._getInst(a))&&!a.inline&&this._setDateFromField(a,b);return a?this._getDate(a):null},_doKeyDown:function(a){var b=d.datepicker._getInst(a.target),c=true,e=b.dpDiv.is(".ui-datepicker-rtl");
+b._keyEvent=true;if(d.datepicker._datepickerShowing)switch(a.keyCode){case 9:d.datepicker._hideDatepicker();c=false;break;case 13:c=d("td."+d.datepicker._dayOverClass+":not(."+d.datepicker._currentClass+")",b.dpDiv);c[0]&&d.datepicker._selectDay(a.target,b.selectedMonth,b.selectedYear,c[0]);if(a=d.datepicker._get(b,"onSelect")){c=d.datepicker._formatDate(b);a.apply(b.input?b.input[0]:null,[c,b])}else d.datepicker._hideDatepicker();return false;case 27:d.datepicker._hideDatepicker();break;case 33:d.datepicker._adjustDate(a.target,
+a.ctrlKey?-d.datepicker._get(b,"stepBigMonths"):-d.datepicker._get(b,"stepMonths"),"M");break;case 34:d.datepicker._adjustDate(a.target,a.ctrlKey?+d.datepicker._get(b,"stepBigMonths"):+d.datepicker._get(b,"stepMonths"),"M");break;case 35:if(a.ctrlKey||a.metaKey)d.datepicker._clearDate(a.target);c=a.ctrlKey||a.metaKey;break;case 36:if(a.ctrlKey||a.metaKey)d.datepicker._gotoToday(a.target);c=a.ctrlKey||a.metaKey;break;case 37:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,e?+1:-1,"D");c=
+a.ctrlKey||a.metaKey;if(a.originalEvent.altKey)d.datepicker._adjustDate(a.target,a.ctrlKey?-d.datepicker._get(b,"stepBigMonths"):-d.datepicker._get(b,"stepMonths"),"M");break;case 38:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,-7,"D");c=a.ctrlKey||a.metaKey;break;case 39:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,e?-1:+1,"D");c=a.ctrlKey||a.metaKey;if(a.originalEvent.altKey)d.datepicker._adjustDate(a.target,a.ctrlKey?+d.datepicker._get(b,"stepBigMonths"):+d.datepicker._get(b,
+"stepMonths"),"M");break;case 40:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,+7,"D");c=a.ctrlKey||a.metaKey;break;default:c=false}else if(a.keyCode==36&&a.ctrlKey)d.datepicker._showDatepicker(this);else c=false;if(c){a.preventDefault();a.stopPropagation()}},_doKeyPress:function(a){var b=d.datepicker._getInst(a.target);if(d.datepicker._get(b,"constrainInput")){b=d.datepicker._possibleChars(d.datepicker._get(b,"dateFormat"));var c=String.fromCharCode(a.charCode==C?a.keyCode:a.charCode);
+return a.ctrlKey||a.metaKey||c<" "||!b||b.indexOf(c)>-1}},_doKeyUp:function(a){a=d.datepicker._getInst(a.target);if(a.input.val()!=a.lastVal)try{if(d.datepicker.parseDate(d.datepicker._get(a,"dateFormat"),a.input?a.input.val():null,d.datepicker._getFormatConfig(a))){d.datepicker._setDateFromField(a);d.datepicker._updateAlternate(a);d.datepicker._updateDatepicker(a)}}catch(b){d.datepicker.log(b)}return true},_showDatepicker:function(a){a=a.target||a;if(a.nodeName.toLowerCase()!="input")a=d("input",
+a.parentNode)[0];if(!(d.datepicker._isDisabledDatepicker(a)||d.datepicker._lastInput==a)){var b=d.datepicker._getInst(a);if(d.datepicker._curInst&&d.datepicker._curInst!=b){d.datepicker._datepickerShowing&&d.datepicker._triggerOnClose(d.datepicker._curInst);d.datepicker._curInst.dpDiv.stop(true,true)}var c=d.datepicker._get(b,"beforeShow");c=c?c.apply(a,[a,b]):{};if(c!==false){H(b.settings,c);b.lastVal=null;d.datepicker._lastInput=a;d.datepicker._setDateFromField(b);if(d.datepicker._inDialog)a.value=
+"";if(!d.datepicker._pos){d.datepicker._pos=d.datepicker._findPos(a);d.datepicker._pos[1]+=a.offsetHeight}var e=false;d(a).parents().each(function(){e|=d(this).css("position")=="fixed";return!e});if(e&&d.browser.opera){d.datepicker._pos[0]-=document.documentElement.scrollLeft;d.datepicker._pos[1]-=document.documentElement.scrollTop}c={left:d.datepicker._pos[0],top:d.datepicker._pos[1]};d.datepicker._pos=null;b.dpDiv.empty();b.dpDiv.css({position:"absolute",display:"block",top:"-1000px"});d.datepicker._updateDatepicker(b);
+c=d.datepicker._checkOffset(b,c,e);b.dpDiv.css({position:d.datepicker._inDialog&&d.blockUI?"static":e?"fixed":"absolute",display:"none",left:c.left+"px",top:c.top+"px"});if(!b.inline){c=d.datepicker._get(b,"showAnim");var f=d.datepicker._get(b,"duration"),h=function(){var i=b.dpDiv.find("iframe.ui-datepicker-cover");if(i.length){var g=d.datepicker._getBorders(b.dpDiv);i.css({left:-g[0],top:-g[1],width:b.dpDiv.outerWidth(),height:b.dpDiv.outerHeight()})}};b.dpDiv.zIndex(d(a).zIndex()+1);d.datepicker._datepickerShowing=
+true;d.effects&&d.effects[c]?b.dpDiv.show(c,d.datepicker._get(b,"showOptions"),f,h):b.dpDiv[c||"show"](c?f:null,h);if(!c||!f)h();b.input.is(":visible")&&!b.input.is(":disabled")&&b.input.focus();d.datepicker._curInst=b}}}},_updateDatepicker:function(a){this.maxRows=4;var b=d.datepicker._getBorders(a.dpDiv);J=a;a.dpDiv.empty().append(this._generateHTML(a));var c=a.dpDiv.find("iframe.ui-datepicker-cover");c.length&&c.css({left:-b[0],top:-b[1],width:a.dpDiv.outerWidth(),height:a.dpDiv.outerHeight()});
+a.dpDiv.find("."+this._dayOverClass+" a").mouseover();b=this._getNumberOfMonths(a);c=b[1];a.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");c>1&&a.dpDiv.addClass("ui-datepicker-multi-"+c).css("width",17*c+"em");a.dpDiv[(b[0]!=1||b[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi");a.dpDiv[(this._get(a,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl");a==d.datepicker._curInst&&d.datepicker._datepickerShowing&&a.input&&a.input.is(":visible")&&
+!a.input.is(":disabled")&&a.input[0]!=document.activeElement&&a.input.focus();if(a.yearshtml){var e=a.yearshtml;setTimeout(function(){e===a.yearshtml&&a.yearshtml&&a.dpDiv.find("select.ui-datepicker-year:first").replaceWith(a.yearshtml);e=a.yearshtml=null},0)}},_getBorders:function(a){var b=function(c){return{thin:1,medium:2,thick:3}[c]||c};return[parseFloat(b(a.css("border-left-width"))),parseFloat(b(a.css("border-top-width")))]},_checkOffset:function(a,b,c){var e=a.dpDiv.outerWidth(),f=a.dpDiv.outerHeight(),
+h=a.input?a.input.outerWidth():0,i=a.input?a.input.outerHeight():0,g=document.documentElement.clientWidth+d(document).scrollLeft(),j=document.documentElement.clientHeight+d(document).scrollTop();b.left-=this._get(a,"isRTL")?e-h:0;b.left-=c&&b.left==a.input.offset().left?d(document).scrollLeft():0;b.top-=c&&b.top==a.input.offset().top+i?d(document).scrollTop():0;b.left-=Math.min(b.left,b.left+e>g&&g>e?Math.abs(b.left+e-g):0);b.top-=Math.min(b.top,b.top+f>j&&j>f?Math.abs(f+i):0);return b},_findPos:function(a){for(var b=
+this._get(this._getInst(a),"isRTL");a&&(a.type=="hidden"||a.nodeType!=1||d.expr.filters.hidden(a));)a=a[b?"previousSibling":"nextSibling"];a=d(a).offset();return[a.left,a.top]},_triggerOnClose:function(a){var b=this._get(a,"onClose");if(b)b.apply(a.input?a.input[0]:null,[a.input?a.input.val():"",a])},_hideDatepicker:function(a){var b=this._curInst;if(!(!b||a&&b!=d.data(a,"datepicker")))if(this._datepickerShowing){a=this._get(b,"showAnim");var c=this._get(b,"duration"),e=function(){d.datepicker._tidyDialog(b);
+this._curInst=null};d.effects&&d.effects[a]?b.dpDiv.hide(a,d.datepicker._get(b,"showOptions"),c,e):b.dpDiv[a=="slideDown"?"slideUp":a=="fadeIn"?"fadeOut":"hide"](a?c:null,e);a||e();d.datepicker._triggerOnClose(b);this._datepickerShowing=false;this._lastInput=null;if(this._inDialog){this._dialogInput.css({position:"absolute",left:"0",top:"-100px"});if(d.blockUI){d.unblockUI();d("body").append(this.dpDiv)}}this._inDialog=false}},_tidyDialog:function(a){a.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},
+_checkExternalClick:function(a){if(d.datepicker._curInst){a=d(a.target);a[0].id!=d.datepicker._mainDivId&&a.parents("#"+d.datepicker._mainDivId).length==0&&!a.hasClass(d.datepicker.markerClassName)&&!a.hasClass(d.datepicker._triggerClass)&&d.datepicker._datepickerShowing&&!(d.datepicker._inDialog&&d.blockUI)&&d.datepicker._hideDatepicker()}},_adjustDate:function(a,b,c){a=d(a);var e=this._getInst(a[0]);if(!this._isDisabledDatepicker(a[0])){this._adjustInstDate(e,b+(c=="M"?this._get(e,"showCurrentAtPos"):
+0),c);this._updateDatepicker(e)}},_gotoToday:function(a){a=d(a);var b=this._getInst(a[0]);if(this._get(b,"gotoCurrent")&&b.currentDay){b.selectedDay=b.currentDay;b.drawMonth=b.selectedMonth=b.currentMonth;b.drawYear=b.selectedYear=b.currentYear}else{var c=new Date;b.selectedDay=c.getDate();b.drawMonth=b.selectedMonth=c.getMonth();b.drawYear=b.selectedYear=c.getFullYear()}this._notifyChange(b);this._adjustDate(a)},_selectMonthYear:function(a,b,c){a=d(a);var e=this._getInst(a[0]);e["selected"+(c=="M"?
+"Month":"Year")]=e["draw"+(c=="M"?"Month":"Year")]=parseInt(b.options[b.selectedIndex].value,10);this._notifyChange(e);this._adjustDate(a)},_selectDay:function(a,b,c,e){var f=d(a);if(!(d(e).hasClass(this._unselectableClass)||this._isDisabledDatepicker(f[0]))){f=this._getInst(f[0]);f.selectedDay=f.currentDay=d("a",e).html();f.selectedMonth=f.currentMonth=b;f.selectedYear=f.currentYear=c;this._selectDate(a,this._formatDate(f,f.currentDay,f.currentMonth,f.currentYear))}},_clearDate:function(a){a=d(a);
+this._getInst(a[0]);this._selectDate(a,"")},_selectDate:function(a,b){a=this._getInst(d(a)[0]);b=b!=null?b:this._formatDate(a);a.input&&a.input.val(b);this._updateAlternate(a);var c=this._get(a,"onSelect");if(c)c.apply(a.input?a.input[0]:null,[b,a]);else a.input&&a.input.trigger("change");if(a.inline)this._updateDatepicker(a);else{this._hideDatepicker();this._lastInput=a.input[0];typeof a.input[0]!="object"&&a.input.focus();this._lastInput=null}},_updateAlternate:function(a){var b=this._get(a,"altField");
+if(b){var c=this._get(a,"altFormat")||this._get(a,"dateFormat"),e=this._getDate(a),f=this.formatDate(c,e,this._getFormatConfig(a));d(b).each(function(){d(this).val(f)})}},noWeekends:function(a){a=a.getDay();return[a>0&&a<6,""]},iso8601Week:function(a){a=new Date(a.getTime());a.setDate(a.getDate()+4-(a.getDay()||7));var b=a.getTime();a.setMonth(0);a.setDate(1);return Math.floor(Math.round((b-a)/864E5)/7)+1},parseDate:function(a,b,c){if(a==null||b==null)throw"Invalid arguments";b=typeof b=="object"?
+b.toString():b+"";if(b=="")return null;var e=(c?c.shortYearCutoff:null)||this._defaults.shortYearCutoff;e=typeof e!="string"?e:(new Date).getFullYear()%100+parseInt(e,10);for(var f=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,h=(c?c.dayNames:null)||this._defaults.dayNames,i=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort,g=(c?c.monthNames:null)||this._defaults.monthNames,j=c=-1,l=-1,u=-1,k=false,o=function(p){(p=A+1<a.length&&a.charAt(A+1)==p)&&A++;return p},m=function(p){var D=
+o(p);p=new RegExp("^\\d{1,"+(p=="@"?14:p=="!"?20:p=="y"&&D?4:p=="o"?3:2)+"}");p=b.substring(q).match(p);if(!p)throw"Missing number at position "+q;q+=p[0].length;return parseInt(p[0],10)},n=function(p,D,K){p=d.map(o(p)?K:D,function(w,x){return[[x,w]]}).sort(function(w,x){return-(w[1].length-x[1].length)});var E=-1;d.each(p,function(w,x){w=x[1];if(b.substr(q,w.length).toLowerCase()==w.toLowerCase()){E=x[0];q+=w.length;return false}});if(E!=-1)return E+1;else throw"Unknown name at position "+q;},s=
+function(){if(b.charAt(q)!=a.charAt(A))throw"Unexpected literal at position "+q;q++},q=0,A=0;A<a.length;A++)if(k)if(a.charAt(A)=="'"&&!o("'"))k=false;else s();else switch(a.charAt(A)){case "d":l=m("d");break;case "D":n("D",f,h);break;case "o":u=m("o");break;case "m":j=m("m");break;case "M":j=n("M",i,g);break;case "y":c=m("y");break;case "@":var v=new Date(m("@"));c=v.getFullYear();j=v.getMonth()+1;l=v.getDate();break;case "!":v=new Date((m("!")-this._ticksTo1970)/1E4);c=v.getFullYear();j=v.getMonth()+
+1;l=v.getDate();break;case "'":if(o("'"))s();else k=true;break;default:s()}if(q<b.length)throw"Extra/unparsed characters found in date: "+b.substring(q);if(c==-1)c=(new Date).getFullYear();else if(c<100)c+=(new Date).getFullYear()-(new Date).getFullYear()%100+(c<=e?0:-100);if(u>-1){j=1;l=u;do{e=this._getDaysInMonth(c,j-1);if(l<=e)break;j++;l-=e}while(1)}v=this._daylightSavingAdjust(new Date(c,j-1,l));if(v.getFullYear()!=c||v.getMonth()+1!=j||v.getDate()!=l)throw"Invalid date";return v},ATOM:"yy-mm-dd",
+COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*24*60*60*1E7,formatDate:function(a,b,c){if(!b)return"";var e=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,f=(c?c.dayNames:null)||this._defaults.dayNames,h=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort;c=(c?c.monthNames:
+null)||this._defaults.monthNames;var i=function(o){(o=k+1<a.length&&a.charAt(k+1)==o)&&k++;return o},g=function(o,m,n){m=""+m;if(i(o))for(;m.length<n;)m="0"+m;return m},j=function(o,m,n,s){return i(o)?s[m]:n[m]},l="",u=false;if(b)for(var k=0;k<a.length;k++)if(u)if(a.charAt(k)=="'"&&!i("'"))u=false;else l+=a.charAt(k);else switch(a.charAt(k)){case "d":l+=g("d",b.getDate(),2);break;case "D":l+=j("D",b.getDay(),e,f);break;case "o":l+=g("o",Math.round(((new Date(b.getFullYear(),b.getMonth(),b.getDate())).getTime()-
+(new Date(b.getFullYear(),0,0)).getTime())/864E5),3);break;case "m":l+=g("m",b.getMonth()+1,2);break;case "M":l+=j("M",b.getMonth(),h,c);break;case "y":l+=i("y")?b.getFullYear():(b.getYear()%100<10?"0":"")+b.getYear()%100;break;case "@":l+=b.getTime();break;case "!":l+=b.getTime()*1E4+this._ticksTo1970;break;case "'":if(i("'"))l+="'";else u=true;break;default:l+=a.charAt(k)}return l},_possibleChars:function(a){for(var b="",c=false,e=function(h){(h=f+1<a.length&&a.charAt(f+1)==h)&&f++;return h},f=
+0;f<a.length;f++)if(c)if(a.charAt(f)=="'"&&!e("'"))c=false;else b+=a.charAt(f);else switch(a.charAt(f)){case "d":case "m":case "y":case "@":b+="0123456789";break;case "D":case "M":return null;case "'":if(e("'"))b+="'";else c=true;break;default:b+=a.charAt(f)}return b},_get:function(a,b){return a.settings[b]!==C?a.settings[b]:this._defaults[b]},_setDateFromField:function(a,b){if(a.input.val()!=a.lastVal){var c=this._get(a,"dateFormat"),e=a.lastVal=a.input?a.input.val():null,f,h;f=h=this._getDefaultDate(a);
+var i=this._getFormatConfig(a);try{f=this.parseDate(c,e,i)||h}catch(g){this.log(g);e=b?"":e}a.selectedDay=f.getDate();a.drawMonth=a.selectedMonth=f.getMonth();a.drawYear=a.selectedYear=f.getFullYear();a.currentDay=e?f.getDate():0;a.currentMonth=e?f.getMonth():0;a.currentYear=e?f.getFullYear():0;this._adjustInstDate(a)}},_getDefaultDate:function(a){return this._restrictMinMax(a,this._determineDate(a,this._get(a,"defaultDate"),new Date))},_determineDate:function(a,b,c){var e=function(h){var i=new Date;
+i.setDate(i.getDate()+h);return i},f=function(h){try{return d.datepicker.parseDate(d.datepicker._get(a,"dateFormat"),h,d.datepicker._getFormatConfig(a))}catch(i){}var g=(h.toLowerCase().match(/^c/)?d.datepicker._getDate(a):null)||new Date,j=g.getFullYear(),l=g.getMonth();g=g.getDate();for(var u=/([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,k=u.exec(h);k;){switch(k[2]||"d"){case "d":case "D":g+=parseInt(k[1],10);break;case "w":case "W":g+=parseInt(k[1],10)*7;break;case "m":case "M":l+=parseInt(k[1],10);g=
+Math.min(g,d.datepicker._getDaysInMonth(j,l));break;case "y":case "Y":j+=parseInt(k[1],10);g=Math.min(g,d.datepicker._getDaysInMonth(j,l));break}k=u.exec(h)}return new Date(j,l,g)};if(b=(b=b==null||b===""?c:typeof b=="string"?f(b):typeof b=="number"?isNaN(b)?c:e(b):new Date(b.getTime()))&&b.toString()=="Invalid Date"?c:b){b.setHours(0);b.setMinutes(0);b.setSeconds(0);b.setMilliseconds(0)}return this._daylightSavingAdjust(b)},_daylightSavingAdjust:function(a){if(!a)return null;a.setHours(a.getHours()>
+12?a.getHours()+2:0);return a},_setDate:function(a,b,c){var e=!b,f=a.selectedMonth,h=a.selectedYear;b=this._restrictMinMax(a,this._determineDate(a,b,new Date));a.selectedDay=a.currentDay=b.getDate();a.drawMonth=a.selectedMonth=a.currentMonth=b.getMonth();a.drawYear=a.selectedYear=a.currentYear=b.getFullYear();if((f!=a.selectedMonth||h!=a.selectedYear)&&!c)this._notifyChange(a);this._adjustInstDate(a);if(a.input)a.input.val(e?"":this._formatDate(a))},_getDate:function(a){return!a.currentYear||a.input&&
+a.input.val()==""?null:this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay))},_generateHTML:function(a){var b=new Date;b=this._daylightSavingAdjust(new Date(b.getFullYear(),b.getMonth(),b.getDate()));var c=this._get(a,"isRTL"),e=this._get(a,"showButtonPanel"),f=this._get(a,"hideIfNoPrevNext"),h=this._get(a,"navigationAsDateFormat"),i=this._getNumberOfMonths(a),g=this._get(a,"showCurrentAtPos"),j=this._get(a,"stepMonths"),l=i[0]!=1||i[1]!=1,u=this._daylightSavingAdjust(!a.currentDay?
+new Date(9999,9,9):new Date(a.currentYear,a.currentMonth,a.currentDay)),k=this._getMinMaxDate(a,"min"),o=this._getMinMaxDate(a,"max");g=a.drawMonth-g;var m=a.drawYear;if(g<0){g+=12;m--}if(o){var n=this._daylightSavingAdjust(new Date(o.getFullYear(),o.getMonth()-i[0]*i[1]+1,o.getDate()));for(n=k&&n<k?k:n;this._daylightSavingAdjust(new Date(m,g,1))>n;){g--;if(g<0){g=11;m--}}}a.drawMonth=g;a.drawYear=m;n=this._get(a,"prevText");n=!h?n:this.formatDate(n,this._daylightSavingAdjust(new Date(m,g-j,1)),this._getFormatConfig(a));
+n=this._canAdjustMonth(a,-1,m,g)?'<a class="ui-datepicker-prev ui-corner-all" onclick="DP_jQuery_'+B+".datepicker._adjustDate('#"+a.id+"', -"+j+", 'M');\" title=\""+n+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">'+n+"</span></a>":f?"":'<a class="ui-datepicker-prev ui-corner-all ui-state-disabled" title="'+n+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">'+n+"</span></a>";var s=this._get(a,"nextText");s=!h?s:this.formatDate(s,this._daylightSavingAdjust(new Date(m,
+g+j,1)),this._getFormatConfig(a));f=this._canAdjustMonth(a,+1,m,g)?'<a class="ui-datepicker-next ui-corner-all" onclick="DP_jQuery_'+B+".datepicker._adjustDate('#"+a.id+"', +"+j+", 'M');\" title=\""+s+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'">'+s+"</span></a>":f?"":'<a class="ui-datepicker-next ui-corner-all ui-state-disabled" title="'+s+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'">'+s+"</span></a>";j=this._get(a,"currentText");s=this._get(a,"gotoCurrent")&&
+a.currentDay?u:b;j=!h?j:this.formatDate(j,s,this._getFormatConfig(a));h=!a.inline?'<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all" onclick="DP_jQuery_'+B+'.datepicker._hideDatepicker();">'+this._get(a,"closeText")+"</button>":"";e=e?'<div class="ui-datepicker-buttonpane ui-widget-content">'+(c?h:"")+(this._isInRange(a,s)?'<button type="button" class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" onclick="DP_jQuery_'+
+B+".datepicker._gotoToday('#"+a.id+"');\">"+j+"</button>":"")+(c?"":h)+"</div>":"";h=parseInt(this._get(a,"firstDay"),10);h=isNaN(h)?0:h;j=this._get(a,"showWeek");s=this._get(a,"dayNames");this._get(a,"dayNamesShort");var q=this._get(a,"dayNamesMin"),A=this._get(a,"monthNames"),v=this._get(a,"monthNamesShort"),p=this._get(a,"beforeShowDay"),D=this._get(a,"showOtherMonths"),K=this._get(a,"selectOtherMonths");this._get(a,"calculateWeek");for(var E=this._getDefaultDate(a),w="",x=0;x<i[0];x++){var O=
+"";this.maxRows=4;for(var G=0;G<i[1];G++){var P=this._daylightSavingAdjust(new Date(m,g,a.selectedDay)),t=" ui-corner-all",y="";if(l){y+='<div class="ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" ui-datepicker-group-first";t=" ui-corner-"+(c?"right":"left");break;case i[1]-1:y+=" ui-datepicker-group-last";t=" ui-corner-"+(c?"left":"right");break;default:y+=" ui-datepicker-group-middle";t="";break}y+='">'}y+='<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix'+t+'">'+(/all|left/.test(t)&&
+x==0?c?f:n:"")+(/all|right/.test(t)&&x==0?c?n:f:"")+this._generateMonthYearHeader(a,g,m,k,o,x>0||G>0,A,v)+'</div><table class="ui-datepicker-calendar"><thead><tr>';var z=j?'<th class="ui-datepicker-week-col">'+this._get(a,"weekHeader")+"</th>":"";for(t=0;t<7;t++){var r=(t+h)%7;z+="<th"+((t+h+6)%7>=5?' class="ui-datepicker-week-end"':"")+'><span title="'+s[r]+'">'+q[r]+"</span></th>"}y+=z+"</tr></thead><tbody>";z=this._getDaysInMonth(m,g);if(m==a.selectedYear&&g==a.selectedMonth)a.selectedDay=Math.min(a.selectedDay,
+z);t=(this._getFirstDayOfMonth(m,g)-h+7)%7;z=Math.ceil((t+z)/7);this.maxRows=z=l?this.maxRows>z?this.maxRows:z:z;r=this._daylightSavingAdjust(new Date(m,g,1-t));for(var Q=0;Q<z;Q++){y+="<tr>";var R=!j?"":'<td class="ui-datepicker-week-col">'+this._get(a,"calculateWeek")(r)+"</td>";for(t=0;t<7;t++){var I=p?p.apply(a.input?a.input[0]:null,[r]):[true,""],F=r.getMonth()!=g,L=F&&!K||!I[0]||k&&r<k||o&&r>o;R+='<td class="'+((t+h+6)%7>=5?" ui-datepicker-week-end":"")+(F?" ui-datepicker-other-month":"")+(r.getTime()==
+P.getTime()&&g==a.selectedMonth&&a._keyEvent||E.getTime()==r.getTime()&&E.getTime()==P.getTime()?" "+this._dayOverClass:"")+(L?" "+this._unselectableClass+" ui-state-disabled":"")+(F&&!D?"":" "+I[1]+(r.getTime()==u.getTime()?" "+this._currentClass:"")+(r.getTime()==b.getTime()?" ui-datepicker-today":""))+'"'+((!F||D)&&I[2]?' title="'+I[2]+'"':"")+(L?"":' onclick="DP_jQuery_'+B+".datepicker._selectDay('#"+a.id+"',"+r.getMonth()+","+r.getFullYear()+', this);return false;"')+">"+(F&&!D?"&#xa0;":L?'<span class="ui-state-default">'+
+r.getDate()+"</span>":'<a class="ui-state-default'+(r.getTime()==b.getTime()?" ui-state-highlight":"")+(r.getTime()==u.getTime()?" ui-state-active":"")+(F?" ui-priority-secondary":"")+'" href="#">'+r.getDate()+"</a>")+"</td>";r.setDate(r.getDate()+1);r=this._daylightSavingAdjust(r)}y+=R+"</tr>"}g++;if(g>11){g=0;m++}y+="</tbody></table>"+(l?"</div>"+(i[0]>0&&G==i[1]-1?'<div class="ui-datepicker-row-break"></div>':""):"");O+=y}w+=O}w+=e+(d.browser.msie&&parseInt(d.browser.version,10)<7&&!a.inline?'<iframe src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>':
+"");a._keyEvent=false;return w},_generateMonthYearHeader:function(a,b,c,e,f,h,i,g){var j=this._get(a,"changeMonth"),l=this._get(a,"changeYear"),u=this._get(a,"showMonthAfterYear"),k='<div class="ui-datepicker-title">',o="";if(h||!j)o+='<span class="ui-datepicker-month">'+i[b]+"</span>";else{i=e&&e.getFullYear()==c;var m=f&&f.getFullYear()==c;o+='<select class="ui-datepicker-month" onchange="DP_jQuery_'+B+".datepicker._selectMonthYear('#"+a.id+"', this, 'M');\" >";for(var n=0;n<12;n++)if((!i||n>=e.getMonth())&&
+(!m||n<=f.getMonth()))o+='<option value="'+n+'"'+(n==b?' selected="selected"':"")+">"+g[n]+"</option>";o+="</select>"}u||(k+=o+(h||!(j&&l)?"&#xa0;":""));if(!a.yearshtml){a.yearshtml="";if(h||!l)k+='<span class="ui-datepicker-year">'+c+"</span>";else{g=this._get(a,"yearRange").split(":");var s=(new Date).getFullYear();i=function(q){q=q.match(/c[+-].*/)?c+parseInt(q.substring(1),10):q.match(/[+-].*/)?s+parseInt(q,10):parseInt(q,10);return isNaN(q)?s:q};b=i(g[0]);g=Math.max(b,i(g[1]||""));b=e?Math.max(b,
+e.getFullYear()):b;g=f?Math.min(g,f.getFullYear()):g;for(a.yearshtml+='<select class="ui-datepicker-year" onchange="DP_jQuery_'+B+".datepicker._selectMonthYear('#"+a.id+"', this, 'Y');\" >";b<=g;b++)a.yearshtml+='<option value="'+b+'"'+(b==c?' selected="selected"':"")+">"+b+"</option>";a.yearshtml+="</select>";k+=a.yearshtml;a.yearshtml=null}}k+=this._get(a,"yearSuffix");if(u)k+=(h||!(j&&l)?"&#xa0;":"")+o;k+="</div>";return k},_adjustInstDate:function(a,b,c){var e=a.drawYear+(c=="Y"?b:0),f=a.drawMonth+
+(c=="M"?b:0);b=Math.min(a.selectedDay,this._getDaysInMonth(e,f))+(c=="D"?b:0);e=this._restrictMinMax(a,this._daylightSavingAdjust(new Date(e,f,b)));a.selectedDay=e.getDate();a.drawMonth=a.selectedMonth=e.getMonth();a.drawYear=a.selectedYear=e.getFullYear();if(c=="M"||c=="Y")this._notifyChange(a)},_restrictMinMax:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");b=c&&b<c?c:b;return b=a&&b>a?a:b},_notifyChange:function(a){var b=this._get(a,"onChangeMonthYear");if(b)b.apply(a.input?
+a.input[0]:null,[a.selectedYear,a.selectedMonth+1,a])},_getNumberOfMonths:function(a){a=this._get(a,"numberOfMonths");return a==null?[1,1]:typeof a=="number"?[1,a]:a},_getMinMaxDate:function(a,b){return this._determineDate(a,this._get(a,b+"Date"),null)},_getDaysInMonth:function(a,b){return 32-this._daylightSavingAdjust(new Date(a,b,32)).getDate()},_getFirstDayOfMonth:function(a,b){return(new Date(a,b,1)).getDay()},_canAdjustMonth:function(a,b,c,e){var f=this._getNumberOfMonths(a);c=this._daylightSavingAdjust(new Date(c,
+e+(b<0?b:f[0]*f[1]),1));b<0&&c.setDate(this._getDaysInMonth(c.getFullYear(),c.getMonth()));return this._isInRange(a,c)},_isInRange:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");return(!c||b.getTime()>=c.getTime())&&(!a||b.getTime()<=a.getTime())},_getFormatConfig:function(a){var b=this._get(a,"shortYearCutoff");b=typeof b!="string"?b:(new Date).getFullYear()%100+parseInt(b,10);return{shortYearCutoff:b,dayNamesShort:this._get(a,"dayNamesShort"),dayNames:this._get(a,
+"dayNames"),monthNamesShort:this._get(a,"monthNamesShort"),monthNames:this._get(a,"monthNames")}},_formatDate:function(a,b,c,e){if(!b){a.currentDay=a.selectedDay;a.currentMonth=a.selectedMonth;a.currentYear=a.selectedYear}b=b?typeof b=="object"?b:this._daylightSavingAdjust(new Date(e,c,b)):this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay));return this.formatDate(this._get(a,"dateFormat"),b,this._getFormatConfig(a))}});d.fn.datepicker=function(a){if(!this.length)return this;
+if(!d.datepicker.initialized){d(document).mousedown(d.datepicker._checkExternalClick).find("body").append(d.datepicker.dpDiv);d.datepicker.initialized=true}var b=Array.prototype.slice.call(arguments,1);if(typeof a=="string"&&(a=="isDisabled"||a=="getDate"||a=="widget"))return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));if(a=="option"&&arguments.length==2&&typeof arguments[1]=="string")return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));return this.each(function(){typeof a==
+"string"?d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this].concat(b)):d.datepicker._attachDatepicker(this,a)})};d.datepicker=new M;d.datepicker.initialized=false;d.datepicker.uuid=(new Date).getTime();d.datepicker.version="1.8.16";window["DP_jQuery_"+B]=d})(jQuery);
+;/*
+ * jQuery UI Effects 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/
+ */
+jQuery.effects||function(f,j){function m(c){var a;if(c&&c.constructor==Array&&c.length==3)return c;if(a=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(c))return[parseInt(a[1],10),parseInt(a[2],10),parseInt(a[3],10)];if(a=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(c))return[parseFloat(a[1])*2.55,parseFloat(a[2])*2.55,parseFloat(a[3])*2.55];if(a=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(c))return[parseInt(a[1],
+16),parseInt(a[2],16),parseInt(a[3],16)];if(a=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(c))return[parseInt(a[1]+a[1],16),parseInt(a[2]+a[2],16),parseInt(a[3]+a[3],16)];if(/rgba\(0, 0, 0, 0\)/.exec(c))return n.transparent;return n[f.trim(c).toLowerCase()]}function s(c,a){var b;do{b=f.curCSS(c,a);if(b!=""&&b!="transparent"||f.nodeName(c,"body"))break;a="backgroundColor"}while(c=c.parentNode);return m(b)}function o(){var c=document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle,
+a={},b,d;if(c&&c.length&&c[0]&&c[c[0]])for(var e=c.length;e--;){b=c[e];if(typeof c[b]=="string"){d=b.replace(/\-(\w)/g,function(g,h){return h.toUpperCase()});a[d]=c[b]}}else for(b in c)if(typeof c[b]==="string")a[b]=c[b];return a}function p(c){var a,b;for(a in c){b=c[a];if(b==null||f.isFunction(b)||a in t||/scrollbar/.test(a)||!/color/i.test(a)&&isNaN(parseFloat(b)))delete c[a]}return c}function u(c,a){var b={_:0},d;for(d in a)if(c[d]!=a[d])b[d]=a[d];return b}function k(c,a,b,d){if(typeof c=="object"){d=
+a;b=null;a=c;c=a.effect}if(f.isFunction(a)){d=a;b=null;a={}}if(typeof a=="number"||f.fx.speeds[a]){d=b;b=a;a={}}if(f.isFunction(b)){d=b;b=null}a=a||{};b=b||a.duration;b=f.fx.off?0:typeof b=="number"?b:b in f.fx.speeds?f.fx.speeds[b]:f.fx.speeds._default;d=d||a.complete;return[c,a,b,d]}function l(c){if(!c||typeof c==="number"||f.fx.speeds[c])return true;if(typeof c==="string"&&!f.effects[c])return true;return false}f.effects={};f.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor",
+"borderTopColor","borderColor","color","outlineColor"],function(c,a){f.fx.step[a]=function(b){if(!b.colorInit){b.start=s(b.elem,a);b.end=m(b.end);b.colorInit=true}b.elem.style[a]="rgb("+Math.max(Math.min(parseInt(b.pos*(b.end[0]-b.start[0])+b.start[0],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[1]-b.start[1])+b.start[1],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[2]-b.start[2])+b.start[2],10),255),0)+")"}});var n={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,
+0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,
+211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]},q=["add","remove","toggle"],t={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};f.effects.animateClass=function(c,a,b,
+d){if(f.isFunction(b)){d=b;b=null}return this.queue(function(){var e=f(this),g=e.attr("style")||" ",h=p(o.call(this)),r,v=e.attr("class");f.each(q,function(w,i){c[i]&&e[i+"Class"](c[i])});r=p(o.call(this));e.attr("class",v);e.animate(u(h,r),{queue:false,duration:a,easing:b,complete:function(){f.each(q,function(w,i){c[i]&&e[i+"Class"](c[i])});if(typeof e.attr("style")=="object"){e.attr("style").cssText="";e.attr("style").cssText=g}else e.attr("style",g);d&&d.apply(this,arguments);f.dequeue(this)}})})};
+f.fn.extend({_addClass:f.fn.addClass,addClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{add:c},a,b,d]):this._addClass(c)},_removeClass:f.fn.removeClass,removeClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{remove:c},a,b,d]):this._removeClass(c)},_toggleClass:f.fn.toggleClass,toggleClass:function(c,a,b,d,e){return typeof a=="boolean"||a===j?b?f.effects.animateClass.apply(this,[a?{add:c}:{remove:c},b,d,e]):this._toggleClass(c,a):f.effects.animateClass.apply(this,
+[{toggle:c},a,b,d])},switchClass:function(c,a,b,d,e){return f.effects.animateClass.apply(this,[{add:a,remove:c},b,d,e])}});f.extend(f.effects,{version:"1.8.16",save:function(c,a){for(var b=0;b<a.length;b++)a[b]!==null&&c.data("ec.storage."+a[b],c[0].style[a[b]])},restore:function(c,a){for(var b=0;b<a.length;b++)a[b]!==null&&c.css(a[b],c.data("ec.storage."+a[b]))},setMode:function(c,a){if(a=="toggle")a=c.is(":hidden")?"show":"hide";return a},getBaseline:function(c,a){var b;switch(c[0]){case "top":b=
+0;break;case "middle":b=0.5;break;case "bottom":b=1;break;default:b=c[0]/a.height}switch(c[1]){case "left":c=0;break;case "center":c=0.5;break;case "right":c=1;break;default:c=c[1]/a.width}return{x:c,y:b}},createWrapper:function(c){if(c.parent().is(".ui-effects-wrapper"))return c.parent();var a={width:c.outerWidth(true),height:c.outerHeight(true),"float":c.css("float")},b=f("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),
+d=document.activeElement;c.wrap(b);if(c[0]===d||f.contains(c[0],d))f(d).focus();b=c.parent();if(c.css("position")=="static"){b.css({position:"relative"});c.css({position:"relative"})}else{f.extend(a,{position:c.css("position"),zIndex:c.css("z-index")});f.each(["top","left","bottom","right"],function(e,g){a[g]=c.css(g);if(isNaN(parseInt(a[g],10)))a[g]="auto"});c.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})}return b.css(a).show()},removeWrapper:function(c){var a,b=document.activeElement;
+if(c.parent().is(".ui-effects-wrapper")){a=c.parent().replaceWith(c);if(c[0]===b||f.contains(c[0],b))f(b).focus();return a}return c},setTransition:function(c,a,b,d){d=d||{};f.each(a,function(e,g){unit=c.cssUnit(g);if(unit[0]>0)d[g]=unit[0]*b+unit[1]});return d}});f.fn.extend({effect:function(c){var a=k.apply(this,arguments),b={options:a[1],duration:a[2],callback:a[3]};a=b.options.mode;var d=f.effects[c];if(f.fx.off||!d)return a?this[a](b.duration,b.callback):this.each(function(){b.callback&&b.callback.call(this)});
+return d.call(this,b)},_show:f.fn.show,show:function(c){if(l(c))return this._show.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="show";return this.effect.apply(this,a)}},_hide:f.fn.hide,hide:function(c){if(l(c))return this._hide.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="hide";return this.effect.apply(this,a)}},__toggle:f.fn.toggle,toggle:function(c){if(l(c)||typeof c==="boolean"||f.isFunction(c))return this.__toggle.apply(this,arguments);else{var a=k.apply(this,
+arguments);a[1].mode="toggle";return this.effect.apply(this,a)}},cssUnit:function(c){var a=this.css(c),b=[];f.each(["em","px","%","pt"],function(d,e){if(a.indexOf(e)>0)b=[parseFloat(a),e]});return b}});f.easing.jswing=f.easing.swing;f.extend(f.easing,{def:"easeOutQuad",swing:function(c,a,b,d,e){return f.easing[f.easing.def](c,a,b,d,e)},easeInQuad:function(c,a,b,d,e){return d*(a/=e)*a+b},easeOutQuad:function(c,a,b,d,e){return-d*(a/=e)*(a-2)+b},easeInOutQuad:function(c,a,b,d,e){if((a/=e/2)<1)return d/
+2*a*a+b;return-d/2*(--a*(a-2)-1)+b},easeInCubic:function(c,a,b,d,e){return d*(a/=e)*a*a+b},easeOutCubic:function(c,a,b,d,e){return d*((a=a/e-1)*a*a+1)+b},easeInOutCubic:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a+b;return d/2*((a-=2)*a*a+2)+b},easeInQuart:function(c,a,b,d,e){return d*(a/=e)*a*a*a+b},easeOutQuart:function(c,a,b,d,e){return-d*((a=a/e-1)*a*a*a-1)+b},easeInOutQuart:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a*a+b;return-d/2*((a-=2)*a*a*a-2)+b},easeInQuint:function(c,a,b,
+d,e){return d*(a/=e)*a*a*a*a+b},easeOutQuint:function(c,a,b,d,e){return d*((a=a/e-1)*a*a*a*a+1)+b},easeInOutQuint:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a*a*a+b;return d/2*((a-=2)*a*a*a*a+2)+b},easeInSine:function(c,a,b,d,e){return-d*Math.cos(a/e*(Math.PI/2))+d+b},easeOutSine:function(c,a,b,d,e){return d*Math.sin(a/e*(Math.PI/2))+b},easeInOutSine:function(c,a,b,d,e){return-d/2*(Math.cos(Math.PI*a/e)-1)+b},easeInExpo:function(c,a,b,d,e){return a==0?b:d*Math.pow(2,10*(a/e-1))+b},easeOutExpo:function(c,
+a,b,d,e){return a==e?b+d:d*(-Math.pow(2,-10*a/e)+1)+b},easeInOutExpo:function(c,a,b,d,e){if(a==0)return b;if(a==e)return b+d;if((a/=e/2)<1)return d/2*Math.pow(2,10*(a-1))+b;return d/2*(-Math.pow(2,-10*--a)+2)+b},easeInCirc:function(c,a,b,d,e){return-d*(Math.sqrt(1-(a/=e)*a)-1)+b},easeOutCirc:function(c,a,b,d,e){return d*Math.sqrt(1-(a=a/e-1)*a)+b},easeInOutCirc:function(c,a,b,d,e){if((a/=e/2)<1)return-d/2*(Math.sqrt(1-a*a)-1)+b;return d/2*(Math.sqrt(1-(a-=2)*a)+1)+b},easeInElastic:function(c,a,b,
+d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/h);return-(h*Math.pow(2,10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g))+b},easeOutElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/h);return h*Math.pow(2,-10*a)*Math.sin((a*e-c)*2*Math.PI/g)+d+b},easeInOutElastic:function(c,a,b,d,e){c=1.70158;var g=
+0,h=d;if(a==0)return b;if((a/=e/2)==2)return b+d;g||(g=e*0.3*1.5);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/h);if(a<1)return-0.5*h*Math.pow(2,10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g)+b;return h*Math.pow(2,-10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g)*0.5+d+b},easeInBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;return d*(a/=e)*a*((g+1)*a-g)+b},easeOutBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;return d*((a=a/e-1)*a*((g+1)*a+g)+1)+b},easeInOutBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;
+if((a/=e/2)<1)return d/2*a*a*(((g*=1.525)+1)*a-g)+b;return d/2*((a-=2)*a*(((g*=1.525)+1)*a+g)+2)+b},easeInBounce:function(c,a,b,d,e){return d-f.easing.easeOutBounce(c,e-a,0,d,e)+b},easeOutBounce:function(c,a,b,d,e){return(a/=e)<1/2.75?d*7.5625*a*a+b:a<2/2.75?d*(7.5625*(a-=1.5/2.75)*a+0.75)+b:a<2.5/2.75?d*(7.5625*(a-=2.25/2.75)*a+0.9375)+b:d*(7.5625*(a-=2.625/2.75)*a+0.984375)+b},easeInOutBounce:function(c,a,b,d,e){if(a<e/2)return f.easing.easeInBounce(c,a*2,0,d,e)*0.5+b;return f.easing.easeOutBounce(c,
+a*2-e,0,d,e)*0.5+d*0.5+b}})}(jQuery);
+;/*
+ * jQuery UI Effects Blind 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Blind
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(b){b.effects.blind=function(c){return this.queue(function(){var a=b(this),g=["position","top","bottom","left","right"],f=b.effects.setMode(a,c.options.mode||"hide"),d=c.options.direction||"vertical";b.effects.save(a,g);a.show();var e=b.effects.createWrapper(a).css({overflow:"hidden"}),h=d=="vertical"?"height":"width";d=d=="vertical"?e.height():e.width();f=="show"&&e.css(h,0);var i={};i[h]=f=="show"?d:0;e.animate(i,c.duration,c.options.easing,function(){f=="hide"&&a.hide();b.effects.restore(a,
+g);b.effects.removeWrapper(a);c.callback&&c.callback.apply(a[0],arguments);a.dequeue()})})}})(jQuery);
+;/*
+ * jQuery UI Effects Bounce 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Bounce
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(e){e.effects.bounce=function(b){return this.queue(function(){var a=e(this),l=["position","top","bottom","left","right"],h=e.effects.setMode(a,b.options.mode||"effect"),d=b.options.direction||"up",c=b.options.distance||20,m=b.options.times||5,i=b.duration||250;/show|hide/.test(h)&&l.push("opacity");e.effects.save(a,l);a.show();e.effects.createWrapper(a);var f=d=="up"||d=="down"?"top":"left";d=d=="up"||d=="left"?"pos":"neg";c=b.options.distance||(f=="top"?a.outerHeight({margin:true})/3:a.outerWidth({margin:true})/
+3);if(h=="show")a.css("opacity",0).css(f,d=="pos"?-c:c);if(h=="hide")c/=m*2;h!="hide"&&m--;if(h=="show"){var g={opacity:1};g[f]=(d=="pos"?"+=":"-=")+c;a.animate(g,i/2,b.options.easing);c/=2;m--}for(g=0;g<m;g++){var j={},k={};j[f]=(d=="pos"?"-=":"+=")+c;k[f]=(d=="pos"?"+=":"-=")+c;a.animate(j,i/2,b.options.easing).animate(k,i/2,b.options.easing);c=h=="hide"?c*2:c/2}if(h=="hide"){g={opacity:0};g[f]=(d=="pos"?"-=":"+=")+c;a.animate(g,i/2,b.options.easing,function(){a.hide();e.effects.restore(a,l);e.effects.removeWrapper(a);
+b.callback&&b.callback.apply(this,arguments)})}else{j={};k={};j[f]=(d=="pos"?"-=":"+=")+c;k[f]=(d=="pos"?"+=":"-=")+c;a.animate(j,i/2,b.options.easing).animate(k,i/2,b.options.easing,function(){e.effects.restore(a,l);e.effects.removeWrapper(a);b.callback&&b.callback.apply(this,arguments)})}a.queue("fx",function(){a.dequeue()});a.dequeue()})}})(jQuery);
+;/*
+ * jQuery UI Effects Clip 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Clip
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(b){b.effects.clip=function(e){return this.queue(function(){var a=b(this),i=["position","top","bottom","left","right","height","width"],f=b.effects.setMode(a,e.options.mode||"hide"),c=e.options.direction||"vertical";b.effects.save(a,i);a.show();var d=b.effects.createWrapper(a).css({overflow:"hidden"});d=a[0].tagName=="IMG"?d:a;var g={size:c=="vertical"?"height":"width",position:c=="vertical"?"top":"left"};c=c=="vertical"?d.height():d.width();if(f=="show"){d.css(g.size,0);d.css(g.position,
+c/2)}var h={};h[g.size]=f=="show"?c:0;h[g.position]=f=="show"?0:c/2;d.animate(h,{queue:false,duration:e.duration,easing:e.options.easing,complete:function(){f=="hide"&&a.hide();b.effects.restore(a,i);b.effects.removeWrapper(a);e.callback&&e.callback.apply(a[0],arguments);a.dequeue()}})})}})(jQuery);
+;/*
+ * jQuery UI Effects Drop 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Drop
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(c){c.effects.drop=function(d){return this.queue(function(){var a=c(this),h=["position","top","bottom","left","right","opacity"],e=c.effects.setMode(a,d.options.mode||"hide"),b=d.options.direction||"left";c.effects.save(a,h);a.show();c.effects.createWrapper(a);var f=b=="up"||b=="down"?"top":"left";b=b=="up"||b=="left"?"pos":"neg";var g=d.options.distance||(f=="top"?a.outerHeight({margin:true})/2:a.outerWidth({margin:true})/2);if(e=="show")a.css("opacity",0).css(f,b=="pos"?-g:g);var i={opacity:e==
+"show"?1:0};i[f]=(e=="show"?b=="pos"?"+=":"-=":b=="pos"?"-=":"+=")+g;a.animate(i,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){e=="hide"&&a.hide();c.effects.restore(a,h);c.effects.removeWrapper(a);d.callback&&d.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
+;/*
+ * jQuery UI Effects Explode 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Explode
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(j){j.effects.explode=function(a){return this.queue(function(){var c=a.options.pieces?Math.round(Math.sqrt(a.options.pieces)):3,d=a.options.pieces?Math.round(Math.sqrt(a.options.pieces)):3;a.options.mode=a.options.mode=="toggle"?j(this).is(":visible")?"hide":"show":a.options.mode;var b=j(this).show().css("visibility","hidden"),g=b.offset();g.top-=parseInt(b.css("marginTop"),10)||0;g.left-=parseInt(b.css("marginLeft"),10)||0;for(var h=b.outerWidth(true),i=b.outerHeight(true),e=0;e<c;e++)for(var f=
+0;f<d;f++)b.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-f*(h/d),top:-e*(i/c)}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:h/d,height:i/c,left:g.left+f*(h/d)+(a.options.mode=="show"?(f-Math.floor(d/2))*(h/d):0),top:g.top+e*(i/c)+(a.options.mode=="show"?(e-Math.floor(c/2))*(i/c):0),opacity:a.options.mode=="show"?0:1}).animate({left:g.left+f*(h/d)+(a.options.mode=="show"?0:(f-Math.floor(d/2))*(h/d)),top:g.top+
+e*(i/c)+(a.options.mode=="show"?0:(e-Math.floor(c/2))*(i/c)),opacity:a.options.mode=="show"?1:0},a.duration||500);setTimeout(function(){a.options.mode=="show"?b.css({visibility:"visible"}):b.css({visibility:"visible"}).hide();a.callback&&a.callback.apply(b[0]);b.dequeue();j("div.ui-effects-explode").remove()},a.duration||500)})}})(jQuery);
+;/*
+ * jQuery UI Effects Fade 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Fade
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(b){b.effects.fade=function(a){return this.queue(function(){var c=b(this),d=b.effects.setMode(c,a.options.mode||"hide");c.animate({opacity:d},{queue:false,duration:a.duration,easing:a.options.easing,complete:function(){a.callback&&a.callback.apply(this,arguments);c.dequeue()}})})}})(jQuery);
+;/*
+ * jQuery UI Effects Fold 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Fold
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(c){c.effects.fold=function(a){return this.queue(function(){var b=c(this),j=["position","top","bottom","left","right"],d=c.effects.setMode(b,a.options.mode||"hide"),g=a.options.size||15,h=!!a.options.horizFirst,k=a.duration?a.duration/2:c.fx.speeds._default/2;c.effects.save(b,j);b.show();var e=c.effects.createWrapper(b).css({overflow:"hidden"}),f=d=="show"!=h,l=f?["width","height"]:["height","width"];f=f?[e.width(),e.height()]:[e.height(),e.width()];var i=/([0-9]+)%/.exec(g);if(i)g=parseInt(i[1],
+10)/100*f[d=="hide"?0:1];if(d=="show")e.css(h?{height:0,width:g}:{height:g,width:0});h={};i={};h[l[0]]=d=="show"?f[0]:g;i[l[1]]=d=="show"?f[1]:0;e.animate(h,k,a.options.easing).animate(i,k,a.options.easing,function(){d=="hide"&&b.hide();c.effects.restore(b,j);c.effects.removeWrapper(b);a.callback&&a.callback.apply(b[0],arguments);b.dequeue()})})}})(jQuery);
+;/*
+ * jQuery UI Effects Highlight 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Highlight
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(b){b.effects.highlight=function(c){return this.queue(function(){var a=b(this),e=["backgroundImage","backgroundColor","opacity"],d=b.effects.setMode(a,c.options.mode||"show"),f={backgroundColor:a.css("backgroundColor")};if(d=="hide")f.opacity=0;b.effects.save(a,e);a.show().css({backgroundImage:"none",backgroundColor:c.options.color||"#ffff99"}).animate(f,{queue:false,duration:c.duration,easing:c.options.easing,complete:function(){d=="hide"&&a.hide();b.effects.restore(a,e);d=="show"&&!b.support.opacity&&
+this.style.removeAttribute("filter");c.callback&&c.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
+;/*
+ * jQuery UI Effects Pulsate 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Pulsate
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(d){d.effects.pulsate=function(a){return this.queue(function(){var b=d(this),c=d.effects.setMode(b,a.options.mode||"show");times=(a.options.times||5)*2-1;duration=a.duration?a.duration/2:d.fx.speeds._default/2;isVisible=b.is(":visible");animateTo=0;if(!isVisible){b.css("opacity",0).show();animateTo=1}if(c=="hide"&&isVisible||c=="show"&&!isVisible)times--;for(c=0;c<times;c++){b.animate({opacity:animateTo},duration,a.options.easing);animateTo=(animateTo+1)%2}b.animate({opacity:animateTo},duration,
+a.options.easing,function(){animateTo==0&&b.hide();a.callback&&a.callback.apply(this,arguments)});b.queue("fx",function(){b.dequeue()}).dequeue()})}})(jQuery);
+;/*
+ * jQuery UI Effects Scale 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Scale
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(c){c.effects.puff=function(b){return this.queue(function(){var a=c(this),e=c.effects.setMode(a,b.options.mode||"hide"),g=parseInt(b.options.percent,10)||150,h=g/100,i={height:a.height(),width:a.width()};c.extend(b.options,{fade:true,mode:e,percent:e=="hide"?g:100,from:e=="hide"?i:{height:i.height*h,width:i.width*h}});a.effect("scale",b.options,b.duration,b.callback);a.dequeue()})};c.effects.scale=function(b){return this.queue(function(){var a=c(this),e=c.extend(true,{},b.options),g=c.effects.setMode(a,
+b.options.mode||"effect"),h=parseInt(b.options.percent,10)||(parseInt(b.options.percent,10)==0?0:g=="hide"?0:100),i=b.options.direction||"both",f=b.options.origin;if(g!="effect"){e.origin=f||["middle","center"];e.restore=true}f={height:a.height(),width:a.width()};a.from=b.options.from||(g=="show"?{height:0,width:0}:f);h={y:i!="horizontal"?h/100:1,x:i!="vertical"?h/100:1};a.to={height:f.height*h.y,width:f.width*h.x};if(b.options.fade){if(g=="show"){a.from.opacity=0;a.to.opacity=1}if(g=="hide"){a.from.opacity=
+1;a.to.opacity=0}}e.from=a.from;e.to=a.to;e.mode=g;a.effect("size",e,b.duration,b.callback);a.dequeue()})};c.effects.size=function(b){return this.queue(function(){var a=c(this),e=["position","top","bottom","left","right","width","height","overflow","opacity"],g=["position","top","bottom","left","right","overflow","opacity"],h=["width","height","overflow"],i=["fontSize"],f=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],k=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],
+p=c.effects.setMode(a,b.options.mode||"effect"),n=b.options.restore||false,m=b.options.scale||"both",l=b.options.origin,j={height:a.height(),width:a.width()};a.from=b.options.from||j;a.to=b.options.to||j;if(l){l=c.effects.getBaseline(l,j);a.from.top=(j.height-a.from.height)*l.y;a.from.left=(j.width-a.from.width)*l.x;a.to.top=(j.height-a.to.height)*l.y;a.to.left=(j.width-a.to.width)*l.x}var d={from:{y:a.from.height/j.height,x:a.from.width/j.width},to:{y:a.to.height/j.height,x:a.to.width/j.width}};
+if(m=="box"||m=="both"){if(d.from.y!=d.to.y){e=e.concat(f);a.from=c.effects.setTransition(a,f,d.from.y,a.from);a.to=c.effects.setTransition(a,f,d.to.y,a.to)}if(d.from.x!=d.to.x){e=e.concat(k);a.from=c.effects.setTransition(a,k,d.from.x,a.from);a.to=c.effects.setTransition(a,k,d.to.x,a.to)}}if(m=="content"||m=="both")if(d.from.y!=d.to.y){e=e.concat(i);a.from=c.effects.setTransition(a,i,d.from.y,a.from);a.to=c.effects.setTransition(a,i,d.to.y,a.to)}c.effects.save(a,n?e:g);a.show();c.effects.createWrapper(a);
+a.css("overflow","hidden").css(a.from);if(m=="content"||m=="both"){f=f.concat(["marginTop","marginBottom"]).concat(i);k=k.concat(["marginLeft","marginRight"]);h=e.concat(f).concat(k);a.find("*[width]").each(function(){child=c(this);n&&c.effects.save(child,h);var o={height:child.height(),width:child.width()};child.from={height:o.height*d.from.y,width:o.width*d.from.x};child.to={height:o.height*d.to.y,width:o.width*d.to.x};if(d.from.y!=d.to.y){child.from=c.effects.setTransition(child,f,d.from.y,child.from);
+child.to=c.effects.setTransition(child,f,d.to.y,child.to)}if(d.from.x!=d.to.x){child.from=c.effects.setTransition(child,k,d.from.x,child.from);child.to=c.effects.setTransition(child,k,d.to.x,child.to)}child.css(child.from);child.animate(child.to,b.duration,b.options.easing,function(){n&&c.effects.restore(child,h)})})}a.animate(a.to,{queue:false,duration:b.duration,easing:b.options.easing,complete:function(){a.to.opacity===0&&a.css("opacity",a.from.opacity);p=="hide"&&a.hide();c.effects.restore(a,
+n?e:g);c.effects.removeWrapper(a);b.callback&&b.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
+;/*
+ * jQuery UI Effects Shake 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Shake
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(d){d.effects.shake=function(a){return this.queue(function(){var b=d(this),j=["position","top","bottom","left","right"];d.effects.setMode(b,a.options.mode||"effect");var c=a.options.direction||"left",e=a.options.distance||20,l=a.options.times||3,f=a.duration||a.options.duration||140;d.effects.save(b,j);b.show();d.effects.createWrapper(b);var g=c=="up"||c=="down"?"top":"left",h=c=="up"||c=="left"?"pos":"neg";c={};var i={},k={};c[g]=(h=="pos"?"-=":"+=")+e;i[g]=(h=="pos"?"+=":"-=")+e*2;k[g]=
+(h=="pos"?"-=":"+=")+e*2;b.animate(c,f,a.options.easing);for(e=1;e<l;e++)b.animate(i,f,a.options.easing).animate(k,f,a.options.easing);b.animate(i,f,a.options.easing).animate(c,f/2,a.options.easing,function(){d.effects.restore(b,j);d.effects.removeWrapper(b);a.callback&&a.callback.apply(this,arguments)});b.queue("fx",function(){b.dequeue()});b.dequeue()})}})(jQuery);
+;/*
+ * jQuery UI Effects Slide 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Slide
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(c){c.effects.slide=function(d){return this.queue(function(){var a=c(this),h=["position","top","bottom","left","right"],f=c.effects.setMode(a,d.options.mode||"show"),b=d.options.direction||"left";c.effects.save(a,h);a.show();c.effects.createWrapper(a).css({overflow:"hidden"});var g=b=="up"||b=="down"?"top":"left";b=b=="up"||b=="left"?"pos":"neg";var e=d.options.distance||(g=="top"?a.outerHeight({margin:true}):a.outerWidth({margin:true}));if(f=="show")a.css(g,b=="pos"?isNaN(e)?"-"+e:-e:e);
+var i={};i[g]=(f=="show"?b=="pos"?"+=":"-=":b=="pos"?"-=":"+=")+e;a.animate(i,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){f=="hide"&&a.hide();c.effects.restore(a,h);c.effects.removeWrapper(a);d.callback&&d.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
+;/*
+ * jQuery UI Effects Transfer 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Transfer
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(e){e.effects.transfer=function(a){return this.queue(function(){var b=e(this),c=e(a.options.to),d=c.offset();c={top:d.top,left:d.left,height:c.innerHeight(),width:c.innerWidth()};d=b.offset();var f=e('<div class="ui-effects-transfer"></div>').appendTo(document.body).addClass(a.options.className).css({top:d.top,left:d.left,height:b.innerHeight(),width:b.innerWidth(),position:"absolute"}).animate(c,a.duration,a.options.easing,function(){f.remove();a.callback&&a.callback.apply(b[0],arguments);
+b.dequeue()})})}})(jQuery);
+;
\ No newline at end of file
diff --git a/ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js b/ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js
new file mode 100644
index 00000000000..2cb7fee0e2e
--- /dev/null
+++ b/ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js
@@ -0,0 +1,6 @@
+/*! 
+ * jquery.event.drag - v 2.0.0 
+ * Copyright (c) 2010 Three Dub Media - http://threedubmedia.com
+ * Open Source MIT License - http://threedubmedia.com/code/license
+ */
+;(function(f){f.fn.drag=function(b,a,d){var e=typeof b=="string"?b:"",k=f.isFunction(b)?b:f.isFunction(a)?a:null;if(e.indexOf("drag")!==0)e="drag"+e;d=(b==k?a:d)||{};return k?this.bind(e,d,k):this.trigger(e)};var i=f.event,h=i.special,c=h.drag={defaults:{which:1,distance:0,not:":input",handle:null,relative:false,drop:true,click:false},datakey:"dragdata",livekey:"livedrag",add:function(b){var a=f.data(this,c.datakey),d=b.data||{};a.related+=1;if(!a.live&&b.selector){a.live=true;i.add(this,"draginit."+ c.livekey,c.delegate)}f.each(c.defaults,function(e){if(d[e]!==undefined)a[e]=d[e]})},remove:function(){f.data(this,c.datakey).related-=1},setup:function(){if(!f.data(this,c.datakey)){var b=f.extend({related:0},c.defaults);f.data(this,c.datakey,b);i.add(this,"mousedown",c.init,b);this.attachEvent&&this.attachEvent("ondragstart",c.dontstart)}},teardown:function(){if(!f.data(this,c.datakey).related){f.removeData(this,c.datakey);i.remove(this,"mousedown",c.init);i.remove(this,"draginit",c.delegate);c.textselect(true); this.detachEvent&&this.detachEvent("ondragstart",c.dontstart)}},init:function(b){var a=b.data,d;if(!(a.which>0&&b.which!=a.which))if(!f(b.target).is(a.not))if(!(a.handle&&!f(b.target).closest(a.handle,b.currentTarget).length)){a.propagates=1;a.interactions=[c.interaction(this,a)];a.target=b.target;a.pageX=b.pageX;a.pageY=b.pageY;a.dragging=null;d=c.hijack(b,"draginit",a);if(a.propagates){if((d=c.flatten(d))&&d.length){a.interactions=[];f.each(d,function(){a.interactions.push(c.interaction(this,a))})}a.propagates= a.interactions.length;a.drop!==false&&h.drop&&h.drop.handler(b,a);c.textselect(false);i.add(document,"mousemove mouseup",c.handler,a);return false}}},interaction:function(b,a){return{drag:b,callback:new c.callback,droppable:[],offset:f(b)[a.relative?"position":"offset"]()||{top:0,left:0}}},handler:function(b){var a=b.data;switch(b.type){case !a.dragging&&"mousemove":if(Math.pow(b.pageX-a.pageX,2)+Math.pow(b.pageY-a.pageY,2)<Math.pow(a.distance,2))break;b.target=a.target;c.hijack(b,"dragstart",a); if(a.propagates)a.dragging=true;case "mousemove":if(a.dragging){c.hijack(b,"drag",a);if(a.propagates){a.drop!==false&&h.drop&&h.drop.handler(b,a);break}b.type="mouseup"}case "mouseup":i.remove(document,"mousemove mouseup",c.handler);if(a.dragging){a.drop!==false&&h.drop&&h.drop.handler(b,a);c.hijack(b,"dragend",a)}c.textselect(true);if(a.click===false&&a.dragging){jQuery.event.triggered=true;setTimeout(function(){jQuery.event.triggered=false},20);a.dragging=false}break}},delegate:function(b){var a= [],d,e=f.data(this,"events")||{};f.each(e.live||[],function(k,j){if(j.preType.indexOf("drag")===0)if(d=f(b.target).closest(j.selector,b.currentTarget)[0]){i.add(d,j.origType+"."+c.livekey,j.origHandler,j.data);f.inArray(d,a)<0&&a.push(d)}});if(!a.length)return false;return f(a).bind("dragend."+c.livekey,function(){i.remove(this,"."+c.livekey)})},hijack:function(b,a,d,e,k){if(d){var j={event:b.originalEvent,type:b.type},n=a.indexOf("drop")?"drag":"drop",l,o=e||0,g,m;e=!isNaN(e)?e:d.interactions.length; b.type=a;b.originalEvent=null;d.results=[];do if(g=d.interactions[o])if(!(a!=="dragend"&&g.cancelled)){m=c.properties(b,d,g);g.results=[];f(k||g[n]||d.droppable).each(function(q,p){l=(m.target=p)?i.handle.call(p,b,m):null;if(l===false){if(n=="drag"){g.cancelled=true;d.propagates-=1}if(a=="drop")g[n][q]=null}else if(a=="dropinit")g.droppable.push(c.element(l)||p);if(a=="dragstart")g.proxy=f(c.element(l)||g.drag)[0];g.results.push(l);delete b.result;if(a!=="dropinit")return l});d.results[o]=c.flatten(g.results); if(a=="dropinit")g.droppable=c.flatten(g.droppable);a=="dragstart"&&!g.cancelled&&m.update()}while(++o<e);b.type=j.type;b.originalEvent=j.event;return c.flatten(d.results)}},properties:function(b,a,d){var e=d.callback;e.drag=d.drag;e.proxy=d.proxy||d.drag;e.startX=a.pageX;e.startY=a.pageY;e.deltaX=b.pageX-a.pageX;e.deltaY=b.pageY-a.pageY;e.originalX=d.offset.left;e.originalY=d.offset.top;e.offsetX=b.pageX-(a.pageX-e.originalX);e.offsetY=b.pageY-(a.pageY-e.originalY);e.drop=c.flatten((d.drop||[]).slice()); e.available=c.flatten((d.droppable||[]).slice());return e},element:function(b){if(b&&(b.jquery||b.nodeType==1))return b},flatten:function(b){return f.map(b,function(a){return a&&a.jquery?f.makeArray(a):a&&a.length?c.flatten(a):a})},textselect:function(b){f(document)[b?"unbind":"bind"]("selectstart",c.dontstart).attr("unselectable",b?"off":"on").css("MozUserSelect",b?"":"none")},dontstart:function(){return false},callback:function(){}};c.callback.prototype={update:function(){h.drop&&this.available.length&& f.each(this.available,function(b){h.drop.locate(this,b)})}};h.draginit=h.dragstart=h.dragend=c})(jQuery);
\ No newline at end of file
diff --git a/ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.js b/ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.js
new file mode 100644
index 00000000000..edf0208feab
--- /dev/null
+++ b/ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.js
@@ -0,0 +1,84 @@
+(function(e){function G(){var d=!1,e=!1;this.stopPropagation=function(){d=!0};this.isPropagationStopped=function(){return d};this.stopImmediatePropagation=function(){e=!0};this.isImmediatePropagationStopped=function(){return e}}function A(){this.__nonDataRow=!0}function ba(){this.__group=!0;this.__updated=!1;this.count=0;this.title=this.value=null;this.collapsed=!1;this.totals=null}function g(){this.__groupTotals=!0;this.group=null}function f(){var d=null;this.isActive=function(e){return e?d===e:
+null!==d};this.activate=function(e){if(e!==d){if(null!==d)throw"SlickGrid.EditorLock.activate: an editController is still active, can't activate another editController";if(!e.commitCurrentEdit)throw"SlickGrid.EditorLock.activate: editController must implement .commitCurrentEdit()";if(!e.cancelCurrentEdit)throw"SlickGrid.EditorLock.activate: editController must implement .cancelCurrentEdit()";d=e}};this.deactivate=function(e){if(d!==e)throw"SlickGrid.EditorLock.deactivate: specified editController is not the currently active one";
+d=null};this.commitCurrentEdit=function(){return d?d.commitCurrentEdit():!0};this.cancelCurrentEdit=function(){return d?d.cancelCurrentEdit():!0}}e.extend(!0,window,{Slick:{Event:function(){var d=[];this.subscribe=function(e){d.push(e)};this.unsubscribe=function(e){for(var f=d.length-1;f>=0;f--)d[f]===e&&d.splice(f,1)};this.notify=function(e,f,g){for(var f=f||new G,g=g||this,A,ma=0;ma<d.length&&!f.isPropagationStopped()&&!f.isImmediatePropagationStopped();ma++)A=d[ma].call(g,f,e);return A}},EventData:G,
+EventHandler:function(){var d=[];this.subscribe=function(e,f){d.push({event:e,handler:f});e.subscribe(f)};this.unsubscribe=function(e,f){for(var g=d.length;g--;)if(d[g].event===e&&d[g].handler===f){d.splice(g,1);e.unsubscribe(f);break}};this.unsubscribeAll=function(){for(var e=d.length;e--;)d[e].event.unsubscribe(d[e].handler);d=[]}},Range:function(d,e,f,g){if(f===void 0&&g===void 0){f=d;g=e}this.fromRow=Math.min(d,f);this.fromCell=Math.min(e,g);this.toRow=Math.max(d,f);this.toCell=Math.max(e,g);
+this.isSingleRow=function(){return this.fromRow==this.toRow};this.isSingleCell=function(){return this.fromRow==this.toRow&&this.fromCell==this.toCell};this.contains=function(d,e){return d>=this.fromRow&&d<=this.toRow&&e>=this.fromCell&&e<=this.toCell};this.toString=function(){return this.isSingleCell()?"("+this.fromRow+":"+this.fromCell+")":"("+this.fromRow+":"+this.fromCell+" - "+this.toRow+":"+this.toCell+")"}},NonDataRow:A,Group:ba,GroupTotals:g,EditorLock:f,GlobalEditorLock:new f}});ba.prototype=
+new A;ba.prototype.equals=function(d){return this.value===d.value&&this.count===d.count&&this.collapsed===d.collapsed};g.prototype=new A})(jQuery);/*
+
+ (c) 2009-2012 Michael Leibman
+ michael{dot}leibman{at}gmail{dot}com
+ http://github.com/mleibman/slickgrid
+
+ Distributed under MIT license.
+ All rights reserved.
+
+ SlickGrid v2.0
+
+ NOTES:
+     Cell/row DOM manipulations are done directly bypassing jQuery's DOM manipulation methods.
+     This increases the speed dramatically, but can only be done safely because there are no event handlers
+     or data associated with any cell/row DOM nodes.  Cell editors must make sure they implement .destroy()
+     and do proper cleanup.
+*/
+if("undefined"===typeof jQuery)throw"SlickGrid requires jquery module to be loaded";if(!jQuery.fn.drag)throw"SlickGrid requires jquery.event.drag module to be loaded";if("undefined"===typeof Slick)throw"slick.core.js not loaded";
+(function(e){e.extend(!0,window,{Slick:{Grid:function(ba,g,f,d){function fb(){if(!H){H=true;U=parseFloat(e.css(n[0],"width",true));Vb();ma(t);d.enableTextSelectionOnCells||v.bind("selectstart.ui",function(a){return e(a.target).is("input,textarea")});hb();Wb();ib();K();Xb();n.bind("resize.slickgrid",K);v.bind("scroll.slickgrid",jb);ca.bind("contextmenu.slickgrid",Yb).bind("click.slickgrid",Zb);Ka.bind("keydown.slickgrid",kb);B.bind("keydown.slickgrid",kb).bind("click.slickgrid",$b).bind("dblclick.slickgrid",
+ac).bind("contextmenu.slickgrid",bc).bind("draginit",cc).bind("dragstart",dc).bind("drag",ec).bind("dragend",fc).delegate(".slick-cell","mouseenter",gc).delegate(".slick-cell","mouseleave",hc)}}function gb(a){for(var b=O.length;b>=0;b--)if(O[b]===a){O[b].destroy&&O[b].destroy();O.splice(b,1);break}}function Ub(){var a=e("<div style='position:absolute; top:-10000px; left:-10000px; width:100px; height:100px; overflow:scroll;'></div>").appendTo("body"),b={width:a.width()-a[0].clientWidth,height:a.height()-
+a[0].clientHeight};a.remove();return b}function Ja(a){for(var b=P,c=na?U-G.width:U,j=0,e=f.length;e--;)j=j+(f[e].width||La.width);P=d.fullWidthRows?Math.max(j,c):j;if(P!=b){B.width(P);da.width(P);lb=P>U-G.width}(P!=b||a)&&Ma()}function ma(a){a&&a.jquery&&a.attr("unselectable","on").css("MozUserSelect","none").bind("selectstart.ui",function(){return false})}function ic(){for(var a=1E6,b=e.browser.mozilla?5E6:1E9,c=e("<div style='display:none' />").appendTo(document.body);a<=b;){c.css("height",a+1E6);
+if(c.height()!==a+1E6)break;else a=a+1E6}c.remove();return a}function Xb(){for(var a=B[0];(a=a.parentNode)!=document.body&&a!=null;)(a==v[0]||a.scrollWidth!=a.clientWidth||a.scrollHeight!=a.clientHeight)&&e(a).bind("scroll.slickgrid",mb)}function hb(){function a(){e(this).addClass("ui-state-hover")}function b(){e(this).removeClass("ui-state-hover")}t.empty();da.empty();I={};for(var c=0;c<f.length;c++){var j=f[c]=e.extend({},La,f[c]);I[j.id]=c;var oa=e("<div class='ui-state-default slick-header-column' id='"+
+z+j.id+"' />").html("<span class='slick-column-name'>"+j.name+"</span>").width(j.width-V).attr("title",j.toolTip||j.name||"").data("fieldId",j.id).addClass(j.headerCssClass||"").appendTo(t);(d.enableColumnReorder||j.sortable)&&oa.hover(a,b);j.sortable&&oa.append("<span class='slick-sort-indicator' />");d.showHeaderRow&&e("<div class='ui-state-default slick-headerrow-column l"+c+" r"+c+"'></div>").appendTo(da)}d.showHeaderRow&&e("<div style='display:block;height:1px;width:10000px;position:absolute;top:0;left:0;'></div>").appendTo(Q);
+ta(r);nb();d.enableColumnReorder&&jc()}function Wb(){t.click(function(a){a.metaKey=a.metaKey||a.ctrlKey;if(!e(a.target).hasClass("slick-resizable-handle")){var b=e(a.target).closest(".slick-header-column");if(b.length){b=f[Na(b.data("fieldId"))];if(b.sortable&&p().commitCurrentEdit()){for(var c=null,j=0;j<r.length;j++)if(r[j].columnId==b.id){c=r[j];c.sortAsc=!c.sortAsc;break}if(a.metaKey&&d.multiColumnSort)c&&r.splice(j,1);else{if(!a.shiftKey&&!a.metaKey||!d.multiColumnSort)r=[];if(c)r.length==0&&
+r.push(c);else{c={columnId:b.id,sortAsc:true};r.push(c)}}ta(r);d.multiColumnSort?l(i.onSort,{multiColumnSort:true,sortCols:e.map(r,function(a){return{sortCol:f[I[a.columnId]],sortAsc:a.sortAsc}})},a):l(i.onSort,{multiColumnSort:false,sortCol:b,sortAsc:c.sortAsc},a)}}}})}function jc(){t.sortable({containment:"parent",axis:"x",cursor:"default",tolerance:"intersection",helper:"clone",placeholder:"slick-sortable-placeholder ui-state-default slick-header-column",forcePlaceholderSize:true,start:function(a,
+b){e(b.helper).addClass("slick-header-column-active")},beforeStop:function(a,b){e(b.helper).removeClass("slick-header-column-active")},stop:function(a){if(p().commitCurrentEdit()){for(var b=t.sortable("toArray"),c=[],j=0;j<b.length;j++)c.push(f[Na(b[j].replace(z,""))]);ob(c);l(i.onColumnsReordered,{});a.stopPropagation();nb()}else e(this).sortable("cancel")}})}function nb(){var a,b,c,j,oa,pb,h,g;j=t.children();j.find(".slick-resizable-handle").remove();j.each(function(a){if(f[a].resizable){h===void 0&&
+(h=a);g=a}});h!==void 0&&j.each(function(k,m){if(!(k<h||d.forceFitColumns&&k>=g)){e(m);e("<div class='slick-resizable-handle' />").appendTo(m).bind("dragstart",function(g){if(!p().commitCurrentEdit())return false;c=g.pageX;e(this).parent().addClass("slick-header-column-active");var h=g=null;j.each(function(a,b){f[a].previousWidth=e(b).outerWidth()});if(d.forceFitColumns){h=g=0;for(a=k+1;a<j.length;a++){b=f[a];if(b.resizable){h!==null&&(h=b.maxWidth?h+(b.maxWidth-b.previousWidth):null);g=g+(b.previousWidth-
+Math.max(b.minWidth||0,R))}}}var pa=0,i=0;for(a=0;a<=k;a++){b=f[a];if(b.resizable){i!==null&&(i=b.maxWidth?i+(b.maxWidth-b.previousWidth):null);pa=pa+(b.previousWidth-Math.max(b.minWidth||0,R))}}g===null&&(g=1E5);pa===null&&(pa=1E5);h===null&&(h=1E5);i===null&&(i=1E5);pb=c+Math.min(g,i);oa=c-Math.min(pa,h)}).bind("drag",function(e){var g=Math.min(pb,Math.max(oa,e.pageX))-c,h;if(g<0){h=g;for(a=k;a>=0;a--){b=f[a];if(b.resizable){e=Math.max(b.minWidth||0,R);if(h&&b.previousWidth+h<e){h=h+(b.previousWidth-
+e);b.width=e}else{b.width=b.previousWidth+h;h=0}}}if(d.forceFitColumns){h=-g;for(a=k+1;a<j.length;a++){b=f[a];if(b.resizable)if(h&&b.maxWidth&&b.maxWidth-b.previousWidth<h){h=h-(b.maxWidth-b.previousWidth);b.width=b.maxWidth}else{b.width=b.previousWidth+h;h=0}}}}else{h=g;for(a=k;a>=0;a--){b=f[a];if(b.resizable)if(h&&b.maxWidth&&b.maxWidth-b.previousWidth<h){h=h-(b.maxWidth-b.previousWidth);b.width=b.maxWidth}else{b.width=b.previousWidth+h;h=0}}if(d.forceFitColumns){h=-g;for(a=k+1;a<j.length;a++){b=
+f[a];if(b.resizable){e=Math.max(b.minWidth||0,R);if(h&&b.previousWidth+h<e){h=h+(b.previousWidth-e);b.width=e}else{b.width=b.previousWidth+h;h=0}}}}}qb();d.syncColumnCellResize&&Ma()}).bind("dragend",function(){var c;e(this).parent().removeClass("slick-header-column-active");for(a=0;a<j.length;a++){b=f[a];c=e(j[a]).outerWidth();b.previousWidth!==c&&b.rerenderOnResize&&W()}Ja(true);J();l(i.onColumnsResized,{})})}})}function Oa(a){var b=0;e.each(["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],
+function(c,j){b=b+(parseFloat(a.css(j))||0)});return b}function Vb(){var a,b=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],c=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"];a=e("<div class='ui-state-default slick-header-column' style='visibility:hidden'>-</div>").appendTo(t);V=Pa=0;e.each(b,function(b,c){V=V+(parseFloat(a.css(c))||0)});e.each(c,function(b,c){Pa=Pa+(parseFloat(a.css(c))||0)});a.remove();var j=e("<div class='slick-row' />").appendTo(B);a=e("<div class='slick-cell' id='' style='visibility:hidden'>-</div>").appendTo(j);
+ua=va=0;e.each(b,function(b,c){ua=ua+(parseFloat(a.css(c))||0)});e.each(c,function(b,c){va=va+(parseFloat(a.css(c))||0)});j.remove();R=Math.max(V,ua)}function ib(){X=e("<style type='text/css' rel='stylesheet' />").appendTo(e("head"));for(var a=["."+z+" .slick-header-column { left: 1000px; }","."+z+" .slick-top-panel { height:"+d.topPanelHeight+"px; }","."+z+" .slick-headerrow-columns { height:"+d.headerRowHeight+"px; }","."+z+" .slick-cell { height:"+(d.rowHeight-va)+"px; }","."+z+" .slick-row { height:"+
+d.rowHeight+"px; }"],b=0;b<f.length;b++){a.push("."+z+" .l"+b+" { }");a.push("."+z+" .r"+b+" { }")}X[0].styleSheet?X[0].styleSheet.cssText=a.join(" "):X[0].appendChild(document.createTextNode(a.join(" ")))}function l(a,b,c){c=c||new Slick.EventData;b=b||{};b.grid=i;return a.notify(b,c,i)}function p(){return d.editorLock}function Na(a){return I[a]}function Qa(){var a,b,c=[],j=0,d=0,e,h=na?U-G.width:U;for(a=0;a<f.length;a++){b=f[a];c.push(b.width);d=d+b.width;b.resizable&&(j=j+(b.width-Math.max(b.minWidth,
+R)))}for(e=d;d>h&&j;){var g=(d-h)/j;for(a=0;a<f.length&&d>h;a++){b=f[a];var k=c[a];if(b.resizable&&!(k<=b.minWidth||k<=R)){b=Math.max(b.minWidth,R);var i=Math.floor(g*(k-b))||1,i=Math.min(i,k-b),d=d-i,j=j-i;c[a]=c[a]-i}}if(e==d)break;e=d}for(e=d;d<h;){j=h/d;for(a=0;a<f.length&&d<h;a++){b=f[a];if(b.resizable&&!(b.maxWidth<=b.width)){g=Math.min(Math.floor(j*b.width)-b.width,b.maxWidth-b.width||1E6)||1;d=d+g;c[a]=c[a]+g}}if(e==d)break;e=d}d=false;for(a=0;a<f.length;a++){f[a].rerenderOnResize&&f[a].width!=
+c[a]&&(d=true);f[a].width=c[a]}qb();Ja(true);if(d){W();J()}}function qb(){if(H)for(var a,b=0,c=t.children(),d=c.length;b<d;b++){a=e(c[b]);a.width()!==f[b].width-V&&a.width(f[b].width-V)}}function Ma(){for(var a,b,c=0,d,e=0;e<f.length;e++){d=f[e].width;b=e;if(!Y){var g=document.styleSheets;for(a=0;a<g.length;a++)if((g[a].ownerNode||g[a].owningElement)==X[0]){Y=g[a];break}if(!Y)throw Error("Cannot find stylesheet.");Ra=[];Sa=[];var g=Y.cssRules||Y.rules,h=void 0,h=void 0;for(a=0;a<g.length;a++){var i=
+g[a].selectorText;if(h=/\.l\d+/.exec(i)){h=parseInt(h[0].substr(2,h[0].length-2),10);Ra[h]=g[a]}else if(h=/\.r\d+/.exec(i)){h=parseInt(h[0].substr(2,h[0].length-2),10);Sa[h]=g[a]}}}a=Ra[b];b=Sa[b];a.style.left=c+"px";b.style.right=P-c-d+"px";c=c+f[e].width}}function ta(a){r=a;var b=t.children();b.removeClass("slick-header-column-sorted").find(".slick-sort-indicator").removeClass("slick-sort-indicator-asc slick-sort-indicator-desc");e.each(r,function(a,d){if(d.sortAsc==null)d.sortAsc=true;var e=I[d.columnId];
+e!=null&&b.eq(e).addClass("slick-header-column-sorted").find(".slick-sort-indicator").addClass(d.sortAsc?"slick-sort-indicator-asc":"slick-sort-indicator-desc")})}function rb(a,b){Ta=[];for(var c={},j=0;j<b.length;j++)for(var e=b[j].fromRow;e<=b[j].toRow;e++){c[e]||Ta.push(e);c[e]={};for(var g=b[j].fromCell;g<=b[j].toCell;g++)if(sb(e,g))c[e][f[g].id]=d.selectedCellCssClass}tb(d.selectedCellCssClass,c);l(i.onSelectedRowsChanged,{rows:ub()},a)}function ob(a){f=a;if(H){W();hb();X.remove();Y=null;ib();
+K();Ma();jb()}}function q(){return g.getLength?g.getLength():g.length}function C(a){return g.getItem?g.getItem(a):g[a]}function ea(a){var b=w;fa=Math.min(ga-1,Math.floor(a/ha));w=Math.round(fa*wa);a=a-w;if(w!=b){var c=xa(a);vb(c.top,c.bottom);for(var e in x)x[e].style.top=e*d.rowHeight-w+"px"}if(ia!=a){Z=ia+b<a+w?1:-1;v[0].scrollTop=Ua=y=ia=a;l(i.onViewportChanged,{})}}function ya(a,b){var c=g.getItemMetadata&&g.getItemMetadata(a),e=c&&c.columns&&(c.columns[b.id]||c.columns[I[b.id]]);return e&&e.formatter||
+c&&c.formatter||b.formatter||d.formatterFactory&&d.formatterFactory.getFormatter(b)||d.defaultFormatter}function wb(a,b){var c=f[b],e=g.getItemMetadata&&g.getItemMetadata(a);return(e=e&&e.columns)&&e[c.id]&&e[c.id].editor!==void 0?e[c.id].editor:e&&e[b]&&e[b].editor!==void 0?e[b].editor:c.editor||d.editorFactory&&d.editorFactory.getEditor(c)}function za(a,b){return d.dataItemColumnValueExtractor?d.dataItemColumnValueExtractor(a,b):a[b.field]}function vb(a){for(var b in x)(b=parseInt(b,10))!==m&&(b<
+a.top||b>a.bottom)&&Aa(b)}function W(){k&&L();for(var a in x)Aa(a)}function Aa(a){var b=x[a];if(b){B[0].removeChild(b);delete x[a];delete Ba[a];Va--;xb++}}function yb(a){var b,c;if(a&&a.length){b=Z=0;for(c=a.length;b<c;b++){k&&m===a[b]&&L();x[a[b]]&&Aa(a[b])}}}function zb(a){yb([a])}function Wa(a){if(x[a]){var b=0;e(x[a]).children().each(function(c){var d=f[b],e=C(a);a===m&&c===u&&k?k.loadValue(C(m)):this.innerHTML=e?ya(a,d)(a,b,za(e,d),d,C(a)):"";b=b+$(a,c)});Xa(a)}}function K(){if(H){s=d.autoHeight?
+d.rowHeight*(q()+(d.enableAddRow?1:0)+(d.leaveSpaceForNewRows?Ca-1:0)):parseFloat(e.css(n[0],"height",true))-parseFloat(e.css(ca[0],"height"))-Oa(ca)-(d.showTopPanel?d.topPanelHeight+Oa(aa):0)-(d.showHeaderRow?d.headerRowHeight+Oa(Q):0);Ca=Math.ceil(s/d.rowHeight);U=parseFloat(e.css(n[0],"width",true));v.height(s);d.forceFitColumns&&Qa();Da();J()}}function Da(){if(H){Ya=q()+(d.enableAddRow?1:0)+(d.leaveSpaceForNewRows?Ca-1:0);var a=na;na=!d.autoHeight&&Ya*d.rowHeight>s;var b=d.enableAddRow?q():q()-
+1,c;for(c in x)c>=b&&Aa(c);b=M;N=Math.max(d.rowHeight*Ya,s-G.height);if(N<A){M=ha=N;ga=1;wa=0}else{M=A;ha=M/100;ga=Math.floor(N/ha);wa=(N-M)/(ga-1)}if(M!==b){B.css("height",M);y=v[0].scrollTop}c=y+w<=N-s;N==0||y==0?fa=w=0:c?ea(y+w):ea(N-s);M!=b&&d.autoHeight&&K();d.forceFitColumns&&a!=na&&Qa();Ja(false)}}function xa(a){a==null&&(a=y);return{top:Math.floor((a+w)/d.rowHeight),bottom:Math.ceil((a+w+s)/d.rowHeight)}}function Ab(a){var a=xa(a),b=Math.round(s/d.rowHeight);if(Z==-1){a.top=a.top-b;a.bottom=
+a.bottom+3}else if(Z==1){a.top=a.top-3;a.bottom=a.bottom+b}else{a.top=a.top-3;a.bottom=a.bottom+3}a.top=Math.max(0,a.top);a.bottom=Math.min(d.enableAddRow?q():q()-1,a.bottom);return a}function Bb(){if(d.enableAsyncPostRender){clearTimeout(Za);Za=setTimeout(Cb,d.asyncPostRenderDelay)}}function Xa(a){delete Ba[a];ja=Math.min(ja,a);qa=Math.max(qa,a);Bb()}function J(){if(H){var a=xa(),b=Ab();vb(b);var c,e,i=B[0];e=[];var k=[],h=false;for(c=b.top;c<=b.bottom;c++)if(!x[c]){Va++;k.push(c);var l=e,n=c,v=
+C(n),p=void 0,p="slick-row "+(n<q()&&!v?" loading":"")+(n%2==1?" odd":" even"),s=g.getItemMetadata&&g.getItemMetadata(n);s&&s.cssClasses&&(p=p+(" "+s.cssClasses));l.push("<div class='ui-widget-content "+p+"' row='"+n+"' style='top:"+(d.rowHeight*n-w)+"px'>");for(var t=s=void 0,r=0,A=f.length;r<A;r++){t=f[r];s=$(n,r);p="slick-cell l"+r+" r"+Math.min(f.length-1,r+s-1)+(t.cssClass?" "+t.cssClass:"");n===m&&r===u&&(p=p+" active");for(var z in D)D[z][n]&&D[z][n][t.id]&&(p=p+(" "+D[z][n][t.id]));l.push("<div class='"+
+p+"'>");v&&l.push(ya(n,t)(n,r,za(v,t),t,v));l.push("</div>");s&&(r=r+(s-1))}l.push("</div>");o&&m===c&&(h=true);Db++}if(k.length){b=document.createElement("div");b.innerHTML=e.join("");c=0;for(e=b.childNodes.length;c<e;c++)x[k[c]]=i.appendChild(b.firstChild);h&&(o=E(m,u))}ja=a.top;qa=Math.min(d.enableAddRow?q():q()-1,a.bottom);Bb();Ua=y;Ea=null}}function jb(){y=v[0].scrollTop;var a=v[0].scrollLeft,b=Math.abs(y-ia);if(a!==Eb){Eb=a;ca[0].scrollLeft=a;aa[0].scrollLeft=a;Q[0].scrollLeft=a}if(b){Z=ia<
+y?1:-1;ia=y;if(b<s)ea(y+w);else{b=w;fa=Math.min(ga-1,Math.floor(y*((N-s)/(M-s))*(1/ha)));w=Math.round(fa*wa);b!=w&&W()}Ea&&clearTimeout(Ea);Math.abs(Ua-y)<s?J():Ea=setTimeout(J,50);l(i.onViewportChanged,{})}l(i.onScroll,{scrollLeft:a,scrollTop:y})}function Cb(){for(;ja<=qa;){var a=Z>=0?ja++:qa--,b=x[a];if(b&&!(Ba[a]||a>=q())){for(var c=C(a),b=b.childNodes,e=0,g=0,i=f.length;e<i;++e){var h=f[e];h.asyncPostRender&&h.asyncPostRender(b[g],ja,c,h);++g}Ba[a]=true;Za=setTimeout(Cb,d.asyncPostRenderDelay);
+break}}}function $a(a,b){var c,d,f,g,h;for(h in x){g=b&&b[h];f=a&&a[h];if(g)for(d in g)if(!f||g[d]!=f[d])(c=E(h,I[d]))&&e(c).removeClass(g[d]);if(f)for(d in f)if(!g||g[d]!=f[d])(c=E(h,I[d]))&&e(c).addClass(f[d])}}function tb(a,b){var c=D[a];D[a]=b;$a(b,c);l(i.onCellCssStylesChanged,{key:a,hash:b})}function cc(a,b){var c=ra(a);if(!c||!ab(c.row,c.cell))return false;retval=l(i.onDragInit,b,a);return a.isImmediatePropagationStopped()?retval:false}function dc(a,b){var c=ra(a);if(!c||!ab(c.row,c.cell))return false;
+c=l(i.onDragStart,b,a);return a.isImmediatePropagationStopped()?c:false}function ec(a,b){return l(i.onDrag,b,a)}function fc(a,b){l(i.onDragEnd,b,a)}function kb(a){l(i.onKeyDown,{row:m,cell:u},a);if(!a.isImmediatePropagationStopped())if(!a.shiftKey&&!a.altKey&&!a.ctrlKey)if(a.which==27){if(!p().isActive())return;Fb()}else if(a.which==37)Gb();else if(a.which==39)Hb();else if(a.which==38)Ib();else if(a.which==40)Fa();else if(a.which==9)Jb();else if(a.which==13)d.editable&&(k?m===q()?Fa():Kb():p().commitCurrentEdit()&&
+Ga());else return;else if(a.which==9&&a.shiftKey&&!a.ctrlKey&&!a.altKey)Lb();else return;a.stopPropagation();a.preventDefault();try{a.originalEvent.keyCode=0}catch(b){}}function $b(a){k||S();var b=ra(a);if(b&&!(k!==null&&m==b.row&&u==b.cell)){l(i.onClick,{row:b.row,cell:b.cell},a);if(!a.isImmediatePropagationStopped()&&T(b.row,b.cell)&&(!p().isActive()||p().commitCurrentEdit())){sa(b.row,false);ka(E(b.row,b.cell),b.row===q()||d.autoEdit)}}}function bc(a){var b=e(a.target).closest(".slick-cell",B);
+b.length!==0&&!(o===b[0]&&k!==null)&&l(i.onContextMenu,{},a)}function ac(a){var b=ra(a);if(b&&!(k!==null&&m==b.row&&u==b.cell)){l(i.onDblClick,{row:b.row,cell:b.cell},a);a.isImmediatePropagationStopped()||d.editable&&Mb(b.row,b.cell,true)}}function Yb(a){var b=e(a.target).closest(".slick-header-column",".slick-header-columns"),b=b&&f[i.getColumnIndex(b.data("fieldId"))];l(i.onHeaderContextMenu,{column:b},a)}function Zb(a){var b=e(a.target).closest(".slick-header-column",".slick-header-columns");(b=
+b&&f[i.getColumnIndex(b.data("fieldId"))])&&l(i.onHeaderClick,{column:b},a)}function gc(a){l(i.onMouseEnter,{},a)}function hc(a){l(i.onMouseLeave,{},a)}function ab(a,b){return!(a<0||a>=q()||b<0||b>=f.length)}function bb(a){var b=/l\d+/.exec(a.className);if(!b)throw"getCellFromNode: cannot get cell - "+a.className;return parseInt(b[0].substr(1,b[0].length-1),10)}function ra(a){a=e(a.target).closest(".slick-cell",B);return!a.length?null:{row:a.parent().attr("row")|0,cell:bb(a[0])}}function S(){Ka[0].focus()}
+function kc(){if(o){var a=e(o).position().left,b=a+e(o).outerWidth(),c=v.scrollLeft(),d=c+v.width();a<c?v.scrollLeft(a):b>d&&v.scrollLeft(Math.min(a,b-v[0].clientWidth))}}function ka(a,b){if(o!==null){L();e(o).removeClass("active")}var c=o!==a;o=a;if(o!=null){m=parseInt(e(o).parent().attr("row"));u=cb=bb(o);e(o).addClass("active");if(d.editable&&b&&Nb(m,u)){clearTimeout(db);d.asyncEditorLoading?db=setTimeout(function(){Ga()},d.asyncEditorLoadDelay):Ga()}else S()}else m=u=null;if(c){kc();l(i.onActiveCellChanged,
+Ob())}}function Nb(a,b){return a<q()&&!C(a)||f[b].cannotTriggerInsert&&a>=q()||!wb(a,b)?false:true}function L(){if(k){l(i.onBeforeCellEditorDestroy,{editor:k});k.destroy();k=null;if(o){var a=C(m);e(o).removeClass("editable invalid");if(a){var b=f[u],c=ya(m,b);o.innerHTML=c(m,u,za(a,b),b,C(m));Xa(m)}}if(e.browser.msie)if(document.selection&&document.selection.empty)document.selection.empty();else if(window.getSelection)(a=window.getSelection())&&a.removeAllRanges&&a.removeAllRanges();p().deactivate(Ha)}}
+function Ga(a){if(o){if(!d.editable)throw"Grid : makeActiveCellEditable : should never get called when options.editable is false";clearTimeout(db);if(Nb(m,u)){var b=f[u],c=C(m);if(l(i.onBeforeEditCell,{row:m,cell:u,item:c,column:b})===false)S();else{p().activate(Ha);e(o).addClass("editable");if(!a)o.innerHTML="";k=new (a||wb(m,u))({grid:i,gridPosition:Ia(n[0]),position:Ia(o),container:o,column:b,item:c||{},commitChanges:Kb,cancelChanges:Fb});c&&k.loadValue(c);Pb=k.serializeValue();k.position&&mb()}}}}
+function Kb(){if(p().commitCurrentEdit()){S();d.autoEdit&&Fa()}}function Fb(){p().cancelCurrentEdit()&&S()}function Ia(a){var b={top:a.offsetTop,left:a.offsetLeft,bottom:0,right:0,width:e(a).outerWidth(),height:e(a).outerHeight(),visible:true};b.bottom=b.top+b.height;b.right=b.left+b.width;for(var c=a.offsetParent;(a=a.parentNode)!=document.body;){if(b.visible&&a.scrollHeight!=a.offsetHeight&&e(a).css("overflowY")!="visible")b.visible=b.bottom>a.scrollTop&&b.top<a.scrollTop+a.clientHeight;if(b.visible&&
+a.scrollWidth!=a.offsetWidth&&e(a).css("overflowX")!="visible")b.visible=b.right>a.scrollLeft&&b.left<a.scrollLeft+a.clientWidth;b.left=b.left-a.scrollLeft;b.top=b.top-a.scrollTop;if(a===c){b.left=b.left+a.offsetLeft;b.top=b.top+a.offsetTop;c=a.offsetParent}b.bottom=b.top+b.height;b.right=b.left+b.width}return b}function Qb(){return Ia(o)}function mb(){if(o){l(i.onActiveCellPositionChanged,{});if(k){var a=Qb();k.show&&k.hide&&(a.visible?k.show():k.hide());k.position&&k.position(a)}}}function Ob(){return o?
+{row:m,cell:u}:null}function sa(a,b){var c=a*d.rowHeight,e=(a+1)*d.rowHeight-s+(lb?G.height:0);if((a+1)*d.rowHeight>y+s+w){ea(b?c:e);J()}else if(a*d.rowHeight<y+w){ea(b?e:c);J()}}function $(a,b){var c=g.getItemMetadata&&g.getItemMetadata(a);if(!c||!c.columns)return 1;c=(c=c.columns[f[b].id]||c.columns[b])&&c.colspan;c==="*"&&(c=f.length-b);return c||1}function Rb(a){for(var b=0;b<f.length;){if(T(a,b))return b;b=b+$(a,b)}return null}function eb(a,b){if(b>=f.length)return null;do b=b+$(a,b);while(b<
+f.length&&!T(a,b));return b<f.length?{row:a,cell:b,posX:b}:null}function Sb(a,b){if(b<=0)return null;var c=Rb(a);if(c===null||c>=b)return null;for(var c={row:a,cell:c,posX:c},d;;){d=eb(c.row,c.cell,c.posX);if(!d)return null;if(d.cell>=b)return c;c=d}}function lc(a,b,c){for(var e;;){if(++a>=q()+(d.enableAddRow?1:0))return null;for(e=b=0;b<=c;){e=b;b=b+$(a,b)}if(T(a,e))return{row:a,cell:e,posX:c}}}function mc(a,b,c){for(var d;;){if(--a<0)return null;for(d=b=0;b<=c;){d=b;b=b+$(a,b)}if(T(a,d))return{row:a,
+cell:d,posX:c}}}function nc(a,b,c){if(b=eb(a,b,c))return b;for(b=null;++a<q()+(d.enableAddRow?1:0);){b=Rb(a);if(b!==null)return{row:a,cell:b,posX:b}}return null}function oc(a,b,c){for(var d,e;!d;){if(d=Sb(a,b,c))break;if(--a<0)return null;b=0;e=a;for(var g=0,h=null;g<f.length;){T(e,g)&&(h=g);g=g+$(e,g)}e=h;e!==null&&(d={row:a,cell:e,posX:e})}return d}function Hb(){la("right")}function Gb(){la("left")}function Fa(){la("down")}function Ib(){la("up")}function Jb(){la("next")}function Lb(){la("prev")}
+function la(a){if(o&&d.enableCellNavigation&&p().commitCurrentEdit()){S();if(a=(0,{up:mc,down:lc,left:Sb,right:eb,prev:oc,next:nc}[a])(m,u,cb)){var b=a.row==q();sa(a.row,!b);ka(E(a.row,a.cell),b||d.autoEdit);cb=a.posX}else ka(E(m,u),m==q()||d.autoEdit)}}function E(a,b){if(x[a])for(var c=e(x[a]).children(),d,f=0;f<c.length;f++){d=bb(c[f]);if(d===b)return c[f];if(d>b)break}return null}function T(a,b){if(!d.enableCellNavigation||a>=q()+(d.enableAddRow?1:0)||a<0||b>=f.length||b<0)return false;var c=g.getItemMetadata&&
+g.getItemMetadata(a);if(c&&typeof c.focusable==="boolean")return c.focusable;return(c=c&&c.columns)&&c[f[b].id]&&typeof c[f[b].id].focusable==="boolean"?c[f[b].id].focusable:c&&c[b]&&typeof c[b].focusable==="boolean"?c[b].focusable:typeof f[b].focusable==="boolean"?f[b].focusable:true}function sb(a,b){if(a>=q()||a<0||b>=f.length||b<0)return false;var c=g.getItemMetadata&&g.getItemMetadata(a);if(c&&typeof c.selectable==="boolean")return c.selectable;return(c=c&&c.columns&&(c.columns[f[b].id]||c.columns[b]))&&
+typeof c.selectable==="boolean"?c.selectable:typeof f[b].selectable==="boolean"?f[b].selectable:true}function Mb(a,b,c){if(H&&T(a,b)&&p().commitCurrentEdit()){sa(a,false);b=E(a,b);ka(b,c||a===q()||d.autoEdit);k||S()}}function pc(a){for(var b=[],c=f.length-1,d=0;d<a.length;d++)b.push(new Slick.Range(a[d],0,a[d],c));return b}function ub(){if(!F)throw"Selection model is not set";return Ta}var qc={explicitInitialization:false,rowHeight:25,defaultColumnWidth:80,enableAddRow:false,leaveSpaceForNewRows:false,
+editable:false,autoEdit:true,enableCellNavigation:true,enableColumnReorder:true,asyncEditorLoading:false,asyncEditorLoadDelay:100,forceFitColumns:false,enableAsyncPostRender:false,asyncPostRenderDelay:60,autoHeight:false,editorLock:Slick.GlobalEditorLock,showHeaderRow:false,headerRowHeight:25,showTopPanel:false,topPanelHeight:25,formatterFactory:null,editorFactory:null,cellFlashingCssClass:"flashing",selectedCellCssClass:"selected",multiSelect:true,enableTextSelectionOnCells:false,dataItemColumnValueExtractor:null,
+fullWidthRows:false,multiColumnSort:false,defaultFormatter:function(a,b,c){return c==null?"":c.toString().replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;")}},La={name:"",resizable:true,sortable:false,minWidth:30,rerenderOnResize:false,headerCssClass:null},N,M,ha,ga,wa,fa=0,w=0,Z=1,H=false,n,z="slickgrid_"+Math.round(1E6*Math.random()),i=this,Ka,ca,t,da,Q,aa,Tb,v,B,X,Y,Ra,Sa,s,U,P,lb,na,V=0,Pa=0,ua=0,va=0,R,Ya=0,cb,m,u,o=null,k=null,Pb,Ha,x={},Va=0,Ca,ia=0,y=0,Ua=0,Eb=0,F,Ta=[],O=[],
+D={},I={},r=[],db=null,Ea=null,Za=null,Ba={},qa=null,ja=null,Db=0,xb=0;this.debug=function(){var a;a="\ncounter_rows_rendered:  "+Db;a=a+("\ncounter_rows_removed:  "+xb);a=a+("\nrenderedRows:  "+Va);a=a+("\nnumVisibleRows:  "+Ca);a=a+("\nmaxSupportedCssHeight:  "+A);a=a+("\nn(umber of pages):  "+ga);a=a+("\n(current) page:  "+fa);a=a+("\npage height (ph):  "+ha);a=a+("\nscrollDir:  "+Z);alert(a)};this.eval=function(a){return eval(a)};e.extend(this,{slickGridVersion:"2.0",onScroll:new Slick.Event,
+onSort:new Slick.Event,onHeaderContextMenu:new Slick.Event,onHeaderClick:new Slick.Event,onMouseEnter:new Slick.Event,onMouseLeave:new Slick.Event,onClick:new Slick.Event,onDblClick:new Slick.Event,onContextMenu:new Slick.Event,onKeyDown:new Slick.Event,onAddNewRow:new Slick.Event,onValidationError:new Slick.Event,onViewportChanged:new Slick.Event,onColumnsReordered:new Slick.Event,onColumnsResized:new Slick.Event,onCellChange:new Slick.Event,onBeforeEditCell:new Slick.Event,onBeforeCellEditorDestroy:new Slick.Event,
+onBeforeDestroy:new Slick.Event,onActiveCellChanged:new Slick.Event,onActiveCellPositionChanged:new Slick.Event,onDragInit:new Slick.Event,onDragStart:new Slick.Event,onDrag:new Slick.Event,onDragEnd:new Slick.Event,onSelectedRowsChanged:new Slick.Event,onCellCssStylesChanged:new Slick.Event,registerPlugin:function(a){O.unshift(a);a.init(i)},unregisterPlugin:gb,getColumns:function(){return f},setColumns:ob,getColumnIndex:Na,updateColumnHeader:function(a,b,c){if(H){var a=I[a],d=t.children().eq(a);
+if(d){f[a].name=b;f[a].toolTip=c;d.attr("title",c||b||"").children().eq(0).html(b)}}},setSortColumn:function(a,b){ta([{columnId:a,sortAsc:b}])},setSortColumns:ta,getSortColumns:function(){return r},autosizeColumns:Qa,getOptions:function(){return d},setOptions:function(a){if(p().commitCurrentEdit()){L();d.enableAddRow!==a.enableAddRow&&zb(q());d=e.extend(d,a);v.css("overflow-y",d.autoHeight?"hidden":"auto");J()}},getData:function(){return g},getDataLength:q,getDataItem:C,setData:function(a,b){g=a;
+W();Da();b&&ea(0)},getSelectionModel:function(){return F},setSelectionModel:function(a){if(F){F.onSelectedRangesChanged.unsubscribe(rb);F.destroy&&F.destroy()}if(F=a){F.init(i);F.onSelectedRangesChanged.subscribe(rb)}},getSelectedRows:ub,setSelectedRows:function(a){if(!F)throw"Selection model is not set";F.setSelectedRanges(pc(a))},render:J,invalidate:function(){Da();W();J()},invalidateRow:zb,invalidateRows:yb,invalidateAllRows:W,updateCell:function(a,b){var c=E(a,b);if(c){var d=f[b],e=C(a);if(k&&
+m===a&&u===b)k.loadValue(e);else{c.innerHTML=e?ya(a,d)(a,b,za(e,d),d,e):"";Xa(a)}}},updateRow:Wa,getViewport:xa,getRenderedRange:Ab,resizeCanvas:K,updateRowCount:Da,scrollRowIntoView:sa,getCanvasNode:function(){return B[0]},focus:S,getCellFromPoint:function(a,b){for(var c=Math.floor((b+w)/d.rowHeight),e=0,g=0,i=0;i<f.length&&g<a;i++){g=g+f[i].width;e++}e<0&&(e=0);return{row:c,cell:e-1}},getCellFromEvent:ra,getActiveCell:Ob,setActiveCell:function(a,b){if(H&&!(a>q()||a<0||b>=f.length||b<0)&&d.enableCellNavigation){sa(a,
+false);ka(E(a,b),false)}},getActiveCellNode:function(){return o},getActiveCellPosition:Qb,resetActiveCell:function(){ka(null,false)},editActiveCell:Ga,getCellEditor:function(){return k},getCellNode:E,getCellNodeBox:function(a,b){if(!ab(a,b))return null;for(var c=a*d.rowHeight-w,e=c+d.rowHeight-1,g=0,i=0;i<b;i++)g=g+f[i].width;return{top:c,left:g,bottom:e,right:g+f[b].width}},canCellBeSelected:sb,canCellBeActive:T,navigatePrev:Lb,navigateNext:Jb,navigateUp:Ib,navigateDown:Fa,navigateLeft:Gb,navigateRight:Hb,
+gotoCell:Mb,getTopPanel:function(){return Tb[0]},showTopPanel:function(){d.showTopPanel=true;aa.slideDown("fast",K)},hideTopPanel:function(){d.showTopPanel=false;aa.slideUp("fast",K)},showHeaderRowColumns:function(){d.showHeaderRow=true;Q.slideDown("fast",K)},hideHeaderRowColumns:function(){d.showHeaderRow=false;Q.slideUp("fast",K)},getHeaderRow:function(){return da[0]},getHeaderRowColumn:function(a){a=I[a];return(a=da.children().eq(a))&&a[0]},getGridPosition:function(){return Ia(n[0])},flashCell:function(a,
+b,c){c=c||100;if(x[a]){var f=e(E(a,b)),g=function(a){a&&setTimeout(function(){f.queue(function(){f.toggleClass(d.cellFlashingCssClass).dequeue();g(a-1)})},c)};g(4)}},addCellCssStyles:function(a,b){if(D[a])throw"addCellCssStyles: cell CSS hash with key '"+a+"' already exists.";D[a]=b;$a(b,null);l(i.onCellCssStylesChanged,{key:a,hash:b})},setCellCssStyles:tb,removeCellCssStyles:function(a){if(D[a]){$a(null,D[a]);delete D[a];l(i.onCellCssStylesChanged,{key:a,hash:null})}},getCellCssStyles:function(a){return D[a]},
+init:fb,destroy:function(){p().cancelCurrentEdit();l(i.onBeforeDestroy,{});for(var a=0;a<O.length;a++)gb(O[a]);d.enableColumnReorder&&t.sortable&&t.sortable("destroy");B.parents().unbind("scroll.slickgrid");n.unbind(".slickgrid");X.remove();Y=null;B.unbind("draginit dragstart dragend drag");n.empty().removeClass(z)},getEditorLock:p,getEditController:function(){return Ha}});n=e(ba);if(n.length<1)throw Error("SlickGrid requires a valid container, "+ba+" does not exist in the DOM.");A=A||ic();G=G||Ub();
+d=e.extend({},qc,d);La.width=d.defaultColumnWidth;if(d.enableColumnReorder&&!e.fn.sortable)throw Error("SlickGrid's 'enableColumnReorder = true' option requires jquery-ui.sortable module to be loaded");Ha={commitCurrentEdit:function(){var a=C(m),b=f[u];if(k){if(k.isValueChanged()){var c=k.validate();if(c.valid){if(m<q()){c={row:m,cell:u,editor:k,serializedValue:k.serializeValue(),prevSerializedValue:Pb,execute:function(){this.editor.applyValue(a,this.serializedValue);Wa(this.row)},undo:function(){this.editor.applyValue(a,
+this.prevSerializedValue);Wa(this.row)}};if(d.editCommandHandler){L();d.editCommandHandler(a,b,c)}else{c.execute();L()}l(i.onCellChange,{row:m,cell:u,item:a})}else{c={};k.applyValue(c,k.serializeValue());L();l(i.onAddNewRow,{item:c,column:b})}return!p().isActive()}e(o).addClass("invalid");e(o).stop(true,true).effect("highlight",{color:"red"},300);l(i.onValidationError,{editor:k,cellNode:o,validationResults:c,row:m,cell:u,column:b});k.focus();return false}L()}return true},cancelCurrentEdit:function(){L();
+return true}};n.empty().css("overflow","hidden").css("outline",0).addClass(z).addClass("ui-widget");/relative|absolute|fixed/.test(n.css("position"))||n.css("position","relative");Ka=e("<div tabIndex='0' hideFocus style='position:fixed;width:0;height:0;top:0;left:0;outline:0;'></div>").appendTo(n);ca=e("<div class='slick-header ui-state-default' style='overflow:hidden;position:relative;' />").appendTo(n);t=e("<div class='slick-header-columns' style='width:10000px; left:-1000px' />").appendTo(ca);
+Q=e("<div class='slick-headerrow ui-state-default' style='overflow:hidden;position:relative;' />").appendTo(n);da=e("<div class='slick-headerrow-columns' />").appendTo(Q);aa=e("<div class='slick-top-panel-scroller ui-state-default' style='overflow:hidden;position:relative;' />").appendTo(n);Tb=e("<div class='slick-top-panel' style='width:10000px' />").appendTo(aa);d.showTopPanel||aa.hide();d.showHeaderRow||Q.hide();v=e("<div class='slick-viewport' style='width:100%;overflow:auto;outline:0;position:relative;;'>").appendTo(n);
+v.css("overflow-y",d.autoHeight?"hidden":"auto");B=e("<div class='grid-canvas' />").appendTo(v);d.explicitInitialization||fb()}}});var G,A})(jQuery);

From a75cc9d35c710d9841e7c12cc054bd6f85d5629c Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Wed, 15 Aug 2012 17:31:12 +0100
Subject: [PATCH 066/130] [#2618] Ckan minify js files

---
 .../vendor/bootstrap/2.0.3/bootstrap.min.js   |   5 -
 .../2.0.1/jquery-ui-1.8.16.custom.min.js      | 628 +-----------------
 .../2.0.1/jquery.event.drag-2.0.min.js        |   7 +-
 .../vendor/slickgrid/2.0.1/slick.grid.min.js  |  94 +--
 4 files changed, 31 insertions(+), 703 deletions(-)

diff --git a/ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.min.js b/ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.min.js
index 1f87730a3ae..7752184d3ae 100644
--- a/ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.min.js
+++ b/ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.min.js
@@ -1,6 +1 @@
-/*!
-* Bootstrap.js by @fat & @mdo
-* Copyright 2012 Twitter, Inc.
-* http://www.apache.org/licenses/LICENSE-2.0.txt
-*/
 !function(a){a(function(){"use strict",a.support.transition=function(){var a=function(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd",msTransition:"MSTransitionEnd",transition:"transitionend"},c;for(c in b)if(a.style[c]!==undefined)return b[c]}();return a&&{end:a}}()})}(window.jQuery),!function(a){"use strict";var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype.close=function(b){function f(){e.trigger("closed").remove()}var c=a(this),d=c.attr("data-target"),e;d||(d=c.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),e=a(d),b&&b.preventDefault(),e.length||(e=c.hasClass("alert")?c:c.parent()),e.trigger(b=a.Event("close"));if(b.isDefaultPrevented())return;e.removeClass("in"),a.support.transition&&e.hasClass("fade")?e.on(a.support.transition.end,f):f()},a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("alert");e||d.data("alert",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.alert.Constructor=c,a(function(){a("body").on("click.alert.data-api",b,c.prototype.close)})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.button.defaults,c)};b.prototype.setState=function(a){var b="disabled",c=this.$element,d=c.data(),e=c.is("input")?"val":"html";a+="Text",d.resetText||c.data("resetText",c[e]()),c[e](d[a]||this.options[a]),setTimeout(function(){a=="loadingText"?c.addClass(b).attr(b,b):c.removeClass(b).removeAttr(b)},0)},b.prototype.toggle=function(){var a=this.$element.parent('[data-toggle="buttons-radio"]');a&&a.find(".active").removeClass("active"),this.$element.toggleClass("active")},a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("button"),f=typeof c=="object"&&c;e||d.data("button",e=new b(this,f)),c=="toggle"?e.toggle():c&&e.setState(c)})},a.fn.button.defaults={loadingText:"loading..."},a.fn.button.Constructor=b,a(function(){a("body").on("click.button.data-api","[data-toggle^=button]",function(b){var c=a(b.target);c.hasClass("btn")||(c=c.closest(".btn")),c.button("toggle")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=c,this.options.slide&&this.slide(this.options.slide),this.options.pause=="hover"&&this.$element.on("mouseenter",a.proxy(this.pause,this)).on("mouseleave",a.proxy(this.cycle,this))};b.prototype={cycle:function(b){return b||(this.paused=!1),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},to:function(b){var c=this.$element.find(".active"),d=c.parent().children(),e=d.index(c),f=this;if(b>d.length-1||b<0)return;return this.sliding?this.$element.one("slid",function(){f.to(b)}):e==b?this.pause().cycle():this.slide(b>e?"next":"prev",a(d[b]))},pause:function(a){return a||(this.paused=!0),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(b,c){var d=this.$element.find(".active"),e=c||d[b](),f=this.interval,g=b=="next"?"left":"right",h=b=="next"?"first":"last",i=this,j=a.Event("slide");this.sliding=!0,f&&this.pause(),e=e.length?e:this.$element.find(".item")[h]();if(e.hasClass("active"))return;if(a.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(j);if(j.isDefaultPrevented())return;e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),this.$element.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid")},0)})}else{this.$element.trigger(j);if(j.isDefaultPrevented())return;d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return f&&this.cycle(),this}},a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("carousel"),f=a.extend({},a.fn.carousel.defaults,typeof c=="object"&&c);e||d.data("carousel",e=new b(this,f)),typeof c=="number"?e.to(c):typeof c=="string"||(c=f.slide)?e[c]():f.interval&&e.cycle()})},a.fn.carousel.defaults={interval:5e3,pause:"hover"},a.fn.carousel.Constructor=b,a(function(){a("body").on("click.carousel.data-api","[data-slide]",function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=!e.data("modal")&&a.extend({},e.data(),c.data());e.carousel(f),b.preventDefault()})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.collapse.defaults,c),this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.prototype={constructor:b,dimension:function(){var a=this.$element.hasClass("width");return a?"width":"height"},show:function(){var b,c,d,e;if(this.transitioning)return;b=this.dimension(),c=a.camelCase(["scroll",b].join("-")),d=this.$parent&&this.$parent.find("> .accordion-group > .in");if(d&&d.length){e=d.data("collapse");if(e&&e.transitioning)return;d.collapse("hide"),e||d.data("collapse",null)}this.$element[b](0),this.transition("addClass",a.Event("show"),"shown"),this.$element[b](this.$element[0][c])},hide:function(){var b;if(this.transitioning)return;b=this.dimension(),this.reset(this.$element[b]()),this.transition("removeClass",a.Event("hide"),"hidden"),this.$element[b](0)},reset:function(a){var b=this.dimension();return this.$element.removeClass("collapse")[b](a||"auto")[0].offsetWidth,this.$element[a!==null?"addClass":"removeClass"]("collapse"),this},transition:function(b,c,d){var e=this,f=function(){c.type=="show"&&e.reset(),e.transitioning=0,e.$element.trigger(d)};this.$element.trigger(c);if(c.isDefaultPrevented())return;this.transitioning=1,this.$element[b]("in"),a.support.transition&&this.$element.hasClass("collapse")?this.$element.one(a.support.transition.end,f):f()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("collapse"),f=typeof c=="object"&&c;e||d.data("collapse",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.collapse.defaults={toggle:!0},a.fn.collapse.Constructor=b,a(function(){a("body").on("click.collapse.data-api","[data-toggle=collapse]",function(b){var c=a(this),d,e=c.attr("data-target")||b.preventDefault()||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,""),f=a(e).data("collapse")?"toggle":c.data();a(e).collapse(f)})})}(window.jQuery),!function(a){function d(){a(b).parent().removeClass("open")}"use strict";var b='[data-toggle="dropdown"]',c=function(b){var c=a(b).on("click.dropdown.data-api",this.toggle);a("html").on("click.dropdown.data-api",function(){c.parent().removeClass("open")})};c.prototype={constructor:c,toggle:function(b){var c=a(this),e,f,g;if(c.is(".disabled, :disabled"))return;return f=c.attr("data-target"),f||(f=c.attr("href"),f=f&&f.replace(/.*(?=#[^\s]*$)/,"")),e=a(f),e.length||(e=c.parent()),g=e.hasClass("open"),d(),g||e.toggleClass("open"),!1}},a.fn.dropdown=function(b){return this.each(function(){var d=a(this),e=d.data("dropdown");e||d.data("dropdown",e=new c(this)),typeof b=="string"&&e[b].call(d)})},a.fn.dropdown.Constructor=c,a(function(){a("html").on("click.dropdown.data-api",d),a("body").on("click.dropdown",".dropdown form",function(a){a.stopPropagation()}).on("click.dropdown.data-api",b,c.prototype.toggle)})}(window.jQuery),!function(a){function c(){var b=this,c=setTimeout(function(){b.$element.off(a.support.transition.end),d.call(b)},500);this.$element.one(a.support.transition.end,function(){clearTimeout(c),d.call(b)})}function d(a){this.$element.hide().trigger("hidden"),e.call(this)}function e(b){var c=this,d=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var e=a.support.transition&&d;this.$backdrop=a('<div class="modal-backdrop '+d+'" />').appendTo(document.body),this.options.backdrop!="static"&&this.$backdrop.click(a.proxy(this.hide,this)),e&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),e?this.$backdrop.one(a.support.transition.end,b):b()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(a.support.transition.end,a.proxy(f,this)):f.call(this)):b&&b()}function f(){this.$backdrop.remove(),this.$backdrop=null}function g(){var b=this;this.isShown&&this.options.keyboard?a(document).on("keyup.dismiss.modal",function(a){a.which==27&&b.hide()}):this.isShown||a(document).off("keyup.dismiss.modal")}"use strict";var b=function(b,c){this.options=c,this.$element=a(b).delegate('[data-dismiss="modal"]',"click.dismiss.modal",a.proxy(this.hide,this))};b.prototype={constructor:b,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var b=this,c=a.Event("show");this.$element.trigger(c);if(this.isShown||c.isDefaultPrevented())return;a("body").addClass("modal-open"),this.isShown=!0,g.call(this),e.call(this,function(){var c=a.support.transition&&b.$element.hasClass("fade");b.$element.parent().length||b.$element.appendTo(document.body),b.$element.show(),c&&b.$element[0].offsetWidth,b.$element.addClass("in"),c?b.$element.one(a.support.transition.end,function(){b.$element.trigger("shown")}):b.$element.trigger("shown")})},hide:function(b){b&&b.preventDefault();var e=this;b=a.Event("hide"),this.$element.trigger(b);if(!this.isShown||b.isDefaultPrevented())return;this.isShown=!1,a("body").removeClass("modal-open"),g.call(this),this.$element.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?c.call(this):d.call(this)}},a.fn.modal=function(c){return this.each(function(){var d=a(this),e=d.data("modal"),f=a.extend({},a.fn.modal.defaults,d.data(),typeof c=="object"&&c);e||d.data("modal",e=new b(this,f)),typeof c=="string"?e[c]():f.show&&e.show()})},a.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},a.fn.modal.Constructor=b,a(function(){a("body").on("click.modal.data-api",'[data-toggle="modal"]',function(b){var c=a(this),d,e=a(c.attr("data-target")||(d=c.attr("href"))&&d.replace(/.*(?=#[^\s]+$)/,"")),f=e.data("modal")?"toggle":a.extend({},e.data(),c.data());b.preventDefault(),e.modal(f)})})}(window.jQuery),!function(a){"use strict";var b=function(a,b){this.init("tooltip",a,b)};b.prototype={constructor:b,init:function(b,c,d){var e,f;this.type=b,this.$element=a(c),this.options=this.getOptions(d),this.enabled=!0,this.options.trigger!="manual"&&(e=this.options.trigger=="hover"?"mouseenter":"focus",f=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(e,this.options.selector,a.proxy(this.enter,this)),this.$element.on(f,this.options.selector,a.proxy(this.leave,this))),this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(b){return b=a.extend({},a.fn[this.type].defaults,b,this.$element.data()),b.delay&&typeof b.delay=="number"&&(b.delay={show:b.delay,hide:b.delay}),b},enter:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);if(!c.options.delay||!c.options.delay.show)return c.show();clearTimeout(this.timeout),c.hoverState="in",this.timeout=setTimeout(function(){c.hoverState=="in"&&c.show()},c.options.delay.show)},leave:function(b){var c=a(b.currentTarget)[this.type](this._options).data(this.type);if(!c.options.delay||!c.options.delay.hide)return c.hide();clearTimeout(this.timeout),c.hoverState="out",this.timeout=setTimeout(function(){c.hoverState=="out"&&c.hide()},c.options.delay.hide)},show:function(){var a,b,c,d,e,f,g;if(this.hasContent()&&this.enabled){a=this.tip(),this.setContent(),this.options.animation&&a.addClass("fade"),f=typeof this.options.placement=="function"?this.options.placement.call(this,a[0],this.$element[0]):this.options.placement,b=/in/.test(f),a.remove().css({top:0,left:0,display:"block"}).appendTo(b?this.$element:document.body),c=this.getPosition(b),d=a[0].offsetWidth,e=a[0].offsetHeight;switch(b?f.split(" ")[1]:f){case"bottom":g={top:c.top+c.height,left:c.left+c.width/2-d/2};break;case"top":g={top:c.top-e,left:c.left+c.width/2-d/2};break;case"left":g={top:c.top+c.height/2-e/2,left:c.left-d};break;case"right":g={top:c.top+c.height/2-e/2,left:c.left+c.width}}a.css(g).addClass(f).addClass("in")}},isHTML:function(a){return typeof a!="string"||a.charAt(0)==="<"&&a.charAt(a.length-1)===">"&&a.length>=3||/^(?:[^<]*<[\w\W]+>[^>]*$)/.exec(a)},setContent:function(){var a=this.tip(),b=this.getTitle();a.find(".tooltip-inner")[this.isHTML(b)?"html":"text"](b),a.removeClass("fade in top bottom left right")},hide:function(){function d(){var b=setTimeout(function(){c.off(a.support.transition.end).remove()},500);c.one(a.support.transition.end,function(){clearTimeout(b),c.remove()})}var b=this,c=this.tip();c.removeClass("in"),a.support.transition&&this.$tip.hasClass("fade")?d():c.remove()},fixTitle:function(){var a=this.$element;(a.attr("title")||typeof a.attr("data-original-title")!="string")&&a.attr("data-original-title",a.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(b){return a.extend({},b?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||(typeof c.title=="function"?c.title.call(b[0]):c.title),a},tip:function(){return this.$tip=this.$tip||a(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(){this[this.tip().hasClass("in")?"hide":"show"]()}},a.fn.tooltip=function(c){return this.each(function(){var d=a(this),e=d.data("tooltip"),f=typeof c=="object"&&c;e||d.data("tooltip",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.tooltip.Constructor=b,a.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover",title:"",delay:0}}(window.jQuery),!function(a){"use strict";var b=function(a,b){this.init("popover",a,b)};b.prototype=a.extend({},a.fn.tooltip.Constructor.prototype,{constructor:b,setContent:function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.isHTML(b)?"html":"text"](b),a.find(".popover-content > *")[this.isHTML(c)?"html":"text"](c),a.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var a,b=this.$element,c=this.options;return a=b.attr("data-content")||(typeof c.content=="function"?c.content.call(b[0]):c.content),a},tip:function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip}}),a.fn.popover=function(c){return this.each(function(){var d=a(this),e=d.data("popover"),f=typeof c=="object"&&c;e||d.data("popover",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.popover.Constructor=b,a.fn.popover.defaults=a.extend({},a.fn.tooltip.defaults,{placement:"right",content:"",template:'<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'})}(window.jQuery),!function(a){function b(b,c){var d=a.proxy(this.process,this),e=a(b).is("body")?a(window):a(b),f;this.options=a.extend({},a.fn.scrollspy.defaults,c),this.$scrollElement=e.on("scroll.scroll.data-api",d),this.selector=(this.options.target||(f=a(b).attr("href"))&&f.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=a("body"),this.refresh(),this.process()}"use strict",b.prototype={constructor:b,refresh:function(){var b=this,c;this.offsets=a([]),this.targets=a([]),c=this.$body.find(this.selector).map(function(){var b=a(this),c=b.data("target")||b.attr("href"),d=/^#\w/.test(c)&&a(c);return d&&c.length&&[[d.position().top,c]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){b.offsets.push(this[0]),b.targets.push(this[1])})},process:function(){var a=this.$scrollElement.scrollTop()+this.options.offset,b=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,c=b-this.$scrollElement.height(),d=this.offsets,e=this.targets,f=this.activeTarget,g;if(a>=c)return f!=(g=e.last()[0])&&this.activate(g);for(g=d.length;g--;)f!=e[g]&&a>=d[g]&&(!d[g+1]||a<=d[g+1])&&this.activate(e[g])},activate:function(b){var c,d;this.activeTarget=b,a(this.selector).parent(".active").removeClass("active"),d=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',c=a(d).parent("li").addClass("active"),c.parent(".dropdown-menu")&&(c=c.closest("li.dropdown").addClass("active")),c.trigger("activate")}},a.fn.scrollspy=function(c){return this.each(function(){var d=a(this),e=d.data("scrollspy"),f=typeof c=="object"&&c;e||d.data("scrollspy",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.scrollspy.Constructor=b,a.fn.scrollspy.defaults={offset:10},a(function(){a('[data-spy="scroll"]').each(function(){var b=a(this);b.scrollspy(b.data())})})}(window.jQuery),!function(a){"use strict";var b=function(b){this.element=a(b)};b.prototype={constructor:b,show:function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.attr("data-target"),e,f,g;d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,""));if(b.parent("li").hasClass("active"))return;e=c.find(".active a").last()[0],g=a.Event("show",{relatedTarget:e}),b.trigger(g);if(g.isDefaultPrevented())return;f=a(d),this.activate(b.parent("li"),c),this.activate(f,f.parent(),function(){b.trigger({type:"shown",relatedTarget:e})})},activate:function(b,c,d){function g(){e.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),f?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var e=c.find("> .active"),f=d&&a.support.transition&&e.hasClass("fade");f?e.one(a.support.transition.end,g):g(),e.removeClass("in")}},a.fn.tab=function(c){return this.each(function(){var d=a(this),e=d.data("tab");e||d.data("tab",e=new b(this)),typeof c=="string"&&e[c]()})},a.fn.tab.Constructor=b,a(function(){a("body").on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(b){b.preventDefault(),a(this).tab("show")})})}(window.jQuery),!function(a){"use strict";var b=function(b,c){this.$element=a(b),this.options=a.extend({},a.fn.typeahead.defaults,c),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.$menu=a(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};b.prototype={constructor:b,select:function(){var a=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(a)).change(),this.hide()},updater:function(a){return a},show:function(){var b=a.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:b.top+b.height,left:b.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(b){var c=this,d,e;return this.query=this.$element.val(),this.query?(d=a.grep(this.source,function(a){return c.matcher(a)}),d=this.sorter(d),d.length?this.render(d.slice(0,this.options.items)).show():this.shown?this.hide():this):this.shown?this.hide():this},matcher:function(a){return~a.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(a){var b=[],c=[],d=[],e;while(e=a.shift())e.toLowerCase().indexOf(this.query.toLowerCase())?~e.indexOf(this.query)?c.push(e):d.push(e):b.push(e);return b.concat(c,d)},highlighter:function(a){var b=this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&");return a.replace(new RegExp("("+b+")","ig"),function(a,b){return"<strong>"+b+"</strong>"})},render:function(b){var c=this;return b=a(b).map(function(b,d){return b=a(c.options.item).attr("data-value",d),b.find("a").html(c.highlighter(d)),b[0]}),b.first().addClass("active"),this.$menu.html(b),this},next:function(b){var c=this.$menu.find(".active").removeClass("active"),d=c.next();d.length||(d=a(this.$menu.find("li")[0])),d.addClass("active")},prev:function(a){var b=this.$menu.find(".active").removeClass("active"),c=b.prev();c.length||(c=this.$menu.find("li").last()),c.addClass("active")},listen:function(){this.$element.on("blur",a.proxy(this.blur,this)).on("keypress",a.proxy(this.keypress,this)).on("keyup",a.proxy(this.keyup,this)),(a.browser.webkit||a.browser.msie)&&this.$element.on("keydown",a.proxy(this.keypress,this)),this.$menu.on("click",a.proxy(this.click,this)).on("mouseenter","li",a.proxy(this.mouseenter,this))},keyup:function(a){switch(a.keyCode){case 40:case 38:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}a.stopPropagation(),a.preventDefault()},keypress:function(a){if(!this.shown)return;switch(a.keyCode){case 9:case 13:case 27:a.preventDefault();break;case 38:if(a.type!="keydown")break;a.preventDefault(),this.prev();break;case 40:if(a.type!="keydown")break;a.preventDefault(),this.next()}a.stopPropagation()},blur:function(a){var b=this;setTimeout(function(){b.hide()},150)},click:function(a){a.stopPropagation(),a.preventDefault(),this.select()},mouseenter:function(b){this.$menu.find(".active").removeClass("active"),a(b.currentTarget).addClass("active")}},a.fn.typeahead=function(c){return this.each(function(){var d=a(this),e=d.data("typeahead"),f=typeof c=="object"&&c;e||d.data("typeahead",e=new b(this,f)),typeof c=="string"&&e[c]()})},a.fn.typeahead.defaults={source:[],items:8,menu:'<ul class="typeahead dropdown-menu"></ul>',item:'<li><a href="#"></a></li>'},a.fn.typeahead.Constructor=b,a(function(){a("body").on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(b){var c=a(this);if(c.data("typeahead"))return;b.preventDefault(),c.typeahead(c.data())})})}(window.jQuery);
\ No newline at end of file
diff --git a/ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js b/ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
index 7e3093a59f1..e7642bf3ad5 100644
--- a/ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
+++ b/ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
@@ -1,611 +1,21 @@
-/*!
- * jQuery UI 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI
- */
-(function(c,j){function k(a,b){var d=a.nodeName.toLowerCase();if("area"===d){b=a.parentNode;d=b.name;if(!a.href||!d||b.nodeName.toLowerCase()!=="map")return false;a=c("img[usemap=#"+d+"]")[0];return!!a&&l(a)}return(/input|select|textarea|button|object/.test(d)?!a.disabled:"a"==d?a.href||b:b)&&l(a)}function l(a){return!c(a).parents().andSelf().filter(function(){return c.curCSS(this,"visibility")==="hidden"||c.expr.filters.hidden(this)}).length}c.ui=c.ui||{};if(!c.ui.version){c.extend(c.ui,{version:"1.8.16",
-keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}});c.fn.extend({propAttr:c.fn.prop||c.fn.attr,_focus:c.fn.focus,focus:function(a,b){return typeof a==="number"?this.each(function(){var d=
-this;setTimeout(function(){c(d).focus();b&&b.call(d)},a)}):this._focus.apply(this,arguments)},scrollParent:function(){var a;a=c.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(c.curCSS(this,"position",1))&&/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(c.curCSS(this,
-"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||!a.length?c(document):a},zIndex:function(a){if(a!==j)return this.css("zIndex",a);if(this.length){a=c(this[0]);for(var b;a.length&&a[0]!==document;){b=a.css("position");if(b==="absolute"||b==="relative"||b==="fixed"){b=parseInt(a.css("zIndex"),10);if(!isNaN(b)&&b!==0)return b}a=a.parent()}}return 0},disableSelection:function(){return this.bind((c.support.selectstart?"selectstart":
-"mousedown")+".ui-disableSelection",function(a){a.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}});c.each(["Width","Height"],function(a,b){function d(f,g,m,n){c.each(e,function(){g-=parseFloat(c.curCSS(f,"padding"+this,true))||0;if(m)g-=parseFloat(c.curCSS(f,"border"+this+"Width",true))||0;if(n)g-=parseFloat(c.curCSS(f,"margin"+this,true))||0});return g}var e=b==="Width"?["Left","Right"]:["Top","Bottom"],h=b.toLowerCase(),i={innerWidth:c.fn.innerWidth,innerHeight:c.fn.innerHeight,
-outerWidth:c.fn.outerWidth,outerHeight:c.fn.outerHeight};c.fn["inner"+b]=function(f){if(f===j)return i["inner"+b].call(this);return this.each(function(){c(this).css(h,d(this,f)+"px")})};c.fn["outer"+b]=function(f,g){if(typeof f!=="number")return i["outer"+b].call(this,f);return this.each(function(){c(this).css(h,d(this,f,true,g)+"px")})}});c.extend(c.expr[":"],{data:function(a,b,d){return!!c.data(a,d[3])},focusable:function(a){return k(a,!isNaN(c.attr(a,"tabindex")))},tabbable:function(a){var b=c.attr(a,
-"tabindex"),d=isNaN(b);return(d||b>=0)&&k(a,!d)}});c(function(){var a=document.body,b=a.appendChild(b=document.createElement("div"));c.extend(b.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0});c.support.minHeight=b.offsetHeight===100;c.support.selectstart="onselectstart"in b;a.removeChild(b).style.display="none"});c.extend(c.ui,{plugin:{add:function(a,b,d){a=c.ui[a].prototype;for(var e in d){a.plugins[e]=a.plugins[e]||[];a.plugins[e].push([b,d[e]])}},call:function(a,b,d){if((b=a.plugins[b])&&
-a.element[0].parentNode)for(var e=0;e<b.length;e++)a.options[b[e][0]]&&b[e][1].apply(a.element,d)}},contains:function(a,b){return document.compareDocumentPosition?a.compareDocumentPosition(b)&16:a!==b&&a.contains(b)},hasScroll:function(a,b){if(c(a).css("overflow")==="hidden")return false;b=b&&b==="left"?"scrollLeft":"scrollTop";var d=false;if(a[b]>0)return true;a[b]=1;d=a[b]>0;a[b]=0;return d},isOverAxis:function(a,b,d){return a>b&&a<b+d},isOver:function(a,b,d,e,h,i){return c.ui.isOverAxis(a,d,h)&&
-c.ui.isOverAxis(b,e,i)}})}})(jQuery);
-;/*!
- * jQuery UI Widget 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Widget
- */
-(function(b,j){if(b.cleanData){var k=b.cleanData;b.cleanData=function(a){for(var c=0,d;(d=a[c])!=null;c++)try{b(d).triggerHandler("remove")}catch(e){}k(a)}}else{var l=b.fn.remove;b.fn.remove=function(a,c){return this.each(function(){if(!c)if(!a||b.filter(a,[this]).length)b("*",this).add([this]).each(function(){try{b(this).triggerHandler("remove")}catch(d){}});return l.call(b(this),a,c)})}}b.widget=function(a,c,d){var e=a.split(".")[0],f;a=a.split(".")[1];f=e+"-"+a;if(!d){d=c;c=b.Widget}b.expr[":"][f]=
-function(h){return!!b.data(h,a)};b[e]=b[e]||{};b[e][a]=function(h,g){arguments.length&&this._createWidget(h,g)};c=new c;c.options=b.extend(true,{},c.options);b[e][a].prototype=b.extend(true,c,{namespace:e,widgetName:a,widgetEventPrefix:b[e][a].prototype.widgetEventPrefix||a,widgetBaseClass:f},d);b.widget.bridge(a,b[e][a])};b.widget.bridge=function(a,c){b.fn[a]=function(d){var e=typeof d==="string",f=Array.prototype.slice.call(arguments,1),h=this;d=!e&&f.length?b.extend.apply(null,[true,d].concat(f)):
-d;if(e&&d.charAt(0)==="_")return h;e?this.each(function(){var g=b.data(this,a),i=g&&b.isFunction(g[d])?g[d].apply(g,f):g;if(i!==g&&i!==j){h=i;return false}}):this.each(function(){var g=b.data(this,a);g?g.option(d||{})._init():b.data(this,a,new c(d,this))});return h}};b.Widget=function(a,c){arguments.length&&this._createWidget(a,c)};b.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",options:{disabled:false},_createWidget:function(a,c){b.data(c,this.widgetName,this);this.element=b(c);this.options=
-b.extend(true,{},this.options,this._getCreateOptions(),a);var d=this;this.element.bind("remove."+this.widgetName,function(){d.destroy()});this._create();this._trigger("create");this._init()},_getCreateOptions:function(){return b.metadata&&b.metadata.get(this.element[0])[this.widgetName]},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName);this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+
-"-disabled ui-state-disabled")},widget:function(){return this.element},option:function(a,c){var d=a;if(arguments.length===0)return b.extend({},this.options);if(typeof a==="string"){if(c===j)return this.options[a];d={};d[a]=c}this._setOptions(d);return this},_setOptions:function(a){var c=this;b.each(a,function(d,e){c._setOption(d,e)});return this},_setOption:function(a,c){this.options[a]=c;if(a==="disabled")this.widget()[c?"addClass":"removeClass"](this.widgetBaseClass+"-disabled ui-state-disabled").attr("aria-disabled",
-c);return this},enable:function(){return this._setOption("disabled",false)},disable:function(){return this._setOption("disabled",true)},_trigger:function(a,c,d){var e=this.options[a];c=b.Event(c);c.type=(a===this.widgetEventPrefix?a:this.widgetEventPrefix+a).toLowerCase();d=d||{};if(c.originalEvent){a=b.event.props.length;for(var f;a;){f=b.event.props[--a];c[f]=c.originalEvent[f]}}this.element.trigger(c,d);return!(b.isFunction(e)&&e.call(this.element[0],c,d)===false||c.isDefaultPrevented())}}})(jQuery);
-;/*!
- * jQuery UI Mouse 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Mouse
- *
- * Depends:
- *	jquery.ui.widget.js
- */
-(function(b){var d=false;b(document).mouseup(function(){d=false});b.widget("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseInit:function(){var a=this;this.element.bind("mousedown."+this.widgetName,function(c){return a._mouseDown(c)}).bind("click."+this.widgetName,function(c){if(true===b.data(c.target,a.widgetName+".preventClickEvent")){b.removeData(c.target,a.widgetName+".preventClickEvent");c.stopImmediatePropagation();return false}});this.started=false},_mouseDestroy:function(){this.element.unbind("."+
-this.widgetName)},_mouseDown:function(a){if(!d){this._mouseStarted&&this._mouseUp(a);this._mouseDownEvent=a;var c=this,f=a.which==1,g=typeof this.options.cancel=="string"&&a.target.nodeName?b(a.target).closest(this.options.cancel).length:false;if(!f||g||!this._mouseCapture(a))return true;this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet)this._mouseDelayTimer=setTimeout(function(){c.mouseDelayMet=true},this.options.delay);if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a)){this._mouseStarted=
-this._mouseStart(a)!==false;if(!this._mouseStarted){a.preventDefault();return true}}true===b.data(a.target,this.widgetName+".preventClickEvent")&&b.removeData(a.target,this.widgetName+".preventClickEvent");this._mouseMoveDelegate=function(e){return c._mouseMove(e)};this._mouseUpDelegate=function(e){return c._mouseUp(e)};b(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);a.preventDefault();return d=true}},_mouseMove:function(a){if(b.browser.msie&&
-!(document.documentMode>=9)&&!a.button)return this._mouseUp(a);if(this._mouseStarted){this._mouseDrag(a);return a.preventDefault()}if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a))(this._mouseStarted=this._mouseStart(this._mouseDownEvent,a)!==false)?this._mouseDrag(a):this._mouseUp(a);return!this._mouseStarted},_mouseUp:function(a){b(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=
-false;a.target==this._mouseDownEvent.target&&b.data(a.target,this.widgetName+".preventClickEvent",true);this._mouseStop(a)}return false},_mouseDistanceMet:function(a){return Math.max(Math.abs(this._mouseDownEvent.pageX-a.pageX),Math.abs(this._mouseDownEvent.pageY-a.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return true}})})(jQuery);
-;/*
- * jQuery UI Position 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Position
- */
-(function(c){c.ui=c.ui||{};var n=/left|center|right/,o=/top|center|bottom/,t=c.fn.position,u=c.fn.offset;c.fn.position=function(b){if(!b||!b.of)return t.apply(this,arguments);b=c.extend({},b);var a=c(b.of),d=a[0],g=(b.collision||"flip").split(" "),e=b.offset?b.offset.split(" "):[0,0],h,k,j;if(d.nodeType===9){h=a.width();k=a.height();j={top:0,left:0}}else if(d.setTimeout){h=a.width();k=a.height();j={top:a.scrollTop(),left:a.scrollLeft()}}else if(d.preventDefault){b.at="left top";h=k=0;j={top:b.of.pageY,
-left:b.of.pageX}}else{h=a.outerWidth();k=a.outerHeight();j=a.offset()}c.each(["my","at"],function(){var f=(b[this]||"").split(" ");if(f.length===1)f=n.test(f[0])?f.concat(["center"]):o.test(f[0])?["center"].concat(f):["center","center"];f[0]=n.test(f[0])?f[0]:"center";f[1]=o.test(f[1])?f[1]:"center";b[this]=f});if(g.length===1)g[1]=g[0];e[0]=parseInt(e[0],10)||0;if(e.length===1)e[1]=e[0];e[1]=parseInt(e[1],10)||0;if(b.at[0]==="right")j.left+=h;else if(b.at[0]==="center")j.left+=h/2;if(b.at[1]==="bottom")j.top+=
-k;else if(b.at[1]==="center")j.top+=k/2;j.left+=e[0];j.top+=e[1];return this.each(function(){var f=c(this),l=f.outerWidth(),m=f.outerHeight(),p=parseInt(c.curCSS(this,"marginLeft",true))||0,q=parseInt(c.curCSS(this,"marginTop",true))||0,v=l+p+(parseInt(c.curCSS(this,"marginRight",true))||0),w=m+q+(parseInt(c.curCSS(this,"marginBottom",true))||0),i=c.extend({},j),r;if(b.my[0]==="right")i.left-=l;else if(b.my[0]==="center")i.left-=l/2;if(b.my[1]==="bottom")i.top-=m;else if(b.my[1]==="center")i.top-=
-m/2;i.left=Math.round(i.left);i.top=Math.round(i.top);r={left:i.left-p,top:i.top-q};c.each(["left","top"],function(s,x){c.ui.position[g[s]]&&c.ui.position[g[s]][x](i,{targetWidth:h,targetHeight:k,elemWidth:l,elemHeight:m,collisionPosition:r,collisionWidth:v,collisionHeight:w,offset:e,my:b.my,at:b.at})});c.fn.bgiframe&&f.bgiframe();f.offset(c.extend(i,{using:b.using}))})};c.ui.position={fit:{left:function(b,a){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();b.left=
-d>0?b.left-d:Math.max(b.left-a.collisionPosition.left,b.left)},top:function(b,a){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();b.top=d>0?b.top-d:Math.max(b.top-a.collisionPosition.top,b.top)}},flip:{left:function(b,a){if(a.at[0]!=="center"){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();var g=a.my[0]==="left"?-a.elemWidth:a.my[0]==="right"?a.elemWidth:0,e=a.at[0]==="left"?a.targetWidth:-a.targetWidth,h=-2*a.offset[0];b.left+=
-a.collisionPosition.left<0?g+e+h:d>0?g+e+h:0}},top:function(b,a){if(a.at[1]!=="center"){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();var g=a.my[1]==="top"?-a.elemHeight:a.my[1]==="bottom"?a.elemHeight:0,e=a.at[1]==="top"?a.targetHeight:-a.targetHeight,h=-2*a.offset[1];b.top+=a.collisionPosition.top<0?g+e+h:d>0?g+e+h:0}}}};if(!c.offset.setOffset){c.offset.setOffset=function(b,a){if(/static/.test(c.curCSS(b,"position")))b.style.position="relative";var d=c(b),
-g=d.offset(),e=parseInt(c.curCSS(b,"top",true),10)||0,h=parseInt(c.curCSS(b,"left",true),10)||0;g={top:a.top-g.top+e,left:a.left-g.left+h};"using"in a?a.using.call(b,g):d.css(g)};c.fn.offset=function(b){var a=this[0];if(!a||!a.ownerDocument)return null;if(b)return this.each(function(){c.offset.setOffset(this,b)});return u.call(this)}}})(jQuery);
-;/*
- * jQuery UI Draggable 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Draggables
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.mouse.js
- *	jquery.ui.widget.js
- */
-(function(d){d.widget("ui.draggable",d.ui.mouse,{widgetEventPrefix:"drag",options:{addClasses:true,appendTo:"parent",axis:false,connectToSortable:false,containment:false,cursor:"auto",cursorAt:false,grid:false,handle:false,helper:"original",iframeFix:false,opacity:false,refreshPositions:false,revert:false,revertDuration:500,scope:"default",scroll:true,scrollSensitivity:20,scrollSpeed:20,snap:false,snapMode:"both",snapTolerance:20,stack:false,zIndex:false},_create:function(){if(this.options.helper==
-"original"&&!/^(?:r|a|f)/.test(this.element.css("position")))this.element[0].style.position="relative";this.options.addClasses&&this.element.addClass("ui-draggable");this.options.disabled&&this.element.addClass("ui-draggable-disabled");this._mouseInit()},destroy:function(){if(this.element.data("draggable")){this.element.removeData("draggable").unbind(".draggable").removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled");this._mouseDestroy();return this}},_mouseCapture:function(a){var b=
-this.options;if(this.helper||b.disabled||d(a.target).is(".ui-resizable-handle"))return false;this.handle=this._getHandle(a);if(!this.handle)return false;if(b.iframeFix)d(b.iframeFix===true?"iframe":b.iframeFix).each(function(){d('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>').css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1E3}).css(d(this).offset()).appendTo("body")});return true},_mouseStart:function(a){var b=this.options;
-this.helper=this._createHelper(a);this._cacheHelperProportions();if(d.ui.ddmanager)d.ui.ddmanager.current=this;this._cacheMargins();this.cssPosition=this.helper.css("position");this.scrollParent=this.helper.scrollParent();this.offset=this.positionAbs=this.element.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};d.extend(this.offset,{click:{left:a.pageX-this.offset.left,top:a.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});
-this.originalPosition=this.position=this._generatePosition(a);this.originalPageX=a.pageX;this.originalPageY=a.pageY;b.cursorAt&&this._adjustOffsetFromHelper(b.cursorAt);b.containment&&this._setContainment();if(this._trigger("start",a)===false){this._clear();return false}this._cacheHelperProportions();d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a);this.helper.addClass("ui-draggable-dragging");this._mouseDrag(a,true);d.ui.ddmanager&&d.ui.ddmanager.dragStart(this,a);return true},
-_mouseDrag:function(a,b){this.position=this._generatePosition(a);this.positionAbs=this._convertPositionTo("absolute");if(!b){b=this._uiHash();if(this._trigger("drag",a,b)===false){this._mouseUp({});return false}this.position=b.position}if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";d.ui.ddmanager&&d.ui.ddmanager.drag(this,a);return false},_mouseStop:function(a){var b=
-false;if(d.ui.ddmanager&&!this.options.dropBehaviour)b=d.ui.ddmanager.drop(this,a);if(this.dropped){b=this.dropped;this.dropped=false}if((!this.element[0]||!this.element[0].parentNode)&&this.options.helper=="original")return false;if(this.options.revert=="invalid"&&!b||this.options.revert=="valid"&&b||this.options.revert===true||d.isFunction(this.options.revert)&&this.options.revert.call(this.element,b)){var c=this;d(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,
-10),function(){c._trigger("stop",a)!==false&&c._clear()})}else this._trigger("stop",a)!==false&&this._clear();return false},_mouseUp:function(a){this.options.iframeFix===true&&d("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)});d.ui.ddmanager&&d.ui.ddmanager.dragStop(this,a);return d.ui.mouse.prototype._mouseUp.call(this,a)},cancel:function(){this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear();return this},_getHandle:function(a){var b=!this.options.handle||
-!d(this.options.handle,this.element).length?true:false;d(this.options.handle,this.element).find("*").andSelf().each(function(){if(this==a.target)b=true});return b},_createHelper:function(a){var b=this.options;a=d.isFunction(b.helper)?d(b.helper.apply(this.element[0],[a])):b.helper=="clone"?this.element.clone().removeAttr("id"):this.element;a.parents("body").length||a.appendTo(b.appendTo=="parent"?this.element[0].parentNode:b.appendTo);a[0]!=this.element[0]&&!/(fixed|absolute)/.test(a.css("position"))&&
-a.css("position","absolute");return a},_adjustOffsetFromHelper:function(a){if(typeof a=="string")a=a.split(" ");if(d.isArray(a))a={left:+a[0],top:+a[1]||0};if("left"in a)this.offset.click.left=a.left+this.margins.left;if("right"in a)this.offset.click.left=this.helperProportions.width-a.right+this.margins.left;if("top"in a)this.offset.click.top=a.top+this.margins.top;if("bottom"in a)this.offset.click.top=this.helperProportions.height-a.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=
-this.helper.offsetParent();var a=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0])){a.left+=this.scrollParent.scrollLeft();a.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&d.browser.msie)a={top:0,left:0};return{top:a.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:a.left+(parseInt(this.offsetParent.css("borderLeftWidth"),
-10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var a=this.element.position();return{top:a.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),
-10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var a=this.options;if(a.containment=="parent")a.containment=this.helper[0].parentNode;if(a.containment=="document"||a.containment=="window")this.containment=[a.containment=="document"?0:d(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,a.containment=="document"?0:d(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,
-(a.containment=="document"?0:d(window).scrollLeft())+d(a.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(a.containment=="document"?0:d(window).scrollTop())+(d(a.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(a.containment)&&a.containment.constructor!=Array){a=d(a.containment);var b=a[0];if(b){a.offset();var c=d(b).css("overflow")!=
-"hidden";this.containment=[(parseInt(d(b).css("borderLeftWidth"),10)||0)+(parseInt(d(b).css("paddingLeft"),10)||0),(parseInt(d(b).css("borderTopWidth"),10)||0)+(parseInt(d(b).css("paddingTop"),10)||0),(c?Math.max(b.scrollWidth,b.offsetWidth):b.offsetWidth)-(parseInt(d(b).css("borderLeftWidth"),10)||0)-(parseInt(d(b).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(c?Math.max(b.scrollHeight,b.offsetHeight):b.offsetHeight)-(parseInt(d(b).css("borderTopWidth"),
-10)||0)-(parseInt(d(b).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom];this.relative_container=a}}else if(a.containment.constructor==Array)this.containment=a.containment},_convertPositionTo:function(a,b){if(!b)b=this.position;a=a=="absolute"?1:-1;var c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,f=/(html|body)/i.test(c[0].tagName);return{top:b.top+
-this.offset.relative.top*a+this.offset.parent.top*a-(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():f?0:c.scrollTop())*a),left:b.left+this.offset.relative.left*a+this.offset.parent.left*a-(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():f?0:c.scrollLeft())*a)}},_generatePosition:function(a){var b=this.options,c=this.cssPosition=="absolute"&&
-!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,f=/(html|body)/i.test(c[0].tagName),e=a.pageX,h=a.pageY;if(this.originalPosition){var g;if(this.containment){if(this.relative_container){g=this.relative_container.offset();g=[this.containment[0]+g.left,this.containment[1]+g.top,this.containment[2]+g.left,this.containment[3]+g.top]}else g=this.containment;if(a.pageX-this.offset.click.left<g[0])e=g[0]+this.offset.click.left;
-if(a.pageY-this.offset.click.top<g[1])h=g[1]+this.offset.click.top;if(a.pageX-this.offset.click.left>g[2])e=g[2]+this.offset.click.left;if(a.pageY-this.offset.click.top>g[3])h=g[3]+this.offset.click.top}if(b.grid){h=b.grid[1]?this.originalPageY+Math.round((h-this.originalPageY)/b.grid[1])*b.grid[1]:this.originalPageY;h=g?!(h-this.offset.click.top<g[1]||h-this.offset.click.top>g[3])?h:!(h-this.offset.click.top<g[1])?h-b.grid[1]:h+b.grid[1]:h;e=b.grid[0]?this.originalPageX+Math.round((e-this.originalPageX)/
-b.grid[0])*b.grid[0]:this.originalPageX;e=g?!(e-this.offset.click.left<g[0]||e-this.offset.click.left>g[2])?e:!(e-this.offset.click.left<g[0])?e-b.grid[0]:e+b.grid[0]:e}}return{top:h-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():f?0:c.scrollTop()),left:e-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(d.browser.safari&&d.browser.version<
-526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():f?0:c.scrollLeft())}},_clear:function(){this.helper.removeClass("ui-draggable-dragging");this.helper[0]!=this.element[0]&&!this.cancelHelperRemoval&&this.helper.remove();this.helper=null;this.cancelHelperRemoval=false},_trigger:function(a,b,c){c=c||this._uiHash();d.ui.plugin.call(this,a,[b,c]);if(a=="drag")this.positionAbs=this._convertPositionTo("absolute");return d.Widget.prototype._trigger.call(this,a,b,
-c)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}});d.extend(d.ui.draggable,{version:"1.8.16"});d.ui.plugin.add("draggable","connectToSortable",{start:function(a,b){var c=d(this).data("draggable"),f=c.options,e=d.extend({},b,{item:c.element});c.sortables=[];d(f.connectToSortable).each(function(){var h=d.data(this,"sortable");if(h&&!h.options.disabled){c.sortables.push({instance:h,shouldRevert:h.options.revert});
-h.refreshPositions();h._trigger("activate",a,e)}})},stop:function(a,b){var c=d(this).data("draggable"),f=d.extend({},b,{item:c.element});d.each(c.sortables,function(){if(this.instance.isOver){this.instance.isOver=0;c.cancelHelperRemoval=true;this.instance.cancelHelperRemoval=false;if(this.shouldRevert)this.instance.options.revert=true;this.instance._mouseStop(a);this.instance.options.helper=this.instance.options._helper;c.options.helper=="original"&&this.instance.currentItem.css({top:"auto",left:"auto"})}else{this.instance.cancelHelperRemoval=
-false;this.instance._trigger("deactivate",a,f)}})},drag:function(a,b){var c=d(this).data("draggable"),f=this;d.each(c.sortables,function(){this.instance.positionAbs=c.positionAbs;this.instance.helperProportions=c.helperProportions;this.instance.offset.click=c.offset.click;if(this.instance._intersectsWith(this.instance.containerCache)){if(!this.instance.isOver){this.instance.isOver=1;this.instance.currentItem=d(f).clone().removeAttr("id").appendTo(this.instance.element).data("sortable-item",true);
-this.instance.options._helper=this.instance.options.helper;this.instance.options.helper=function(){return b.helper[0]};a.target=this.instance.currentItem[0];this.instance._mouseCapture(a,true);this.instance._mouseStart(a,true,true);this.instance.offset.click.top=c.offset.click.top;this.instance.offset.click.left=c.offset.click.left;this.instance.offset.parent.left-=c.offset.parent.left-this.instance.offset.parent.left;this.instance.offset.parent.top-=c.offset.parent.top-this.instance.offset.parent.top;
-c._trigger("toSortable",a);c.dropped=this.instance.element;c.currentItem=c.element;this.instance.fromOutside=c}this.instance.currentItem&&this.instance._mouseDrag(a)}else if(this.instance.isOver){this.instance.isOver=0;this.instance.cancelHelperRemoval=true;this.instance.options.revert=false;this.instance._trigger("out",a,this.instance._uiHash(this.instance));this.instance._mouseStop(a,true);this.instance.options.helper=this.instance.options._helper;this.instance.currentItem.remove();this.instance.placeholder&&
-this.instance.placeholder.remove();c._trigger("fromSortable",a);c.dropped=false}})}});d.ui.plugin.add("draggable","cursor",{start:function(){var a=d("body"),b=d(this).data("draggable").options;if(a.css("cursor"))b._cursor=a.css("cursor");a.css("cursor",b.cursor)},stop:function(){var a=d(this).data("draggable").options;a._cursor&&d("body").css("cursor",a._cursor)}});d.ui.plugin.add("draggable","opacity",{start:function(a,b){a=d(b.helper);b=d(this).data("draggable").options;if(a.css("opacity"))b._opacity=
-a.css("opacity");a.css("opacity",b.opacity)},stop:function(a,b){a=d(this).data("draggable").options;a._opacity&&d(b.helper).css("opacity",a._opacity)}});d.ui.plugin.add("draggable","scroll",{start:function(){var a=d(this).data("draggable");if(a.scrollParent[0]!=document&&a.scrollParent[0].tagName!="HTML")a.overflowOffset=a.scrollParent.offset()},drag:function(a){var b=d(this).data("draggable"),c=b.options,f=false;if(b.scrollParent[0]!=document&&b.scrollParent[0].tagName!="HTML"){if(!c.axis||c.axis!=
-"x")if(b.overflowOffset.top+b.scrollParent[0].offsetHeight-a.pageY<c.scrollSensitivity)b.scrollParent[0].scrollTop=f=b.scrollParent[0].scrollTop+c.scrollSpeed;else if(a.pageY-b.overflowOffset.top<c.scrollSensitivity)b.scrollParent[0].scrollTop=f=b.scrollParent[0].scrollTop-c.scrollSpeed;if(!c.axis||c.axis!="y")if(b.overflowOffset.left+b.scrollParent[0].offsetWidth-a.pageX<c.scrollSensitivity)b.scrollParent[0].scrollLeft=f=b.scrollParent[0].scrollLeft+c.scrollSpeed;else if(a.pageX-b.overflowOffset.left<
-c.scrollSensitivity)b.scrollParent[0].scrollLeft=f=b.scrollParent[0].scrollLeft-c.scrollSpeed}else{if(!c.axis||c.axis!="x")if(a.pageY-d(document).scrollTop()<c.scrollSensitivity)f=d(document).scrollTop(d(document).scrollTop()-c.scrollSpeed);else if(d(window).height()-(a.pageY-d(document).scrollTop())<c.scrollSensitivity)f=d(document).scrollTop(d(document).scrollTop()+c.scrollSpeed);if(!c.axis||c.axis!="y")if(a.pageX-d(document).scrollLeft()<c.scrollSensitivity)f=d(document).scrollLeft(d(document).scrollLeft()-
-c.scrollSpeed);else if(d(window).width()-(a.pageX-d(document).scrollLeft())<c.scrollSensitivity)f=d(document).scrollLeft(d(document).scrollLeft()+c.scrollSpeed)}f!==false&&d.ui.ddmanager&&!c.dropBehaviour&&d.ui.ddmanager.prepareOffsets(b,a)}});d.ui.plugin.add("draggable","snap",{start:function(){var a=d(this).data("draggable"),b=a.options;a.snapElements=[];d(b.snap.constructor!=String?b.snap.items||":data(draggable)":b.snap).each(function(){var c=d(this),f=c.offset();this!=a.element[0]&&a.snapElements.push({item:this,
-width:c.outerWidth(),height:c.outerHeight(),top:f.top,left:f.left})})},drag:function(a,b){for(var c=d(this).data("draggable"),f=c.options,e=f.snapTolerance,h=b.offset.left,g=h+c.helperProportions.width,n=b.offset.top,o=n+c.helperProportions.height,i=c.snapElements.length-1;i>=0;i--){var j=c.snapElements[i].left,l=j+c.snapElements[i].width,k=c.snapElements[i].top,m=k+c.snapElements[i].height;if(j-e<h&&h<l+e&&k-e<n&&n<m+e||j-e<h&&h<l+e&&k-e<o&&o<m+e||j-e<g&&g<l+e&&k-e<n&&n<m+e||j-e<g&&g<l+e&&k-e<o&&
-o<m+e){if(f.snapMode!="inner"){var p=Math.abs(k-o)<=e,q=Math.abs(m-n)<=e,r=Math.abs(j-g)<=e,s=Math.abs(l-h)<=e;if(p)b.position.top=c._convertPositionTo("relative",{top:k-c.helperProportions.height,left:0}).top-c.margins.top;if(q)b.position.top=c._convertPositionTo("relative",{top:m,left:0}).top-c.margins.top;if(r)b.position.left=c._convertPositionTo("relative",{top:0,left:j-c.helperProportions.width}).left-c.margins.left;if(s)b.position.left=c._convertPositionTo("relative",{top:0,left:l}).left-c.margins.left}var t=
-p||q||r||s;if(f.snapMode!="outer"){p=Math.abs(k-n)<=e;q=Math.abs(m-o)<=e;r=Math.abs(j-h)<=e;s=Math.abs(l-g)<=e;if(p)b.position.top=c._convertPositionTo("relative",{top:k,left:0}).top-c.margins.top;if(q)b.position.top=c._convertPositionTo("relative",{top:m-c.helperProportions.height,left:0}).top-c.margins.top;if(r)b.position.left=c._convertPositionTo("relative",{top:0,left:j}).left-c.margins.left;if(s)b.position.left=c._convertPositionTo("relative",{top:0,left:l-c.helperProportions.width}).left-c.margins.left}if(!c.snapElements[i].snapping&&
-(p||q||r||s||t))c.options.snap.snap&&c.options.snap.snap.call(c.element,a,d.extend(c._uiHash(),{snapItem:c.snapElements[i].item}));c.snapElements[i].snapping=p||q||r||s||t}else{c.snapElements[i].snapping&&c.options.snap.release&&c.options.snap.release.call(c.element,a,d.extend(c._uiHash(),{snapItem:c.snapElements[i].item}));c.snapElements[i].snapping=false}}}});d.ui.plugin.add("draggable","stack",{start:function(){var a=d(this).data("draggable").options;a=d.makeArray(d(a.stack)).sort(function(c,f){return(parseInt(d(c).css("zIndex"),
-10)||0)-(parseInt(d(f).css("zIndex"),10)||0)});if(a.length){var b=parseInt(a[0].style.zIndex)||0;d(a).each(function(c){this.style.zIndex=b+c});this[0].style.zIndex=b+a.length}}});d.ui.plugin.add("draggable","zIndex",{start:function(a,b){a=d(b.helper);b=d(this).data("draggable").options;if(a.css("zIndex"))b._zIndex=a.css("zIndex");a.css("zIndex",b.zIndex)},stop:function(a,b){a=d(this).data("draggable").options;a._zIndex&&d(b.helper).css("zIndex",a._zIndex)}})})(jQuery);
-;/*
- * jQuery UI Droppable 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Droppables
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.widget.js
- *	jquery.ui.mouse.js
- *	jquery.ui.draggable.js
- */
-(function(d){d.widget("ui.droppable",{widgetEventPrefix:"drop",options:{accept:"*",activeClass:false,addClasses:true,greedy:false,hoverClass:false,scope:"default",tolerance:"intersect"},_create:function(){var a=this.options,b=a.accept;this.isover=0;this.isout=1;this.accept=d.isFunction(b)?b:function(c){return c.is(b)};this.proportions={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight};d.ui.ddmanager.droppables[a.scope]=d.ui.ddmanager.droppables[a.scope]||[];d.ui.ddmanager.droppables[a.scope].push(this);
-a.addClasses&&this.element.addClass("ui-droppable")},destroy:function(){for(var a=d.ui.ddmanager.droppables[this.options.scope],b=0;b<a.length;b++)a[b]==this&&a.splice(b,1);this.element.removeClass("ui-droppable ui-droppable-disabled").removeData("droppable").unbind(".droppable");return this},_setOption:function(a,b){if(a=="accept")this.accept=d.isFunction(b)?b:function(c){return c.is(b)};d.Widget.prototype._setOption.apply(this,arguments)},_activate:function(a){var b=d.ui.ddmanager.current;this.options.activeClass&&
-this.element.addClass(this.options.activeClass);b&&this._trigger("activate",a,this.ui(b))},_deactivate:function(a){var b=d.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass);b&&this._trigger("deactivate",a,this.ui(b))},_over:function(a){var b=d.ui.ddmanager.current;if(!(!b||(b.currentItem||b.element)[0]==this.element[0]))if(this.accept.call(this.element[0],b.currentItem||b.element)){this.options.hoverClass&&this.element.addClass(this.options.hoverClass);
-this._trigger("over",a,this.ui(b))}},_out:function(a){var b=d.ui.ddmanager.current;if(!(!b||(b.currentItem||b.element)[0]==this.element[0]))if(this.accept.call(this.element[0],b.currentItem||b.element)){this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("out",a,this.ui(b))}},_drop:function(a,b){var c=b||d.ui.ddmanager.current;if(!c||(c.currentItem||c.element)[0]==this.element[0])return false;var e=false;this.element.find(":data(droppable)").not(".ui-draggable-dragging").each(function(){var g=
-d.data(this,"droppable");if(g.options.greedy&&!g.options.disabled&&g.options.scope==c.options.scope&&g.accept.call(g.element[0],c.currentItem||c.element)&&d.ui.intersect(c,d.extend(g,{offset:g.element.offset()}),g.options.tolerance)){e=true;return false}});if(e)return false;if(this.accept.call(this.element[0],c.currentItem||c.element)){this.options.activeClass&&this.element.removeClass(this.options.activeClass);this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("drop",
-a,this.ui(c));return this.element}return false},ui:function(a){return{draggable:a.currentItem||a.element,helper:a.helper,position:a.position,offset:a.positionAbs}}});d.extend(d.ui.droppable,{version:"1.8.16"});d.ui.intersect=function(a,b,c){if(!b.offset)return false;var e=(a.positionAbs||a.position.absolute).left,g=e+a.helperProportions.width,f=(a.positionAbs||a.position.absolute).top,h=f+a.helperProportions.height,i=b.offset.left,k=i+b.proportions.width,j=b.offset.top,l=j+b.proportions.height;
-switch(c){case "fit":return i<=e&&g<=k&&j<=f&&h<=l;case "intersect":return i<e+a.helperProportions.width/2&&g-a.helperProportions.width/2<k&&j<f+a.helperProportions.height/2&&h-a.helperProportions.height/2<l;case "pointer":return d.ui.isOver((a.positionAbs||a.position.absolute).top+(a.clickOffset||a.offset.click).top,(a.positionAbs||a.position.absolute).left+(a.clickOffset||a.offset.click).left,j,i,b.proportions.height,b.proportions.width);case "touch":return(f>=j&&f<=l||h>=j&&h<=l||f<j&&h>l)&&(e>=
-i&&e<=k||g>=i&&g<=k||e<i&&g>k);default:return false}};d.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(a,b){var c=d.ui.ddmanager.droppables[a.options.scope]||[],e=b?b.type:null,g=(a.currentItem||a.element).find(":data(droppable)").andSelf(),f=0;a:for(;f<c.length;f++)if(!(c[f].options.disabled||a&&!c[f].accept.call(c[f].element[0],a.currentItem||a.element))){for(var h=0;h<g.length;h++)if(g[h]==c[f].element[0]){c[f].proportions.height=0;continue a}c[f].visible=c[f].element.css("display")!=
-"none";if(c[f].visible){e=="mousedown"&&c[f]._activate.call(c[f],b);c[f].offset=c[f].element.offset();c[f].proportions={width:c[f].element[0].offsetWidth,height:c[f].element[0].offsetHeight}}}},drop:function(a,b){var c=false;d.each(d.ui.ddmanager.droppables[a.options.scope]||[],function(){if(this.options){if(!this.options.disabled&&this.visible&&d.ui.intersect(a,this,this.options.tolerance))c=c||this._drop.call(this,b);if(!this.options.disabled&&this.visible&&this.accept.call(this.element[0],a.currentItem||
-a.element)){this.isout=1;this.isover=0;this._deactivate.call(this,b)}}});return c},dragStart:function(a,b){a.element.parents(":not(body,html)").bind("scroll.droppable",function(){a.options.refreshPositions||d.ui.ddmanager.prepareOffsets(a,b)})},drag:function(a,b){a.options.refreshPositions&&d.ui.ddmanager.prepareOffsets(a,b);d.each(d.ui.ddmanager.droppables[a.options.scope]||[],function(){if(!(this.options.disabled||this.greedyChild||!this.visible)){var c=d.ui.intersect(a,this,this.options.tolerance);
-if(c=!c&&this.isover==1?"isout":c&&this.isover==0?"isover":null){var e;if(this.options.greedy){var g=this.element.parents(":data(droppable):eq(0)");if(g.length){e=d.data(g[0],"droppable");e.greedyChild=c=="isover"?1:0}}if(e&&c=="isover"){e.isover=0;e.isout=1;e._out.call(e,b)}this[c]=1;this[c=="isout"?"isover":"isout"]=0;this[c=="isover"?"_over":"_out"].call(this,b);if(e&&c=="isout"){e.isout=0;e.isover=1;e._over.call(e,b)}}}})},dragStop:function(a,b){a.element.parents(":not(body,html)").unbind("scroll.droppable");
-a.options.refreshPositions||d.ui.ddmanager.prepareOffsets(a,b)}}})(jQuery);
-;/*
- * jQuery UI Resizable 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Resizables
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.mouse.js
- *	jquery.ui.widget.js
- */
-(function(e){e.widget("ui.resizable",e.ui.mouse,{widgetEventPrefix:"resize",options:{alsoResize:false,animate:false,animateDuration:"slow",animateEasing:"swing",aspectRatio:false,autoHide:false,containment:false,ghost:false,grid:false,handles:"e,s,se",helper:false,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:1E3},_create:function(){var b=this,a=this.options;this.element.addClass("ui-resizable");e.extend(this,{_aspectRatio:!!a.aspectRatio,aspectRatio:a.aspectRatio,originalElement:this.element,
-_proportionallyResizeElements:[],_helper:a.helper||a.ghost||a.animate?a.helper||"ui-resizable-helper":null});if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)){/relative/.test(this.element.css("position"))&&e.browser.opera&&this.element.css({position:"relative",top:"auto",left:"auto"});this.element.wrap(e('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),
-top:this.element.css("top"),left:this.element.css("left")}));this.element=this.element.parent().data("resizable",this.element.data("resizable"));this.elementIsWrapper=true;this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")});this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0});this.originalResizeStyle=
-this.originalElement.css("resize");this.originalElement.css("resize","none");this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"}));this.originalElement.css({margin:this.originalElement.css("margin")});this._proportionallyResize()}this.handles=a.handles||(!e(".ui-resizable-handle",this.element).length?"e,s,se":{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",
-nw:".ui-resizable-nw"});if(this.handles.constructor==String){if(this.handles=="all")this.handles="n,e,s,w,se,sw,ne,nw";var c=this.handles.split(",");this.handles={};for(var d=0;d<c.length;d++){var f=e.trim(c[d]),g=e('<div class="ui-resizable-handle '+("ui-resizable-"+f)+'"></div>');/sw|se|ne|nw/.test(f)&&g.css({zIndex:++a.zIndex});"se"==f&&g.addClass("ui-icon ui-icon-gripsmall-diagonal-se");this.handles[f]=".ui-resizable-"+f;this.element.append(g)}}this._renderAxis=function(h){h=h||this.element;for(var i in this.handles){if(this.handles[i].constructor==
-String)this.handles[i]=e(this.handles[i],this.element).show();if(this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)){var j=e(this.handles[i],this.element),l=0;l=/sw|ne|nw|se|n|s/.test(i)?j.outerHeight():j.outerWidth();j=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join("");h.css(j,l);this._proportionallyResize()}e(this.handles[i])}};this._renderAxis(this.element);this._handles=e(".ui-resizable-handle",this.element).disableSelection();
-this._handles.mouseover(function(){if(!b.resizing){if(this.className)var h=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);b.axis=h&&h[1]?h[1]:"se"}});if(a.autoHide){this._handles.hide();e(this.element).addClass("ui-resizable-autohide").hover(function(){if(!a.disabled){e(this).removeClass("ui-resizable-autohide");b._handles.show()}},function(){if(!a.disabled)if(!b.resizing){e(this).addClass("ui-resizable-autohide");b._handles.hide()}})}this._mouseInit()},destroy:function(){this._mouseDestroy();
-var b=function(c){e(c).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};if(this.elementIsWrapper){b(this.element);var a=this.element;a.after(this.originalElement.css({position:a.css("position"),width:a.outerWidth(),height:a.outerHeight(),top:a.css("top"),left:a.css("left")})).remove()}this.originalElement.css("resize",this.originalResizeStyle);b(this.originalElement);return this},_mouseCapture:function(b){var a=
-false;for(var c in this.handles)if(e(this.handles[c])[0]==b.target)a=true;return!this.options.disabled&&a},_mouseStart:function(b){var a=this.options,c=this.element.position(),d=this.element;this.resizing=true;this.documentScroll={top:e(document).scrollTop(),left:e(document).scrollLeft()};if(d.is(".ui-draggable")||/absolute/.test(d.css("position")))d.css({position:"absolute",top:c.top,left:c.left});e.browser.opera&&/relative/.test(d.css("position"))&&d.css({position:"relative",top:"auto",left:"auto"});
-this._renderProxy();c=m(this.helper.css("left"));var f=m(this.helper.css("top"));if(a.containment){c+=e(a.containment).scrollLeft()||0;f+=e(a.containment).scrollTop()||0}this.offset=this.helper.offset();this.position={left:c,top:f};this.size=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalSize=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalPosition={left:c,top:f};this.sizeDiff=
-{width:d.outerWidth()-d.width(),height:d.outerHeight()-d.height()};this.originalMousePosition={left:b.pageX,top:b.pageY};this.aspectRatio=typeof a.aspectRatio=="number"?a.aspectRatio:this.originalSize.width/this.originalSize.height||1;a=e(".ui-resizable-"+this.axis).css("cursor");e("body").css("cursor",a=="auto"?this.axis+"-resize":a);d.addClass("ui-resizable-resizing");this._propagate("start",b);return true},_mouseDrag:function(b){var a=this.helper,c=this.originalMousePosition,d=this._change[this.axis];
-if(!d)return false;c=d.apply(this,[b,b.pageX-c.left||0,b.pageY-c.top||0]);this._updateVirtualBoundaries(b.shiftKey);if(this._aspectRatio||b.shiftKey)c=this._updateRatio(c,b);c=this._respectSize(c,b);this._propagate("resize",b);a.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"});!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize();this._updateCache(c);this._trigger("resize",b,this.ui());return false},
-_mouseStop:function(b){this.resizing=false;var a=this.options,c=this;if(this._helper){var d=this._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName);d=f&&e.ui.hasScroll(d[0],"left")?0:c.sizeDiff.height;f=f?0:c.sizeDiff.width;f={width:c.helper.width()-f,height:c.helper.height()-d};d=parseInt(c.element.css("left"),10)+(c.position.left-c.originalPosition.left)||null;var g=parseInt(c.element.css("top"),10)+(c.position.top-c.originalPosition.top)||null;a.animate||this.element.css(e.extend(f,
-{top:g,left:d}));c.helper.height(c.size.height);c.helper.width(c.size.width);this._helper&&!a.animate&&this._proportionallyResize()}e("body").css("cursor","auto");this.element.removeClass("ui-resizable-resizing");this._propagate("stop",b);this._helper&&this.helper.remove();return false},_updateVirtualBoundaries:function(b){var a=this.options,c,d,f;a={minWidth:k(a.minWidth)?a.minWidth:0,maxWidth:k(a.maxWidth)?a.maxWidth:Infinity,minHeight:k(a.minHeight)?a.minHeight:0,maxHeight:k(a.maxHeight)?a.maxHeight:
-Infinity};if(this._aspectRatio||b){b=a.minHeight*this.aspectRatio;d=a.minWidth/this.aspectRatio;c=a.maxHeight*this.aspectRatio;f=a.maxWidth/this.aspectRatio;if(b>a.minWidth)a.minWidth=b;if(d>a.minHeight)a.minHeight=d;if(c<a.maxWidth)a.maxWidth=c;if(f<a.maxHeight)a.maxHeight=f}this._vBoundaries=a},_updateCache:function(b){this.offset=this.helper.offset();if(k(b.left))this.position.left=b.left;if(k(b.top))this.position.top=b.top;if(k(b.height))this.size.height=b.height;if(k(b.width))this.size.width=
-b.width},_updateRatio:function(b){var a=this.position,c=this.size,d=this.axis;if(k(b.height))b.width=b.height*this.aspectRatio;else if(k(b.width))b.height=b.width/this.aspectRatio;if(d=="sw"){b.left=a.left+(c.width-b.width);b.top=null}if(d=="nw"){b.top=a.top+(c.height-b.height);b.left=a.left+(c.width-b.width)}return b},_respectSize:function(b){var a=this._vBoundaries,c=this.axis,d=k(b.width)&&a.maxWidth&&a.maxWidth<b.width,f=k(b.height)&&a.maxHeight&&a.maxHeight<b.height,g=k(b.width)&&a.minWidth&&
-a.minWidth>b.width,h=k(b.height)&&a.minHeight&&a.minHeight>b.height;if(g)b.width=a.minWidth;if(h)b.height=a.minHeight;if(d)b.width=a.maxWidth;if(f)b.height=a.maxHeight;var i=this.originalPosition.left+this.originalSize.width,j=this.position.top+this.size.height,l=/sw|nw|w/.test(c);c=/nw|ne|n/.test(c);if(g&&l)b.left=i-a.minWidth;if(d&&l)b.left=i-a.maxWidth;if(h&&c)b.top=j-a.minHeight;if(f&&c)b.top=j-a.maxHeight;if((a=!b.width&&!b.height)&&!b.left&&b.top)b.top=null;else if(a&&!b.top&&b.left)b.left=
-null;return b},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var b=this.helper||this.element,a=0;a<this._proportionallyResizeElements.length;a++){var c=this._proportionallyResizeElements[a];if(!this.borderDif){var d=[c.css("borderTopWidth"),c.css("borderRightWidth"),c.css("borderBottomWidth"),c.css("borderLeftWidth")],f=[c.css("paddingTop"),c.css("paddingRight"),c.css("paddingBottom"),c.css("paddingLeft")];this.borderDif=e.map(d,function(g,h){g=parseInt(g,10)||
-0;h=parseInt(f[h],10)||0;return g+h})}e.browser.msie&&(e(b).is(":hidden")||e(b).parents(":hidden").length)||c.css({height:b.height()-this.borderDif[0]-this.borderDif[2]||0,width:b.width()-this.borderDif[1]-this.borderDif[3]||0})}},_renderProxy:function(){var b=this.options;this.elementOffset=this.element.offset();if(this._helper){this.helper=this.helper||e('<div style="overflow:hidden;"></div>');var a=e.browser.msie&&e.browser.version<7,c=a?1:0;a=a?2:-1;this.helper.addClass(this._helper).css({width:this.element.outerWidth()+
+(function(c,j){function k(a,b){var d=a.nodeName.toLowerCase();if("area"===d){b=a.parentNode;d=b.name;if(!a.href||!d||b.nodeName.toLowerCase()!=="map")return false;a=c("img[usemap=#"+d+"]")[0];return!!a&&l(a)}return(/input|select|textarea|button|object/.test(d)?!a.disabled:"a"==d?a.href||b:b)&&l(a)}function l(a){return!c(a).parents().andSelf().filter(function(){return c.curCSS(this,"visibility")==="hidden"||c.expr.filters.hidden(this)}).length}c.ui=c.ui||{};if(!c.ui.version){c.extend(c.ui,{version:"1.8.16",keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}});c.fn.extend({propAttr:c.fn.prop||c.fn.attr,_focus:c.fn.focus,focus:function(a,b){return typeof a==="number"?this.each(function(){var d=this;setTimeout(function(){c(d).focus();b&&b.call(d)},a)}):this._focus.apply(this,arguments)},scrollParent:function(){var a;a=c.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(c.curCSS(this,"position",1))&&/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||!a.length?c(document):a},zIndex:function(a){if(a!==j)return this.css("zIndex",a);if(this.length){a=c(this[0]);for(var b;a.length&&a[0]!==document;){b=a.css("position");if(b==="absolute"||b==="relative"||b==="fixed"){b=parseInt(a.css("zIndex"),10);if(!isNaN(b)&&b!==0)return b}a=a.parent()}}return 0},disableSelection:function(){return this.bind((c.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",function(a){a.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}});c.each(["Width","Height"],function(a,b){function d(f,g,m,n){c.each(e,function(){g-=parseFloat(c.curCSS(f,"padding"+this,true))||0;if(m)g-=parseFloat(c.curCSS(f,"border"+this+"Width",true))||0;if(n)g-=parseFloat(c.curCSS(f,"margin"+this,true))||0});return g}var e=b==="Width"?["Left","Right"]:["Top","Bottom"],h=b.toLowerCase(),i={innerWidth:c.fn.innerWidth,innerHeight:c.fn.innerHeight,outerWidth:c.fn.outerWidth,outerHeight:c.fn.outerHeight};c.fn["inner"+b]=function(f){if(f===j)return i["inner"+b].call(this);return this.each(function(){c(this).css(h,d(this,f)+"px")})};c.fn["outer"+b]=function(f,g){if(typeof f!=="number")return i["outer"+b].call(this,f);return this.each(function(){c(this).css(h,d(this,f,true,g)+"px")})}});c.extend(c.expr[":"],{data:function(a,b,d){return!!c.data(a,d[3])},focusable:function(a){return k(a,!isNaN(c.attr(a,"tabindex")))},tabbable:function(a){var b=c.attr(a,"tabindex"),d=isNaN(b);return(d||b>=0)&&k(a,!d)}});c(function(){var a=document.body,b=a.appendChild(b=document.createElement("div"));c.extend(b.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0});c.support.minHeight=b.offsetHeight===100;c.support.selectstart="onselectstart"in b;a.removeChild(b).style.display="none"});c.extend(c.ui,{plugin:{add:function(a,b,d){a=c.ui[a].prototype;for(var e in d){a.plugins[e]=a.plugins[e]||[];a.plugins[e].push([b,d[e]])}},call:function(a,b,d){if((b=a.plugins[b])&&a.element[0].parentNode)for(var e=0;e<b.length;e++)a.options[b[e][0]]&&b[e][1].apply(a.element,d)}},contains:function(a,b){return document.compareDocumentPosition?a.compareDocumentPosition(b)&16:a!==b&&a.contains(b)},hasScroll:function(a,b){if(c(a).css("overflow")==="hidden")return false;b=b&&b==="left"?"scrollLeft":"scrollTop";var d=false;if(a[b]>0)return true;a[b]=1;d=a[b]>0;a[b]=0;return d},isOverAxis:function(a,b,d){return a>b&&a<b+d},isOver:function(a,b,d,e,h,i){return c.ui.isOverAxis(a,d,h)&&c.ui.isOverAxis(b,e,i)}})}})(jQuery);;(function(b,j){if(b.cleanData){var k=b.cleanData;b.cleanData=function(a){for(var c=0,d;(d=a[c])!=null;c++)try{b(d).triggerHandler("remove")}catch(e){}k(a)}}else{var l=b.fn.remove;b.fn.remove=function(a,c){return this.each(function(){if(!c)if(!a||b.filter(a,[this]).length)b("*",this).add([this]).each(function(){try{b(this).triggerHandler("remove")}catch(d){}});return l.call(b(this),a,c)})}}b.widget=function(a,c,d){var e=a.split(".")[0],f;a=a.split(".")[1];f=e+"-"+a;if(!d){d=c;c=b.Widget}b.expr[":"][f]=function(h){return!!b.data(h,a)};b[e]=b[e]||{};b[e][a]=function(h,g){arguments.length&&this._createWidget(h,g)};c=new c;c.options=b.extend(true,{},c.options);b[e][a].prototype=b.extend(true,c,{namespace:e,widgetName:a,widgetEventPrefix:b[e][a].prototype.widgetEventPrefix||a,widgetBaseClass:f},d);b.widget.bridge(a,b[e][a])};b.widget.bridge=function(a,c){b.fn[a]=function(d){var e=typeof d==="string",f=Array.prototype.slice.call(arguments,1),h=this;d=!e&&f.length?b.extend.apply(null,[true,d].concat(f)):d;if(e&&d.charAt(0)==="_")return h;e?this.each(function(){var g=b.data(this,a),i=g&&b.isFunction(g[d])?g[d].apply(g,f):g;if(i!==g&&i!==j){h=i;return false}}):this.each(function(){var g=b.data(this,a);g?g.option(d||{})._init():b.data(this,a,new c(d,this))});return h}};b.Widget=function(a,c){arguments.length&&this._createWidget(a,c)};b.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",options:{disabled:false},_createWidget:function(a,c){b.data(c,this.widgetName,this);this.element=b(c);this.options=b.extend(true,{},this.options,this._getCreateOptions(),a);var d=this;this.element.bind("remove."+this.widgetName,function(){d.destroy()});this._create();this._trigger("create");this._init()},_getCreateOptions:function(){return b.metadata&&b.metadata.get(this.element[0])[this.widgetName]},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName);this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+"-disabled ui-state-disabled")},widget:function(){return this.element},option:function(a,c){var d=a;if(arguments.length===0)return b.extend({},this.options);if(typeof a==="string"){if(c===j)return this.options[a];d={};d[a]=c}this._setOptions(d);return this},_setOptions:function(a){var c=this;b.each(a,function(d,e){c._setOption(d,e)});return this},_setOption:function(a,c){this.options[a]=c;if(a==="disabled")this.widget()[c?"addClass":"removeClass"](this.widgetBaseClass+"-disabled ui-state-disabled").attr("aria-disabled",c);return this},enable:function(){return this._setOption("disabled",false)},disable:function(){return this._setOption("disabled",true)},_trigger:function(a,c,d){var e=this.options[a];c=b.Event(c);c.type=(a===this.widgetEventPrefix?a:this.widgetEventPrefix+a).toLowerCase();d=d||{};if(c.originalEvent){a=b.event.props.length;for(var f;a;){f=b.event.props[--a];c[f]=c.originalEvent[f]}}this.element.trigger(c,d);return!(b.isFunction(e)&&e.call(this.element[0],c,d)===false||c.isDefaultPrevented())}}})(jQuery);;(function(b){var d=false;b(document).mouseup(function(){d=false});b.widget("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseInit:function(){var a=this;this.element.bind("mousedown."+this.widgetName,function(c){return a._mouseDown(c)}).bind("click."+this.widgetName,function(c){if(true===b.data(c.target,a.widgetName+".preventClickEvent")){b.removeData(c.target,a.widgetName+".preventClickEvent");c.stopImmediatePropagation();return false}});this.started=false},_mouseDestroy:function(){this.element.unbind("."+
+this.widgetName)},_mouseDown:function(a){if(!d){this._mouseStarted&&this._mouseUp(a);this._mouseDownEvent=a;var c=this,f=a.which==1,g=typeof this.options.cancel=="string"&&a.target.nodeName?b(a.target).closest(this.options.cancel).length:false;if(!f||g||!this._mouseCapture(a))return true;this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet)this._mouseDelayTimer=setTimeout(function(){c.mouseDelayMet=true},this.options.delay);if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a)){this._mouseStarted=this._mouseStart(a)!==false;if(!this._mouseStarted){a.preventDefault();return true}}true===b.data(a.target,this.widgetName+".preventClickEvent")&&b.removeData(a.target,this.widgetName+".preventClickEvent");this._mouseMoveDelegate=function(e){return c._mouseMove(e)};this._mouseUpDelegate=function(e){return c._mouseUp(e)};b(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);a.preventDefault();return d=true}},_mouseMove:function(a){if(b.browser.msie&&!(document.documentMode>=9)&&!a.button)return this._mouseUp(a);if(this._mouseStarted){this._mouseDrag(a);return a.preventDefault()}if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a))(this._mouseStarted=this._mouseStart(this._mouseDownEvent,a)!==false)?this._mouseDrag(a):this._mouseUp(a);return!this._mouseStarted},_mouseUp:function(a){b(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=false;a.target==this._mouseDownEvent.target&&b.data(a.target,this.widgetName+".preventClickEvent",true);this._mouseStop(a)}return false},_mouseDistanceMet:function(a){return Math.max(Math.abs(this._mouseDownEvent.pageX-a.pageX),Math.abs(this._mouseDownEvent.pageY-a.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return true}})})(jQuery);;(function(c){c.ui=c.ui||{};var n=/left|center|right/,o=/top|center|bottom/,t=c.fn.position,u=c.fn.offset;c.fn.position=function(b){if(!b||!b.of)return t.apply(this,arguments);b=c.extend({},b);var a=c(b.of),d=a[0],g=(b.collision||"flip").split(" "),e=b.offset?b.offset.split(" "):[0,0],h,k,j;if(d.nodeType===9){h=a.width();k=a.height();j={top:0,left:0}}else if(d.setTimeout){h=a.width();k=a.height();j={top:a.scrollTop(),left:a.scrollLeft()}}else if(d.preventDefault){b.at="left top";h=k=0;j={top:b.of.pageY,left:b.of.pageX}}else{h=a.outerWidth();k=a.outerHeight();j=a.offset()}c.each(["my","at"],function(){var f=(b[this]||"").split(" ");if(f.length===1)f=n.test(f[0])?f.concat(["center"]):o.test(f[0])?["center"].concat(f):["center","center"];f[0]=n.test(f[0])?f[0]:"center";f[1]=o.test(f[1])?f[1]:"center";b[this]=f});if(g.length===1)g[1]=g[0];e[0]=parseInt(e[0],10)||0;if(e.length===1)e[1]=e[0];e[1]=parseInt(e[1],10)||0;if(b.at[0]==="right")j.left+=h;else if(b.at[0]==="center")j.left+=h/2;if(b.at[1]==="bottom")j.top+=k;else if(b.at[1]==="center")j.top+=k/2;j.left+=e[0];j.top+=e[1];return this.each(function(){var f=c(this),l=f.outerWidth(),m=f.outerHeight(),p=parseInt(c.curCSS(this,"marginLeft",true))||0,q=parseInt(c.curCSS(this,"marginTop",true))||0,v=l+p+(parseInt(c.curCSS(this,"marginRight",true))||0),w=m+q+(parseInt(c.curCSS(this,"marginBottom",true))||0),i=c.extend({},j),r;if(b.my[0]==="right")i.left-=l;else if(b.my[0]==="center")i.left-=l/2;if(b.my[1]==="bottom")i.top-=m;else if(b.my[1]==="center")i.top-=m/2;i.left=Math.round(i.left);i.top=Math.round(i.top);r={left:i.left-p,top:i.top-q};c.each(["left","top"],function(s,x){c.ui.position[g[s]]&&c.ui.position[g[s]][x](i,{targetWidth:h,targetHeight:k,elemWidth:l,elemHeight:m,collisionPosition:r,collisionWidth:v,collisionHeight:w,offset:e,my:b.my,at:b.at})});c.fn.bgiframe&&f.bgiframe();f.offset(c.extend(i,{using:b.using}))})};c.ui.position={fit:{left:function(b,a){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();b.left=d>0?b.left-d:Math.max(b.left-a.collisionPosition.left,b.left)},top:function(b,a){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();b.top=d>0?b.top-d:Math.max(b.top-a.collisionPosition.top,b.top)}},flip:{left:function(b,a){if(a.at[0]!=="center"){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();var g=a.my[0]==="left"?-a.elemWidth:a.my[0]==="right"?a.elemWidth:0,e=a.at[0]==="left"?a.targetWidth:-a.targetWidth,h=-2*a.offset[0];b.left+=a.collisionPosition.left<0?g+e+h:d>0?g+e+h:0}},top:function(b,a){if(a.at[1]!=="center"){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();var g=a.my[1]==="top"?-a.elemHeight:a.my[1]==="bottom"?a.elemHeight:0,e=a.at[1]==="top"?a.targetHeight:-a.targetHeight,h=-2*a.offset[1];b.top+=a.collisionPosition.top<0?g+e+h:d>0?g+e+h:0}}}};if(!c.offset.setOffset){c.offset.setOffset=function(b,a){if(/static/.test(c.curCSS(b,"position")))b.style.position="relative";var d=c(b),g=d.offset(),e=parseInt(c.curCSS(b,"top",true),10)||0,h=parseInt(c.curCSS(b,"left",true),10)||0;g={top:a.top-g.top+e,left:a.left-g.left+h};"using"in a?a.using.call(b,g):d.css(g)};c.fn.offset=function(b){var a=this[0];if(!a||!a.ownerDocument)return null;if(b)return this.each(function(){c.offset.setOffset(this,b)});return u.call(this)}}})(jQuery);;(function(d){d.widget("ui.draggable",d.ui.mouse,{widgetEventPrefix:"drag",options:{addClasses:true,appendTo:"parent",axis:false,connectToSortable:false,containment:false,cursor:"auto",cursorAt:false,grid:false,handle:false,helper:"original",iframeFix:false,opacity:false,refreshPositions:false,revert:false,revertDuration:500,scope:"default",scroll:true,scrollSensitivity:20,scrollSpeed:20,snap:false,snapMode:"both",snapTolerance:20,stack:false,zIndex:false},_create:function(){if(this.options.helper=="original"&&!/^(?:r|a|f)/.test(this.element.css("position")))this.element[0].style.position="relative";this.options.addClasses&&this.element.addClass("ui-draggable");this.options.disabled&&this.element.addClass("ui-draggable-disabled");this._mouseInit()},destroy:function(){if(this.element.data("draggable")){this.element.removeData("draggable").unbind(".draggable").removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled");this._mouseDestroy();return this}},_mouseCapture:function(a){var b=this.options;if(this.helper||b.disabled||d(a.target).is(".ui-resizable-handle"))return false;this.handle=this._getHandle(a);if(!this.handle)return false;if(b.iframeFix)d(b.iframeFix===true?"iframe":b.iframeFix).each(function(){d('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>').css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1E3}).css(d(this).offset()).appendTo("body")});return true},_mouseStart:function(a){var b=this.options;this.helper=this._createHelper(a);this._cacheHelperProportions();if(d.ui.ddmanager)d.ui.ddmanager.current=this;this._cacheMargins();this.cssPosition=this.helper.css("position");this.scrollParent=this.helper.scrollParent();this.offset=this.positionAbs=this.element.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};d.extend(this.offset,{click:{left:a.pageX-this.offset.left,top:a.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this.position=this._generatePosition(a);this.originalPageX=a.pageX;this.originalPageY=a.pageY;b.cursorAt&&this._adjustOffsetFromHelper(b.cursorAt);b.containment&&this._setContainment();if(this._trigger("start",a)===false){this._clear();return false}this._cacheHelperProportions();d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a);this.helper.addClass("ui-draggable-dragging");this._mouseDrag(a,true);d.ui.ddmanager&&d.ui.ddmanager.dragStart(this,a);return true},_mouseDrag:function(a,b){this.position=this._generatePosition(a);this.positionAbs=this._convertPositionTo("absolute");if(!b){b=this._uiHash();if(this._trigger("drag",a,b)===false){this._mouseUp({});return false}this.position=b.position}if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";d.ui.ddmanager&&d.ui.ddmanager.drag(this,a);return false},_mouseStop:function(a){var b=false;if(d.ui.ddmanager&&!this.options.dropBehaviour)b=d.ui.ddmanager.drop(this,a);if(this.dropped){b=this.dropped;this.dropped=false}if((!this.element[0]||!this.element[0].parentNode)&&this.options.helper=="original")return false;if(this.options.revert=="invalid"&&!b||this.options.revert=="valid"&&b||this.options.revert===true||d.isFunction(this.options.revert)&&this.options.revert.call(this.element,b)){var c=this;d(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){c._trigger("stop",a)!==false&&c._clear()})}else this._trigger("stop",a)!==false&&this._clear();return false},_mouseUp:function(a){this.options.iframeFix===true&&d("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)});d.ui.ddmanager&&d.ui.ddmanager.dragStop(this,a);return d.ui.mouse.prototype._mouseUp.call(this,a)},cancel:function(){this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear();return this},_getHandle:function(a){var b=!this.options.handle||!d(this.options.handle,this.element).length?true:false;d(this.options.handle,this.element).find("*").andSelf().each(function(){if(this==a.target)b=true});return b},_createHelper:function(a){var b=this.options;a=d.isFunction(b.helper)?d(b.helper.apply(this.element[0],[a])):b.helper=="clone"?this.element.clone().removeAttr("id"):this.element;a.parents("body").length||a.appendTo(b.appendTo=="parent"?this.element[0].parentNode:b.appendTo);a[0]!=this.element[0]&&!/(fixed|absolute)/.test(a.css("position"))&&a.css("position","absolute");return a},_adjustOffsetFromHelper:function(a){if(typeof a=="string")a=a.split(" ");if(d.isArray(a))a={left:+a[0],top:+a[1]||0};if("left"in a)this.offset.click.left=a.left+this.margins.left;if("right"in a)this.offset.click.left=this.helperProportions.width-a.right+this.margins.left;if("top"in a)this.offset.click.top=a.top+this.margins.top;if("bottom"in a)this.offset.click.top=this.helperProportions.height-a.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var a=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0])){a.left+=this.scrollParent.scrollLeft();a.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&d.browser.msie)a={top:0,left:0};return{top:a.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:a.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var a=this.element.position();return{top:a.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var a=this.options;if(a.containment=="parent")a.containment=this.helper[0].parentNode;if(a.containment=="document"||a.containment=="window")this.containment=[a.containment=="document"?0:d(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,a.containment=="document"?0:d(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,(a.containment=="document"?0:d(window).scrollLeft())+d(a.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(a.containment=="document"?0:d(window).scrollTop())+(d(a.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(a.containment)&&a.containment.constructor!=Array){a=d(a.containment);var b=a[0];if(b){a.offset();var c=d(b).css("overflow")!="hidden";this.containment=[(parseInt(d(b).css("borderLeftWidth"),10)||0)+(parseInt(d(b).css("paddingLeft"),10)||0),(parseInt(d(b).css("borderTopWidth"),10)||0)+(parseInt(d(b).css("paddingTop"),10)||0),(c?Math.max(b.scrollWidth,b.offsetWidth):b.offsetWidth)-(parseInt(d(b).css("borderLeftWidth"),10)||0)-(parseInt(d(b).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(c?Math.max(b.scrollHeight,b.offsetHeight):b.offsetHeight)-(parseInt(d(b).css("borderTopWidth"),10)||0)-(parseInt(d(b).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom];this.relative_container=a}}else if(a.containment.constructor==Array)this.containment=a.containment},_convertPositionTo:function(a,b){if(!b)b=this.position;a=a=="absolute"?1:-1;var c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,f=/(html|body)/i.test(c[0].tagName);return{top:b.top+
+this.offset.relative.top*a+this.offset.parent.top*a-(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():f?0:c.scrollTop())*a),left:b.left+this.offset.relative.left*a+this.offset.parent.left*a-(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():f?0:c.scrollLeft())*a)}},_generatePosition:function(a){var b=this.options,c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,f=/(html|body)/i.test(c[0].tagName),e=a.pageX,h=a.pageY;if(this.originalPosition){var g;if(this.containment){if(this.relative_container){g=this.relative_container.offset();g=[this.containment[0]+g.left,this.containment[1]+g.top,this.containment[2]+g.left,this.containment[3]+g.top]}else g=this.containment;if(a.pageX-this.offset.click.left<g[0])e=g[0]+this.offset.click.left;if(a.pageY-this.offset.click.top<g[1])h=g[1]+this.offset.click.top;if(a.pageX-this.offset.click.left>g[2])e=g[2]+this.offset.click.left;if(a.pageY-this.offset.click.top>g[3])h=g[3]+this.offset.click.top}if(b.grid){h=b.grid[1]?this.originalPageY+Math.round((h-this.originalPageY)/b.grid[1])*b.grid[1]:this.originalPageY;h=g?!(h-this.offset.click.top<g[1]||h-this.offset.click.top>g[3])?h:!(h-this.offset.click.top<g[1])?h-b.grid[1]:h+b.grid[1]:h;e=b.grid[0]?this.originalPageX+Math.round((e-this.originalPageX)/b.grid[0])*b.grid[0]:this.originalPageX;e=g?!(e-this.offset.click.left<g[0]||e-this.offset.click.left>g[2])?e:!(e-this.offset.click.left<g[0])?e-b.grid[0]:e+b.grid[0]:e}}return{top:h-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():f?0:c.scrollTop()),left:e-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():f?0:c.scrollLeft())}},_clear:function(){this.helper.removeClass("ui-draggable-dragging");this.helper[0]!=this.element[0]&&!this.cancelHelperRemoval&&this.helper.remove();this.helper=null;this.cancelHelperRemoval=false},_trigger:function(a,b,c){c=c||this._uiHash();d.ui.plugin.call(this,a,[b,c]);if(a=="drag")this.positionAbs=this._convertPositionTo("absolute");return d.Widget.prototype._trigger.call(this,a,b,c)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}});d.extend(d.ui.draggable,{version:"1.8.16"});d.ui.plugin.add("draggable","connectToSortable",{start:function(a,b){var c=d(this).data("draggable"),f=c.options,e=d.extend({},b,{item:c.element});c.sortables=[];d(f.connectToSortable).each(function(){var h=d.data(this,"sortable");if(h&&!h.options.disabled){c.sortables.push({instance:h,shouldRevert:h.options.revert});h.refreshPositions();h._trigger("activate",a,e)}})},stop:function(a,b){var c=d(this).data("draggable"),f=d.extend({},b,{item:c.element});d.each(c.sortables,function(){if(this.instance.isOver){this.instance.isOver=0;c.cancelHelperRemoval=true;this.instance.cancelHelperRemoval=false;if(this.shouldRevert)this.instance.options.revert=true;this.instance._mouseStop(a);this.instance.options.helper=this.instance.options._helper;c.options.helper=="original"&&this.instance.currentItem.css({top:"auto",left:"auto"})}else{this.instance.cancelHelperRemoval=false;this.instance._trigger("deactivate",a,f)}})},drag:function(a,b){var c=d(this).data("draggable"),f=this;d.each(c.sortables,function(){this.instance.positionAbs=c.positionAbs;this.instance.helperProportions=c.helperProportions;this.instance.offset.click=c.offset.click;if(this.instance._intersectsWith(this.instance.containerCache)){if(!this.instance.isOver){this.instance.isOver=1;this.instance.currentItem=d(f).clone().removeAttr("id").appendTo(this.instance.element).data("sortable-item",true);this.instance.options._helper=this.instance.options.helper;this.instance.options.helper=function(){return b.helper[0]};a.target=this.instance.currentItem[0];this.instance._mouseCapture(a,true);this.instance._mouseStart(a,true,true);this.instance.offset.click.top=c.offset.click.top;this.instance.offset.click.left=c.offset.click.left;this.instance.offset.parent.left-=c.offset.parent.left-this.instance.offset.parent.left;this.instance.offset.parent.top-=c.offset.parent.top-this.instance.offset.parent.top;c._trigger("toSortable",a);c.dropped=this.instance.element;c.currentItem=c.element;this.instance.fromOutside=c}this.instance.currentItem&&this.instance._mouseDrag(a)}else if(this.instance.isOver){this.instance.isOver=0;this.instance.cancelHelperRemoval=true;this.instance.options.revert=false;this.instance._trigger("out",a,this.instance._uiHash(this.instance));this.instance._mouseStop(a,true);this.instance.options.helper=this.instance.options._helper;this.instance.currentItem.remove();this.instance.placeholder&&this.instance.placeholder.remove();c._trigger("fromSortable",a);c.dropped=false}})}});d.ui.plugin.add("draggable","cursor",{start:function(){var a=d("body"),b=d(this).data("draggable").options;if(a.css("cursor"))b._cursor=a.css("cursor");a.css("cursor",b.cursor)},stop:function(){var a=d(this).data("draggable").options;a._cursor&&d("body").css("cursor",a._cursor)}});d.ui.plugin.add("draggable","opacity",{start:function(a,b){a=d(b.helper);b=d(this).data("draggable").options;if(a.css("opacity"))b._opacity=a.css("opacity");a.css("opacity",b.opacity)},stop:function(a,b){a=d(this).data("draggable").options;a._opacity&&d(b.helper).css("opacity",a._opacity)}});d.ui.plugin.add("draggable","scroll",{start:function(){var a=d(this).data("draggable");if(a.scrollParent[0]!=document&&a.scrollParent[0].tagName!="HTML")a.overflowOffset=a.scrollParent.offset()},drag:function(a){var b=d(this).data("draggable"),c=b.options,f=false;if(b.scrollParent[0]!=document&&b.scrollParent[0].tagName!="HTML"){if(!c.axis||c.axis!="x")if(b.overflowOffset.top+b.scrollParent[0].offsetHeight-a.pageY<c.scrollSensitivity)b.scrollParent[0].scrollTop=f=b.scrollParent[0].scrollTop+c.scrollSpeed;else if(a.pageY-b.overflowOffset.top<c.scrollSensitivity)b.scrollParent[0].scrollTop=f=b.scrollParent[0].scrollTop-c.scrollSpeed;if(!c.axis||c.axis!="y")if(b.overflowOffset.left+b.scrollParent[0].offsetWidth-a.pageX<c.scrollSensitivity)b.scrollParent[0].scrollLeft=f=b.scrollParent[0].scrollLeft+c.scrollSpeed;else if(a.pageX-b.overflowOffset.left<c.scrollSensitivity)b.scrollParent[0].scrollLeft=f=b.scrollParent[0].scrollLeft-c.scrollSpeed}else{if(!c.axis||c.axis!="x")if(a.pageY-d(document).scrollTop()<c.scrollSensitivity)f=d(document).scrollTop(d(document).scrollTop()-c.scrollSpeed);else if(d(window).height()-(a.pageY-d(document).scrollTop())<c.scrollSensitivity)f=d(document).scrollTop(d(document).scrollTop()+c.scrollSpeed);if(!c.axis||c.axis!="y")if(a.pageX-d(document).scrollLeft()<c.scrollSensitivity)f=d(document).scrollLeft(d(document).scrollLeft()-
+c.scrollSpeed);else if(d(window).width()-(a.pageX-d(document).scrollLeft())<c.scrollSensitivity)f=d(document).scrollLeft(d(document).scrollLeft()+c.scrollSpeed)}f!==false&&d.ui.ddmanager&&!c.dropBehaviour&&d.ui.ddmanager.prepareOffsets(b,a)}});d.ui.plugin.add("draggable","snap",{start:function(){var a=d(this).data("draggable"),b=a.options;a.snapElements=[];d(b.snap.constructor!=String?b.snap.items||":data(draggable)":b.snap).each(function(){var c=d(this),f=c.offset();this!=a.element[0]&&a.snapElements.push({item:this,width:c.outerWidth(),height:c.outerHeight(),top:f.top,left:f.left})})},drag:function(a,b){for(var c=d(this).data("draggable"),f=c.options,e=f.snapTolerance,h=b.offset.left,g=h+c.helperProportions.width,n=b.offset.top,o=n+c.helperProportions.height,i=c.snapElements.length-1;i>=0;i--){var j=c.snapElements[i].left,l=j+c.snapElements[i].width,k=c.snapElements[i].top,m=k+c.snapElements[i].height;if(j-e<h&&h<l+e&&k-e<n&&n<m+e||j-e<h&&h<l+e&&k-e<o&&o<m+e||j-e<g&&g<l+e&&k-e<n&&n<m+e||j-e<g&&g<l+e&&k-e<o&&o<m+e){if(f.snapMode!="inner"){var p=Math.abs(k-o)<=e,q=Math.abs(m-n)<=e,r=Math.abs(j-g)<=e,s=Math.abs(l-h)<=e;if(p)b.position.top=c._convertPositionTo("relative",{top:k-c.helperProportions.height,left:0}).top-c.margins.top;if(q)b.position.top=c._convertPositionTo("relative",{top:m,left:0}).top-c.margins.top;if(r)b.position.left=c._convertPositionTo("relative",{top:0,left:j-c.helperProportions.width}).left-c.margins.left;if(s)b.position.left=c._convertPositionTo("relative",{top:0,left:l}).left-c.margins.left}var t=p||q||r||s;if(f.snapMode!="outer"){p=Math.abs(k-n)<=e;q=Math.abs(m-o)<=e;r=Math.abs(j-h)<=e;s=Math.abs(l-g)<=e;if(p)b.position.top=c._convertPositionTo("relative",{top:k,left:0}).top-c.margins.top;if(q)b.position.top=c._convertPositionTo("relative",{top:m-c.helperProportions.height,left:0}).top-c.margins.top;if(r)b.position.left=c._convertPositionTo("relative",{top:0,left:j}).left-c.margins.left;if(s)b.position.left=c._convertPositionTo("relative",{top:0,left:l-c.helperProportions.width}).left-c.margins.left}if(!c.snapElements[i].snapping&&(p||q||r||s||t))c.options.snap.snap&&c.options.snap.snap.call(c.element,a,d.extend(c._uiHash(),{snapItem:c.snapElements[i].item}));c.snapElements[i].snapping=p||q||r||s||t}else{c.snapElements[i].snapping&&c.options.snap.release&&c.options.snap.release.call(c.element,a,d.extend(c._uiHash(),{snapItem:c.snapElements[i].item}));c.snapElements[i].snapping=false}}}});d.ui.plugin.add("draggable","stack",{start:function(){var a=d(this).data("draggable").options;a=d.makeArray(d(a.stack)).sort(function(c,f){return(parseInt(d(c).css("zIndex"),10)||0)-(parseInt(d(f).css("zIndex"),10)||0)});if(a.length){var b=parseInt(a[0].style.zIndex)||0;d(a).each(function(c){this.style.zIndex=b+c});this[0].style.zIndex=b+a.length}}});d.ui.plugin.add("draggable","zIndex",{start:function(a,b){a=d(b.helper);b=d(this).data("draggable").options;if(a.css("zIndex"))b._zIndex=a.css("zIndex");a.css("zIndex",b.zIndex)},stop:function(a,b){a=d(this).data("draggable").options;a._zIndex&&d(b.helper).css("zIndex",a._zIndex)}})})(jQuery);;(function(d){d.widget("ui.droppable",{widgetEventPrefix:"drop",options:{accept:"*",activeClass:false,addClasses:true,greedy:false,hoverClass:false,scope:"default",tolerance:"intersect"},_create:function(){var a=this.options,b=a.accept;this.isover=0;this.isout=1;this.accept=d.isFunction(b)?b:function(c){return c.is(b)};this.proportions={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight};d.ui.ddmanager.droppables[a.scope]=d.ui.ddmanager.droppables[a.scope]||[];d.ui.ddmanager.droppables[a.scope].push(this);a.addClasses&&this.element.addClass("ui-droppable")},destroy:function(){for(var a=d.ui.ddmanager.droppables[this.options.scope],b=0;b<a.length;b++)a[b]==this&&a.splice(b,1);this.element.removeClass("ui-droppable ui-droppable-disabled").removeData("droppable").unbind(".droppable");return this},_setOption:function(a,b){if(a=="accept")this.accept=d.isFunction(b)?b:function(c){return c.is(b)};d.Widget.prototype._setOption.apply(this,arguments)},_activate:function(a){var b=d.ui.ddmanager.current;this.options.activeClass&&this.element.addClass(this.options.activeClass);b&&this._trigger("activate",a,this.ui(b))},_deactivate:function(a){var b=d.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass);b&&this._trigger("deactivate",a,this.ui(b))},_over:function(a){var b=d.ui.ddmanager.current;if(!(!b||(b.currentItem||b.element)[0]==this.element[0]))if(this.accept.call(this.element[0],b.currentItem||b.element)){this.options.hoverClass&&this.element.addClass(this.options.hoverClass);this._trigger("over",a,this.ui(b))}},_out:function(a){var b=d.ui.ddmanager.current;if(!(!b||(b.currentItem||b.element)[0]==this.element[0]))if(this.accept.call(this.element[0],b.currentItem||b.element)){this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("out",a,this.ui(b))}},_drop:function(a,b){var c=b||d.ui.ddmanager.current;if(!c||(c.currentItem||c.element)[0]==this.element[0])return false;var e=false;this.element.find(":data(droppable)").not(".ui-draggable-dragging").each(function(){var g=d.data(this,"droppable");if(g.options.greedy&&!g.options.disabled&&g.options.scope==c.options.scope&&g.accept.call(g.element[0],c.currentItem||c.element)&&d.ui.intersect(c,d.extend(g,{offset:g.element.offset()}),g.options.tolerance)){e=true;return false}});if(e)return false;if(this.accept.call(this.element[0],c.currentItem||c.element)){this.options.activeClass&&this.element.removeClass(this.options.activeClass);this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("drop",a,this.ui(c));return this.element}return false},ui:function(a){return{draggable:a.currentItem||a.element,helper:a.helper,position:a.position,offset:a.positionAbs}}});d.extend(d.ui.droppable,{version:"1.8.16"});d.ui.intersect=function(a,b,c){if(!b.offset)return false;var e=(a.positionAbs||a.position.absolute).left,g=e+a.helperProportions.width,f=(a.positionAbs||a.position.absolute).top,h=f+a.helperProportions.height,i=b.offset.left,k=i+b.proportions.width,j=b.offset.top,l=j+b.proportions.height;switch(c){case"fit":return i<=e&&g<=k&&j<=f&&h<=l;case"intersect":return i<e+a.helperProportions.width/2&&g-a.helperProportions.width/2<k&&j<f+a.helperProportions.height/2&&h-a.helperProportions.height/2<l;case"pointer":return d.ui.isOver((a.positionAbs||a.position.absolute).top+(a.clickOffset||a.offset.click).top,(a.positionAbs||a.position.absolute).left+(a.clickOffset||a.offset.click).left,j,i,b.proportions.height,b.proportions.width);case"touch":return(f>=j&&f<=l||h>=j&&h<=l||f<j&&h>l)&&(e>=i&&e<=k||g>=i&&g<=k||e<i&&g>k);default:return false}};d.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(a,b){var c=d.ui.ddmanager.droppables[a.options.scope]||[],e=b?b.type:null,g=(a.currentItem||a.element).find(":data(droppable)").andSelf(),f=0;a:for(;f<c.length;f++)if(!(c[f].options.disabled||a&&!c[f].accept.call(c[f].element[0],a.currentItem||a.element))){for(var h=0;h<g.length;h++)if(g[h]==c[f].element[0]){c[f].proportions.height=0;continue a}c[f].visible=c[f].element.css("display")!="none";if(c[f].visible){e=="mousedown"&&c[f]._activate.call(c[f],b);c[f].offset=c[f].element.offset();c[f].proportions={width:c[f].element[0].offsetWidth,height:c[f].element[0].offsetHeight}}}},drop:function(a,b){var c=false;d.each(d.ui.ddmanager.droppables[a.options.scope]||[],function(){if(this.options){if(!this.options.disabled&&this.visible&&d.ui.intersect(a,this,this.options.tolerance))c=c||this._drop.call(this,b);if(!this.options.disabled&&this.visible&&this.accept.call(this.element[0],a.currentItem||a.element)){this.isout=1;this.isover=0;this._deactivate.call(this,b)}}});return c},dragStart:function(a,b){a.element.parents(":not(body,html)").bind("scroll.droppable",function(){a.options.refreshPositions||d.ui.ddmanager.prepareOffsets(a,b)})},drag:function(a,b){a.options.refreshPositions&&d.ui.ddmanager.prepareOffsets(a,b);d.each(d.ui.ddmanager.droppables[a.options.scope]||[],function(){if(!(this.options.disabled||this.greedyChild||!this.visible)){var c=d.ui.intersect(a,this,this.options.tolerance);if(c=!c&&this.isover==1?"isout":c&&this.isover==0?"isover":null){var e;if(this.options.greedy){var g=this.element.parents(":data(droppable):eq(0)");if(g.length){e=d.data(g[0],"droppable");e.greedyChild=c=="isover"?1:0}}if(e&&c=="isover"){e.isover=0;e.isout=1;e._out.call(e,b)}this[c]=1;this[c=="isout"?"isover":"isout"]=0;this[c=="isover"?"_over":"_out"].call(this,b);if(e&&c=="isout"){e.isout=0;e.isover=1;e._over.call(e,b)}}}})},dragStop:function(a,b){a.element.parents(":not(body,html)").unbind("scroll.droppable");a.options.refreshPositions||d.ui.ddmanager.prepareOffsets(a,b)}}})(jQuery);;(function(e){e.widget("ui.resizable",e.ui.mouse,{widgetEventPrefix:"resize",options:{alsoResize:false,animate:false,animateDuration:"slow",animateEasing:"swing",aspectRatio:false,autoHide:false,containment:false,ghost:false,grid:false,handles:"e,s,se",helper:false,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:1E3},_create:function(){var b=this,a=this.options;this.element.addClass("ui-resizable");e.extend(this,{_aspectRatio:!!a.aspectRatio,aspectRatio:a.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:a.helper||a.ghost||a.animate?a.helper||"ui-resizable-helper":null});if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)){/relative/.test(this.element.css("position"))&&e.browser.opera&&this.element.css({position:"relative",top:"auto",left:"auto"});this.element.wrap(e('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")}));this.element=this.element.parent().data("resizable",this.element.data("resizable"));this.elementIsWrapper=true;this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")});this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0});this.originalResizeStyle=this.originalElement.css("resize");this.originalElement.css("resize","none");this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"}));this.originalElement.css({margin:this.originalElement.css("margin")});this._proportionallyResize()}this.handles=a.handles||(!e(".ui-resizable-handle",this.element).length?"e,s,se":{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"});if(this.handles.constructor==String){if(this.handles=="all")this.handles="n,e,s,w,se,sw,ne,nw";var c=this.handles.split(",");this.handles={};for(var d=0;d<c.length;d++){var f=e.trim(c[d]),g=e('<div class="ui-resizable-handle '+("ui-resizable-"+f)+'"></div>');/sw|se|ne|nw/.test(f)&&g.css({zIndex:++a.zIndex});"se"==f&&g.addClass("ui-icon ui-icon-gripsmall-diagonal-se");this.handles[f]=".ui-resizable-"+f;this.element.append(g)}}this._renderAxis=function(h){h=h||this.element;for(var i in this.handles){if(this.handles[i].constructor==String)this.handles[i]=e(this.handles[i],this.element).show();if(this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)){var j=e(this.handles[i],this.element),l=0;l=/sw|ne|nw|se|n|s/.test(i)?j.outerHeight():j.outerWidth();j=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join("");h.css(j,l);this._proportionallyResize()}e(this.handles[i])}};this._renderAxis(this.element);this._handles=e(".ui-resizable-handle",this.element).disableSelection();this._handles.mouseover(function(){if(!b.resizing){if(this.className)var h=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);b.axis=h&&h[1]?h[1]:"se"}});if(a.autoHide){this._handles.hide();e(this.element).addClass("ui-resizable-autohide").hover(function(){if(!a.disabled){e(this).removeClass("ui-resizable-autohide");b._handles.show()}},function(){if(!a.disabled)if(!b.resizing){e(this).addClass("ui-resizable-autohide");b._handles.hide()}})}this._mouseInit()},destroy:function(){this._mouseDestroy();var b=function(c){e(c).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};if(this.elementIsWrapper){b(this.element);var a=this.element;a.after(this.originalElement.css({position:a.css("position"),width:a.outerWidth(),height:a.outerHeight(),top:a.css("top"),left:a.css("left")})).remove()}this.originalElement.css("resize",this.originalResizeStyle);b(this.originalElement);return this},_mouseCapture:function(b){var a=false;for(var c in this.handles)if(e(this.handles[c])[0]==b.target)a=true;return!this.options.disabled&&a},_mouseStart:function(b){var a=this.options,c=this.element.position(),d=this.element;this.resizing=true;this.documentScroll={top:e(document).scrollTop(),left:e(document).scrollLeft()};if(d.is(".ui-draggable")||/absolute/.test(d.css("position")))d.css({position:"absolute",top:c.top,left:c.left});e.browser.opera&&/relative/.test(d.css("position"))&&d.css({position:"relative",top:"auto",left:"auto"});this._renderProxy();c=m(this.helper.css("left"));var f=m(this.helper.css("top"));if(a.containment){c+=e(a.containment).scrollLeft()||0;f+=e(a.containment).scrollTop()||0}this.offset=this.helper.offset();this.position={left:c,top:f};this.size=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalSize=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalPosition={left:c,top:f};this.sizeDiff={width:d.outerWidth()-d.width(),height:d.outerHeight()-d.height()};this.originalMousePosition={left:b.pageX,top:b.pageY};this.aspectRatio=typeof a.aspectRatio=="number"?a.aspectRatio:this.originalSize.width/this.originalSize.height||1;a=e(".ui-resizable-"+this.axis).css("cursor");e("body").css("cursor",a=="auto"?this.axis+"-resize":a);d.addClass("ui-resizable-resizing");this._propagate("start",b);return true},_mouseDrag:function(b){var a=this.helper,c=this.originalMousePosition,d=this._change[this.axis];if(!d)return false;c=d.apply(this,[b,b.pageX-c.left||0,b.pageY-c.top||0]);this._updateVirtualBoundaries(b.shiftKey);if(this._aspectRatio||b.shiftKey)c=this._updateRatio(c,b);c=this._respectSize(c,b);this._propagate("resize",b);a.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"});!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize();this._updateCache(c);this._trigger("resize",b,this.ui());return false},_mouseStop:function(b){this.resizing=false;var a=this.options,c=this;if(this._helper){var d=this._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName);d=f&&e.ui.hasScroll(d[0],"left")?0:c.sizeDiff.height;f=f?0:c.sizeDiff.width;f={width:c.helper.width()-f,height:c.helper.height()-d};d=parseInt(c.element.css("left"),10)+(c.position.left-c.originalPosition.left)||null;var g=parseInt(c.element.css("top"),10)+(c.position.top-c.originalPosition.top)||null;a.animate||this.element.css(e.extend(f,{top:g,left:d}));c.helper.height(c.size.height);c.helper.width(c.size.width);this._helper&&!a.animate&&this._proportionallyResize()}e("body").css("cursor","auto");this.element.removeClass("ui-resizable-resizing");this._propagate("stop",b);this._helper&&this.helper.remove();return false},_updateVirtualBoundaries:function(b){var a=this.options,c,d,f;a={minWidth:k(a.minWidth)?a.minWidth:0,maxWidth:k(a.maxWidth)?a.maxWidth:Infinity,minHeight:k(a.minHeight)?a.minHeight:0,maxHeight:k(a.maxHeight)?a.maxHeight:Infinity};if(this._aspectRatio||b){b=a.minHeight*this.aspectRatio;d=a.minWidth/this.aspectRatio;c=a.maxHeight*this.aspectRatio;f=a.maxWidth/this.aspectRatio;if(b>a.minWidth)a.minWidth=b;if(d>a.minHeight)a.minHeight=d;if(c<a.maxWidth)a.maxWidth=c;if(f<a.maxHeight)a.maxHeight=f}this._vBoundaries=a},_updateCache:function(b){this.offset=this.helper.offset();if(k(b.left))this.position.left=b.left;if(k(b.top))this.position.top=b.top;if(k(b.height))this.size.height=b.height;if(k(b.width))this.size.width=b.width},_updateRatio:function(b){var a=this.position,c=this.size,d=this.axis;if(k(b.height))b.width=b.height*this.aspectRatio;else if(k(b.width))b.height=b.width/this.aspectRatio;if(d=="sw"){b.left=a.left+(c.width-b.width);b.top=null}if(d=="nw"){b.top=a.top+(c.height-b.height);b.left=a.left+(c.width-b.width)}return b},_respectSize:function(b){var a=this._vBoundaries,c=this.axis,d=k(b.width)&&a.maxWidth&&a.maxWidth<b.width,f=k(b.height)&&a.maxHeight&&a.maxHeight<b.height,g=k(b.width)&&a.minWidth&&a.minWidth>b.width,h=k(b.height)&&a.minHeight&&a.minHeight>b.height;if(g)b.width=a.minWidth;if(h)b.height=a.minHeight;if(d)b.width=a.maxWidth;if(f)b.height=a.maxHeight;var i=this.originalPosition.left+this.originalSize.width,j=this.position.top+this.size.height,l=/sw|nw|w/.test(c);c=/nw|ne|n/.test(c);if(g&&l)b.left=i-a.minWidth;if(d&&l)b.left=i-a.maxWidth;if(h&&c)b.top=j-a.minHeight;if(f&&c)b.top=j-a.maxHeight;if((a=!b.width&&!b.height)&&!b.left&&b.top)b.top=null;else if(a&&!b.top&&b.left)b.left=null;return b},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var b=this.helper||this.element,a=0;a<this._proportionallyResizeElements.length;a++){var c=this._proportionallyResizeElements[a];if(!this.borderDif){var d=[c.css("borderTopWidth"),c.css("borderRightWidth"),c.css("borderBottomWidth"),c.css("borderLeftWidth")],f=[c.css("paddingTop"),c.css("paddingRight"),c.css("paddingBottom"),c.css("paddingLeft")];this.borderDif=e.map(d,function(g,h){g=parseInt(g,10)||0;h=parseInt(f[h],10)||0;return g+h})}e.browser.msie&&(e(b).is(":hidden")||e(b).parents(":hidden").length)||c.css({height:b.height()-this.borderDif[0]-this.borderDif[2]||0,width:b.width()-this.borderDif[1]-this.borderDif[3]||0})}},_renderProxy:function(){var b=this.options;this.elementOffset=this.element.offset();if(this._helper){this.helper=this.helper||e('<div style="overflow:hidden;"></div>');var a=e.browser.msie&&e.browser.version<7,c=a?1:0;a=a?2:-1;this.helper.addClass(this._helper).css({width:this.element.outerWidth()+
 a,height:this.element.outerHeight()+a,position:"absolute",left:this.elementOffset.left-c+"px",top:this.elementOffset.top-c+"px",zIndex:++b.zIndex});this.helper.appendTo("body").disableSelection()}else this.helper=this.element},_change:{e:function(b,a){return{width:this.originalSize.width+a}},w:function(b,a){return{left:this.originalPosition.left+a,width:this.originalSize.width-a}},n:function(b,a,c){return{top:this.originalPosition.top+c,height:this.originalSize.height-c}},s:function(b,a,c){return{height:this.originalSize.height+
-c}},se:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[b,a,c]))},sw:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[b,a,c]))},ne:function(b,a,c){return e.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[b,a,c]))},nw:function(b,a,c){return e.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[b,a,c]))}},_propagate:function(b,a){e.ui.plugin.call(this,b,[a,this.ui()]);
-b!="resize"&&this._trigger(b,a,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}});e.extend(e.ui.resizable,{version:"1.8.16"});e.ui.plugin.add("resizable","alsoResize",{start:function(){var b=e(this).data("resizable").options,a=function(c){e(c).each(function(){var d=e(this);d.data("resizable-alsoresize",{width:parseInt(d.width(),
-10),height:parseInt(d.height(),10),left:parseInt(d.css("left"),10),top:parseInt(d.css("top"),10),position:d.css("position")})})};if(typeof b.alsoResize=="object"&&!b.alsoResize.parentNode)if(b.alsoResize.length){b.alsoResize=b.alsoResize[0];a(b.alsoResize)}else e.each(b.alsoResize,function(c){a(c)});else a(b.alsoResize)},resize:function(b,a){var c=e(this).data("resizable");b=c.options;var d=c.originalSize,f=c.originalPosition,g={height:c.size.height-d.height||0,width:c.size.width-d.width||0,top:c.position.top-
-f.top||0,left:c.position.left-f.left||0},h=function(i,j){e(i).each(function(){var l=e(this),q=e(this).data("resizable-alsoresize"),p={},r=j&&j.length?j:l.parents(a.originalElement[0]).length?["width","height"]:["width","height","top","left"];e.each(r,function(n,o){if((n=(q[o]||0)+(g[o]||0))&&n>=0)p[o]=n||null});if(e.browser.opera&&/relative/.test(l.css("position"))){c._revertToRelativePosition=true;l.css({position:"absolute",top:"auto",left:"auto"})}l.css(p)})};typeof b.alsoResize=="object"&&!b.alsoResize.nodeType?
-e.each(b.alsoResize,function(i,j){h(i,j)}):h(b.alsoResize)},stop:function(){var b=e(this).data("resizable"),a=b.options,c=function(d){e(d).each(function(){var f=e(this);f.css({position:f.data("resizable-alsoresize").position})})};if(b._revertToRelativePosition){b._revertToRelativePosition=false;typeof a.alsoResize=="object"&&!a.alsoResize.nodeType?e.each(a.alsoResize,function(d){c(d)}):c(a.alsoResize)}e(this).removeData("resizable-alsoresize")}});e.ui.plugin.add("resizable","animate",{stop:function(b){var a=
-e(this).data("resizable"),c=a.options,d=a._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName),g=f&&e.ui.hasScroll(d[0],"left")?0:a.sizeDiff.height;f={width:a.size.width-(f?0:a.sizeDiff.width),height:a.size.height-g};g=parseInt(a.element.css("left"),10)+(a.position.left-a.originalPosition.left)||null;var h=parseInt(a.element.css("top"),10)+(a.position.top-a.originalPosition.top)||null;a.element.animate(e.extend(f,h&&g?{top:h,left:g}:{}),{duration:c.animateDuration,easing:c.animateEasing,
-step:function(){var i={width:parseInt(a.element.css("width"),10),height:parseInt(a.element.css("height"),10),top:parseInt(a.element.css("top"),10),left:parseInt(a.element.css("left"),10)};d&&d.length&&e(d[0]).css({width:i.width,height:i.height});a._updateCache(i);a._propagate("resize",b)}})}});e.ui.plugin.add("resizable","containment",{start:function(){var b=e(this).data("resizable"),a=b.element,c=b.options.containment;if(a=c instanceof e?c.get(0):/parent/.test(c)?a.parent().get(0):c){b.containerElement=
-e(a);if(/document/.test(c)||c==document){b.containerOffset={left:0,top:0};b.containerPosition={left:0,top:0};b.parentData={element:e(document),left:0,top:0,width:e(document).width(),height:e(document).height()||document.body.parentNode.scrollHeight}}else{var d=e(a),f=[];e(["Top","Right","Left","Bottom"]).each(function(i,j){f[i]=m(d.css("padding"+j))});b.containerOffset=d.offset();b.containerPosition=d.position();b.containerSize={height:d.innerHeight()-f[3],width:d.innerWidth()-f[1]};c=b.containerOffset;
-var g=b.containerSize.height,h=b.containerSize.width;h=e.ui.hasScroll(a,"left")?a.scrollWidth:h;g=e.ui.hasScroll(a)?a.scrollHeight:g;b.parentData={element:a,left:c.left,top:c.top,width:h,height:g}}}},resize:function(b){var a=e(this).data("resizable"),c=a.options,d=a.containerOffset,f=a.position;b=a._aspectRatio||b.shiftKey;var g={top:0,left:0},h=a.containerElement;if(h[0]!=document&&/static/.test(h.css("position")))g=d;if(f.left<(a._helper?d.left:0)){a.size.width+=a._helper?a.position.left-d.left:
-a.position.left-g.left;if(b)a.size.height=a.size.width/c.aspectRatio;a.position.left=c.helper?d.left:0}if(f.top<(a._helper?d.top:0)){a.size.height+=a._helper?a.position.top-d.top:a.position.top;if(b)a.size.width=a.size.height*c.aspectRatio;a.position.top=a._helper?d.top:0}a.offset.left=a.parentData.left+a.position.left;a.offset.top=a.parentData.top+a.position.top;c=Math.abs((a._helper?a.offset.left-g.left:a.offset.left-g.left)+a.sizeDiff.width);d=Math.abs((a._helper?a.offset.top-g.top:a.offset.top-
-d.top)+a.sizeDiff.height);f=a.containerElement.get(0)==a.element.parent().get(0);g=/relative|absolute/.test(a.containerElement.css("position"));if(f&&g)c-=a.parentData.left;if(c+a.size.width>=a.parentData.width){a.size.width=a.parentData.width-c;if(b)a.size.height=a.size.width/a.aspectRatio}if(d+a.size.height>=a.parentData.height){a.size.height=a.parentData.height-d;if(b)a.size.width=a.size.height*a.aspectRatio}},stop:function(){var b=e(this).data("resizable"),a=b.options,c=b.containerOffset,d=b.containerPosition,
-f=b.containerElement,g=e(b.helper),h=g.offset(),i=g.outerWidth()-b.sizeDiff.width;g=g.outerHeight()-b.sizeDiff.height;b._helper&&!a.animate&&/relative/.test(f.css("position"))&&e(this).css({left:h.left-d.left-c.left,width:i,height:g});b._helper&&!a.animate&&/static/.test(f.css("position"))&&e(this).css({left:h.left-d.left-c.left,width:i,height:g})}});e.ui.plugin.add("resizable","ghost",{start:function(){var b=e(this).data("resizable"),a=b.options,c=b.size;b.ghost=b.originalElement.clone();b.ghost.css({opacity:0.25,
-display:"block",position:"relative",height:c.height,width:c.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof a.ghost=="string"?a.ghost:"");b.ghost.appendTo(b.helper)},resize:function(){var b=e(this).data("resizable");b.ghost&&b.ghost.css({position:"relative",height:b.size.height,width:b.size.width})},stop:function(){var b=e(this).data("resizable");b.ghost&&b.helper&&b.helper.get(0).removeChild(b.ghost.get(0))}});e.ui.plugin.add("resizable","grid",{resize:function(){var b=
-e(this).data("resizable"),a=b.options,c=b.size,d=b.originalSize,f=b.originalPosition,g=b.axis;a.grid=typeof a.grid=="number"?[a.grid,a.grid]:a.grid;var h=Math.round((c.width-d.width)/(a.grid[0]||1))*(a.grid[0]||1);a=Math.round((c.height-d.height)/(a.grid[1]||1))*(a.grid[1]||1);if(/^(se|s|e)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a}else if(/^(ne)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}else{if(/^(sw)$/.test(g)){b.size.width=d.width+h;b.size.height=
-d.height+a}else{b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}b.position.left=f.left-h}}});var m=function(b){return parseInt(b,10)||0},k=function(b){return!isNaN(parseInt(b,10))}})(jQuery);
-;/*
- * jQuery UI Selectable 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Selectables
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.mouse.js
- *	jquery.ui.widget.js
- */
-(function(e){e.widget("ui.selectable",e.ui.mouse,{options:{appendTo:"body",autoRefresh:true,distance:0,filter:"*",tolerance:"touch"},_create:function(){var c=this;this.element.addClass("ui-selectable");this.dragged=false;var f;this.refresh=function(){f=e(c.options.filter,c.element[0]);f.each(function(){var d=e(this),b=d.offset();e.data(this,"selectable-item",{element:this,$element:d,left:b.left,top:b.top,right:b.left+d.outerWidth(),bottom:b.top+d.outerHeight(),startselected:false,selected:d.hasClass("ui-selected"),
-selecting:d.hasClass("ui-selecting"),unselecting:d.hasClass("ui-unselecting")})})};this.refresh();this.selectees=f.addClass("ui-selectee");this._mouseInit();this.helper=e("<div class='ui-selectable-helper'></div>")},destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item");this.element.removeClass("ui-selectable ui-selectable-disabled").removeData("selectable").unbind(".selectable");this._mouseDestroy();return this},_mouseStart:function(c){var f=this;this.opos=[c.pageX,
-c.pageY];if(!this.options.disabled){var d=this.options;this.selectees=e(d.filter,this.element[0]);this._trigger("start",c);e(d.appendTo).append(this.helper);this.helper.css({left:c.clientX,top:c.clientY,width:0,height:0});d.autoRefresh&&this.refresh();this.selectees.filter(".ui-selected").each(function(){var b=e.data(this,"selectable-item");b.startselected=true;if(!c.metaKey){b.$element.removeClass("ui-selected");b.selected=false;b.$element.addClass("ui-unselecting");b.unselecting=true;f._trigger("unselecting",
-c,{unselecting:b.element})}});e(c.target).parents().andSelf().each(function(){var b=e.data(this,"selectable-item");if(b){var g=!c.metaKey||!b.$element.hasClass("ui-selected");b.$element.removeClass(g?"ui-unselecting":"ui-selected").addClass(g?"ui-selecting":"ui-unselecting");b.unselecting=!g;b.selecting=g;(b.selected=g)?f._trigger("selecting",c,{selecting:b.element}):f._trigger("unselecting",c,{unselecting:b.element});return false}})}},_mouseDrag:function(c){var f=this;this.dragged=true;if(!this.options.disabled){var d=
-this.options,b=this.opos[0],g=this.opos[1],h=c.pageX,i=c.pageY;if(b>h){var j=h;h=b;b=j}if(g>i){j=i;i=g;g=j}this.helper.css({left:b,top:g,width:h-b,height:i-g});this.selectees.each(function(){var a=e.data(this,"selectable-item");if(!(!a||a.element==f.element[0])){var k=false;if(d.tolerance=="touch")k=!(a.left>h||a.right<b||a.top>i||a.bottom<g);else if(d.tolerance=="fit")k=a.left>b&&a.right<h&&a.top>g&&a.bottom<i;if(k){if(a.selected){a.$element.removeClass("ui-selected");a.selected=false}if(a.unselecting){a.$element.removeClass("ui-unselecting");
-a.unselecting=false}if(!a.selecting){a.$element.addClass("ui-selecting");a.selecting=true;f._trigger("selecting",c,{selecting:a.element})}}else{if(a.selecting)if(c.metaKey&&a.startselected){a.$element.removeClass("ui-selecting");a.selecting=false;a.$element.addClass("ui-selected");a.selected=true}else{a.$element.removeClass("ui-selecting");a.selecting=false;if(a.startselected){a.$element.addClass("ui-unselecting");a.unselecting=true}f._trigger("unselecting",c,{unselecting:a.element})}if(a.selected)if(!c.metaKey&&
-!a.startselected){a.$element.removeClass("ui-selected");a.selected=false;a.$element.addClass("ui-unselecting");a.unselecting=true;f._trigger("unselecting",c,{unselecting:a.element})}}}});return false}},_mouseStop:function(c){var f=this;this.dragged=false;e(".ui-unselecting",this.element[0]).each(function(){var d=e.data(this,"selectable-item");d.$element.removeClass("ui-unselecting");d.unselecting=false;d.startselected=false;f._trigger("unselected",c,{unselected:d.element})});e(".ui-selecting",this.element[0]).each(function(){var d=
-e.data(this,"selectable-item");d.$element.removeClass("ui-selecting").addClass("ui-selected");d.selecting=false;d.selected=true;d.startselected=true;f._trigger("selected",c,{selected:d.element})});this._trigger("stop",c);this.helper.remove();return false}});e.extend(e.ui.selectable,{version:"1.8.16"})})(jQuery);
-;/*
- * jQuery UI Sortable 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Sortables
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.mouse.js
- *	jquery.ui.widget.js
- */
-(function(d){d.widget("ui.sortable",d.ui.mouse,{widgetEventPrefix:"sort",options:{appendTo:"parent",axis:false,connectWith:false,containment:false,cursor:"auto",cursorAt:false,dropOnEmpty:true,forcePlaceholderSize:false,forceHelperSize:false,grid:false,handle:false,helper:"original",items:"> *",opacity:false,placeholder:false,revert:false,scroll:true,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1E3},_create:function(){var a=this.options;this.containerCache={};this.element.addClass("ui-sortable");
-this.refresh();this.floating=this.items.length?a.axis==="x"||/left|right/.test(this.items[0].item.css("float"))||/inline|table-cell/.test(this.items[0].item.css("display")):false;this.offset=this.element.offset();this._mouseInit()},destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").removeData("sortable").unbind(".sortable");this._mouseDestroy();for(var a=this.items.length-1;a>=0;a--)this.items[a].item.removeData("sortable-item");return this},_setOption:function(a,b){if(a===
-"disabled"){this.options[a]=b;this.widget()[b?"addClass":"removeClass"]("ui-sortable-disabled")}else d.Widget.prototype._setOption.apply(this,arguments)},_mouseCapture:function(a,b){if(this.reverting)return false;if(this.options.disabled||this.options.type=="static")return false;this._refreshItems(a);var c=null,e=this;d(a.target).parents().each(function(){if(d.data(this,"sortable-item")==e){c=d(this);return false}});if(d.data(a.target,"sortable-item")==e)c=d(a.target);if(!c)return false;if(this.options.handle&&
-!b){var f=false;d(this.options.handle,c).find("*").andSelf().each(function(){if(this==a.target)f=true});if(!f)return false}this.currentItem=c;this._removeCurrentsFromItems();return true},_mouseStart:function(a,b,c){b=this.options;var e=this;this.currentContainer=this;this.refreshPositions();this.helper=this._createHelper(a);this._cacheHelperProportions();this._cacheMargins();this.scrollParent=this.helper.scrollParent();this.offset=this.currentItem.offset();this.offset={top:this.offset.top-this.margins.top,
-left:this.offset.left-this.margins.left};this.helper.css("position","absolute");this.cssPosition=this.helper.css("position");d.extend(this.offset,{click:{left:a.pageX-this.offset.left,top:a.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this._generatePosition(a);this.originalPageX=a.pageX;this.originalPageY=a.pageY;b.cursorAt&&this._adjustOffsetFromHelper(b.cursorAt);this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]};
-this.helper[0]!=this.currentItem[0]&&this.currentItem.hide();this._createPlaceholder();b.containment&&this._setContainment();if(b.cursor){if(d("body").css("cursor"))this._storedCursor=d("body").css("cursor");d("body").css("cursor",b.cursor)}if(b.opacity){if(this.helper.css("opacity"))this._storedOpacity=this.helper.css("opacity");this.helper.css("opacity",b.opacity)}if(b.zIndex){if(this.helper.css("zIndex"))this._storedZIndex=this.helper.css("zIndex");this.helper.css("zIndex",b.zIndex)}if(this.scrollParent[0]!=
-document&&this.scrollParent[0].tagName!="HTML")this.overflowOffset=this.scrollParent.offset();this._trigger("start",a,this._uiHash());this._preserveHelperProportions||this._cacheHelperProportions();if(!c)for(c=this.containers.length-1;c>=0;c--)this.containers[c]._trigger("activate",a,e._uiHash(this));if(d.ui.ddmanager)d.ui.ddmanager.current=this;d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a);this.dragging=true;this.helper.addClass("ui-sortable-helper");this._mouseDrag(a);
-return true},_mouseDrag:function(a){this.position=this._generatePosition(a);this.positionAbs=this._convertPositionTo("absolute");if(!this.lastPositionAbs)this.lastPositionAbs=this.positionAbs;if(this.options.scroll){var b=this.options,c=false;if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"){if(this.overflowOffset.top+this.scrollParent[0].offsetHeight-a.pageY<b.scrollSensitivity)this.scrollParent[0].scrollTop=c=this.scrollParent[0].scrollTop+b.scrollSpeed;else if(a.pageY-this.overflowOffset.top<
-b.scrollSensitivity)this.scrollParent[0].scrollTop=c=this.scrollParent[0].scrollTop-b.scrollSpeed;if(this.overflowOffset.left+this.scrollParent[0].offsetWidth-a.pageX<b.scrollSensitivity)this.scrollParent[0].scrollLeft=c=this.scrollParent[0].scrollLeft+b.scrollSpeed;else if(a.pageX-this.overflowOffset.left<b.scrollSensitivity)this.scrollParent[0].scrollLeft=c=this.scrollParent[0].scrollLeft-b.scrollSpeed}else{if(a.pageY-d(document).scrollTop()<b.scrollSensitivity)c=d(document).scrollTop(d(document).scrollTop()-
-b.scrollSpeed);else if(d(window).height()-(a.pageY-d(document).scrollTop())<b.scrollSensitivity)c=d(document).scrollTop(d(document).scrollTop()+b.scrollSpeed);if(a.pageX-d(document).scrollLeft()<b.scrollSensitivity)c=d(document).scrollLeft(d(document).scrollLeft()-b.scrollSpeed);else if(d(window).width()-(a.pageX-d(document).scrollLeft())<b.scrollSensitivity)c=d(document).scrollLeft(d(document).scrollLeft()+b.scrollSpeed)}c!==false&&d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,
-a)}this.positionAbs=this._convertPositionTo("absolute");if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";for(b=this.items.length-1;b>=0;b--){c=this.items[b];var e=c.item[0],f=this._intersectsWithPointer(c);if(f)if(e!=this.currentItem[0]&&this.placeholder[f==1?"next":"prev"]()[0]!=e&&!d.ui.contains(this.placeholder[0],e)&&(this.options.type=="semi-dynamic"?!d.ui.contains(this.element[0],
-e):true)){this.direction=f==1?"down":"up";if(this.options.tolerance=="pointer"||this._intersectsWithSides(c))this._rearrange(a,c);else break;this._trigger("change",a,this._uiHash());break}}this._contactContainers(a);d.ui.ddmanager&&d.ui.ddmanager.drag(this,a);this._trigger("sort",a,this._uiHash());this.lastPositionAbs=this.positionAbs;return false},_mouseStop:function(a,b){if(a){d.ui.ddmanager&&!this.options.dropBehaviour&&d.ui.ddmanager.drop(this,a);if(this.options.revert){var c=this;b=c.placeholder.offset();
-c.reverting=true;d(this.helper).animate({left:b.left-this.offset.parent.left-c.margins.left+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft),top:b.top-this.offset.parent.top-c.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){c._clear(a)})}else this._clear(a,b);return false}},cancel:function(){var a=this;if(this.dragging){this._mouseUp({target:null});this.options.helper=="original"?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):
-this.currentItem.show();for(var b=this.containers.length-1;b>=0;b--){this.containers[b]._trigger("deactivate",null,a._uiHash(this));if(this.containers[b].containerCache.over){this.containers[b]._trigger("out",null,a._uiHash(this));this.containers[b].containerCache.over=0}}}if(this.placeholder){this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.options.helper!="original"&&this.helper&&this.helper[0].parentNode&&this.helper.remove();d.extend(this,{helper:null,
-dragging:false,reverting:false,_noFinalSort:null});this.domPosition.prev?d(this.domPosition.prev).after(this.currentItem):d(this.domPosition.parent).prepend(this.currentItem)}return this},serialize:function(a){var b=this._getItemsAsjQuery(a&&a.connected),c=[];a=a||{};d(b).each(function(){var e=(d(a.item||this).attr(a.attribute||"id")||"").match(a.expression||/(.+)[-=_](.+)/);if(e)c.push((a.key||e[1]+"[]")+"="+(a.key&&a.expression?e[1]:e[2]))});!c.length&&a.key&&c.push(a.key+"=");return c.join("&")},
-toArray:function(a){var b=this._getItemsAsjQuery(a&&a.connected),c=[];a=a||{};b.each(function(){c.push(d(a.item||this).attr(a.attribute||"id")||"")});return c},_intersectsWith:function(a){var b=this.positionAbs.left,c=b+this.helperProportions.width,e=this.positionAbs.top,f=e+this.helperProportions.height,g=a.left,h=g+a.width,i=a.top,k=i+a.height,j=this.offset.click.top,l=this.offset.click.left;j=e+j>i&&e+j<k&&b+l>g&&b+l<h;return this.options.tolerance=="pointer"||this.options.forcePointerForContainers||
-this.options.tolerance!="pointer"&&this.helperProportions[this.floating?"width":"height"]>a[this.floating?"width":"height"]?j:g<b+this.helperProportions.width/2&&c-this.helperProportions.width/2<h&&i<e+this.helperProportions.height/2&&f-this.helperProportions.height/2<k},_intersectsWithPointer:function(a){var b=d.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,a.top,a.height);a=d.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,a.left,a.width);b=b&&a;a=this._getDragVerticalDirection();
-var c=this._getDragHorizontalDirection();if(!b)return false;return this.floating?c&&c=="right"||a=="down"?2:1:a&&(a=="down"?2:1)},_intersectsWithSides:function(a){var b=d.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,a.top+a.height/2,a.height);a=d.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,a.left+a.width/2,a.width);var c=this._getDragVerticalDirection(),e=this._getDragHorizontalDirection();return this.floating&&e?e=="right"&&a||e=="left"&&!a:c&&(c=="down"&&b||c=="up"&&!b)},
-_getDragVerticalDirection:function(){var a=this.positionAbs.top-this.lastPositionAbs.top;return a!=0&&(a>0?"down":"up")},_getDragHorizontalDirection:function(){var a=this.positionAbs.left-this.lastPositionAbs.left;return a!=0&&(a>0?"right":"left")},refresh:function(a){this._refreshItems(a);this.refreshPositions();return this},_connectWith:function(){var a=this.options;return a.connectWith.constructor==String?[a.connectWith]:a.connectWith},_getItemsAsjQuery:function(a){var b=[],c=[],e=this._connectWith();
-if(e&&a)for(a=e.length-1;a>=0;a--)for(var f=d(e[a]),g=f.length-1;g>=0;g--){var h=d.data(f[g],"sortable");if(h&&h!=this&&!h.options.disabled)c.push([d.isFunction(h.options.items)?h.options.items.call(h.element):d(h.options.items,h.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),h])}c.push([d.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):d(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),
-this]);for(a=c.length-1;a>=0;a--)c[a][0].each(function(){b.push(this)});return d(b)},_removeCurrentsFromItems:function(){for(var a=this.currentItem.find(":data(sortable-item)"),b=0;b<this.items.length;b++)for(var c=0;c<a.length;c++)a[c]==this.items[b].item[0]&&this.items.splice(b,1)},_refreshItems:function(a){this.items=[];this.containers=[this];var b=this.items,c=[[d.isFunction(this.options.items)?this.options.items.call(this.element[0],a,{item:this.currentItem}):d(this.options.items,this.element),
-this]],e=this._connectWith();if(e)for(var f=e.length-1;f>=0;f--)for(var g=d(e[f]),h=g.length-1;h>=0;h--){var i=d.data(g[h],"sortable");if(i&&i!=this&&!i.options.disabled){c.push([d.isFunction(i.options.items)?i.options.items.call(i.element[0],a,{item:this.currentItem}):d(i.options.items,i.element),i]);this.containers.push(i)}}for(f=c.length-1;f>=0;f--){a=c[f][1];e=c[f][0];h=0;for(g=e.length;h<g;h++){i=d(e[h]);i.data("sortable-item",a);b.push({item:i,instance:a,width:0,height:0,left:0,top:0})}}},refreshPositions:function(a){if(this.offsetParent&&
-this.helper)this.offset.parent=this._getParentOffset();for(var b=this.items.length-1;b>=0;b--){var c=this.items[b];if(!(c.instance!=this.currentContainer&&this.currentContainer&&c.item[0]!=this.currentItem[0])){var e=this.options.toleranceElement?d(this.options.toleranceElement,c.item):c.item;if(!a){c.width=e.outerWidth();c.height=e.outerHeight()}e=e.offset();c.left=e.left;c.top=e.top}}if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(b=
-this.containers.length-1;b>=0;b--){e=this.containers[b].element.offset();this.containers[b].containerCache.left=e.left;this.containers[b].containerCache.top=e.top;this.containers[b].containerCache.width=this.containers[b].element.outerWidth();this.containers[b].containerCache.height=this.containers[b].element.outerHeight()}return this},_createPlaceholder:function(a){var b=a||this,c=b.options;if(!c.placeholder||c.placeholder.constructor==String){var e=c.placeholder;c.placeholder={element:function(){var f=
-d(document.createElement(b.currentItem[0].nodeName)).addClass(e||b.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper")[0];if(!e)f.style.visibility="hidden";return f},update:function(f,g){if(!(e&&!c.forcePlaceholderSize)){g.height()||g.height(b.currentItem.innerHeight()-parseInt(b.currentItem.css("paddingTop")||0,10)-parseInt(b.currentItem.css("paddingBottom")||0,10));g.width()||g.width(b.currentItem.innerWidth()-parseInt(b.currentItem.css("paddingLeft")||0,10)-parseInt(b.currentItem.css("paddingRight")||
-0,10))}}}}b.placeholder=d(c.placeholder.element.call(b.element,b.currentItem));b.currentItem.after(b.placeholder);c.placeholder.update(b,b.placeholder)},_contactContainers:function(a){for(var b=null,c=null,e=this.containers.length-1;e>=0;e--)if(!d.ui.contains(this.currentItem[0],this.containers[e].element[0]))if(this._intersectsWith(this.containers[e].containerCache)){if(!(b&&d.ui.contains(this.containers[e].element[0],b.element[0]))){b=this.containers[e];c=e}}else if(this.containers[e].containerCache.over){this.containers[e]._trigger("out",
-a,this._uiHash(this));this.containers[e].containerCache.over=0}if(b)if(this.containers.length===1){this.containers[c]._trigger("over",a,this._uiHash(this));this.containers[c].containerCache.over=1}else if(this.currentContainer!=this.containers[c]){b=1E4;e=null;for(var f=this.positionAbs[this.containers[c].floating?"left":"top"],g=this.items.length-1;g>=0;g--)if(d.ui.contains(this.containers[c].element[0],this.items[g].item[0])){var h=this.items[g][this.containers[c].floating?"left":"top"];if(Math.abs(h-
-f)<b){b=Math.abs(h-f);e=this.items[g]}}if(e||this.options.dropOnEmpty){this.currentContainer=this.containers[c];e?this._rearrange(a,e,null,true):this._rearrange(a,null,this.containers[c].element,true);this._trigger("change",a,this._uiHash());this.containers[c]._trigger("change",a,this._uiHash(this));this.options.placeholder.update(this.currentContainer,this.placeholder);this.containers[c]._trigger("over",a,this._uiHash(this));this.containers[c].containerCache.over=1}}},_createHelper:function(a){var b=
-this.options;a=d.isFunction(b.helper)?d(b.helper.apply(this.element[0],[a,this.currentItem])):b.helper=="clone"?this.currentItem.clone():this.currentItem;a.parents("body").length||d(b.appendTo!="parent"?b.appendTo:this.currentItem[0].parentNode)[0].appendChild(a[0]);if(a[0]==this.currentItem[0])this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")};if(a[0].style.width==
-""||b.forceHelperSize)a.width(this.currentItem.width());if(a[0].style.height==""||b.forceHelperSize)a.height(this.currentItem.height());return a},_adjustOffsetFromHelper:function(a){if(typeof a=="string")a=a.split(" ");if(d.isArray(a))a={left:+a[0],top:+a[1]||0};if("left"in a)this.offset.click.left=a.left+this.margins.left;if("right"in a)this.offset.click.left=this.helperProportions.width-a.right+this.margins.left;if("top"in a)this.offset.click.top=a.top+this.margins.top;if("bottom"in a)this.offset.click.top=
-this.helperProportions.height-a.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var a=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0])){a.left+=this.scrollParent.scrollLeft();a.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&d.browser.msie)a=
-{top:0,left:0};return{top:a.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:a.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var a=this.currentItem.position();return{top:a.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),
-10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var a=this.options;if(a.containment=="parent")a.containment=this.helper[0].parentNode;if(a.containment=="document"||a.containment=="window")this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,d(a.containment=="document"?
-document:window).width()-this.helperProportions.width-this.margins.left,(d(a.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(a.containment)){var b=d(a.containment)[0];a=d(a.containment).offset();var c=d(b).css("overflow")!="hidden";this.containment=[a.left+(parseInt(d(b).css("borderLeftWidth"),10)||0)+(parseInt(d(b).css("paddingLeft"),10)||0)-this.margins.left,a.top+(parseInt(d(b).css("borderTopWidth"),
-10)||0)+(parseInt(d(b).css("paddingTop"),10)||0)-this.margins.top,a.left+(c?Math.max(b.scrollWidth,b.offsetWidth):b.offsetWidth)-(parseInt(d(b).css("borderLeftWidth"),10)||0)-(parseInt(d(b).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,a.top+(c?Math.max(b.scrollHeight,b.offsetHeight):b.offsetHeight)-(parseInt(d(b).css("borderTopWidth"),10)||0)-(parseInt(d(b).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}},_convertPositionTo:function(a,b){if(!b)b=
-this.position;a=a=="absolute"?1:-1;var c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,e=/(html|body)/i.test(c[0].tagName);return{top:b.top+this.offset.relative.top*a+this.offset.parent.top*a-(d.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():e?0:c.scrollTop())*a),left:b.left+this.offset.relative.left*a+this.offset.parent.left*a-(d.browser.safari&&
-this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():e?0:c.scrollLeft())*a)}},_generatePosition:function(a){var b=this.options,c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,e=/(html|body)/i.test(c[0].tagName);if(this.cssPosition=="relative"&&!(this.scrollParent[0]!=document&&this.scrollParent[0]!=this.offsetParent[0]))this.offset.relative=this._getRelativeOffset();
-var f=a.pageX,g=a.pageY;if(this.originalPosition){if(this.containment){if(a.pageX-this.offset.click.left<this.containment[0])f=this.containment[0]+this.offset.click.left;if(a.pageY-this.offset.click.top<this.containment[1])g=this.containment[1]+this.offset.click.top;if(a.pageX-this.offset.click.left>this.containment[2])f=this.containment[2]+this.offset.click.left;if(a.pageY-this.offset.click.top>this.containment[3])g=this.containment[3]+this.offset.click.top}if(b.grid){g=this.originalPageY+Math.round((g-
+c}},se:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[b,a,c]))},sw:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[b,a,c]))},ne:function(b,a,c){return e.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[b,a,c]))},nw:function(b,a,c){return e.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[b,a,c]))}},_propagate:function(b,a){e.ui.plugin.call(this,b,[a,this.ui()]);b!="resize"&&this._trigger(b,a,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}});e.extend(e.ui.resizable,{version:"1.8.16"});e.ui.plugin.add("resizable","alsoResize",{start:function(){var b=e(this).data("resizable").options,a=function(c){e(c).each(function(){var d=e(this);d.data("resizable-alsoresize",{width:parseInt(d.width(),10),height:parseInt(d.height(),10),left:parseInt(d.css("left"),10),top:parseInt(d.css("top"),10),position:d.css("position")})})};if(typeof b.alsoResize=="object"&&!b.alsoResize.parentNode)if(b.alsoResize.length){b.alsoResize=b.alsoResize[0];a(b.alsoResize)}else e.each(b.alsoResize,function(c){a(c)});else a(b.alsoResize)},resize:function(b,a){var c=e(this).data("resizable");b=c.options;var d=c.originalSize,f=c.originalPosition,g={height:c.size.height-d.height||0,width:c.size.width-d.width||0,top:c.position.top-
+f.top||0,left:c.position.left-f.left||0},h=function(i,j){e(i).each(function(){var l=e(this),q=e(this).data("resizable-alsoresize"),p={},r=j&&j.length?j:l.parents(a.originalElement[0]).length?["width","height"]:["width","height","top","left"];e.each(r,function(n,o){if((n=(q[o]||0)+(g[o]||0))&&n>=0)p[o]=n||null});if(e.browser.opera&&/relative/.test(l.css("position"))){c._revertToRelativePosition=true;l.css({position:"absolute",top:"auto",left:"auto"})}l.css(p)})};typeof b.alsoResize=="object"&&!b.alsoResize.nodeType?e.each(b.alsoResize,function(i,j){h(i,j)}):h(b.alsoResize)},stop:function(){var b=e(this).data("resizable"),a=b.options,c=function(d){e(d).each(function(){var f=e(this);f.css({position:f.data("resizable-alsoresize").position})})};if(b._revertToRelativePosition){b._revertToRelativePosition=false;typeof a.alsoResize=="object"&&!a.alsoResize.nodeType?e.each(a.alsoResize,function(d){c(d)}):c(a.alsoResize)}e(this).removeData("resizable-alsoresize")}});e.ui.plugin.add("resizable","animate",{stop:function(b){var a=e(this).data("resizable"),c=a.options,d=a._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName),g=f&&e.ui.hasScroll(d[0],"left")?0:a.sizeDiff.height;f={width:a.size.width-(f?0:a.sizeDiff.width),height:a.size.height-g};g=parseInt(a.element.css("left"),10)+(a.position.left-a.originalPosition.left)||null;var h=parseInt(a.element.css("top"),10)+(a.position.top-a.originalPosition.top)||null;a.element.animate(e.extend(f,h&&g?{top:h,left:g}:{}),{duration:c.animateDuration,easing:c.animateEasing,step:function(){var i={width:parseInt(a.element.css("width"),10),height:parseInt(a.element.css("height"),10),top:parseInt(a.element.css("top"),10),left:parseInt(a.element.css("left"),10)};d&&d.length&&e(d[0]).css({width:i.width,height:i.height});a._updateCache(i);a._propagate("resize",b)}})}});e.ui.plugin.add("resizable","containment",{start:function(){var b=e(this).data("resizable"),a=b.element,c=b.options.containment;if(a=c instanceof e?c.get(0):/parent/.test(c)?a.parent().get(0):c){b.containerElement=e(a);if(/document/.test(c)||c==document){b.containerOffset={left:0,top:0};b.containerPosition={left:0,top:0};b.parentData={element:e(document),left:0,top:0,width:e(document).width(),height:e(document).height()||document.body.parentNode.scrollHeight}}else{var d=e(a),f=[];e(["Top","Right","Left","Bottom"]).each(function(i,j){f[i]=m(d.css("padding"+j))});b.containerOffset=d.offset();b.containerPosition=d.position();b.containerSize={height:d.innerHeight()-f[3],width:d.innerWidth()-f[1]};c=b.containerOffset;var g=b.containerSize.height,h=b.containerSize.width;h=e.ui.hasScroll(a,"left")?a.scrollWidth:h;g=e.ui.hasScroll(a)?a.scrollHeight:g;b.parentData={element:a,left:c.left,top:c.top,width:h,height:g}}}},resize:function(b){var a=e(this).data("resizable"),c=a.options,d=a.containerOffset,f=a.position;b=a._aspectRatio||b.shiftKey;var g={top:0,left:0},h=a.containerElement;if(h[0]!=document&&/static/.test(h.css("position")))g=d;if(f.left<(a._helper?d.left:0)){a.size.width+=a._helper?a.position.left-d.left:a.position.left-g.left;if(b)a.size.height=a.size.width/c.aspectRatio;a.position.left=c.helper?d.left:0}if(f.top<(a._helper?d.top:0)){a.size.height+=a._helper?a.position.top-d.top:a.position.top;if(b)a.size.width=a.size.height*c.aspectRatio;a.position.top=a._helper?d.top:0}a.offset.left=a.parentData.left+a.position.left;a.offset.top=a.parentData.top+a.position.top;c=Math.abs((a._helper?a.offset.left-g.left:a.offset.left-g.left)+a.sizeDiff.width);d=Math.abs((a._helper?a.offset.top-g.top:a.offset.top-
+d.top)+a.sizeDiff.height);f=a.containerElement.get(0)==a.element.parent().get(0);g=/relative|absolute/.test(a.containerElement.css("position"));if(f&&g)c-=a.parentData.left;if(c+a.size.width>=a.parentData.width){a.size.width=a.parentData.width-c;if(b)a.size.height=a.size.width/a.aspectRatio}if(d+a.size.height>=a.parentData.height){a.size.height=a.parentData.height-d;if(b)a.size.width=a.size.height*a.aspectRatio}},stop:function(){var b=e(this).data("resizable"),a=b.options,c=b.containerOffset,d=b.containerPosition,f=b.containerElement,g=e(b.helper),h=g.offset(),i=g.outerWidth()-b.sizeDiff.width;g=g.outerHeight()-b.sizeDiff.height;b._helper&&!a.animate&&/relative/.test(f.css("position"))&&e(this).css({left:h.left-d.left-c.left,width:i,height:g});b._helper&&!a.animate&&/static/.test(f.css("position"))&&e(this).css({left:h.left-d.left-c.left,width:i,height:g})}});e.ui.plugin.add("resizable","ghost",{start:function(){var b=e(this).data("resizable"),a=b.options,c=b.size;b.ghost=b.originalElement.clone();b.ghost.css({opacity:0.25,display:"block",position:"relative",height:c.height,width:c.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof a.ghost=="string"?a.ghost:"");b.ghost.appendTo(b.helper)},resize:function(){var b=e(this).data("resizable");b.ghost&&b.ghost.css({position:"relative",height:b.size.height,width:b.size.width})},stop:function(){var b=e(this).data("resizable");b.ghost&&b.helper&&b.helper.get(0).removeChild(b.ghost.get(0))}});e.ui.plugin.add("resizable","grid",{resize:function(){var b=e(this).data("resizable"),a=b.options,c=b.size,d=b.originalSize,f=b.originalPosition,g=b.axis;a.grid=typeof a.grid=="number"?[a.grid,a.grid]:a.grid;var h=Math.round((c.width-d.width)/(a.grid[0]||1))*(a.grid[0]||1);a=Math.round((c.height-d.height)/(a.grid[1]||1))*(a.grid[1]||1);if(/^(se|s|e)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a}else if(/^(ne)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}else{if(/^(sw)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a}else{b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}b.position.left=f.left-h}}});var m=function(b){return parseInt(b,10)||0},k=function(b){return!isNaN(parseInt(b,10))}})(jQuery);;(function(e){e.widget("ui.selectable",e.ui.mouse,{options:{appendTo:"body",autoRefresh:true,distance:0,filter:"*",tolerance:"touch"},_create:function(){var c=this;this.element.addClass("ui-selectable");this.dragged=false;var f;this.refresh=function(){f=e(c.options.filter,c.element[0]);f.each(function(){var d=e(this),b=d.offset();e.data(this,"selectable-item",{element:this,$element:d,left:b.left,top:b.top,right:b.left+d.outerWidth(),bottom:b.top+d.outerHeight(),startselected:false,selected:d.hasClass("ui-selected"),selecting:d.hasClass("ui-selecting"),unselecting:d.hasClass("ui-unselecting")})})};this.refresh();this.selectees=f.addClass("ui-selectee");this._mouseInit();this.helper=e("<div class='ui-selectable-helper'></div>")},destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item");this.element.removeClass("ui-selectable ui-selectable-disabled").removeData("selectable").unbind(".selectable");this._mouseDestroy();return this},_mouseStart:function(c){var f=this;this.opos=[c.pageX,c.pageY];if(!this.options.disabled){var d=this.options;this.selectees=e(d.filter,this.element[0]);this._trigger("start",c);e(d.appendTo).append(this.helper);this.helper.css({left:c.clientX,top:c.clientY,width:0,height:0});d.autoRefresh&&this.refresh();this.selectees.filter(".ui-selected").each(function(){var b=e.data(this,"selectable-item");b.startselected=true;if(!c.metaKey){b.$element.removeClass("ui-selected");b.selected=false;b.$element.addClass("ui-unselecting");b.unselecting=true;f._trigger("unselecting",c,{unselecting:b.element})}});e(c.target).parents().andSelf().each(function(){var b=e.data(this,"selectable-item");if(b){var g=!c.metaKey||!b.$element.hasClass("ui-selected");b.$element.removeClass(g?"ui-unselecting":"ui-selected").addClass(g?"ui-selecting":"ui-unselecting");b.unselecting=!g;b.selecting=g;(b.selected=g)?f._trigger("selecting",c,{selecting:b.element}):f._trigger("unselecting",c,{unselecting:b.element});return false}})}},_mouseDrag:function(c){var f=this;this.dragged=true;if(!this.options.disabled){var d=this.options,b=this.opos[0],g=this.opos[1],h=c.pageX,i=c.pageY;if(b>h){var j=h;h=b;b=j}if(g>i){j=i;i=g;g=j}this.helper.css({left:b,top:g,width:h-b,height:i-g});this.selectees.each(function(){var a=e.data(this,"selectable-item");if(!(!a||a.element==f.element[0])){var k=false;if(d.tolerance=="touch")k=!(a.left>h||a.right<b||a.top>i||a.bottom<g);else if(d.tolerance=="fit")k=a.left>b&&a.right<h&&a.top>g&&a.bottom<i;if(k){if(a.selected){a.$element.removeClass("ui-selected");a.selected=false}if(a.unselecting){a.$element.removeClass("ui-unselecting");a.unselecting=false}if(!a.selecting){a.$element.addClass("ui-selecting");a.selecting=true;f._trigger("selecting",c,{selecting:a.element})}}else{if(a.selecting)if(c.metaKey&&a.startselected){a.$element.removeClass("ui-selecting");a.selecting=false;a.$element.addClass("ui-selected");a.selected=true}else{a.$element.removeClass("ui-selecting");a.selecting=false;if(a.startselected){a.$element.addClass("ui-unselecting");a.unselecting=true}f._trigger("unselecting",c,{unselecting:a.element})}if(a.selected)if(!c.metaKey&&!a.startselected){a.$element.removeClass("ui-selected");a.selected=false;a.$element.addClass("ui-unselecting");a.unselecting=true;f._trigger("unselecting",c,{unselecting:a.element})}}}});return false}},_mouseStop:function(c){var f=this;this.dragged=false;e(".ui-unselecting",this.element[0]).each(function(){var d=e.data(this,"selectable-item");d.$element.removeClass("ui-unselecting");d.unselecting=false;d.startselected=false;f._trigger("unselected",c,{unselected:d.element})});e(".ui-selecting",this.element[0]).each(function(){var d=e.data(this,"selectable-item");d.$element.removeClass("ui-selecting").addClass("ui-selected");d.selecting=false;d.selected=true;d.startselected=true;f._trigger("selected",c,{selected:d.element})});this._trigger("stop",c);this.helper.remove();return false}});e.extend(e.ui.selectable,{version:"1.8.16"})})(jQuery);;(function(d){d.widget("ui.sortable",d.ui.mouse,{widgetEventPrefix:"sort",options:{appendTo:"parent",axis:false,connectWith:false,containment:false,cursor:"auto",cursorAt:false,dropOnEmpty:true,forcePlaceholderSize:false,forceHelperSize:false,grid:false,handle:false,helper:"original",items:"> *",opacity:false,placeholder:false,revert:false,scroll:true,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1E3},_create:function(){var a=this.options;this.containerCache={};this.element.addClass("ui-sortable");this.refresh();this.floating=this.items.length?a.axis==="x"||/left|right/.test(this.items[0].item.css("float"))||/inline|table-cell/.test(this.items[0].item.css("display")):false;this.offset=this.element.offset();this._mouseInit()},destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").removeData("sortable").unbind(".sortable");this._mouseDestroy();for(var a=this.items.length-1;a>=0;a--)this.items[a].item.removeData("sortable-item");return this},_setOption:function(a,b){if(a==="disabled"){this.options[a]=b;this.widget()[b?"addClass":"removeClass"]("ui-sortable-disabled")}else d.Widget.prototype._setOption.apply(this,arguments)},_mouseCapture:function(a,b){if(this.reverting)return false;if(this.options.disabled||this.options.type=="static")return false;this._refreshItems(a);var c=null,e=this;d(a.target).parents().each(function(){if(d.data(this,"sortable-item")==e){c=d(this);return false}});if(d.data(a.target,"sortable-item")==e)c=d(a.target);if(!c)return false;if(this.options.handle&&!b){var f=false;d(this.options.handle,c).find("*").andSelf().each(function(){if(this==a.target)f=true});if(!f)return false}this.currentItem=c;this._removeCurrentsFromItems();return true},_mouseStart:function(a,b,c){b=this.options;var e=this;this.currentContainer=this;this.refreshPositions();this.helper=this._createHelper(a);this._cacheHelperProportions();this._cacheMargins();this.scrollParent=this.helper.scrollParent();this.offset=this.currentItem.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};this.helper.css("position","absolute");this.cssPosition=this.helper.css("position");d.extend(this.offset,{click:{left:a.pageX-this.offset.left,top:a.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this._generatePosition(a);this.originalPageX=a.pageX;this.originalPageY=a.pageY;b.cursorAt&&this._adjustOffsetFromHelper(b.cursorAt);this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]};this.helper[0]!=this.currentItem[0]&&this.currentItem.hide();this._createPlaceholder();b.containment&&this._setContainment();if(b.cursor){if(d("body").css("cursor"))this._storedCursor=d("body").css("cursor");d("body").css("cursor",b.cursor)}if(b.opacity){if(this.helper.css("opacity"))this._storedOpacity=this.helper.css("opacity");this.helper.css("opacity",b.opacity)}if(b.zIndex){if(this.helper.css("zIndex"))this._storedZIndex=this.helper.css("zIndex");this.helper.css("zIndex",b.zIndex)}if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML")this.overflowOffset=this.scrollParent.offset();this._trigger("start",a,this._uiHash());this._preserveHelperProportions||this._cacheHelperProportions();if(!c)for(c=this.containers.length-1;c>=0;c--)this.containers[c]._trigger("activate",a,e._uiHash(this));if(d.ui.ddmanager)d.ui.ddmanager.current=this;d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a);this.dragging=true;this.helper.addClass("ui-sortable-helper");this._mouseDrag(a);return true},_mouseDrag:function(a){this.position=this._generatePosition(a);this.positionAbs=this._convertPositionTo("absolute");if(!this.lastPositionAbs)this.lastPositionAbs=this.positionAbs;if(this.options.scroll){var b=this.options,c=false;if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"){if(this.overflowOffset.top+this.scrollParent[0].offsetHeight-a.pageY<b.scrollSensitivity)this.scrollParent[0].scrollTop=c=this.scrollParent[0].scrollTop+b.scrollSpeed;else if(a.pageY-this.overflowOffset.top<b.scrollSensitivity)this.scrollParent[0].scrollTop=c=this.scrollParent[0].scrollTop-b.scrollSpeed;if(this.overflowOffset.left+this.scrollParent[0].offsetWidth-a.pageX<b.scrollSensitivity)this.scrollParent[0].scrollLeft=c=this.scrollParent[0].scrollLeft+b.scrollSpeed;else if(a.pageX-this.overflowOffset.left<b.scrollSensitivity)this.scrollParent[0].scrollLeft=c=this.scrollParent[0].scrollLeft-b.scrollSpeed}else{if(a.pageY-d(document).scrollTop()<b.scrollSensitivity)c=d(document).scrollTop(d(document).scrollTop()-
+b.scrollSpeed);else if(d(window).height()-(a.pageY-d(document).scrollTop())<b.scrollSensitivity)c=d(document).scrollTop(d(document).scrollTop()+b.scrollSpeed);if(a.pageX-d(document).scrollLeft()<b.scrollSensitivity)c=d(document).scrollLeft(d(document).scrollLeft()-b.scrollSpeed);else if(d(window).width()-(a.pageX-d(document).scrollLeft())<b.scrollSensitivity)c=d(document).scrollLeft(d(document).scrollLeft()+b.scrollSpeed)}c!==false&&d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a)}this.positionAbs=this._convertPositionTo("absolute");if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";for(b=this.items.length-1;b>=0;b--){c=this.items[b];var e=c.item[0],f=this._intersectsWithPointer(c);if(f)if(e!=this.currentItem[0]&&this.placeholder[f==1?"next":"prev"]()[0]!=e&&!d.ui.contains(this.placeholder[0],e)&&(this.options.type=="semi-dynamic"?!d.ui.contains(this.element[0],e):true)){this.direction=f==1?"down":"up";if(this.options.tolerance=="pointer"||this._intersectsWithSides(c))this._rearrange(a,c);else break;this._trigger("change",a,this._uiHash());break}}this._contactContainers(a);d.ui.ddmanager&&d.ui.ddmanager.drag(this,a);this._trigger("sort",a,this._uiHash());this.lastPositionAbs=this.positionAbs;return false},_mouseStop:function(a,b){if(a){d.ui.ddmanager&&!this.options.dropBehaviour&&d.ui.ddmanager.drop(this,a);if(this.options.revert){var c=this;b=c.placeholder.offset();c.reverting=true;d(this.helper).animate({left:b.left-this.offset.parent.left-c.margins.left+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft),top:b.top-this.offset.parent.top-c.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){c._clear(a)})}else this._clear(a,b);return false}},cancel:function(){var a=this;if(this.dragging){this._mouseUp({target:null});this.options.helper=="original"?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):this.currentItem.show();for(var b=this.containers.length-1;b>=0;b--){this.containers[b]._trigger("deactivate",null,a._uiHash(this));if(this.containers[b].containerCache.over){this.containers[b]._trigger("out",null,a._uiHash(this));this.containers[b].containerCache.over=0}}}if(this.placeholder){this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.options.helper!="original"&&this.helper&&this.helper[0].parentNode&&this.helper.remove();d.extend(this,{helper:null,dragging:false,reverting:false,_noFinalSort:null});this.domPosition.prev?d(this.domPosition.prev).after(this.currentItem):d(this.domPosition.parent).prepend(this.currentItem)}return this},serialize:function(a){var b=this._getItemsAsjQuery(a&&a.connected),c=[];a=a||{};d(b).each(function(){var e=(d(a.item||this).attr(a.attribute||"id")||"").match(a.expression||/(.+)[-=_](.+)/);if(e)c.push((a.key||e[1]+"[]")+"="+(a.key&&a.expression?e[1]:e[2]))});!c.length&&a.key&&c.push(a.key+"=");return c.join("&")},toArray:function(a){var b=this._getItemsAsjQuery(a&&a.connected),c=[];a=a||{};b.each(function(){c.push(d(a.item||this).attr(a.attribute||"id")||"")});return c},_intersectsWith:function(a){var b=this.positionAbs.left,c=b+this.helperProportions.width,e=this.positionAbs.top,f=e+this.helperProportions.height,g=a.left,h=g+a.width,i=a.top,k=i+a.height,j=this.offset.click.top,l=this.offset.click.left;j=e+j>i&&e+j<k&&b+l>g&&b+l<h;return this.options.tolerance=="pointer"||this.options.forcePointerForContainers||this.options.tolerance!="pointer"&&this.helperProportions[this.floating?"width":"height"]>a[this.floating?"width":"height"]?j:g<b+this.helperProportions.width/2&&c-this.helperProportions.width/2<h&&i<e+this.helperProportions.height/2&&f-this.helperProportions.height/2<k},_intersectsWithPointer:function(a){var b=d.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,a.top,a.height);a=d.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,a.left,a.width);b=b&&a;a=this._getDragVerticalDirection();var c=this._getDragHorizontalDirection();if(!b)return false;return this.floating?c&&c=="right"||a=="down"?2:1:a&&(a=="down"?2:1)},_intersectsWithSides:function(a){var b=d.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,a.top+a.height/2,a.height);a=d.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,a.left+a.width/2,a.width);var c=this._getDragVerticalDirection(),e=this._getDragHorizontalDirection();return this.floating&&e?e=="right"&&a||e=="left"&&!a:c&&(c=="down"&&b||c=="up"&&!b)},_getDragVerticalDirection:function(){var a=this.positionAbs.top-this.lastPositionAbs.top;return a!=0&&(a>0?"down":"up")},_getDragHorizontalDirection:function(){var a=this.positionAbs.left-this.lastPositionAbs.left;return a!=0&&(a>0?"right":"left")},refresh:function(a){this._refreshItems(a);this.refreshPositions();return this},_connectWith:function(){var a=this.options;return a.connectWith.constructor==String?[a.connectWith]:a.connectWith},_getItemsAsjQuery:function(a){var b=[],c=[],e=this._connectWith();if(e&&a)for(a=e.length-1;a>=0;a--)for(var f=d(e[a]),g=f.length-1;g>=0;g--){var h=d.data(f[g],"sortable");if(h&&h!=this&&!h.options.disabled)c.push([d.isFunction(h.options.items)?h.options.items.call(h.element):d(h.options.items,h.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),h])}c.push([d.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):d(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]);for(a=c.length-1;a>=0;a--)c[a][0].each(function(){b.push(this)});return d(b)},_removeCurrentsFromItems:function(){for(var a=this.currentItem.find(":data(sortable-item)"),b=0;b<this.items.length;b++)for(var c=0;c<a.length;c++)a[c]==this.items[b].item[0]&&this.items.splice(b,1)},_refreshItems:function(a){this.items=[];this.containers=[this];var b=this.items,c=[[d.isFunction(this.options.items)?this.options.items.call(this.element[0],a,{item:this.currentItem}):d(this.options.items,this.element),this]],e=this._connectWith();if(e)for(var f=e.length-1;f>=0;f--)for(var g=d(e[f]),h=g.length-1;h>=0;h--){var i=d.data(g[h],"sortable");if(i&&i!=this&&!i.options.disabled){c.push([d.isFunction(i.options.items)?i.options.items.call(i.element[0],a,{item:this.currentItem}):d(i.options.items,i.element),i]);this.containers.push(i)}}for(f=c.length-1;f>=0;f--){a=c[f][1];e=c[f][0];h=0;for(g=e.length;h<g;h++){i=d(e[h]);i.data("sortable-item",a);b.push({item:i,instance:a,width:0,height:0,left:0,top:0})}}},refreshPositions:function(a){if(this.offsetParent&&this.helper)this.offset.parent=this._getParentOffset();for(var b=this.items.length-1;b>=0;b--){var c=this.items[b];if(!(c.instance!=this.currentContainer&&this.currentContainer&&c.item[0]!=this.currentItem[0])){var e=this.options.toleranceElement?d(this.options.toleranceElement,c.item):c.item;if(!a){c.width=e.outerWidth();c.height=e.outerHeight()}e=e.offset();c.left=e.left;c.top=e.top}}if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(b=this.containers.length-1;b>=0;b--){e=this.containers[b].element.offset();this.containers[b].containerCache.left=e.left;this.containers[b].containerCache.top=e.top;this.containers[b].containerCache.width=this.containers[b].element.outerWidth();this.containers[b].containerCache.height=this.containers[b].element.outerHeight()}return this},_createPlaceholder:function(a){var b=a||this,c=b.options;if(!c.placeholder||c.placeholder.constructor==String){var e=c.placeholder;c.placeholder={element:function(){var f=d(document.createElement(b.currentItem[0].nodeName)).addClass(e||b.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper")[0];if(!e)f.style.visibility="hidden";return f},update:function(f,g){if(!(e&&!c.forcePlaceholderSize)){g.height()||g.height(b.currentItem.innerHeight()-parseInt(b.currentItem.css("paddingTop")||0,10)-parseInt(b.currentItem.css("paddingBottom")||0,10));g.width()||g.width(b.currentItem.innerWidth()-parseInt(b.currentItem.css("paddingLeft")||0,10)-parseInt(b.currentItem.css("paddingRight")||0,10))}}}}b.placeholder=d(c.placeholder.element.call(b.element,b.currentItem));b.currentItem.after(b.placeholder);c.placeholder.update(b,b.placeholder)},_contactContainers:function(a){for(var b=null,c=null,e=this.containers.length-1;e>=0;e--)if(!d.ui.contains(this.currentItem[0],this.containers[e].element[0]))if(this._intersectsWith(this.containers[e].containerCache)){if(!(b&&d.ui.contains(this.containers[e].element[0],b.element[0]))){b=this.containers[e];c=e}}else if(this.containers[e].containerCache.over){this.containers[e]._trigger("out",a,this._uiHash(this));this.containers[e].containerCache.over=0}if(b)if(this.containers.length===1){this.containers[c]._trigger("over",a,this._uiHash(this));this.containers[c].containerCache.over=1}else if(this.currentContainer!=this.containers[c]){b=1E4;e=null;for(var f=this.positionAbs[this.containers[c].floating?"left":"top"],g=this.items.length-1;g>=0;g--)if(d.ui.contains(this.containers[c].element[0],this.items[g].item[0])){var h=this.items[g][this.containers[c].floating?"left":"top"];if(Math.abs(h-
+f)<b){b=Math.abs(h-f);e=this.items[g]}}if(e||this.options.dropOnEmpty){this.currentContainer=this.containers[c];e?this._rearrange(a,e,null,true):this._rearrange(a,null,this.containers[c].element,true);this._trigger("change",a,this._uiHash());this.containers[c]._trigger("change",a,this._uiHash(this));this.options.placeholder.update(this.currentContainer,this.placeholder);this.containers[c]._trigger("over",a,this._uiHash(this));this.containers[c].containerCache.over=1}}},_createHelper:function(a){var b=this.options;a=d.isFunction(b.helper)?d(b.helper.apply(this.element[0],[a,this.currentItem])):b.helper=="clone"?this.currentItem.clone():this.currentItem;a.parents("body").length||d(b.appendTo!="parent"?b.appendTo:this.currentItem[0].parentNode)[0].appendChild(a[0]);if(a[0]==this.currentItem[0])this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")};if(a[0].style.width==""||b.forceHelperSize)a.width(this.currentItem.width());if(a[0].style.height==""||b.forceHelperSize)a.height(this.currentItem.height());return a},_adjustOffsetFromHelper:function(a){if(typeof a=="string")a=a.split(" ");if(d.isArray(a))a={left:+a[0],top:+a[1]||0};if("left"in a)this.offset.click.left=a.left+this.margins.left;if("right"in a)this.offset.click.left=this.helperProportions.width-a.right+this.margins.left;if("top"in a)this.offset.click.top=a.top+this.margins.top;if("bottom"in a)this.offset.click.top=this.helperProportions.height-a.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var a=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0])){a.left+=this.scrollParent.scrollLeft();a.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&d.browser.msie)a={top:0,left:0};return{top:a.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:a.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var a=this.currentItem.position();return{top:a.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var a=this.options;if(a.containment=="parent")a.containment=this.helper[0].parentNode;if(a.containment=="document"||a.containment=="window")this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,d(a.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(d(a.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(a.containment)){var b=d(a.containment)[0];a=d(a.containment).offset();var c=d(b).css("overflow")!="hidden";this.containment=[a.left+(parseInt(d(b).css("borderLeftWidth"),10)||0)+(parseInt(d(b).css("paddingLeft"),10)||0)-this.margins.left,a.top+(parseInt(d(b).css("borderTopWidth"),10)||0)+(parseInt(d(b).css("paddingTop"),10)||0)-this.margins.top,a.left+(c?Math.max(b.scrollWidth,b.offsetWidth):b.offsetWidth)-(parseInt(d(b).css("borderLeftWidth"),10)||0)-(parseInt(d(b).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,a.top+(c?Math.max(b.scrollHeight,b.offsetHeight):b.offsetHeight)-(parseInt(d(b).css("borderTopWidth"),10)||0)-(parseInt(d(b).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}},_convertPositionTo:function(a,b){if(!b)b=this.position;a=a=="absolute"?1:-1;var c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,e=/(html|body)/i.test(c[0].tagName);return{top:b.top+this.offset.relative.top*a+this.offset.parent.top*a-(d.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():e?0:c.scrollTop())*a),left:b.left+this.offset.relative.left*a+this.offset.parent.left*a-(d.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():e?0:c.scrollLeft())*a)}},_generatePosition:function(a){var b=this.options,c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,e=/(html|body)/i.test(c[0].tagName);if(this.cssPosition=="relative"&&!(this.scrollParent[0]!=document&&this.scrollParent[0]!=this.offsetParent[0]))this.offset.relative=this._getRelativeOffset();var f=a.pageX,g=a.pageY;if(this.originalPosition){if(this.containment){if(a.pageX-this.offset.click.left<this.containment[0])f=this.containment[0]+this.offset.click.left;if(a.pageY-this.offset.click.top<this.containment[1])g=this.containment[1]+this.offset.click.top;if(a.pageX-this.offset.click.left>this.containment[2])f=this.containment[2]+this.offset.click.left;if(a.pageY-this.offset.click.top>this.containment[3])g=this.containment[3]+this.offset.click.top}if(b.grid){g=this.originalPageY+Math.round((g-
 this.originalPageY)/b.grid[1])*b.grid[1];g=this.containment?!(g-this.offset.click.top<this.containment[1]||g-this.offset.click.top>this.containment[3])?g:!(g-this.offset.click.top<this.containment[1])?g-b.grid[1]:g+b.grid[1]:g;f=this.originalPageX+Math.round((f-this.originalPageX)/b.grid[0])*b.grid[0];f=this.containment?!(f-this.offset.click.left<this.containment[0]||f-this.offset.click.left>this.containment[2])?f:!(f-this.offset.click.left<this.containment[0])?f-b.grid[0]:f+b.grid[0]:f}}return{top:g-
-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(d.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():e?0:c.scrollTop()),left:f-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(d.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():e?0:c.scrollLeft())}},_rearrange:function(a,b,c,e){c?c[0].appendChild(this.placeholder[0]):b.item[0].parentNode.insertBefore(this.placeholder[0],
-this.direction=="down"?b.item[0]:b.item[0].nextSibling);this.counter=this.counter?++this.counter:1;var f=this,g=this.counter;window.setTimeout(function(){g==f.counter&&f.refreshPositions(!e)},0)},_clear:function(a,b){this.reverting=false;var c=[];!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem);this._noFinalSort=null;if(this.helper[0]==this.currentItem[0]){for(var e in this._storedCSS)if(this._storedCSS[e]=="auto"||this._storedCSS[e]=="static")this._storedCSS[e]=
-"";this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();this.fromOutside&&!b&&c.push(function(f){this._trigger("receive",f,this._uiHash(this.fromOutside))});if((this.fromOutside||this.domPosition.prev!=this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!=this.currentItem.parent()[0])&&!b)c.push(function(f){this._trigger("update",f,this._uiHash())});if(!d.ui.contains(this.element[0],this.currentItem[0])){b||c.push(function(f){this._trigger("remove",
-f,this._uiHash())});for(e=this.containers.length-1;e>=0;e--)if(d.ui.contains(this.containers[e].element[0],this.currentItem[0])&&!b){c.push(function(f){return function(g){f._trigger("receive",g,this._uiHash(this))}}.call(this,this.containers[e]));c.push(function(f){return function(g){f._trigger("update",g,this._uiHash(this))}}.call(this,this.containers[e]))}}for(e=this.containers.length-1;e>=0;e--){b||c.push(function(f){return function(g){f._trigger("deactivate",g,this._uiHash(this))}}.call(this,
-this.containers[e]));if(this.containers[e].containerCache.over){c.push(function(f){return function(g){f._trigger("out",g,this._uiHash(this))}}.call(this,this.containers[e]));this.containers[e].containerCache.over=0}}this._storedCursor&&d("body").css("cursor",this._storedCursor);this._storedOpacity&&this.helper.css("opacity",this._storedOpacity);if(this._storedZIndex)this.helper.css("zIndex",this._storedZIndex=="auto"?"":this._storedZIndex);this.dragging=false;if(this.cancelHelperRemoval){if(!b){this._trigger("beforeStop",
-a,this._uiHash());for(e=0;e<c.length;e++)c[e].call(this,a);this._trigger("stop",a,this._uiHash())}return false}b||this._trigger("beforeStop",a,this._uiHash());this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.helper[0]!=this.currentItem[0]&&this.helper.remove();this.helper=null;if(!b){for(e=0;e<c.length;e++)c[e].call(this,a);this._trigger("stop",a,this._uiHash())}this.fromOutside=false;return true},_trigger:function(){d.Widget.prototype._trigger.apply(this,arguments)===false&&this.cancel()},
-_uiHash:function(a){var b=a||this;return{helper:b.helper,placeholder:b.placeholder||d([]),position:b.position,originalPosition:b.originalPosition,offset:b.positionAbs,item:b.currentItem,sender:a?a.element:null}}});d.extend(d.ui.sortable,{version:"1.8.16"})})(jQuery);
-;/*
- * jQuery UI Slider 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Slider
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.mouse.js
- *	jquery.ui.widget.js
- */
-(function(d){d.widget("ui.slider",d.ui.mouse,{widgetEventPrefix:"slide",options:{animate:false,distance:0,max:100,min:0,orientation:"horizontal",range:false,step:1,value:0,values:null},_create:function(){var a=this,b=this.options,c=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),f=b.values&&b.values.length||1,e=[];this._mouseSliding=this._keySliding=false;this._animateOff=true;this._handleIndex=null;this._detectOrientation();this._mouseInit();this.element.addClass("ui-slider ui-slider-"+
-this.orientation+" ui-widget ui-widget-content ui-corner-all"+(b.disabled?" ui-slider-disabled ui-disabled":""));this.range=d([]);if(b.range){if(b.range===true){if(!b.values)b.values=[this._valueMin(),this._valueMin()];if(b.values.length&&b.values.length!==2)b.values=[b.values[0],b.values[0]]}this.range=d("<div></div>").appendTo(this.element).addClass("ui-slider-range ui-widget-header"+(b.range==="min"||b.range==="max"?" ui-slider-range-"+b.range:""))}for(var j=c.length;j<f;j+=1)e.push("<a class='ui-slider-handle ui-state-default ui-corner-all' href='#'></a>");
-this.handles=c.add(d(e.join("")).appendTo(a.element));this.handle=this.handles.eq(0);this.handles.add(this.range).filter("a").click(function(g){g.preventDefault()}).hover(function(){b.disabled||d(this).addClass("ui-state-hover")},function(){d(this).removeClass("ui-state-hover")}).focus(function(){if(b.disabled)d(this).blur();else{d(".ui-slider .ui-state-focus").removeClass("ui-state-focus");d(this).addClass("ui-state-focus")}}).blur(function(){d(this).removeClass("ui-state-focus")});this.handles.each(function(g){d(this).data("index.ui-slider-handle",
-g)});this.handles.keydown(function(g){var k=true,l=d(this).data("index.ui-slider-handle"),i,h,m;if(!a.options.disabled){switch(g.keyCode){case d.ui.keyCode.HOME:case d.ui.keyCode.END:case d.ui.keyCode.PAGE_UP:case d.ui.keyCode.PAGE_DOWN:case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:k=false;if(!a._keySliding){a._keySliding=true;d(this).addClass("ui-state-active");i=a._start(g,l);if(i===false)return}break}m=a.options.step;i=a.options.values&&a.options.values.length?
-(h=a.values(l)):(h=a.value());switch(g.keyCode){case d.ui.keyCode.HOME:h=a._valueMin();break;case d.ui.keyCode.END:h=a._valueMax();break;case d.ui.keyCode.PAGE_UP:h=a._trimAlignValue(i+(a._valueMax()-a._valueMin())/5);break;case d.ui.keyCode.PAGE_DOWN:h=a._trimAlignValue(i-(a._valueMax()-a._valueMin())/5);break;case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:if(i===a._valueMax())return;h=a._trimAlignValue(i+m);break;case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:if(i===a._valueMin())return;h=a._trimAlignValue(i-
-m);break}a._slide(g,l,h);return k}}).keyup(function(g){var k=d(this).data("index.ui-slider-handle");if(a._keySliding){a._keySliding=false;a._stop(g,k);a._change(g,k);d(this).removeClass("ui-state-active")}});this._refreshValue();this._animateOff=false},destroy:function(){this.handles.remove();this.range.remove();this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-slider-disabled ui-widget ui-widget-content ui-corner-all").removeData("slider").unbind(".slider");this._mouseDestroy();
-return this},_mouseCapture:function(a){var b=this.options,c,f,e,j,g;if(b.disabled)return false;this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()};this.elementOffset=this.element.offset();c=this._normValueFromMouse({x:a.pageX,y:a.pageY});f=this._valueMax()-this._valueMin()+1;j=this;this.handles.each(function(k){var l=Math.abs(c-j.values(k));if(f>l){f=l;e=d(this);g=k}});if(b.range===true&&this.values(1)===b.min){g+=1;e=d(this.handles[g])}if(this._start(a,g)===false)return false;
-this._mouseSliding=true;j._handleIndex=g;e.addClass("ui-state-active").focus();b=e.offset();this._clickOffset=!d(a.target).parents().andSelf().is(".ui-slider-handle")?{left:0,top:0}:{left:a.pageX-b.left-e.width()/2,top:a.pageY-b.top-e.height()/2-(parseInt(e.css("borderTopWidth"),10)||0)-(parseInt(e.css("borderBottomWidth"),10)||0)+(parseInt(e.css("marginTop"),10)||0)};this.handles.hasClass("ui-state-hover")||this._slide(a,g,c);return this._animateOff=true},_mouseStart:function(){return true},_mouseDrag:function(a){var b=
-this._normValueFromMouse({x:a.pageX,y:a.pageY});this._slide(a,this._handleIndex,b);return false},_mouseStop:function(a){this.handles.removeClass("ui-state-active");this._mouseSliding=false;this._stop(a,this._handleIndex);this._change(a,this._handleIndex);this._clickOffset=this._handleIndex=null;return this._animateOff=false},_detectOrientation:function(){this.orientation=this.options.orientation==="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(a){var b;if(this.orientation==="horizontal"){b=
-this.elementSize.width;a=a.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)}else{b=this.elementSize.height;a=a.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)}b=a/b;if(b>1)b=1;if(b<0)b=0;if(this.orientation==="vertical")b=1-b;a=this._valueMax()-this._valueMin();return this._trimAlignValue(this._valueMin()+b*a)},_start:function(a,b){var c={handle:this.handles[b],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(b);
-c.values=this.values()}return this._trigger("start",a,c)},_slide:function(a,b,c){var f;if(this.options.values&&this.options.values.length){f=this.values(b?0:1);if(this.options.values.length===2&&this.options.range===true&&(b===0&&c>f||b===1&&c<f))c=f;if(c!==this.values(b)){f=this.values();f[b]=c;a=this._trigger("slide",a,{handle:this.handles[b],value:c,values:f});this.values(b?0:1);a!==false&&this.values(b,c,true)}}else if(c!==this.value()){a=this._trigger("slide",a,{handle:this.handles[b],value:c});
-a!==false&&this.value(c)}},_stop:function(a,b){var c={handle:this.handles[b],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(b);c.values=this.values()}this._trigger("stop",a,c)},_change:function(a,b){if(!this._keySliding&&!this._mouseSliding){var c={handle:this.handles[b],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(b);c.values=this.values()}this._trigger("change",a,c)}},value:function(a){if(arguments.length){this.options.value=
-this._trimAlignValue(a);this._refreshValue();this._change(null,0)}else return this._value()},values:function(a,b){var c,f,e;if(arguments.length>1){this.options.values[a]=this._trimAlignValue(b);this._refreshValue();this._change(null,a)}else if(arguments.length)if(d.isArray(arguments[0])){c=this.options.values;f=arguments[0];for(e=0;e<c.length;e+=1){c[e]=this._trimAlignValue(f[e]);this._change(null,e)}this._refreshValue()}else return this.options.values&&this.options.values.length?this._values(a):
-this.value();else return this._values()},_setOption:function(a,b){var c,f=0;if(d.isArray(this.options.values))f=this.options.values.length;d.Widget.prototype._setOption.apply(this,arguments);switch(a){case "disabled":if(b){this.handles.filter(".ui-state-focus").blur();this.handles.removeClass("ui-state-hover");this.handles.propAttr("disabled",true);this.element.addClass("ui-disabled")}else{this.handles.propAttr("disabled",false);this.element.removeClass("ui-disabled")}break;case "orientation":this._detectOrientation();
-this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation);this._refreshValue();break;case "value":this._animateOff=true;this._refreshValue();this._change(null,0);this._animateOff=false;break;case "values":this._animateOff=true;this._refreshValue();for(c=0;c<f;c+=1)this._change(null,c);this._animateOff=false;break}},_value:function(){var a=this.options.value;return a=this._trimAlignValue(a)},_values:function(a){var b,c;if(arguments.length){b=this.options.values[a];
-return b=this._trimAlignValue(b)}else{b=this.options.values.slice();for(c=0;c<b.length;c+=1)b[c]=this._trimAlignValue(b[c]);return b}},_trimAlignValue:function(a){if(a<=this._valueMin())return this._valueMin();if(a>=this._valueMax())return this._valueMax();var b=this.options.step>0?this.options.step:1,c=(a-this._valueMin())%b;a=a-c;if(Math.abs(c)*2>=b)a+=c>0?b:-b;return parseFloat(a.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max},_refreshValue:function(){var a=
-this.options.range,b=this.options,c=this,f=!this._animateOff?b.animate:false,e,j={},g,k,l,i;if(this.options.values&&this.options.values.length)this.handles.each(function(h){e=(c.values(h)-c._valueMin())/(c._valueMax()-c._valueMin())*100;j[c.orientation==="horizontal"?"left":"bottom"]=e+"%";d(this).stop(1,1)[f?"animate":"css"](j,b.animate);if(c.options.range===true)if(c.orientation==="horizontal"){if(h===0)c.range.stop(1,1)[f?"animate":"css"]({left:e+"%"},b.animate);if(h===1)c.range[f?"animate":"css"]({width:e-
-g+"%"},{queue:false,duration:b.animate})}else{if(h===0)c.range.stop(1,1)[f?"animate":"css"]({bottom:e+"%"},b.animate);if(h===1)c.range[f?"animate":"css"]({height:e-g+"%"},{queue:false,duration:b.animate})}g=e});else{k=this.value();l=this._valueMin();i=this._valueMax();e=i!==l?(k-l)/(i-l)*100:0;j[c.orientation==="horizontal"?"left":"bottom"]=e+"%";this.handle.stop(1,1)[f?"animate":"css"](j,b.animate);if(a==="min"&&this.orientation==="horizontal")this.range.stop(1,1)[f?"animate":"css"]({width:e+"%"},
-b.animate);if(a==="max"&&this.orientation==="horizontal")this.range[f?"animate":"css"]({width:100-e+"%"},{queue:false,duration:b.animate});if(a==="min"&&this.orientation==="vertical")this.range.stop(1,1)[f?"animate":"css"]({height:e+"%"},b.animate);if(a==="max"&&this.orientation==="vertical")this.range[f?"animate":"css"]({height:100-e+"%"},{queue:false,duration:b.animate})}}});d.extend(d.ui.slider,{version:"1.8.16"})})(jQuery);
-;/*
- * jQuery UI Datepicker 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Datepicker
- *
- * Depends:
- *	jquery.ui.core.js
- */
-(function(d,C){function M(){this.debug=false;this._curInst=null;this._keyEvent=false;this._disabledInputs=[];this._inDialog=this._datepickerShowing=false;this._mainDivId="ui-datepicker-div";this._inlineClass="ui-datepicker-inline";this._appendClass="ui-datepicker-append";this._triggerClass="ui-datepicker-trigger";this._dialogClass="ui-datepicker-dialog";this._disableClass="ui-datepicker-disabled";this._unselectableClass="ui-datepicker-unselectable";this._currentClass="ui-datepicker-current-day";this._dayOverClass=
-"ui-datepicker-days-cell-over";this.regional=[];this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su",
-"Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:false,showMonthAfterYear:false,yearSuffix:""};this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:false,hideIfNoPrevNext:false,navigationAsDateFormat:false,gotoCurrent:false,changeMonth:false,changeYear:false,yearRange:"c-10:c+10",showOtherMonths:false,selectOtherMonths:false,showWeek:false,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",
-minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:true,showButtonPanel:false,autoSize:false,disabled:false};d.extend(this._defaults,this.regional[""]);this.dpDiv=N(d('<div id="'+this._mainDivId+'" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))}function N(a){return a.bind("mouseout",
-function(b){b=d(b.target).closest("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a");b.length&&b.removeClass("ui-state-hover ui-datepicker-prev-hover ui-datepicker-next-hover")}).bind("mouseover",function(b){b=d(b.target).closest("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a");if(!(d.datepicker._isDisabledDatepicker(J.inline?a.parent()[0]:J.input[0])||!b.length)){b.parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");
-b.addClass("ui-state-hover");b.hasClass("ui-datepicker-prev")&&b.addClass("ui-datepicker-prev-hover");b.hasClass("ui-datepicker-next")&&b.addClass("ui-datepicker-next-hover")}})}function H(a,b){d.extend(a,b);for(var c in b)if(b[c]==null||b[c]==C)a[c]=b[c];return a}d.extend(d.ui,{datepicker:{version:"1.8.16"}});var B=(new Date).getTime(),J;d.extend(M.prototype,{markerClassName:"hasDatepicker",maxRows:4,log:function(){this.debug&&console.log.apply("",arguments)},_widgetDatepicker:function(){return this.dpDiv},
-setDefaults:function(a){H(this._defaults,a||{});return this},_attachDatepicker:function(a,b){var c=null;for(var e in this._defaults){var f=a.getAttribute("date:"+e);if(f){c=c||{};try{c[e]=eval(f)}catch(h){c[e]=f}}}e=a.nodeName.toLowerCase();f=e=="div"||e=="span";if(!a.id){this.uuid+=1;a.id="dp"+this.uuid}var i=this._newInst(d(a),f);i.settings=d.extend({},b||{},c||{});if(e=="input")this._connectDatepicker(a,i);else f&&this._inlineDatepicker(a,i)},_newInst:function(a,b){return{id:a[0].id.replace(/([^A-Za-z0-9_-])/g,
-"\\\\$1"),input:a,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:b,dpDiv:!b?this.dpDiv:N(d('<div class="'+this._inlineClass+' ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))}},_connectDatepicker:function(a,b){var c=d(a);b.append=d([]);b.trigger=d([]);if(!c.hasClass(this.markerClassName)){this._attachments(c,b);c.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp).bind("setData.datepicker",
-function(e,f,h){b.settings[f]=h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});this._autoSize(b);d.data(a,"datepicker",b);b.settings.disabled&&this._disableDatepicker(a)}},_attachments:function(a,b){var c=this._get(b,"appendText"),e=this._get(b,"isRTL");b.append&&b.append.remove();if(c){b.append=d('<span class="'+this._appendClass+'">'+c+"</span>");a[e?"before":"after"](b.append)}a.unbind("focus",this._showDatepicker);b.trigger&&b.trigger.remove();c=this._get(b,"showOn");if(c==
-"focus"||c=="both")a.focus(this._showDatepicker);if(c=="button"||c=="both"){c=this._get(b,"buttonText");var f=this._get(b,"buttonImage");b.trigger=d(this._get(b,"buttonImageOnly")?d("<img/>").addClass(this._triggerClass).attr({src:f,alt:c,title:c}):d('<button type="button"></button>').addClass(this._triggerClass).html(f==""?c:d("<img/>").attr({src:f,alt:c,title:c})));a[e?"before":"after"](b.trigger);b.trigger.click(function(){d.datepicker._datepickerShowing&&d.datepicker._lastInput==a[0]?d.datepicker._hideDatepicker():
-d.datepicker._showDatepicker(a[0]);return false})}},_autoSize:function(a){if(this._get(a,"autoSize")&&!a.inline){var b=new Date(2009,11,20),c=this._get(a,"dateFormat");if(c.match(/[DM]/)){var e=function(f){for(var h=0,i=0,g=0;g<f.length;g++)if(f[g].length>h){h=f[g].length;i=g}return i};b.setMonth(e(this._get(a,c.match(/MM/)?"monthNames":"monthNamesShort")));b.setDate(e(this._get(a,c.match(/DD/)?"dayNames":"dayNamesShort"))+20-b.getDay())}a.input.attr("size",this._formatDate(a,b).length)}},_inlineDatepicker:function(a,
-b){var c=d(a);if(!c.hasClass(this.markerClassName)){c.addClass(this.markerClassName).append(b.dpDiv).bind("setData.datepicker",function(e,f,h){b.settings[f]=h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});d.data(a,"datepicker",b);this._setDate(b,this._getDefaultDate(b),true);this._updateDatepicker(b);this._updateAlternate(b);b.settings.disabled&&this._disableDatepicker(a);b.dpDiv.css("display","block")}},_dialogDatepicker:function(a,b,c,e,f){a=this._dialogInst;if(!a){this.uuid+=
-1;this._dialogInput=d('<input type="text" id="'+("dp"+this.uuid)+'" style="position: absolute; top: -100px; width: 0px; z-index: -10;"/>');this._dialogInput.keydown(this._doKeyDown);d("body").append(this._dialogInput);a=this._dialogInst=this._newInst(this._dialogInput,false);a.settings={};d.data(this._dialogInput[0],"datepicker",a)}H(a.settings,e||{});b=b&&b.constructor==Date?this._formatDate(a,b):b;this._dialogInput.val(b);this._pos=f?f.length?f:[f.pageX,f.pageY]:null;if(!this._pos)this._pos=[document.documentElement.clientWidth/
-2-100+(document.documentElement.scrollLeft||document.body.scrollLeft),document.documentElement.clientHeight/2-150+(document.documentElement.scrollTop||document.body.scrollTop)];this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px");a.settings.onSelect=c;this._inDialog=true;this.dpDiv.addClass(this._dialogClass);this._showDatepicker(this._dialogInput[0]);d.blockUI&&d.blockUI(this.dpDiv);d.data(this._dialogInput[0],"datepicker",a);return this},_destroyDatepicker:function(a){var b=
-d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();d.removeData(a,"datepicker");if(e=="input"){c.append.remove();c.trigger.remove();b.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)}else if(e=="div"||e=="span")b.removeClass(this.markerClassName).empty()}},_enableDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=
-a.nodeName.toLowerCase();if(e=="input"){a.disabled=false;c.trigger.filter("button").each(function(){this.disabled=false}).end().filter("img").css({opacity:"1.0",cursor:""})}else if(e=="div"||e=="span"){b=b.children("."+this._inlineClass);b.children().removeClass("ui-state-disabled");b.find("select.ui-datepicker-month, select.ui-datepicker-year").removeAttr("disabled")}this._disabledInputs=d.map(this._disabledInputs,function(f){return f==a?null:f})}},_disableDatepicker:function(a){var b=d(a),c=d.data(a,
-"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();if(e=="input"){a.disabled=true;c.trigger.filter("button").each(function(){this.disabled=true}).end().filter("img").css({opacity:"0.5",cursor:"default"})}else if(e=="div"||e=="span"){b=b.children("."+this._inlineClass);b.children().addClass("ui-state-disabled");b.find("select.ui-datepicker-month, select.ui-datepicker-year").attr("disabled","disabled")}this._disabledInputs=d.map(this._disabledInputs,function(f){return f==
-a?null:f});this._disabledInputs[this._disabledInputs.length]=a}},_isDisabledDatepicker:function(a){if(!a)return false;for(var b=0;b<this._disabledInputs.length;b++)if(this._disabledInputs[b]==a)return true;return false},_getInst:function(a){try{return d.data(a,"datepicker")}catch(b){throw"Missing instance data for this datepicker";}},_optionDatepicker:function(a,b,c){var e=this._getInst(a);if(arguments.length==2&&typeof b=="string")return b=="defaults"?d.extend({},d.datepicker._defaults):e?b=="all"?
-d.extend({},e.settings):this._get(e,b):null;var f=b||{};if(typeof b=="string"){f={};f[b]=c}if(e){this._curInst==e&&this._hideDatepicker();var h=this._getDateDatepicker(a,true),i=this._getMinMaxDate(e,"min"),g=this._getMinMaxDate(e,"max");H(e.settings,f);if(i!==null&&f.dateFormat!==C&&f.minDate===C)e.settings.minDate=this._formatDate(e,i);if(g!==null&&f.dateFormat!==C&&f.maxDate===C)e.settings.maxDate=this._formatDate(e,g);this._attachments(d(a),e);this._autoSize(e);this._setDate(e,h);this._updateAlternate(e);
-this._updateDatepicker(e)}},_changeDatepicker:function(a,b,c){this._optionDatepicker(a,b,c)},_refreshDatepicker:function(a){(a=this._getInst(a))&&this._updateDatepicker(a)},_setDateDatepicker:function(a,b){if(a=this._getInst(a)){this._setDate(a,b);this._updateDatepicker(a);this._updateAlternate(a)}},_getDateDatepicker:function(a,b){(a=this._getInst(a))&&!a.inline&&this._setDateFromField(a,b);return a?this._getDate(a):null},_doKeyDown:function(a){var b=d.datepicker._getInst(a.target),c=true,e=b.dpDiv.is(".ui-datepicker-rtl");
-b._keyEvent=true;if(d.datepicker._datepickerShowing)switch(a.keyCode){case 9:d.datepicker._hideDatepicker();c=false;break;case 13:c=d("td."+d.datepicker._dayOverClass+":not(."+d.datepicker._currentClass+")",b.dpDiv);c[0]&&d.datepicker._selectDay(a.target,b.selectedMonth,b.selectedYear,c[0]);if(a=d.datepicker._get(b,"onSelect")){c=d.datepicker._formatDate(b);a.apply(b.input?b.input[0]:null,[c,b])}else d.datepicker._hideDatepicker();return false;case 27:d.datepicker._hideDatepicker();break;case 33:d.datepicker._adjustDate(a.target,
-a.ctrlKey?-d.datepicker._get(b,"stepBigMonths"):-d.datepicker._get(b,"stepMonths"),"M");break;case 34:d.datepicker._adjustDate(a.target,a.ctrlKey?+d.datepicker._get(b,"stepBigMonths"):+d.datepicker._get(b,"stepMonths"),"M");break;case 35:if(a.ctrlKey||a.metaKey)d.datepicker._clearDate(a.target);c=a.ctrlKey||a.metaKey;break;case 36:if(a.ctrlKey||a.metaKey)d.datepicker._gotoToday(a.target);c=a.ctrlKey||a.metaKey;break;case 37:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,e?+1:-1,"D");c=
-a.ctrlKey||a.metaKey;if(a.originalEvent.altKey)d.datepicker._adjustDate(a.target,a.ctrlKey?-d.datepicker._get(b,"stepBigMonths"):-d.datepicker._get(b,"stepMonths"),"M");break;case 38:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,-7,"D");c=a.ctrlKey||a.metaKey;break;case 39:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,e?-1:+1,"D");c=a.ctrlKey||a.metaKey;if(a.originalEvent.altKey)d.datepicker._adjustDate(a.target,a.ctrlKey?+d.datepicker._get(b,"stepBigMonths"):+d.datepicker._get(b,
-"stepMonths"),"M");break;case 40:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,+7,"D");c=a.ctrlKey||a.metaKey;break;default:c=false}else if(a.keyCode==36&&a.ctrlKey)d.datepicker._showDatepicker(this);else c=false;if(c){a.preventDefault();a.stopPropagation()}},_doKeyPress:function(a){var b=d.datepicker._getInst(a.target);if(d.datepicker._get(b,"constrainInput")){b=d.datepicker._possibleChars(d.datepicker._get(b,"dateFormat"));var c=String.fromCharCode(a.charCode==C?a.keyCode:a.charCode);
-return a.ctrlKey||a.metaKey||c<" "||!b||b.indexOf(c)>-1}},_doKeyUp:function(a){a=d.datepicker._getInst(a.target);if(a.input.val()!=a.lastVal)try{if(d.datepicker.parseDate(d.datepicker._get(a,"dateFormat"),a.input?a.input.val():null,d.datepicker._getFormatConfig(a))){d.datepicker._setDateFromField(a);d.datepicker._updateAlternate(a);d.datepicker._updateDatepicker(a)}}catch(b){d.datepicker.log(b)}return true},_showDatepicker:function(a){a=a.target||a;if(a.nodeName.toLowerCase()!="input")a=d("input",
-a.parentNode)[0];if(!(d.datepicker._isDisabledDatepicker(a)||d.datepicker._lastInput==a)){var b=d.datepicker._getInst(a);if(d.datepicker._curInst&&d.datepicker._curInst!=b){d.datepicker._datepickerShowing&&d.datepicker._triggerOnClose(d.datepicker._curInst);d.datepicker._curInst.dpDiv.stop(true,true)}var c=d.datepicker._get(b,"beforeShow");c=c?c.apply(a,[a,b]):{};if(c!==false){H(b.settings,c);b.lastVal=null;d.datepicker._lastInput=a;d.datepicker._setDateFromField(b);if(d.datepicker._inDialog)a.value=
-"";if(!d.datepicker._pos){d.datepicker._pos=d.datepicker._findPos(a);d.datepicker._pos[1]+=a.offsetHeight}var e=false;d(a).parents().each(function(){e|=d(this).css("position")=="fixed";return!e});if(e&&d.browser.opera){d.datepicker._pos[0]-=document.documentElement.scrollLeft;d.datepicker._pos[1]-=document.documentElement.scrollTop}c={left:d.datepicker._pos[0],top:d.datepicker._pos[1]};d.datepicker._pos=null;b.dpDiv.empty();b.dpDiv.css({position:"absolute",display:"block",top:"-1000px"});d.datepicker._updateDatepicker(b);
-c=d.datepicker._checkOffset(b,c,e);b.dpDiv.css({position:d.datepicker._inDialog&&d.blockUI?"static":e?"fixed":"absolute",display:"none",left:c.left+"px",top:c.top+"px"});if(!b.inline){c=d.datepicker._get(b,"showAnim");var f=d.datepicker._get(b,"duration"),h=function(){var i=b.dpDiv.find("iframe.ui-datepicker-cover");if(i.length){var g=d.datepicker._getBorders(b.dpDiv);i.css({left:-g[0],top:-g[1],width:b.dpDiv.outerWidth(),height:b.dpDiv.outerHeight()})}};b.dpDiv.zIndex(d(a).zIndex()+1);d.datepicker._datepickerShowing=
-true;d.effects&&d.effects[c]?b.dpDiv.show(c,d.datepicker._get(b,"showOptions"),f,h):b.dpDiv[c||"show"](c?f:null,h);if(!c||!f)h();b.input.is(":visible")&&!b.input.is(":disabled")&&b.input.focus();d.datepicker._curInst=b}}}},_updateDatepicker:function(a){this.maxRows=4;var b=d.datepicker._getBorders(a.dpDiv);J=a;a.dpDiv.empty().append(this._generateHTML(a));var c=a.dpDiv.find("iframe.ui-datepicker-cover");c.length&&c.css({left:-b[0],top:-b[1],width:a.dpDiv.outerWidth(),height:a.dpDiv.outerHeight()});
-a.dpDiv.find("."+this._dayOverClass+" a").mouseover();b=this._getNumberOfMonths(a);c=b[1];a.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");c>1&&a.dpDiv.addClass("ui-datepicker-multi-"+c).css("width",17*c+"em");a.dpDiv[(b[0]!=1||b[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi");a.dpDiv[(this._get(a,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl");a==d.datepicker._curInst&&d.datepicker._datepickerShowing&&a.input&&a.input.is(":visible")&&
-!a.input.is(":disabled")&&a.input[0]!=document.activeElement&&a.input.focus();if(a.yearshtml){var e=a.yearshtml;setTimeout(function(){e===a.yearshtml&&a.yearshtml&&a.dpDiv.find("select.ui-datepicker-year:first").replaceWith(a.yearshtml);e=a.yearshtml=null},0)}},_getBorders:function(a){var b=function(c){return{thin:1,medium:2,thick:3}[c]||c};return[parseFloat(b(a.css("border-left-width"))),parseFloat(b(a.css("border-top-width")))]},_checkOffset:function(a,b,c){var e=a.dpDiv.outerWidth(),f=a.dpDiv.outerHeight(),
-h=a.input?a.input.outerWidth():0,i=a.input?a.input.outerHeight():0,g=document.documentElement.clientWidth+d(document).scrollLeft(),j=document.documentElement.clientHeight+d(document).scrollTop();b.left-=this._get(a,"isRTL")?e-h:0;b.left-=c&&b.left==a.input.offset().left?d(document).scrollLeft():0;b.top-=c&&b.top==a.input.offset().top+i?d(document).scrollTop():0;b.left-=Math.min(b.left,b.left+e>g&&g>e?Math.abs(b.left+e-g):0);b.top-=Math.min(b.top,b.top+f>j&&j>f?Math.abs(f+i):0);return b},_findPos:function(a){for(var b=
-this._get(this._getInst(a),"isRTL");a&&(a.type=="hidden"||a.nodeType!=1||d.expr.filters.hidden(a));)a=a[b?"previousSibling":"nextSibling"];a=d(a).offset();return[a.left,a.top]},_triggerOnClose:function(a){var b=this._get(a,"onClose");if(b)b.apply(a.input?a.input[0]:null,[a.input?a.input.val():"",a])},_hideDatepicker:function(a){var b=this._curInst;if(!(!b||a&&b!=d.data(a,"datepicker")))if(this._datepickerShowing){a=this._get(b,"showAnim");var c=this._get(b,"duration"),e=function(){d.datepicker._tidyDialog(b);
-this._curInst=null};d.effects&&d.effects[a]?b.dpDiv.hide(a,d.datepicker._get(b,"showOptions"),c,e):b.dpDiv[a=="slideDown"?"slideUp":a=="fadeIn"?"fadeOut":"hide"](a?c:null,e);a||e();d.datepicker._triggerOnClose(b);this._datepickerShowing=false;this._lastInput=null;if(this._inDialog){this._dialogInput.css({position:"absolute",left:"0",top:"-100px"});if(d.blockUI){d.unblockUI();d("body").append(this.dpDiv)}}this._inDialog=false}},_tidyDialog:function(a){a.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},
-_checkExternalClick:function(a){if(d.datepicker._curInst){a=d(a.target);a[0].id!=d.datepicker._mainDivId&&a.parents("#"+d.datepicker._mainDivId).length==0&&!a.hasClass(d.datepicker.markerClassName)&&!a.hasClass(d.datepicker._triggerClass)&&d.datepicker._datepickerShowing&&!(d.datepicker._inDialog&&d.blockUI)&&d.datepicker._hideDatepicker()}},_adjustDate:function(a,b,c){a=d(a);var e=this._getInst(a[0]);if(!this._isDisabledDatepicker(a[0])){this._adjustInstDate(e,b+(c=="M"?this._get(e,"showCurrentAtPos"):
-0),c);this._updateDatepicker(e)}},_gotoToday:function(a){a=d(a);var b=this._getInst(a[0]);if(this._get(b,"gotoCurrent")&&b.currentDay){b.selectedDay=b.currentDay;b.drawMonth=b.selectedMonth=b.currentMonth;b.drawYear=b.selectedYear=b.currentYear}else{var c=new Date;b.selectedDay=c.getDate();b.drawMonth=b.selectedMonth=c.getMonth();b.drawYear=b.selectedYear=c.getFullYear()}this._notifyChange(b);this._adjustDate(a)},_selectMonthYear:function(a,b,c){a=d(a);var e=this._getInst(a[0]);e["selected"+(c=="M"?
-"Month":"Year")]=e["draw"+(c=="M"?"Month":"Year")]=parseInt(b.options[b.selectedIndex].value,10);this._notifyChange(e);this._adjustDate(a)},_selectDay:function(a,b,c,e){var f=d(a);if(!(d(e).hasClass(this._unselectableClass)||this._isDisabledDatepicker(f[0]))){f=this._getInst(f[0]);f.selectedDay=f.currentDay=d("a",e).html();f.selectedMonth=f.currentMonth=b;f.selectedYear=f.currentYear=c;this._selectDate(a,this._formatDate(f,f.currentDay,f.currentMonth,f.currentYear))}},_clearDate:function(a){a=d(a);
-this._getInst(a[0]);this._selectDate(a,"")},_selectDate:function(a,b){a=this._getInst(d(a)[0]);b=b!=null?b:this._formatDate(a);a.input&&a.input.val(b);this._updateAlternate(a);var c=this._get(a,"onSelect");if(c)c.apply(a.input?a.input[0]:null,[b,a]);else a.input&&a.input.trigger("change");if(a.inline)this._updateDatepicker(a);else{this._hideDatepicker();this._lastInput=a.input[0];typeof a.input[0]!="object"&&a.input.focus();this._lastInput=null}},_updateAlternate:function(a){var b=this._get(a,"altField");
-if(b){var c=this._get(a,"altFormat")||this._get(a,"dateFormat"),e=this._getDate(a),f=this.formatDate(c,e,this._getFormatConfig(a));d(b).each(function(){d(this).val(f)})}},noWeekends:function(a){a=a.getDay();return[a>0&&a<6,""]},iso8601Week:function(a){a=new Date(a.getTime());a.setDate(a.getDate()+4-(a.getDay()||7));var b=a.getTime();a.setMonth(0);a.setDate(1);return Math.floor(Math.round((b-a)/864E5)/7)+1},parseDate:function(a,b,c){if(a==null||b==null)throw"Invalid arguments";b=typeof b=="object"?
-b.toString():b+"";if(b=="")return null;var e=(c?c.shortYearCutoff:null)||this._defaults.shortYearCutoff;e=typeof e!="string"?e:(new Date).getFullYear()%100+parseInt(e,10);for(var f=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,h=(c?c.dayNames:null)||this._defaults.dayNames,i=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort,g=(c?c.monthNames:null)||this._defaults.monthNames,j=c=-1,l=-1,u=-1,k=false,o=function(p){(p=A+1<a.length&&a.charAt(A+1)==p)&&A++;return p},m=function(p){var D=
-o(p);p=new RegExp("^\\d{1,"+(p=="@"?14:p=="!"?20:p=="y"&&D?4:p=="o"?3:2)+"}");p=b.substring(q).match(p);if(!p)throw"Missing number at position "+q;q+=p[0].length;return parseInt(p[0],10)},n=function(p,D,K){p=d.map(o(p)?K:D,function(w,x){return[[x,w]]}).sort(function(w,x){return-(w[1].length-x[1].length)});var E=-1;d.each(p,function(w,x){w=x[1];if(b.substr(q,w.length).toLowerCase()==w.toLowerCase()){E=x[0];q+=w.length;return false}});if(E!=-1)return E+1;else throw"Unknown name at position "+q;},s=
-function(){if(b.charAt(q)!=a.charAt(A))throw"Unexpected literal at position "+q;q++},q=0,A=0;A<a.length;A++)if(k)if(a.charAt(A)=="'"&&!o("'"))k=false;else s();else switch(a.charAt(A)){case "d":l=m("d");break;case "D":n("D",f,h);break;case "o":u=m("o");break;case "m":j=m("m");break;case "M":j=n("M",i,g);break;case "y":c=m("y");break;case "@":var v=new Date(m("@"));c=v.getFullYear();j=v.getMonth()+1;l=v.getDate();break;case "!":v=new Date((m("!")-this._ticksTo1970)/1E4);c=v.getFullYear();j=v.getMonth()+
-1;l=v.getDate();break;case "'":if(o("'"))s();else k=true;break;default:s()}if(q<b.length)throw"Extra/unparsed characters found in date: "+b.substring(q);if(c==-1)c=(new Date).getFullYear();else if(c<100)c+=(new Date).getFullYear()-(new Date).getFullYear()%100+(c<=e?0:-100);if(u>-1){j=1;l=u;do{e=this._getDaysInMonth(c,j-1);if(l<=e)break;j++;l-=e}while(1)}v=this._daylightSavingAdjust(new Date(c,j-1,l));if(v.getFullYear()!=c||v.getMonth()+1!=j||v.getDate()!=l)throw"Invalid date";return v},ATOM:"yy-mm-dd",
-COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*24*60*60*1E7,formatDate:function(a,b,c){if(!b)return"";var e=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,f=(c?c.dayNames:null)||this._defaults.dayNames,h=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort;c=(c?c.monthNames:
-null)||this._defaults.monthNames;var i=function(o){(o=k+1<a.length&&a.charAt(k+1)==o)&&k++;return o},g=function(o,m,n){m=""+m;if(i(o))for(;m.length<n;)m="0"+m;return m},j=function(o,m,n,s){return i(o)?s[m]:n[m]},l="",u=false;if(b)for(var k=0;k<a.length;k++)if(u)if(a.charAt(k)=="'"&&!i("'"))u=false;else l+=a.charAt(k);else switch(a.charAt(k)){case "d":l+=g("d",b.getDate(),2);break;case "D":l+=j("D",b.getDay(),e,f);break;case "o":l+=g("o",Math.round(((new Date(b.getFullYear(),b.getMonth(),b.getDate())).getTime()-
-(new Date(b.getFullYear(),0,0)).getTime())/864E5),3);break;case "m":l+=g("m",b.getMonth()+1,2);break;case "M":l+=j("M",b.getMonth(),h,c);break;case "y":l+=i("y")?b.getFullYear():(b.getYear()%100<10?"0":"")+b.getYear()%100;break;case "@":l+=b.getTime();break;case "!":l+=b.getTime()*1E4+this._ticksTo1970;break;case "'":if(i("'"))l+="'";else u=true;break;default:l+=a.charAt(k)}return l},_possibleChars:function(a){for(var b="",c=false,e=function(h){(h=f+1<a.length&&a.charAt(f+1)==h)&&f++;return h},f=
-0;f<a.length;f++)if(c)if(a.charAt(f)=="'"&&!e("'"))c=false;else b+=a.charAt(f);else switch(a.charAt(f)){case "d":case "m":case "y":case "@":b+="0123456789";break;case "D":case "M":return null;case "'":if(e("'"))b+="'";else c=true;break;default:b+=a.charAt(f)}return b},_get:function(a,b){return a.settings[b]!==C?a.settings[b]:this._defaults[b]},_setDateFromField:function(a,b){if(a.input.val()!=a.lastVal){var c=this._get(a,"dateFormat"),e=a.lastVal=a.input?a.input.val():null,f,h;f=h=this._getDefaultDate(a);
-var i=this._getFormatConfig(a);try{f=this.parseDate(c,e,i)||h}catch(g){this.log(g);e=b?"":e}a.selectedDay=f.getDate();a.drawMonth=a.selectedMonth=f.getMonth();a.drawYear=a.selectedYear=f.getFullYear();a.currentDay=e?f.getDate():0;a.currentMonth=e?f.getMonth():0;a.currentYear=e?f.getFullYear():0;this._adjustInstDate(a)}},_getDefaultDate:function(a){return this._restrictMinMax(a,this._determineDate(a,this._get(a,"defaultDate"),new Date))},_determineDate:function(a,b,c){var e=function(h){var i=new Date;
-i.setDate(i.getDate()+h);return i},f=function(h){try{return d.datepicker.parseDate(d.datepicker._get(a,"dateFormat"),h,d.datepicker._getFormatConfig(a))}catch(i){}var g=(h.toLowerCase().match(/^c/)?d.datepicker._getDate(a):null)||new Date,j=g.getFullYear(),l=g.getMonth();g=g.getDate();for(var u=/([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,k=u.exec(h);k;){switch(k[2]||"d"){case "d":case "D":g+=parseInt(k[1],10);break;case "w":case "W":g+=parseInt(k[1],10)*7;break;case "m":case "M":l+=parseInt(k[1],10);g=
-Math.min(g,d.datepicker._getDaysInMonth(j,l));break;case "y":case "Y":j+=parseInt(k[1],10);g=Math.min(g,d.datepicker._getDaysInMonth(j,l));break}k=u.exec(h)}return new Date(j,l,g)};if(b=(b=b==null||b===""?c:typeof b=="string"?f(b):typeof b=="number"?isNaN(b)?c:e(b):new Date(b.getTime()))&&b.toString()=="Invalid Date"?c:b){b.setHours(0);b.setMinutes(0);b.setSeconds(0);b.setMilliseconds(0)}return this._daylightSavingAdjust(b)},_daylightSavingAdjust:function(a){if(!a)return null;a.setHours(a.getHours()>
-12?a.getHours()+2:0);return a},_setDate:function(a,b,c){var e=!b,f=a.selectedMonth,h=a.selectedYear;b=this._restrictMinMax(a,this._determineDate(a,b,new Date));a.selectedDay=a.currentDay=b.getDate();a.drawMonth=a.selectedMonth=a.currentMonth=b.getMonth();a.drawYear=a.selectedYear=a.currentYear=b.getFullYear();if((f!=a.selectedMonth||h!=a.selectedYear)&&!c)this._notifyChange(a);this._adjustInstDate(a);if(a.input)a.input.val(e?"":this._formatDate(a))},_getDate:function(a){return!a.currentYear||a.input&&
-a.input.val()==""?null:this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay))},_generateHTML:function(a){var b=new Date;b=this._daylightSavingAdjust(new Date(b.getFullYear(),b.getMonth(),b.getDate()));var c=this._get(a,"isRTL"),e=this._get(a,"showButtonPanel"),f=this._get(a,"hideIfNoPrevNext"),h=this._get(a,"navigationAsDateFormat"),i=this._getNumberOfMonths(a),g=this._get(a,"showCurrentAtPos"),j=this._get(a,"stepMonths"),l=i[0]!=1||i[1]!=1,u=this._daylightSavingAdjust(!a.currentDay?
-new Date(9999,9,9):new Date(a.currentYear,a.currentMonth,a.currentDay)),k=this._getMinMaxDate(a,"min"),o=this._getMinMaxDate(a,"max");g=a.drawMonth-g;var m=a.drawYear;if(g<0){g+=12;m--}if(o){var n=this._daylightSavingAdjust(new Date(o.getFullYear(),o.getMonth()-i[0]*i[1]+1,o.getDate()));for(n=k&&n<k?k:n;this._daylightSavingAdjust(new Date(m,g,1))>n;){g--;if(g<0){g=11;m--}}}a.drawMonth=g;a.drawYear=m;n=this._get(a,"prevText");n=!h?n:this.formatDate(n,this._daylightSavingAdjust(new Date(m,g-j,1)),this._getFormatConfig(a));
-n=this._canAdjustMonth(a,-1,m,g)?'<a class="ui-datepicker-prev ui-corner-all" onclick="DP_jQuery_'+B+".datepicker._adjustDate('#"+a.id+"', -"+j+", 'M');\" title=\""+n+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">'+n+"</span></a>":f?"":'<a class="ui-datepicker-prev ui-corner-all ui-state-disabled" title="'+n+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">'+n+"</span></a>";var s=this._get(a,"nextText");s=!h?s:this.formatDate(s,this._daylightSavingAdjust(new Date(m,
-g+j,1)),this._getFormatConfig(a));f=this._canAdjustMonth(a,+1,m,g)?'<a class="ui-datepicker-next ui-corner-all" onclick="DP_jQuery_'+B+".datepicker._adjustDate('#"+a.id+"', +"+j+", 'M');\" title=\""+s+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'">'+s+"</span></a>":f?"":'<a class="ui-datepicker-next ui-corner-all ui-state-disabled" title="'+s+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'">'+s+"</span></a>";j=this._get(a,"currentText");s=this._get(a,"gotoCurrent")&&
-a.currentDay?u:b;j=!h?j:this.formatDate(j,s,this._getFormatConfig(a));h=!a.inline?'<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all" onclick="DP_jQuery_'+B+'.datepicker._hideDatepicker();">'+this._get(a,"closeText")+"</button>":"";e=e?'<div class="ui-datepicker-buttonpane ui-widget-content">'+(c?h:"")+(this._isInRange(a,s)?'<button type="button" class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" onclick="DP_jQuery_'+
-B+".datepicker._gotoToday('#"+a.id+"');\">"+j+"</button>":"")+(c?"":h)+"</div>":"";h=parseInt(this._get(a,"firstDay"),10);h=isNaN(h)?0:h;j=this._get(a,"showWeek");s=this._get(a,"dayNames");this._get(a,"dayNamesShort");var q=this._get(a,"dayNamesMin"),A=this._get(a,"monthNames"),v=this._get(a,"monthNamesShort"),p=this._get(a,"beforeShowDay"),D=this._get(a,"showOtherMonths"),K=this._get(a,"selectOtherMonths");this._get(a,"calculateWeek");for(var E=this._getDefaultDate(a),w="",x=0;x<i[0];x++){var O=
-"";this.maxRows=4;for(var G=0;G<i[1];G++){var P=this._daylightSavingAdjust(new Date(m,g,a.selectedDay)),t=" ui-corner-all",y="";if(l){y+='<div class="ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" ui-datepicker-group-first";t=" ui-corner-"+(c?"right":"left");break;case i[1]-1:y+=" ui-datepicker-group-last";t=" ui-corner-"+(c?"left":"right");break;default:y+=" ui-datepicker-group-middle";t="";break}y+='">'}y+='<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix'+t+'">'+(/all|left/.test(t)&&
-x==0?c?f:n:"")+(/all|right/.test(t)&&x==0?c?n:f:"")+this._generateMonthYearHeader(a,g,m,k,o,x>0||G>0,A,v)+'</div><table class="ui-datepicker-calendar"><thead><tr>';var z=j?'<th class="ui-datepicker-week-col">'+this._get(a,"weekHeader")+"</th>":"";for(t=0;t<7;t++){var r=(t+h)%7;z+="<th"+((t+h+6)%7>=5?' class="ui-datepicker-week-end"':"")+'><span title="'+s[r]+'">'+q[r]+"</span></th>"}y+=z+"</tr></thead><tbody>";z=this._getDaysInMonth(m,g);if(m==a.selectedYear&&g==a.selectedMonth)a.selectedDay=Math.min(a.selectedDay,
-z);t=(this._getFirstDayOfMonth(m,g)-h+7)%7;z=Math.ceil((t+z)/7);this.maxRows=z=l?this.maxRows>z?this.maxRows:z:z;r=this._daylightSavingAdjust(new Date(m,g,1-t));for(var Q=0;Q<z;Q++){y+="<tr>";var R=!j?"":'<td class="ui-datepicker-week-col">'+this._get(a,"calculateWeek")(r)+"</td>";for(t=0;t<7;t++){var I=p?p.apply(a.input?a.input[0]:null,[r]):[true,""],F=r.getMonth()!=g,L=F&&!K||!I[0]||k&&r<k||o&&r>o;R+='<td class="'+((t+h+6)%7>=5?" ui-datepicker-week-end":"")+(F?" ui-datepicker-other-month":"")+(r.getTime()==
-P.getTime()&&g==a.selectedMonth&&a._keyEvent||E.getTime()==r.getTime()&&E.getTime()==P.getTime()?" "+this._dayOverClass:"")+(L?" "+this._unselectableClass+" ui-state-disabled":"")+(F&&!D?"":" "+I[1]+(r.getTime()==u.getTime()?" "+this._currentClass:"")+(r.getTime()==b.getTime()?" ui-datepicker-today":""))+'"'+((!F||D)&&I[2]?' title="'+I[2]+'"':"")+(L?"":' onclick="DP_jQuery_'+B+".datepicker._selectDay('#"+a.id+"',"+r.getMonth()+","+r.getFullYear()+', this);return false;"')+">"+(F&&!D?"&#xa0;":L?'<span class="ui-state-default">'+
-r.getDate()+"</span>":'<a class="ui-state-default'+(r.getTime()==b.getTime()?" ui-state-highlight":"")+(r.getTime()==u.getTime()?" ui-state-active":"")+(F?" ui-priority-secondary":"")+'" href="#">'+r.getDate()+"</a>")+"</td>";r.setDate(r.getDate()+1);r=this._daylightSavingAdjust(r)}y+=R+"</tr>"}g++;if(g>11){g=0;m++}y+="</tbody></table>"+(l?"</div>"+(i[0]>0&&G==i[1]-1?'<div class="ui-datepicker-row-break"></div>':""):"");O+=y}w+=O}w+=e+(d.browser.msie&&parseInt(d.browser.version,10)<7&&!a.inline?'<iframe src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>':
-"");a._keyEvent=false;return w},_generateMonthYearHeader:function(a,b,c,e,f,h,i,g){var j=this._get(a,"changeMonth"),l=this._get(a,"changeYear"),u=this._get(a,"showMonthAfterYear"),k='<div class="ui-datepicker-title">',o="";if(h||!j)o+='<span class="ui-datepicker-month">'+i[b]+"</span>";else{i=e&&e.getFullYear()==c;var m=f&&f.getFullYear()==c;o+='<select class="ui-datepicker-month" onchange="DP_jQuery_'+B+".datepicker._selectMonthYear('#"+a.id+"', this, 'M');\" >";for(var n=0;n<12;n++)if((!i||n>=e.getMonth())&&
-(!m||n<=f.getMonth()))o+='<option value="'+n+'"'+(n==b?' selected="selected"':"")+">"+g[n]+"</option>";o+="</select>"}u||(k+=o+(h||!(j&&l)?"&#xa0;":""));if(!a.yearshtml){a.yearshtml="";if(h||!l)k+='<span class="ui-datepicker-year">'+c+"</span>";else{g=this._get(a,"yearRange").split(":");var s=(new Date).getFullYear();i=function(q){q=q.match(/c[+-].*/)?c+parseInt(q.substring(1),10):q.match(/[+-].*/)?s+parseInt(q,10):parseInt(q,10);return isNaN(q)?s:q};b=i(g[0]);g=Math.max(b,i(g[1]||""));b=e?Math.max(b,
-e.getFullYear()):b;g=f?Math.min(g,f.getFullYear()):g;for(a.yearshtml+='<select class="ui-datepicker-year" onchange="DP_jQuery_'+B+".datepicker._selectMonthYear('#"+a.id+"', this, 'Y');\" >";b<=g;b++)a.yearshtml+='<option value="'+b+'"'+(b==c?' selected="selected"':"")+">"+b+"</option>";a.yearshtml+="</select>";k+=a.yearshtml;a.yearshtml=null}}k+=this._get(a,"yearSuffix");if(u)k+=(h||!(j&&l)?"&#xa0;":"")+o;k+="</div>";return k},_adjustInstDate:function(a,b,c){var e=a.drawYear+(c=="Y"?b:0),f=a.drawMonth+
-(c=="M"?b:0);b=Math.min(a.selectedDay,this._getDaysInMonth(e,f))+(c=="D"?b:0);e=this._restrictMinMax(a,this._daylightSavingAdjust(new Date(e,f,b)));a.selectedDay=e.getDate();a.drawMonth=a.selectedMonth=e.getMonth();a.drawYear=a.selectedYear=e.getFullYear();if(c=="M"||c=="Y")this._notifyChange(a)},_restrictMinMax:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");b=c&&b<c?c:b;return b=a&&b>a?a:b},_notifyChange:function(a){var b=this._get(a,"onChangeMonthYear");if(b)b.apply(a.input?
-a.input[0]:null,[a.selectedYear,a.selectedMonth+1,a])},_getNumberOfMonths:function(a){a=this._get(a,"numberOfMonths");return a==null?[1,1]:typeof a=="number"?[1,a]:a},_getMinMaxDate:function(a,b){return this._determineDate(a,this._get(a,b+"Date"),null)},_getDaysInMonth:function(a,b){return 32-this._daylightSavingAdjust(new Date(a,b,32)).getDate()},_getFirstDayOfMonth:function(a,b){return(new Date(a,b,1)).getDay()},_canAdjustMonth:function(a,b,c,e){var f=this._getNumberOfMonths(a);c=this._daylightSavingAdjust(new Date(c,
-e+(b<0?b:f[0]*f[1]),1));b<0&&c.setDate(this._getDaysInMonth(c.getFullYear(),c.getMonth()));return this._isInRange(a,c)},_isInRange:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");return(!c||b.getTime()>=c.getTime())&&(!a||b.getTime()<=a.getTime())},_getFormatConfig:function(a){var b=this._get(a,"shortYearCutoff");b=typeof b!="string"?b:(new Date).getFullYear()%100+parseInt(b,10);return{shortYearCutoff:b,dayNamesShort:this._get(a,"dayNamesShort"),dayNames:this._get(a,
-"dayNames"),monthNamesShort:this._get(a,"monthNamesShort"),monthNames:this._get(a,"monthNames")}},_formatDate:function(a,b,c,e){if(!b){a.currentDay=a.selectedDay;a.currentMonth=a.selectedMonth;a.currentYear=a.selectedYear}b=b?typeof b=="object"?b:this._daylightSavingAdjust(new Date(e,c,b)):this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay));return this.formatDate(this._get(a,"dateFormat"),b,this._getFormatConfig(a))}});d.fn.datepicker=function(a){if(!this.length)return this;
-if(!d.datepicker.initialized){d(document).mousedown(d.datepicker._checkExternalClick).find("body").append(d.datepicker.dpDiv);d.datepicker.initialized=true}var b=Array.prototype.slice.call(arguments,1);if(typeof a=="string"&&(a=="isDisabled"||a=="getDate"||a=="widget"))return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));if(a=="option"&&arguments.length==2&&typeof arguments[1]=="string")return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));return this.each(function(){typeof a==
-"string"?d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this].concat(b)):d.datepicker._attachDatepicker(this,a)})};d.datepicker=new M;d.datepicker.initialized=false;d.datepicker.uuid=(new Date).getTime();d.datepicker.version="1.8.16";window["DP_jQuery_"+B]=d})(jQuery);
-;/*
- * jQuery UI Effects 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/
- */
-jQuery.effects||function(f,j){function m(c){var a;if(c&&c.constructor==Array&&c.length==3)return c;if(a=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(c))return[parseInt(a[1],10),parseInt(a[2],10),parseInt(a[3],10)];if(a=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(c))return[parseFloat(a[1])*2.55,parseFloat(a[2])*2.55,parseFloat(a[3])*2.55];if(a=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(c))return[parseInt(a[1],
-16),parseInt(a[2],16),parseInt(a[3],16)];if(a=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(c))return[parseInt(a[1]+a[1],16),parseInt(a[2]+a[2],16),parseInt(a[3]+a[3],16)];if(/rgba\(0, 0, 0, 0\)/.exec(c))return n.transparent;return n[f.trim(c).toLowerCase()]}function s(c,a){var b;do{b=f.curCSS(c,a);if(b!=""&&b!="transparent"||f.nodeName(c,"body"))break;a="backgroundColor"}while(c=c.parentNode);return m(b)}function o(){var c=document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle,
-a={},b,d;if(c&&c.length&&c[0]&&c[c[0]])for(var e=c.length;e--;){b=c[e];if(typeof c[b]=="string"){d=b.replace(/\-(\w)/g,function(g,h){return h.toUpperCase()});a[d]=c[b]}}else for(b in c)if(typeof c[b]==="string")a[b]=c[b];return a}function p(c){var a,b;for(a in c){b=c[a];if(b==null||f.isFunction(b)||a in t||/scrollbar/.test(a)||!/color/i.test(a)&&isNaN(parseFloat(b)))delete c[a]}return c}function u(c,a){var b={_:0},d;for(d in a)if(c[d]!=a[d])b[d]=a[d];return b}function k(c,a,b,d){if(typeof c=="object"){d=
-a;b=null;a=c;c=a.effect}if(f.isFunction(a)){d=a;b=null;a={}}if(typeof a=="number"||f.fx.speeds[a]){d=b;b=a;a={}}if(f.isFunction(b)){d=b;b=null}a=a||{};b=b||a.duration;b=f.fx.off?0:typeof b=="number"?b:b in f.fx.speeds?f.fx.speeds[b]:f.fx.speeds._default;d=d||a.complete;return[c,a,b,d]}function l(c){if(!c||typeof c==="number"||f.fx.speeds[c])return true;if(typeof c==="string"&&!f.effects[c])return true;return false}f.effects={};f.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor",
-"borderTopColor","borderColor","color","outlineColor"],function(c,a){f.fx.step[a]=function(b){if(!b.colorInit){b.start=s(b.elem,a);b.end=m(b.end);b.colorInit=true}b.elem.style[a]="rgb("+Math.max(Math.min(parseInt(b.pos*(b.end[0]-b.start[0])+b.start[0],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[1]-b.start[1])+b.start[1],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[2]-b.start[2])+b.start[2],10),255),0)+")"}});var n={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,
-0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,
-211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]},q=["add","remove","toggle"],t={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};f.effects.animateClass=function(c,a,b,
-d){if(f.isFunction(b)){d=b;b=null}return this.queue(function(){var e=f(this),g=e.attr("style")||" ",h=p(o.call(this)),r,v=e.attr("class");f.each(q,function(w,i){c[i]&&e[i+"Class"](c[i])});r=p(o.call(this));e.attr("class",v);e.animate(u(h,r),{queue:false,duration:a,easing:b,complete:function(){f.each(q,function(w,i){c[i]&&e[i+"Class"](c[i])});if(typeof e.attr("style")=="object"){e.attr("style").cssText="";e.attr("style").cssText=g}else e.attr("style",g);d&&d.apply(this,arguments);f.dequeue(this)}})})};
-f.fn.extend({_addClass:f.fn.addClass,addClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{add:c},a,b,d]):this._addClass(c)},_removeClass:f.fn.removeClass,removeClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{remove:c},a,b,d]):this._removeClass(c)},_toggleClass:f.fn.toggleClass,toggleClass:function(c,a,b,d,e){return typeof a=="boolean"||a===j?b?f.effects.animateClass.apply(this,[a?{add:c}:{remove:c},b,d,e]):this._toggleClass(c,a):f.effects.animateClass.apply(this,
-[{toggle:c},a,b,d])},switchClass:function(c,a,b,d,e){return f.effects.animateClass.apply(this,[{add:a,remove:c},b,d,e])}});f.extend(f.effects,{version:"1.8.16",save:function(c,a){for(var b=0;b<a.length;b++)a[b]!==null&&c.data("ec.storage."+a[b],c[0].style[a[b]])},restore:function(c,a){for(var b=0;b<a.length;b++)a[b]!==null&&c.css(a[b],c.data("ec.storage."+a[b]))},setMode:function(c,a){if(a=="toggle")a=c.is(":hidden")?"show":"hide";return a},getBaseline:function(c,a){var b;switch(c[0]){case "top":b=
-0;break;case "middle":b=0.5;break;case "bottom":b=1;break;default:b=c[0]/a.height}switch(c[1]){case "left":c=0;break;case "center":c=0.5;break;case "right":c=1;break;default:c=c[1]/a.width}return{x:c,y:b}},createWrapper:function(c){if(c.parent().is(".ui-effects-wrapper"))return c.parent();var a={width:c.outerWidth(true),height:c.outerHeight(true),"float":c.css("float")},b=f("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),
-d=document.activeElement;c.wrap(b);if(c[0]===d||f.contains(c[0],d))f(d).focus();b=c.parent();if(c.css("position")=="static"){b.css({position:"relative"});c.css({position:"relative"})}else{f.extend(a,{position:c.css("position"),zIndex:c.css("z-index")});f.each(["top","left","bottom","right"],function(e,g){a[g]=c.css(g);if(isNaN(parseInt(a[g],10)))a[g]="auto"});c.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})}return b.css(a).show()},removeWrapper:function(c){var a,b=document.activeElement;
-if(c.parent().is(".ui-effects-wrapper")){a=c.parent().replaceWith(c);if(c[0]===b||f.contains(c[0],b))f(b).focus();return a}return c},setTransition:function(c,a,b,d){d=d||{};f.each(a,function(e,g){unit=c.cssUnit(g);if(unit[0]>0)d[g]=unit[0]*b+unit[1]});return d}});f.fn.extend({effect:function(c){var a=k.apply(this,arguments),b={options:a[1],duration:a[2],callback:a[3]};a=b.options.mode;var d=f.effects[c];if(f.fx.off||!d)return a?this[a](b.duration,b.callback):this.each(function(){b.callback&&b.callback.call(this)});
-return d.call(this,b)},_show:f.fn.show,show:function(c){if(l(c))return this._show.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="show";return this.effect.apply(this,a)}},_hide:f.fn.hide,hide:function(c){if(l(c))return this._hide.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="hide";return this.effect.apply(this,a)}},__toggle:f.fn.toggle,toggle:function(c){if(l(c)||typeof c==="boolean"||f.isFunction(c))return this.__toggle.apply(this,arguments);else{var a=k.apply(this,
-arguments);a[1].mode="toggle";return this.effect.apply(this,a)}},cssUnit:function(c){var a=this.css(c),b=[];f.each(["em","px","%","pt"],function(d,e){if(a.indexOf(e)>0)b=[parseFloat(a),e]});return b}});f.easing.jswing=f.easing.swing;f.extend(f.easing,{def:"easeOutQuad",swing:function(c,a,b,d,e){return f.easing[f.easing.def](c,a,b,d,e)},easeInQuad:function(c,a,b,d,e){return d*(a/=e)*a+b},easeOutQuad:function(c,a,b,d,e){return-d*(a/=e)*(a-2)+b},easeInOutQuad:function(c,a,b,d,e){if((a/=e/2)<1)return d/
-2*a*a+b;return-d/2*(--a*(a-2)-1)+b},easeInCubic:function(c,a,b,d,e){return d*(a/=e)*a*a+b},easeOutCubic:function(c,a,b,d,e){return d*((a=a/e-1)*a*a+1)+b},easeInOutCubic:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a+b;return d/2*((a-=2)*a*a+2)+b},easeInQuart:function(c,a,b,d,e){return d*(a/=e)*a*a*a+b},easeOutQuart:function(c,a,b,d,e){return-d*((a=a/e-1)*a*a*a-1)+b},easeInOutQuart:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a*a+b;return-d/2*((a-=2)*a*a*a-2)+b},easeInQuint:function(c,a,b,
-d,e){return d*(a/=e)*a*a*a*a+b},easeOutQuint:function(c,a,b,d,e){return d*((a=a/e-1)*a*a*a*a+1)+b},easeInOutQuint:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a*a*a+b;return d/2*((a-=2)*a*a*a*a+2)+b},easeInSine:function(c,a,b,d,e){return-d*Math.cos(a/e*(Math.PI/2))+d+b},easeOutSine:function(c,a,b,d,e){return d*Math.sin(a/e*(Math.PI/2))+b},easeInOutSine:function(c,a,b,d,e){return-d/2*(Math.cos(Math.PI*a/e)-1)+b},easeInExpo:function(c,a,b,d,e){return a==0?b:d*Math.pow(2,10*(a/e-1))+b},easeOutExpo:function(c,
-a,b,d,e){return a==e?b+d:d*(-Math.pow(2,-10*a/e)+1)+b},easeInOutExpo:function(c,a,b,d,e){if(a==0)return b;if(a==e)return b+d;if((a/=e/2)<1)return d/2*Math.pow(2,10*(a-1))+b;return d/2*(-Math.pow(2,-10*--a)+2)+b},easeInCirc:function(c,a,b,d,e){return-d*(Math.sqrt(1-(a/=e)*a)-1)+b},easeOutCirc:function(c,a,b,d,e){return d*Math.sqrt(1-(a=a/e-1)*a)+b},easeInOutCirc:function(c,a,b,d,e){if((a/=e/2)<1)return-d/2*(Math.sqrt(1-a*a)-1)+b;return d/2*(Math.sqrt(1-(a-=2)*a)+1)+b},easeInElastic:function(c,a,b,
-d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/h);return-(h*Math.pow(2,10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g))+b},easeOutElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/h);return h*Math.pow(2,-10*a)*Math.sin((a*e-c)*2*Math.PI/g)+d+b},easeInOutElastic:function(c,a,b,d,e){c=1.70158;var g=
-0,h=d;if(a==0)return b;if((a/=e/2)==2)return b+d;g||(g=e*0.3*1.5);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/h);if(a<1)return-0.5*h*Math.pow(2,10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g)+b;return h*Math.pow(2,-10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g)*0.5+d+b},easeInBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;return d*(a/=e)*a*((g+1)*a-g)+b},easeOutBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;return d*((a=a/e-1)*a*((g+1)*a+g)+1)+b},easeInOutBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;
-if((a/=e/2)<1)return d/2*a*a*(((g*=1.525)+1)*a-g)+b;return d/2*((a-=2)*a*(((g*=1.525)+1)*a+g)+2)+b},easeInBounce:function(c,a,b,d,e){return d-f.easing.easeOutBounce(c,e-a,0,d,e)+b},easeOutBounce:function(c,a,b,d,e){return(a/=e)<1/2.75?d*7.5625*a*a+b:a<2/2.75?d*(7.5625*(a-=1.5/2.75)*a+0.75)+b:a<2.5/2.75?d*(7.5625*(a-=2.25/2.75)*a+0.9375)+b:d*(7.5625*(a-=2.625/2.75)*a+0.984375)+b},easeInOutBounce:function(c,a,b,d,e){if(a<e/2)return f.easing.easeInBounce(c,a*2,0,d,e)*0.5+b;return f.easing.easeOutBounce(c,
-a*2-e,0,d,e)*0.5+d*0.5+b}})}(jQuery);
-;/*
- * jQuery UI Effects Blind 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Blind
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(b){b.effects.blind=function(c){return this.queue(function(){var a=b(this),g=["position","top","bottom","left","right"],f=b.effects.setMode(a,c.options.mode||"hide"),d=c.options.direction||"vertical";b.effects.save(a,g);a.show();var e=b.effects.createWrapper(a).css({overflow:"hidden"}),h=d=="vertical"?"height":"width";d=d=="vertical"?e.height():e.width();f=="show"&&e.css(h,0);var i={};i[h]=f=="show"?d:0;e.animate(i,c.duration,c.options.easing,function(){f=="hide"&&a.hide();b.effects.restore(a,
-g);b.effects.removeWrapper(a);c.callback&&c.callback.apply(a[0],arguments);a.dequeue()})})}})(jQuery);
-;/*
- * jQuery UI Effects Bounce 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Bounce
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(e){e.effects.bounce=function(b){return this.queue(function(){var a=e(this),l=["position","top","bottom","left","right"],h=e.effects.setMode(a,b.options.mode||"effect"),d=b.options.direction||"up",c=b.options.distance||20,m=b.options.times||5,i=b.duration||250;/show|hide/.test(h)&&l.push("opacity");e.effects.save(a,l);a.show();e.effects.createWrapper(a);var f=d=="up"||d=="down"?"top":"left";d=d=="up"||d=="left"?"pos":"neg";c=b.options.distance||(f=="top"?a.outerHeight({margin:true})/3:a.outerWidth({margin:true})/
-3);if(h=="show")a.css("opacity",0).css(f,d=="pos"?-c:c);if(h=="hide")c/=m*2;h!="hide"&&m--;if(h=="show"){var g={opacity:1};g[f]=(d=="pos"?"+=":"-=")+c;a.animate(g,i/2,b.options.easing);c/=2;m--}for(g=0;g<m;g++){var j={},k={};j[f]=(d=="pos"?"-=":"+=")+c;k[f]=(d=="pos"?"+=":"-=")+c;a.animate(j,i/2,b.options.easing).animate(k,i/2,b.options.easing);c=h=="hide"?c*2:c/2}if(h=="hide"){g={opacity:0};g[f]=(d=="pos"?"-=":"+=")+c;a.animate(g,i/2,b.options.easing,function(){a.hide();e.effects.restore(a,l);e.effects.removeWrapper(a);
-b.callback&&b.callback.apply(this,arguments)})}else{j={};k={};j[f]=(d=="pos"?"-=":"+=")+c;k[f]=(d=="pos"?"+=":"-=")+c;a.animate(j,i/2,b.options.easing).animate(k,i/2,b.options.easing,function(){e.effects.restore(a,l);e.effects.removeWrapper(a);b.callback&&b.callback.apply(this,arguments)})}a.queue("fx",function(){a.dequeue()});a.dequeue()})}})(jQuery);
-;/*
- * jQuery UI Effects Clip 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Clip
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(b){b.effects.clip=function(e){return this.queue(function(){var a=b(this),i=["position","top","bottom","left","right","height","width"],f=b.effects.setMode(a,e.options.mode||"hide"),c=e.options.direction||"vertical";b.effects.save(a,i);a.show();var d=b.effects.createWrapper(a).css({overflow:"hidden"});d=a[0].tagName=="IMG"?d:a;var g={size:c=="vertical"?"height":"width",position:c=="vertical"?"top":"left"};c=c=="vertical"?d.height():d.width();if(f=="show"){d.css(g.size,0);d.css(g.position,
-c/2)}var h={};h[g.size]=f=="show"?c:0;h[g.position]=f=="show"?0:c/2;d.animate(h,{queue:false,duration:e.duration,easing:e.options.easing,complete:function(){f=="hide"&&a.hide();b.effects.restore(a,i);b.effects.removeWrapper(a);e.callback&&e.callback.apply(a[0],arguments);a.dequeue()}})})}})(jQuery);
-;/*
- * jQuery UI Effects Drop 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Drop
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(c){c.effects.drop=function(d){return this.queue(function(){var a=c(this),h=["position","top","bottom","left","right","opacity"],e=c.effects.setMode(a,d.options.mode||"hide"),b=d.options.direction||"left";c.effects.save(a,h);a.show();c.effects.createWrapper(a);var f=b=="up"||b=="down"?"top":"left";b=b=="up"||b=="left"?"pos":"neg";var g=d.options.distance||(f=="top"?a.outerHeight({margin:true})/2:a.outerWidth({margin:true})/2);if(e=="show")a.css("opacity",0).css(f,b=="pos"?-g:g);var i={opacity:e==
-"show"?1:0};i[f]=(e=="show"?b=="pos"?"+=":"-=":b=="pos"?"-=":"+=")+g;a.animate(i,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){e=="hide"&&a.hide();c.effects.restore(a,h);c.effects.removeWrapper(a);d.callback&&d.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
-;/*
- * jQuery UI Effects Explode 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Explode
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(j){j.effects.explode=function(a){return this.queue(function(){var c=a.options.pieces?Math.round(Math.sqrt(a.options.pieces)):3,d=a.options.pieces?Math.round(Math.sqrt(a.options.pieces)):3;a.options.mode=a.options.mode=="toggle"?j(this).is(":visible")?"hide":"show":a.options.mode;var b=j(this).show().css("visibility","hidden"),g=b.offset();g.top-=parseInt(b.css("marginTop"),10)||0;g.left-=parseInt(b.css("marginLeft"),10)||0;for(var h=b.outerWidth(true),i=b.outerHeight(true),e=0;e<c;e++)for(var f=
-0;f<d;f++)b.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-f*(h/d),top:-e*(i/c)}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:h/d,height:i/c,left:g.left+f*(h/d)+(a.options.mode=="show"?(f-Math.floor(d/2))*(h/d):0),top:g.top+e*(i/c)+(a.options.mode=="show"?(e-Math.floor(c/2))*(i/c):0),opacity:a.options.mode=="show"?0:1}).animate({left:g.left+f*(h/d)+(a.options.mode=="show"?0:(f-Math.floor(d/2))*(h/d)),top:g.top+
-e*(i/c)+(a.options.mode=="show"?0:(e-Math.floor(c/2))*(i/c)),opacity:a.options.mode=="show"?1:0},a.duration||500);setTimeout(function(){a.options.mode=="show"?b.css({visibility:"visible"}):b.css({visibility:"visible"}).hide();a.callback&&a.callback.apply(b[0]);b.dequeue();j("div.ui-effects-explode").remove()},a.duration||500)})}})(jQuery);
-;/*
- * jQuery UI Effects Fade 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Fade
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(b){b.effects.fade=function(a){return this.queue(function(){var c=b(this),d=b.effects.setMode(c,a.options.mode||"hide");c.animate({opacity:d},{queue:false,duration:a.duration,easing:a.options.easing,complete:function(){a.callback&&a.callback.apply(this,arguments);c.dequeue()}})})}})(jQuery);
-;/*
- * jQuery UI Effects Fold 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Fold
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(c){c.effects.fold=function(a){return this.queue(function(){var b=c(this),j=["position","top","bottom","left","right"],d=c.effects.setMode(b,a.options.mode||"hide"),g=a.options.size||15,h=!!a.options.horizFirst,k=a.duration?a.duration/2:c.fx.speeds._default/2;c.effects.save(b,j);b.show();var e=c.effects.createWrapper(b).css({overflow:"hidden"}),f=d=="show"!=h,l=f?["width","height"]:["height","width"];f=f?[e.width(),e.height()]:[e.height(),e.width()];var i=/([0-9]+)%/.exec(g);if(i)g=parseInt(i[1],
-10)/100*f[d=="hide"?0:1];if(d=="show")e.css(h?{height:0,width:g}:{height:g,width:0});h={};i={};h[l[0]]=d=="show"?f[0]:g;i[l[1]]=d=="show"?f[1]:0;e.animate(h,k,a.options.easing).animate(i,k,a.options.easing,function(){d=="hide"&&b.hide();c.effects.restore(b,j);c.effects.removeWrapper(b);a.callback&&a.callback.apply(b[0],arguments);b.dequeue()})})}})(jQuery);
-;/*
- * jQuery UI Effects Highlight 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Highlight
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(b){b.effects.highlight=function(c){return this.queue(function(){var a=b(this),e=["backgroundImage","backgroundColor","opacity"],d=b.effects.setMode(a,c.options.mode||"show"),f={backgroundColor:a.css("backgroundColor")};if(d=="hide")f.opacity=0;b.effects.save(a,e);a.show().css({backgroundImage:"none",backgroundColor:c.options.color||"#ffff99"}).animate(f,{queue:false,duration:c.duration,easing:c.options.easing,complete:function(){d=="hide"&&a.hide();b.effects.restore(a,e);d=="show"&&!b.support.opacity&&
-this.style.removeAttribute("filter");c.callback&&c.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
-;/*
- * jQuery UI Effects Pulsate 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Pulsate
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(d){d.effects.pulsate=function(a){return this.queue(function(){var b=d(this),c=d.effects.setMode(b,a.options.mode||"show");times=(a.options.times||5)*2-1;duration=a.duration?a.duration/2:d.fx.speeds._default/2;isVisible=b.is(":visible");animateTo=0;if(!isVisible){b.css("opacity",0).show();animateTo=1}if(c=="hide"&&isVisible||c=="show"&&!isVisible)times--;for(c=0;c<times;c++){b.animate({opacity:animateTo},duration,a.options.easing);animateTo=(animateTo+1)%2}b.animate({opacity:animateTo},duration,
-a.options.easing,function(){animateTo==0&&b.hide();a.callback&&a.callback.apply(this,arguments)});b.queue("fx",function(){b.dequeue()}).dequeue()})}})(jQuery);
-;/*
- * jQuery UI Effects Scale 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Scale
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(c){c.effects.puff=function(b){return this.queue(function(){var a=c(this),e=c.effects.setMode(a,b.options.mode||"hide"),g=parseInt(b.options.percent,10)||150,h=g/100,i={height:a.height(),width:a.width()};c.extend(b.options,{fade:true,mode:e,percent:e=="hide"?g:100,from:e=="hide"?i:{height:i.height*h,width:i.width*h}});a.effect("scale",b.options,b.duration,b.callback);a.dequeue()})};c.effects.scale=function(b){return this.queue(function(){var a=c(this),e=c.extend(true,{},b.options),g=c.effects.setMode(a,
-b.options.mode||"effect"),h=parseInt(b.options.percent,10)||(parseInt(b.options.percent,10)==0?0:g=="hide"?0:100),i=b.options.direction||"both",f=b.options.origin;if(g!="effect"){e.origin=f||["middle","center"];e.restore=true}f={height:a.height(),width:a.width()};a.from=b.options.from||(g=="show"?{height:0,width:0}:f);h={y:i!="horizontal"?h/100:1,x:i!="vertical"?h/100:1};a.to={height:f.height*h.y,width:f.width*h.x};if(b.options.fade){if(g=="show"){a.from.opacity=0;a.to.opacity=1}if(g=="hide"){a.from.opacity=
-1;a.to.opacity=0}}e.from=a.from;e.to=a.to;e.mode=g;a.effect("size",e,b.duration,b.callback);a.dequeue()})};c.effects.size=function(b){return this.queue(function(){var a=c(this),e=["position","top","bottom","left","right","width","height","overflow","opacity"],g=["position","top","bottom","left","right","overflow","opacity"],h=["width","height","overflow"],i=["fontSize"],f=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],k=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],
-p=c.effects.setMode(a,b.options.mode||"effect"),n=b.options.restore||false,m=b.options.scale||"both",l=b.options.origin,j={height:a.height(),width:a.width()};a.from=b.options.from||j;a.to=b.options.to||j;if(l){l=c.effects.getBaseline(l,j);a.from.top=(j.height-a.from.height)*l.y;a.from.left=(j.width-a.from.width)*l.x;a.to.top=(j.height-a.to.height)*l.y;a.to.left=(j.width-a.to.width)*l.x}var d={from:{y:a.from.height/j.height,x:a.from.width/j.width},to:{y:a.to.height/j.height,x:a.to.width/j.width}};
-if(m=="box"||m=="both"){if(d.from.y!=d.to.y){e=e.concat(f);a.from=c.effects.setTransition(a,f,d.from.y,a.from);a.to=c.effects.setTransition(a,f,d.to.y,a.to)}if(d.from.x!=d.to.x){e=e.concat(k);a.from=c.effects.setTransition(a,k,d.from.x,a.from);a.to=c.effects.setTransition(a,k,d.to.x,a.to)}}if(m=="content"||m=="both")if(d.from.y!=d.to.y){e=e.concat(i);a.from=c.effects.setTransition(a,i,d.from.y,a.from);a.to=c.effects.setTransition(a,i,d.to.y,a.to)}c.effects.save(a,n?e:g);a.show();c.effects.createWrapper(a);
-a.css("overflow","hidden").css(a.from);if(m=="content"||m=="both"){f=f.concat(["marginTop","marginBottom"]).concat(i);k=k.concat(["marginLeft","marginRight"]);h=e.concat(f).concat(k);a.find("*[width]").each(function(){child=c(this);n&&c.effects.save(child,h);var o={height:child.height(),width:child.width()};child.from={height:o.height*d.from.y,width:o.width*d.from.x};child.to={height:o.height*d.to.y,width:o.width*d.to.x};if(d.from.y!=d.to.y){child.from=c.effects.setTransition(child,f,d.from.y,child.from);
-child.to=c.effects.setTransition(child,f,d.to.y,child.to)}if(d.from.x!=d.to.x){child.from=c.effects.setTransition(child,k,d.from.x,child.from);child.to=c.effects.setTransition(child,k,d.to.x,child.to)}child.css(child.from);child.animate(child.to,b.duration,b.options.easing,function(){n&&c.effects.restore(child,h)})})}a.animate(a.to,{queue:false,duration:b.duration,easing:b.options.easing,complete:function(){a.to.opacity===0&&a.css("opacity",a.from.opacity);p=="hide"&&a.hide();c.effects.restore(a,
-n?e:g);c.effects.removeWrapper(a);b.callback&&b.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
-;/*
- * jQuery UI Effects Shake 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Shake
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(d){d.effects.shake=function(a){return this.queue(function(){var b=d(this),j=["position","top","bottom","left","right"];d.effects.setMode(b,a.options.mode||"effect");var c=a.options.direction||"left",e=a.options.distance||20,l=a.options.times||3,f=a.duration||a.options.duration||140;d.effects.save(b,j);b.show();d.effects.createWrapper(b);var g=c=="up"||c=="down"?"top":"left",h=c=="up"||c=="left"?"pos":"neg";c={};var i={},k={};c[g]=(h=="pos"?"-=":"+=")+e;i[g]=(h=="pos"?"+=":"-=")+e*2;k[g]=
-(h=="pos"?"-=":"+=")+e*2;b.animate(c,f,a.options.easing);for(e=1;e<l;e++)b.animate(i,f,a.options.easing).animate(k,f,a.options.easing);b.animate(i,f,a.options.easing).animate(c,f/2,a.options.easing,function(){d.effects.restore(b,j);d.effects.removeWrapper(b);a.callback&&a.callback.apply(this,arguments)});b.queue("fx",function(){b.dequeue()});b.dequeue()})}})(jQuery);
-;/*
- * jQuery UI Effects Slide 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Slide
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(c){c.effects.slide=function(d){return this.queue(function(){var a=c(this),h=["position","top","bottom","left","right"],f=c.effects.setMode(a,d.options.mode||"show"),b=d.options.direction||"left";c.effects.save(a,h);a.show();c.effects.createWrapper(a).css({overflow:"hidden"});var g=b=="up"||b=="down"?"top":"left";b=b=="up"||b=="left"?"pos":"neg";var e=d.options.distance||(g=="top"?a.outerHeight({margin:true}):a.outerWidth({margin:true}));if(f=="show")a.css(g,b=="pos"?isNaN(e)?"-"+e:-e:e);
-var i={};i[g]=(f=="show"?b=="pos"?"+=":"-=":b=="pos"?"-=":"+=")+e;a.animate(i,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){f=="hide"&&a.hide();c.effects.restore(a,h);c.effects.removeWrapper(a);d.callback&&d.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
-;/*
- * jQuery UI Effects Transfer 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Transfer
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(e){e.effects.transfer=function(a){return this.queue(function(){var b=e(this),c=e(a.options.to),d=c.offset();c={top:d.top,left:d.left,height:c.innerHeight(),width:c.innerWidth()};d=b.offset();var f=e('<div class="ui-effects-transfer"></div>').appendTo(document.body).addClass(a.options.className).css({top:d.top,left:d.left,height:b.innerHeight(),width:b.innerWidth(),position:"absolute"}).animate(c,a.duration,a.options.easing,function(){f.remove();a.callback&&a.callback.apply(b[0],arguments);
-b.dequeue()})})}})(jQuery);
-;
\ No newline at end of file
+this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(d.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():e?0:c.scrollTop()),left:f-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(d.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():e?0:c.scrollLeft())}},_rearrange:function(a,b,c,e){c?c[0].appendChild(this.placeholder[0]):b.item[0].parentNode.insertBefore(this.placeholder[0],this.direction=="down"?b.item[0]:b.item[0].nextSibling);this.counter=this.counter?++this.counter:1;var f=this,g=this.counter;window.setTimeout(function(){g==f.counter&&f.refreshPositions(!e)},0)},_clear:function(a,b){this.reverting=false;var c=[];!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem);this._noFinalSort=null;if(this.helper[0]==this.currentItem[0]){for(var e in this._storedCSS)if(this._storedCSS[e]=="auto"||this._storedCSS[e]=="static")this._storedCSS[e]="";this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();this.fromOutside&&!b&&c.push(function(f){this._trigger("receive",f,this._uiHash(this.fromOutside))});if((this.fromOutside||this.domPosition.prev!=this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!=this.currentItem.parent()[0])&&!b)c.push(function(f){this._trigger("update",f,this._uiHash())});if(!d.ui.contains(this.element[0],this.currentItem[0])){b||c.push(function(f){this._trigger("remove",f,this._uiHash())});for(e=this.containers.length-1;e>=0;e--)if(d.ui.contains(this.containers[e].element[0],this.currentItem[0])&&!b){c.push(function(f){return function(g){f._trigger("receive",g,this._uiHash(this))}}.call(this,this.containers[e]));c.push(function(f){return function(g){f._trigger("update",g,this._uiHash(this))}}.call(this,this.containers[e]))}}for(e=this.containers.length-1;e>=0;e--){b||c.push(function(f){return function(g){f._trigger("deactivate",g,this._uiHash(this))}}.call(this,this.containers[e]));if(this.containers[e].containerCache.over){c.push(function(f){return function(g){f._trigger("out",g,this._uiHash(this))}}.call(this,this.containers[e]));this.containers[e].containerCache.over=0}}this._storedCursor&&d("body").css("cursor",this._storedCursor);this._storedOpacity&&this.helper.css("opacity",this._storedOpacity);if(this._storedZIndex)this.helper.css("zIndex",this._storedZIndex=="auto"?"":this._storedZIndex);this.dragging=false;if(this.cancelHelperRemoval){if(!b){this._trigger("beforeStop",a,this._uiHash());for(e=0;e<c.length;e++)c[e].call(this,a);this._trigger("stop",a,this._uiHash())}return false}b||this._trigger("beforeStop",a,this._uiHash());this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.helper[0]!=this.currentItem[0]&&this.helper.remove();this.helper=null;if(!b){for(e=0;e<c.length;e++)c[e].call(this,a);this._trigger("stop",a,this._uiHash())}this.fromOutside=false;return true},_trigger:function(){d.Widget.prototype._trigger.apply(this,arguments)===false&&this.cancel()},_uiHash:function(a){var b=a||this;return{helper:b.helper,placeholder:b.placeholder||d([]),position:b.position,originalPosition:b.originalPosition,offset:b.positionAbs,item:b.currentItem,sender:a?a.element:null}}});d.extend(d.ui.sortable,{version:"1.8.16"})})(jQuery);;(function(d){d.widget("ui.slider",d.ui.mouse,{widgetEventPrefix:"slide",options:{animate:false,distance:0,max:100,min:0,orientation:"horizontal",range:false,step:1,value:0,values:null},_create:function(){var a=this,b=this.options,c=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),f=b.values&&b.values.length||1,e=[];this._mouseSliding=this._keySliding=false;this._animateOff=true;this._handleIndex=null;this._detectOrientation();this._mouseInit();this.element.addClass("ui-slider ui-slider-"+
+this.orientation+" ui-widget ui-widget-content ui-corner-all"+(b.disabled?" ui-slider-disabled ui-disabled":""));this.range=d([]);if(b.range){if(b.range===true){if(!b.values)b.values=[this._valueMin(),this._valueMin()];if(b.values.length&&b.values.length!==2)b.values=[b.values[0],b.values[0]]}this.range=d("<div></div>").appendTo(this.element).addClass("ui-slider-range ui-widget-header"+(b.range==="min"||b.range==="max"?" ui-slider-range-"+b.range:""))}for(var j=c.length;j<f;j+=1)e.push("<a class='ui-slider-handle ui-state-default ui-corner-all' href='#'></a>");this.handles=c.add(d(e.join("")).appendTo(a.element));this.handle=this.handles.eq(0);this.handles.add(this.range).filter("a").click(function(g){g.preventDefault()}).hover(function(){b.disabled||d(this).addClass("ui-state-hover")},function(){d(this).removeClass("ui-state-hover")}).focus(function(){if(b.disabled)d(this).blur();else{d(".ui-slider .ui-state-focus").removeClass("ui-state-focus");d(this).addClass("ui-state-focus")}}).blur(function(){d(this).removeClass("ui-state-focus")});this.handles.each(function(g){d(this).data("index.ui-slider-handle",g)});this.handles.keydown(function(g){var k=true,l=d(this).data("index.ui-slider-handle"),i,h,m;if(!a.options.disabled){switch(g.keyCode){case d.ui.keyCode.HOME:case d.ui.keyCode.END:case d.ui.keyCode.PAGE_UP:case d.ui.keyCode.PAGE_DOWN:case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:k=false;if(!a._keySliding){a._keySliding=true;d(this).addClass("ui-state-active");i=a._start(g,l);if(i===false)return}break}m=a.options.step;i=a.options.values&&a.options.values.length?(h=a.values(l)):(h=a.value());switch(g.keyCode){case d.ui.keyCode.HOME:h=a._valueMin();break;case d.ui.keyCode.END:h=a._valueMax();break;case d.ui.keyCode.PAGE_UP:h=a._trimAlignValue(i+(a._valueMax()-a._valueMin())/5);break;case d.ui.keyCode.PAGE_DOWN:h=a._trimAlignValue(i-(a._valueMax()-a._valueMin())/5);break;case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:if(i===a._valueMax())return;h=a._trimAlignValue(i+m);break;case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:if(i===a._valueMin())return;h=a._trimAlignValue(i-
+m);break}a._slide(g,l,h);return k}}).keyup(function(g){var k=d(this).data("index.ui-slider-handle");if(a._keySliding){a._keySliding=false;a._stop(g,k);a._change(g,k);d(this).removeClass("ui-state-active")}});this._refreshValue();this._animateOff=false},destroy:function(){this.handles.remove();this.range.remove();this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-slider-disabled ui-widget ui-widget-content ui-corner-all").removeData("slider").unbind(".slider");this._mouseDestroy();return this},_mouseCapture:function(a){var b=this.options,c,f,e,j,g;if(b.disabled)return false;this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()};this.elementOffset=this.element.offset();c=this._normValueFromMouse({x:a.pageX,y:a.pageY});f=this._valueMax()-this._valueMin()+1;j=this;this.handles.each(function(k){var l=Math.abs(c-j.values(k));if(f>l){f=l;e=d(this);g=k}});if(b.range===true&&this.values(1)===b.min){g+=1;e=d(this.handles[g])}if(this._start(a,g)===false)return false;this._mouseSliding=true;j._handleIndex=g;e.addClass("ui-state-active").focus();b=e.offset();this._clickOffset=!d(a.target).parents().andSelf().is(".ui-slider-handle")?{left:0,top:0}:{left:a.pageX-b.left-e.width()/2,top:a.pageY-b.top-e.height()/2-(parseInt(e.css("borderTopWidth"),10)||0)-(parseInt(e.css("borderBottomWidth"),10)||0)+(parseInt(e.css("marginTop"),10)||0)};this.handles.hasClass("ui-state-hover")||this._slide(a,g,c);return this._animateOff=true},_mouseStart:function(){return true},_mouseDrag:function(a){var b=this._normValueFromMouse({x:a.pageX,y:a.pageY});this._slide(a,this._handleIndex,b);return false},_mouseStop:function(a){this.handles.removeClass("ui-state-active");this._mouseSliding=false;this._stop(a,this._handleIndex);this._change(a,this._handleIndex);this._clickOffset=this._handleIndex=null;return this._animateOff=false},_detectOrientation:function(){this.orientation=this.options.orientation==="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(a){var b;if(this.orientation==="horizontal"){b=this.elementSize.width;a=a.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)}else{b=this.elementSize.height;a=a.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)}b=a/b;if(b>1)b=1;if(b<0)b=0;if(this.orientation==="vertical")b=1-b;a=this._valueMax()-this._valueMin();return this._trimAlignValue(this._valueMin()+b*a)},_start:function(a,b){var c={handle:this.handles[b],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(b);c.values=this.values()}return this._trigger("start",a,c)},_slide:function(a,b,c){var f;if(this.options.values&&this.options.values.length){f=this.values(b?0:1);if(this.options.values.length===2&&this.options.range===true&&(b===0&&c>f||b===1&&c<f))c=f;if(c!==this.values(b)){f=this.values();f[b]=c;a=this._trigger("slide",a,{handle:this.handles[b],value:c,values:f});this.values(b?0:1);a!==false&&this.values(b,c,true)}}else if(c!==this.value()){a=this._trigger("slide",a,{handle:this.handles[b],value:c});a!==false&&this.value(c)}},_stop:function(a,b){var c={handle:this.handles[b],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(b);c.values=this.values()}this._trigger("stop",a,c)},_change:function(a,b){if(!this._keySliding&&!this._mouseSliding){var c={handle:this.handles[b],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(b);c.values=this.values()}this._trigger("change",a,c)}},value:function(a){if(arguments.length){this.options.value=this._trimAlignValue(a);this._refreshValue();this._change(null,0)}else return this._value()},values:function(a,b){var c,f,e;if(arguments.length>1){this.options.values[a]=this._trimAlignValue(b);this._refreshValue();this._change(null,a)}else if(arguments.length)if(d.isArray(arguments[0])){c=this.options.values;f=arguments[0];for(e=0;e<c.length;e+=1){c[e]=this._trimAlignValue(f[e]);this._change(null,e)}this._refreshValue()}else return this.options.values&&this.options.values.length?this._values(a):this.value();else return this._values()},_setOption:function(a,b){var c,f=0;if(d.isArray(this.options.values))f=this.options.values.length;d.Widget.prototype._setOption.apply(this,arguments);switch(a){case"disabled":if(b){this.handles.filter(".ui-state-focus").blur();this.handles.removeClass("ui-state-hover");this.handles.propAttr("disabled",true);this.element.addClass("ui-disabled")}else{this.handles.propAttr("disabled",false);this.element.removeClass("ui-disabled")}break;case"orientation":this._detectOrientation();this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation);this._refreshValue();break;case"value":this._animateOff=true;this._refreshValue();this._change(null,0);this._animateOff=false;break;case"values":this._animateOff=true;this._refreshValue();for(c=0;c<f;c+=1)this._change(null,c);this._animateOff=false;break}},_value:function(){var a=this.options.value;return a=this._trimAlignValue(a)},_values:function(a){var b,c;if(arguments.length){b=this.options.values[a];return b=this._trimAlignValue(b)}else{b=this.options.values.slice();for(c=0;c<b.length;c+=1)b[c]=this._trimAlignValue(b[c]);return b}},_trimAlignValue:function(a){if(a<=this._valueMin())return this._valueMin();if(a>=this._valueMax())return this._valueMax();var b=this.options.step>0?this.options.step:1,c=(a-this._valueMin())%b;a=a-c;if(Math.abs(c)*2>=b)a+=c>0?b:-b;return parseFloat(a.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max},_refreshValue:function(){var a=this.options.range,b=this.options,c=this,f=!this._animateOff?b.animate:false,e,j={},g,k,l,i;if(this.options.values&&this.options.values.length)this.handles.each(function(h){e=(c.values(h)-c._valueMin())/(c._valueMax()-c._valueMin())*100;j[c.orientation==="horizontal"?"left":"bottom"]=e+"%";d(this).stop(1,1)[f?"animate":"css"](j,b.animate);if(c.options.range===true)if(c.orientation==="horizontal"){if(h===0)c.range.stop(1,1)[f?"animate":"css"]({left:e+"%"},b.animate);if(h===1)c.range[f?"animate":"css"]({width:e-
+g+"%"},{queue:false,duration:b.animate})}else{if(h===0)c.range.stop(1,1)[f?"animate":"css"]({bottom:e+"%"},b.animate);if(h===1)c.range[f?"animate":"css"]({height:e-g+"%"},{queue:false,duration:b.animate})}g=e});else{k=this.value();l=this._valueMin();i=this._valueMax();e=i!==l?(k-l)/(i-l)*100:0;j[c.orientation==="horizontal"?"left":"bottom"]=e+"%";this.handle.stop(1,1)[f?"animate":"css"](j,b.animate);if(a==="min"&&this.orientation==="horizontal")this.range.stop(1,1)[f?"animate":"css"]({width:e+"%"},b.animate);if(a==="max"&&this.orientation==="horizontal")this.range[f?"animate":"css"]({width:100-e+"%"},{queue:false,duration:b.animate});if(a==="min"&&this.orientation==="vertical")this.range.stop(1,1)[f?"animate":"css"]({height:e+"%"},b.animate);if(a==="max"&&this.orientation==="vertical")this.range[f?"animate":"css"]({height:100-e+"%"},{queue:false,duration:b.animate})}}});d.extend(d.ui.slider,{version:"1.8.16"})})(jQuery);;(function(d,C){function M(){this.debug=false;this._curInst=null;this._keyEvent=false;this._disabledInputs=[];this._inDialog=this._datepickerShowing=false;this._mainDivId="ui-datepicker-div";this._inlineClass="ui-datepicker-inline";this._appendClass="ui-datepicker-append";this._triggerClass="ui-datepicker-trigger";this._dialogClass="ui-datepicker-dialog";this._disableClass="ui-datepicker-disabled";this._unselectableClass="ui-datepicker-unselectable";this._currentClass="ui-datepicker-current-day";this._dayOverClass="ui-datepicker-days-cell-over";this.regional=[];this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:false,showMonthAfterYear:false,yearSuffix:""};this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:false,hideIfNoPrevNext:false,navigationAsDateFormat:false,gotoCurrent:false,changeMonth:false,changeYear:false,yearRange:"c-10:c+10",showOtherMonths:false,selectOtherMonths:false,showWeek:false,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:true,showButtonPanel:false,autoSize:false,disabled:false};d.extend(this._defaults,this.regional[""]);this.dpDiv=N(d('<div id="'+this._mainDivId+'" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))}function N(a){return a.bind("mouseout",function(b){b=d(b.target).closest("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a");b.length&&b.removeClass("ui-state-hover ui-datepicker-prev-hover ui-datepicker-next-hover")}).bind("mouseover",function(b){b=d(b.target).closest("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a");if(!(d.datepicker._isDisabledDatepicker(J.inline?a.parent()[0]:J.input[0])||!b.length)){b.parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");b.addClass("ui-state-hover");b.hasClass("ui-datepicker-prev")&&b.addClass("ui-datepicker-prev-hover");b.hasClass("ui-datepicker-next")&&b.addClass("ui-datepicker-next-hover")}})}function H(a,b){d.extend(a,b);for(var c in b)if(b[c]==null||b[c]==C)a[c]=b[c];return a}d.extend(d.ui,{datepicker:{version:"1.8.16"}});var B=(new Date).getTime(),J;d.extend(M.prototype,{markerClassName:"hasDatepicker",maxRows:4,log:function(){this.debug&&console.log.apply("",arguments)},_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(a){H(this._defaults,a||{});return this},_attachDatepicker:function(a,b){var c=null;for(var e in this._defaults){var f=a.getAttribute("date:"+e);if(f){c=c||{};try{c[e]=eval(f)}catch(h){c[e]=f}}}e=a.nodeName.toLowerCase();f=e=="div"||e=="span";if(!a.id){this.uuid+=1;a.id="dp"+this.uuid}var i=this._newInst(d(a),f);i.settings=d.extend({},b||{},c||{});if(e=="input")this._connectDatepicker(a,i);else f&&this._inlineDatepicker(a,i)},_newInst:function(a,b){return{id:a[0].id.replace(/([^A-Za-z0-9_-])/g,"\\\\$1"),input:a,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:b,dpDiv:!b?this.dpDiv:N(d('<div class="'+this._inlineClass+' ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))}},_connectDatepicker:function(a,b){var c=d(a);b.append=d([]);b.trigger=d([]);if(!c.hasClass(this.markerClassName)){this._attachments(c,b);c.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp).bind("setData.datepicker",function(e,f,h){b.settings[f]=h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});this._autoSize(b);d.data(a,"datepicker",b);b.settings.disabled&&this._disableDatepicker(a)}},_attachments:function(a,b){var c=this._get(b,"appendText"),e=this._get(b,"isRTL");b.append&&b.append.remove();if(c){b.append=d('<span class="'+this._appendClass+'">'+c+"</span>");a[e?"before":"after"](b.append)}a.unbind("focus",this._showDatepicker);b.trigger&&b.trigger.remove();c=this._get(b,"showOn");if(c=="focus"||c=="both")a.focus(this._showDatepicker);if(c=="button"||c=="both"){c=this._get(b,"buttonText");var f=this._get(b,"buttonImage");b.trigger=d(this._get(b,"buttonImageOnly")?d("<img/>").addClass(this._triggerClass).attr({src:f,alt:c,title:c}):d('<button type="button"></button>').addClass(this._triggerClass).html(f==""?c:d("<img/>").attr({src:f,alt:c,title:c})));a[e?"before":"after"](b.trigger);b.trigger.click(function(){d.datepicker._datepickerShowing&&d.datepicker._lastInput==a[0]?d.datepicker._hideDatepicker():d.datepicker._showDatepicker(a[0]);return false})}},_autoSize:function(a){if(this._get(a,"autoSize")&&!a.inline){var b=new Date(2009,11,20),c=this._get(a,"dateFormat");if(c.match(/[DM]/)){var e=function(f){for(var h=0,i=0,g=0;g<f.length;g++)if(f[g].length>h){h=f[g].length;i=g}return i};b.setMonth(e(this._get(a,c.match(/MM/)?"monthNames":"monthNamesShort")));b.setDate(e(this._get(a,c.match(/DD/)?"dayNames":"dayNamesShort"))+20-b.getDay())}a.input.attr("size",this._formatDate(a,b).length)}},_inlineDatepicker:function(a,b){var c=d(a);if(!c.hasClass(this.markerClassName)){c.addClass(this.markerClassName).append(b.dpDiv).bind("setData.datepicker",function(e,f,h){b.settings[f]=h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});d.data(a,"datepicker",b);this._setDate(b,this._getDefaultDate(b),true);this._updateDatepicker(b);this._updateAlternate(b);b.settings.disabled&&this._disableDatepicker(a);b.dpDiv.css("display","block")}},_dialogDatepicker:function(a,b,c,e,f){a=this._dialogInst;if(!a){this.uuid+=1;this._dialogInput=d('<input type="text" id="'+("dp"+this.uuid)+'" style="position: absolute; top: -100px; width: 0px; z-index: -10;"/>');this._dialogInput.keydown(this._doKeyDown);d("body").append(this._dialogInput);a=this._dialogInst=this._newInst(this._dialogInput,false);a.settings={};d.data(this._dialogInput[0],"datepicker",a)}H(a.settings,e||{});b=b&&b.constructor==Date?this._formatDate(a,b):b;this._dialogInput.val(b);this._pos=f?f.length?f:[f.pageX,f.pageY]:null;if(!this._pos)this._pos=[document.documentElement.clientWidth/2-100+(document.documentElement.scrollLeft||document.body.scrollLeft),document.documentElement.clientHeight/2-150+(document.documentElement.scrollTop||document.body.scrollTop)];this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px");a.settings.onSelect=c;this._inDialog=true;this.dpDiv.addClass(this._dialogClass);this._showDatepicker(this._dialogInput[0]);d.blockUI&&d.blockUI(this.dpDiv);d.data(this._dialogInput[0],"datepicker",a);return this},_destroyDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();d.removeData(a,"datepicker");if(e=="input"){c.append.remove();c.trigger.remove();b.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)}else if(e=="div"||e=="span")b.removeClass(this.markerClassName).empty()}},_enableDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();if(e=="input"){a.disabled=false;c.trigger.filter("button").each(function(){this.disabled=false}).end().filter("img").css({opacity:"1.0",cursor:""})}else if(e=="div"||e=="span"){b=b.children("."+this._inlineClass);b.children().removeClass("ui-state-disabled");b.find("select.ui-datepicker-month, select.ui-datepicker-year").removeAttr("disabled")}this._disabledInputs=d.map(this._disabledInputs,function(f){return f==a?null:f})}},_disableDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();if(e=="input"){a.disabled=true;c.trigger.filter("button").each(function(){this.disabled=true}).end().filter("img").css({opacity:"0.5",cursor:"default"})}else if(e=="div"||e=="span"){b=b.children("."+this._inlineClass);b.children().addClass("ui-state-disabled");b.find("select.ui-datepicker-month, select.ui-datepicker-year").attr("disabled","disabled")}this._disabledInputs=d.map(this._disabledInputs,function(f){return f==a?null:f});this._disabledInputs[this._disabledInputs.length]=a}},_isDisabledDatepicker:function(a){if(!a)return false;for(var b=0;b<this._disabledInputs.length;b++)if(this._disabledInputs[b]==a)return true;return false},_getInst:function(a){try{return d.data(a,"datepicker")}catch(b){throw"Missing instance data for this datepicker";}},_optionDatepicker:function(a,b,c){var e=this._getInst(a);if(arguments.length==2&&typeof b=="string")return b=="defaults"?d.extend({},d.datepicker._defaults):e?b=="all"?d.extend({},e.settings):this._get(e,b):null;var f=b||{};if(typeof b=="string"){f={};f[b]=c}if(e){this._curInst==e&&this._hideDatepicker();var h=this._getDateDatepicker(a,true),i=this._getMinMaxDate(e,"min"),g=this._getMinMaxDate(e,"max");H(e.settings,f);if(i!==null&&f.dateFormat!==C&&f.minDate===C)e.settings.minDate=this._formatDate(e,i);if(g!==null&&f.dateFormat!==C&&f.maxDate===C)e.settings.maxDate=this._formatDate(e,g);this._attachments(d(a),e);this._autoSize(e);this._setDate(e,h);this._updateAlternate(e);this._updateDatepicker(e)}},_changeDatepicker:function(a,b,c){this._optionDatepicker(a,b,c)},_refreshDatepicker:function(a){(a=this._getInst(a))&&this._updateDatepicker(a)},_setDateDatepicker:function(a,b){if(a=this._getInst(a)){this._setDate(a,b);this._updateDatepicker(a);this._updateAlternate(a)}},_getDateDatepicker:function(a,b){(a=this._getInst(a))&&!a.inline&&this._setDateFromField(a,b);return a?this._getDate(a):null},_doKeyDown:function(a){var b=d.datepicker._getInst(a.target),c=true,e=b.dpDiv.is(".ui-datepicker-rtl");b._keyEvent=true;if(d.datepicker._datepickerShowing)switch(a.keyCode){case 9:d.datepicker._hideDatepicker();c=false;break;case 13:c=d("td."+d.datepicker._dayOverClass+":not(."+d.datepicker._currentClass+")",b.dpDiv);c[0]&&d.datepicker._selectDay(a.target,b.selectedMonth,b.selectedYear,c[0]);if(a=d.datepicker._get(b,"onSelect")){c=d.datepicker._formatDate(b);a.apply(b.input?b.input[0]:null,[c,b])}else d.datepicker._hideDatepicker();return false;case 27:d.datepicker._hideDatepicker();break;case 33:d.datepicker._adjustDate(a.target,a.ctrlKey?-d.datepicker._get(b,"stepBigMonths"):-d.datepicker._get(b,"stepMonths"),"M");break;case 34:d.datepicker._adjustDate(a.target,a.ctrlKey?+d.datepicker._get(b,"stepBigMonths"):+d.datepicker._get(b,"stepMonths"),"M");break;case 35:if(a.ctrlKey||a.metaKey)d.datepicker._clearDate(a.target);c=a.ctrlKey||a.metaKey;break;case 36:if(a.ctrlKey||a.metaKey)d.datepicker._gotoToday(a.target);c=a.ctrlKey||a.metaKey;break;case 37:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,e?+1:-1,"D");c=a.ctrlKey||a.metaKey;if(a.originalEvent.altKey)d.datepicker._adjustDate(a.target,a.ctrlKey?-d.datepicker._get(b,"stepBigMonths"):-d.datepicker._get(b,"stepMonths"),"M");break;case 38:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,-7,"D");c=a.ctrlKey||a.metaKey;break;case 39:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,e?-1:+1,"D");c=a.ctrlKey||a.metaKey;if(a.originalEvent.altKey)d.datepicker._adjustDate(a.target,a.ctrlKey?+d.datepicker._get(b,"stepBigMonths"):+d.datepicker._get(b,"stepMonths"),"M");break;case 40:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,+7,"D");c=a.ctrlKey||a.metaKey;break;default:c=false}else if(a.keyCode==36&&a.ctrlKey)d.datepicker._showDatepicker(this);else c=false;if(c){a.preventDefault();a.stopPropagation()}},_doKeyPress:function(a){var b=d.datepicker._getInst(a.target);if(d.datepicker._get(b,"constrainInput")){b=d.datepicker._possibleChars(d.datepicker._get(b,"dateFormat"));var c=String.fromCharCode(a.charCode==C?a.keyCode:a.charCode);return a.ctrlKey||a.metaKey||c<" "||!b||b.indexOf(c)>-1}},_doKeyUp:function(a){a=d.datepicker._getInst(a.target);if(a.input.val()!=a.lastVal)try{if(d.datepicker.parseDate(d.datepicker._get(a,"dateFormat"),a.input?a.input.val():null,d.datepicker._getFormatConfig(a))){d.datepicker._setDateFromField(a);d.datepicker._updateAlternate(a);d.datepicker._updateDatepicker(a)}}catch(b){d.datepicker.log(b)}return true},_showDatepicker:function(a){a=a.target||a;if(a.nodeName.toLowerCase()!="input")a=d("input",a.parentNode)[0];if(!(d.datepicker._isDisabledDatepicker(a)||d.datepicker._lastInput==a)){var b=d.datepicker._getInst(a);if(d.datepicker._curInst&&d.datepicker._curInst!=b){d.datepicker._datepickerShowing&&d.datepicker._triggerOnClose(d.datepicker._curInst);d.datepicker._curInst.dpDiv.stop(true,true)}var c=d.datepicker._get(b,"beforeShow");c=c?c.apply(a,[a,b]):{};if(c!==false){H(b.settings,c);b.lastVal=null;d.datepicker._lastInput=a;d.datepicker._setDateFromField(b);if(d.datepicker._inDialog)a.value="";if(!d.datepicker._pos){d.datepicker._pos=d.datepicker._findPos(a);d.datepicker._pos[1]+=a.offsetHeight}var e=false;d(a).parents().each(function(){e|=d(this).css("position")=="fixed";return!e});if(e&&d.browser.opera){d.datepicker._pos[0]-=document.documentElement.scrollLeft;d.datepicker._pos[1]-=document.documentElement.scrollTop}c={left:d.datepicker._pos[0],top:d.datepicker._pos[1]};d.datepicker._pos=null;b.dpDiv.empty();b.dpDiv.css({position:"absolute",display:"block",top:"-1000px"});d.datepicker._updateDatepicker(b);c=d.datepicker._checkOffset(b,c,e);b.dpDiv.css({position:d.datepicker._inDialog&&d.blockUI?"static":e?"fixed":"absolute",display:"none",left:c.left+"px",top:c.top+"px"});if(!b.inline){c=d.datepicker._get(b,"showAnim");var f=d.datepicker._get(b,"duration"),h=function(){var i=b.dpDiv.find("iframe.ui-datepicker-cover");if(i.length){var g=d.datepicker._getBorders(b.dpDiv);i.css({left:-g[0],top:-g[1],width:b.dpDiv.outerWidth(),height:b.dpDiv.outerHeight()})}};b.dpDiv.zIndex(d(a).zIndex()+1);d.datepicker._datepickerShowing=true;d.effects&&d.effects[c]?b.dpDiv.show(c,d.datepicker._get(b,"showOptions"),f,h):b.dpDiv[c||"show"](c?f:null,h);if(!c||!f)h();b.input.is(":visible")&&!b.input.is(":disabled")&&b.input.focus();d.datepicker._curInst=b}}}},_updateDatepicker:function(a){this.maxRows=4;var b=d.datepicker._getBorders(a.dpDiv);J=a;a.dpDiv.empty().append(this._generateHTML(a));var c=a.dpDiv.find("iframe.ui-datepicker-cover");c.length&&c.css({left:-b[0],top:-b[1],width:a.dpDiv.outerWidth(),height:a.dpDiv.outerHeight()});a.dpDiv.find("."+this._dayOverClass+" a").mouseover();b=this._getNumberOfMonths(a);c=b[1];a.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");c>1&&a.dpDiv.addClass("ui-datepicker-multi-"+c).css("width",17*c+"em");a.dpDiv[(b[0]!=1||b[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi");a.dpDiv[(this._get(a,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl");a==d.datepicker._curInst&&d.datepicker._datepickerShowing&&a.input&&a.input.is(":visible")&&!a.input.is(":disabled")&&a.input[0]!=document.activeElement&&a.input.focus();if(a.yearshtml){var e=a.yearshtml;setTimeout(function(){e===a.yearshtml&&a.yearshtml&&a.dpDiv.find("select.ui-datepicker-year:first").replaceWith(a.yearshtml);e=a.yearshtml=null},0)}},_getBorders:function(a){var b=function(c){return{thin:1,medium:2,thick:3}[c]||c};return[parseFloat(b(a.css("border-left-width"))),parseFloat(b(a.css("border-top-width")))]},_checkOffset:function(a,b,c){var e=a.dpDiv.outerWidth(),f=a.dpDiv.outerHeight(),h=a.input?a.input.outerWidth():0,i=a.input?a.input.outerHeight():0,g=document.documentElement.clientWidth+d(document).scrollLeft(),j=document.documentElement.clientHeight+d(document).scrollTop();b.left-=this._get(a,"isRTL")?e-h:0;b.left-=c&&b.left==a.input.offset().left?d(document).scrollLeft():0;b.top-=c&&b.top==a.input.offset().top+i?d(document).scrollTop():0;b.left-=Math.min(b.left,b.left+e>g&&g>e?Math.abs(b.left+e-g):0);b.top-=Math.min(b.top,b.top+f>j&&j>f?Math.abs(f+i):0);return b},_findPos:function(a){for(var b=this._get(this._getInst(a),"isRTL");a&&(a.type=="hidden"||a.nodeType!=1||d.expr.filters.hidden(a));)a=a[b?"previousSibling":"nextSibling"];a=d(a).offset();return[a.left,a.top]},_triggerOnClose:function(a){var b=this._get(a,"onClose");if(b)b.apply(a.input?a.input[0]:null,[a.input?a.input.val():"",a])},_hideDatepicker:function(a){var b=this._curInst;if(!(!b||a&&b!=d.data(a,"datepicker")))if(this._datepickerShowing){a=this._get(b,"showAnim");var c=this._get(b,"duration"),e=function(){d.datepicker._tidyDialog(b);this._curInst=null};d.effects&&d.effects[a]?b.dpDiv.hide(a,d.datepicker._get(b,"showOptions"),c,e):b.dpDiv[a=="slideDown"?"slideUp":a=="fadeIn"?"fadeOut":"hide"](a?c:null,e);a||e();d.datepicker._triggerOnClose(b);this._datepickerShowing=false;this._lastInput=null;if(this._inDialog){this._dialogInput.css({position:"absolute",left:"0",top:"-100px"});if(d.blockUI){d.unblockUI();d("body").append(this.dpDiv)}}this._inDialog=false}},_tidyDialog:function(a){a.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(a){if(d.datepicker._curInst){a=d(a.target);a[0].id!=d.datepicker._mainDivId&&a.parents("#"+d.datepicker._mainDivId).length==0&&!a.hasClass(d.datepicker.markerClassName)&&!a.hasClass(d.datepicker._triggerClass)&&d.datepicker._datepickerShowing&&!(d.datepicker._inDialog&&d.blockUI)&&d.datepicker._hideDatepicker()}},_adjustDate:function(a,b,c){a=d(a);var e=this._getInst(a[0]);if(!this._isDisabledDatepicker(a[0])){this._adjustInstDate(e,b+(c=="M"?this._get(e,"showCurrentAtPos"):0),c);this._updateDatepicker(e)}},_gotoToday:function(a){a=d(a);var b=this._getInst(a[0]);if(this._get(b,"gotoCurrent")&&b.currentDay){b.selectedDay=b.currentDay;b.drawMonth=b.selectedMonth=b.currentMonth;b.drawYear=b.selectedYear=b.currentYear}else{var c=new Date;b.selectedDay=c.getDate();b.drawMonth=b.selectedMonth=c.getMonth();b.drawYear=b.selectedYear=c.getFullYear()}this._notifyChange(b);this._adjustDate(a)},_selectMonthYear:function(a,b,c){a=d(a);var e=this._getInst(a[0]);e["selected"+(c=="M"?"Month":"Year")]=e["draw"+(c=="M"?"Month":"Year")]=parseInt(b.options[b.selectedIndex].value,10);this._notifyChange(e);this._adjustDate(a)},_selectDay:function(a,b,c,e){var f=d(a);if(!(d(e).hasClass(this._unselectableClass)||this._isDisabledDatepicker(f[0]))){f=this._getInst(f[0]);f.selectedDay=f.currentDay=d("a",e).html();f.selectedMonth=f.currentMonth=b;f.selectedYear=f.currentYear=c;this._selectDate(a,this._formatDate(f,f.currentDay,f.currentMonth,f.currentYear))}},_clearDate:function(a){a=d(a);this._getInst(a[0]);this._selectDate(a,"")},_selectDate:function(a,b){a=this._getInst(d(a)[0]);b=b!=null?b:this._formatDate(a);a.input&&a.input.val(b);this._updateAlternate(a);var c=this._get(a,"onSelect");if(c)c.apply(a.input?a.input[0]:null,[b,a]);else a.input&&a.input.trigger("change");if(a.inline)this._updateDatepicker(a);else{this._hideDatepicker();this._lastInput=a.input[0];typeof a.input[0]!="object"&&a.input.focus();this._lastInput=null}},_updateAlternate:function(a){var b=this._get(a,"altField");if(b){var c=this._get(a,"altFormat")||this._get(a,"dateFormat"),e=this._getDate(a),f=this.formatDate(c,e,this._getFormatConfig(a));d(b).each(function(){d(this).val(f)})}},noWeekends:function(a){a=a.getDay();return[a>0&&a<6,""]},iso8601Week:function(a){a=new Date(a.getTime());a.setDate(a.getDate()+4-(a.getDay()||7));var b=a.getTime();a.setMonth(0);a.setDate(1);return Math.floor(Math.round((b-a)/864E5)/7)+1},parseDate:function(a,b,c){if(a==null||b==null)throw"Invalid arguments";b=typeof b=="object"?b.toString():b+"";if(b=="")return null;var e=(c?c.shortYearCutoff:null)||this._defaults.shortYearCutoff;e=typeof e!="string"?e:(new Date).getFullYear()%100+parseInt(e,10);for(var f=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,h=(c?c.dayNames:null)||this._defaults.dayNames,i=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort,g=(c?c.monthNames:null)||this._defaults.monthNames,j=c=-1,l=-1,u=-1,k=false,o=function(p){(p=A+1<a.length&&a.charAt(A+1)==p)&&A++;return p},m=function(p){var D=o(p);p=new RegExp("^\\d{1,"+(p=="@"?14:p=="!"?20:p=="y"&&D?4:p=="o"?3:2)+"}");p=b.substring(q).match(p);if(!p)throw"Missing number at position "+q;q+=p[0].length;return parseInt(p[0],10)},n=function(p,D,K){p=d.map(o(p)?K:D,function(w,x){return[[x,w]]}).sort(function(w,x){return-(w[1].length-x[1].length)});var E=-1;d.each(p,function(w,x){w=x[1];if(b.substr(q,w.length).toLowerCase()==w.toLowerCase()){E=x[0];q+=w.length;return false}});if(E!=-1)return E+1;else throw"Unknown name at position "+q;},s=function(){if(b.charAt(q)!=a.charAt(A))throw"Unexpected literal at position "+q;q++},q=0,A=0;A<a.length;A++)if(k)if(a.charAt(A)=="'"&&!o("'"))k=false;else s();else switch(a.charAt(A)){case"d":l=m("d");break;case"D":n("D",f,h);break;case"o":u=m("o");break;case"m":j=m("m");break;case"M":j=n("M",i,g);break;case"y":c=m("y");break;case"@":var v=new Date(m("@"));c=v.getFullYear();j=v.getMonth()+1;l=v.getDate();break;case"!":v=new Date((m("!")-this._ticksTo1970)/1E4);c=v.getFullYear();j=v.getMonth()+
+1;l=v.getDate();break;case"'":if(o("'"))s();else k=true;break;default:s()}if(q<b.length)throw"Extra/unparsed characters found in date: "+b.substring(q);if(c==-1)c=(new Date).getFullYear();else if(c<100)c+=(new Date).getFullYear()-(new Date).getFullYear()%100+(c<=e?0:-100);if(u>-1){j=1;l=u;do{e=this._getDaysInMonth(c,j-1);if(l<=e)break;j++;l-=e}while(1)}v=this._daylightSavingAdjust(new Date(c,j-1,l));if(v.getFullYear()!=c||v.getMonth()+1!=j||v.getDate()!=l)throw"Invalid date";return v},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*24*60*60*1E7,formatDate:function(a,b,c){if(!b)return"";var e=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,f=(c?c.dayNames:null)||this._defaults.dayNames,h=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort;c=(c?c.monthNames:null)||this._defaults.monthNames;var i=function(o){(o=k+1<a.length&&a.charAt(k+1)==o)&&k++;return o},g=function(o,m,n){m=""+m;if(i(o))for(;m.length<n;)m="0"+m;return m},j=function(o,m,n,s){return i(o)?s[m]:n[m]},l="",u=false;if(b)for(var k=0;k<a.length;k++)if(u)if(a.charAt(k)=="'"&&!i("'"))u=false;else l+=a.charAt(k);else switch(a.charAt(k)){case"d":l+=g("d",b.getDate(),2);break;case"D":l+=j("D",b.getDay(),e,f);break;case"o":l+=g("o",Math.round(((new Date(b.getFullYear(),b.getMonth(),b.getDate())).getTime()-
+(new Date(b.getFullYear(),0,0)).getTime())/864E5),3);break;case"m":l+=g("m",b.getMonth()+1,2);break;case"M":l+=j("M",b.getMonth(),h,c);break;case"y":l+=i("y")?b.getFullYear():(b.getYear()%100<10?"0":"")+b.getYear()%100;break;case"@":l+=b.getTime();break;case"!":l+=b.getTime()*1E4+this._ticksTo1970;break;case"'":if(i("'"))l+="'";else u=true;break;default:l+=a.charAt(k)}return l},_possibleChars:function(a){for(var b="",c=false,e=function(h){(h=f+1<a.length&&a.charAt(f+1)==h)&&f++;return h},f=0;f<a.length;f++)if(c)if(a.charAt(f)=="'"&&!e("'"))c=false;else b+=a.charAt(f);else switch(a.charAt(f)){case"d":case"m":case"y":case"@":b+="0123456789";break;case"D":case"M":return null;case"'":if(e("'"))b+="'";else c=true;break;default:b+=a.charAt(f)}return b},_get:function(a,b){return a.settings[b]!==C?a.settings[b]:this._defaults[b]},_setDateFromField:function(a,b){if(a.input.val()!=a.lastVal){var c=this._get(a,"dateFormat"),e=a.lastVal=a.input?a.input.val():null,f,h;f=h=this._getDefaultDate(a);var i=this._getFormatConfig(a);try{f=this.parseDate(c,e,i)||h}catch(g){this.log(g);e=b?"":e}a.selectedDay=f.getDate();a.drawMonth=a.selectedMonth=f.getMonth();a.drawYear=a.selectedYear=f.getFullYear();a.currentDay=e?f.getDate():0;a.currentMonth=e?f.getMonth():0;a.currentYear=e?f.getFullYear():0;this._adjustInstDate(a)}},_getDefaultDate:function(a){return this._restrictMinMax(a,this._determineDate(a,this._get(a,"defaultDate"),new Date))},_determineDate:function(a,b,c){var e=function(h){var i=new Date;i.setDate(i.getDate()+h);return i},f=function(h){try{return d.datepicker.parseDate(d.datepicker._get(a,"dateFormat"),h,d.datepicker._getFormatConfig(a))}catch(i){}var g=(h.toLowerCase().match(/^c/)?d.datepicker._getDate(a):null)||new Date,j=g.getFullYear(),l=g.getMonth();g=g.getDate();for(var u=/([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,k=u.exec(h);k;){switch(k[2]||"d"){case"d":case"D":g+=parseInt(k[1],10);break;case"w":case"W":g+=parseInt(k[1],10)*7;break;case"m":case"M":l+=parseInt(k[1],10);g=Math.min(g,d.datepicker._getDaysInMonth(j,l));break;case"y":case"Y":j+=parseInt(k[1],10);g=Math.min(g,d.datepicker._getDaysInMonth(j,l));break}k=u.exec(h)}return new Date(j,l,g)};if(b=(b=b==null||b===""?c:typeof b=="string"?f(b):typeof b=="number"?isNaN(b)?c:e(b):new Date(b.getTime()))&&b.toString()=="Invalid Date"?c:b){b.setHours(0);b.setMinutes(0);b.setSeconds(0);b.setMilliseconds(0)}return this._daylightSavingAdjust(b)},_daylightSavingAdjust:function(a){if(!a)return null;a.setHours(a.getHours()>12?a.getHours()+2:0);return a},_setDate:function(a,b,c){var e=!b,f=a.selectedMonth,h=a.selectedYear;b=this._restrictMinMax(a,this._determineDate(a,b,new Date));a.selectedDay=a.currentDay=b.getDate();a.drawMonth=a.selectedMonth=a.currentMonth=b.getMonth();a.drawYear=a.selectedYear=a.currentYear=b.getFullYear();if((f!=a.selectedMonth||h!=a.selectedYear)&&!c)this._notifyChange(a);this._adjustInstDate(a);if(a.input)a.input.val(e?"":this._formatDate(a))},_getDate:function(a){return!a.currentYear||a.input&&a.input.val()==""?null:this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay))},_generateHTML:function(a){var b=new Date;b=this._daylightSavingAdjust(new Date(b.getFullYear(),b.getMonth(),b.getDate()));var c=this._get(a,"isRTL"),e=this._get(a,"showButtonPanel"),f=this._get(a,"hideIfNoPrevNext"),h=this._get(a,"navigationAsDateFormat"),i=this._getNumberOfMonths(a),g=this._get(a,"showCurrentAtPos"),j=this._get(a,"stepMonths"),l=i[0]!=1||i[1]!=1,u=this._daylightSavingAdjust(!a.currentDay?new Date(9999,9,9):new Date(a.currentYear,a.currentMonth,a.currentDay)),k=this._getMinMaxDate(a,"min"),o=this._getMinMaxDate(a,"max");g=a.drawMonth-g;var m=a.drawYear;if(g<0){g+=12;m--}if(o){var n=this._daylightSavingAdjust(new Date(o.getFullYear(),o.getMonth()-i[0]*i[1]+1,o.getDate()));for(n=k&&n<k?k:n;this._daylightSavingAdjust(new Date(m,g,1))>n;){g--;if(g<0){g=11;m--}}}a.drawMonth=g;a.drawYear=m;n=this._get(a,"prevText");n=!h?n:this.formatDate(n,this._daylightSavingAdjust(new Date(m,g-j,1)),this._getFormatConfig(a));n=this._canAdjustMonth(a,-1,m,g)?'<a class="ui-datepicker-prev ui-corner-all" onclick="DP_jQuery_'+B+".datepicker._adjustDate('#"+a.id+"', -"+j+", 'M');\" title=\""+n+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">'+n+"</span></a>":f?"":'<a class="ui-datepicker-prev ui-corner-all ui-state-disabled" title="'+n+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">'+n+"</span></a>";var s=this._get(a,"nextText");s=!h?s:this.formatDate(s,this._daylightSavingAdjust(new Date(m,g+j,1)),this._getFormatConfig(a));f=this._canAdjustMonth(a,+1,m,g)?'<a class="ui-datepicker-next ui-corner-all" onclick="DP_jQuery_'+B+".datepicker._adjustDate('#"+a.id+"', +"+j+", 'M');\" title=\""+s+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'">'+s+"</span></a>":f?"":'<a class="ui-datepicker-next ui-corner-all ui-state-disabled" title="'+s+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'">'+s+"</span></a>";j=this._get(a,"currentText");s=this._get(a,"gotoCurrent")&&a.currentDay?u:b;j=!h?j:this.formatDate(j,s,this._getFormatConfig(a));h=!a.inline?'<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all" onclick="DP_jQuery_'+B+'.datepicker._hideDatepicker();">'+this._get(a,"closeText")+"</button>":"";e=e?'<div class="ui-datepicker-buttonpane ui-widget-content">'+(c?h:"")+(this._isInRange(a,s)?'<button type="button" class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" onclick="DP_jQuery_'+
+B+".datepicker._gotoToday('#"+a.id+"');\">"+j+"</button>":"")+(c?"":h)+"</div>":"";h=parseInt(this._get(a,"firstDay"),10);h=isNaN(h)?0:h;j=this._get(a,"showWeek");s=this._get(a,"dayNames");this._get(a,"dayNamesShort");var q=this._get(a,"dayNamesMin"),A=this._get(a,"monthNames"),v=this._get(a,"monthNamesShort"),p=this._get(a,"beforeShowDay"),D=this._get(a,"showOtherMonths"),K=this._get(a,"selectOtherMonths");this._get(a,"calculateWeek");for(var E=this._getDefaultDate(a),w="",x=0;x<i[0];x++){var O="";this.maxRows=4;for(var G=0;G<i[1];G++){var P=this._daylightSavingAdjust(new Date(m,g,a.selectedDay)),t=" ui-corner-all",y="";if(l){y+='<div class="ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" ui-datepicker-group-first";t=" ui-corner-"+(c?"right":"left");break;case i[1]-1:y+=" ui-datepicker-group-last";t=" ui-corner-"+(c?"left":"right");break;default:y+=" ui-datepicker-group-middle";t="";break}y+='">'}y+='<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix'+t+'">'+(/all|left/.test(t)&&x==0?c?f:n:"")+(/all|right/.test(t)&&x==0?c?n:f:"")+this._generateMonthYearHeader(a,g,m,k,o,x>0||G>0,A,v)+'</div><table class="ui-datepicker-calendar"><thead><tr>';var z=j?'<th class="ui-datepicker-week-col">'+this._get(a,"weekHeader")+"</th>":"";for(t=0;t<7;t++){var r=(t+h)%7;z+="<th"+((t+h+6)%7>=5?' class="ui-datepicker-week-end"':"")+'><span title="'+s[r]+'">'+q[r]+"</span></th>"}y+=z+"</tr></thead><tbody>";z=this._getDaysInMonth(m,g);if(m==a.selectedYear&&g==a.selectedMonth)a.selectedDay=Math.min(a.selectedDay,z);t=(this._getFirstDayOfMonth(m,g)-h+7)%7;z=Math.ceil((t+z)/7);this.maxRows=z=l?this.maxRows>z?this.maxRows:z:z;r=this._daylightSavingAdjust(new Date(m,g,1-t));for(var Q=0;Q<z;Q++){y+="<tr>";var R=!j?"":'<td class="ui-datepicker-week-col">'+this._get(a,"calculateWeek")(r)+"</td>";for(t=0;t<7;t++){var I=p?p.apply(a.input?a.input[0]:null,[r]):[true,""],F=r.getMonth()!=g,L=F&&!K||!I[0]||k&&r<k||o&&r>o;R+='<td class="'+((t+h+6)%7>=5?" ui-datepicker-week-end":"")+(F?" ui-datepicker-other-month":"")+(r.getTime()==P.getTime()&&g==a.selectedMonth&&a._keyEvent||E.getTime()==r.getTime()&&E.getTime()==P.getTime()?" "+this._dayOverClass:"")+(L?" "+this._unselectableClass+" ui-state-disabled":"")+(F&&!D?"":" "+I[1]+(r.getTime()==u.getTime()?" "+this._currentClass:"")+(r.getTime()==b.getTime()?" ui-datepicker-today":""))+'"'+((!F||D)&&I[2]?' title="'+I[2]+'"':"")+(L?"":' onclick="DP_jQuery_'+B+".datepicker._selectDay('#"+a.id+"',"+r.getMonth()+","+r.getFullYear()+', this);return false;"')+">"+(F&&!D?"&#xa0;":L?'<span class="ui-state-default">'+
+r.getDate()+"</span>":'<a class="ui-state-default'+(r.getTime()==b.getTime()?" ui-state-highlight":"")+(r.getTime()==u.getTime()?" ui-state-active":"")+(F?" ui-priority-secondary":"")+'" href="#">'+r.getDate()+"</a>")+"</td>";r.setDate(r.getDate()+1);r=this._daylightSavingAdjust(r)}y+=R+"</tr>"}g++;if(g>11){g=0;m++}y+="</tbody></table>"+(l?"</div>"+(i[0]>0&&G==i[1]-1?'<div class="ui-datepicker-row-break"></div>':""):"");O+=y}w+=O}w+=e+(d.browser.msie&&parseInt(d.browser.version,10)<7&&!a.inline?'<iframe src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>':"");a._keyEvent=false;return w},_generateMonthYearHeader:function(a,b,c,e,f,h,i,g){var j=this._get(a,"changeMonth"),l=this._get(a,"changeYear"),u=this._get(a,"showMonthAfterYear"),k='<div class="ui-datepicker-title">',o="";if(h||!j)o+='<span class="ui-datepicker-month">'+i[b]+"</span>";else{i=e&&e.getFullYear()==c;var m=f&&f.getFullYear()==c;o+='<select class="ui-datepicker-month" onchange="DP_jQuery_'+B+".datepicker._selectMonthYear('#"+a.id+"', this, 'M');\" >";for(var n=0;n<12;n++)if((!i||n>=e.getMonth())&&(!m||n<=f.getMonth()))o+='<option value="'+n+'"'+(n==b?' selected="selected"':"")+">"+g[n]+"</option>";o+="</select>"}u||(k+=o+(h||!(j&&l)?"&#xa0;":""));if(!a.yearshtml){a.yearshtml="";if(h||!l)k+='<span class="ui-datepicker-year">'+c+"</span>";else{g=this._get(a,"yearRange").split(":");var s=(new Date).getFullYear();i=function(q){q=q.match(/c[+-].*/)?c+parseInt(q.substring(1),10):q.match(/[+-].*/)?s+parseInt(q,10):parseInt(q,10);return isNaN(q)?s:q};b=i(g[0]);g=Math.max(b,i(g[1]||""));b=e?Math.max(b,e.getFullYear()):b;g=f?Math.min(g,f.getFullYear()):g;for(a.yearshtml+='<select class="ui-datepicker-year" onchange="DP_jQuery_'+B+".datepicker._selectMonthYear('#"+a.id+"', this, 'Y');\" >";b<=g;b++)a.yearshtml+='<option value="'+b+'"'+(b==c?' selected="selected"':"")+">"+b+"</option>";a.yearshtml+="</select>";k+=a.yearshtml;a.yearshtml=null}}k+=this._get(a,"yearSuffix");if(u)k+=(h||!(j&&l)?"&#xa0;":"")+o;k+="</div>";return k},_adjustInstDate:function(a,b,c){var e=a.drawYear+(c=="Y"?b:0),f=a.drawMonth+
+(c=="M"?b:0);b=Math.min(a.selectedDay,this._getDaysInMonth(e,f))+(c=="D"?b:0);e=this._restrictMinMax(a,this._daylightSavingAdjust(new Date(e,f,b)));a.selectedDay=e.getDate();a.drawMonth=a.selectedMonth=e.getMonth();a.drawYear=a.selectedYear=e.getFullYear();if(c=="M"||c=="Y")this._notifyChange(a)},_restrictMinMax:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");b=c&&b<c?c:b;return b=a&&b>a?a:b},_notifyChange:function(a){var b=this._get(a,"onChangeMonthYear");if(b)b.apply(a.input?a.input[0]:null,[a.selectedYear,a.selectedMonth+1,a])},_getNumberOfMonths:function(a){a=this._get(a,"numberOfMonths");return a==null?[1,1]:typeof a=="number"?[1,a]:a},_getMinMaxDate:function(a,b){return this._determineDate(a,this._get(a,b+"Date"),null)},_getDaysInMonth:function(a,b){return 32-this._daylightSavingAdjust(new Date(a,b,32)).getDate()},_getFirstDayOfMonth:function(a,b){return(new Date(a,b,1)).getDay()},_canAdjustMonth:function(a,b,c,e){var f=this._getNumberOfMonths(a);c=this._daylightSavingAdjust(new Date(c,e+(b<0?b:f[0]*f[1]),1));b<0&&c.setDate(this._getDaysInMonth(c.getFullYear(),c.getMonth()));return this._isInRange(a,c)},_isInRange:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");return(!c||b.getTime()>=c.getTime())&&(!a||b.getTime()<=a.getTime())},_getFormatConfig:function(a){var b=this._get(a,"shortYearCutoff");b=typeof b!="string"?b:(new Date).getFullYear()%100+parseInt(b,10);return{shortYearCutoff:b,dayNamesShort:this._get(a,"dayNamesShort"),dayNames:this._get(a,"dayNames"),monthNamesShort:this._get(a,"monthNamesShort"),monthNames:this._get(a,"monthNames")}},_formatDate:function(a,b,c,e){if(!b){a.currentDay=a.selectedDay;a.currentMonth=a.selectedMonth;a.currentYear=a.selectedYear}b=b?typeof b=="object"?b:this._daylightSavingAdjust(new Date(e,c,b)):this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay));return this.formatDate(this._get(a,"dateFormat"),b,this._getFormatConfig(a))}});d.fn.datepicker=function(a){if(!this.length)return this;if(!d.datepicker.initialized){d(document).mousedown(d.datepicker._checkExternalClick).find("body").append(d.datepicker.dpDiv);d.datepicker.initialized=true}var b=Array.prototype.slice.call(arguments,1);if(typeof a=="string"&&(a=="isDisabled"||a=="getDate"||a=="widget"))return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));if(a=="option"&&arguments.length==2&&typeof arguments[1]=="string")return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));return this.each(function(){typeof a=="string"?d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this].concat(b)):d.datepicker._attachDatepicker(this,a)})};d.datepicker=new M;d.datepicker.initialized=false;d.datepicker.uuid=(new Date).getTime();d.datepicker.version="1.8.16";window["DP_jQuery_"+B]=d})(jQuery);;jQuery.effects||function(f,j){function m(c){var a;if(c&&c.constructor==Array&&c.length==3)return c;if(a=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(c))return[parseInt(a[1],10),parseInt(a[2],10),parseInt(a[3],10)];if(a=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(c))return[parseFloat(a[1])*2.55,parseFloat(a[2])*2.55,parseFloat(a[3])*2.55];if(a=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(c))return[parseInt(a[1],16),parseInt(a[2],16),parseInt(a[3],16)];if(a=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(c))return[parseInt(a[1]+a[1],16),parseInt(a[2]+a[2],16),parseInt(a[3]+a[3],16)];if(/rgba\(0, 0, 0, 0\)/.exec(c))return n.transparent;return n[f.trim(c).toLowerCase()]}function s(c,a){var b;do{b=f.curCSS(c,a);if(b!=""&&b!="transparent"||f.nodeName(c,"body"))break;a="backgroundColor"}while(c=c.parentNode);return m(b)}function o(){var c=document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle,a={},b,d;if(c&&c.length&&c[0]&&c[c[0]])for(var e=c.length;e--;){b=c[e];if(typeof c[b]=="string"){d=b.replace(/\-(\w)/g,function(g,h){return h.toUpperCase()});a[d]=c[b]}}else for(b in c)if(typeof c[b]==="string")a[b]=c[b];return a}function p(c){var a,b;for(a in c){b=c[a];if(b==null||f.isFunction(b)||a in t||/scrollbar/.test(a)||!/color/i.test(a)&&isNaN(parseFloat(b)))delete c[a]}return c}function u(c,a){var b={_:0},d;for(d in a)if(c[d]!=a[d])b[d]=a[d];return b}function k(c,a,b,d){if(typeof c=="object"){d=a;b=null;a=c;c=a.effect}if(f.isFunction(a)){d=a;b=null;a={}}if(typeof a=="number"||f.fx.speeds[a]){d=b;b=a;a={}}if(f.isFunction(b)){d=b;b=null}a=a||{};b=b||a.duration;b=f.fx.off?0:typeof b=="number"?b:b in f.fx.speeds?f.fx.speeds[b]:f.fx.speeds._default;d=d||a.complete;return[c,a,b,d]}function l(c){if(!c||typeof c==="number"||f.fx.speeds[c])return true;if(typeof c==="string"&&!f.effects[c])return true;return false}f.effects={};f.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor","borderTopColor","borderColor","color","outlineColor"],function(c,a){f.fx.step[a]=function(b){if(!b.colorInit){b.start=s(b.elem,a);b.end=m(b.end);b.colorInit=true}b.elem.style[a]="rgb("+Math.max(Math.min(parseInt(b.pos*(b.end[0]-b.start[0])+b.start[0],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[1]-b.start[1])+b.start[1],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[2]-b.start[2])+b.start[2],10),255),0)+")"}});var n={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]},q=["add","remove","toggle"],t={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};f.effects.animateClass=function(c,a,b,d){if(f.isFunction(b)){d=b;b=null}return this.queue(function(){var e=f(this),g=e.attr("style")||" ",h=p(o.call(this)),r,v=e.attr("class");f.each(q,function(w,i){c[i]&&e[i+"Class"](c[i])});r=p(o.call(this));e.attr("class",v);e.animate(u(h,r),{queue:false,duration:a,easing:b,complete:function(){f.each(q,function(w,i){c[i]&&e[i+"Class"](c[i])});if(typeof e.attr("style")=="object"){e.attr("style").cssText="";e.attr("style").cssText=g}else e.attr("style",g);d&&d.apply(this,arguments);f.dequeue(this)}})})};f.fn.extend({_addClass:f.fn.addClass,addClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{add:c},a,b,d]):this._addClass(c)},_removeClass:f.fn.removeClass,removeClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{remove:c},a,b,d]):this._removeClass(c)},_toggleClass:f.fn.toggleClass,toggleClass:function(c,a,b,d,e){return typeof a=="boolean"||a===j?b?f.effects.animateClass.apply(this,[a?{add:c}:{remove:c},b,d,e]):this._toggleClass(c,a):f.effects.animateClass.apply(this,[{toggle:c},a,b,d])},switchClass:function(c,a,b,d,e){return f.effects.animateClass.apply(this,[{add:a,remove:c},b,d,e])}});f.extend(f.effects,{version:"1.8.16",save:function(c,a){for(var b=0;b<a.length;b++)a[b]!==null&&c.data("ec.storage."+a[b],c[0].style[a[b]])},restore:function(c,a){for(var b=0;b<a.length;b++)a[b]!==null&&c.css(a[b],c.data("ec.storage."+a[b]))},setMode:function(c,a){if(a=="toggle")a=c.is(":hidden")?"show":"hide";return a},getBaseline:function(c,a){var b;switch(c[0]){case"top":b=0;break;case"middle":b=0.5;break;case"bottom":b=1;break;default:b=c[0]/a.height}switch(c[1]){case"left":c=0;break;case"center":c=0.5;break;case"right":c=1;break;default:c=c[1]/a.width}return{x:c,y:b}},createWrapper:function(c){if(c.parent().is(".ui-effects-wrapper"))return c.parent();var a={width:c.outerWidth(true),height:c.outerHeight(true),"float":c.css("float")},b=f("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),d=document.activeElement;c.wrap(b);if(c[0]===d||f.contains(c[0],d))f(d).focus();b=c.parent();if(c.css("position")=="static"){b.css({position:"relative"});c.css({position:"relative"})}else{f.extend(a,{position:c.css("position"),zIndex:c.css("z-index")});f.each(["top","left","bottom","right"],function(e,g){a[g]=c.css(g);if(isNaN(parseInt(a[g],10)))a[g]="auto"});c.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})}return b.css(a).show()},removeWrapper:function(c){var a,b=document.activeElement;if(c.parent().is(".ui-effects-wrapper")){a=c.parent().replaceWith(c);if(c[0]===b||f.contains(c[0],b))f(b).focus();return a}return c},setTransition:function(c,a,b,d){d=d||{};f.each(a,function(e,g){unit=c.cssUnit(g);if(unit[0]>0)d[g]=unit[0]*b+unit[1]});return d}});f.fn.extend({effect:function(c){var a=k.apply(this,arguments),b={options:a[1],duration:a[2],callback:a[3]};a=b.options.mode;var d=f.effects[c];if(f.fx.off||!d)return a?this[a](b.duration,b.callback):this.each(function(){b.callback&&b.callback.call(this)});return d.call(this,b)},_show:f.fn.show,show:function(c){if(l(c))return this._show.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="show";return this.effect.apply(this,a)}},_hide:f.fn.hide,hide:function(c){if(l(c))return this._hide.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="hide";return this.effect.apply(this,a)}},__toggle:f.fn.toggle,toggle:function(c){if(l(c)||typeof c==="boolean"||f.isFunction(c))return this.__toggle.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="toggle";return this.effect.apply(this,a)}},cssUnit:function(c){var a=this.css(c),b=[];f.each(["em","px","%","pt"],function(d,e){if(a.indexOf(e)>0)b=[parseFloat(a),e]});return b}});f.easing.jswing=f.easing.swing;f.extend(f.easing,{def:"easeOutQuad",swing:function(c,a,b,d,e){return f.easing[f.easing.def](c,a,b,d,e)},easeInQuad:function(c,a,b,d,e){return d*(a/=e)*a+b},easeOutQuad:function(c,a,b,d,e){return-d*(a/=e)*(a-2)+b},easeInOutQuad:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a+b;return-d/2*(--a*(a-2)-1)+b},easeInCubic:function(c,a,b,d,e){return d*(a/=e)*a*a+b},easeOutCubic:function(c,a,b,d,e){return d*((a=a/e-1)*a*a+1)+b},easeInOutCubic:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a+b;return d/2*((a-=2)*a*a+2)+b},easeInQuart:function(c,a,b,d,e){return d*(a/=e)*a*a*a+b},easeOutQuart:function(c,a,b,d,e){return-d*((a=a/e-1)*a*a*a-1)+b},easeInOutQuart:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a*a+b;return-d/2*((a-=2)*a*a*a-2)+b},easeInQuint:function(c,a,b,d,e){return d*(a/=e)*a*a*a*a+b},easeOutQuint:function(c,a,b,d,e){return d*((a=a/e-1)*a*a*a*a+1)+b},easeInOutQuint:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a*a*a+b;return d/2*((a-=2)*a*a*a*a+2)+b},easeInSine:function(c,a,b,d,e){return-d*Math.cos(a/e*(Math.PI/2))+d+b},easeOutSine:function(c,a,b,d,e){return d*Math.sin(a/e*(Math.PI/2))+b},easeInOutSine:function(c,a,b,d,e){return-d/2*(Math.cos(Math.PI*a/e)-1)+b},easeInExpo:function(c,a,b,d,e){return a==0?b:d*Math.pow(2,10*(a/e-1))+b},easeOutExpo:function(c,a,b,d,e){return a==e?b+d:d*(-Math.pow(2,-10*a/e)+1)+b},easeInOutExpo:function(c,a,b,d,e){if(a==0)return b;if(a==e)return b+d;if((a/=e/2)<1)return d/2*Math.pow(2,10*(a-1))+b;return d/2*(-Math.pow(2,-10*--a)+2)+b},easeInCirc:function(c,a,b,d,e){return-d*(Math.sqrt(1-(a/=e)*a)-1)+b},easeOutCirc:function(c,a,b,d,e){return d*Math.sqrt(1-(a=a/e-1)*a)+b},easeInOutCirc:function(c,a,b,d,e){if((a/=e/2)<1)return-d/2*(Math.sqrt(1-a*a)-1)+b;return d/2*(Math.sqrt(1-(a-=2)*a)+1)+b},easeInElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/h);return-(h*Math.pow(2,10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g))+b},easeOutElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/h);return h*Math.pow(2,-10*a)*Math.sin((a*e-c)*2*Math.PI/g)+d+b},easeInOutElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e/2)==2)return b+d;g||(g=e*0.3*1.5);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/h);if(a<1)return-0.5*h*Math.pow(2,10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g)+b;return h*Math.pow(2,-10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g)*0.5+d+b},easeInBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;return d*(a/=e)*a*((g+1)*a-g)+b},easeOutBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;return d*((a=a/e-1)*a*((g+1)*a+g)+1)+b},easeInOutBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;if((a/=e/2)<1)return d/2*a*a*(((g*=1.525)+1)*a-g)+b;return d/2*((a-=2)*a*(((g*=1.525)+1)*a+g)+2)+b},easeInBounce:function(c,a,b,d,e){return d-f.easing.easeOutBounce(c,e-a,0,d,e)+b},easeOutBounce:function(c,a,b,d,e){return(a/=e)<1/2.75?d*7.5625*a*a+b:a<2/2.75?d*(7.5625*(a-=1.5/2.75)*a+0.75)+b:a<2.5/2.75?d*(7.5625*(a-=2.25/2.75)*a+0.9375)+b:d*(7.5625*(a-=2.625/2.75)*a+0.984375)+b},easeInOutBounce:function(c,a,b,d,e){if(a<e/2)return f.easing.easeInBounce(c,a*2,0,d,e)*0.5+b;return f.easing.easeOutBounce(c,a*2-e,0,d,e)*0.5+d*0.5+b}})}(jQuery);;(function(b){b.effects.blind=function(c){return this.queue(function(){var a=b(this),g=["position","top","bottom","left","right"],f=b.effects.setMode(a,c.options.mode||"hide"),d=c.options.direction||"vertical";b.effects.save(a,g);a.show();var e=b.effects.createWrapper(a).css({overflow:"hidden"}),h=d=="vertical"?"height":"width";d=d=="vertical"?e.height():e.width();f=="show"&&e.css(h,0);var i={};i[h]=f=="show"?d:0;e.animate(i,c.duration,c.options.easing,function(){f=="hide"&&a.hide();b.effects.restore(a,g);b.effects.removeWrapper(a);c.callback&&c.callback.apply(a[0],arguments);a.dequeue()})})}})(jQuery);;(function(e){e.effects.bounce=function(b){return this.queue(function(){var a=e(this),l=["position","top","bottom","left","right"],h=e.effects.setMode(a,b.options.mode||"effect"),d=b.options.direction||"up",c=b.options.distance||20,m=b.options.times||5,i=b.duration||250;/show|hide/.test(h)&&l.push("opacity");e.effects.save(a,l);a.show();e.effects.createWrapper(a);var f=d=="up"||d=="down"?"top":"left";d=d=="up"||d=="left"?"pos":"neg";c=b.options.distance||(f=="top"?a.outerHeight({margin:true})/3:a.outerWidth({margin:true})/3);if(h=="show")a.css("opacity",0).css(f,d=="pos"?-c:c);if(h=="hide")c/=m*2;h!="hide"&&m--;if(h=="show"){var g={opacity:1};g[f]=(d=="pos"?"+=":"-=")+c;a.animate(g,i/2,b.options.easing);c/=2;m--}for(g=0;g<m;g++){var j={},k={};j[f]=(d=="pos"?"-=":"+=")+c;k[f]=(d=="pos"?"+=":"-=")+c;a.animate(j,i/2,b.options.easing).animate(k,i/2,b.options.easing);c=h=="hide"?c*2:c/2}if(h=="hide"){g={opacity:0};g[f]=(d=="pos"?"-=":"+=")+c;a.animate(g,i/2,b.options.easing,function(){a.hide();e.effects.restore(a,l);e.effects.removeWrapper(a);b.callback&&b.callback.apply(this,arguments)})}else{j={};k={};j[f]=(d=="pos"?"-=":"+=")+c;k[f]=(d=="pos"?"+=":"-=")+c;a.animate(j,i/2,b.options.easing).animate(k,i/2,b.options.easing,function(){e.effects.restore(a,l);e.effects.removeWrapper(a);b.callback&&b.callback.apply(this,arguments)})}a.queue("fx",function(){a.dequeue()});a.dequeue()})}})(jQuery);;(function(b){b.effects.clip=function(e){return this.queue(function(){var a=b(this),i=["position","top","bottom","left","right","height","width"],f=b.effects.setMode(a,e.options.mode||"hide"),c=e.options.direction||"vertical";b.effects.save(a,i);a.show();var d=b.effects.createWrapper(a).css({overflow:"hidden"});d=a[0].tagName=="IMG"?d:a;var g={size:c=="vertical"?"height":"width",position:c=="vertical"?"top":"left"};c=c=="vertical"?d.height():d.width();if(f=="show"){d.css(g.size,0);d.css(g.position,c/2)}var h={};h[g.size]=f=="show"?c:0;h[g.position]=f=="show"?0:c/2;d.animate(h,{queue:false,duration:e.duration,easing:e.options.easing,complete:function(){f=="hide"&&a.hide();b.effects.restore(a,i);b.effects.removeWrapper(a);e.callback&&e.callback.apply(a[0],arguments);a.dequeue()}})})}})(jQuery);;(function(c){c.effects.drop=function(d){return this.queue(function(){var a=c(this),h=["position","top","bottom","left","right","opacity"],e=c.effects.setMode(a,d.options.mode||"hide"),b=d.options.direction||"left";c.effects.save(a,h);a.show();c.effects.createWrapper(a);var f=b=="up"||b=="down"?"top":"left";b=b=="up"||b=="left"?"pos":"neg";var g=d.options.distance||(f=="top"?a.outerHeight({margin:true})/2:a.outerWidth({margin:true})/2);if(e=="show")a.css("opacity",0).css(f,b=="pos"?-g:g);var i={opacity:e=="show"?1:0};i[f]=(e=="show"?b=="pos"?"+=":"-=":b=="pos"?"-=":"+=")+g;a.animate(i,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){e=="hide"&&a.hide();c.effects.restore(a,h);c.effects.removeWrapper(a);d.callback&&d.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);;(function(j){j.effects.explode=function(a){return this.queue(function(){var c=a.options.pieces?Math.round(Math.sqrt(a.options.pieces)):3,d=a.options.pieces?Math.round(Math.sqrt(a.options.pieces)):3;a.options.mode=a.options.mode=="toggle"?j(this).is(":visible")?"hide":"show":a.options.mode;var b=j(this).show().css("visibility","hidden"),g=b.offset();g.top-=parseInt(b.css("marginTop"),10)||0;g.left-=parseInt(b.css("marginLeft"),10)||0;for(var h=b.outerWidth(true),i=b.outerHeight(true),e=0;e<c;e++)for(var f=0;f<d;f++)b.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-f*(h/d),top:-e*(i/c)}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:h/d,height:i/c,left:g.left+f*(h/d)+(a.options.mode=="show"?(f-Math.floor(d/2))*(h/d):0),top:g.top+e*(i/c)+(a.options.mode=="show"?(e-Math.floor(c/2))*(i/c):0),opacity:a.options.mode=="show"?0:1}).animate({left:g.left+f*(h/d)+(a.options.mode=="show"?0:(f-Math.floor(d/2))*(h/d)),top:g.top+
+e*(i/c)+(a.options.mode=="show"?0:(e-Math.floor(c/2))*(i/c)),opacity:a.options.mode=="show"?1:0},a.duration||500);setTimeout(function(){a.options.mode=="show"?b.css({visibility:"visible"}):b.css({visibility:"visible"}).hide();a.callback&&a.callback.apply(b[0]);b.dequeue();j("div.ui-effects-explode").remove()},a.duration||500)})}})(jQuery);;(function(b){b.effects.fade=function(a){return this.queue(function(){var c=b(this),d=b.effects.setMode(c,a.options.mode||"hide");c.animate({opacity:d},{queue:false,duration:a.duration,easing:a.options.easing,complete:function(){a.callback&&a.callback.apply(this,arguments);c.dequeue()}})})}})(jQuery);;(function(c){c.effects.fold=function(a){return this.queue(function(){var b=c(this),j=["position","top","bottom","left","right"],d=c.effects.setMode(b,a.options.mode||"hide"),g=a.options.size||15,h=!!a.options.horizFirst,k=a.duration?a.duration/2:c.fx.speeds._default/2;c.effects.save(b,j);b.show();var e=c.effects.createWrapper(b).css({overflow:"hidden"}),f=d=="show"!=h,l=f?["width","height"]:["height","width"];f=f?[e.width(),e.height()]:[e.height(),e.width()];var i=/([0-9]+)%/.exec(g);if(i)g=parseInt(i[1],10)/100*f[d=="hide"?0:1];if(d=="show")e.css(h?{height:0,width:g}:{height:g,width:0});h={};i={};h[l[0]]=d=="show"?f[0]:g;i[l[1]]=d=="show"?f[1]:0;e.animate(h,k,a.options.easing).animate(i,k,a.options.easing,function(){d=="hide"&&b.hide();c.effects.restore(b,j);c.effects.removeWrapper(b);a.callback&&a.callback.apply(b[0],arguments);b.dequeue()})})}})(jQuery);;(function(b){b.effects.highlight=function(c){return this.queue(function(){var a=b(this),e=["backgroundImage","backgroundColor","opacity"],d=b.effects.setMode(a,c.options.mode||"show"),f={backgroundColor:a.css("backgroundColor")};if(d=="hide")f.opacity=0;b.effects.save(a,e);a.show().css({backgroundImage:"none",backgroundColor:c.options.color||"#ffff99"}).animate(f,{queue:false,duration:c.duration,easing:c.options.easing,complete:function(){d=="hide"&&a.hide();b.effects.restore(a,e);d=="show"&&!b.support.opacity&&this.style.removeAttribute("filter");c.callback&&c.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);;(function(d){d.effects.pulsate=function(a){return this.queue(function(){var b=d(this),c=d.effects.setMode(b,a.options.mode||"show");times=(a.options.times||5)*2-1;duration=a.duration?a.duration/2:d.fx.speeds._default/2;isVisible=b.is(":visible");animateTo=0;if(!isVisible){b.css("opacity",0).show();animateTo=1}if(c=="hide"&&isVisible||c=="show"&&!isVisible)times--;for(c=0;c<times;c++){b.animate({opacity:animateTo},duration,a.options.easing);animateTo=(animateTo+1)%2}b.animate({opacity:animateTo},duration,a.options.easing,function(){animateTo==0&&b.hide();a.callback&&a.callback.apply(this,arguments)});b.queue("fx",function(){b.dequeue()}).dequeue()})}})(jQuery);;(function(c){c.effects.puff=function(b){return this.queue(function(){var a=c(this),e=c.effects.setMode(a,b.options.mode||"hide"),g=parseInt(b.options.percent,10)||150,h=g/100,i={height:a.height(),width:a.width()};c.extend(b.options,{fade:true,mode:e,percent:e=="hide"?g:100,from:e=="hide"?i:{height:i.height*h,width:i.width*h}});a.effect("scale",b.options,b.duration,b.callback);a.dequeue()})};c.effects.scale=function(b){return this.queue(function(){var a=c(this),e=c.extend(true,{},b.options),g=c.effects.setMode(a,b.options.mode||"effect"),h=parseInt(b.options.percent,10)||(parseInt(b.options.percent,10)==0?0:g=="hide"?0:100),i=b.options.direction||"both",f=b.options.origin;if(g!="effect"){e.origin=f||["middle","center"];e.restore=true}f={height:a.height(),width:a.width()};a.from=b.options.from||(g=="show"?{height:0,width:0}:f);h={y:i!="horizontal"?h/100:1,x:i!="vertical"?h/100:1};a.to={height:f.height*h.y,width:f.width*h.x};if(b.options.fade){if(g=="show"){a.from.opacity=0;a.to.opacity=1}if(g=="hide"){a.from.opacity=1;a.to.opacity=0}}e.from=a.from;e.to=a.to;e.mode=g;a.effect("size",e,b.duration,b.callback);a.dequeue()})};c.effects.size=function(b){return this.queue(function(){var a=c(this),e=["position","top","bottom","left","right","width","height","overflow","opacity"],g=["position","top","bottom","left","right","overflow","opacity"],h=["width","height","overflow"],i=["fontSize"],f=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],k=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],p=c.effects.setMode(a,b.options.mode||"effect"),n=b.options.restore||false,m=b.options.scale||"both",l=b.options.origin,j={height:a.height(),width:a.width()};a.from=b.options.from||j;a.to=b.options.to||j;if(l){l=c.effects.getBaseline(l,j);a.from.top=(j.height-a.from.height)*l.y;a.from.left=(j.width-a.from.width)*l.x;a.to.top=(j.height-a.to.height)*l.y;a.to.left=(j.width-a.to.width)*l.x}var d={from:{y:a.from.height/j.height,x:a.from.width/j.width},to:{y:a.to.height/j.height,x:a.to.width/j.width}};if(m=="box"||m=="both"){if(d.from.y!=d.to.y){e=e.concat(f);a.from=c.effects.setTransition(a,f,d.from.y,a.from);a.to=c.effects.setTransition(a,f,d.to.y,a.to)}if(d.from.x!=d.to.x){e=e.concat(k);a.from=c.effects.setTransition(a,k,d.from.x,a.from);a.to=c.effects.setTransition(a,k,d.to.x,a.to)}}if(m=="content"||m=="both")if(d.from.y!=d.to.y){e=e.concat(i);a.from=c.effects.setTransition(a,i,d.from.y,a.from);a.to=c.effects.setTransition(a,i,d.to.y,a.to)}c.effects.save(a,n?e:g);a.show();c.effects.createWrapper(a);a.css("overflow","hidden").css(a.from);if(m=="content"||m=="both"){f=f.concat(["marginTop","marginBottom"]).concat(i);k=k.concat(["marginLeft","marginRight"]);h=e.concat(f).concat(k);a.find("*[width]").each(function(){child=c(this);n&&c.effects.save(child,h);var o={height:child.height(),width:child.width()};child.from={height:o.height*d.from.y,width:o.width*d.from.x};child.to={height:o.height*d.to.y,width:o.width*d.to.x};if(d.from.y!=d.to.y){child.from=c.effects.setTransition(child,f,d.from.y,child.from);child.to=c.effects.setTransition(child,f,d.to.y,child.to)}if(d.from.x!=d.to.x){child.from=c.effects.setTransition(child,k,d.from.x,child.from);child.to=c.effects.setTransition(child,k,d.to.x,child.to)}child.css(child.from);child.animate(child.to,b.duration,b.options.easing,function(){n&&c.effects.restore(child,h)})})}a.animate(a.to,{queue:false,duration:b.duration,easing:b.options.easing,complete:function(){a.to.opacity===0&&a.css("opacity",a.from.opacity);p=="hide"&&a.hide();c.effects.restore(a,n?e:g);c.effects.removeWrapper(a);b.callback&&b.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);;(function(d){d.effects.shake=function(a){return this.queue(function(){var b=d(this),j=["position","top","bottom","left","right"];d.effects.setMode(b,a.options.mode||"effect");var c=a.options.direction||"left",e=a.options.distance||20,l=a.options.times||3,f=a.duration||a.options.duration||140;d.effects.save(b,j);b.show();d.effects.createWrapper(b);var g=c=="up"||c=="down"?"top":"left",h=c=="up"||c=="left"?"pos":"neg";c={};var i={},k={};c[g]=(h=="pos"?"-=":"+=")+e;i[g]=(h=="pos"?"+=":"-=")+e*2;k[g]=(h=="pos"?"-=":"+=")+e*2;b.animate(c,f,a.options.easing);for(e=1;e<l;e++)b.animate(i,f,a.options.easing).animate(k,f,a.options.easing);b.animate(i,f,a.options.easing).animate(c,f/2,a.options.easing,function(){d.effects.restore(b,j);d.effects.removeWrapper(b);a.callback&&a.callback.apply(this,arguments)});b.queue("fx",function(){b.dequeue()});b.dequeue()})}})(jQuery);;(function(c){c.effects.slide=function(d){return this.queue(function(){var a=c(this),h=["position","top","bottom","left","right"],f=c.effects.setMode(a,d.options.mode||"show"),b=d.options.direction||"left";c.effects.save(a,h);a.show();c.effects.createWrapper(a).css({overflow:"hidden"});var g=b=="up"||b=="down"?"top":"left";b=b=="up"||b=="left"?"pos":"neg";var e=d.options.distance||(g=="top"?a.outerHeight({margin:true}):a.outerWidth({margin:true}));if(f=="show")a.css(g,b=="pos"?isNaN(e)?"-"+e:-e:e);var i={};i[g]=(f=="show"?b=="pos"?"+=":"-=":b=="pos"?"-=":"+=")+e;a.animate(i,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){f=="hide"&&a.hide();c.effects.restore(a,h);c.effects.removeWrapper(a);d.callback&&d.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);;(function(e){e.effects.transfer=function(a){return this.queue(function(){var b=e(this),c=e(a.options.to),d=c.offset();c={top:d.top,left:d.left,height:c.innerHeight(),width:c.innerWidth()};d=b.offset();var f=e('<div class="ui-effects-transfer"></div>').appendTo(document.body).addClass(a.options.className).css({top:d.top,left:d.left,height:b.innerHeight(),width:b.innerWidth(),position:"absolute"}).animate(c,a.duration,a.options.easing,function(){f.remove();a.callback&&a.callback.apply(b[0],arguments);b.dequeue()})})}})(jQuery);;
\ No newline at end of file
diff --git a/ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js b/ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
index 2cb7fee0e2e..10a1c415655 100644
--- a/ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
+++ b/ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
@@ -1,6 +1 @@
-/*! 
- * jquery.event.drag - v 2.0.0 
- * Copyright (c) 2010 Three Dub Media - http://threedubmedia.com
- * Open Source MIT License - http://threedubmedia.com/code/license
- */
-;(function(f){f.fn.drag=function(b,a,d){var e=typeof b=="string"?b:"",k=f.isFunction(b)?b:f.isFunction(a)?a:null;if(e.indexOf("drag")!==0)e="drag"+e;d=(b==k?a:d)||{};return k?this.bind(e,d,k):this.trigger(e)};var i=f.event,h=i.special,c=h.drag={defaults:{which:1,distance:0,not:":input",handle:null,relative:false,drop:true,click:false},datakey:"dragdata",livekey:"livedrag",add:function(b){var a=f.data(this,c.datakey),d=b.data||{};a.related+=1;if(!a.live&&b.selector){a.live=true;i.add(this,"draginit."+ c.livekey,c.delegate)}f.each(c.defaults,function(e){if(d[e]!==undefined)a[e]=d[e]})},remove:function(){f.data(this,c.datakey).related-=1},setup:function(){if(!f.data(this,c.datakey)){var b=f.extend({related:0},c.defaults);f.data(this,c.datakey,b);i.add(this,"mousedown",c.init,b);this.attachEvent&&this.attachEvent("ondragstart",c.dontstart)}},teardown:function(){if(!f.data(this,c.datakey).related){f.removeData(this,c.datakey);i.remove(this,"mousedown",c.init);i.remove(this,"draginit",c.delegate);c.textselect(true); this.detachEvent&&this.detachEvent("ondragstart",c.dontstart)}},init:function(b){var a=b.data,d;if(!(a.which>0&&b.which!=a.which))if(!f(b.target).is(a.not))if(!(a.handle&&!f(b.target).closest(a.handle,b.currentTarget).length)){a.propagates=1;a.interactions=[c.interaction(this,a)];a.target=b.target;a.pageX=b.pageX;a.pageY=b.pageY;a.dragging=null;d=c.hijack(b,"draginit",a);if(a.propagates){if((d=c.flatten(d))&&d.length){a.interactions=[];f.each(d,function(){a.interactions.push(c.interaction(this,a))})}a.propagates= a.interactions.length;a.drop!==false&&h.drop&&h.drop.handler(b,a);c.textselect(false);i.add(document,"mousemove mouseup",c.handler,a);return false}}},interaction:function(b,a){return{drag:b,callback:new c.callback,droppable:[],offset:f(b)[a.relative?"position":"offset"]()||{top:0,left:0}}},handler:function(b){var a=b.data;switch(b.type){case !a.dragging&&"mousemove":if(Math.pow(b.pageX-a.pageX,2)+Math.pow(b.pageY-a.pageY,2)<Math.pow(a.distance,2))break;b.target=a.target;c.hijack(b,"dragstart",a); if(a.propagates)a.dragging=true;case "mousemove":if(a.dragging){c.hijack(b,"drag",a);if(a.propagates){a.drop!==false&&h.drop&&h.drop.handler(b,a);break}b.type="mouseup"}case "mouseup":i.remove(document,"mousemove mouseup",c.handler);if(a.dragging){a.drop!==false&&h.drop&&h.drop.handler(b,a);c.hijack(b,"dragend",a)}c.textselect(true);if(a.click===false&&a.dragging){jQuery.event.triggered=true;setTimeout(function(){jQuery.event.triggered=false},20);a.dragging=false}break}},delegate:function(b){var a= [],d,e=f.data(this,"events")||{};f.each(e.live||[],function(k,j){if(j.preType.indexOf("drag")===0)if(d=f(b.target).closest(j.selector,b.currentTarget)[0]){i.add(d,j.origType+"."+c.livekey,j.origHandler,j.data);f.inArray(d,a)<0&&a.push(d)}});if(!a.length)return false;return f(a).bind("dragend."+c.livekey,function(){i.remove(this,"."+c.livekey)})},hijack:function(b,a,d,e,k){if(d){var j={event:b.originalEvent,type:b.type},n=a.indexOf("drop")?"drag":"drop",l,o=e||0,g,m;e=!isNaN(e)?e:d.interactions.length; b.type=a;b.originalEvent=null;d.results=[];do if(g=d.interactions[o])if(!(a!=="dragend"&&g.cancelled)){m=c.properties(b,d,g);g.results=[];f(k||g[n]||d.droppable).each(function(q,p){l=(m.target=p)?i.handle.call(p,b,m):null;if(l===false){if(n=="drag"){g.cancelled=true;d.propagates-=1}if(a=="drop")g[n][q]=null}else if(a=="dropinit")g.droppable.push(c.element(l)||p);if(a=="dragstart")g.proxy=f(c.element(l)||g.drag)[0];g.results.push(l);delete b.result;if(a!=="dropinit")return l});d.results[o]=c.flatten(g.results); if(a=="dropinit")g.droppable=c.flatten(g.droppable);a=="dragstart"&&!g.cancelled&&m.update()}while(++o<e);b.type=j.type;b.originalEvent=j.event;return c.flatten(d.results)}},properties:function(b,a,d){var e=d.callback;e.drag=d.drag;e.proxy=d.proxy||d.drag;e.startX=a.pageX;e.startY=a.pageY;e.deltaX=b.pageX-a.pageX;e.deltaY=b.pageY-a.pageY;e.originalX=d.offset.left;e.originalY=d.offset.top;e.offsetX=b.pageX-(a.pageX-e.originalX);e.offsetY=b.pageY-(a.pageY-e.originalY);e.drop=c.flatten((d.drop||[]).slice()); e.available=c.flatten((d.droppable||[]).slice());return e},element:function(b){if(b&&(b.jquery||b.nodeType==1))return b},flatten:function(b){return f.map(b,function(a){return a&&a.jquery?f.makeArray(a):a&&a.length?c.flatten(a):a})},textselect:function(b){f(document)[b?"unbind":"bind"]("selectstart",c.dontstart).attr("unselectable",b?"off":"on").css("MozUserSelect",b?"":"none")},dontstart:function(){return false},callback:function(){}};c.callback.prototype={update:function(){h.drop&&this.available.length&& f.each(this.available,function(b){h.drop.locate(this,b)})}};h.draginit=h.dragstart=h.dragend=c})(jQuery);
\ No newline at end of file
+;(function(f){f.fn.drag=function(b,a,d){var e=typeof b=="string"?b:"",k=f.isFunction(b)?b:f.isFunction(a)?a:null;if(e.indexOf("drag")!==0)e="drag"+e;d=(b==k?a:d)||{};return k?this.bind(e,d,k):this.trigger(e)};var i=f.event,h=i.special,c=h.drag={defaults:{which:1,distance:0,not:":input",handle:null,relative:false,drop:true,click:false},datakey:"dragdata",livekey:"livedrag",add:function(b){var a=f.data(this,c.datakey),d=b.data||{};a.related+=1;if(!a.live&&b.selector){a.live=true;i.add(this,"draginit."+c.livekey,c.delegate)}f.each(c.defaults,function(e){if(d[e]!==undefined)a[e]=d[e]})},remove:function(){f.data(this,c.datakey).related-=1},setup:function(){if(!f.data(this,c.datakey)){var b=f.extend({related:0},c.defaults);f.data(this,c.datakey,b);i.add(this,"mousedown",c.init,b);this.attachEvent&&this.attachEvent("ondragstart",c.dontstart)}},teardown:function(){if(!f.data(this,c.datakey).related){f.removeData(this,c.datakey);i.remove(this,"mousedown",c.init);i.remove(this,"draginit",c.delegate);c.textselect(true);this.detachEvent&&this.detachEvent("ondragstart",c.dontstart)}},init:function(b){var a=b.data,d;if(!(a.which>0&&b.which!=a.which))if(!f(b.target).is(a.not))if(!(a.handle&&!f(b.target).closest(a.handle,b.currentTarget).length)){a.propagates=1;a.interactions=[c.interaction(this,a)];a.target=b.target;a.pageX=b.pageX;a.pageY=b.pageY;a.dragging=null;d=c.hijack(b,"draginit",a);if(a.propagates){if((d=c.flatten(d))&&d.length){a.interactions=[];f.each(d,function(){a.interactions.push(c.interaction(this,a))})}a.propagates=a.interactions.length;a.drop!==false&&h.drop&&h.drop.handler(b,a);c.textselect(false);i.add(document,"mousemove mouseup",c.handler,a);return false}}},interaction:function(b,a){return{drag:b,callback:new c.callback,droppable:[],offset:f(b)[a.relative?"position":"offset"]()||{top:0,left:0}}},handler:function(b){var a=b.data;switch(b.type){case!a.dragging&&"mousemove":if(Math.pow(b.pageX-a.pageX,2)+Math.pow(b.pageY-a.pageY,2)<Math.pow(a.distance,2))break;b.target=a.target;c.hijack(b,"dragstart",a);if(a.propagates)a.dragging=true;case"mousemove":if(a.dragging){c.hijack(b,"drag",a);if(a.propagates){a.drop!==false&&h.drop&&h.drop.handler(b,a);break}b.type="mouseup"}case"mouseup":i.remove(document,"mousemove mouseup",c.handler);if(a.dragging){a.drop!==false&&h.drop&&h.drop.handler(b,a);c.hijack(b,"dragend",a)}c.textselect(true);if(a.click===false&&a.dragging){jQuery.event.triggered=true;setTimeout(function(){jQuery.event.triggered=false},20);a.dragging=false}break}},delegate:function(b){var a=[],d,e=f.data(this,"events")||{};f.each(e.live||[],function(k,j){if(j.preType.indexOf("drag")===0)if(d=f(b.target).closest(j.selector,b.currentTarget)[0]){i.add(d,j.origType+"."+c.livekey,j.origHandler,j.data);f.inArray(d,a)<0&&a.push(d)}});if(!a.length)return false;return f(a).bind("dragend."+c.livekey,function(){i.remove(this,"."+c.livekey)})},hijack:function(b,a,d,e,k){if(d){var j={event:b.originalEvent,type:b.type},n=a.indexOf("drop")?"drag":"drop",l,o=e||0,g,m;e=!isNaN(e)?e:d.interactions.length;b.type=a;b.originalEvent=null;d.results=[];do if(g=d.interactions[o])if(!(a!=="dragend"&&g.cancelled)){m=c.properties(b,d,g);g.results=[];f(k||g[n]||d.droppable).each(function(q,p){l=(m.target=p)?i.handle.call(p,b,m):null;if(l===false){if(n=="drag"){g.cancelled=true;d.propagates-=1}if(a=="drop")g[n][q]=null}else if(a=="dropinit")g.droppable.push(c.element(l)||p);if(a=="dragstart")g.proxy=f(c.element(l)||g.drag)[0];g.results.push(l);delete b.result;if(a!=="dropinit")return l});d.results[o]=c.flatten(g.results);if(a=="dropinit")g.droppable=c.flatten(g.droppable);a=="dragstart"&&!g.cancelled&&m.update()}while(++o<e);b.type=j.type;b.originalEvent=j.event;return c.flatten(d.results)}},properties:function(b,a,d){var e=d.callback;e.drag=d.drag;e.proxy=d.proxy||d.drag;e.startX=a.pageX;e.startY=a.pageY;e.deltaX=b.pageX-a.pageX;e.deltaY=b.pageY-a.pageY;e.originalX=d.offset.left;e.originalY=d.offset.top;e.offsetX=b.pageX-(a.pageX-e.originalX);e.offsetY=b.pageY-(a.pageY-e.originalY);e.drop=c.flatten((d.drop||[]).slice());e.available=c.flatten((d.droppable||[]).slice());return e},element:function(b){if(b&&(b.jquery||b.nodeType==1))return b},flatten:function(b){return f.map(b,function(a){return a&&a.jquery?f.makeArray(a):a&&a.length?c.flatten(a):a})},textselect:function(b){f(document)[b?"unbind":"bind"]("selectstart",c.dontstart).attr("unselectable",b?"off":"on").css("MozUserSelect",b?"":"none")},dontstart:function(){return false},callback:function(){}};c.callback.prototype={update:function(){h.drop&&this.available.length&&f.each(this.available,function(b){h.drop.locate(this,b)})}};h.draginit=h.dragstart=h.dragend=c})(jQuery);
\ No newline at end of file
diff --git a/ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.min.js b/ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.min.js
index edf0208feab..5935c73c379 100644
--- a/ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.min.js
+++ b/ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.min.js
@@ -1,84 +1,12 @@
-(function(e){function G(){var d=!1,e=!1;this.stopPropagation=function(){d=!0};this.isPropagationStopped=function(){return d};this.stopImmediatePropagation=function(){e=!0};this.isImmediatePropagationStopped=function(){return e}}function A(){this.__nonDataRow=!0}function ba(){this.__group=!0;this.__updated=!1;this.count=0;this.title=this.value=null;this.collapsed=!1;this.totals=null}function g(){this.__groupTotals=!0;this.group=null}function f(){var d=null;this.isActive=function(e){return e?d===e:
-null!==d};this.activate=function(e){if(e!==d){if(null!==d)throw"SlickGrid.EditorLock.activate: an editController is still active, can't activate another editController";if(!e.commitCurrentEdit)throw"SlickGrid.EditorLock.activate: editController must implement .commitCurrentEdit()";if(!e.cancelCurrentEdit)throw"SlickGrid.EditorLock.activate: editController must implement .cancelCurrentEdit()";d=e}};this.deactivate=function(e){if(d!==e)throw"SlickGrid.EditorLock.deactivate: specified editController is not the currently active one";
-d=null};this.commitCurrentEdit=function(){return d?d.commitCurrentEdit():!0};this.cancelCurrentEdit=function(){return d?d.cancelCurrentEdit():!0}}e.extend(!0,window,{Slick:{Event:function(){var d=[];this.subscribe=function(e){d.push(e)};this.unsubscribe=function(e){for(var f=d.length-1;f>=0;f--)d[f]===e&&d.splice(f,1)};this.notify=function(e,f,g){for(var f=f||new G,g=g||this,A,ma=0;ma<d.length&&!f.isPropagationStopped()&&!f.isImmediatePropagationStopped();ma++)A=d[ma].call(g,f,e);return A}},EventData:G,
-EventHandler:function(){var d=[];this.subscribe=function(e,f){d.push({event:e,handler:f});e.subscribe(f)};this.unsubscribe=function(e,f){for(var g=d.length;g--;)if(d[g].event===e&&d[g].handler===f){d.splice(g,1);e.unsubscribe(f);break}};this.unsubscribeAll=function(){for(var e=d.length;e--;)d[e].event.unsubscribe(d[e].handler);d=[]}},Range:function(d,e,f,g){if(f===void 0&&g===void 0){f=d;g=e}this.fromRow=Math.min(d,f);this.fromCell=Math.min(e,g);this.toRow=Math.max(d,f);this.toCell=Math.max(e,g);
-this.isSingleRow=function(){return this.fromRow==this.toRow};this.isSingleCell=function(){return this.fromRow==this.toRow&&this.fromCell==this.toCell};this.contains=function(d,e){return d>=this.fromRow&&d<=this.toRow&&e>=this.fromCell&&e<=this.toCell};this.toString=function(){return this.isSingleCell()?"("+this.fromRow+":"+this.fromCell+")":"("+this.fromRow+":"+this.fromCell+" - "+this.toRow+":"+this.toCell+")"}},NonDataRow:A,Group:ba,GroupTotals:g,EditorLock:f,GlobalEditorLock:new f}});ba.prototype=
-new A;ba.prototype.equals=function(d){return this.value===d.value&&this.count===d.count&&this.collapsed===d.collapsed};g.prototype=new A})(jQuery);/*
-
- (c) 2009-2012 Michael Leibman
- michael{dot}leibman{at}gmail{dot}com
- http://github.com/mleibman/slickgrid
-
- Distributed under MIT license.
- All rights reserved.
-
- SlickGrid v2.0
-
- NOTES:
-     Cell/row DOM manipulations are done directly bypassing jQuery's DOM manipulation methods.
-     This increases the speed dramatically, but can only be done safely because there are no event handlers
-     or data associated with any cell/row DOM nodes.  Cell editors must make sure they implement .destroy()
-     and do proper cleanup.
-*/
-if("undefined"===typeof jQuery)throw"SlickGrid requires jquery module to be loaded";if(!jQuery.fn.drag)throw"SlickGrid requires jquery.event.drag module to be loaded";if("undefined"===typeof Slick)throw"slick.core.js not loaded";
-(function(e){e.extend(!0,window,{Slick:{Grid:function(ba,g,f,d){function fb(){if(!H){H=true;U=parseFloat(e.css(n[0],"width",true));Vb();ma(t);d.enableTextSelectionOnCells||v.bind("selectstart.ui",function(a){return e(a.target).is("input,textarea")});hb();Wb();ib();K();Xb();n.bind("resize.slickgrid",K);v.bind("scroll.slickgrid",jb);ca.bind("contextmenu.slickgrid",Yb).bind("click.slickgrid",Zb);Ka.bind("keydown.slickgrid",kb);B.bind("keydown.slickgrid",kb).bind("click.slickgrid",$b).bind("dblclick.slickgrid",
-ac).bind("contextmenu.slickgrid",bc).bind("draginit",cc).bind("dragstart",dc).bind("drag",ec).bind("dragend",fc).delegate(".slick-cell","mouseenter",gc).delegate(".slick-cell","mouseleave",hc)}}function gb(a){for(var b=O.length;b>=0;b--)if(O[b]===a){O[b].destroy&&O[b].destroy();O.splice(b,1);break}}function Ub(){var a=e("<div style='position:absolute; top:-10000px; left:-10000px; width:100px; height:100px; overflow:scroll;'></div>").appendTo("body"),b={width:a.width()-a[0].clientWidth,height:a.height()-
-a[0].clientHeight};a.remove();return b}function Ja(a){for(var b=P,c=na?U-G.width:U,j=0,e=f.length;e--;)j=j+(f[e].width||La.width);P=d.fullWidthRows?Math.max(j,c):j;if(P!=b){B.width(P);da.width(P);lb=P>U-G.width}(P!=b||a)&&Ma()}function ma(a){a&&a.jquery&&a.attr("unselectable","on").css("MozUserSelect","none").bind("selectstart.ui",function(){return false})}function ic(){for(var a=1E6,b=e.browser.mozilla?5E6:1E9,c=e("<div style='display:none' />").appendTo(document.body);a<=b;){c.css("height",a+1E6);
-if(c.height()!==a+1E6)break;else a=a+1E6}c.remove();return a}function Xb(){for(var a=B[0];(a=a.parentNode)!=document.body&&a!=null;)(a==v[0]||a.scrollWidth!=a.clientWidth||a.scrollHeight!=a.clientHeight)&&e(a).bind("scroll.slickgrid",mb)}function hb(){function a(){e(this).addClass("ui-state-hover")}function b(){e(this).removeClass("ui-state-hover")}t.empty();da.empty();I={};for(var c=0;c<f.length;c++){var j=f[c]=e.extend({},La,f[c]);I[j.id]=c;var oa=e("<div class='ui-state-default slick-header-column' id='"+
-z+j.id+"' />").html("<span class='slick-column-name'>"+j.name+"</span>").width(j.width-V).attr("title",j.toolTip||j.name||"").data("fieldId",j.id).addClass(j.headerCssClass||"").appendTo(t);(d.enableColumnReorder||j.sortable)&&oa.hover(a,b);j.sortable&&oa.append("<span class='slick-sort-indicator' />");d.showHeaderRow&&e("<div class='ui-state-default slick-headerrow-column l"+c+" r"+c+"'></div>").appendTo(da)}d.showHeaderRow&&e("<div style='display:block;height:1px;width:10000px;position:absolute;top:0;left:0;'></div>").appendTo(Q);
-ta(r);nb();d.enableColumnReorder&&jc()}function Wb(){t.click(function(a){a.metaKey=a.metaKey||a.ctrlKey;if(!e(a.target).hasClass("slick-resizable-handle")){var b=e(a.target).closest(".slick-header-column");if(b.length){b=f[Na(b.data("fieldId"))];if(b.sortable&&p().commitCurrentEdit()){for(var c=null,j=0;j<r.length;j++)if(r[j].columnId==b.id){c=r[j];c.sortAsc=!c.sortAsc;break}if(a.metaKey&&d.multiColumnSort)c&&r.splice(j,1);else{if(!a.shiftKey&&!a.metaKey||!d.multiColumnSort)r=[];if(c)r.length==0&&
-r.push(c);else{c={columnId:b.id,sortAsc:true};r.push(c)}}ta(r);d.multiColumnSort?l(i.onSort,{multiColumnSort:true,sortCols:e.map(r,function(a){return{sortCol:f[I[a.columnId]],sortAsc:a.sortAsc}})},a):l(i.onSort,{multiColumnSort:false,sortCol:b,sortAsc:c.sortAsc},a)}}}})}function jc(){t.sortable({containment:"parent",axis:"x",cursor:"default",tolerance:"intersection",helper:"clone",placeholder:"slick-sortable-placeholder ui-state-default slick-header-column",forcePlaceholderSize:true,start:function(a,
-b){e(b.helper).addClass("slick-header-column-active")},beforeStop:function(a,b){e(b.helper).removeClass("slick-header-column-active")},stop:function(a){if(p().commitCurrentEdit()){for(var b=t.sortable("toArray"),c=[],j=0;j<b.length;j++)c.push(f[Na(b[j].replace(z,""))]);ob(c);l(i.onColumnsReordered,{});a.stopPropagation();nb()}else e(this).sortable("cancel")}})}function nb(){var a,b,c,j,oa,pb,h,g;j=t.children();j.find(".slick-resizable-handle").remove();j.each(function(a){if(f[a].resizable){h===void 0&&
-(h=a);g=a}});h!==void 0&&j.each(function(k,m){if(!(k<h||d.forceFitColumns&&k>=g)){e(m);e("<div class='slick-resizable-handle' />").appendTo(m).bind("dragstart",function(g){if(!p().commitCurrentEdit())return false;c=g.pageX;e(this).parent().addClass("slick-header-column-active");var h=g=null;j.each(function(a,b){f[a].previousWidth=e(b).outerWidth()});if(d.forceFitColumns){h=g=0;for(a=k+1;a<j.length;a++){b=f[a];if(b.resizable){h!==null&&(h=b.maxWidth?h+(b.maxWidth-b.previousWidth):null);g=g+(b.previousWidth-
+(function(e){function G(){var d=!1,e=!1;this.stopPropagation=function(){d=!0};this.isPropagationStopped=function(){return d};this.stopImmediatePropagation=function(){e=!0};this.isImmediatePropagationStopped=function(){return e}}function A(){this.__nonDataRow=!0}function ba(){this.__group=!0;this.__updated=!1;this.count=0;this.title=this.value=null;this.collapsed=!1;this.totals=null}function g(){this.__groupTotals=!0;this.group=null}function f(){var d=null;this.isActive=function(e){return e?d===e:null!==d};this.activate=function(e){if(e!==d){if(null!==d)throw"SlickGrid.EditorLock.activate: an editController is still active, can't activate another editController";if(!e.commitCurrentEdit)throw"SlickGrid.EditorLock.activate: editController must implement .commitCurrentEdit()";if(!e.cancelCurrentEdit)throw"SlickGrid.EditorLock.activate: editController must implement .cancelCurrentEdit()";d=e}};this.deactivate=function(e){if(d!==e)throw"SlickGrid.EditorLock.deactivate: specified editController is not the currently active one";d=null};this.commitCurrentEdit=function(){return d?d.commitCurrentEdit():!0};this.cancelCurrentEdit=function(){return d?d.cancelCurrentEdit():!0}}e.extend(!0,window,{Slick:{Event:function(){var d=[];this.subscribe=function(e){d.push(e)};this.unsubscribe=function(e){for(var f=d.length-1;f>=0;f--)d[f]===e&&d.splice(f,1)};this.notify=function(e,f,g){for(var f=f||new G,g=g||this,A,ma=0;ma<d.length&&!f.isPropagationStopped()&&!f.isImmediatePropagationStopped();ma++)A=d[ma].call(g,f,e);return A}},EventData:G,EventHandler:function(){var d=[];this.subscribe=function(e,f){d.push({event:e,handler:f});e.subscribe(f)};this.unsubscribe=function(e,f){for(var g=d.length;g--;)if(d[g].event===e&&d[g].handler===f){d.splice(g,1);e.unsubscribe(f);break}};this.unsubscribeAll=function(){for(var e=d.length;e--;)d[e].event.unsubscribe(d[e].handler);d=[]}},Range:function(d,e,f,g){if(f===void 0&&g===void 0){f=d;g=e}this.fromRow=Math.min(d,f);this.fromCell=Math.min(e,g);this.toRow=Math.max(d,f);this.toCell=Math.max(e,g);this.isSingleRow=function(){return this.fromRow==this.toRow};this.isSingleCell=function(){return this.fromRow==this.toRow&&this.fromCell==this.toCell};this.contains=function(d,e){return d>=this.fromRow&&d<=this.toRow&&e>=this.fromCell&&e<=this.toCell};this.toString=function(){return this.isSingleCell()?"("+this.fromRow+":"+this.fromCell+")":"("+this.fromRow+":"+this.fromCell+" - "+this.toRow+":"+this.toCell+")"}},NonDataRow:A,Group:ba,GroupTotals:g,EditorLock:f,GlobalEditorLock:new f}});ba.prototype=new A;ba.prototype.equals=function(d){return this.value===d.value&&this.count===d.count&&this.collapsed===d.collapsed};g.prototype=new A})(jQuery);if("undefined"===typeof jQuery)throw"SlickGrid requires jquery module to be loaded";if(!jQuery.fn.drag)throw"SlickGrid requires jquery.event.drag module to be loaded";if("undefined"===typeof Slick)throw"slick.core.js not loaded";(function(e){e.extend(!0,window,{Slick:{Grid:function(ba,g,f,d){function fb(){if(!H){H=true;U=parseFloat(e.css(n[0],"width",true));Vb();ma(t);d.enableTextSelectionOnCells||v.bind("selectstart.ui",function(a){return e(a.target).is("input,textarea")});hb();Wb();ib();K();Xb();n.bind("resize.slickgrid",K);v.bind("scroll.slickgrid",jb);ca.bind("contextmenu.slickgrid",Yb).bind("click.slickgrid",Zb);Ka.bind("keydown.slickgrid",kb);B.bind("keydown.slickgrid",kb).bind("click.slickgrid",$b).bind("dblclick.slickgrid",ac).bind("contextmenu.slickgrid",bc).bind("draginit",cc).bind("dragstart",dc).bind("drag",ec).bind("dragend",fc).delegate(".slick-cell","mouseenter",gc).delegate(".slick-cell","mouseleave",hc)}}function gb(a){for(var b=O.length;b>=0;b--)if(O[b]===a){O[b].destroy&&O[b].destroy();O.splice(b,1);break}}function Ub(){var a=e("<div style='position:absolute; top:-10000px; left:-10000px; width:100px; height:100px; overflow:scroll;'></div>").appendTo("body"),b={width:a.width()-a[0].clientWidth,height:a.height()-
+a[0].clientHeight};a.remove();return b}function Ja(a){for(var b=P,c=na?U-G.width:U,j=0,e=f.length;e--;)j=j+(f[e].width||La.width);P=d.fullWidthRows?Math.max(j,c):j;if(P!=b){B.width(P);da.width(P);lb=P>U-G.width}(P!=b||a)&&Ma()}function ma(a){a&&a.jquery&&a.attr("unselectable","on").css("MozUserSelect","none").bind("selectstart.ui",function(){return false})}function ic(){for(var a=1E6,b=e.browser.mozilla?5E6:1E9,c=e("<div style='display:none' />").appendTo(document.body);a<=b;){c.css("height",a+1E6);if(c.height()!==a+1E6)break;else a=a+1E6}c.remove();return a}function Xb(){for(var a=B[0];(a=a.parentNode)!=document.body&&a!=null;)(a==v[0]||a.scrollWidth!=a.clientWidth||a.scrollHeight!=a.clientHeight)&&e(a).bind("scroll.slickgrid",mb)}function hb(){function a(){e(this).addClass("ui-state-hover")}function b(){e(this).removeClass("ui-state-hover")}t.empty();da.empty();I={};for(var c=0;c<f.length;c++){var j=f[c]=e.extend({},La,f[c]);I[j.id]=c;var oa=e("<div class='ui-state-default slick-header-column' id='"+
+z+j.id+"' />").html("<span class='slick-column-name'>"+j.name+"</span>").width(j.width-V).attr("title",j.toolTip||j.name||"").data("fieldId",j.id).addClass(j.headerCssClass||"").appendTo(t);(d.enableColumnReorder||j.sortable)&&oa.hover(a,b);j.sortable&&oa.append("<span class='slick-sort-indicator' />");d.showHeaderRow&&e("<div class='ui-state-default slick-headerrow-column l"+c+" r"+c+"'></div>").appendTo(da)}d.showHeaderRow&&e("<div style='display:block;height:1px;width:10000px;position:absolute;top:0;left:0;'></div>").appendTo(Q);ta(r);nb();d.enableColumnReorder&&jc()}function Wb(){t.click(function(a){a.metaKey=a.metaKey||a.ctrlKey;if(!e(a.target).hasClass("slick-resizable-handle")){var b=e(a.target).closest(".slick-header-column");if(b.length){b=f[Na(b.data("fieldId"))];if(b.sortable&&p().commitCurrentEdit()){for(var c=null,j=0;j<r.length;j++)if(r[j].columnId==b.id){c=r[j];c.sortAsc=!c.sortAsc;break}if(a.metaKey&&d.multiColumnSort)c&&r.splice(j,1);else{if(!a.shiftKey&&!a.metaKey||!d.multiColumnSort)r=[];if(c)r.length==0&&r.push(c);else{c={columnId:b.id,sortAsc:true};r.push(c)}}ta(r);d.multiColumnSort?l(i.onSort,{multiColumnSort:true,sortCols:e.map(r,function(a){return{sortCol:f[I[a.columnId]],sortAsc:a.sortAsc}})},a):l(i.onSort,{multiColumnSort:false,sortCol:b,sortAsc:c.sortAsc},a)}}}})}function jc(){t.sortable({containment:"parent",axis:"x",cursor:"default",tolerance:"intersection",helper:"clone",placeholder:"slick-sortable-placeholder ui-state-default slick-header-column",forcePlaceholderSize:true,start:function(a,b){e(b.helper).addClass("slick-header-column-active")},beforeStop:function(a,b){e(b.helper).removeClass("slick-header-column-active")},stop:function(a){if(p().commitCurrentEdit()){for(var b=t.sortable("toArray"),c=[],j=0;j<b.length;j++)c.push(f[Na(b[j].replace(z,""))]);ob(c);l(i.onColumnsReordered,{});a.stopPropagation();nb()}else e(this).sortable("cancel")}})}function nb(){var a,b,c,j,oa,pb,h,g;j=t.children();j.find(".slick-resizable-handle").remove();j.each(function(a){if(f[a].resizable){h===void 0&&(h=a);g=a}});h!==void 0&&j.each(function(k,m){if(!(k<h||d.forceFitColumns&&k>=g)){e(m);e("<div class='slick-resizable-handle' />").appendTo(m).bind("dragstart",function(g){if(!p().commitCurrentEdit())return false;c=g.pageX;e(this).parent().addClass("slick-header-column-active");var h=g=null;j.each(function(a,b){f[a].previousWidth=e(b).outerWidth()});if(d.forceFitColumns){h=g=0;for(a=k+1;a<j.length;a++){b=f[a];if(b.resizable){h!==null&&(h=b.maxWidth?h+(b.maxWidth-b.previousWidth):null);g=g+(b.previousWidth-
 Math.max(b.minWidth||0,R))}}}var pa=0,i=0;for(a=0;a<=k;a++){b=f[a];if(b.resizable){i!==null&&(i=b.maxWidth?i+(b.maxWidth-b.previousWidth):null);pa=pa+(b.previousWidth-Math.max(b.minWidth||0,R))}}g===null&&(g=1E5);pa===null&&(pa=1E5);h===null&&(h=1E5);i===null&&(i=1E5);pb=c+Math.min(g,i);oa=c-Math.min(pa,h)}).bind("drag",function(e){var g=Math.min(pb,Math.max(oa,e.pageX))-c,h;if(g<0){h=g;for(a=k;a>=0;a--){b=f[a];if(b.resizable){e=Math.max(b.minWidth||0,R);if(h&&b.previousWidth+h<e){h=h+(b.previousWidth-
-e);b.width=e}else{b.width=b.previousWidth+h;h=0}}}if(d.forceFitColumns){h=-g;for(a=k+1;a<j.length;a++){b=f[a];if(b.resizable)if(h&&b.maxWidth&&b.maxWidth-b.previousWidth<h){h=h-(b.maxWidth-b.previousWidth);b.width=b.maxWidth}else{b.width=b.previousWidth+h;h=0}}}}else{h=g;for(a=k;a>=0;a--){b=f[a];if(b.resizable)if(h&&b.maxWidth&&b.maxWidth-b.previousWidth<h){h=h-(b.maxWidth-b.previousWidth);b.width=b.maxWidth}else{b.width=b.previousWidth+h;h=0}}if(d.forceFitColumns){h=-g;for(a=k+1;a<j.length;a++){b=
-f[a];if(b.resizable){e=Math.max(b.minWidth||0,R);if(h&&b.previousWidth+h<e){h=h+(b.previousWidth-e);b.width=e}else{b.width=b.previousWidth+h;h=0}}}}}qb();d.syncColumnCellResize&&Ma()}).bind("dragend",function(){var c;e(this).parent().removeClass("slick-header-column-active");for(a=0;a<j.length;a++){b=f[a];c=e(j[a]).outerWidth();b.previousWidth!==c&&b.rerenderOnResize&&W()}Ja(true);J();l(i.onColumnsResized,{})})}})}function Oa(a){var b=0;e.each(["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],
-function(c,j){b=b+(parseFloat(a.css(j))||0)});return b}function Vb(){var a,b=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],c=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"];a=e("<div class='ui-state-default slick-header-column' style='visibility:hidden'>-</div>").appendTo(t);V=Pa=0;e.each(b,function(b,c){V=V+(parseFloat(a.css(c))||0)});e.each(c,function(b,c){Pa=Pa+(parseFloat(a.css(c))||0)});a.remove();var j=e("<div class='slick-row' />").appendTo(B);a=e("<div class='slick-cell' id='' style='visibility:hidden'>-</div>").appendTo(j);
-ua=va=0;e.each(b,function(b,c){ua=ua+(parseFloat(a.css(c))||0)});e.each(c,function(b,c){va=va+(parseFloat(a.css(c))||0)});j.remove();R=Math.max(V,ua)}function ib(){X=e("<style type='text/css' rel='stylesheet' />").appendTo(e("head"));for(var a=["."+z+" .slick-header-column { left: 1000px; }","."+z+" .slick-top-panel { height:"+d.topPanelHeight+"px; }","."+z+" .slick-headerrow-columns { height:"+d.headerRowHeight+"px; }","."+z+" .slick-cell { height:"+(d.rowHeight-va)+"px; }","."+z+" .slick-row { height:"+
-d.rowHeight+"px; }"],b=0;b<f.length;b++){a.push("."+z+" .l"+b+" { }");a.push("."+z+" .r"+b+" { }")}X[0].styleSheet?X[0].styleSheet.cssText=a.join(" "):X[0].appendChild(document.createTextNode(a.join(" ")))}function l(a,b,c){c=c||new Slick.EventData;b=b||{};b.grid=i;return a.notify(b,c,i)}function p(){return d.editorLock}function Na(a){return I[a]}function Qa(){var a,b,c=[],j=0,d=0,e,h=na?U-G.width:U;for(a=0;a<f.length;a++){b=f[a];c.push(b.width);d=d+b.width;b.resizable&&(j=j+(b.width-Math.max(b.minWidth,
-R)))}for(e=d;d>h&&j;){var g=(d-h)/j;for(a=0;a<f.length&&d>h;a++){b=f[a];var k=c[a];if(b.resizable&&!(k<=b.minWidth||k<=R)){b=Math.max(b.minWidth,R);var i=Math.floor(g*(k-b))||1,i=Math.min(i,k-b),d=d-i,j=j-i;c[a]=c[a]-i}}if(e==d)break;e=d}for(e=d;d<h;){j=h/d;for(a=0;a<f.length&&d<h;a++){b=f[a];if(b.resizable&&!(b.maxWidth<=b.width)){g=Math.min(Math.floor(j*b.width)-b.width,b.maxWidth-b.width||1E6)||1;d=d+g;c[a]=c[a]+g}}if(e==d)break;e=d}d=false;for(a=0;a<f.length;a++){f[a].rerenderOnResize&&f[a].width!=
-c[a]&&(d=true);f[a].width=c[a]}qb();Ja(true);if(d){W();J()}}function qb(){if(H)for(var a,b=0,c=t.children(),d=c.length;b<d;b++){a=e(c[b]);a.width()!==f[b].width-V&&a.width(f[b].width-V)}}function Ma(){for(var a,b,c=0,d,e=0;e<f.length;e++){d=f[e].width;b=e;if(!Y){var g=document.styleSheets;for(a=0;a<g.length;a++)if((g[a].ownerNode||g[a].owningElement)==X[0]){Y=g[a];break}if(!Y)throw Error("Cannot find stylesheet.");Ra=[];Sa=[];var g=Y.cssRules||Y.rules,h=void 0,h=void 0;for(a=0;a<g.length;a++){var i=
-g[a].selectorText;if(h=/\.l\d+/.exec(i)){h=parseInt(h[0].substr(2,h[0].length-2),10);Ra[h]=g[a]}else if(h=/\.r\d+/.exec(i)){h=parseInt(h[0].substr(2,h[0].length-2),10);Sa[h]=g[a]}}}a=Ra[b];b=Sa[b];a.style.left=c+"px";b.style.right=P-c-d+"px";c=c+f[e].width}}function ta(a){r=a;var b=t.children();b.removeClass("slick-header-column-sorted").find(".slick-sort-indicator").removeClass("slick-sort-indicator-asc slick-sort-indicator-desc");e.each(r,function(a,d){if(d.sortAsc==null)d.sortAsc=true;var e=I[d.columnId];
-e!=null&&b.eq(e).addClass("slick-header-column-sorted").find(".slick-sort-indicator").addClass(d.sortAsc?"slick-sort-indicator-asc":"slick-sort-indicator-desc")})}function rb(a,b){Ta=[];for(var c={},j=0;j<b.length;j++)for(var e=b[j].fromRow;e<=b[j].toRow;e++){c[e]||Ta.push(e);c[e]={};for(var g=b[j].fromCell;g<=b[j].toCell;g++)if(sb(e,g))c[e][f[g].id]=d.selectedCellCssClass}tb(d.selectedCellCssClass,c);l(i.onSelectedRowsChanged,{rows:ub()},a)}function ob(a){f=a;if(H){W();hb();X.remove();Y=null;ib();
-K();Ma();jb()}}function q(){return g.getLength?g.getLength():g.length}function C(a){return g.getItem?g.getItem(a):g[a]}function ea(a){var b=w;fa=Math.min(ga-1,Math.floor(a/ha));w=Math.round(fa*wa);a=a-w;if(w!=b){var c=xa(a);vb(c.top,c.bottom);for(var e in x)x[e].style.top=e*d.rowHeight-w+"px"}if(ia!=a){Z=ia+b<a+w?1:-1;v[0].scrollTop=Ua=y=ia=a;l(i.onViewportChanged,{})}}function ya(a,b){var c=g.getItemMetadata&&g.getItemMetadata(a),e=c&&c.columns&&(c.columns[b.id]||c.columns[I[b.id]]);return e&&e.formatter||
-c&&c.formatter||b.formatter||d.formatterFactory&&d.formatterFactory.getFormatter(b)||d.defaultFormatter}function wb(a,b){var c=f[b],e=g.getItemMetadata&&g.getItemMetadata(a);return(e=e&&e.columns)&&e[c.id]&&e[c.id].editor!==void 0?e[c.id].editor:e&&e[b]&&e[b].editor!==void 0?e[b].editor:c.editor||d.editorFactory&&d.editorFactory.getEditor(c)}function za(a,b){return d.dataItemColumnValueExtractor?d.dataItemColumnValueExtractor(a,b):a[b.field]}function vb(a){for(var b in x)(b=parseInt(b,10))!==m&&(b<
-a.top||b>a.bottom)&&Aa(b)}function W(){k&&L();for(var a in x)Aa(a)}function Aa(a){var b=x[a];if(b){B[0].removeChild(b);delete x[a];delete Ba[a];Va--;xb++}}function yb(a){var b,c;if(a&&a.length){b=Z=0;for(c=a.length;b<c;b++){k&&m===a[b]&&L();x[a[b]]&&Aa(a[b])}}}function zb(a){yb([a])}function Wa(a){if(x[a]){var b=0;e(x[a]).children().each(function(c){var d=f[b],e=C(a);a===m&&c===u&&k?k.loadValue(C(m)):this.innerHTML=e?ya(a,d)(a,b,za(e,d),d,C(a)):"";b=b+$(a,c)});Xa(a)}}function K(){if(H){s=d.autoHeight?
-d.rowHeight*(q()+(d.enableAddRow?1:0)+(d.leaveSpaceForNewRows?Ca-1:0)):parseFloat(e.css(n[0],"height",true))-parseFloat(e.css(ca[0],"height"))-Oa(ca)-(d.showTopPanel?d.topPanelHeight+Oa(aa):0)-(d.showHeaderRow?d.headerRowHeight+Oa(Q):0);Ca=Math.ceil(s/d.rowHeight);U=parseFloat(e.css(n[0],"width",true));v.height(s);d.forceFitColumns&&Qa();Da();J()}}function Da(){if(H){Ya=q()+(d.enableAddRow?1:0)+(d.leaveSpaceForNewRows?Ca-1:0);var a=na;na=!d.autoHeight&&Ya*d.rowHeight>s;var b=d.enableAddRow?q():q()-
-1,c;for(c in x)c>=b&&Aa(c);b=M;N=Math.max(d.rowHeight*Ya,s-G.height);if(N<A){M=ha=N;ga=1;wa=0}else{M=A;ha=M/100;ga=Math.floor(N/ha);wa=(N-M)/(ga-1)}if(M!==b){B.css("height",M);y=v[0].scrollTop}c=y+w<=N-s;N==0||y==0?fa=w=0:c?ea(y+w):ea(N-s);M!=b&&d.autoHeight&&K();d.forceFitColumns&&a!=na&&Qa();Ja(false)}}function xa(a){a==null&&(a=y);return{top:Math.floor((a+w)/d.rowHeight),bottom:Math.ceil((a+w+s)/d.rowHeight)}}function Ab(a){var a=xa(a),b=Math.round(s/d.rowHeight);if(Z==-1){a.top=a.top-b;a.bottom=
-a.bottom+3}else if(Z==1){a.top=a.top-3;a.bottom=a.bottom+b}else{a.top=a.top-3;a.bottom=a.bottom+3}a.top=Math.max(0,a.top);a.bottom=Math.min(d.enableAddRow?q():q()-1,a.bottom);return a}function Bb(){if(d.enableAsyncPostRender){clearTimeout(Za);Za=setTimeout(Cb,d.asyncPostRenderDelay)}}function Xa(a){delete Ba[a];ja=Math.min(ja,a);qa=Math.max(qa,a);Bb()}function J(){if(H){var a=xa(),b=Ab();vb(b);var c,e,i=B[0];e=[];var k=[],h=false;for(c=b.top;c<=b.bottom;c++)if(!x[c]){Va++;k.push(c);var l=e,n=c,v=
-C(n),p=void 0,p="slick-row "+(n<q()&&!v?" loading":"")+(n%2==1?" odd":" even"),s=g.getItemMetadata&&g.getItemMetadata(n);s&&s.cssClasses&&(p=p+(" "+s.cssClasses));l.push("<div class='ui-widget-content "+p+"' row='"+n+"' style='top:"+(d.rowHeight*n-w)+"px'>");for(var t=s=void 0,r=0,A=f.length;r<A;r++){t=f[r];s=$(n,r);p="slick-cell l"+r+" r"+Math.min(f.length-1,r+s-1)+(t.cssClass?" "+t.cssClass:"");n===m&&r===u&&(p=p+" active");for(var z in D)D[z][n]&&D[z][n][t.id]&&(p=p+(" "+D[z][n][t.id]));l.push("<div class='"+
-p+"'>");v&&l.push(ya(n,t)(n,r,za(v,t),t,v));l.push("</div>");s&&(r=r+(s-1))}l.push("</div>");o&&m===c&&(h=true);Db++}if(k.length){b=document.createElement("div");b.innerHTML=e.join("");c=0;for(e=b.childNodes.length;c<e;c++)x[k[c]]=i.appendChild(b.firstChild);h&&(o=E(m,u))}ja=a.top;qa=Math.min(d.enableAddRow?q():q()-1,a.bottom);Bb();Ua=y;Ea=null}}function jb(){y=v[0].scrollTop;var a=v[0].scrollLeft,b=Math.abs(y-ia);if(a!==Eb){Eb=a;ca[0].scrollLeft=a;aa[0].scrollLeft=a;Q[0].scrollLeft=a}if(b){Z=ia<
-y?1:-1;ia=y;if(b<s)ea(y+w);else{b=w;fa=Math.min(ga-1,Math.floor(y*((N-s)/(M-s))*(1/ha)));w=Math.round(fa*wa);b!=w&&W()}Ea&&clearTimeout(Ea);Math.abs(Ua-y)<s?J():Ea=setTimeout(J,50);l(i.onViewportChanged,{})}l(i.onScroll,{scrollLeft:a,scrollTop:y})}function Cb(){for(;ja<=qa;){var a=Z>=0?ja++:qa--,b=x[a];if(b&&!(Ba[a]||a>=q())){for(var c=C(a),b=b.childNodes,e=0,g=0,i=f.length;e<i;++e){var h=f[e];h.asyncPostRender&&h.asyncPostRender(b[g],ja,c,h);++g}Ba[a]=true;Za=setTimeout(Cb,d.asyncPostRenderDelay);
-break}}}function $a(a,b){var c,d,f,g,h;for(h in x){g=b&&b[h];f=a&&a[h];if(g)for(d in g)if(!f||g[d]!=f[d])(c=E(h,I[d]))&&e(c).removeClass(g[d]);if(f)for(d in f)if(!g||g[d]!=f[d])(c=E(h,I[d]))&&e(c).addClass(f[d])}}function tb(a,b){var c=D[a];D[a]=b;$a(b,c);l(i.onCellCssStylesChanged,{key:a,hash:b})}function cc(a,b){var c=ra(a);if(!c||!ab(c.row,c.cell))return false;retval=l(i.onDragInit,b,a);return a.isImmediatePropagationStopped()?retval:false}function dc(a,b){var c=ra(a);if(!c||!ab(c.row,c.cell))return false;
-c=l(i.onDragStart,b,a);return a.isImmediatePropagationStopped()?c:false}function ec(a,b){return l(i.onDrag,b,a)}function fc(a,b){l(i.onDragEnd,b,a)}function kb(a){l(i.onKeyDown,{row:m,cell:u},a);if(!a.isImmediatePropagationStopped())if(!a.shiftKey&&!a.altKey&&!a.ctrlKey)if(a.which==27){if(!p().isActive())return;Fb()}else if(a.which==37)Gb();else if(a.which==39)Hb();else if(a.which==38)Ib();else if(a.which==40)Fa();else if(a.which==9)Jb();else if(a.which==13)d.editable&&(k?m===q()?Fa():Kb():p().commitCurrentEdit()&&
-Ga());else return;else if(a.which==9&&a.shiftKey&&!a.ctrlKey&&!a.altKey)Lb();else return;a.stopPropagation();a.preventDefault();try{a.originalEvent.keyCode=0}catch(b){}}function $b(a){k||S();var b=ra(a);if(b&&!(k!==null&&m==b.row&&u==b.cell)){l(i.onClick,{row:b.row,cell:b.cell},a);if(!a.isImmediatePropagationStopped()&&T(b.row,b.cell)&&(!p().isActive()||p().commitCurrentEdit())){sa(b.row,false);ka(E(b.row,b.cell),b.row===q()||d.autoEdit)}}}function bc(a){var b=e(a.target).closest(".slick-cell",B);
-b.length!==0&&!(o===b[0]&&k!==null)&&l(i.onContextMenu,{},a)}function ac(a){var b=ra(a);if(b&&!(k!==null&&m==b.row&&u==b.cell)){l(i.onDblClick,{row:b.row,cell:b.cell},a);a.isImmediatePropagationStopped()||d.editable&&Mb(b.row,b.cell,true)}}function Yb(a){var b=e(a.target).closest(".slick-header-column",".slick-header-columns"),b=b&&f[i.getColumnIndex(b.data("fieldId"))];l(i.onHeaderContextMenu,{column:b},a)}function Zb(a){var b=e(a.target).closest(".slick-header-column",".slick-header-columns");(b=
-b&&f[i.getColumnIndex(b.data("fieldId"))])&&l(i.onHeaderClick,{column:b},a)}function gc(a){l(i.onMouseEnter,{},a)}function hc(a){l(i.onMouseLeave,{},a)}function ab(a,b){return!(a<0||a>=q()||b<0||b>=f.length)}function bb(a){var b=/l\d+/.exec(a.className);if(!b)throw"getCellFromNode: cannot get cell - "+a.className;return parseInt(b[0].substr(1,b[0].length-1),10)}function ra(a){a=e(a.target).closest(".slick-cell",B);return!a.length?null:{row:a.parent().attr("row")|0,cell:bb(a[0])}}function S(){Ka[0].focus()}
-function kc(){if(o){var a=e(o).position().left,b=a+e(o).outerWidth(),c=v.scrollLeft(),d=c+v.width();a<c?v.scrollLeft(a):b>d&&v.scrollLeft(Math.min(a,b-v[0].clientWidth))}}function ka(a,b){if(o!==null){L();e(o).removeClass("active")}var c=o!==a;o=a;if(o!=null){m=parseInt(e(o).parent().attr("row"));u=cb=bb(o);e(o).addClass("active");if(d.editable&&b&&Nb(m,u)){clearTimeout(db);d.asyncEditorLoading?db=setTimeout(function(){Ga()},d.asyncEditorLoadDelay):Ga()}else S()}else m=u=null;if(c){kc();l(i.onActiveCellChanged,
-Ob())}}function Nb(a,b){return a<q()&&!C(a)||f[b].cannotTriggerInsert&&a>=q()||!wb(a,b)?false:true}function L(){if(k){l(i.onBeforeCellEditorDestroy,{editor:k});k.destroy();k=null;if(o){var a=C(m);e(o).removeClass("editable invalid");if(a){var b=f[u],c=ya(m,b);o.innerHTML=c(m,u,za(a,b),b,C(m));Xa(m)}}if(e.browser.msie)if(document.selection&&document.selection.empty)document.selection.empty();else if(window.getSelection)(a=window.getSelection())&&a.removeAllRanges&&a.removeAllRanges();p().deactivate(Ha)}}
-function Ga(a){if(o){if(!d.editable)throw"Grid : makeActiveCellEditable : should never get called when options.editable is false";clearTimeout(db);if(Nb(m,u)){var b=f[u],c=C(m);if(l(i.onBeforeEditCell,{row:m,cell:u,item:c,column:b})===false)S();else{p().activate(Ha);e(o).addClass("editable");if(!a)o.innerHTML="";k=new (a||wb(m,u))({grid:i,gridPosition:Ia(n[0]),position:Ia(o),container:o,column:b,item:c||{},commitChanges:Kb,cancelChanges:Fb});c&&k.loadValue(c);Pb=k.serializeValue();k.position&&mb()}}}}
-function Kb(){if(p().commitCurrentEdit()){S();d.autoEdit&&Fa()}}function Fb(){p().cancelCurrentEdit()&&S()}function Ia(a){var b={top:a.offsetTop,left:a.offsetLeft,bottom:0,right:0,width:e(a).outerWidth(),height:e(a).outerHeight(),visible:true};b.bottom=b.top+b.height;b.right=b.left+b.width;for(var c=a.offsetParent;(a=a.parentNode)!=document.body;){if(b.visible&&a.scrollHeight!=a.offsetHeight&&e(a).css("overflowY")!="visible")b.visible=b.bottom>a.scrollTop&&b.top<a.scrollTop+a.clientHeight;if(b.visible&&
-a.scrollWidth!=a.offsetWidth&&e(a).css("overflowX")!="visible")b.visible=b.right>a.scrollLeft&&b.left<a.scrollLeft+a.clientWidth;b.left=b.left-a.scrollLeft;b.top=b.top-a.scrollTop;if(a===c){b.left=b.left+a.offsetLeft;b.top=b.top+a.offsetTop;c=a.offsetParent}b.bottom=b.top+b.height;b.right=b.left+b.width}return b}function Qb(){return Ia(o)}function mb(){if(o){l(i.onActiveCellPositionChanged,{});if(k){var a=Qb();k.show&&k.hide&&(a.visible?k.show():k.hide());k.position&&k.position(a)}}}function Ob(){return o?
-{row:m,cell:u}:null}function sa(a,b){var c=a*d.rowHeight,e=(a+1)*d.rowHeight-s+(lb?G.height:0);if((a+1)*d.rowHeight>y+s+w){ea(b?c:e);J()}else if(a*d.rowHeight<y+w){ea(b?e:c);J()}}function $(a,b){var c=g.getItemMetadata&&g.getItemMetadata(a);if(!c||!c.columns)return 1;c=(c=c.columns[f[b].id]||c.columns[b])&&c.colspan;c==="*"&&(c=f.length-b);return c||1}function Rb(a){for(var b=0;b<f.length;){if(T(a,b))return b;b=b+$(a,b)}return null}function eb(a,b){if(b>=f.length)return null;do b=b+$(a,b);while(b<
-f.length&&!T(a,b));return b<f.length?{row:a,cell:b,posX:b}:null}function Sb(a,b){if(b<=0)return null;var c=Rb(a);if(c===null||c>=b)return null;for(var c={row:a,cell:c,posX:c},d;;){d=eb(c.row,c.cell,c.posX);if(!d)return null;if(d.cell>=b)return c;c=d}}function lc(a,b,c){for(var e;;){if(++a>=q()+(d.enableAddRow?1:0))return null;for(e=b=0;b<=c;){e=b;b=b+$(a,b)}if(T(a,e))return{row:a,cell:e,posX:c}}}function mc(a,b,c){for(var d;;){if(--a<0)return null;for(d=b=0;b<=c;){d=b;b=b+$(a,b)}if(T(a,d))return{row:a,
-cell:d,posX:c}}}function nc(a,b,c){if(b=eb(a,b,c))return b;for(b=null;++a<q()+(d.enableAddRow?1:0);){b=Rb(a);if(b!==null)return{row:a,cell:b,posX:b}}return null}function oc(a,b,c){for(var d,e;!d;){if(d=Sb(a,b,c))break;if(--a<0)return null;b=0;e=a;for(var g=0,h=null;g<f.length;){T(e,g)&&(h=g);g=g+$(e,g)}e=h;e!==null&&(d={row:a,cell:e,posX:e})}return d}function Hb(){la("right")}function Gb(){la("left")}function Fa(){la("down")}function Ib(){la("up")}function Jb(){la("next")}function Lb(){la("prev")}
-function la(a){if(o&&d.enableCellNavigation&&p().commitCurrentEdit()){S();if(a=(0,{up:mc,down:lc,left:Sb,right:eb,prev:oc,next:nc}[a])(m,u,cb)){var b=a.row==q();sa(a.row,!b);ka(E(a.row,a.cell),b||d.autoEdit);cb=a.posX}else ka(E(m,u),m==q()||d.autoEdit)}}function E(a,b){if(x[a])for(var c=e(x[a]).children(),d,f=0;f<c.length;f++){d=bb(c[f]);if(d===b)return c[f];if(d>b)break}return null}function T(a,b){if(!d.enableCellNavigation||a>=q()+(d.enableAddRow?1:0)||a<0||b>=f.length||b<0)return false;var c=g.getItemMetadata&&
-g.getItemMetadata(a);if(c&&typeof c.focusable==="boolean")return c.focusable;return(c=c&&c.columns)&&c[f[b].id]&&typeof c[f[b].id].focusable==="boolean"?c[f[b].id].focusable:c&&c[b]&&typeof c[b].focusable==="boolean"?c[b].focusable:typeof f[b].focusable==="boolean"?f[b].focusable:true}function sb(a,b){if(a>=q()||a<0||b>=f.length||b<0)return false;var c=g.getItemMetadata&&g.getItemMetadata(a);if(c&&typeof c.selectable==="boolean")return c.selectable;return(c=c&&c.columns&&(c.columns[f[b].id]||c.columns[b]))&&
-typeof c.selectable==="boolean"?c.selectable:typeof f[b].selectable==="boolean"?f[b].selectable:true}function Mb(a,b,c){if(H&&T(a,b)&&p().commitCurrentEdit()){sa(a,false);b=E(a,b);ka(b,c||a===q()||d.autoEdit);k||S()}}function pc(a){for(var b=[],c=f.length-1,d=0;d<a.length;d++)b.push(new Slick.Range(a[d],0,a[d],c));return b}function ub(){if(!F)throw"Selection model is not set";return Ta}var qc={explicitInitialization:false,rowHeight:25,defaultColumnWidth:80,enableAddRow:false,leaveSpaceForNewRows:false,
-editable:false,autoEdit:true,enableCellNavigation:true,enableColumnReorder:true,asyncEditorLoading:false,asyncEditorLoadDelay:100,forceFitColumns:false,enableAsyncPostRender:false,asyncPostRenderDelay:60,autoHeight:false,editorLock:Slick.GlobalEditorLock,showHeaderRow:false,headerRowHeight:25,showTopPanel:false,topPanelHeight:25,formatterFactory:null,editorFactory:null,cellFlashingCssClass:"flashing",selectedCellCssClass:"selected",multiSelect:true,enableTextSelectionOnCells:false,dataItemColumnValueExtractor:null,
-fullWidthRows:false,multiColumnSort:false,defaultFormatter:function(a,b,c){return c==null?"":c.toString().replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;")}},La={name:"",resizable:true,sortable:false,minWidth:30,rerenderOnResize:false,headerCssClass:null},N,M,ha,ga,wa,fa=0,w=0,Z=1,H=false,n,z="slickgrid_"+Math.round(1E6*Math.random()),i=this,Ka,ca,t,da,Q,aa,Tb,v,B,X,Y,Ra,Sa,s,U,P,lb,na,V=0,Pa=0,ua=0,va=0,R,Ya=0,cb,m,u,o=null,k=null,Pb,Ha,x={},Va=0,Ca,ia=0,y=0,Ua=0,Eb=0,F,Ta=[],O=[],
-D={},I={},r=[],db=null,Ea=null,Za=null,Ba={},qa=null,ja=null,Db=0,xb=0;this.debug=function(){var a;a="\ncounter_rows_rendered:  "+Db;a=a+("\ncounter_rows_removed:  "+xb);a=a+("\nrenderedRows:  "+Va);a=a+("\nnumVisibleRows:  "+Ca);a=a+("\nmaxSupportedCssHeight:  "+A);a=a+("\nn(umber of pages):  "+ga);a=a+("\n(current) page:  "+fa);a=a+("\npage height (ph):  "+ha);a=a+("\nscrollDir:  "+Z);alert(a)};this.eval=function(a){return eval(a)};e.extend(this,{slickGridVersion:"2.0",onScroll:new Slick.Event,
-onSort:new Slick.Event,onHeaderContextMenu:new Slick.Event,onHeaderClick:new Slick.Event,onMouseEnter:new Slick.Event,onMouseLeave:new Slick.Event,onClick:new Slick.Event,onDblClick:new Slick.Event,onContextMenu:new Slick.Event,onKeyDown:new Slick.Event,onAddNewRow:new Slick.Event,onValidationError:new Slick.Event,onViewportChanged:new Slick.Event,onColumnsReordered:new Slick.Event,onColumnsResized:new Slick.Event,onCellChange:new Slick.Event,onBeforeEditCell:new Slick.Event,onBeforeCellEditorDestroy:new Slick.Event,
-onBeforeDestroy:new Slick.Event,onActiveCellChanged:new Slick.Event,onActiveCellPositionChanged:new Slick.Event,onDragInit:new Slick.Event,onDragStart:new Slick.Event,onDrag:new Slick.Event,onDragEnd:new Slick.Event,onSelectedRowsChanged:new Slick.Event,onCellCssStylesChanged:new Slick.Event,registerPlugin:function(a){O.unshift(a);a.init(i)},unregisterPlugin:gb,getColumns:function(){return f},setColumns:ob,getColumnIndex:Na,updateColumnHeader:function(a,b,c){if(H){var a=I[a],d=t.children().eq(a);
-if(d){f[a].name=b;f[a].toolTip=c;d.attr("title",c||b||"").children().eq(0).html(b)}}},setSortColumn:function(a,b){ta([{columnId:a,sortAsc:b}])},setSortColumns:ta,getSortColumns:function(){return r},autosizeColumns:Qa,getOptions:function(){return d},setOptions:function(a){if(p().commitCurrentEdit()){L();d.enableAddRow!==a.enableAddRow&&zb(q());d=e.extend(d,a);v.css("overflow-y",d.autoHeight?"hidden":"auto");J()}},getData:function(){return g},getDataLength:q,getDataItem:C,setData:function(a,b){g=a;
-W();Da();b&&ea(0)},getSelectionModel:function(){return F},setSelectionModel:function(a){if(F){F.onSelectedRangesChanged.unsubscribe(rb);F.destroy&&F.destroy()}if(F=a){F.init(i);F.onSelectedRangesChanged.subscribe(rb)}},getSelectedRows:ub,setSelectedRows:function(a){if(!F)throw"Selection model is not set";F.setSelectedRanges(pc(a))},render:J,invalidate:function(){Da();W();J()},invalidateRow:zb,invalidateRows:yb,invalidateAllRows:W,updateCell:function(a,b){var c=E(a,b);if(c){var d=f[b],e=C(a);if(k&&
-m===a&&u===b)k.loadValue(e);else{c.innerHTML=e?ya(a,d)(a,b,za(e,d),d,e):"";Xa(a)}}},updateRow:Wa,getViewport:xa,getRenderedRange:Ab,resizeCanvas:K,updateRowCount:Da,scrollRowIntoView:sa,getCanvasNode:function(){return B[0]},focus:S,getCellFromPoint:function(a,b){for(var c=Math.floor((b+w)/d.rowHeight),e=0,g=0,i=0;i<f.length&&g<a;i++){g=g+f[i].width;e++}e<0&&(e=0);return{row:c,cell:e-1}},getCellFromEvent:ra,getActiveCell:Ob,setActiveCell:function(a,b){if(H&&!(a>q()||a<0||b>=f.length||b<0)&&d.enableCellNavigation){sa(a,
-false);ka(E(a,b),false)}},getActiveCellNode:function(){return o},getActiveCellPosition:Qb,resetActiveCell:function(){ka(null,false)},editActiveCell:Ga,getCellEditor:function(){return k},getCellNode:E,getCellNodeBox:function(a,b){if(!ab(a,b))return null;for(var c=a*d.rowHeight-w,e=c+d.rowHeight-1,g=0,i=0;i<b;i++)g=g+f[i].width;return{top:c,left:g,bottom:e,right:g+f[b].width}},canCellBeSelected:sb,canCellBeActive:T,navigatePrev:Lb,navigateNext:Jb,navigateUp:Ib,navigateDown:Fa,navigateLeft:Gb,navigateRight:Hb,
-gotoCell:Mb,getTopPanel:function(){return Tb[0]},showTopPanel:function(){d.showTopPanel=true;aa.slideDown("fast",K)},hideTopPanel:function(){d.showTopPanel=false;aa.slideUp("fast",K)},showHeaderRowColumns:function(){d.showHeaderRow=true;Q.slideDown("fast",K)},hideHeaderRowColumns:function(){d.showHeaderRow=false;Q.slideUp("fast",K)},getHeaderRow:function(){return da[0]},getHeaderRowColumn:function(a){a=I[a];return(a=da.children().eq(a))&&a[0]},getGridPosition:function(){return Ia(n[0])},flashCell:function(a,
-b,c){c=c||100;if(x[a]){var f=e(E(a,b)),g=function(a){a&&setTimeout(function(){f.queue(function(){f.toggleClass(d.cellFlashingCssClass).dequeue();g(a-1)})},c)};g(4)}},addCellCssStyles:function(a,b){if(D[a])throw"addCellCssStyles: cell CSS hash with key '"+a+"' already exists.";D[a]=b;$a(b,null);l(i.onCellCssStylesChanged,{key:a,hash:b})},setCellCssStyles:tb,removeCellCssStyles:function(a){if(D[a]){$a(null,D[a]);delete D[a];l(i.onCellCssStylesChanged,{key:a,hash:null})}},getCellCssStyles:function(a){return D[a]},
-init:fb,destroy:function(){p().cancelCurrentEdit();l(i.onBeforeDestroy,{});for(var a=0;a<O.length;a++)gb(O[a]);d.enableColumnReorder&&t.sortable&&t.sortable("destroy");B.parents().unbind("scroll.slickgrid");n.unbind(".slickgrid");X.remove();Y=null;B.unbind("draginit dragstart dragend drag");n.empty().removeClass(z)},getEditorLock:p,getEditController:function(){return Ha}});n=e(ba);if(n.length<1)throw Error("SlickGrid requires a valid container, "+ba+" does not exist in the DOM.");A=A||ic();G=G||Ub();
-d=e.extend({},qc,d);La.width=d.defaultColumnWidth;if(d.enableColumnReorder&&!e.fn.sortable)throw Error("SlickGrid's 'enableColumnReorder = true' option requires jquery-ui.sortable module to be loaded");Ha={commitCurrentEdit:function(){var a=C(m),b=f[u];if(k){if(k.isValueChanged()){var c=k.validate();if(c.valid){if(m<q()){c={row:m,cell:u,editor:k,serializedValue:k.serializeValue(),prevSerializedValue:Pb,execute:function(){this.editor.applyValue(a,this.serializedValue);Wa(this.row)},undo:function(){this.editor.applyValue(a,
-this.prevSerializedValue);Wa(this.row)}};if(d.editCommandHandler){L();d.editCommandHandler(a,b,c)}else{c.execute();L()}l(i.onCellChange,{row:m,cell:u,item:a})}else{c={};k.applyValue(c,k.serializeValue());L();l(i.onAddNewRow,{item:c,column:b})}return!p().isActive()}e(o).addClass("invalid");e(o).stop(true,true).effect("highlight",{color:"red"},300);l(i.onValidationError,{editor:k,cellNode:o,validationResults:c,row:m,cell:u,column:b});k.focus();return false}L()}return true},cancelCurrentEdit:function(){L();
-return true}};n.empty().css("overflow","hidden").css("outline",0).addClass(z).addClass("ui-widget");/relative|absolute|fixed/.test(n.css("position"))||n.css("position","relative");Ka=e("<div tabIndex='0' hideFocus style='position:fixed;width:0;height:0;top:0;left:0;outline:0;'></div>").appendTo(n);ca=e("<div class='slick-header ui-state-default' style='overflow:hidden;position:relative;' />").appendTo(n);t=e("<div class='slick-header-columns' style='width:10000px; left:-1000px' />").appendTo(ca);
-Q=e("<div class='slick-headerrow ui-state-default' style='overflow:hidden;position:relative;' />").appendTo(n);da=e("<div class='slick-headerrow-columns' />").appendTo(Q);aa=e("<div class='slick-top-panel-scroller ui-state-default' style='overflow:hidden;position:relative;' />").appendTo(n);Tb=e("<div class='slick-top-panel' style='width:10000px' />").appendTo(aa);d.showTopPanel||aa.hide();d.showHeaderRow||Q.hide();v=e("<div class='slick-viewport' style='width:100%;overflow:auto;outline:0;position:relative;;'>").appendTo(n);
-v.css("overflow-y",d.autoHeight?"hidden":"auto");B=e("<div class='grid-canvas' />").appendTo(v);d.explicitInitialization||fb()}}});var G,A})(jQuery);
+e);b.width=e}else{b.width=b.previousWidth+h;h=0}}}if(d.forceFitColumns){h=-g;for(a=k+1;a<j.length;a++){b=f[a];if(b.resizable)if(h&&b.maxWidth&&b.maxWidth-b.previousWidth<h){h=h-(b.maxWidth-b.previousWidth);b.width=b.maxWidth}else{b.width=b.previousWidth+h;h=0}}}}else{h=g;for(a=k;a>=0;a--){b=f[a];if(b.resizable)if(h&&b.maxWidth&&b.maxWidth-b.previousWidth<h){h=h-(b.maxWidth-b.previousWidth);b.width=b.maxWidth}else{b.width=b.previousWidth+h;h=0}}if(d.forceFitColumns){h=-g;for(a=k+1;a<j.length;a++){b=f[a];if(b.resizable){e=Math.max(b.minWidth||0,R);if(h&&b.previousWidth+h<e){h=h+(b.previousWidth-e);b.width=e}else{b.width=b.previousWidth+h;h=0}}}}}qb();d.syncColumnCellResize&&Ma()}).bind("dragend",function(){var c;e(this).parent().removeClass("slick-header-column-active");for(a=0;a<j.length;a++){b=f[a];c=e(j[a]).outerWidth();b.previousWidth!==c&&b.rerenderOnResize&&W()}Ja(true);J();l(i.onColumnsResized,{})})}})}function Oa(a){var b=0;e.each(["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],function(c,j){b=b+(parseFloat(a.css(j))||0)});return b}function Vb(){var a,b=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],c=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"];a=e("<div class='ui-state-default slick-header-column' style='visibility:hidden'>-</div>").appendTo(t);V=Pa=0;e.each(b,function(b,c){V=V+(parseFloat(a.css(c))||0)});e.each(c,function(b,c){Pa=Pa+(parseFloat(a.css(c))||0)});a.remove();var j=e("<div class='slick-row' />").appendTo(B);a=e("<div class='slick-cell' id='' style='visibility:hidden'>-</div>").appendTo(j);ua=va=0;e.each(b,function(b,c){ua=ua+(parseFloat(a.css(c))||0)});e.each(c,function(b,c){va=va+(parseFloat(a.css(c))||0)});j.remove();R=Math.max(V,ua)}function ib(){X=e("<style type='text/css' rel='stylesheet' />").appendTo(e("head"));for(var a=["."+z+" .slick-header-column { left: 1000px; }","."+z+" .slick-top-panel { height:"+d.topPanelHeight+"px; }","."+z+" .slick-headerrow-columns { height:"+d.headerRowHeight+"px; }","."+z+" .slick-cell { height:"+(d.rowHeight-va)+"px; }","."+z+" .slick-row { height:"+
+d.rowHeight+"px; }"],b=0;b<f.length;b++){a.push("."+z+" .l"+b+" { }");a.push("."+z+" .r"+b+" { }")}X[0].styleSheet?X[0].styleSheet.cssText=a.join(" "):X[0].appendChild(document.createTextNode(a.join(" ")))}function l(a,b,c){c=c||new Slick.EventData;b=b||{};b.grid=i;return a.notify(b,c,i)}function p(){return d.editorLock}function Na(a){return I[a]}function Qa(){var a,b,c=[],j=0,d=0,e,h=na?U-G.width:U;for(a=0;a<f.length;a++){b=f[a];c.push(b.width);d=d+b.width;b.resizable&&(j=j+(b.width-Math.max(b.minWidth,R)))}for(e=d;d>h&&j;){var g=(d-h)/j;for(a=0;a<f.length&&d>h;a++){b=f[a];var k=c[a];if(b.resizable&&!(k<=b.minWidth||k<=R)){b=Math.max(b.minWidth,R);var i=Math.floor(g*(k-b))||1,i=Math.min(i,k-b),d=d-i,j=j-i;c[a]=c[a]-i}}if(e==d)break;e=d}for(e=d;d<h;){j=h/d;for(a=0;a<f.length&&d<h;a++){b=f[a];if(b.resizable&&!(b.maxWidth<=b.width)){g=Math.min(Math.floor(j*b.width)-b.width,b.maxWidth-b.width||1E6)||1;d=d+g;c[a]=c[a]+g}}if(e==d)break;e=d}d=false;for(a=0;a<f.length;a++){f[a].rerenderOnResize&&f[a].width!=c[a]&&(d=true);f[a].width=c[a]}qb();Ja(true);if(d){W();J()}}function qb(){if(H)for(var a,b=0,c=t.children(),d=c.length;b<d;b++){a=e(c[b]);a.width()!==f[b].width-V&&a.width(f[b].width-V)}}function Ma(){for(var a,b,c=0,d,e=0;e<f.length;e++){d=f[e].width;b=e;if(!Y){var g=document.styleSheets;for(a=0;a<g.length;a++)if((g[a].ownerNode||g[a].owningElement)==X[0]){Y=g[a];break}if(!Y)throw Error("Cannot find stylesheet.");Ra=[];Sa=[];var g=Y.cssRules||Y.rules,h=void 0,h=void 0;for(a=0;a<g.length;a++){var i=g[a].selectorText;if(h=/\.l\d+/.exec(i)){h=parseInt(h[0].substr(2,h[0].length-2),10);Ra[h]=g[a]}else if(h=/\.r\d+/.exec(i)){h=parseInt(h[0].substr(2,h[0].length-2),10);Sa[h]=g[a]}}}a=Ra[b];b=Sa[b];a.style.left=c+"px";b.style.right=P-c-d+"px";c=c+f[e].width}}function ta(a){r=a;var b=t.children();b.removeClass("slick-header-column-sorted").find(".slick-sort-indicator").removeClass("slick-sort-indicator-asc slick-sort-indicator-desc");e.each(r,function(a,d){if(d.sortAsc==null)d.sortAsc=true;var e=I[d.columnId];e!=null&&b.eq(e).addClass("slick-header-column-sorted").find(".slick-sort-indicator").addClass(d.sortAsc?"slick-sort-indicator-asc":"slick-sort-indicator-desc")})}function rb(a,b){Ta=[];for(var c={},j=0;j<b.length;j++)for(var e=b[j].fromRow;e<=b[j].toRow;e++){c[e]||Ta.push(e);c[e]={};for(var g=b[j].fromCell;g<=b[j].toCell;g++)if(sb(e,g))c[e][f[g].id]=d.selectedCellCssClass}tb(d.selectedCellCssClass,c);l(i.onSelectedRowsChanged,{rows:ub()},a)}function ob(a){f=a;if(H){W();hb();X.remove();Y=null;ib();K();Ma();jb()}}function q(){return g.getLength?g.getLength():g.length}function C(a){return g.getItem?g.getItem(a):g[a]}function ea(a){var b=w;fa=Math.min(ga-1,Math.floor(a/ha));w=Math.round(fa*wa);a=a-w;if(w!=b){var c=xa(a);vb(c.top,c.bottom);for(var e in x)x[e].style.top=e*d.rowHeight-w+"px"}if(ia!=a){Z=ia+b<a+w?1:-1;v[0].scrollTop=Ua=y=ia=a;l(i.onViewportChanged,{})}}function ya(a,b){var c=g.getItemMetadata&&g.getItemMetadata(a),e=c&&c.columns&&(c.columns[b.id]||c.columns[I[b.id]]);return e&&e.formatter||c&&c.formatter||b.formatter||d.formatterFactory&&d.formatterFactory.getFormatter(b)||d.defaultFormatter}function wb(a,b){var c=f[b],e=g.getItemMetadata&&g.getItemMetadata(a);return(e=e&&e.columns)&&e[c.id]&&e[c.id].editor!==void 0?e[c.id].editor:e&&e[b]&&e[b].editor!==void 0?e[b].editor:c.editor||d.editorFactory&&d.editorFactory.getEditor(c)}function za(a,b){return d.dataItemColumnValueExtractor?d.dataItemColumnValueExtractor(a,b):a[b.field]}function vb(a){for(var b in x)(b=parseInt(b,10))!==m&&(b<a.top||b>a.bottom)&&Aa(b)}function W(){k&&L();for(var a in x)Aa(a)}function Aa(a){var b=x[a];if(b){B[0].removeChild(b);delete x[a];delete Ba[a];Va--;xb++}}function yb(a){var b,c;if(a&&a.length){b=Z=0;for(c=a.length;b<c;b++){k&&m===a[b]&&L();x[a[b]]&&Aa(a[b])}}}function zb(a){yb([a])}function Wa(a){if(x[a]){var b=0;e(x[a]).children().each(function(c){var d=f[b],e=C(a);a===m&&c===u&&k?k.loadValue(C(m)):this.innerHTML=e?ya(a,d)(a,b,za(e,d),d,C(a)):"";b=b+$(a,c)});Xa(a)}}function K(){if(H){s=d.autoHeight?d.rowHeight*(q()+(d.enableAddRow?1:0)+(d.leaveSpaceForNewRows?Ca-1:0)):parseFloat(e.css(n[0],"height",true))-parseFloat(e.css(ca[0],"height"))-Oa(ca)-(d.showTopPanel?d.topPanelHeight+Oa(aa):0)-(d.showHeaderRow?d.headerRowHeight+Oa(Q):0);Ca=Math.ceil(s/d.rowHeight);U=parseFloat(e.css(n[0],"width",true));v.height(s);d.forceFitColumns&&Qa();Da();J()}}function Da(){if(H){Ya=q()+(d.enableAddRow?1:0)+(d.leaveSpaceForNewRows?Ca-1:0);var a=na;na=!d.autoHeight&&Ya*d.rowHeight>s;var b=d.enableAddRow?q():q()-
+1,c;for(c in x)c>=b&&Aa(c);b=M;N=Math.max(d.rowHeight*Ya,s-G.height);if(N<A){M=ha=N;ga=1;wa=0}else{M=A;ha=M/100;ga=Math.floor(N/ha);wa=(N-M)/(ga-1)}if(M!==b){B.css("height",M);y=v[0].scrollTop}c=y+w<=N-s;N==0||y==0?fa=w=0:c?ea(y+w):ea(N-s);M!=b&&d.autoHeight&&K();d.forceFitColumns&&a!=na&&Qa();Ja(false)}}function xa(a){a==null&&(a=y);return{top:Math.floor((a+w)/d.rowHeight),bottom:Math.ceil((a+w+s)/d.rowHeight)}}function Ab(a){var a=xa(a),b=Math.round(s/d.rowHeight);if(Z==-1){a.top=a.top-b;a.bottom=a.bottom+3}else if(Z==1){a.top=a.top-3;a.bottom=a.bottom+b}else{a.top=a.top-3;a.bottom=a.bottom+3}a.top=Math.max(0,a.top);a.bottom=Math.min(d.enableAddRow?q():q()-1,a.bottom);return a}function Bb(){if(d.enableAsyncPostRender){clearTimeout(Za);Za=setTimeout(Cb,d.asyncPostRenderDelay)}}function Xa(a){delete Ba[a];ja=Math.min(ja,a);qa=Math.max(qa,a);Bb()}function J(){if(H){var a=xa(),b=Ab();vb(b);var c,e,i=B[0];e=[];var k=[],h=false;for(c=b.top;c<=b.bottom;c++)if(!x[c]){Va++;k.push(c);var l=e,n=c,v=C(n),p=void 0,p="slick-row "+(n<q()&&!v?" loading":"")+(n%2==1?" odd":" even"),s=g.getItemMetadata&&g.getItemMetadata(n);s&&s.cssClasses&&(p=p+(" "+s.cssClasses));l.push("<div class='ui-widget-content "+p+"' row='"+n+"' style='top:"+(d.rowHeight*n-w)+"px'>");for(var t=s=void 0,r=0,A=f.length;r<A;r++){t=f[r];s=$(n,r);p="slick-cell l"+r+" r"+Math.min(f.length-1,r+s-1)+(t.cssClass?" "+t.cssClass:"");n===m&&r===u&&(p=p+" active");for(var z in D)D[z][n]&&D[z][n][t.id]&&(p=p+(" "+D[z][n][t.id]));l.push("<div class='"+
+p+"'>");v&&l.push(ya(n,t)(n,r,za(v,t),t,v));l.push("</div>");s&&(r=r+(s-1))}l.push("</div>");o&&m===c&&(h=true);Db++}if(k.length){b=document.createElement("div");b.innerHTML=e.join("");c=0;for(e=b.childNodes.length;c<e;c++)x[k[c]]=i.appendChild(b.firstChild);h&&(o=E(m,u))}ja=a.top;qa=Math.min(d.enableAddRow?q():q()-1,a.bottom);Bb();Ua=y;Ea=null}}function jb(){y=v[0].scrollTop;var a=v[0].scrollLeft,b=Math.abs(y-ia);if(a!==Eb){Eb=a;ca[0].scrollLeft=a;aa[0].scrollLeft=a;Q[0].scrollLeft=a}if(b){Z=ia<y?1:-1;ia=y;if(b<s)ea(y+w);else{b=w;fa=Math.min(ga-1,Math.floor(y*((N-s)/(M-s))*(1/ha)));w=Math.round(fa*wa);b!=w&&W()}Ea&&clearTimeout(Ea);Math.abs(Ua-y)<s?J():Ea=setTimeout(J,50);l(i.onViewportChanged,{})}l(i.onScroll,{scrollLeft:a,scrollTop:y})}function Cb(){for(;ja<=qa;){var a=Z>=0?ja++:qa--,b=x[a];if(b&&!(Ba[a]||a>=q())){for(var c=C(a),b=b.childNodes,e=0,g=0,i=f.length;e<i;++e){var h=f[e];h.asyncPostRender&&h.asyncPostRender(b[g],ja,c,h);++g}Ba[a]=true;Za=setTimeout(Cb,d.asyncPostRenderDelay);break}}}function $a(a,b){var c,d,f,g,h;for(h in x){g=b&&b[h];f=a&&a[h];if(g)for(d in g)if(!f||g[d]!=f[d])(c=E(h,I[d]))&&e(c).removeClass(g[d]);if(f)for(d in f)if(!g||g[d]!=f[d])(c=E(h,I[d]))&&e(c).addClass(f[d])}}function tb(a,b){var c=D[a];D[a]=b;$a(b,c);l(i.onCellCssStylesChanged,{key:a,hash:b})}function cc(a,b){var c=ra(a);if(!c||!ab(c.row,c.cell))return false;retval=l(i.onDragInit,b,a);return a.isImmediatePropagationStopped()?retval:false}function dc(a,b){var c=ra(a);if(!c||!ab(c.row,c.cell))return false;c=l(i.onDragStart,b,a);return a.isImmediatePropagationStopped()?c:false}function ec(a,b){return l(i.onDrag,b,a)}function fc(a,b){l(i.onDragEnd,b,a)}function kb(a){l(i.onKeyDown,{row:m,cell:u},a);if(!a.isImmediatePropagationStopped())if(!a.shiftKey&&!a.altKey&&!a.ctrlKey)if(a.which==27){if(!p().isActive())return;Fb()}else if(a.which==37)Gb();else if(a.which==39)Hb();else if(a.which==38)Ib();else if(a.which==40)Fa();else if(a.which==9)Jb();else if(a.which==13)d.editable&&(k?m===q()?Fa():Kb():p().commitCurrentEdit()&&Ga());else return;else if(a.which==9&&a.shiftKey&&!a.ctrlKey&&!a.altKey)Lb();else return;a.stopPropagation();a.preventDefault();try{a.originalEvent.keyCode=0}catch(b){}}function $b(a){k||S();var b=ra(a);if(b&&!(k!==null&&m==b.row&&u==b.cell)){l(i.onClick,{row:b.row,cell:b.cell},a);if(!a.isImmediatePropagationStopped()&&T(b.row,b.cell)&&(!p().isActive()||p().commitCurrentEdit())){sa(b.row,false);ka(E(b.row,b.cell),b.row===q()||d.autoEdit)}}}function bc(a){var b=e(a.target).closest(".slick-cell",B);b.length!==0&&!(o===b[0]&&k!==null)&&l(i.onContextMenu,{},a)}function ac(a){var b=ra(a);if(b&&!(k!==null&&m==b.row&&u==b.cell)){l(i.onDblClick,{row:b.row,cell:b.cell},a);a.isImmediatePropagationStopped()||d.editable&&Mb(b.row,b.cell,true)}}function Yb(a){var b=e(a.target).closest(".slick-header-column",".slick-header-columns"),b=b&&f[i.getColumnIndex(b.data("fieldId"))];l(i.onHeaderContextMenu,{column:b},a)}function Zb(a){var b=e(a.target).closest(".slick-header-column",".slick-header-columns");(b=b&&f[i.getColumnIndex(b.data("fieldId"))])&&l(i.onHeaderClick,{column:b},a)}function gc(a){l(i.onMouseEnter,{},a)}function hc(a){l(i.onMouseLeave,{},a)}function ab(a,b){return!(a<0||a>=q()||b<0||b>=f.length)}function bb(a){var b=/l\d+/.exec(a.className);if(!b)throw"getCellFromNode: cannot get cell - "+a.className;return parseInt(b[0].substr(1,b[0].length-1),10)}function ra(a){a=e(a.target).closest(".slick-cell",B);return!a.length?null:{row:a.parent().attr("row")|0,cell:bb(a[0])}}function S(){Ka[0].focus()}
+function kc(){if(o){var a=e(o).position().left,b=a+e(o).outerWidth(),c=v.scrollLeft(),d=c+v.width();a<c?v.scrollLeft(a):b>d&&v.scrollLeft(Math.min(a,b-v[0].clientWidth))}}function ka(a,b){if(o!==null){L();e(o).removeClass("active")}var c=o!==a;o=a;if(o!=null){m=parseInt(e(o).parent().attr("row"));u=cb=bb(o);e(o).addClass("active");if(d.editable&&b&&Nb(m,u)){clearTimeout(db);d.asyncEditorLoading?db=setTimeout(function(){Ga()},d.asyncEditorLoadDelay):Ga()}else S()}else m=u=null;if(c){kc();l(i.onActiveCellChanged,Ob())}}function Nb(a,b){return a<q()&&!C(a)||f[b].cannotTriggerInsert&&a>=q()||!wb(a,b)?false:true}function L(){if(k){l(i.onBeforeCellEditorDestroy,{editor:k});k.destroy();k=null;if(o){var a=C(m);e(o).removeClass("editable invalid");if(a){var b=f[u],c=ya(m,b);o.innerHTML=c(m,u,za(a,b),b,C(m));Xa(m)}}if(e.browser.msie)if(document.selection&&document.selection.empty)document.selection.empty();else if(window.getSelection)(a=window.getSelection())&&a.removeAllRanges&&a.removeAllRanges();p().deactivate(Ha)}}
+function Ga(a){if(o){if(!d.editable)throw"Grid : makeActiveCellEditable : should never get called when options.editable is false";clearTimeout(db);if(Nb(m,u)){var b=f[u],c=C(m);if(l(i.onBeforeEditCell,{row:m,cell:u,item:c,column:b})===false)S();else{p().activate(Ha);e(o).addClass("editable");if(!a)o.innerHTML="";k=new(a||wb(m,u))({grid:i,gridPosition:Ia(n[0]),position:Ia(o),container:o,column:b,item:c||{},commitChanges:Kb,cancelChanges:Fb});c&&k.loadValue(c);Pb=k.serializeValue();k.position&&mb()}}}}
+function Kb(){if(p().commitCurrentEdit()){S();d.autoEdit&&Fa()}}function Fb(){p().cancelCurrentEdit()&&S()}function Ia(a){var b={top:a.offsetTop,left:a.offsetLeft,bottom:0,right:0,width:e(a).outerWidth(),height:e(a).outerHeight(),visible:true};b.bottom=b.top+b.height;b.right=b.left+b.width;for(var c=a.offsetParent;(a=a.parentNode)!=document.body;){if(b.visible&&a.scrollHeight!=a.offsetHeight&&e(a).css("overflowY")!="visible")b.visible=b.bottom>a.scrollTop&&b.top<a.scrollTop+a.clientHeight;if(b.visible&&a.scrollWidth!=a.offsetWidth&&e(a).css("overflowX")!="visible")b.visible=b.right>a.scrollLeft&&b.left<a.scrollLeft+a.clientWidth;b.left=b.left-a.scrollLeft;b.top=b.top-a.scrollTop;if(a===c){b.left=b.left+a.offsetLeft;b.top=b.top+a.offsetTop;c=a.offsetParent}b.bottom=b.top+b.height;b.right=b.left+b.width}return b}function Qb(){return Ia(o)}function mb(){if(o){l(i.onActiveCellPositionChanged,{});if(k){var a=Qb();k.show&&k.hide&&(a.visible?k.show():k.hide());k.position&&k.position(a)}}}function Ob(){return o?{row:m,cell:u}:null}function sa(a,b){var c=a*d.rowHeight,e=(a+1)*d.rowHeight-s+(lb?G.height:0);if((a+1)*d.rowHeight>y+s+w){ea(b?c:e);J()}else if(a*d.rowHeight<y+w){ea(b?e:c);J()}}function $(a,b){var c=g.getItemMetadata&&g.getItemMetadata(a);if(!c||!c.columns)return 1;c=(c=c.columns[f[b].id]||c.columns[b])&&c.colspan;c==="*"&&(c=f.length-b);return c||1}function Rb(a){for(var b=0;b<f.length;){if(T(a,b))return b;b=b+$(a,b)}return null}function eb(a,b){if(b>=f.length)return null;do b=b+$(a,b);while(b<f.length&&!T(a,b));return b<f.length?{row:a,cell:b,posX:b}:null}function Sb(a,b){if(b<=0)return null;var c=Rb(a);if(c===null||c>=b)return null;for(var c={row:a,cell:c,posX:c},d;;){d=eb(c.row,c.cell,c.posX);if(!d)return null;if(d.cell>=b)return c;c=d}}function lc(a,b,c){for(var e;;){if(++a>=q()+(d.enableAddRow?1:0))return null;for(e=b=0;b<=c;){e=b;b=b+$(a,b)}if(T(a,e))return{row:a,cell:e,posX:c}}}function mc(a,b,c){for(var d;;){if(--a<0)return null;for(d=b=0;b<=c;){d=b;b=b+$(a,b)}if(T(a,d))return{row:a,cell:d,posX:c}}}function nc(a,b,c){if(b=eb(a,b,c))return b;for(b=null;++a<q()+(d.enableAddRow?1:0);){b=Rb(a);if(b!==null)return{row:a,cell:b,posX:b}}return null}function oc(a,b,c){for(var d,e;!d;){if(d=Sb(a,b,c))break;if(--a<0)return null;b=0;e=a;for(var g=0,h=null;g<f.length;){T(e,g)&&(h=g);g=g+$(e,g)}e=h;e!==null&&(d={row:a,cell:e,posX:e})}return d}function Hb(){la("right")}function Gb(){la("left")}function Fa(){la("down")}function Ib(){la("up")}function Jb(){la("next")}function Lb(){la("prev")}
+function la(a){if(o&&d.enableCellNavigation&&p().commitCurrentEdit()){S();if(a=(0,{up:mc,down:lc,left:Sb,right:eb,prev:oc,next:nc}[a])(m,u,cb)){var b=a.row==q();sa(a.row,!b);ka(E(a.row,a.cell),b||d.autoEdit);cb=a.posX}else ka(E(m,u),m==q()||d.autoEdit)}}function E(a,b){if(x[a])for(var c=e(x[a]).children(),d,f=0;f<c.length;f++){d=bb(c[f]);if(d===b)return c[f];if(d>b)break}return null}function T(a,b){if(!d.enableCellNavigation||a>=q()+(d.enableAddRow?1:0)||a<0||b>=f.length||b<0)return false;var c=g.getItemMetadata&&g.getItemMetadata(a);if(c&&typeof c.focusable==="boolean")return c.focusable;return(c=c&&c.columns)&&c[f[b].id]&&typeof c[f[b].id].focusable==="boolean"?c[f[b].id].focusable:c&&c[b]&&typeof c[b].focusable==="boolean"?c[b].focusable:typeof f[b].focusable==="boolean"?f[b].focusable:true}function sb(a,b){if(a>=q()||a<0||b>=f.length||b<0)return false;var c=g.getItemMetadata&&g.getItemMetadata(a);if(c&&typeof c.selectable==="boolean")return c.selectable;return(c=c&&c.columns&&(c.columns[f[b].id]||c.columns[b]))&&typeof c.selectable==="boolean"?c.selectable:typeof f[b].selectable==="boolean"?f[b].selectable:true}function Mb(a,b,c){if(H&&T(a,b)&&p().commitCurrentEdit()){sa(a,false);b=E(a,b);ka(b,c||a===q()||d.autoEdit);k||S()}}function pc(a){for(var b=[],c=f.length-1,d=0;d<a.length;d++)b.push(new Slick.Range(a[d],0,a[d],c));return b}function ub(){if(!F)throw"Selection model is not set";return Ta}var qc={explicitInitialization:false,rowHeight:25,defaultColumnWidth:80,enableAddRow:false,leaveSpaceForNewRows:false,editable:false,autoEdit:true,enableCellNavigation:true,enableColumnReorder:true,asyncEditorLoading:false,asyncEditorLoadDelay:100,forceFitColumns:false,enableAsyncPostRender:false,asyncPostRenderDelay:60,autoHeight:false,editorLock:Slick.GlobalEditorLock,showHeaderRow:false,headerRowHeight:25,showTopPanel:false,topPanelHeight:25,formatterFactory:null,editorFactory:null,cellFlashingCssClass:"flashing",selectedCellCssClass:"selected",multiSelect:true,enableTextSelectionOnCells:false,dataItemColumnValueExtractor:null,fullWidthRows:false,multiColumnSort:false,defaultFormatter:function(a,b,c){return c==null?"":c.toString().replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;")}},La={name:"",resizable:true,sortable:false,minWidth:30,rerenderOnResize:false,headerCssClass:null},N,M,ha,ga,wa,fa=0,w=0,Z=1,H=false,n,z="slickgrid_"+Math.round(1E6*Math.random()),i=this,Ka,ca,t,da,Q,aa,Tb,v,B,X,Y,Ra,Sa,s,U,P,lb,na,V=0,Pa=0,ua=0,va=0,R,Ya=0,cb,m,u,o=null,k=null,Pb,Ha,x={},Va=0,Ca,ia=0,y=0,Ua=0,Eb=0,F,Ta=[],O=[],D={},I={},r=[],db=null,Ea=null,Za=null,Ba={},qa=null,ja=null,Db=0,xb=0;this.debug=function(){var a;a="\ncounter_rows_rendered:  "+Db;a=a+("\ncounter_rows_removed:  "+xb);a=a+("\nrenderedRows:  "+Va);a=a+("\nnumVisibleRows:  "+Ca);a=a+("\nmaxSupportedCssHeight:  "+A);a=a+("\nn(umber of pages):  "+ga);a=a+("\n(current) page:  "+fa);a=a+("\npage height (ph):  "+ha);a=a+("\nscrollDir:  "+Z);alert(a)};this.eval=function(a){return eval(a)};e.extend(this,{slickGridVersion:"2.0",onScroll:new Slick.Event,onSort:new Slick.Event,onHeaderContextMenu:new Slick.Event,onHeaderClick:new Slick.Event,onMouseEnter:new Slick.Event,onMouseLeave:new Slick.Event,onClick:new Slick.Event,onDblClick:new Slick.Event,onContextMenu:new Slick.Event,onKeyDown:new Slick.Event,onAddNewRow:new Slick.Event,onValidationError:new Slick.Event,onViewportChanged:new Slick.Event,onColumnsReordered:new Slick.Event,onColumnsResized:new Slick.Event,onCellChange:new Slick.Event,onBeforeEditCell:new Slick.Event,onBeforeCellEditorDestroy:new Slick.Event,onBeforeDestroy:new Slick.Event,onActiveCellChanged:new Slick.Event,onActiveCellPositionChanged:new Slick.Event,onDragInit:new Slick.Event,onDragStart:new Slick.Event,onDrag:new Slick.Event,onDragEnd:new Slick.Event,onSelectedRowsChanged:new Slick.Event,onCellCssStylesChanged:new Slick.Event,registerPlugin:function(a){O.unshift(a);a.init(i)},unregisterPlugin:gb,getColumns:function(){return f},setColumns:ob,getColumnIndex:Na,updateColumnHeader:function(a,b,c){if(H){var a=I[a],d=t.children().eq(a);if(d){f[a].name=b;f[a].toolTip=c;d.attr("title",c||b||"").children().eq(0).html(b)}}},setSortColumn:function(a,b){ta([{columnId:a,sortAsc:b}])},setSortColumns:ta,getSortColumns:function(){return r},autosizeColumns:Qa,getOptions:function(){return d},setOptions:function(a){if(p().commitCurrentEdit()){L();d.enableAddRow!==a.enableAddRow&&zb(q());d=e.extend(d,a);v.css("overflow-y",d.autoHeight?"hidden":"auto");J()}},getData:function(){return g},getDataLength:q,getDataItem:C,setData:function(a,b){g=a;W();Da();b&&ea(0)},getSelectionModel:function(){return F},setSelectionModel:function(a){if(F){F.onSelectedRangesChanged.unsubscribe(rb);F.destroy&&F.destroy()}if(F=a){F.init(i);F.onSelectedRangesChanged.subscribe(rb)}},getSelectedRows:ub,setSelectedRows:function(a){if(!F)throw"Selection model is not set";F.setSelectedRanges(pc(a))},render:J,invalidate:function(){Da();W();J()},invalidateRow:zb,invalidateRows:yb,invalidateAllRows:W,updateCell:function(a,b){var c=E(a,b);if(c){var d=f[b],e=C(a);if(k&&m===a&&u===b)k.loadValue(e);else{c.innerHTML=e?ya(a,d)(a,b,za(e,d),d,e):"";Xa(a)}}},updateRow:Wa,getViewport:xa,getRenderedRange:Ab,resizeCanvas:K,updateRowCount:Da,scrollRowIntoView:sa,getCanvasNode:function(){return B[0]},focus:S,getCellFromPoint:function(a,b){for(var c=Math.floor((b+w)/d.rowHeight),e=0,g=0,i=0;i<f.length&&g<a;i++){g=g+f[i].width;e++}e<0&&(e=0);return{row:c,cell:e-1}},getCellFromEvent:ra,getActiveCell:Ob,setActiveCell:function(a,b){if(H&&!(a>q()||a<0||b>=f.length||b<0)&&d.enableCellNavigation){sa(a,false);ka(E(a,b),false)}},getActiveCellNode:function(){return o},getActiveCellPosition:Qb,resetActiveCell:function(){ka(null,false)},editActiveCell:Ga,getCellEditor:function(){return k},getCellNode:E,getCellNodeBox:function(a,b){if(!ab(a,b))return null;for(var c=a*d.rowHeight-w,e=c+d.rowHeight-1,g=0,i=0;i<b;i++)g=g+f[i].width;return{top:c,left:g,bottom:e,right:g+f[b].width}},canCellBeSelected:sb,canCellBeActive:T,navigatePrev:Lb,navigateNext:Jb,navigateUp:Ib,navigateDown:Fa,navigateLeft:Gb,navigateRight:Hb,gotoCell:Mb,getTopPanel:function(){return Tb[0]},showTopPanel:function(){d.showTopPanel=true;aa.slideDown("fast",K)},hideTopPanel:function(){d.showTopPanel=false;aa.slideUp("fast",K)},showHeaderRowColumns:function(){d.showHeaderRow=true;Q.slideDown("fast",K)},hideHeaderRowColumns:function(){d.showHeaderRow=false;Q.slideUp("fast",K)},getHeaderRow:function(){return da[0]},getHeaderRowColumn:function(a){a=I[a];return(a=da.children().eq(a))&&a[0]},getGridPosition:function(){return Ia(n[0])},flashCell:function(a,b,c){c=c||100;if(x[a]){var f=e(E(a,b)),g=function(a){a&&setTimeout(function(){f.queue(function(){f.toggleClass(d.cellFlashingCssClass).dequeue();g(a-1)})},c)};g(4)}},addCellCssStyles:function(a,b){if(D[a])throw"addCellCssStyles: cell CSS hash with key '"+a+"' already exists.";D[a]=b;$a(b,null);l(i.onCellCssStylesChanged,{key:a,hash:b})},setCellCssStyles:tb,removeCellCssStyles:function(a){if(D[a]){$a(null,D[a]);delete D[a];l(i.onCellCssStylesChanged,{key:a,hash:null})}},getCellCssStyles:function(a){return D[a]},init:fb,destroy:function(){p().cancelCurrentEdit();l(i.onBeforeDestroy,{});for(var a=0;a<O.length;a++)gb(O[a]);d.enableColumnReorder&&t.sortable&&t.sortable("destroy");B.parents().unbind("scroll.slickgrid");n.unbind(".slickgrid");X.remove();Y=null;B.unbind("draginit dragstart dragend drag");n.empty().removeClass(z)},getEditorLock:p,getEditController:function(){return Ha}});n=e(ba);if(n.length<1)throw Error("SlickGrid requires a valid container, "+ba+" does not exist in the DOM.");A=A||ic();G=G||Ub();d=e.extend({},qc,d);La.width=d.defaultColumnWidth;if(d.enableColumnReorder&&!e.fn.sortable)throw Error("SlickGrid's 'enableColumnReorder = true' option requires jquery-ui.sortable module to be loaded");Ha={commitCurrentEdit:function(){var a=C(m),b=f[u];if(k){if(k.isValueChanged()){var c=k.validate();if(c.valid){if(m<q()){c={row:m,cell:u,editor:k,serializedValue:k.serializeValue(),prevSerializedValue:Pb,execute:function(){this.editor.applyValue(a,this.serializedValue);Wa(this.row)},undo:function(){this.editor.applyValue(a,this.prevSerializedValue);Wa(this.row)}};if(d.editCommandHandler){L();d.editCommandHandler(a,b,c)}else{c.execute();L()}l(i.onCellChange,{row:m,cell:u,item:a})}else{c={};k.applyValue(c,k.serializeValue());L();l(i.onAddNewRow,{item:c,column:b})}return!p().isActive()}e(o).addClass("invalid");e(o).stop(true,true).effect("highlight",{color:"red"},300);l(i.onValidationError,{editor:k,cellNode:o,validationResults:c,row:m,cell:u,column:b});k.focus();return false}L()}return true},cancelCurrentEdit:function(){L();return true}};n.empty().css("overflow","hidden").css("outline",0).addClass(z).addClass("ui-widget");/relative|absolute|fixed/.test(n.css("position"))||n.css("position","relative");Ka=e("<div tabIndex='0' hideFocus style='position:fixed;width:0;height:0;top:0;left:0;outline:0;'></div>").appendTo(n);ca=e("<div class='slick-header ui-state-default' style='overflow:hidden;position:relative;' />").appendTo(n);t=e("<div class='slick-header-columns' style='width:10000px; left:-1000px' />").appendTo(ca);Q=e("<div class='slick-headerrow ui-state-default' style='overflow:hidden;position:relative;' />").appendTo(n);da=e("<div class='slick-headerrow-columns' />").appendTo(Q);aa=e("<div class='slick-top-panel-scroller ui-state-default' style='overflow:hidden;position:relative;' />").appendTo(n);Tb=e("<div class='slick-top-panel' style='width:10000px' />").appendTo(aa);d.showTopPanel||aa.hide();d.showHeaderRow||Q.hide();v=e("<div class='slick-viewport' style='width:100%;overflow:auto;outline:0;position:relative;;'>").appendTo(n);v.css("overflow-y",d.autoHeight?"hidden":"auto");B=e("<div class='grid-canvas' />").appendTo(v);d.explicitInitialization||fb()}}});var G,A})(jQuery);
\ No newline at end of file

From 15c0b86ac15a7011b8864447dbb51103efdd4b85 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Thu, 16 Aug 2012 09:15:57 +0100
Subject: [PATCH 067/130] [#2375] Allow extra html in autoforms

---
 ckan/templates/macros/autoform.html | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ckan/templates/macros/autoform.html b/ckan/templates/macros/autoform.html
index ff3c46ae077..5774875afd7 100644
--- a/ckan/templates/macros/autoform.html
+++ b/ckan/templates/macros/autoform.html
@@ -45,6 +45,12 @@
       {% call form.select(name, id=id, label=label, options=item.options, selected=value, error=error) %}
         {% if item.extra_info %}{{ form.info(item.extra_info) }}{% endif %}
       {% endcall %}
+    {% elif control == 'html' %}
+    <div class="control-group control-medium">
+      <div class="controls">
+        {{ item.html }}
+      </div>
+    </div>
     {% else %}
       {% call form[control](name, id=id, label=label, placeholder=placeholder, value=value, error=error, classes=classes) %}
         {% if item.extra_info %}{{ form.info(item.extra_info) }}{% endif %}

From 3a425ef31d8da7fc108c52e9e29751fcc09325d2 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Thu, 16 Aug 2012 10:55:00 +0100
Subject: [PATCH 068/130] [#2618] Update resource.configs

---
 ckan/public/base/javascript/resource.config | 3 +++
 ckan/public/base/vendor/resource.config     | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ckan/public/base/javascript/resource.config b/ckan/public/base/javascript/resource.config
index 3e3ef8b1653..38931183ce9 100644
--- a/ckan/public/base/javascript/resource.config
+++ b/ckan/public/base/javascript/resource.config
@@ -11,7 +11,9 @@ main =
     plugins/jquery.date-helpers.js
     plugins/jquery.slug.js
     plugins/jquery.slug-preview.js
+    plugins/jquery.truncator.js
     plugins/jquery.form-warning.js
+
     sandbox.js
     module.js
     pubsub.js
@@ -19,6 +21,7 @@ main =
     notify.js
     i18n.js
     main.js
+
     modules/select-switch.js
     modules/slug-preview.js
     modules/basic-form.js
diff --git a/ckan/public/base/vendor/resource.config b/ckan/public/base/vendor/resource.config
index ead36aee9a3..f23eca10a9e 100644
--- a/ckan/public/base/vendor/resource.config
+++ b/ckan/public/base/vendor/resource.config
@@ -12,8 +12,6 @@ vendor = jquery.js
 
 [groups]
 
-#    jquery.js
-
 bootstrap =
     bootstrap/js/bootstrap-transition.js
     bootstrap/js/bootstrap-modal.js
@@ -25,4 +23,3 @@ vendor =
     jed.js
     select2/select2.js
     bootstrap
-

From 093c99f8e6f495d978e1d26c392b19f3504556cc Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Thu, 16 Aug 2012 10:57:56 +0100
Subject: [PATCH 069/130] [#2618] Do not track .min.* files in base

---
 .../public/base/vendor/select2/select2.min.js | 76 -------------------
 1 file changed, 76 deletions(-)
 delete mode 100644 ckan/public/base/vendor/select2/select2.min.js

diff --git a/ckan/public/base/vendor/select2/select2.min.js b/ckan/public/base/vendor/select2/select2.min.js
deleted file mode 100644
index 2b890b07887..00000000000
--- a/ckan/public/base/vendor/select2/select2.min.js
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-Copyright 2012 Igor Vaynberg
- 
-Version: 3.0 Timestamp: Tue Jul 31 21:09:16 PDT 2012
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this work except in
-compliance with the License. You may obtain a copy of the License in the LICENSE file, or at:
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is
-distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and limitations under the License.
-*/
-(function(f){"undefined"==typeof f.fn.each2&&f.fn.extend({each2:function(h){for(var l=f([0]),j=-1,m=this.length;++j<m&&(l.context=l[0]=this[j])&&!1!==h.call(l[0],j,l););return this}})})(jQuery);
-(function(f,h){function l(a){return a&&"string"===typeof a?a.replace("&","&amp;"):a}function j(a,b){var c=0,d=b.length,g;if("undefined"===typeof a)return-1;if(a.constructor===String)for(;c<d;c+=1){if(0===a.localeCompare(b[c]))return c}else for(;c<d;c+=1)if(g=b[c],g.constructor===String){if(0===g.localeCompare(a))return c}else if(g===a)return c;return-1}function m(a,b){return a===b?!0:a===h||b===h||null===a||null===b?!1:a.constructor===String?0===a.localeCompare(b):b.constructor===String?0===b.localeCompare(a):
-!1}function y(a,b){var c,d,g;if(null===a||1>a.length)return[];c=a.split(b);d=0;for(g=c.length;d<g;d+=1)c[d]=f.trim(c[d]);return c}function z(a,b){var c;return function(){window.clearTimeout(c);c=window.setTimeout(b,a)}}function i(a){a.preventDefault();a.stopPropagation()}function A(a,b,c){var d=a.toUpperCase().indexOf(b.toUpperCase()),b=b.length;0>d?c.push(a):(c.push(a.substring(0,d)),c.push("<span class='select2-match'>"),c.push(a.substring(d,d+b)),c.push("</span>"),c.push(a.substring(d+b,a.length)))}
-function B(a){var b,c=0,d=null,g=a.quietMillis||100;return function(k){window.clearTimeout(b);b=window.setTimeout(function(){var b=c+=1,g=a.data,e=a.transport||f.ajax,h=a.type||"GET",g=g.call(this,k.term,k.page,k.context);null!==d&&d.abort();d=e.call(null,{url:a.url,dataType:a.dataType,data:g,type:h,success:function(d){b<c||(d=a.results(d,k.page),k.callback(d))}})},g)}}function C(a){var b=a,c,d=function(a){return""+a.text};f.isArray(b)||(d=b.text,f.isFunction(d)||(c=b.text,d=function(a){return a[c]}),
-b=b.results);return function(a){var c=a.term,e={};if(c==="")a.callback({results:b});else{e.results=f(b).filter(function(){return a.matcher(c,d(this))}).get();a.callback(e)}}}function D(a){return f.isFunction(a)?a:function(b){var c=b.term,d={results:[]};f(a).each(function(){var a=this.text!==h,f=a?this.text:this;if(""===c||b.matcher(c,f))d.results.push(a?this:{id:this,text:this})});b.callback(d)}}function s(a){if(f.isFunction(a))return!0;if(!a)return fasle;throw Error("formatterName must be a function or a falsy value");
-}function t(a){return f.isFunction(a)?a():a}function v(a,b){var c=function(){};c.prototype=new a;c.prototype.constructor=c;c.prototype.parent=a.prototype;c.prototype=f.extend(c.prototype,b);return c}if(window.Select2===h){var e,u,w,x,r;e={TAB:9,ENTER:13,ESC:27,SPACE:32,LEFT:37,UP:38,RIGHT:39,DOWN:40,SHIFT:16,CTRL:17,ALT:18,PAGE_UP:33,PAGE_DOWN:34,HOME:36,END:35,BACKSPACE:8,DELETE:46,isArrow:function(a){a=a.which?a.which:a;switch(a){case e.LEFT:case e.RIGHT:case e.UP:case e.DOWN:return!0}return!1},
-isControl:function(a){a=a.which?a.which:a;switch(a){case e.SHIFT:case e.CTRL:case e.ALT:return!0}return a.metaKey?!0:!1},isFunctionKey:function(a){a=a.which?a.which:a;return 112<=a&&123>=a}};f(document).delegate("*","mousemove",function(a){f.data(document,"select2-lastpos",{x:a.pageX,y:a.pageY})});f(document).ready(function(){f(document).delegate("*","mousedown touchend",function(a){var b=f(a.target).closest("div.select2-container").get(0),c;b?f(document).find("div.select2-container-active").each(function(){this!==
-b&&f(this).data("select2").blur()}):(b=f(a.target).closest("div.select2-drop").get(0),f(document).find("div.select2-drop-active").each(function(){this!==b&&f(this).data("select2").blur()}));b=f(a.target);c=b.attr("for");"LABEL"===a.target.tagName&&(c&&0<c.length)&&(b=f("#"+c),b=b.data("select2"),b!==h&&(b.focus(),a.preventDefault()))})});u=v(Object,{bind:function(a){var b=this;return function(){a.apply(b,arguments)}},init:function(a){var b,c;this.opts=a=this.prepareOpts(a);this.id=a.id;a.element.data("select2")!==
-h&&null!==a.element.data("select2")&&this.destroy();this.enabled=!0;this.container=this.createContainer();var d=!1,g;this.body=function(){!1===d&&(g=a.element.closest("body"),d=!0);return g};a.element.attr("class")!==h&&this.container.addClass(a.element.attr("class"));this.container.css(t(a.containerCss));this.container.addClass(t(a.containerCssClass));this.opts.element.data("select2",this).hide().after(this.container);this.container.data("select2",this);this.dropdown=this.container.find(".select2-drop");
-this.dropdown.css(t(a.dropdownCss));this.dropdown.addClass(t(a.dropdownCssClass));this.dropdown.data("select2",this);this.results=b=this.container.find(".select2-results");this.search=c=this.container.find("input.select2-input");c.attr("tabIndex",this.opts.element.attr("tabIndex"));this.resultsPage=0;this.context=null;this.initContainer();this.initContainerWidth();this.results.bind("mousemove",function(a){var b=f.data(document,"select2-lastpos");(b===h||b.x!==a.pageX||b.y!==a.pageY)&&f(a.target).trigger("mousemove-filtered",
-a)});this.dropdown.delegate(".select2-results","mousemove-filtered",this.bind(this.highlightUnderEvent));var k=this.results,e=z(80,function(a){k.trigger("scroll-debounced",a)});k.bind("scroll",function(a){0<=j(a.target,k.get())&&e(a)});this.dropdown.delegate(".select2-results","scroll-debounced",this.bind(this.loadMoreIfNeeded));f.fn.mousewheel&&b.mousewheel(function(a,c,d,g){c=b.scrollTop();0<g&&0>=c-g?(b.scrollTop(0),i(a)):0>g&&b.get(0).scrollHeight-b.scrollTop()+g<=b.height()&&(b.scrollTop(b.get(0).scrollHeight-
-b.height()),i(a))});c.bind("keydown",function(){f.data(c,"keyup-change-value")===h&&f.data(c,"keyup-change-value",c.val())});c.bind("keyup",function(){var a=f.data(c,"keyup-change-value");a!==h&&c.val()!==a&&(f.removeData(c,"keyup-change-value"),c.trigger("keyup-change"))});c.bind("keyup-change",this.bind(this.updateResults));c.bind("focus",function(){c.addClass("select2-focused");" "===c.val()&&c.val("")});c.bind("blur",function(){c.removeClass("select2-focused")});this.dropdown.delegate(".select2-results",
-"mouseup",this.bind(function(a){0<f(a.target).closest(".select2-result-selectable:not(.select2-disabled)").length?(this.highlightUnderEvent(a),this.selectHighlighted(a)):this.focusSearch();i(a)}));this.dropdown.bind("click mouseup mousedown",function(a){a.stopPropagation()});f.isFunction(this.opts.initSelection)&&(this.initSelection(),this.monitorSource());a.element.is(":disabled")&&this.disable()},destroy:function(){var a=this.opts.element.data("select2");a!==h&&(a.container.remove(),a.dropdown.remove(),
-a.opts.element.removeData("select2").unbind(".select2").show())},prepareOpts:function(a){var b,c,d;b=a.element;"select"===b.get(0).tagName.toLowerCase()&&(this.select=c=a.element);a.separator=a.separator||",";c&&f.each("id multiple ajax query createSearchChoice initSelection data tags".split(" "),function(){if(this in a)throw Error("Option '"+this+"' is not allowed for Select2 when attached to a <select> element.");});a=f.extend({},{populateResults:function(b,c,d){var e,E=this.opts.id;e=function(b,
-c,g){var k,i,j,p,q,n,m;k=0;for(i=b.length;k<i;k=k+1){j=b[k];p=E(j)!==h;q="children"in j&&j.children.length>0;n=f("<li></li>");n.addClass("select2-results-dept-"+g);n.addClass("select2-result");n.addClass(p?"select2-result-selectable":"select2-result-unselectable");q&&n.addClass("select2-result-with-children");p=f("<div></div>");p.addClass("select2-result-label");m=a.formatResult(j,p,d);m!==h&&p.html(l(m));n.append(p);if(q){q=f("<ul></ul>");q.addClass("select2-result-sub");e(j.children,q,g+1);n.append(q)}n.data("select2-data",
-j);c.append(n)}};e(c,b,0)}},f.fn.select2.defaults,a);"function"!==typeof a.id&&(d=a.id,a.id=function(a){return a[d]});if(c)a.query=this.bind(function(a){var c={results:[],more:false},d=a.term,e,i,j;j=function(b,c){var f;if(b.is("option"))a.matcher(d,b.text(),b)&&c.push({id:b.attr("value"),text:b.text(),element:b.get()});else if(b.is("optgroup")){f={text:b.attr("label"),children:[],element:b.get()};b.children().each2(function(a,b){j(b,f.children)});f.children.length>0&&c.push(f)}};e=b.children();if(this.getPlaceholder()!==
-h&&e.length>0){i=e[0];f(i).text()===""&&(e=e.not(i))}e.each2(function(a,b){j(b,c.results)});a.callback(c)}),a.id=function(a){return a.id};else if(!("query"in a))if("ajax"in a){if((c=a.element.data("ajax-url"))&&0<c.length)a.ajax.url=c;a.query=B(a.ajax)}else"data"in a?a.query=C(a.data):"tags"in a&&(a.query=D(a.tags),a.createSearchChoice=function(a){return{id:a,text:a}},a.initSelection=function(b,c){var d=[];f(y(b.val(),a.separator)).each(function(){var b=this,c=this,g=a.tags;f.isFunction(g)&&(g=g());
-f(g).each(function(){if(m(this.id,b)){c=this.text;return false}});d.push({id:b,text:c})});c(d)});if("function"!==typeof a.query)throw"query function not defined for Select2 "+a.element.attr("id");return a},monitorSource:function(){this.opts.element.bind("change.select2",this.bind(function(){!0!==this.opts.element.data("select2-change-triggered")&&this.initSelection()}))},triggerChange:function(a){a=a||{};a=f.extend({},a,{type:"change",val:this.val()});this.opts.element.data("select2-change-triggered",
-!0);this.opts.element.trigger(a);this.opts.element.data("select2-change-triggered",!1);this.opts.element.click()},enable:function(){this.enabled||(this.enabled=!0,this.container.removeClass("select2-container-disabled"))},disable:function(){this.enabled&&(this.close(),this.enabled=!1,this.container.addClass("select2-container-disabled"))},opened:function(){return this.container.hasClass("select2-dropdown-open")},positionDropdown:function(){var a=this.container.offset(),b=this.container.outerHeight(),
-c=this.container.outerWidth(),d=this.dropdown.outerHeight(),g=f(window).scrollTop()+document.documentElement.clientHeight,b=a.top+b,g=b+d<=g,e=a.top-d>=this.body().scrollTop(),h;this.dropdown.hasClass("select2-drop-above")?(h=!0,!e&&g&&(h=!1)):(h=!1,!g&&e&&(h=!0));h?(b=a.top-d,this.container.addClass("select2-drop-above"),this.dropdown.addClass("select2-drop-above")):(this.container.removeClass("select2-drop-above"),this.dropdown.removeClass("select2-drop-above"));this.dropdown.css({top:b,left:a.left,
-width:c})},shouldOpen:function(){var a;if(this.opened())return!1;a=jQuery.Event("open");this.opts.element.trigger(a);return!a.isDefaultPrevented()},clearDropdownAlignmentPreference:function(){this.container.removeClass("select2-drop-above");this.dropdown.removeClass("select2-drop-above")},open:function(){if(!this.shouldOpen())return!1;window.setTimeout(this.bind(this.opening),1);return!0},opening:function(){this.clearDropdownAlignmentPreference();" "===this.search.val()&&this.search.val("");this.dropdown.addClass("select2-drop-active");
-this.container.addClass("select2-dropdown-open").addClass("select2-container-active");this.updateResults(!0);this.dropdown[0]!==this.body().children().last()[0]&&this.dropdown.detach().appendTo(this.body());this.dropdown.show();this.ensureHighlightVisible();this.positionDropdown();this.focusSearch()},close:function(){this.opened()&&(this.clearDropdownAlignmentPreference(),this.dropdown.hide(),this.container.removeClass("select2-dropdown-open").removeClass("select2-container-active"),this.results.empty(),
-this.clearSearch(),this.opts.element.trigger(jQuery.Event("close")))},clearSearch:function(){},ensureHighlightVisible:function(){var a=this.results,b,c,d,g;c=this.highlight();0>c||(0==c?a.scrollTop(0):(b=a.find(".select2-result-selectable"),d=f(b[c]),g=d.offset().top+d.outerHeight(),c===b.length-1&&(b=a.find("li.select2-more-results"),0<b.length&&(g=b.offset().top+b.outerHeight())),b=a.offset().top+a.outerHeight(),g>b&&a.scrollTop(a.scrollTop()+(g-b)),d=d.offset().top-a.offset().top,0>d&&a.scrollTop(a.scrollTop()+
-d)))},moveHighlight:function(a){for(var b=this.results.find(".select2-result-selectable"),c=this.highlight();-1<c&&c<b.length;){var c=c+a,d=f(b[c]);if(d.hasClass("select2-result-selectable")&&!d.hasClass("select2-disabled")){this.highlight(c);break}}},highlight:function(a){var b=this.results.find(".select2-result-selectable").not(".select2-disabled");if(0===arguments.length)return j(b.filter(".select2-highlighted")[0],b.get());a>=b.length&&(a=b.length-1);0>a&&(a=0);b.removeClass("select2-highlighted");
-f(b[a]).addClass("select2-highlighted");this.ensureHighlightVisible()},countSelectableResults:function(){return this.results.find(".select2-result-selectable").not(".select2-disabled").length},highlightUnderEvent:function(a){a=f(a.target).closest(".select2-result-selectable");if(0<a.length&&!a.is(".select2-highlighted")){var b=this.results.find(".select2-result-selectable");this.highlight(b.index(a))}else 0==a.length&&this.results.find(".select2-highlighted").removeClass("select2-highlighted")},loadMoreIfNeeded:function(){var a=
-this.results,b=a.find("li.select2-more-results"),c,d=this.resultsPage+1,f=this,e=this.search.val(),h=this.context;0!==b.length&&(c=b.offset().top-a.offset().top-a.height(),0>=c&&(b.addClass("select2-active"),this.opts.query({term:e,page:d,context:h,matcher:this.opts.matcher,callback:this.bind(function(c){f.opts.populateResults.call(this,a,c.results,{term:e,page:d,context:h});!0===c.more?(b.detach().appendTo(a.children(":last")).text(f.opts.formatLoadMore(d+1)),window.setTimeout(function(){f.loadMoreIfNeeded()},
-10)):b.remove();f.positionDropdown();f.resultsPage=d})})))},updateResults:function(a){function b(){g.scrollTop(0);d.removeClass("select2-active");j.positionDropdown()}function c(a){g.html(l(a));b()}var d=this.search,g=this.results,e=this.opts,i,j=this;if(!(!0!==a&&(!1===this.showSearchInput||!this.opened()))){d.addClass("select2-active");if(1<=e.maximumSelectionSize&&(i=this.data(),f.isArray(i)&&i.length>=e.maximumSelectionSize&&s(e.formatSelectionTooBig,"formatSelectionTooBig"))){c("<li class='select2-selection-limit'>"+
-e.formatSelectionTooBig(e.maximumSelectionSize)+"</li>");return}d.val().length<e.minimumInputLength&&s(e.formatInputTooShort,"formatInputTooShort")?c("<li class='select2-no-results'>"+e.formatInputTooShort(d.val(),e.minimumInputLength)+"</li>"):(this.resultsPage=1,e.query({term:d.val(),page:this.resultsPage,context:null,matcher:e.matcher,callback:this.bind(function(i){var o;this.context=i.context===h?null:i.context;this.opts.createSearchChoice&&""!==d.val()&&(o=this.opts.createSearchChoice.call(null,
-d.val(),i.results),o!==h&&null!==o&&j.id(o)!==h&&null!==j.id(o)&&0===f(i.results).filter(function(){return m(j.id(this),j.id(o))}).length&&i.results.unshift(o));0===i.results.length&&s(e.formatNoMatches,"formatNoMatches")?c("<li class='select2-no-results'>"+e.formatNoMatches(d.val())+"</li>"):(g.empty(),j.opts.populateResults.call(this,g,i.results,{term:d.val(),page:this.resultsPage,context:null}),!0===i.more&&s(e.formatLoadMore,"formatLoadMore")&&(g.children().filter(":last").append("<li class='select2-more-results'>"+
-l(e.formatLoadMore(this.resultsPage))+"</li>"),window.setTimeout(function(){j.loadMoreIfNeeded()},10)),this.postprocessResults(i,a),b())})}))}},cancel:function(){this.close()},blur:function(){this.close();this.container.removeClass("select2-container-active");this.dropdown.removeClass("select2-drop-active");this.search[0]===document.activeElement&&this.search.blur();this.clearSearch();this.selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus")},focusSearch:function(){window.setTimeout(this.bind(function(){this.search.focus();
-this.search.val(this.search.val())}),10)},selectHighlighted:function(){var a=this.highlight(),b=this.results.find(".select2-highlighted").not(".select2-disabled"),c=b.closest(".select2-result-selectable").data("select2-data");c&&(b.addClass("select2-disabled"),this.highlight(a),this.onSelect(c))},getPlaceholder:function(){return this.opts.element.attr("placeholder")||this.opts.element.attr("data-placeholder")||this.opts.element.data("placeholder")||this.opts.placeholder},initContainerWidth:function(){var a=
-function(){var a,c,d,e;if("off"===this.opts.width)return null;if("element"===this.opts.width)return 0===this.opts.element.outerWidth()?"auto":this.opts.element.outerWidth()+"px";if("copy"===this.opts.width||"resolve"===this.opts.width){a=this.opts.element.attr("style");if(a!==h){a=a.split(";");d=0;for(e=a.length;d<e;d+=1)if(c=a[d].replace(/\s/g,"").match(/width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/),null!==c&&1<=c.length)return c[1]}return"resolve"===this.opts.width?(a=this.opts.element.css("width"),
-0<a.indexOf("%")?a:0===this.opts.element.outerWidth()?"auto":this.opts.element.outerWidth()+"px"):null}return f.isFunction(this.opts.width)?this.opts.width():this.opts.width}.call(this);null!==a&&this.container.attr("style","width: "+a)}});w=v(u,{createContainer:function(){return f("<div></div>",{"class":"select2-container"}).html("    <a href='javascript:void(0)' class='select2-choice'>   <span></span><abbr class='select2-search-choice-close' style='display:none;'></abbr>   <div><b></b></div></a>    <div class='select2-drop select2-offscreen'>   <div class='select2-search'>       <input type='text' autocomplete='off' class='select2-input'/>   </div>   <ul class='select2-results'>   </ul></div>")},
-opening:function(){this.search.show();this.parent.opening.apply(this,arguments);this.dropdown.removeClass("select2-offscreen")},close:function(){this.opened()&&(this.parent.close.apply(this,arguments),this.dropdown.removeAttr("style").addClass("select2-offscreen").insertAfter(this.selection).show())},focus:function(){this.close();this.selection.focus()},isFocused:function(){return this.selection[0]===document.activeElement},cancel:function(){this.parent.cancel.apply(this,arguments);this.selection.focus()},
-initContainer:function(){var a,b=this.dropdown;this.selection=a=this.container.find(".select2-choice");this.search.bind("keydown",this.bind(function(a){if(this.enabled)if(a.which===e.PAGE_UP||a.which===e.PAGE_DOWN)i(a);else if(this.opened())switch(a.which){case e.UP:case e.DOWN:this.moveHighlight(a.which===e.UP?-1:1);i(a);break;case e.TAB:case e.ENTER:this.selectHighlighted();i(a);break;case e.ESC:this.cancel(a),i(a)}else a.which===e.TAB||(e.isControl(a)||e.isFunctionKey(a)||a.which===e.ESC)||this.open()}));
-this.search.bind("focus",this.bind(function(){this.selection.attr("tabIndex","-1")}));this.search.bind("blur",this.bind(function(){this.opened()||this.container.removeClass("select2-container-active");window.setTimeout(this.bind(function(){this.selection.attr("tabIndex",this.opts.element.attr("tabIndex"))}),10)}));a.bind("mousedown",this.bind(function(a){this.opened()?(this.close(),this.selection.focus()):this.enabled&&this.open();i(a)}));b.bind("mousedown",this.bind(function(){this.search.focus()}));
-a.bind("focus",this.bind(function(){this.container.addClass("select2-container-active");this.search.attr("tabIndex","-1")}));a.bind("blur",this.bind(function(){this.container.removeClass("select2-container-active");window.setTimeout(this.bind(function(){this.search.attr("tabIndex",this.opts.element.attr("tabIndex"))}),10)}));a.bind("keydown",this.bind(function(a){if(this.enabled)if(a.which===e.PAGE_UP||a.which===e.PAGE_DOWN)i(a);else if(!(a.which===e.TAB||e.isControl(a)||e.isFunctionKey(a)||a.which===
-e.ESC)){this.open();if(a.which!==e.ENTER&&!(48>a.which)){var b=String.fromCharCode(a.which).toLowerCase();a.shiftKey&&(b=b.toUpperCase());this.search.val(b)}i(a)}}));a.delegate("abbr","mousedown",this.bind(function(a){this.enabled&&(this.clear(),i(a),this.close(),this.triggerChange(),this.selection.focus())}));this.setPlaceholder();this.search.bind("focus",this.bind(function(){this.container.addClass("select2-container-active")}))},clear:function(){this.opts.element.val("");this.selection.find("span").empty();
-this.selection.removeData("select2-data");this.setPlaceholder()},initSelection:function(){if(""===this.opts.element.val())this.close(),this.setPlaceholder();else{var a=this;this.opts.initSelection.call(null,this.opts.element,function(b){b!==h&&null!==b&&(a.updateSelection(b),a.close(),a.setPlaceholder())})}},prepareOpts:function(){var a=this.parent.prepareOpts.apply(this,arguments);"select"===a.element.get(0).tagName.toLowerCase()&&(a.initSelection=function(a,c){var d=a.find(":selected");f.isFunction(c)&&
-c({id:d.attr("value"),text:d.text()})});return a},setPlaceholder:function(){var a=this.getPlaceholder();""===this.opts.element.val()&&a!==h&&!(this.select&&""!==this.select.find("option:first").text())&&(this.selection.find("span").html(l(a)),this.selection.addClass("select2-default"),this.selection.find("abbr").hide())},postprocessResults:function(a,b){var c=0,d=this,e=!0;this.results.find(".select2-result-selectable").each2(function(a,b){if(m(d.id(b.data("select2-data")),d.opts.element.val()))return c=
-a,!1});this.highlight(c);!0===b&&(e=this.showSearchInput=a.results.length>=this.opts.minimumResultsForSearch,this.dropdown.find(".select2-search")[e?"removeClass":"addClass"]("select2-search-hidden"),f(this.dropdown,this.container)[e?"addClass":"removeClass"]("select2-with-searchbox"))},onSelect:function(a){var b=this.opts.element.val();this.opts.element.val(this.id(a));this.updateSelection(a);this.close();this.selection.focus();m(b,this.id(a))||this.triggerChange()},updateSelection:function(a){var b=
-this.selection.find("span");this.selection.data("select2-data",a);b.empty();a=this.opts.formatSelection(a,b);a!==h&&b.append(l(a));this.selection.removeClass("select2-default");this.opts.allowClear&&this.getPlaceholder()!==h&&this.selection.find("abbr").show()},val:function(){var a,b=null,c=this;if(0===arguments.length)return this.opts.element.val();a=arguments[0];if(this.select)this.select.val(a).find(":selected").each2(function(a,c){b={id:c.attr("value"),text:c.text()};return!1}),this.updateSelection(b),
-this.setPlaceholder();else{if(this.opts.initSelection===h)throw Error("cannot call val() if initSelection() is not defined");a?this.opts.initSelection(this.opts.element,function(a){c.opts.element.val(!a?"":c.id(a));c.updateSelection(a);c.setPlaceholder()}):this.clear()}},clearSearch:function(){this.search.val("")},data:function(a){var b;if(0===arguments.length)return b=this.selection.data("select2-data"),b==h&&(b=null),b;!a||""===a?this.clear():(this.opts.element.val(!a?"":this.id(a)),this.updateSelection(a))}});
-x=v(u,{createContainer:function(){return f("<div></div>",{"class":"select2-container select2-container-multi"}).html("    <ul class='select2-choices'>  <li class='select2-search-field'>    <input type='text' autocomplete='off' style='width: 25px;' class='select2-input'>  </li></ul><div class='select2-drop select2-drop-multi' style='display:none;'>   <ul class='select2-results'>   </ul></div>")},prepareOpts:function(){var a=this.parent.prepareOpts.apply(this,arguments);"select"===a.element.get(0).tagName.toLowerCase()&&
-(a.initSelection=function(a,c){var d=[];a.find(":selected").each2(function(a,b){d.push({id:b.attr("value"),text:b.text()})});f.isFunction(c)&&c(d)});return a},initContainer:function(){var a;this.searchContainer=this.container.find(".select2-search-field");this.selection=a=this.container.find(".select2-choices");this.search.bind("keydown",this.bind(function(b){if(this.enabled){if(b.which===e.BACKSPACE&&""===this.search.val()){this.close();var c;c=a.find(".select2-search-choice-focus");if(0<c.length){this.unselect(c.first());
-this.search.width(10);i(b);return}c=a.find(".select2-search-choice");0<c.length&&c.last().addClass("select2-search-choice-focus")}else a.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus");if(this.opened())switch(b.which){case e.UP:case e.DOWN:this.moveHighlight(b.which===e.UP?-1:1);i(b);return;case e.ENTER:case e.TAB:this.selectHighlighted();i(b);return;case e.ESC:this.cancel(b);i(b);return}b.which===e.TAB||(e.isControl(b)||e.isFunctionKey(b)||b.which===e.BACKSPACE||b.which===
-e.ESC)||(this.open(),(b.which===e.PAGE_UP||b.which===e.PAGE_DOWN)&&i(b))}}));this.search.bind("keyup",this.bind(this.resizeSearch));this.search.bind("blur",this.bind(function(){this.container.removeClass("select2-container-active")}));this.container.delegate(".select2-choices","mousedown",this.bind(function(a){this.enabled&&(this.clearPlaceholder(),this.open(),this.focusSearch(),a.preventDefault())}));this.container.delegate(".select2-choices","focus",this.bind(function(){this.enabled&&(this.container.addClass("select2-container-active"),
-this.dropdown.addClass("select2-drop-active"),this.clearPlaceholder())}));this.clearSearch()},enable:function(){this.enabled||(this.parent.enable.apply(this,arguments),this.search.removeAttr("disabled"))},disable:function(){this.enabled&&(this.parent.disable.apply(this,arguments),this.search.attr("disabled",!0))},initSelection:function(){""===this.opts.element.val()&&(this.updateSelection([]),this.close(),this.clearSearch());if(this.select||""!==this.opts.element.val()){var a=this;this.opts.initSelection.call(null,
-this.opts.element,function(b){if(b!==h&&b!==null){a.updateSelection(b);a.close();a.clearSearch()}})}},clearSearch:function(){var a=this.getPlaceholder();a!==h&&0===this.getVal().length&&!1===this.search.hasClass("select2-focused")?(this.search.val(a).addClass("select2-default"),this.resizeSearch()):this.search.val(" ").width(10)},clearPlaceholder:function(){this.search.hasClass("select2-default")?this.search.val("").removeClass("select2-default"):" "===this.search.val()&&this.search.val("")},opening:function(){this.parent.opening.apply(this,
-arguments);this.clearPlaceholder();this.resizeSearch();this.focusSearch()},close:function(){this.opened()&&this.parent.close.apply(this,arguments)},focus:function(){this.close();this.search.focus()},isFocused:function(){return this.search.hasClass("select2-focused")},updateSelection:function(a){var b=[],c=[],d=this;f(a).each(function(){0>j(d.id(this),b)&&(b.push(d.id(this)),c.push(this))});a=c;this.selection.find(".select2-search-choice").remove();f(a).each(function(){d.addSelectedChoice(this)});
-d.postprocessResults()},onSelect:function(a){this.addSelectedChoice(a);this.select&&this.postprocessResults();this.opts.closeOnSelect?(this.close(),this.search.width(10)):(this.search.width(10),this.resizeSearch(),0<this.countSelectableResults()?this.positionDropdown():this.close());this.triggerChange({added:a});this.focusSearch()},cancel:function(){this.close();this.focusSearch()},addSelectedChoice:function(a){var b=f("<li class='select2-search-choice'>    <div></div>    <a href='javascript:void(0)' class='select2-search-choice-close' tabindex='-1'></a></li>"),
-c=this.id(a),d=this.getVal(),e;e=this.opts.formatSelection(a,b);b.find("div").replaceWith("<div>"+l(e)+"</div>");b.find(".select2-search-choice-close").bind("click dblclick",this.bind(function(a){this.enabled&&(f(a.target).closest(".select2-search-choice").fadeOut("fast").animate({width:"hide"},50,this.bind(function(){this.unselect(f(a.target));this.selection.find(".select2-search-choice-focus").removeClass("select2-search-choice-focus");this.close();this.focusSearch()})).dequeue(),i(a))})).bind("focus",
-this.bind(function(){this.enabled&&(this.container.addClass("select2-container-active"),this.dropdown.addClass("select2-drop-active"))}));b.data("select2-data",a);b.insertBefore(this.searchContainer);d.push(c);this.setVal(d)},unselect:function(a){var b=this.getVal(),c,d,a=a.closest(".select2-search-choice");if(0===a.length)throw"Invalid argument: "+a+". Must be .select2-search-choice";c=a.data("select2-data");d=j(this.id(c),b);0<=d&&(b.splice(d,1),this.setVal(b),this.select&&this.postprocessResults());
-a.remove();this.triggerChange({removed:c})},postprocessResults:function(){var a=this.getVal(),b=this.results.find(".select2-result-selectable"),c=this.results.find(".select2-result-with-children"),d=this;b.each2(function(b,c){var f=d.id(c.data("select2-data"));0<=j(f,a)?c.addClass("select2-disabled").removeClass("select2-result-selectable"):c.removeClass("select2-disabled").addClass("select2-result-selectable")});c.each2(function(a,b){0==b.find(".select2-result-selectable").length?b.addClass("select2-disabled"):
-b.removeClass("select2-disabled")});b.each2(function(a,b){if(!b.hasClass("select2-disabled")&&b.hasClass("select2-result-selectable"))return d.highlight(0),!1})},resizeSearch:function(){var a,b,c,d,e=this.search.outerWidth()-this.search.width();a=this.search;r||(c=a[0].currentStyle||window.getComputedStyle(a[0],null),r=f("<div></div>").css({position:"absolute",left:"-10000px",top:"-10000px",display:"none",fontSize:c.fontSize,fontFamily:c.fontFamily,fontStyle:c.fontStyle,fontWeight:c.fontWeight,letterSpacing:c.letterSpacing,
-textTransform:c.textTransform,whiteSpace:"nowrap"}),f("body").append(r));r.text(a.val());a=r.width()+10;b=this.search.offset().left;c=this.selection.width();d=this.selection.offset().left;b=c-(b-d)-e;b<a&&(b=c-e);40>b&&(b=c-e);this.search.width(b)},getVal:function(){var a;if(this.select)return a=this.select.val(),null===a?[]:a;a=this.opts.element.val();return y(a,this.opts.separator)},setVal:function(a){var b;this.select?this.select.val(a):(b=[],f(a).each(function(){0>j(this,b)&&b.push(this)}),this.opts.element.val(0===
-b.length?"":b.join(this.opts.separator)))},val:function(){var a,b=[],c=this;if(0===arguments.length)return this.getVal();if(a=arguments[0])if(this.setVal(a),this.select)this.select.find(":selected").each(function(){b.push({id:f(this).attr("value"),text:f(this).text()})}),this.updateSelection(b);else{if(this.opts.initSelection===h)throw Error("val() cannot be called if initSelection() is not defined");this.opts.initSelection(this.opts.element,function(a){var b=f(a).map(c.id);c.setVal(b);c.updateSelection(a);
-c.clearSearch()})}else this.opts.element.val(""),this.updateSelection([]);this.clearSearch()},onSortStart:function(){if(this.select)throw Error("Sorting of elements is not supported when attached to <select>. Attach to <input type='hidden'/> instead.");this.search.width(0);this.searchContainer.hide()},onSortEnd:function(){var a=[],b=this;this.searchContainer.show();this.searchContainer.appendTo(this.searchContainer.parent());this.resizeSearch();this.selection.find(".select2-search-choice").each(function(){a.push(b.opts.id(f(this).data("select2-data")))});
-this.setVal(a);this.triggerChange()},data:function(a){var b=this,c;if(0===arguments.length)return this.selection.find(".select2-search-choice").map(function(){return f(this).data("select2-data")}).get();a||(a=[]);c=f.map(a,function(a){return b.opts.id(a)});this.setVal(c);this.updateSelection(a);this.clearSearch()}});f.fn.select2=function(){var a=Array.prototype.slice.call(arguments,0),b,c,d,e,i="val destroy open close focus isFocused container onSortStart onSortEnd enable disable positionDropdown data".split(" ");
-this.each(function(){if(0===a.length||"object"===typeof a[0])b=0===a.length?{}:f.extend({},a[0]),b.element=f(this),"select"===b.element.get(0).tagName.toLowerCase()?e=b.element.attr("multiple"):(e=b.multiple||!1,"tags"in b&&(b.multiple=e=!0)),c=e?new x:new w,c.init(b);else if("string"===typeof a[0]){if(0>j(a[0],i))throw"Unknown method: "+a[0];d=h;c=f(this).data("select2");if(c!==h&&(d="container"===a[0]?c.container:c[a[0]].apply(c,a.slice(1)),d!==h))return!1}else throw"Invalid arguments to select2 plugin: "+
-a;});return d===h?this:d};f.fn.select2.defaults={width:"copy",closeOnSelect:!0,containerCss:{},dropdownCss:{},containerCssClass:"",dropdownCssClass:"",formatResult:function(a,b,c){b=[];A(a.text,c.term,b);return b.join("")},formatSelection:function(a){return a.text},formatNoMatches:function(){return"No matches found"},formatInputTooShort:function(a,b){return"Please enter "+(b-a.length)+" more characters"},formatSelectionTooBig:function(a){return"You can only select "+a+" items"},formatLoadMore:function(){return"Loading more results..."},
-minimumResultsForSearch:0,minimumInputLength:0,maximumSelectionSize:0,id:function(a){return a.id},matcher:function(a,b){return 0<=b.toUpperCase().indexOf(a.toUpperCase())}};window.Select2={query:{ajax:B,local:C,tags:D},util:{debounce:z,markMatch:A},"class":{"abstract":u,single:w,multi:x}}}})(jQuery);

From dd35762942f7090f457e672db6afe252dbece5cc Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Thu, 16 Aug 2012 11:03:50 +0100
Subject: [PATCH 070/130] [#2618] Do not track .min.* files in base

---
 ckan/public/base/.gitignore | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 ckan/public/base/.gitignore

diff --git a/ckan/public/base/.gitignore b/ckan/public/base/.gitignore
new file mode 100644
index 00000000000..0d8693ab156
--- /dev/null
+++ b/ckan/public/base/.gitignore
@@ -0,0 +1,3 @@
+# Auto minified files should be ignored
+**.min.js
+**.min.css

From ac7962457cb1a03f17d1064a3b337cf5610b85f9 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Thu, 16 Aug 2012 11:18:32 +0100
Subject: [PATCH 071/130] [#2618] Make sure different renders are rendered
 separatley

---
 ckan/html_resources/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ckan/html_resources/__init__.py b/ckan/html_resources/__init__.py
index 14159c74c63..0388f7611b7 100644
--- a/ckan/html_resources/__init__.py
+++ b/ckan/html_resources/__init__.py
@@ -225,6 +225,7 @@ def key(resource):
             resource.library.name,
             resource.custom_order,
             resource.dependency_nr,
+            resource.renderer,
             resource.relpath)
     return sorted(resources, key=key)
 

From bb5f7d473ee68173555adc581492341818015213 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Thu, 16 Aug 2012 11:19:12 +0100
Subject: [PATCH 072/130] [#2618] Add html5shim.js to vendor

---
 ckan/public/base/vendor/resource.config | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ckan/public/base/vendor/resource.config b/ckan/public/base/vendor/resource.config
index f23eca10a9e..b0ccb8f603b 100644
--- a/ckan/public/base/vendor/resource.config
+++ b/ckan/public/base/vendor/resource.config
@@ -6,6 +6,10 @@ order =
     jquery.js
     jed.js
 
+[IE conditional]
+
+lte IE 8 = html5.js
+
 [depends]
 
 vendor = jquery.js
@@ -21,5 +25,6 @@ bootstrap =
 
 vendor =
     jed.js
+    html5.js
     select2/select2.js
     bootstrap

From 65df09672c73042b3d6741571ad796021e233281 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Thu, 16 Aug 2012 11:19:40 +0100
Subject: [PATCH 073/130] [#2618] Auto serve dataviewer css

---
 ckan/templates/package/resource_read.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ckan/templates/package/resource_read.html b/ckan/templates/package/resource_read.html
index 505bae2a1a4..ecc077a4688 100644
--- a/ckan/templates/package/resource_read.html
+++ b/ckan/templates/package/resource_read.html
@@ -118,6 +118,7 @@ <h2 class="module-heading"><i class="icon-medium icon-info-sign"></i> Resource I
 
 {% block styles %}
   {{ super() }}
+  {#
   <link rel="stylesheet" href="{% url_for_static '/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.css' %}" />
   <link rel="stylesheet" href="{% url_for_static '/base/datapreview/vendor/leaflet/0.3.1/leaflet.css' %}" />
   <!--[if lte IE 8]>
@@ -125,7 +126,7 @@ <h2 class="module-heading"><i class="icon-medium icon-info-sign"></i> Resource I
   <![endif]-->
   <link rel="stylesheet" href="{% url_for_static '/base/datapreview/vendor/recline/css/recline.css' %}" />
   <link rel="stylesheet" href="{% url_for_static '/base/datapreview/css/datapreview.css' %}" />
-
+  #}
 {% endblock %}
 
 {% block scripts %}

From fcc3897b68d5889aafec96d83f89c68d50b9a07d Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Thu, 16 Aug 2012 11:36:04 +0100
Subject: [PATCH 074/130] [#2618] Allow force_top resource config

---
 ckan/html_resources/__init__.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ckan/html_resources/__init__.py b/ckan/html_resources/__init__.py
index 0388f7611b7..b53632b580e 100644
--- a/ckan/html_resources/__init__.py
+++ b/ckan/html_resources/__init__.py
@@ -269,8 +269,9 @@ def create_resource(path, lib_name, count):
         if os.path.exists(path_min):
             kw['minified'] = min_path(filename)
         if filename.endswith('.js'):
-            kw['bottom'] = True
             renderer = core.render_js
+            if path not in force_top:
+                kw['bottom'] = True
         if filename.endswith('.css'):
             renderer = core.render_css
         if path in depends:
@@ -302,6 +303,7 @@ def create_resource(path, lib_name, count):
 
     order = []
     dont_bundle = []
+    force_top = []
     depends = {}
     groups = {}
     IE_conditionals = {}
@@ -317,6 +319,8 @@ def create_resource(path, lib_name, count):
             order = config.get('main', 'order').split()
         if config.has_option('main', 'dont_bundle'):
             dont_bundle = config.get('main', 'dont_bundle').split()
+        if config.has_option('main', 'force_top'):
+            force_top = config.get('main', 'force_top').split()
         if config.has_section('depends'):
             items = config.items('depends')
             depends = dict((n, v.split()) for (n, v) in items)

From f47488db09d92636430bc63e89fd8d4e88a169f8 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Thu, 16 Aug 2012 11:49:02 +0100
Subject: [PATCH 075/130] [#2618] Allow custom renderer order

---
 ckan/html_resources/__init__.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ckan/html_resources/__init__.py b/ckan/html_resources/__init__.py
index b53632b580e..825dc27cab7 100644
--- a/ckan/html_resources/__init__.py
+++ b/ckan/html_resources/__init__.py
@@ -285,6 +285,8 @@ def create_resource(path, lib_name, count):
             kw['depends'] = dependencies
         if path in dont_bundle:
             kw['dont_bundle'] = True
+        if path in custom_render_order:
+            kw['custom_renderer_order'] = custom_render_order[path]
         kw['custom_order'] = count
         # FIXME needs resource.config options enabled
         if path in IE_conditionals:
@@ -307,6 +309,7 @@ def create_resource(path, lib_name, count):
     depends = {}
     groups = {}
     IE_conditionals = {}
+    custom_render_order = {}
 
     # parse the resource.config file if it exists
     resource_path = os.path.dirname(__file__)
@@ -327,6 +330,9 @@ def create_resource(path, lib_name, count):
         if config.has_section('groups'):
             items = config.items('groups')
             groups = dict((n, v.split()) for (n, v) in items)
+        if config.has_section('custom render order'):
+            items = config.items('custom render order')
+            custom_render_order = dict((n, int(v)) for (n, v) in items)
         if config.has_section('IE conditional'):
             items = config.items('IE conditional')
             for (n, v) in items:

From 08ffbe25d6b1a2974eb80187770c627f9f74ceed Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Thu, 16 Aug 2012 11:49:24 +0100
Subject: [PATCH 076/130] [#2618] Update config for html5.js

---
 ckan/public/base/vendor/resource.config | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ckan/public/base/vendor/resource.config b/ckan/public/base/vendor/resource.config
index b0ccb8f603b..ce50e45ef7e 100644
--- a/ckan/public/base/vendor/resource.config
+++ b/ckan/public/base/vendor/resource.config
@@ -6,10 +6,16 @@ order =
     jquery.js
     jed.js
 
+force_top = html5.js
+
 [IE conditional]
 
 lte IE 8 = html5.js
 
+[custom render order]
+
+html5.js = 1
+
 [depends]
 
 vendor = jquery.js

From 59b64c4b18beb29057ca08c39c27ebaecb851857 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Thu, 16 Aug 2012 12:54:32 +0100
Subject: [PATCH 077/130] [#2618] Clean IEConditionalRenderer

---
 ckan/html_resources/__init__.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/ckan/html_resources/__init__.py b/ckan/html_resources/__init__.py
index 825dc27cab7..2b30c60e345 100644
--- a/ckan/html_resources/__init__.py
+++ b/ckan/html_resources/__init__.py
@@ -47,13 +47,12 @@ class IEConditionalRenderer(object):
     def __init__(self, condition, renderer, other_browsers=False):
         self.condition = condition
         self.renderer = renderer
-        self.other_browsers = other_browsers
         if other_browsers:
-            self.other_browsers_start= '<!-->'
-            self.other_browsers_end= '<!--'
+            self.other_browsers_start = '<!-->'
+            self.other_browsers_end = '<!--'
         else:
-            self.other_browsers_start= ''
-            self.other_browsers_end= ''
+            self.other_browsers_start = ''
+            self.other_browsers_end = ''
 
     def __call__(self, url):
         return '<!--[if %s]>%s%s%s<![endif]-->' % (self.condition,

From bb45607655797caaaf8233a39632f1b304200833 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Thu, 16 Aug 2012 12:55:23 +0100
Subject: [PATCH 078/130] [#2618] Fanstatic inline scripts added

---
 ckan/html_resources/__init__.py | 86 ++++++++++++++++++++++++++-------
 1 file changed, 69 insertions(+), 17 deletions(-)

diff --git a/ckan/html_resources/__init__.py b/ckan/html_resources/__init__.py
index 2b30c60e345..b5213c95e31 100644
--- a/ckan/html_resources/__init__.py
+++ b/ckan/html_resources/__init__.py
@@ -59,6 +59,34 @@ def __call__(self, url):
                                                    self.other_browsers_start,
                                                    self.renderer(url),
                                                    self.other_browsers_end)
+class InlineJSRenderer(object):
+    ''' Allows for in-line js via fanstatic. '''
+    def __init__(self, script=None, renderer=None, condition=None, other_browsers=False):
+        self.script = script
+        self.other_browsers = other_browsers
+        self.renderer = renderer
+        start= ''
+        end= ''
+        # IE conditionals
+        if condition:
+            start = '<!--[if %s]>' % condition
+            end = '<![endif]-->'
+            if other_browsers:
+                start += '<!-->'
+                end = '<!--' + end
+        self.start = start
+        self.end = end
+
+    def __call__(self, url):
+        if self.script:
+            return '%s<script>%s</script>%s' % (self.start,
+                               self.script,
+                               self.end)
+        return '%s%s%s' % (self.start,
+                           self.renderer(url),
+                           self.end)
+def render_js(url):
+    return '<script type="text/javascript" src="%s"></script>' % (url,)
 
 # Fanstatic Patch #
 # FIXME add full license info & push upstream
@@ -78,7 +106,8 @@ def __init__(self, library, relpath, **kw):
 
     self.library = library
     fullpath = os.path.normpath(os.path.join(library.path, relpath))
-    if core._resource_file_existence_checking and not os.path.exists(fullpath):
+    if core._resource_file_existence_checking and not os.path.exists(fullpath) \
+                                    and not kw.get('fake_resource', False):
         raise core.UnknownResourceError("Resource file does not exist: %s" %
                                    fullpath)
     self.relpath = relpath
@@ -258,21 +287,25 @@ def minify(filename, resource_path, min_function):
         f.close()
         log.info('minified %s' % path)
 
-    def create_resource(path, lib_name, count):
+    def create_resource(path, lib_name, count, inline=False):
         ''' create the fanstatic Resource '''
-        # resource_name is name of the file without the .js/.css
-        rel_path, filename = os.path.split(path)
+        renderer = None
         kw = {}
-        filename = os.path.join(rel_path, filename)
-        path_min = min_path(os.path.join(resource_path, filename))
-        if os.path.exists(path_min):
-            kw['minified'] = min_path(filename)
-        if filename.endswith('.js'):
-            renderer = core.render_js
-            if path not in force_top:
-                kw['bottom'] = True
-        if filename.endswith('.css'):
-            renderer = core.render_css
+        if not inline:
+            # resource_name is name of the file without the .js/.css
+            rel_path, filename = os.path.split(path)
+            filename = os.path.join(rel_path, filename)
+            path_min = min_path(os.path.join(resource_path, filename))
+            if os.path.exists(path_min):
+                kw['minified'] = min_path(filename)
+            if filename.endswith('.js'):
+                renderer = core.render_js
+                if path not in force_top:
+                    kw['bottom'] = True
+            if filename.endswith('.css'):
+                renderer = core.render_css
+        else:
+            kw['fake_resource'] = True
         if path in depends:
             dependencies = []
             for dependency in depends[path]:
@@ -287,17 +320,26 @@ def create_resource(path, lib_name, count):
         if path in custom_render_order:
             kw['custom_renderer_order'] = custom_render_order[path]
         kw['custom_order'] = count
-        # FIXME needs resource.config options enabled
+        # IE conditionals
+        condition = None
+        other_browsers = False
         if path in IE_conditionals:
             other_browsers = ('others' in IE_conditionals[path])
             condition = IE_conditionals[path][0]
+        if inline:
+            kw['renderer'] = InlineJSRenderer(
+                                        condition=condition,
+                                        script=inline,
+                                        renderer=renderer,
+                                        other_browsers=other_browsers)
+        elif condition:
             kw['renderer'] = IEConditionalRenderer(
                                         condition=condition,
                                         renderer=renderer,
                                         other_browsers=other_browsers)
-        resource = Resource(library, filename, **kw)
+        resource = Resource(library, path, **kw)
         # add the resource to this module
-        fanstatic_name = '%s/%s' % (lib_name, filename)
+        fanstatic_name = '%s/%s' % (lib_name, path)
         log.info('create resource %s' % fanstatic_name)
         setattr(module, fanstatic_name, resource)
         return resource
@@ -309,6 +351,7 @@ def create_resource(path, lib_name, count):
     groups = {}
     IE_conditionals = {}
     custom_render_order = {}
+    inline_scripts = {}
 
     # parse the resource.config file if it exists
     resource_path = os.path.dirname(__file__)
@@ -332,6 +375,9 @@ def create_resource(path, lib_name, count):
         if config.has_section('custom render order'):
             items = config.items('custom render order')
             custom_render_order = dict((n, int(v)) for (n, v) in items)
+        if config.has_section('inline scripts'):
+            items = config.items('inline scripts')
+            inline_scripts = dict((n, v) for (n, v) in items)
         if config.has_section('IE conditional'):
             items = config.items('IE conditional')
             for (n, v) in items:
@@ -400,6 +446,12 @@ def create_resource(path, lib_name, count):
         group = Group(members)
         fanstatic_name = '%s/%s' % (name, group_name)
         setattr(module, fanstatic_name, group)
+
+    #inline scripts
+    for inline in inline_scripts:
+        create_resource(inline, name, count, inline=inline_scripts[inline].strip())
+        count += 1
+
     # finally add the library to this module
     setattr(module, name, library)
     # add to fanstatic

From b01b116b460a931883d9401effdf84afcee377b8 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Thu, 16 Aug 2012 12:55:50 +0100
Subject: [PATCH 079/130] [#2618] Update vendor resources.config

---
 ckan/public/base/vendor/resource.config | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/ckan/public/base/vendor/resource.config b/ckan/public/base/vendor/resource.config
index ce50e45ef7e..9c765a36ade 100644
--- a/ckan/public/base/vendor/resource.config
+++ b/ckan/public/base/vendor/resource.config
@@ -10,11 +10,17 @@ force_top = html5.js
 
 [IE conditional]
 
-lte IE 8 = html5.js
+lte IE 8 = html5.js block_html5_shim
 
 [custom render order]
 
-html5.js = 1
+block_html5_shim = 1
+html5.js = 2
+
+[inline scripts]
+
+block_html5_shim =
+    var html5 = {shivMethods: false};
 
 [depends]
 

From 018913847fddafd1b3ad11866fc6c606e3fa3dbe Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Thu, 16 Aug 2012 12:57:05 +0100
Subject: [PATCH 080/130] [#2618] Allow custom render order of zero

---
 ckan/html_resources/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckan/html_resources/__init__.py b/ckan/html_resources/__init__.py
index b5213c95e31..c4a08cd8ce2 100644
--- a/ckan/html_resources/__init__.py
+++ b/ckan/html_resources/__init__.py
@@ -135,7 +135,7 @@ def __init__(self, library, relpath, **kw):
         self.order, _ = core.inclusion_renderers.get(
             self.ext, (sys.maxint, None))
 
-    if custom_renderer_order:
+    if custom_renderer_order is not None:
         self.order = custom_renderer_order
     assert not isinstance(depends, basestring)
     self.depends = set()

From da13d17489db865515776390357ceddd2a5d05ca Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Thu, 16 Aug 2012 12:59:33 +0100
Subject: [PATCH 081/130] [#2618] Goodbye html5shim block

---
 ckan/templates/base.html | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/ckan/templates/base.html b/ckan/templates/base.html
index eae6cc1c43f..2c2b4f12138 100644
--- a/ckan/templates/base.html
+++ b/ckan/templates/base.html
@@ -49,16 +49,6 @@
       {%- endblock -%}
     </title>
 
-    {#
-    The html5shim allows you to modify/override the html5 shim. This is useful
-    for modifying it's behaviour or removing it completely.
-    #}
-    {%- block html5shim -%}
-      {# Temporary link until we get resource helper working #}
-      {#      <!--[if lte IE 8]><script src="{% url_for_static '/base/vendor/html5.js' %}"></script><![endif]--> #}
-      {% resource 'vendor/html5.js' %}
-    {%- endblock -%}
-
     {#
     The links block allows you to add additonal content before the stylesheets
     such as rss feeds and favicons in the same way as the meta block.

From 6ab4ea04802a6d0240c3a1d9f388e0a306b7841d Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Thu, 16 Aug 2012 13:10:56 +0100
Subject: [PATCH 082/130] [#2618] Goodbye html5shim block in stats extension

---
 ckan/lib/helpers.py                              |  1 +
 ckanext/stats/templates/ckanext/stats/index.html | 15 ++++++---------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py
index f3b4b71f309..f44ec587d8b 100644
--- a/ckan/lib/helpers.py
+++ b/ckan/lib/helpers.py
@@ -1113,6 +1113,7 @@ def remove_url_param(key, value=None, replace=None, controller=None,
                                    action=action, extras=extras)
 
 def include_resource(resource):
+    print '###', resource
     r = getattr(html_resources, resource)
     r.need()
 
diff --git a/ckanext/stats/templates/ckanext/stats/index.html b/ckanext/stats/templates/ckanext/stats/index.html
index 1ca83cafd0d..ae0f0a0ab47 100644
--- a/ckanext/stats/templates/ckanext/stats/index.html
+++ b/ckanext/stats/templates/ckanext/stats/index.html
@@ -1,14 +1,5 @@
 {% extends "page.html" %}
 
-{%- block html5shim -%}
-  {#
-    Hellish hack to get excanvas to work in IE8. We disable html5shiv from
-    overriding the createElement() method on this page.
-    See: http://stackoverflow.com/questions/10208062/using-flot-with-bootstrap-ie8-incompatibility
-  #}
-  <!--[if lte IE 8 ]><script>var html5 = {shivMethods: false};</script><![endif]-->
-  {{ super() }}
-{%- endblock -%}
 
 {% block styles %}
   {{ super() }}
@@ -208,4 +199,10 @@ <h2 class="module-heading"><i class="icon-bar-chart icon-medium"></i> {{ _('Stat
   <script src="{% url_for_static "/ckanext/stats/vendor/jquery.flot.js" %}"></script>
   <script src="{% url_for_static "/ckanext/stats/javascript/modules/plot.js" %}"></script>
   <script src="{% url_for_static "/ckanext/stats/javascript/modules/stats-nav.js" %}"></script>
+{#
+Hellish hack to get excanvas to work in IE8. We disable html5shiv from
+overriding the createElement() method on this page.
+See: http://stackoverflow.com/questions/10208062/using-flot-with-bootstrap-ie8-incompatibility
+#}
+{% resource "vendor/block_html5_shim" %}
 {% endblock %}

From a3b9e1351a0d08ec6c171232f40213a1279f66f5 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Thu, 16 Aug 2012 14:14:05 +0100
Subject: [PATCH 083/130] [#2618] move html_resources into lib

---
 ckan/html_resources/.gitignore                |   1 -
 ckan/lib/fanstatic_extensions.py              | 224 +++++++++++++++++
 .../fanstatic_resources.py}                   | 225 +-----------------
 ckan/lib/helpers.py                           |   4 +-
 4 files changed, 232 insertions(+), 222 deletions(-)
 delete mode 100644 ckan/html_resources/.gitignore
 create mode 100644 ckan/lib/fanstatic_extensions.py
 rename ckan/{html_resources/__init__.py => lib/fanstatic_resources.py} (54%)

diff --git a/ckan/html_resources/.gitignore b/ckan/html_resources/.gitignore
deleted file mode 100644
index cc64990231b..00000000000
--- a/ckan/html_resources/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-**.min.*
diff --git a/ckan/lib/fanstatic_extensions.py b/ckan/lib/fanstatic_extensions.py
new file mode 100644
index 00000000000..03a6b2db836
--- /dev/null
+++ b/ckan/lib/fanstatic_extensions.py
@@ -0,0 +1,224 @@
+import os.path
+import sys
+
+from fanstatic import Resource
+
+import fanstatic.core as core
+
+class IEConditionalRenderer(object):
+    ''' Allows for IE conditionals. '''
+    def __init__(self, condition, renderer, other_browsers=False):
+        self.condition = condition
+        self.renderer = renderer
+        if other_browsers:
+            self.other_browsers_start = '<!-->'
+            self.other_browsers_end = '<!--'
+        else:
+            self.other_browsers_start = ''
+            self.other_browsers_end = ''
+
+    def __call__(self, url):
+        return '<!--[if %s]>%s%s%s<![endif]-->' % (self.condition,
+                                                   self.other_browsers_start,
+                                                   self.renderer(url),
+                                                   self.other_browsers_end)
+class InlineJSRenderer(object):
+    ''' Allows for in-line js via fanstatic. '''
+    def __init__(self, script=None, renderer=None, condition=None, other_browsers=False):
+        self.script = script
+        self.other_browsers = other_browsers
+        self.renderer = renderer
+        start= ''
+        end= ''
+        # IE conditionals
+        if condition:
+            start = '<!--[if %s]>' % condition
+            end = '<![endif]-->'
+            if other_browsers:
+                start += '<!-->'
+                end = '<!--' + end
+        self.start = start
+        self.end = end
+
+    def __call__(self, url):
+        if self.script:
+            return '%s<script>%s</script>%s' % (self.start,
+                               self.script,
+                               self.end)
+        return '%s%s%s' % (self.start,
+                           self.renderer(url),
+                           self.end)
+def render_js(url):
+    return '<script type="text/javascript" src="%s"></script>' % (url,)
+
+# Fanstatic Patch #
+# FIXME add full license info & push upstream
+def __init__(self, library, relpath, **kw):
+
+    depends = kw.get('depends', None)
+    supersedes = kw.get('supersedes', None)
+    bottom = kw.get('bottom', False)
+    renderer = kw.get('renderer', None)
+    dont_bundle = kw.get('dont_bundle', False)
+    custom_renderer_order = kw.get('custom_renderer_order', None)
+    custom_order = kw.get('custom_order', 0)
+
+    # we don't want to pass these again
+    minified = kw.pop('minified', None)
+    debug = kw.pop('debug', None)
+
+    self.library = library
+    fullpath = os.path.normpath(os.path.join(library.path, relpath))
+    if core._resource_file_existence_checking and not os.path.exists(fullpath) \
+                                    and not kw.get('fake_resource', False):
+        raise core.UnknownResourceError("Resource file does not exist: %s" %
+                                   fullpath)
+    self.relpath = relpath
+    self.dirname, self.filename = os.path.split(relpath)
+    if self.dirname and not self.dirname.endswith('/'):
+        self.dirname += '/'
+    self.bottom = bottom
+    self.dont_bundle = dont_bundle
+    self.custom_order = custom_order
+
+    self.ext = os.path.splitext(self.relpath)[1]
+    if renderer is None:
+        # No custom, ad-hoc renderer for this Resource, so lookup
+        # the default renderer by resource filename extension.
+        if self.ext not in core.inclusion_renderers:
+            raise core.UnknownResourceExtensionError(
+                "Unknown resource extension %s for resource: %s" %
+                (self.ext, repr(self)))
+        self.order, self.renderer = core.inclusion_renderers[self.ext]
+    else:
+        # Use the custom renderer.
+        self.renderer = renderer
+        # If we do not know about the filename extension inclusion
+        # order, we render the resource after all others.
+        self.order, _ = core.inclusion_renderers.get(
+            self.ext, (sys.maxint, None))
+
+    if custom_renderer_order is not None:
+        self.order = custom_renderer_order
+    assert not isinstance(depends, basestring)
+    self.depends = set()
+    if depends is not None:
+        # Normalize groups into the underlying resources...
+        depends = core.normalize_groups(depends)
+        # ...before updating the set of dependencies of this resource.
+        self.depends.update(depends)
+
+    self.resources = set([self])
+    for depend in self.depends:
+        self.resources.update(depend.resources)
+
+    # Check for library dependency cycles.
+    self.library.check_dependency_cycle(self)
+
+    # generate an internal number for sorting the resource
+    # on dependency within the library
+    self.init_dependency_nr()
+
+    self.modes = {}
+    for mode_name, argument in [(core.DEBUG, debug), (core.MINIFIED, minified)]:
+        if argument is None:
+            continue
+        elif isinstance(argument, basestring):
+            mode_resource = Resource(library, argument, **kw)
+        else:
+            # The dependencies of a mode resource should be the same
+            # or a subset of the dependencies this mode replaces.
+            if len(argument.depends - self.depends) > 0:
+                raise core.ModeResourceDependencyError
+            mode_resource = argument
+
+        mode_resource.dependency_nr = self.dependency_nr
+        self.modes[mode_name] = mode_resource
+
+    assert not isinstance(supersedes, basestring)
+    self.supersedes = supersedes or []
+
+    self.rollups = []
+    # create a reference to the superseder in the superseded resource
+    for resource in self.supersedes:
+        resource.rollups.append(self)
+    # also create a reference to the superseding mode in the superseded
+    # mode
+    # XXX what if mode is full-fledged resource which lists
+    # supersedes itself?
+    for mode_name, mode in self.modes.items():
+        for resource in self.supersedes:
+            superseded_mode = resource.mode(mode_name)
+            # if there is no such mode, let's skip it
+            if superseded_mode is resource:
+                continue
+            mode.supersedes.append(superseded_mode)
+            superseded_mode.rollups.append(mode)
+
+
+    # Register ourself with the Library.
+    self.library.register(self)
+
+core.Resource.__init__ = __init__
+
+def render(self, library_url):
+
+
+    paths = [resource.relpath for resource in self._resources]
+    # URL may become too long:
+    # http://www.boutell.com/newfaq/misc/urllength.html
+    relpath = ''.join([core.BUNDLE_PREFIX, ';'.join(paths)])
+
+    return self.renderer('%s/%s' % (library_url, relpath))
+
+core.Bundle.render = render
+def fits(self, resource):
+    if resource.dont_bundle:
+        return False
+    # an empty resource fits anything
+    if not self._resources:
+        return True
+    # a resource fits if it's like the resources already inside
+    bundle_resource = self._resources[0]
+    return (resource.library is bundle_resource.library and
+            resource.renderer is bundle_resource.renderer and
+            (resource.ext == '.js' or
+             resource.dirname == bundle_resource.dirname))
+
+core.Bundle.fits = fits
+
+def sort_resources(resources):
+    """Sort resources for inclusion on web page.
+
+    A number of rules are followed:
+
+    * resources are always grouped per renderer (.js, .css, etc)
+    * resources that depend on other resources are sorted later
+    * resources are grouped by library, if the dependencies allow it
+    * libraries are sorted by name, if dependencies allow it
+    * resources are sorted by resource path if they both would be
+      sorted the same otherwise.
+
+    The only purpose of sorting on library is so we can
+    group resources per library, so that bundles can later be created
+    of them if bundling support is enabled.
+
+    Note this sorting algorithm guarantees a consistent ordering, no
+    matter in what order resources were needed.
+    """
+    for resource in resources:
+        resource.library.init_library_nr()
+
+    def key(resource):
+        return (
+            resource.order,
+            resource.library.library_nr,
+            resource.library.name,
+            resource.custom_order,
+            resource.dependency_nr,
+            resource.renderer,
+            resource.relpath)
+    return sorted(resources, key=key)
+
+core.sort_resources = sort_resources
+# Fanstatic Patch #
diff --git a/ckan/html_resources/__init__.py b/ckan/lib/fanstatic_resources.py
similarity index 54%
rename from ckan/html_resources/__init__.py
rename to ckan/lib/fanstatic_resources.py
index c4a08cd8ce2..42b10cc6451 100644
--- a/ckan/html_resources/__init__.py
+++ b/ckan/lib/fanstatic_resources.py
@@ -33,6 +33,10 @@
 
 from fanstatic import Library, Resource, Group, get_library_registry
 import fanstatic.core as core
+
+# This import patches fanstatic
+import ckan.lib.fanstatic_extensions as fanstatic_extensions
+
 from ckan.include.rjsmin import jsmin
 from ckan.include.rcssmin import cssmin
 
@@ -42,223 +46,6 @@
 # loop through dirs to setup
 # warn on no entry point provided for fanstatic
 
-class IEConditionalRenderer(object):
-    ''' Allows for IE conditionals. '''
-    def __init__(self, condition, renderer, other_browsers=False):
-        self.condition = condition
-        self.renderer = renderer
-        if other_browsers:
-            self.other_browsers_start = '<!-->'
-            self.other_browsers_end = '<!--'
-        else:
-            self.other_browsers_start = ''
-            self.other_browsers_end = ''
-
-    def __call__(self, url):
-        return '<!--[if %s]>%s%s%s<![endif]-->' % (self.condition,
-                                                   self.other_browsers_start,
-                                                   self.renderer(url),
-                                                   self.other_browsers_end)
-class InlineJSRenderer(object):
-    ''' Allows for in-line js via fanstatic. '''
-    def __init__(self, script=None, renderer=None, condition=None, other_browsers=False):
-        self.script = script
-        self.other_browsers = other_browsers
-        self.renderer = renderer
-        start= ''
-        end= ''
-        # IE conditionals
-        if condition:
-            start = '<!--[if %s]>' % condition
-            end = '<![endif]-->'
-            if other_browsers:
-                start += '<!-->'
-                end = '<!--' + end
-        self.start = start
-        self.end = end
-
-    def __call__(self, url):
-        if self.script:
-            return '%s<script>%s</script>%s' % (self.start,
-                               self.script,
-                               self.end)
-        return '%s%s%s' % (self.start,
-                           self.renderer(url),
-                           self.end)
-def render_js(url):
-    return '<script type="text/javascript" src="%s"></script>' % (url,)
-
-# Fanstatic Patch #
-# FIXME add full license info & push upstream
-def __init__(self, library, relpath, **kw):
-
-    depends = kw.get('depends', None)
-    supersedes = kw.get('supersedes', None)
-    bottom = kw.get('bottom', False)
-    renderer = kw.get('renderer', None)
-    dont_bundle = kw.get('dont_bundle', False)
-    custom_renderer_order = kw.get('custom_renderer_order', None)
-    custom_order = kw.get('custom_order', 0)
-
-    # we don't want to pass these again
-    minified = kw.pop('minified', None)
-    debug = kw.pop('debug', None)
-
-    self.library = library
-    fullpath = os.path.normpath(os.path.join(library.path, relpath))
-    if core._resource_file_existence_checking and not os.path.exists(fullpath) \
-                                    and not kw.get('fake_resource', False):
-        raise core.UnknownResourceError("Resource file does not exist: %s" %
-                                   fullpath)
-    self.relpath = relpath
-    self.dirname, self.filename = os.path.split(relpath)
-    if self.dirname and not self.dirname.endswith('/'):
-        self.dirname += '/'
-    self.bottom = bottom
-    self.dont_bundle = dont_bundle
-    self.custom_order = custom_order
-
-    self.ext = os.path.splitext(self.relpath)[1]
-    if renderer is None:
-        # No custom, ad-hoc renderer for this Resource, so lookup
-        # the default renderer by resource filename extension.
-        if self.ext not in core.inclusion_renderers:
-            raise core.UnknownResourceExtensionError(
-                "Unknown resource extension %s for resource: %s" %
-                (self.ext, repr(self)))
-        self.order, self.renderer = core.inclusion_renderers[self.ext]
-    else:
-        # Use the custom renderer.
-        self.renderer = renderer
-        # If we do not know about the filename extension inclusion
-        # order, we render the resource after all others.
-        self.order, _ = core.inclusion_renderers.get(
-            self.ext, (sys.maxint, None))
-
-    if custom_renderer_order is not None:
-        self.order = custom_renderer_order
-    assert not isinstance(depends, basestring)
-    self.depends = set()
-    if depends is not None:
-        # Normalize groups into the underlying resources...
-        depends = core.normalize_groups(depends)
-        # ...before updating the set of dependencies of this resource.
-        self.depends.update(depends)
-
-    self.resources = set([self])
-    for depend in self.depends:
-        self.resources.update(depend.resources)
-
-    # Check for library dependency cycles.
-    self.library.check_dependency_cycle(self)
-
-    # generate an internal number for sorting the resource
-    # on dependency within the library
-    self.init_dependency_nr()
-
-    self.modes = {}
-    for mode_name, argument in [(core.DEBUG, debug), (core.MINIFIED, minified)]:
-        if argument is None:
-            continue
-        elif isinstance(argument, basestring):
-            mode_resource = Resource(library, argument, **kw)
-        else:
-            # The dependencies of a mode resource should be the same
-            # or a subset of the dependencies this mode replaces.
-            if len(argument.depends - self.depends) > 0:
-                raise core.ModeResourceDependencyError
-            mode_resource = argument
-
-        mode_resource.dependency_nr = self.dependency_nr
-        self.modes[mode_name] = mode_resource
-
-    assert not isinstance(supersedes, basestring)
-    self.supersedes = supersedes or []
-
-    self.rollups = []
-    # create a reference to the superseder in the superseded resource
-    for resource in self.supersedes:
-        resource.rollups.append(self)
-    # also create a reference to the superseding mode in the superseded
-    # mode
-    # XXX what if mode is full-fledged resource which lists
-    # supersedes itself?
-    for mode_name, mode in self.modes.items():
-        for resource in self.supersedes:
-            superseded_mode = resource.mode(mode_name)
-            # if there is no such mode, let's skip it
-            if superseded_mode is resource:
-                continue
-            mode.supersedes.append(superseded_mode)
-            superseded_mode.rollups.append(mode)
-
-
-    # Register ourself with the Library.
-    self.library.register(self)
-
-core.Resource.__init__ = __init__
-
-def render(self, library_url):
-
-
-    paths = [resource.relpath for resource in self._resources]
-    # URL may become too long:
-    # http://www.boutell.com/newfaq/misc/urllength.html
-    relpath = ''.join([core.BUNDLE_PREFIX, ';'.join(paths)])
-
-    return self.renderer('%s/%s' % (library_url, relpath))
-
-core.Bundle.render = render
-def fits(self, resource):
-    if resource.dont_bundle:
-        return False
-    # an empty resource fits anything
-    if not self._resources:
-        return True
-    # a resource fits if it's like the resources already inside
-    bundle_resource = self._resources[0]
-    return (resource.library is bundle_resource.library and
-            resource.renderer is bundle_resource.renderer and
-            (resource.ext == '.js' or
-             resource.dirname == bundle_resource.dirname))
-
-core.Bundle.fits = fits
-
-def sort_resources(resources):
-    """Sort resources for inclusion on web page.
-
-    A number of rules are followed:
-
-    * resources are always grouped per renderer (.js, .css, etc)
-    * resources that depend on other resources are sorted later
-    * resources are grouped by library, if the dependencies allow it
-    * libraries are sorted by name, if dependencies allow it
-    * resources are sorted by resource path if they both would be
-      sorted the same otherwise.
-
-    The only purpose of sorting on library is so we can
-    group resources per library, so that bundles can later be created
-    of them if bundling support is enabled.
-
-    Note this sorting algorithm guarantees a consistent ordering, no
-    matter in what order resources were needed.
-    """
-    for resource in resources:
-        resource.library.init_library_nr()
-
-    def key(resource):
-        return (
-            resource.order,
-            resource.library.library_nr,
-            resource.library.name,
-            resource.custom_order,
-            resource.dependency_nr,
-            resource.renderer,
-            resource.relpath)
-    return sorted(resources, key=key)
-
-core.sort_resources = sort_resources
-# Fanstatic Patch #
 
 def create_library(name, path):
     ''' Creates a fanstatic library `name` with the contents of a
@@ -327,13 +114,13 @@ def create_resource(path, lib_name, count, inline=False):
             other_browsers = ('others' in IE_conditionals[path])
             condition = IE_conditionals[path][0]
         if inline:
-            kw['renderer'] = InlineJSRenderer(
+            kw['renderer'] = fanstatic_extensions.InlineJSRenderer(
                                         condition=condition,
                                         script=inline,
                                         renderer=renderer,
                                         other_browsers=other_browsers)
         elif condition:
-            kw['renderer'] = IEConditionalRenderer(
+            kw['renderer'] = fanstatic_extensions.IEConditionalRenderer(
                                         condition=condition,
                                         renderer=renderer,
                                         other_browsers=other_browsers)
diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py
index f44ec587d8b..ad2e2448182 100644
--- a/ckan/lib/helpers.py
+++ b/ckan/lib/helpers.py
@@ -36,7 +36,7 @@
 from pylons import c, g
 from pylons.i18n import _, ungettext
 
-import html_resources
+import ckan.lib.fanstatic_resources as fanstatic_resources
 from lib.maintain import deprecated
 import ckan.model as model
 import ckan.lib.formatters as formatters
@@ -1114,7 +1114,7 @@ def remove_url_param(key, value=None, replace=None, controller=None,
 
 def include_resource(resource):
     print '###', resource
-    r = getattr(html_resources, resource)
+    r = getattr(fanstatic_resources, resource)
     r.need()
 
 def debug_inspect(arg):

From 4106f7e3ae5ad00cad129d664075211eb0c1393c Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Thu, 16 Aug 2012 15:32:27 +0100
Subject: [PATCH 084/130] [#2618] make external libs dependent on base

---
 ckan/lib/fanstatic_resources.py | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/ckan/lib/fanstatic_resources.py b/ckan/lib/fanstatic_resources.py
index 42b10cc6451..0f4a1cd7883 100644
--- a/ckan/lib/fanstatic_resources.py
+++ b/ckan/lib/fanstatic_resources.py
@@ -47,7 +47,7 @@
 # warn on no entry point provided for fanstatic
 
 
-def create_library(name, path):
+def create_library(name, path, depend_base=True):
     ''' Creates a fanstatic library `name` with the contents of a
     directory `path` using resource.config if found. Files are minified
     if needed. '''
@@ -93,14 +93,18 @@ def create_resource(path, lib_name, count, inline=False):
                 renderer = core.render_css
         else:
             kw['fake_resource'] = True
+        dependencies = []
         if path in depends:
-            dependencies = []
             for dependency in depends[path]:
                 try:
                     res = getattr(module, '%s/%s' % (name, dependency))
                 except AttributeError:
                     res = getattr(module, '%s' % dependency)
                 dependencies.append(res)
+        if depend_base:
+            dependencies.append(getattr(module, 'base/main'))
+
+        if dependencies:
             kw['depends'] = dependencies
         if path in dont_bundle:
             kw['dont_bundle'] = True
@@ -246,17 +250,10 @@ def create_resource(path, lib_name, count, inline=False):
     registry.add(library)
 
 base_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'public', 'base', 'vendor'))
-create_library('vendor', base_path)
+create_library('vendor', base_path, depend_base=False)
 
 base_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'public', 'base', 'datapreview'))
-create_library('datapreview', base_path)
+create_library('datapreview', base_path, depend_base=False)
 
 base_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'public', 'base', 'javascript'))
-create_library('base', base_path)
-
-### create our libraries here from any subdirectories
-##for dirname, dirnames, filenames in os.walk(os.path.dirname(__file__)):
-##    if dirname == os.path.dirname(__file__):
-##        continue
-##    lib_name = os.path.basename(dirname)
-##    create_library(lib_name, lib_name)
+create_library('base', base_path, depend_base=False)

From 8f7081729742f5fc8d0c99a781b5e816d6a6de19 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Thu, 16 Aug 2012 15:33:02 +0100
Subject: [PATCH 085/130] [#2618] extensions can add resource libs

---
 ckan/plugins/toolkit.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/ckan/plugins/toolkit.py b/ckan/plugins/toolkit.py
index 827e95a4191..46e36a32f3f 100644
--- a/ckan/plugins/toolkit.py
+++ b/ckan/plugins/toolkit.py
@@ -50,6 +50,7 @@ class _Toolkit(object):
 
         ## Fully defined in this file ##
         'add_template_directory',
+        'add_resource',
         'add_public_directory',
         'requires_ckan_version',
         'check_ckan_version',
@@ -97,6 +98,7 @@ def _initialize(self):
         t['render_snippet'] = self._render_snippet
         t['add_template_directory'] = self._add_template_directory
         t['add_public_directory'] = self._add_public_directory
+        t['add_resource'] = self._add_resource
         t['requires_ckan_version'] = self._requires_ckan_version
         t['check_ckan_version'] = self._check_ckan_version
         t['CkanVersionException'] = CkanVersionException
@@ -145,6 +147,18 @@ def _add_served_directory(cls, config, relative_path, config_var):
             else:
                 config[config_var] = absolute_path
 
+    @classmethod
+    def _add_resource(cls, path, name):
+        # we want the filename that of the function caller but they will
+        # have used one of the available helper functions
+        frame, filename, line_number, function_name, lines, index =\
+            inspect.getouterframes(inspect.currentframe())[1]
+
+        this_dir = os.path.dirname(filename)
+        absolute_path = os.path.join(this_dir, path)
+        import ckan.lib.fanstatic_resources
+        ckan.lib.fanstatic_resources.create_library(name, absolute_path)
+
     @classmethod
     def _version_str_2_list(cls, v_str):
         ''' convert a version string into a list of ints

From fe53e85a90d0bfe5558af31f40b5e6e5da0b8fad Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Thu, 16 Aug 2012 15:34:04 +0100
Subject: [PATCH 086/130] [#2618] Stats uses fanstatic

---
 ckanext/stats/plugin.py                            |  1 +
 ckanext/stats/public/ckanext/stats/resource.config | 12 ++++++++++++
 ckanext/stats/templates/ckanext/stats/index.html   | 11 +----------
 3 files changed, 14 insertions(+), 10 deletions(-)
 create mode 100644 ckanext/stats/public/ckanext/stats/resource.config

diff --git a/ckanext/stats/plugin.py b/ckanext/stats/plugin.py
index 909f0ad79fc..11caf7a42d4 100644
--- a/ckanext/stats/plugin.py
+++ b/ckanext/stats/plugin.py
@@ -24,3 +24,4 @@ def update_config(self, config):
                 templates = 'templates_legacy'
         p.toolkit.add_template_directory(config, templates)
         p.toolkit.add_public_directory(config, 'public')
+        p.toolkit.add_resource('public/ckanext/stats', 'ckanext_stats')
diff --git a/ckanext/stats/public/ckanext/stats/resource.config b/ckanext/stats/public/ckanext/stats/resource.config
new file mode 100644
index 00000000000..e651a3f1b9e
--- /dev/null
+++ b/ckanext/stats/public/ckanext/stats/resource.config
@@ -0,0 +1,12 @@
+[IE conditional]
+
+lte IE 8 = vendor/excanvas.js
+
+[groups]
+
+stats =
+    css/stats.css
+    vendor/excanvas.js
+    vendor/jquery.flot.js
+    javascript/modules/plot.js
+    javascript/modules/stats-nav.js
diff --git a/ckanext/stats/templates/ckanext/stats/index.html b/ckanext/stats/templates/ckanext/stats/index.html
index ae0f0a0ab47..947454034e3 100644
--- a/ckanext/stats/templates/ckanext/stats/index.html
+++ b/ckanext/stats/templates/ckanext/stats/index.html
@@ -1,11 +1,5 @@
 {% extends "page.html" %}
 
-
-{% block styles %}
-  {{ super() }}
-  <link rel="stylesheet" href="{% url_for_static "/ckanext/stats/css/stats.css" %}" />
-{% endblock %}
-
 {% block breadcrumb_content %}
   <li class="active">{{ 'Statistics' }}</li>
 {% endblock %}
@@ -195,14 +189,11 @@ <h2 class="module-heading"><i class="icon-bar-chart icon-medium"></i> {{ _('Stat
 
 {% block scripts %}
   {{ super() }}
-  <!--[if lte IE 8]><script src="{% url_for_static "/ckanext/stats/vendor/excanvas.js" %}"></script><![endif]-->
-  <script src="{% url_for_static "/ckanext/stats/vendor/jquery.flot.js" %}"></script>
-  <script src="{% url_for_static "/ckanext/stats/javascript/modules/plot.js" %}"></script>
-  <script src="{% url_for_static "/ckanext/stats/javascript/modules/stats-nav.js" %}"></script>
 {#
 Hellish hack to get excanvas to work in IE8. We disable html5shiv from
 overriding the createElement() method on this page.
 See: http://stackoverflow.com/questions/10208062/using-flot-with-bootstrap-ie8-incompatibility
 #}
 {% resource "vendor/block_html5_shim" %}
+{% resource "ckanext_stats/stats" %}
 {% endblock %}

From a9920b66411e5e3d97ab287436d049da7904e6a6 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Thu, 16 Aug 2012 15:34:30 +0100
Subject: [PATCH 087/130] [#2618] Vendor bugfix

---
 ckan/public/base/vendor/resource.config | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/ckan/public/base/vendor/resource.config b/ckan/public/base/vendor/resource.config
index 9c765a36ade..bc7a49ebc9c 100644
--- a/ckan/public/base/vendor/resource.config
+++ b/ckan/public/base/vendor/resource.config
@@ -28,15 +28,13 @@ vendor = jquery.js
 
 [groups]
 
-bootstrap =
-    bootstrap/js/bootstrap-transition.js
-    bootstrap/js/bootstrap-modal.js
-    bootstrap/js/bootstrap-alert.js
-    bootstrap/js/bootstrap-tab.js
-    bootstrap/js/bootstrap-button.js
 
 vendor =
     jed.js
     html5.js
     select2/select2.js
-    bootstrap
+    bootstrap/js/bootstrap-transition.js
+    bootstrap/js/bootstrap-modal.js
+    bootstrap/js/bootstrap-alert.js
+    bootstrap/js/bootstrap-tab.js
+    bootstrap/js/bootstrap-button.js

From 0fd8d99c2077a1e440e7c2e51d137d21d5fa8c91 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Thu, 16 Aug 2012 16:23:49 +0100
Subject: [PATCH 088/130] [#2618] Allow inline scripts in groups

---
 ckan/lib/fanstatic_resources.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ckan/lib/fanstatic_resources.py b/ckan/lib/fanstatic_resources.py
index 0f4a1cd7883..0e017d40de6 100644
--- a/ckan/lib/fanstatic_resources.py
+++ b/ckan/lib/fanstatic_resources.py
@@ -221,6 +221,11 @@ def create_resource(path, lib_name, count, inline=False):
         create_resource(f, name, count)
         count += 1
 
+    #inline scripts
+    for inline in inline_scripts:
+        create_resource(inline, name, count, inline=inline_scripts[inline].strip())
+        count += 1
+
     # add groups
     for group_name in groups:
         members = []
@@ -238,11 +243,6 @@ def create_resource(path, lib_name, count, inline=False):
         fanstatic_name = '%s/%s' % (name, group_name)
         setattr(module, fanstatic_name, group)
 
-    #inline scripts
-    for inline in inline_scripts:
-        create_resource(inline, name, count, inline=inline_scripts[inline].strip())
-        count += 1
-
     # finally add the library to this module
     setattr(module, name, library)
     # add to fanstatic

From f8dab60fc4675a10d9b66f356aa9ff8402cfac6c Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Thu, 16 Aug 2012 16:24:12 +0100
Subject: [PATCH 089/130] [#2618] Inline js class helper

---
 ckan/public/base/javascript/resource.config | 10 ++++++++++
 ckan/templates/base.html                    |  3 ---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ckan/public/base/javascript/resource.config b/ckan/public/base/javascript/resource.config
index 38931183ce9..5b715c05d4e 100644
--- a/ckan/public/base/javascript/resource.config
+++ b/ckan/public/base/javascript/resource.config
@@ -2,9 +2,19 @@
 
 main = vendor/jquery.js
 
+[custom render order]
+
+apply_html_class = 1
+
+[inline scripts]
+
+apply_html_class =
+    document.getElementsByTagName('html')[0].className += ' js';
+
 [groups]
 
 main =
+    apply_html_class
     plugins/jquery.inherit.js
     plugins/jquery.proxy-all.js
     plugins/jquery.url-helpers.js
diff --git a/ckan/templates/base.html b/ckan/templates/base.html
index 2c2b4f12138..f3c364b61bd 100644
--- a/ckan/templates/base.html
+++ b/ckan/templates/base.html
@@ -12,9 +12,6 @@
 
   {# Allows custom attributes to be added to the <head> tag #}
   <head{% block headtag %}{% endblock %}>
-    {# Append a .js class to the html element #}
-    <script>document.getElementsByTagName('html')[0].className += ' js';</script>
-
     {#
     Add custom meta tags to the page. Call super() to get the default tags
     such as charset, viewport and generator.

From 8f02c4b038fec5712df1c3116d0a06958d7ce491 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Fri, 17 Aug 2012 12:06:00 +0100
Subject: [PATCH 090/130] [#2618] Restore correct fanstatic setup

---
 ckan/config/middleware.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckan/config/middleware.py b/ckan/config/middleware.py
index 749b8896c21..9e004a5806a 100644
--- a/ckan/config/middleware.py
+++ b/ckan/config/middleware.py
@@ -69,7 +69,7 @@ def make_app(global_conf, full_stack=True, static_files=True, **app_conf):
     #app = QueueLogMiddleware(app)
     
     # Fanstatic
-    if not asbool(config.get('debug', False)):
+    if asbool(config.get('debug', False)):
         fanstatic_config = {
             'versioning' : True,
             'recompute_hashes' : True,

From a0cfce8a0e52ade919ea6962449dd7b0addb903a Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Fri, 17 Aug 2012 12:06:28 +0100
Subject: [PATCH 091/130] [#2618] Fix vendor resource.config

---
 ckan/public/base/vendor/resource.config | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ckan/public/base/vendor/resource.config b/ckan/public/base/vendor/resource.config
index bc7a49ebc9c..961e8784125 100644
--- a/ckan/public/base/vendor/resource.config
+++ b/ckan/public/base/vendor/resource.config
@@ -11,6 +11,7 @@ force_top = html5.js
 [IE conditional]
 
 lte IE 8 = html5.js block_html5_shim
+IE 7 = font-awesome/css/font-awesome-ie7.css
 
 [custom render order]
 
@@ -38,3 +39,4 @@ vendor =
     bootstrap/js/bootstrap-alert.js
     bootstrap/js/bootstrap-tab.js
     bootstrap/js/bootstrap-button.js
+    font-awesome/css/font-awesome-ie7.css

From aa85428fe6f1c4ae3c45afd19bda1a8a10f57675 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Fri, 17 Aug 2012 12:43:53 +0100
Subject: [PATCH 092/130] [#2618] Clean up resource adding plus add css

---
 ckan/lib/fanstatic_resources.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/ckan/lib/fanstatic_resources.py b/ckan/lib/fanstatic_resources.py
index 0e017d40de6..8152b7fa5f2 100644
--- a/ckan/lib/fanstatic_resources.py
+++ b/ckan/lib/fanstatic_resources.py
@@ -249,11 +249,12 @@ def create_resource(path, lib_name, count, inline=False):
     registry = get_library_registry()
     registry.add(library)
 
-base_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'public', 'base', 'vendor'))
-create_library('vendor', base_path, depend_base=False)
+base_path = os.path.abspath(os.path.join(os.path.dirname(__file__),
+                                         '..', 'public', 'base'))
+create_library('vendor', os.path.join(base_path, 'vendor'), depend_base=False)
 
-base_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'public', 'base', 'datapreview'))
-create_library('datapreview', base_path, depend_base=False)
+create_library('datapreview', os.path.join(base_path, 'datapreview'), depend_base=False)
 
-base_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'public', 'base', 'javascript'))
-create_library('base', base_path, depend_base=False)
+create_library('base', os.path.join(base_path, 'javascript'), depend_base=False)
+
+create_library('css', os.path.join(base_path, 'css'), depend_base=False)

From e3d8cc99b20893aa8d5fc2e59890d92b3f0e68a4 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Fri, 17 Aug 2012 12:44:19 +0100
Subject: [PATCH 093/130] [#2618] Main css added via fanstatic

---
 ckan/templates/base.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ckan/templates/base.html b/ckan/templates/base.html
index f3c364b61bd..9073de45052 100644
--- a/ckan/templates/base.html
+++ b/ckan/templates/base.html
@@ -10,6 +10,7 @@
 <!--[if gt IE 8]><!--> <html lang="{{ lang }}"> <!--<![endif]-->
 {%- endblock -%}
 
+{% resource g.main_css[6:] %}
   {# Allows custom attributes to be added to the <head> tag #}
   <head{% block headtag %}{% endblock %}>
     {#
@@ -69,8 +70,6 @@
       {% endblock %}
     #}
     {%- block styles %}
-      <!--[if IE 7]> <link rel="stylesheet" href="{% url_for_static '/base/vendor/font-awesome/css/font-awesome-ie7.css' %}" /> <![endif]-->
-      <link rel="stylesheet" href="{% url_for_static g.main_css %}" />
     {% endblock %}
 
     {# defined in the config.ini under "ckan.template_head_end" #}

From c5274a42f51230898c6ee28f98fca11402be787b Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Fri, 17 Aug 2012 14:42:29 +0100
Subject: [PATCH 094/130] [#2618] Fix relative path issues and select2

---
 ckan/public/base/less/main.less         | 2 --
 ckan/public/base/less/variables.less    | 4 ++--
 ckan/public/base/vendor/resource.config | 2 ++
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ckan/public/base/less/main.less b/ckan/public/base/less/main.less
index 07396953177..c73351f9594 100644
--- a/ckan/public/base/less/main.less
+++ b/ckan/public/base/less/main.less
@@ -56,7 +56,5 @@
 // Font Icons
 @import "../vendor/font-awesome/less/font-awesome.less";
 
-@import "../vendor/select2/select2.css";
-
 // CKAN
 @import "ckan.less";
diff --git a/ckan/public/base/less/variables.less b/ckan/public/base/less/variables.less
index 0b0a391d197..7d45f34451f 100644
--- a/ckan/public/base/less/variables.less
+++ b/ckan/public/base/less/variables.less
@@ -1,7 +1,7 @@
 // Base variables
-@imagePath: "../images";
+@imagePath: "../../../base/images";
 @spritePath: "@{imagePath}/sprite-ckan-icons.png";
-@fontAwesomePath: "../vendor/font-awesome/fonts";
+@fontAwesomePath: "../../../base/vendor/font-awesome/fonts";
 
 // Layout Variables
 @layoutFontFamily: Arial, sans-serif;
diff --git a/ckan/public/base/vendor/resource.config b/ckan/public/base/vendor/resource.config
index 961e8784125..00072afeeb1 100644
--- a/ckan/public/base/vendor/resource.config
+++ b/ckan/public/base/vendor/resource.config
@@ -17,6 +17,7 @@ IE 7 = font-awesome/css/font-awesome-ie7.css
 
 block_html5_shim = 1
 html5.js = 2
+select2/select2.css = 9
 
 [inline scripts]
 
@@ -34,6 +35,7 @@ vendor =
     jed.js
     html5.js
     select2/select2.js
+    select2/select2.css
     bootstrap/js/bootstrap-transition.js
     bootstrap/js/bootstrap-modal.js
     bootstrap/js/bootstrap-alert.js

From 650ca2164c5d20b1632618d909dd04d0d9c00090 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Fri, 17 Aug 2012 14:44:49 +0100
Subject: [PATCH 095/130] [#2618] Reduce fanstatic noise

---
 ckan/lib/fanstatic_resources.py | 4 ++--
 ckan/lib/helpers.py             | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ckan/lib/fanstatic_resources.py b/ckan/lib/fanstatic_resources.py
index 8152b7fa5f2..2e079188eac 100644
--- a/ckan/lib/fanstatic_resources.py
+++ b/ckan/lib/fanstatic_resources.py
@@ -72,7 +72,7 @@ def minify(filename, resource_path, min_function):
         f = open(path_min, 'w')
         f.write(min_function(source))
         f.close()
-        log.info('minified %s' % path)
+        log.debug('minified %s' % path)
 
     def create_resource(path, lib_name, count, inline=False):
         ''' create the fanstatic Resource '''
@@ -131,7 +131,7 @@ def create_resource(path, lib_name, count, inline=False):
         resource = Resource(library, path, **kw)
         # add the resource to this module
         fanstatic_name = '%s/%s' % (lib_name, path)
-        log.info('create resource %s' % fanstatic_name)
+        log.debug('create resource %s' % fanstatic_name)
         setattr(module, fanstatic_name, resource)
         return resource
 
diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py
index ad2e2448182..8cce1a68ea5 100644
--- a/ckan/lib/helpers.py
+++ b/ckan/lib/helpers.py
@@ -1113,7 +1113,6 @@ def remove_url_param(key, value=None, replace=None, controller=None,
                                    action=action, extras=extras)
 
 def include_resource(resource):
-    print '###', resource
     r = getattr(fanstatic_resources, resource)
     r.need()
 

From 7ecf0d2de23ca7c76b44882e734c29232933a5c9 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Mon, 20 Aug 2012 11:04:59 +0100
Subject: [PATCH 096/130] [#2618] Auto sort ordering when dependencies on group

---
 ckan/lib/fanstatic_resources.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ckan/lib/fanstatic_resources.py b/ckan/lib/fanstatic_resources.py
index 2e079188eac..7c0b8680cc7 100644
--- a/ckan/lib/fanstatic_resources.py
+++ b/ckan/lib/fanstatic_resources.py
@@ -210,6 +210,12 @@ def create_resource(path, lib_name, count, inline=False):
     for group in groups:
         for resource in groups[group]:
             if resource not in order:
+                # make sure any dependencies are met when we get to creating
+                # the resource
+                if resource in depends:
+                    for dep in depends[resource]:
+                        if dep not in order:
+                            order.append(dep)
                 order.append(resource)
 
     for x in reversed(order):

From a66a2502605307ed06454d11bf86a2b4e97a5471 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Mon, 20 Aug 2012 11:05:36 +0100
Subject: [PATCH 097/130] [#2618] Improve comments in lib.fanstatic_resources

---
 ckan/lib/fanstatic_resources.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/ckan/lib/fanstatic_resources.py b/ckan/lib/fanstatic_resources.py
index 7c0b8680cc7..a6304bbc511 100644
--- a/ckan/lib/fanstatic_resources.py
+++ b/ckan/lib/fanstatic_resources.py
@@ -34,7 +34,7 @@
 from fanstatic import Library, Resource, Group, get_library_registry
 import fanstatic.core as core
 
-# This import patches fanstatic
+# This imports patches fanstatic
 import ckan.lib.fanstatic_extensions as fanstatic_extensions
 
 from ckan.include.rjsmin import jsmin
@@ -42,10 +42,6 @@
 
 log = logging.getLogger(__name__)
 
-# TODO
-# loop through dirs to setup
-# warn on no entry point provided for fanstatic
-
 
 def create_library(name, path, depend_base=True):
     ''' Creates a fanstatic library `name` with the contents of a

From 2e8f2243e9e83c219cd0e49b17fc9cc895c98451 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Mon, 20 Aug 2012 11:06:03 +0100
Subject: [PATCH 098/130] [#2618] Remove order from vendor/resources.config

---
 ckan/public/base/vendor/resource.config | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ckan/public/base/vendor/resource.config b/ckan/public/base/vendor/resource.config
index 00072afeeb1..9e711134c9f 100644
--- a/ckan/public/base/vendor/resource.config
+++ b/ckan/public/base/vendor/resource.config
@@ -2,10 +2,6 @@
 dont_bundle =
     jquery.js
 
-order =
-    jquery.js
-    jed.js
-
 force_top = html5.js
 
 [IE conditional]

From 054164f9315b259ddf4b99994c4818b403013aeb Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Mon, 20 Aug 2012 11:56:51 +0100
Subject: [PATCH 099/130] [#2618] Add resources.rst

---
 doc/resources.rst | 157 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 157 insertions(+)
 create mode 100644 doc/resources.rst

diff --git a/doc/resources.rst b/doc/resources.rst
new file mode 100644
index 00000000000..3c1c75ddc3c
--- /dev/null
+++ b/doc/resources.rst
@@ -0,0 +1,157 @@
+Resources
+=========
+
+.. Note::
+    Resources are only supported in the new Jinja2 style templates in Ckan 2.0
+    and above.
+
+Resources are .css and .js files that may be included in an html page.
+Resources are included in the page by using the
+`{% resource [full resource name] %}` tag. Resources are grouped into libraries
+and the  full resource name consists of <library name>/<resource name>.  It is
+important to note that these resources will be added to the page as defined by
+the resources not in the location of the `{% resource %}` tag.  Duplicate
+resources will not be added and any dependencies will be included as well as
+the resources adding in the correct order (see below for details).
+
+Libraries can be added to Ckan from extensions using the toolkit helper
+function `add_resource(path, name)` where path is the path to the resource
+directory relative to the file calling the function and name is the name of the
+library.  Resources will the be created for the library for any .js and .css
+files found in the directory or it's subfolders. The resource name being the
+name of the file including any path needed to get to it from the resource
+directory.  For greater control of the creation a resource.config file can be
+created and placed in the resource directory (see below for details).
+
+In debug mode resources are served un minified and unbundled (each resource is
+served separately). In non-debug mode the files are served minified and bundled
+(where allowed).
+
+.. Note::
+    .js and .css resources must be supplied as un-minified files.  Minified
+    files will be created.  It is advised to include a .gitignore file to
+    prevent minified files being added to the repository.
+
+resource.config
+---------------
+
+This file is used to define the resources in a directory and is sub folders.
+Here is an example file.  The general layout of the file and allowed syntax is
+the same as for the .ini config file.
+
+::
+    [main]
+    dont_bundle = jquery.js
+
+    force_top = html5.js
+
+    order = jquery.js jed.js
+
+    [IE conditional]
+
+    lte IE 8 = html5.js block_html5_shim
+    IE 7 = font-awesome/css/font-awesome-ie7.css
+    others = html5.js
+
+    [custom render order]
+
+    block_html5_shim = 1
+    html5.js = 2
+    select2/select2.css = 9
+
+    [inline scripts]
+
+    block_html5_shim =
+        var html5 = {shivMethods: false};
+
+    [depends]
+
+    vendor = jquery.js
+
+    [groups]
+
+    vendor =
+        jed.js
+        html5.js
+        select2/select2.js
+        select2/select2.css
+        bootstrap/js/bootstrap-transition.js
+        bootstrap/js/bootstrap-modal.js
+        bootstrap/js/bootstrap-alert.js
+        bootstrap/js/bootstrap-tab.js
+        bootstrap/js/bootstrap-button.js
+        font-awesome/css/font-awesome-ie7.css
+
+
+[main]
+~~~~~~
+
+This can contain the following values
+
+force_top
+~~~~~~~~~
+
+The resources listed will be placed in the head of the page.  This is only relevant
+to .js files which will by default will be added to the bottom of the page.
+
+dont_bundle
+~~~~~~~~~~~
+
+Bundeling resources causes them to be served to the browser as a single
+resource to prevent multiple requests to the server.  The resources listed will
+not be bundled.  By default items will be bundled where possible.  Note that
+.css files can only be bundled if they are in the same directory.
+
+order
+~~~~~
+
+This is used to make sure that resources are created in the order specified.  It
+should not generally be needed but is available if there are problems.
+
+
+[IE conditional]
+~~~~~~~~~~~~~~~~
+
+This allows IE conditionals to be wrapped around resources eg
+`<!--[if IE lte 8]--><script src="my_script.js"></script><![end if]-->`
+
+The condition is supplied followed by a list of resources that need that condition.
+
+others
+~~~~~~
+
+This is a special condition that means that the resource will also be available
+for none IE browsers.
+
+[custom render order]
+~~~~~~~~~~~~~~~~~~~~~
+
+By default resources have a render order this is 10 for .css and 20 for .js
+resources.  Sometimes we need to add resources before or after they would be
+included an example being the html5shim.js that needs including before .css
+resources.  By providing a custom render order for the resource it's placement
+can be altered.  Lower numbered resources are rendered earlier.  Note that
+resources rendered in the head will still be placed before ones rendered in the
+body.
+
+[inline scripts]
+~~~~~~~~~~~~~~~~
+
+It is possible to define inline scripts in the resource.config file this can be
+helpful in some situations but is probably best avoided if possible.
+
+[depends]
+~~~~~~~~~
+
+Some times one resource depends on another eg many scripts need jquery.js
+included in the page before them. External resource libraries will
+automatically depend on the core ckan JavaScript modules so do not need to
+specify this.
+
+[groups]
+~~~~~~~~
+
+Groups of resources can be specified this allows the group to be included by
+just using it's name rather than having to specify each resource individuality
+when requesting them.  Groups can be referred to in many places in the
+resource.config file eg. [depends]

From 549d38194c496174f1c000d0f2b3eb598130cb7e Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Mon, 20 Aug 2012 12:01:08 +0100
Subject: [PATCH 100/130] [#2618] resources.rst changes

---
 doc/resources.rst | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/doc/resources.rst b/doc/resources.rst
index 3c1c75ddc3c..993c2c21a49 100644
--- a/doc/resources.rst
+++ b/doc/resources.rst
@@ -7,15 +7,15 @@ Resources
 
 Resources are .css and .js files that may be included in an html page.
 Resources are included in the page by using the
-`{% resource [full resource name] %}` tag. Resources are grouped into libraries
+``{% resource [full resource name] %}`` tag. Resources are grouped into libraries
 and the  full resource name consists of <library name>/<resource name>.  It is
 important to note that these resources will be added to the page as defined by
-the resources not in the location of the `{% resource %}` tag.  Duplicate
+the resources not in the location of the ``{% resource %}`` tag.  Duplicate
 resources will not be added and any dependencies will be included as well as
 the resources adding in the correct order (see below for details).
 
 Libraries can be added to Ckan from extensions using the toolkit helper
-function `add_resource(path, name)` where path is the path to the resource
+function ``add_resource(path, name)`` where path is the path to the resource
 directory relative to the file calling the function and name is the name of the
 library.  Resources will the be created for the library for any .js and .css
 files found in the directory or it's subfolders. The resource name being the
@@ -40,7 +40,9 @@ Here is an example file.  The general layout of the file and allowed syntax is
 the same as for the .ini config file.
 
 ::
+
     [main]
+
     dont_bundle = jquery.js
 
     force_top = html5.js
@@ -113,7 +115,7 @@ should not generally be needed but is available if there are problems.
 ~~~~~~~~~~~~~~~~
 
 This allows IE conditionals to be wrapped around resources eg
-`<!--[if IE lte 8]--><script src="my_script.js"></script><![end if]-->`
+``<!--[if IE lte 8]--><script src="my_script.js"></script><![end if]-->``
 
 The condition is supplied followed by a list of resources that need that condition.
 

From 9b1c8b04d0016573ca308a199e8bfe98bbdb14be Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Mon, 20 Aug 2012 12:38:10 +0100
Subject: [PATCH 101/130] [#2618] resources.rst improvements

---
 doc/resources.rst | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/doc/resources.rst b/doc/resources.rst
index 993c2c21a49..ccb1e9c726c 100644
--- a/doc/resources.rst
+++ b/doc/resources.rst
@@ -23,11 +23,11 @@ name of the file including any path needed to get to it from the resource
 directory.  For greater control of the creation a resource.config file can be
 created and placed in the resource directory (see below for details).
 
-In debug mode resources are served un minified and unbundled (each resource is
+In debug mode resources are served un-minified and unbundled (each resource is
 served separately). In non-debug mode the files are served minified and bundled
 (where allowed).
 
-.. Note::
+.. Important::
     .js and .css resources must be supplied as un-minified files.  Minified
     files will be created.  It is advised to include a .gitignore file to
     prevent minified files being added to the repository.
@@ -41,12 +41,12 @@ the same as for the .ini config file.
 
 ::
 
+    # Example resource.config file
+
     [main]
 
     dont_bundle = jquery.js
-
     force_top = html5.js
-
     order = jquery.js jed.js
 
     [IE conditional]
@@ -90,22 +90,19 @@ the same as for the .ini config file.
 
 This can contain the following values
 
-force_top
-~~~~~~~~~
+**force_top**
 
 The resources listed will be placed in the head of the page.  This is only relevant
 to .js files which will by default will be added to the bottom of the page.
 
-dont_bundle
-~~~~~~~~~~~
+**dont_bundle**
 
 Bundeling resources causes them to be served to the browser as a single
 resource to prevent multiple requests to the server.  The resources listed will
 not be bundled.  By default items will be bundled where possible.  Note that
 .css files can only be bundled if they are in the same directory.
 
-order
-~~~~~
+**order**
 
 This is used to make sure that resources are created in the order specified.  It
 should not generally be needed but is available if there are problems.
@@ -114,13 +111,13 @@ should not generally be needed but is available if there are problems.
 [IE conditional]
 ~~~~~~~~~~~~~~~~
 
-This allows IE conditionals to be wrapped around resources eg
-``<!--[if IE lte 8]--><script src="my_script.js"></script><![end if]-->``
+This allows IE conditionals to be wrapped around resources
+
+eg ``<!--[if IE lte 8]--><script src="my_script.js"></script><![end if]-->``
 
 The condition is supplied followed by a list of resources that need that condition.
 
-others
-~~~~~~
+**others**
 
 This is a special condition that means that the resource will also be available
 for none IE browsers.
@@ -155,5 +152,11 @@ specify this.
 
 Groups of resources can be specified this allows the group to be included by
 just using it's name rather than having to specify each resource individuality
-when requesting them.  Groups can be referred to in many places in the
+when requesting them.  The order that items are added to a group will be used
+to order the resources when added to the page but other factors such as
+dependencies, custom render order and resource type can affect the final order
+used.
+
+
+Groups can be referred to in many places in the
 resource.config file eg. [depends]

From f177a0797e3188fccccd12ae4d829e6bbc26f128 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Mon, 20 Aug 2012 12:58:17 +0100
Subject: [PATCH 102/130] [#2618] Fanstatic resources cleanup

---
 ckan/lib/fanstatic_resources.py | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/ckan/lib/fanstatic_resources.py b/ckan/lib/fanstatic_resources.py
index a6304bbc511..0706277b96c 100644
--- a/ckan/lib/fanstatic_resources.py
+++ b/ckan/lib/fanstatic_resources.py
@@ -48,6 +48,15 @@ def create_library(name, path, depend_base=True):
     directory `path` using resource.config if found. Files are minified
     if needed. '''
 
+    def get_resource(lib_name, resource_name):
+        ''' Attempt to get the resource from the current lib or if not try
+        assume it is a fully qualified resource name. '''
+        try:
+            res = getattr(module, '%s/%s' % (lib_name, resource_name))
+        except AttributeError:
+            res = getattr(module, '%s' % resource_name)
+        return res
+
     def min_path(path):
         ''' return the .min filename eg moo.js -> moo.min.js '''
         if f.endswith('.js'):
@@ -92,11 +101,7 @@ def create_resource(path, lib_name, count, inline=False):
         dependencies = []
         if path in depends:
             for dependency in depends[path]:
-                try:
-                    res = getattr(module, '%s/%s' % (name, dependency))
-                except AttributeError:
-                    res = getattr(module, '%s' % dependency)
-                dependencies.append(res)
+                dependencies.append(get_resource(name, dependency))
         if depend_base:
             dependencies.append(getattr(module, 'base/main'))
 
@@ -235,12 +240,9 @@ def create_resource(path, lib_name, count, inline=False):
             fanstatic_name = '%s/%s' % (name, member)
             members.append(getattr(module, fanstatic_name))
         if group_name in depends:
+            # add dependencies for each resource in the group
             for dependency in depends[group_name]:
-                try:
-                    res = getattr(module, '%s/%s' % (name, dependency))
-                except AttributeError:
-                    res = getattr(module, '%s' % dependency)
-                members = [res] + members #.append(res)
+                members = [get_resource(name, dependency)] + members
         group = Group(members)
         fanstatic_name = '%s/%s' % (name, group_name)
         setattr(module, fanstatic_name, group)

From db79da3f1fe986812d10cdfdc3d9aa51f11739c5 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Mon, 20 Aug 2012 13:29:44 +0100
Subject: [PATCH 103/130] [#2618] Fanstatic refactoring

---
 ckan/lib/fanstatic_resources.py | 56 ++++++++++++++++++---------------
 1 file changed, 31 insertions(+), 25 deletions(-)

diff --git a/ckan/lib/fanstatic_resources.py b/ckan/lib/fanstatic_resources.py
index 0706277b96c..13ecc52919a 100644
--- a/ckan/lib/fanstatic_resources.py
+++ b/ckan/lib/fanstatic_resources.py
@@ -59,9 +59,9 @@ def get_resource(lib_name, resource_name):
 
     def min_path(path):
         ''' return the .min filename eg moo.js -> moo.min.js '''
-        if f.endswith('.js'):
+        if path.endswith('.js'):
             return path[:-3] + '.min.js'
-        if f.endswith('.css'):
+        if path.endswith('.css'):
             return path[:-4] + '.min.css'
 
     def minify(filename, resource_path, min_function):
@@ -136,6 +136,12 @@ def create_resource(path, lib_name, count, inline=False):
         setattr(module, fanstatic_name, resource)
         return resource
 
+    resource_path = os.path.join(os.path.dirname(__file__), path)
+    library = Library(name, path)
+    module = sys.modules[__name__]
+
+
+    # config options
     order = []
     dont_bundle = []
     force_top = []
@@ -146,18 +152,18 @@ def create_resource(path, lib_name, count, inline=False):
     inline_scripts = {}
 
     # parse the resource.config file if it exists
-    resource_path = os.path.dirname(__file__)
-    resource_path = os.path.join(resource_path, path)
     config_path = os.path.join(resource_path, 'resource.config')
     if os.path.exists(config_path):
         config = ConfigParser.RawConfigParser()
         config.read(config_path)
+
         if config.has_option('main', 'order'):
             order = config.get('main', 'order').split()
         if config.has_option('main', 'dont_bundle'):
             dont_bundle = config.get('main', 'dont_bundle').split()
         if config.has_option('main', 'force_top'):
             force_top = config.get('main', 'force_top').split()
+
         if config.has_section('depends'):
             items = config.items('depends')
             depends = dict((n, v.split()) for (n, v) in items)
@@ -180,6 +186,7 @@ def create_resource(path, lib_name, count, inline=False):
                     IE_conditionals[f].append(n)
 
 
+    # add dependencies for resources in groups
     for group in groups:
         if group in depends:
             for resource in groups[group]:
@@ -189,11 +196,8 @@ def create_resource(path, lib_name, count, inline=False):
                     if dep not in depends[resource]:
                         depends[resource].append(dep)
 
-    library = Library(name, path)
-    module = sys.modules[__name__]
-
     # process each .js/.css file found
-    file_list = []
+    resource_list = []
     for dirname, dirnames, filenames in os.walk(resource_path):
         for f in filenames:
             rel_path = dirname[len(path):]
@@ -202,10 +206,10 @@ def create_resource(path, lib_name, count, inline=False):
             filepath = os.path.join(rel_path, f)
             if f.endswith('.js') and not f.endswith('.min.js'):
                 minify(f, dirname, jsmin)
-                file_list.append(filepath)
+                resource_list.append(filepath)
             if f.endswith('.css') and not f.endswith('.min.css'):
                 minify(f, dirname, cssmin)
-                file_list.append(filepath)
+                resource_list.append(filepath)
 
     # if groups are defined make sure the order supplied there is honored
     for group in groups:
@@ -219,18 +223,24 @@ def create_resource(path, lib_name, count, inline=False):
                             order.append(dep)
                 order.append(resource)
 
-    for x in reversed(order):
-        if x in file_list:
-            file_list.remove(x)
-            file_list.insert(0, x)
-    count = 0
-    for f in file_list:
-        create_resource(f, name, count)
-        count += 1
-
-    #inline scripts
+    # add inline scripts
     for inline in inline_scripts:
-        create_resource(inline, name, count, inline=inline_scripts[inline].strip())
+        resource_list.append(inline)
+
+    # order resource_list so that resources are created in the correct order
+    for resource_name in reversed(order):
+        if resource_name in resource_list:
+            resource_list.remove(resource_name)
+            resource_list.insert(0, resource_name)
+
+    # create the resources and keep them ordered as we define them.
+    count = 0
+    for resource_name in resource_list:
+        if resource_name in inline_scripts:
+            inline = inline_scripts[resource_name].strip()
+        else:
+            inline = None
+        create_resource(resource_name, name, count, inline=inline)
         count += 1
 
     # add groups
@@ -239,10 +249,6 @@ def create_resource(path, lib_name, count, inline=False):
         for member in groups[group_name]:
             fanstatic_name = '%s/%s' % (name, member)
             members.append(getattr(module, fanstatic_name))
-        if group_name in depends:
-            # add dependencies for each resource in the group
-            for dependency in depends[group_name]:
-                members = [get_resource(name, dependency)] + members
         group = Group(members)
         fanstatic_name = '%s/%s' % (name, group_name)
         setattr(module, fanstatic_name, group)

From 7acbc169fd3d77a954920effa3b9cfd10cfda010 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Mon, 20 Aug 2012 13:35:07 +0100
Subject: [PATCH 104/130] [#2618] Fanstatic flakes8

---
 ckan/lib/fanstatic_extensions.py | 25 ++++++++++++++++++-------
 ckan/lib/fanstatic_resources.py  |  9 +++++----
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/ckan/lib/fanstatic_extensions.py b/ckan/lib/fanstatic_extensions.py
index 03a6b2db836..2d89b71b082 100644
--- a/ckan/lib/fanstatic_extensions.py
+++ b/ckan/lib/fanstatic_extensions.py
@@ -5,6 +5,7 @@
 
 import fanstatic.core as core
 
+
 class IEConditionalRenderer(object):
     ''' Allows for IE conditionals. '''
     def __init__(self, condition, renderer, other_browsers=False):
@@ -22,14 +23,17 @@ def __call__(self, url):
                                                    self.other_browsers_start,
                                                    self.renderer(url),
                                                    self.other_browsers_end)
+
+
 class InlineJSRenderer(object):
     ''' Allows for in-line js via fanstatic. '''
-    def __init__(self, script=None, renderer=None, condition=None, other_browsers=False):
+    def __init__(self, script=None, renderer=None, condition=None,
+                 other_browsers=False):
         self.script = script
         self.other_browsers = other_browsers
         self.renderer = renderer
-        start= ''
-        end= ''
+        start = ''
+        end = ''
         # IE conditionals
         if condition:
             start = '<!--[if %s]>' % condition
@@ -48,9 +52,12 @@ def __call__(self, url):
         return '%s%s%s' % (self.start,
                            self.renderer(url),
                            self.end)
+
+
 def render_js(url):
     return '<script type="text/javascript" src="%s"></script>' % (url,)
 
+
 # Fanstatic Patch #
 # FIXME add full license info & push upstream
 def __init__(self, library, relpath, **kw):
@@ -69,7 +76,8 @@ def __init__(self, library, relpath, **kw):
 
     self.library = library
     fullpath = os.path.normpath(os.path.join(library.path, relpath))
-    if core._resource_file_existence_checking and not os.path.exists(fullpath) \
+    if core._resource_file_existence_checking \
+                                    and not os.path.exists(fullpath) \
                                     and not kw.get('fake_resource', False):
         raise core.UnknownResourceError("Resource file does not exist: %s" %
                                    fullpath)
@@ -120,7 +128,8 @@ def __init__(self, library, relpath, **kw):
     self.init_dependency_nr()
 
     self.modes = {}
-    for mode_name, argument in [(core.DEBUG, debug), (core.MINIFIED, minified)]:
+    for mode_name, argument in [(core.DEBUG, debug),
+                                (core.MINIFIED, minified)]:
         if argument is None:
             continue
         elif isinstance(argument, basestring):
@@ -155,14 +164,13 @@ def __init__(self, library, relpath, **kw):
             mode.supersedes.append(superseded_mode)
             superseded_mode.rollups.append(mode)
 
-
     # Register ourself with the Library.
     self.library.register(self)
 
 core.Resource.__init__ = __init__
 
-def render(self, library_url):
 
+def render(self, library_url):
 
     paths = [resource.relpath for resource in self._resources]
     # URL may become too long:
@@ -172,6 +180,8 @@ def render(self, library_url):
     return self.renderer('%s/%s' % (library_url, relpath))
 
 core.Bundle.render = render
+
+
 def fits(self, resource):
     if resource.dont_bundle:
         return False
@@ -187,6 +197,7 @@ def fits(self, resource):
 
 core.Bundle.fits = fits
 
+
 def sort_resources(resources):
     """Sort resources for inclusion on web page.
 
diff --git a/ckan/lib/fanstatic_resources.py b/ckan/lib/fanstatic_resources.py
index 13ecc52919a..ac59f0b394e 100644
--- a/ckan/lib/fanstatic_resources.py
+++ b/ckan/lib/fanstatic_resources.py
@@ -140,7 +140,6 @@ def create_resource(path, lib_name, count, inline=False):
     library = Library(name, path)
     module = sys.modules[__name__]
 
-
     # config options
     order = []
     dont_bundle = []
@@ -185,7 +184,6 @@ def create_resource(path, lib_name, count, inline=False):
                         IE_conditionals[f] = []
                     IE_conditionals[f].append(n)
 
-
     # add dependencies for resources in groups
     for group in groups:
         if group in depends:
@@ -261,10 +259,13 @@ def create_resource(path, lib_name, count, inline=False):
 
 base_path = os.path.abspath(os.path.join(os.path.dirname(__file__),
                                          '..', 'public', 'base'))
+
 create_library('vendor', os.path.join(base_path, 'vendor'), depend_base=False)
 
-create_library('datapreview', os.path.join(base_path, 'datapreview'), depend_base=False)
+create_library('datapreview', os.path.join(base_path, 'datapreview'),
+               depend_base=False)
 
-create_library('base', os.path.join(base_path, 'javascript'), depend_base=False)
+create_library('base', os.path.join(base_path, 'javascript'),
+               depend_base=False)
 
 create_library('css', os.path.join(base_path, 'css'), depend_base=False)

From ae78bf6b9cad2c3b15d6018bc3d9417b5149fec1 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Mon, 20 Aug 2012 13:38:30 +0100
Subject: [PATCH 105/130] [#2618] Remove outdated file docstring

---
 ckan/lib/fanstatic_resources.py | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/ckan/lib/fanstatic_resources.py b/ckan/lib/fanstatic_resources.py
index ac59f0b394e..d64ad068ee0 100644
--- a/ckan/lib/fanstatic_resources.py
+++ b/ckan/lib/fanstatic_resources.py
@@ -1,31 +1,3 @@
-''' This file creates fanstatic resources from the sub directories. The
-directory can contain a resource.config to specify how the resources should
-be treated. minified copies of the resources are created if the resource
-has a later modification time than existing minified versions.
-
-NOTE :currently each library requires its entry point adding to the main
-ckan setup.py file.
-
-
-resource.config (example)
-==========
-# all resources are named without their file extension
-[main]
-# dont_bundle prevents the resources from being bundled
-dont_bundle = test1
-# order can be used to prevent dependency errors to ensure that the
-# needed resources are created first
-order = test1 test2
-[depends]
-# resource dependencies can be specified here by listing dependent
-# resources
-test2 = test1
-[groups]
-# a group containing several resources can be specified here
-test3 = test2 test1
-
-
-'''
 import os.path
 import sys
 import logging

From fceeed074c8dd6a97a817819aabbca8f5f4fbb2a Mon Sep 17 00:00:00 2001
From: Dominik Moritz <domoritz@gmail.com>
Date: Mon, 20 Aug 2012 22:21:27 +0100
Subject: [PATCH 106/130] Fixed prettyfication of ValidationErrors and typo

---
 ckanext/datastore/db.py | 51 ++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 26 deletions(-)

diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
index 8c85267d46a..2c44ca9a790 100644
--- a/ckanext/datastore/db.py
+++ b/ckanext/datastore/db.py
@@ -35,7 +35,7 @@ def _validate_int(i, field_name):
         int(i)
     except ValueError:
         raise p.toolkit.ValidationError({
-            'field_name': '{} is not an integer'.format(i)
+            'field_name': ['{} is not an integer'.format(i)]
         })
 
 
@@ -69,7 +69,6 @@ def _cache_types(context):
                                            True)
 
 
-
 def _get_type(context, oid):
     _cache_types(context)
     return _pg_types[oid]
@@ -139,11 +138,11 @@ def check_fields(context, fields):
     for field in fields:
         if field.get('type') and not field['type'] in _type_names:
             raise p.toolkit.ValidationError({
-                'fields': '{0} is not a valid field type'.format(field['type'])
+                'fields': ['{0} is not a valid field type'.format(field['type'])]
             })
         elif not _is_valid_field_name(field['id']):
             raise p.toolkit.ValidationError({
-                'fields': '{0} is not a valid field name'.format(field['id'])
+                'fields': ['{0} is not a valid field name'.format(field['id'])]
             })
 
 def convert(data, type):
@@ -177,7 +176,7 @@ def create_table(context, data_dict):
         if 'type' not in field:
             if not records or field['id'] not in records[0]:
                 raise p.toolkit.ValidationError({
-                    'fields': '{} type not guessable'.format(field['id'])
+                    'fields': ['{} type not guessable'.format(field['id'])]
                 })
             field['type'] = _guess_type(records[0][field['id']])
 
@@ -185,7 +184,7 @@ def create_table(context, data_dict):
         # check record for sanity
         if not isinstance(records[0], dict):
             raise p.toolkit.ValidationError({
-                'records': 'The first row is not a json object'
+                'records': ['The first row is not a json object']
             })
         supplied_field_ids = records[0].keys()
         for field_id in supplied_field_ids:
@@ -224,8 +223,8 @@ def alter_table(context, data_dict):
         if num < len(current_fields):
             if field['id'] != current_fields[num]['id']:
                 raise p.toolkit.ValidationError({
-                    'fields': ('Supplied field "{}" not '
-                              'present or in wrong order').format(field['id'])
+                    'fields': [('Supplied field "{}" not '
+                              'present or in wrong order').format(field['id'])]
                 })
             ## no need to check type as field already defined.
             continue
@@ -233,7 +232,7 @@ def alter_table(context, data_dict):
         if 'type' not in field:
             if not records or field['id'] not in records[0]:
                 raise p.toolkit.ValidationError({
-                    'fields': '{} type not guessable'.format(field['id'])
+                    'fields': ['{} type not guessable'.format(field['id'])]
                 })
             field['type'] = _guess_type(records[0][field['id']])
         new_fields.append(field)
@@ -242,7 +241,7 @@ def alter_table(context, data_dict):
         # check record for sanity
         if not isinstance(records[0], dict):
             raise p.toolkit.ValidationError({
-                'records': 'The first row is not a json object'
+                'records': ['The first row is not a json object']
             })
         supplied_field_ids = records[0].keys()
         for field_id in supplied_field_ids:
@@ -277,16 +276,16 @@ def insert_data(context, data_dict):
         # check record for sanity
         if not isinstance(record, dict):
             raise p.toolkit.ValidationError({
-                'records': 'row {} is not a json object'.format(num)
+                'records': ['row {} is not a json object'.format(num)]
             })
         ## check for extra fields in data
         extra_keys = set(record.keys()) - set(field_names)
         if extra_keys:
             raise p.toolkit.ValidationError({
-                'records': 'row {} has extra keys "{}"'.format(
+                'records': ['row {} has extra keys "{}"'.format(
                     num + 1,
                     ', '.join(list(extra_keys))
-                )
+                )]
             })
 
         full_text = []
@@ -319,7 +318,7 @@ def _where(field_ids, data_dict):
 
     if not isinstance(filters, dict):
         raise p.toolkit.ValidationError({
-            'filters': 'Not a json object'}
+            'filters': ['Not a json object']}
         )
 
     where_clauses = []
@@ -328,7 +327,7 @@ def _where(field_ids, data_dict):
     for field, value in filters.iteritems():
         if field not in field_ids:
             raise p.toolkit.ValidationError({
-                'filters': 'field "{}" not in table'}
+                'filters': ['field "{}" not in table']}
             )
         where_clauses.append('"{}" = %s'.format(field))
         values.append(value)
@@ -354,7 +353,7 @@ def _sort(context, sort, field_ids):
         clauses = sort
     else:
         raise p.toolkit.ValidationError({
-            'sort': 'sort is not a list or a string'
+            'sort': ['sort is not a list or a string']
         })
 
     clause_parsed = []
@@ -367,15 +366,15 @@ def _sort(context, sort, field_ids):
             field, sort = clause_parts
         else:
             raise p.toolkit.ValidationError({
-                'sort': 'not valid syntax for sort clause'
+                'sort': ['not valid syntax for sort clause']
             })
         if field not in field_ids:
             raise p.toolkit.ValidationError({
-                'sort': 'field {} not it table'.format(field)
+                'sort': ['field {} not in table'.format(field)]
             })
         if sort.lower() not in ('asc', 'desc'):
             raise p.toolkit.ValidationError({
-                'sort': 'sorting can only be asc or desc'
+                'sort': ['sorting can only be asc or desc']
             })
         clause_parsed.append('"{}" {}'.format(field, sort))
 
@@ -410,7 +409,7 @@ def search_data(context, data_dict):
         for field in field_ids:
             if not field in all_field_ids:
                 raise p.toolkit.ValidationError({
-                    'fields': 'field "{}" not in table'.format(field)}
+                    'fields': ['field "{}" not in table'.format(field)]}
                 )
     else:
         field_ids = all_field_ids
@@ -501,7 +500,7 @@ def create(context, data_dict):
     except Exception, e:
         if 'due to statement timeout' in str(e):
             raise p.toolkit.ValidationError({
-                'query': 'Query took too long'
+                'query': ['Query took too long']
             })
         raise
     finally:
@@ -522,8 +521,8 @@ def delete(context, data_dict):
         ).fetchone()
         if not result:
             raise p.toolkit.ValidationError({
-                'resource_id': 'table for resource {0} does not exist'.format(
-                    data_dict['resource_id'])
+                'resource_id': ['table for resource {0} does not exist'.format(
+                    data_dict['resource_id'])]
             })
         if not 'filters' in data_dict:
             context['connection'].execute(
@@ -557,14 +556,14 @@ def search(context, data_dict):
         ).fetchone()
         if not result:
             raise p.toolkit.ValidationError({
-                'resource_id': 'table for resource {0} does not exist'.format(
-                    data_dict['resource_id'])
+                'resource_id': ['table for resource {0} does not exist'.format(
+                    data_dict['resource_id'])]
             })
         return search_data(context, data_dict)
     except Exception, e:
         if 'due to statement timeout' in str(e):
             raise p.toolkit.ValidationError({
-                'query': 'Search took too long'
+                'query': ['Search took too long']
             })
         raise
     finally:

From 0309f90c83349145e220d2b18cd049bcfbba9deb Mon Sep 17 00:00:00 2001
From: kindly <kindly@gmail.com>
Date: Tue, 21 Aug 2012 01:05:36 +0100
Subject: [PATCH 107/130] [#2733] sort out unicode

---
 ckanext/datastore/db.py                   | 48 +++++++++++++----------
 ckanext/datastore/tests/test_datastore.py | 30 +++++++-------
 2 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
index 8c85267d46a..d63797b0664 100644
--- a/ckanext/datastore/db.py
+++ b/ckanext/datastore/db.py
@@ -114,7 +114,7 @@ def _get_fields(context, data_dict):
     for field in all_fields.cursor.description:
         if not field[0].startswith('_'):
             fields.append({
-                'id': field[0],
+                'id': field[0].decode('utf-8'),
                 'type': _get_type(context, field[1])
             })
     return fields
@@ -196,10 +196,10 @@ def create_table(context, data_dict):
                 })
 
     fields = datastore_fields + supplied_fields + extra_fields
-    sql_fields = ", ".join(['"{0}" {1}'.format(f['id'], f['type'])
+    sql_fields = u", ".join([u'"{0}" {1}'.format(f['id'], f['type'])
                             for f in fields])
 
-    sql_string = 'create table "{0}" ({1});'.format(
+    sql_string = u'create table "{0}" ({1});'.format(
         data_dict['resource_id'],
         sql_fields
     )
@@ -272,20 +272,22 @@ def insert_data(context, data_dict):
 
     rows = []
     ## clean up and validate data
+
     for num, record in enumerate(data_dict['records']):
 
         # check record for sanity
         if not isinstance(record, dict):
             raise p.toolkit.ValidationError({
-                'records': 'row {} is not a json object'.format(num)
+                'records': u'row {} is not a json object'.format(num)
             })
         ## check for extra fields in data
         extra_keys = set(record.keys()) - set(field_names)
+
         if extra_keys:
             raise p.toolkit.ValidationError({
-                'records': 'row {} has extra keys "{}"'.format(
+                'records': u'row {} has extra keys "{}"'.format(
                     num + 1,
-                    ', '.join(list(extra_keys))
+                    u', '.join(list(extra_keys))
                 )
             })
 
@@ -304,7 +306,7 @@ def insert_data(context, data_dict):
         row.append(' '.join(full_text))
         rows.append(row)
 
-    sql_string = 'insert into "{0}" ({1}) values ({2});'.format(
+    sql_string = u'insert into "{0}" ({1}) values ({2});'.format(
         data_dict['resource_id'],
         sql_columns,
         ', '.join(['%s' for field in field_names + ['_full_text']])
@@ -330,7 +332,7 @@ def _where(field_ids, data_dict):
             raise p.toolkit.ValidationError({
                 'filters': 'field "{}" not in table'}
             )
-        where_clauses.append('"{}" = %s'.format(field))
+        where_clauses.append(u'"{}" = %s'.format(field))
         values.append(value)
 
     q = data_dict.get('q')
@@ -360,6 +362,7 @@ def _sort(context, sort, field_ids):
     clause_parsed = []
 
     for clause in clauses:
+        clause = clause.encode('utf-8')
         clause_parts = shlex.split(clause)
         if len(clause_parts) == 1:
             field, sort = clause_parts[0], 'asc'
@@ -369,15 +372,20 @@ def _sort(context, sort, field_ids):
             raise p.toolkit.ValidationError({
                 'sort': 'not valid syntax for sort clause'
             })
+        field, sort = unicode(field, 'utf-8'), unicode(sort, 'utf-8')
+
         if field not in field_ids:
             raise p.toolkit.ValidationError({
-                'sort': 'field {} not it table'.format(field)
+                'sort': u'field {} not it table'.format(
+                    unicode(field, 'utf-8'))
             })
         if sort.lower() not in ('asc', 'desc'):
             raise p.toolkit.ValidationError({
                 'sort': 'sorting can only be asc or desc'
             })
-        clause_parsed.append('"{}" {}'.format(field, sort))
+        clause_parsed.append(u'"{}" {}'.format(
+            field, sort)
+        )
 
     if clause_parsed:
         return "order by " + ", ".join(clause_parsed)
@@ -389,7 +397,7 @@ def delete_data(context, data_dict):
     where_clause, where_values = _where(field_ids, data_dict)
 
     context['connection'].execute(
-        'delete from "{}" {}'.format(
+        u'delete from "{}" {}'.format(
             data_dict['resource_id'],
             where_clause
         ),
@@ -410,12 +418,12 @@ def search_data(context, data_dict):
         for field in field_ids:
             if not field in all_field_ids:
                 raise p.toolkit.ValidationError({
-                    'fields': 'field "{}" not in table'.format(field)}
+                    'fields': u'field "{}" not in table'.format(field)}
                 )
     else:
         field_ids = all_field_ids
 
-    select_columns = ', '.join(['"{}"'.format(field_id)
+    select_columns = ', '.join([u'"{}"'.format(field_id)
                                 for field_id in field_ids])
     where_clause, where_values = _where(all_field_ids, data_dict)
     limit = data_dict.get('limit', 100)
@@ -426,7 +434,7 @@ def search_data(context, data_dict):
 
     sort = _sort(context, data_dict.get('sort'), field_ids)
 
-    sql_string = '''select {}, count(*) over() as "_full_count"
+    sql_string = u'''select {}, count(*) over() as "_full_count"
                     from "{}" {} {} limit {} offset {}'''\
         .format(select_columns, data_dict['resource_id'], where_clause,
                 sort, limit, offset)
@@ -435,7 +443,7 @@ def search_data(context, data_dict):
     result_fields = []
     for field in results.cursor.description:
         result_fields.append({
-            'id': field[0],
+            'id': field[0].decode('utf-8'),
             'type': _get_type(context, field[1])
         })
     result_fields.pop() # remove _full_count
@@ -486,7 +494,7 @@ def create(context, data_dict):
         # check if table already existes
         trans = context['connection'].begin()
         context['connection'].execute(
-            'set local statement_timeout to {}'.format(timeout))
+            u'set local statement_timeout to {}'.format(timeout))
         result = context['connection'].execute(
             'select * from pg_tables where tablename = %s',
              data_dict['resource_id']
@@ -522,12 +530,12 @@ def delete(context, data_dict):
         ).fetchone()
         if not result:
             raise p.toolkit.ValidationError({
-                'resource_id': 'table for resource {0} does not exist'.format(
+                'resource_id': u'table for resource {0} does not exist'.format(
                     data_dict['resource_id'])
             })
         if not 'filters' in data_dict:
             context['connection'].execute(
-                'drop table "{}"'.format(data_dict['resource_id'])
+                u'drop table "{}"'.format(data_dict['resource_id'])
             )
         else:
             delete_data(context, data_dict)
@@ -550,14 +558,14 @@ def search(context, data_dict):
     try:
         # check if table existes
         context['connection'].execute(
-            'set local statement_timeout to {}'.format(timeout))
+            u'set local statement_timeout to {}'.format(timeout))
         result = context['connection'].execute(
             'select * from pg_tables where tablename = %s',
              data_dict['resource_id']
         ).fetchone()
         if not result:
             raise p.toolkit.ValidationError({
-                'resource_id': 'table for resource {0} does not exist'.format(
+                'resource_id': u'table for resource {0} does not exist'.format(
                     data_dict['resource_id'])
             })
         return search_data(context, data_dict)
diff --git a/ckanext/datastore/tests/test_datastore.py b/ckanext/datastore/tests/test_datastore.py
index 1cb6105a5dd..8e46b11464b 100644
--- a/ckanext/datastore/tests/test_datastore.py
+++ b/ckanext/datastore/tests/test_datastore.py
@@ -1,3 +1,4 @@
+
 import json
 import sqlalchemy
 import ckan.plugins as p
@@ -45,7 +46,7 @@ def test_create_invalid_field_type(self):
         resource = model.Package.get('annakarenina').resources[0]
         data = {
             'resource_id': resource.id,
-            'fields': [{'id': 'book', 'type': 'INVALID'},
+            'fields': [{'id': 'b\xfck', 'type': 'INVALID'},
                        {'id': 'author', 'type': 'INVALID'}]
         }
         postparams = '%s=1' % json.dumps(data)
@@ -460,10 +461,11 @@ def setup_class(cls):
         resource = model.Package.get('annakarenina').resources[0]
         cls.data = {
             'resource_id': resource.id,
-            'fields': [{'id': 'book', 'type': 'text'},
-                       {'id': 'author', 'type': 'text'}],
-            'records': [{'book': 'annakarenina', 'author': 'tolstoy', 'published': '2005-03-01', 'nested': ['b', {'moo': 'moo'}]},
-                        {'book': 'warandpeace', 'author': 'tolstoy', 'nested': {'a':'b'}}
+            'fields': [{'id': u'b\xfck', 'type': 'text'},
+                       {'id': 'author', 'type': 'text'},
+                       {'id': 'published'}],
+            'records': [{u'b\xfck': 'annakarenina', 'author': 'tolstoy', 'published': '2005-03-01', 'nested': ['b', {'moo': 'moo'}]},
+                        {u'b\xfck': 'warandpeace', 'author': 'tolstoy', 'nested': {'a':'b'}}
                        ]
         }
         postparams = '%s=1' % json.dumps(cls.data)
@@ -475,10 +477,10 @@ def setup_class(cls):
 
         cls.expected_records = [{u'published': u'2005-03-01T00:00:00',
                                 u'_id': 1,
-                                u'nested': [u'b', {u'moo': u'moo'}], u'book': u'annakarenina', u'author': u'tolstoy'},
+                                u'nested': [u'b', {u'moo': u'moo'}], u'b\xfck': u'annakarenina', u'author': u'tolstoy'},
                                 {u'published': None,
                                  u'_id': 2,
-                                 u'nested': {u'a': u'b'}, u'book': u'warandpeace', u'author': u'tolstoy'}]
+                                 u'nested': {u'a': u'b'}, u'b\xfck': u'warandpeace', u'author': u'tolstoy'}]
 
 
     @classmethod
@@ -509,7 +511,7 @@ def test_search_invalid_field(self):
 
     def test_search_fields(self):
         data = {'resource_id': self.data['resource_id'],
-                'fields': ['book']}
+                'fields': [u'b\xfck']}
         postparams = '%s=1' % json.dumps(data)
         auth = {'Authorization': str(self.sysadmin_user.apikey)}
         res = self.app.post('/api/action/datastore_search', params=postparams,
@@ -518,12 +520,12 @@ def test_search_fields(self):
         assert res_dict['success'] is True
         result = res_dict['result']
         assert result['total'] == len(self.data['records'])
-        assert result['records'] == [{'book': 'annakarenina'},
-                                     {'book': 'warandpeace'}], result['records']
+        assert result['records'] == [{u'b\xfck': 'annakarenina'},
+                                     {u'b\xfck': 'warandpeace'}], result['records']
 
     def test_search_filters(self):
         data = {'resource_id': self.data['resource_id'],
-                'filters': {'book': 'annakarenina'}}
+                'filters': {u'b\xfck': 'annakarenina'}}
         postparams = '%s=1' % json.dumps(data)
         auth = {'Authorization': str(self.sysadmin_user.apikey)}
         res = self.app.post('/api/action/datastore_search', params=postparams,
@@ -536,7 +538,7 @@ def test_search_filters(self):
 
     def test_search_sort(self):
         data = {'resource_id': self.data['resource_id'],
-                'sort': 'book asc, author desc'}
+                'sort': u'b\xfck asc, author desc'}
         postparams = '%s=1' % json.dumps(data)
         auth = {'Authorization': str(self.sysadmin_user.apikey)}
         res = self.app.post('/api/action/datastore_search', params=postparams,
@@ -549,7 +551,7 @@ def test_search_sort(self):
         assert result['records'] == self.expected_records, result['records']
 
         data = {'resource_id': self.data['resource_id'],
-                'sort': ['book desc', '"author" asc']}
+                'sort': [u'b\xfck desc', '"author" asc']}
         postparams = '%s=1' % json.dumps(data)
         res = self.app.post('/api/action/datastore_search', params=postparams,
                             extra_environ=auth)
@@ -631,5 +633,5 @@ def test_search_full_text(self):
         assert result['total'] == 2
         assert result['records'] == self.expected_records, result['records']
 
-        assert result['fields'] == [{u'type': u'int4', u'id': u'_id'}, {u'type': u'text', u'id': u'book'}, {u'type': u'text', u'id': u'author'}, {u'type': u'timestamp', u'id': u'published'}, {u'type': u'_json', u'id': u'nested'}], result['fields']
+        assert result['fields'] == [{u'type': u'int4', u'id': u'_id'}, {u'type': u'text', u'id': u'b\xfck'}, {u'type': u'text', u'id': u'author'}, {u'type': u'timestamp', u'id': u'published'}, {u'type': u'_json', u'id': u'nested'}], result['fields']
 

From 708b332375e24bd6267f1f8e4f10e253b25a20fb Mon Sep 17 00:00:00 2001
From: kindly <kindly@gmail.com>
Date: Tue, 21 Aug 2012 01:38:50 +0100
Subject: [PATCH 108/130] [#2733] remove empty line

---
 ckanext/datastore/db.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
index d63797b0664..d17924b073a 100644
--- a/ckanext/datastore/db.py
+++ b/ckanext/datastore/db.py
@@ -274,7 +274,6 @@ def insert_data(context, data_dict):
     ## clean up and validate data
 
     for num, record in enumerate(data_dict['records']):
-
         # check record for sanity
         if not isinstance(record, dict):
             raise p.toolkit.ValidationError({

From baed742b733b738f73cff2d2c0a1c1a81f8cedb1 Mon Sep 17 00:00:00 2001
From: kindly <kindly@gmail.com>
Date: Tue, 21 Aug 2012 20:49:34 +0100
Subject: [PATCH 109/130] [#2733] sort out full text indexing

---
 ckanext/datastore/db.py                   |  4 +-
 ckanext/datastore/tests/test_datastore.py | 63 +++++++++++++++++++++--
 2 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
index 3b7ee2b8eeb..3c645f280b4 100644
--- a/ckanext/datastore/db.py
+++ b/ckanext/datastore/db.py
@@ -304,10 +304,10 @@ def insert_data(context, data_dict):
         row.append(' '.join(full_text))
         rows.append(row)
 
-    sql_string = u'insert into "{0}" ({1}) values ({2});'.format(
+    sql_string = u'insert into "{0}" ({1}) values ({2}, to_tsvector(%s));'.format(
         data_dict['resource_id'],
         sql_columns,
-        ', '.join(['%s' for field in field_names + ['_full_text']])
+        ', '.join(['%s' for field in field_names])
     )
 
     context['connection'].execute(sql_string, rows)
diff --git a/ckanext/datastore/tests/test_datastore.py b/ckanext/datastore/tests/test_datastore.py
index 8a8973cd0d4..4dd3fc43cb7 100644
--- a/ckanext/datastore/tests/test_datastore.py
+++ b/ckanext/datastore/tests/test_datastore.py
@@ -160,10 +160,10 @@ def test_create_basic(self):
             assert data['records'][i].get('book') == row['book']
             assert data['records'][i].get('author') == (json.loads(row['author'][0]) if row['author'] else None)
 
-        results = c.execute('''select * from "{0}" where _full_text @@ 'warandpeace' '''.format(resource.id))
-        assert results.rowcount == 1
+        results = c.execute('''select * from "{0}" where _full_text @@ to_tsquery('warandpeace') '''.format(resource.id))
+        assert results.rowcount == 1, results.rowcount
 
-        results = c.execute('''select * from "{0}" where _full_text @@ 'tolstoy' '''.format(resource.id))
+        results = c.execute('''select * from "{0}" where _full_text @@ to_tsquery('tolstoy') '''.format(resource.id))
         assert results.rowcount == 2
         model.Session.remove()
 
@@ -220,7 +220,7 @@ def test_create_basic(self):
             assert all_data[i].get('book') == row['book'], (i, all_data[i].get('book'), row['book'])
             assert all_data[i].get('author') == (json.loads(row['author'][0]) if row['author'] else None)
 
-        results = c.execute('''select * from "{0}" where _full_text @@ 'dostoevsky' '''.format(resource.id))
+        results = c.execute('''select * from "{0}" where _full_text @@ to_tsquery('dostoevsky') '''.format(resource.id))
         assert results.rowcount == 2
         model.Session.remove()
 
@@ -635,3 +635,58 @@ def test_search_full_text(self):
 
         assert result['fields'] == [{u'type': u'int4', u'id': u'_id'}, {u'type': u'text', u'id': u'b\xfck'}, {u'type': u'text', u'id': u'author'}, {u'type': u'timestamp', u'id': u'published'}, {u'type': u'_json', u'id': u'nested'}], result['fields']
 
+
+class TestDatastoreFullTextSearch(tests.WsgiAppCase):
+    @classmethod
+    def setup_class(cls):
+        p.load('datastore')
+        ctd.CreateTestData.create()
+        cls.sysadmin_user = model.User.get('testsysadmin')
+        cls.normal_user = model.User.get('annafan')
+        resource = model.Package.get('annakarenina').resources[0]
+        cls.data = dict(
+            resource_id = resource.id,
+            fields = [
+              {'id': 'id'},
+              {'id': 'date', 'type':'date'},
+              {'id': 'x'},
+              {'id': 'y'},
+              {'id': 'z'},
+              {'id': 'country'},
+              {'id': 'title'},
+              {'id': 'lat'},
+              {'id': 'lon'}
+            ],
+            records = [
+              {'id': 0, 'date': '2011-01-01', 'x': 1, 'y': 2, 'z': 3, 'country': 'DE', 'title': 'first', 'lat':52.56, 'lon':13.40},
+              {'id': 1, 'date': '2011-02-02', 'x': 2, 'y': 4, 'z': 24, 'country': 'UK', 'title': 'second', 'lat':54.97, 'lon':-1.60},
+              {'id': 2, 'date': '2011-03-03', 'x': 3, 'y': 6, 'z': 9, 'country': 'US', 'title': 'third', 'lat':40.00, 'lon':-75.5},
+              {'id': 3, 'date': '2011-04-04', 'x': 4, 'y': 8, 'z': 6, 'country': 'UK', 'title': 'fourth', 'lat':57.27, 'lon':-6.20},
+              {'id': 4, 'date': '2011-05-04', 'x': 5, 'y': 10, 'z': 15, 'country': 'UK', 'title': 'fifth', 'lat':51.58, 'lon':0},
+              {'id': 5, 'date': '2011-06-02', 'x': 6, 'y': 12, 'z': 18, 'country': 'DE', 'title': 'sixth', 'lat':51.04, 'lon':7.9}
+            ]
+        )
+        postparams = '%s=1' % json.dumps(cls.data)
+        auth = {'Authorization': str(cls.sysadmin_user.apikey)}
+        res = cls.app.post('/api/action/datastore_create', params=postparams,
+                           extra_environ=auth)
+        res_dict = json.loads(res.body)
+        assert res_dict['success'] is True
+
+    @classmethod
+    def teardown_class(cls):
+        model.repo.rebuild_db()
+
+    def test_search_full_text(self):
+        data = {'resource_id': self.data['resource_id'],
+                'q': 'DE'}
+        postparams = '%s=1' % json.dumps(data)
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
+        res = self.app.post('/api/action/datastore_search', params=postparams,
+                            extra_environ=auth)
+        res_dict = json.loads(res.body)
+        import pprint
+
+        assert res_dict['result']['total'] == 2,  pprint.pformat(res_dict)
+
+

From f82c5d105f84e65d030574f1b5fcb3c082458e1d Mon Sep 17 00:00:00 2001
From: kindly <kindly@gmail.com>
Date: Thu, 23 Aug 2012 12:29:55 +0100
Subject: [PATCH 110/130] [#2733] turn echo is off

---
 ckan/config/routing.py                    |  3 +++
 ckan/controllers/package.py               | 15 +++++++++++++
 ckan/public/scripts/application.js        |  5 +++++
 ckanext/datastore/db.py                   | 12 +++++++++-
 ckanext/datastore/tests/test_datastore.py | 27 +++++++++++++++++++++++
 5 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/ckan/config/routing.py b/ckan/config/routing.py
index a2ab58634b0..c8fc7c9c1d6 100644
--- a/ckan/config/routing.py
+++ b/ckan/config/routing.py
@@ -194,6 +194,9 @@ def make_map():
           )
         m.connect('/dataset/{id}.{format}', action='read')
         m.connect('/dataset/{id}', action='read')
+
+        m.connect('/datapreview/{resource_id}', action='data_preview')
+
         m.connect('/dataset/{id}/resource/{resource_id}',
                   action='resource_read')
         m.connect('/dataset/{id}/resource/{resource_id}/download',
diff --git a/ckan/controllers/package.py b/ckan/controllers/package.py
index dff9a15c8a2..ec5f69841e6 100644
--- a/ckan/controllers/package.py
+++ b/ckan/controllers/package.py
@@ -794,6 +794,21 @@ def resource_read(self, id, resource_id):
         c.related_count = c.pkg.related_count
         return render('package/resource_read.html')
 
+    def data_preview(self, resource_id):
+        context = {'model': model, 'session': model.Session,
+                   'user': c.user or c.author}
+
+        try:
+            c.resource = get_action('resource_show')(context,
+                                                     {'id': resource_id})
+            c.resource_json = json.dumps(c.resource)
+            c.pkg_dict = c.package
+        except NotFound:
+            abort(404, _('Resource not found'))
+        except NotAuthorized:
+            abort(401, _('Unauthorized to read resource %s') % id)
+        return render('package/datapreview.html')
+
     def resource_download(self, id, resource_id):
         """
         Provides a direct download by redirecting the user to the url stored
diff --git a/ckan/public/scripts/application.js b/ckan/public/scripts/application.js
index 87cba35b006..34a78deb418 100644
--- a/ckan/public/scripts/application.js
+++ b/ckan/public/scripts/application.js
@@ -46,6 +46,11 @@ CKAN.Utils = CKAN.Utils || {};
       CKAN.DataPreview.loadPreviewDialog(preload_resource);
     }
 
+    var isResourceViewNew = $('#ckanext-datapreview').length > 0;
+    if (isResourceViewNew) {
+      CKAN.DataPreview.loadPreviewDialog(preload_resource);
+    }
+
     var isEmbededDataviewer = $('body.package.resource_embedded_dataviewer').length > 0;
     if (isEmbededDataviewer) {
       CKAN.DataPreview.loadEmbeddedPreview(preload_resource, reclineState);
diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
index 3c645f280b4..041fe1830e5 100644
--- a/ckanext/datastore/db.py
+++ b/ckanext/datastore/db.py
@@ -45,7 +45,7 @@ def _get_engine(context, data_dict):
     engine = _engines.get(connection_url)
 
     if not engine:
-        engine = sqlalchemy.create_engine(connection_url, echo=True)
+        engine = sqlalchemy.create_engine(connection_url)
         _engines[connection_url] = engine
     return engine
 
@@ -429,6 +429,13 @@ def search_data(context, data_dict):
 
     _validate_int(limit, 'limit')
     _validate_int(offset, 'offset')
+    #convert to ints so that return dict looks correct
+    data_dict['limit'] = int(limit)
+    data_dict['offset'] = int(offset)
+
+    ##pretend there is a limit so we get a count
+    if limit == 0:
+        limit = 1
 
     sort = _sort(context, data_dict.get('sort'), field_ids)
 
@@ -453,6 +460,9 @@ def search_data(context, data_dict):
         converted_row = {}
         if not data_dict['total']:
             data_dict['total'] = row['_full_count']
+            # we have the total now so we do not need any records
+            if data_dict['limit'] == 0:
+                break
         for field in result_fields:
             converted_row[field['id']] = convert(row[field['id']],
                                                  field['type'])
diff --git a/ckanext/datastore/tests/test_datastore.py b/ckanext/datastore/tests/test_datastore.py
index 4dd3fc43cb7..ed381fe6767 100644
--- a/ckanext/datastore/tests/test_datastore.py
+++ b/ckanext/datastore/tests/test_datastore.py
@@ -575,6 +575,33 @@ def test_search_limit(self):
         assert result['total'] == 2
         assert result['records'] == [self.expected_records[0]]
 
+
+        data = {'resource_id': self.data['resource_id'],
+                'limit': 0}
+        postparams = '%s=1' % json.dumps(data)
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
+        res = self.app.post('/api/action/datastore_search', params=postparams,
+                            extra_environ=auth)
+        res_dict = json.loads(res.body)
+        assert res_dict['success'] is True
+        result = res_dict['result']
+        assert result['total'] == 2
+        assert result['records'] == []
+
+        #filter returns no results with 0 limit
+        data = {'resource_id': self.data['resource_id'],
+                'limit': 0,
+                'filters': {u'b\xfck': 'annakar'}}
+        postparams = '%s=1' % json.dumps(data)
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
+        res = self.app.post('/api/action/datastore_search', params=postparams,
+                            extra_environ=auth)
+        res_dict = json.loads(res.body)
+        assert res_dict['success'] is True
+        result = res_dict['result']
+        assert result['total'] == 0
+        assert result['records'] == []
+
     def test_search_invalid_limit(self):
         data = {'resource_id': self.data['resource_id'],
                 'limit': 'bad'}

From cdae2b78ca46b69b874e2a329fea5f28a3d28b5c Mon Sep 17 00:00:00 2001
From: kindly <kindly@gmail.com>
Date: Thu, 23 Aug 2012 12:32:23 +0100
Subject: [PATCH 111/130] Revert "[#2733] turn echo is off"

This reverts commit f82c5d105f84e65d030574f1b5fcb3c082458e1d.
---
 ckan/config/routing.py                    |  3 ---
 ckan/controllers/package.py               | 15 -------------
 ckan/public/scripts/application.js        |  5 -----
 ckanext/datastore/db.py                   | 12 +---------
 ckanext/datastore/tests/test_datastore.py | 27 -----------------------
 5 files changed, 1 insertion(+), 61 deletions(-)

diff --git a/ckan/config/routing.py b/ckan/config/routing.py
index c8fc7c9c1d6..a2ab58634b0 100644
--- a/ckan/config/routing.py
+++ b/ckan/config/routing.py
@@ -194,9 +194,6 @@ def make_map():
           )
         m.connect('/dataset/{id}.{format}', action='read')
         m.connect('/dataset/{id}', action='read')
-
-        m.connect('/datapreview/{resource_id}', action='data_preview')
-
         m.connect('/dataset/{id}/resource/{resource_id}',
                   action='resource_read')
         m.connect('/dataset/{id}/resource/{resource_id}/download',
diff --git a/ckan/controllers/package.py b/ckan/controllers/package.py
index ec5f69841e6..dff9a15c8a2 100644
--- a/ckan/controllers/package.py
+++ b/ckan/controllers/package.py
@@ -794,21 +794,6 @@ def resource_read(self, id, resource_id):
         c.related_count = c.pkg.related_count
         return render('package/resource_read.html')
 
-    def data_preview(self, resource_id):
-        context = {'model': model, 'session': model.Session,
-                   'user': c.user or c.author}
-
-        try:
-            c.resource = get_action('resource_show')(context,
-                                                     {'id': resource_id})
-            c.resource_json = json.dumps(c.resource)
-            c.pkg_dict = c.package
-        except NotFound:
-            abort(404, _('Resource not found'))
-        except NotAuthorized:
-            abort(401, _('Unauthorized to read resource %s') % id)
-        return render('package/datapreview.html')
-
     def resource_download(self, id, resource_id):
         """
         Provides a direct download by redirecting the user to the url stored
diff --git a/ckan/public/scripts/application.js b/ckan/public/scripts/application.js
index 34a78deb418..87cba35b006 100644
--- a/ckan/public/scripts/application.js
+++ b/ckan/public/scripts/application.js
@@ -46,11 +46,6 @@ CKAN.Utils = CKAN.Utils || {};
       CKAN.DataPreview.loadPreviewDialog(preload_resource);
     }
 
-    var isResourceViewNew = $('#ckanext-datapreview').length > 0;
-    if (isResourceViewNew) {
-      CKAN.DataPreview.loadPreviewDialog(preload_resource);
-    }
-
     var isEmbededDataviewer = $('body.package.resource_embedded_dataviewer').length > 0;
     if (isEmbededDataviewer) {
       CKAN.DataPreview.loadEmbeddedPreview(preload_resource, reclineState);
diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
index 041fe1830e5..3c645f280b4 100644
--- a/ckanext/datastore/db.py
+++ b/ckanext/datastore/db.py
@@ -45,7 +45,7 @@ def _get_engine(context, data_dict):
     engine = _engines.get(connection_url)
 
     if not engine:
-        engine = sqlalchemy.create_engine(connection_url)
+        engine = sqlalchemy.create_engine(connection_url, echo=True)
         _engines[connection_url] = engine
     return engine
 
@@ -429,13 +429,6 @@ def search_data(context, data_dict):
 
     _validate_int(limit, 'limit')
     _validate_int(offset, 'offset')
-    #convert to ints so that return dict looks correct
-    data_dict['limit'] = int(limit)
-    data_dict['offset'] = int(offset)
-
-    ##pretend there is a limit so we get a count
-    if limit == 0:
-        limit = 1
 
     sort = _sort(context, data_dict.get('sort'), field_ids)
 
@@ -460,9 +453,6 @@ def search_data(context, data_dict):
         converted_row = {}
         if not data_dict['total']:
             data_dict['total'] = row['_full_count']
-            # we have the total now so we do not need any records
-            if data_dict['limit'] == 0:
-                break
         for field in result_fields:
             converted_row[field['id']] = convert(row[field['id']],
                                                  field['type'])
diff --git a/ckanext/datastore/tests/test_datastore.py b/ckanext/datastore/tests/test_datastore.py
index ed381fe6767..4dd3fc43cb7 100644
--- a/ckanext/datastore/tests/test_datastore.py
+++ b/ckanext/datastore/tests/test_datastore.py
@@ -575,33 +575,6 @@ def test_search_limit(self):
         assert result['total'] == 2
         assert result['records'] == [self.expected_records[0]]
 
-
-        data = {'resource_id': self.data['resource_id'],
-                'limit': 0}
-        postparams = '%s=1' % json.dumps(data)
-        auth = {'Authorization': str(self.sysadmin_user.apikey)}
-        res = self.app.post('/api/action/datastore_search', params=postparams,
-                            extra_environ=auth)
-        res_dict = json.loads(res.body)
-        assert res_dict['success'] is True
-        result = res_dict['result']
-        assert result['total'] == 2
-        assert result['records'] == []
-
-        #filter returns no results with 0 limit
-        data = {'resource_id': self.data['resource_id'],
-                'limit': 0,
-                'filters': {u'b\xfck': 'annakar'}}
-        postparams = '%s=1' % json.dumps(data)
-        auth = {'Authorization': str(self.sysadmin_user.apikey)}
-        res = self.app.post('/api/action/datastore_search', params=postparams,
-                            extra_environ=auth)
-        res_dict = json.loads(res.body)
-        assert res_dict['success'] is True
-        result = res_dict['result']
-        assert result['total'] == 0
-        assert result['records'] == []
-
     def test_search_invalid_limit(self):
         data = {'resource_id': self.data['resource_id'],
                 'limit': 'bad'}

From db9bfe6b258e06037c1b35de689a8fe3ae13fcba Mon Sep 17 00:00:00 2001
From: kindly <kindly@gmail.com>
Date: Thu, 23 Aug 2012 12:39:56 +0100
Subject: [PATCH 112/130] [#2733] turn echo is off

---
 ckanext/datastore/db.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py
index 3c645f280b4..ad5c68e2e7c 100644
--- a/ckanext/datastore/db.py
+++ b/ckanext/datastore/db.py
@@ -45,7 +45,7 @@ def _get_engine(context, data_dict):
     engine = _engines.get(connection_url)
 
     if not engine:
-        engine = sqlalchemy.create_engine(connection_url, echo=True)
+        engine = sqlalchemy.create_engine(connection_url)
         _engines[connection_url] = engine
     return engine
 

From 2e491fd8b743a4be060a17046124e093b55b4c66 Mon Sep 17 00:00:00 2001
From: kindly <kindly@gmail.com>
Date: Thu, 23 Aug 2012 19:06:15 +0100
Subject: [PATCH 113/130] [#2888] first attempt and datapreview on its own

---
 ckan/config/routing.py                    |  3 ++
 ckan/controllers/package.py               | 15 ++++++
 ckan/public/scripts/application.js        |  5 ++
 ckan/templates/package/datapreview.html   | 57 +++++++++++++++++++++++
 ckanext/datastore/tests/test_datastore.py | 27 +++++++++++
 5 files changed, 107 insertions(+)
 create mode 100644 ckan/templates/package/datapreview.html

diff --git a/ckan/config/routing.py b/ckan/config/routing.py
index a2ab58634b0..c8fc7c9c1d6 100644
--- a/ckan/config/routing.py
+++ b/ckan/config/routing.py
@@ -194,6 +194,9 @@ def make_map():
           )
         m.connect('/dataset/{id}.{format}', action='read')
         m.connect('/dataset/{id}', action='read')
+
+        m.connect('/datapreview/{resource_id}', action='data_preview')
+
         m.connect('/dataset/{id}/resource/{resource_id}',
                   action='resource_read')
         m.connect('/dataset/{id}/resource/{resource_id}/download',
diff --git a/ckan/controllers/package.py b/ckan/controllers/package.py
index dff9a15c8a2..ec5f69841e6 100644
--- a/ckan/controllers/package.py
+++ b/ckan/controllers/package.py
@@ -794,6 +794,21 @@ def resource_read(self, id, resource_id):
         c.related_count = c.pkg.related_count
         return render('package/resource_read.html')
 
+    def data_preview(self, resource_id):
+        context = {'model': model, 'session': model.Session,
+                   'user': c.user or c.author}
+
+        try:
+            c.resource = get_action('resource_show')(context,
+                                                     {'id': resource_id})
+            c.resource_json = json.dumps(c.resource)
+            c.pkg_dict = c.package
+        except NotFound:
+            abort(404, _('Resource not found'))
+        except NotAuthorized:
+            abort(401, _('Unauthorized to read resource %s') % id)
+        return render('package/datapreview.html')
+
     def resource_download(self, id, resource_id):
         """
         Provides a direct download by redirecting the user to the url stored
diff --git a/ckan/public/scripts/application.js b/ckan/public/scripts/application.js
index 87cba35b006..34a78deb418 100644
--- a/ckan/public/scripts/application.js
+++ b/ckan/public/scripts/application.js
@@ -46,6 +46,11 @@ CKAN.Utils = CKAN.Utils || {};
       CKAN.DataPreview.loadPreviewDialog(preload_resource);
     }
 
+    var isResourceViewNew = $('#ckanext-datapreview').length > 0;
+    if (isResourceViewNew) {
+      CKAN.DataPreview.loadPreviewDialog(preload_resource);
+    }
+
     var isEmbededDataviewer = $('body.package.resource_embedded_dataviewer').length > 0;
     if (isEmbededDataviewer) {
       CKAN.DataPreview.loadEmbeddedPreview(preload_resource, reclineState);
diff --git a/ckan/templates/package/datapreview.html b/ckan/templates/package/datapreview.html
new file mode 100644
index 00000000000..36d6a99f9a2
--- /dev/null
+++ b/ckan/templates/package/datapreview.html
@@ -0,0 +1,57 @@
+
+<html xmlns:py="http://genshi.edgewall.org/"
+  xmlns:i18n="http://genshi.edgewall.org/i18n"
+  xmlns:xi="http://www.w3.org/2001/XInclude">
+
+<head>
+  <meta charset="utf-8" />
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+
+  <script type="text/javascript">
+    var preload_resource = ${h.literal(c.resource_json)};
+    var embedPath = ${h.literal(c.resource_json)};
+  </script>
+
+  <xi:include href="../js_strings.html" />
+  <xi:include href="../_snippet/data-api-help.html" />
+  <xi:include href="../snippets/data-viewer-embed-dialog.html" />
+
+  <script src="${h.url_for_static('/scripts/vendor/jquery/1.7.1/jquery.js')}"></script>
+  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/jquery.mustache/jquery.mustache.js')}"></script>
+  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/flot/0.7/jquery.flot.js')}"></script>
+  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/flot/0.7/jquery.flot.js')}"></script>
+  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/leaflet/0.3.1/leaflet.js')}"></script>
+  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/json2.js')}"></script>
+  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/jquery.tmpl/beta1/jquery.tmpl.js')}"></script>
+  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/jquery.cookie/jquery.cookie.min.js')}"></script>
+  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/jquery.chosen/0.9.7/chosen.js')}"></script>
+  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/jquery.placeholder/jquery.placeholder.js')}"></script>
+  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/jqueryui/1.8.14/jquery-ui.min.js')}"></script>
+  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/bootstrap/2.0.3/bootstrap.min.js')}"></script>
+
+  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/underscore/1.1.6/underscore.js')}"></script>
+  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/backbone/0.5.1/backbone.js')}"></script>
+
+  <xi:include href="../snippets/recline-extra-header.html" />
+
+  <link rel="stylesheet" href="${h.url_for_static('/scripts/vendor/leaflet/0.3.1/leaflet.css')}" />
+  <!--[if lte IE 8]>
+  <link rel="stylesheet" href="${h.url_for_static('/scripts/vendor/leaflet/0.3.1/leaflet.ie.css')}" />
+  <![endif]-->
+  <link rel="stylesheet" href="${h.url_for_static('/scripts/vendor/jqueryui/1.8.14/css/jquery-ui.custom.css')}" type="text/css" media="screen, print" />
+  <link rel="stylesheet" href="${h.url_for_static('/css/bootstrap.min.css')}" type="text/css" media="screen, projection" />
+  <link rel="stylesheet" href="${h.url_for_static('/css/chosen.css')}" type="text/css" />
+
+</head>
+
+<body>
+  <div id="ckanext-datapreview"></div>
+</body>
+
+  <xi:include href="../snippets/recline-extra-footer.html" />
+
+  <script type="text/javascript" src="${h.url_for_static('/scripts/application.js?lang=${c.locale}')}"></script>
+  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/jquery.mustache/jquery.mustache.js')}"></script>
+
+
+</html>
diff --git a/ckanext/datastore/tests/test_datastore.py b/ckanext/datastore/tests/test_datastore.py
index 4dd3fc43cb7..ed381fe6767 100644
--- a/ckanext/datastore/tests/test_datastore.py
+++ b/ckanext/datastore/tests/test_datastore.py
@@ -575,6 +575,33 @@ def test_search_limit(self):
         assert result['total'] == 2
         assert result['records'] == [self.expected_records[0]]
 
+
+        data = {'resource_id': self.data['resource_id'],
+                'limit': 0}
+        postparams = '%s=1' % json.dumps(data)
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
+        res = self.app.post('/api/action/datastore_search', params=postparams,
+                            extra_environ=auth)
+        res_dict = json.loads(res.body)
+        assert res_dict['success'] is True
+        result = res_dict['result']
+        assert result['total'] == 2
+        assert result['records'] == []
+
+        #filter returns no results with 0 limit
+        data = {'resource_id': self.data['resource_id'],
+                'limit': 0,
+                'filters': {u'b\xfck': 'annakar'}}
+        postparams = '%s=1' % json.dumps(data)
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
+        res = self.app.post('/api/action/datastore_search', params=postparams,
+                            extra_environ=auth)
+        res_dict = json.loads(res.body)
+        assert res_dict['success'] is True
+        result = res_dict['result']
+        assert result['total'] == 0
+        assert result['records'] == []
+
     def test_search_invalid_limit(self):
         data = {'resource_id': self.data['resource_id'],
                 'limit': 'bad'}

From 74584927e1ec3f1e6f391aa79316b97a3e0ce441 Mon Sep 17 00:00:00 2001
From: kindly <kindly@gmail.com>
Date: Thu, 23 Aug 2012 19:07:23 +0100
Subject: [PATCH 114/130] Revert "[#2888] first attempt and datapreview on its
 own"

This reverts commit 2e491fd8b743a4be060a17046124e093b55b4c66.
---
 ckan/config/routing.py                    |  3 --
 ckan/controllers/package.py               | 15 ------
 ckan/public/scripts/application.js        |  5 --
 ckan/templates/package/datapreview.html   | 57 -----------------------
 ckanext/datastore/tests/test_datastore.py | 27 -----------
 5 files changed, 107 deletions(-)
 delete mode 100644 ckan/templates/package/datapreview.html

diff --git a/ckan/config/routing.py b/ckan/config/routing.py
index c8fc7c9c1d6..a2ab58634b0 100644
--- a/ckan/config/routing.py
+++ b/ckan/config/routing.py
@@ -194,9 +194,6 @@ def make_map():
           )
         m.connect('/dataset/{id}.{format}', action='read')
         m.connect('/dataset/{id}', action='read')
-
-        m.connect('/datapreview/{resource_id}', action='data_preview')
-
         m.connect('/dataset/{id}/resource/{resource_id}',
                   action='resource_read')
         m.connect('/dataset/{id}/resource/{resource_id}/download',
diff --git a/ckan/controllers/package.py b/ckan/controllers/package.py
index ec5f69841e6..dff9a15c8a2 100644
--- a/ckan/controllers/package.py
+++ b/ckan/controllers/package.py
@@ -794,21 +794,6 @@ def resource_read(self, id, resource_id):
         c.related_count = c.pkg.related_count
         return render('package/resource_read.html')
 
-    def data_preview(self, resource_id):
-        context = {'model': model, 'session': model.Session,
-                   'user': c.user or c.author}
-
-        try:
-            c.resource = get_action('resource_show')(context,
-                                                     {'id': resource_id})
-            c.resource_json = json.dumps(c.resource)
-            c.pkg_dict = c.package
-        except NotFound:
-            abort(404, _('Resource not found'))
-        except NotAuthorized:
-            abort(401, _('Unauthorized to read resource %s') % id)
-        return render('package/datapreview.html')
-
     def resource_download(self, id, resource_id):
         """
         Provides a direct download by redirecting the user to the url stored
diff --git a/ckan/public/scripts/application.js b/ckan/public/scripts/application.js
index 34a78deb418..87cba35b006 100644
--- a/ckan/public/scripts/application.js
+++ b/ckan/public/scripts/application.js
@@ -46,11 +46,6 @@ CKAN.Utils = CKAN.Utils || {};
       CKAN.DataPreview.loadPreviewDialog(preload_resource);
     }
 
-    var isResourceViewNew = $('#ckanext-datapreview').length > 0;
-    if (isResourceViewNew) {
-      CKAN.DataPreview.loadPreviewDialog(preload_resource);
-    }
-
     var isEmbededDataviewer = $('body.package.resource_embedded_dataviewer').length > 0;
     if (isEmbededDataviewer) {
       CKAN.DataPreview.loadEmbeddedPreview(preload_resource, reclineState);
diff --git a/ckan/templates/package/datapreview.html b/ckan/templates/package/datapreview.html
deleted file mode 100644
index 36d6a99f9a2..00000000000
--- a/ckan/templates/package/datapreview.html
+++ /dev/null
@@ -1,57 +0,0 @@
-
-<html xmlns:py="http://genshi.edgewall.org/"
-  xmlns:i18n="http://genshi.edgewall.org/i18n"
-  xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<head>
-  <meta charset="utf-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-
-  <script type="text/javascript">
-    var preload_resource = ${h.literal(c.resource_json)};
-    var embedPath = ${h.literal(c.resource_json)};
-  </script>
-
-  <xi:include href="../js_strings.html" />
-  <xi:include href="../_snippet/data-api-help.html" />
-  <xi:include href="../snippets/data-viewer-embed-dialog.html" />
-
-  <script src="${h.url_for_static('/scripts/vendor/jquery/1.7.1/jquery.js')}"></script>
-  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/jquery.mustache/jquery.mustache.js')}"></script>
-  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/flot/0.7/jquery.flot.js')}"></script>
-  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/flot/0.7/jquery.flot.js')}"></script>
-  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/leaflet/0.3.1/leaflet.js')}"></script>
-  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/json2.js')}"></script>
-  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/jquery.tmpl/beta1/jquery.tmpl.js')}"></script>
-  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/jquery.cookie/jquery.cookie.min.js')}"></script>
-  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/jquery.chosen/0.9.7/chosen.js')}"></script>
-  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/jquery.placeholder/jquery.placeholder.js')}"></script>
-  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/jqueryui/1.8.14/jquery-ui.min.js')}"></script>
-  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/bootstrap/2.0.3/bootstrap.min.js')}"></script>
-
-  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/underscore/1.1.6/underscore.js')}"></script>
-  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/backbone/0.5.1/backbone.js')}"></script>
-
-  <xi:include href="../snippets/recline-extra-header.html" />
-
-  <link rel="stylesheet" href="${h.url_for_static('/scripts/vendor/leaflet/0.3.1/leaflet.css')}" />
-  <!--[if lte IE 8]>
-  <link rel="stylesheet" href="${h.url_for_static('/scripts/vendor/leaflet/0.3.1/leaflet.ie.css')}" />
-  <![endif]-->
-  <link rel="stylesheet" href="${h.url_for_static('/scripts/vendor/jqueryui/1.8.14/css/jquery-ui.custom.css')}" type="text/css" media="screen, print" />
-  <link rel="stylesheet" href="${h.url_for_static('/css/bootstrap.min.css')}" type="text/css" media="screen, projection" />
-  <link rel="stylesheet" href="${h.url_for_static('/css/chosen.css')}" type="text/css" />
-
-</head>
-
-<body>
-  <div id="ckanext-datapreview"></div>
-</body>
-
-  <xi:include href="../snippets/recline-extra-footer.html" />
-
-  <script type="text/javascript" src="${h.url_for_static('/scripts/application.js?lang=${c.locale}')}"></script>
-  <script type="text/javascript" src="${h.url_for_static('/scripts/vendor/jquery.mustache/jquery.mustache.js')}"></script>
-
-
-</html>
diff --git a/ckanext/datastore/tests/test_datastore.py b/ckanext/datastore/tests/test_datastore.py
index ed381fe6767..4dd3fc43cb7 100644
--- a/ckanext/datastore/tests/test_datastore.py
+++ b/ckanext/datastore/tests/test_datastore.py
@@ -575,33 +575,6 @@ def test_search_limit(self):
         assert result['total'] == 2
         assert result['records'] == [self.expected_records[0]]
 
-
-        data = {'resource_id': self.data['resource_id'],
-                'limit': 0}
-        postparams = '%s=1' % json.dumps(data)
-        auth = {'Authorization': str(self.sysadmin_user.apikey)}
-        res = self.app.post('/api/action/datastore_search', params=postparams,
-                            extra_environ=auth)
-        res_dict = json.loads(res.body)
-        assert res_dict['success'] is True
-        result = res_dict['result']
-        assert result['total'] == 2
-        assert result['records'] == []
-
-        #filter returns no results with 0 limit
-        data = {'resource_id': self.data['resource_id'],
-                'limit': 0,
-                'filters': {u'b\xfck': 'annakar'}}
-        postparams = '%s=1' % json.dumps(data)
-        auth = {'Authorization': str(self.sysadmin_user.apikey)}
-        res = self.app.post('/api/action/datastore_search', params=postparams,
-                            extra_environ=auth)
-        res_dict = json.loads(res.body)
-        assert res_dict['success'] is True
-        result = res_dict['result']
-        assert result['total'] == 0
-        assert result['records'] == []
-
     def test_search_invalid_limit(self):
         data = {'resource_id': self.data['resource_id'],
                 'limit': 'bad'}

From 35eef77e3366f17658b98a9153f0a313d2103dbd Mon Sep 17 00:00:00 2001
From: kindly <kindly@gmail.com>
Date: Fri, 24 Aug 2012 00:46:00 +0100
Subject: [PATCH 115/130] [#2733] add datastore_active flag to resource dicts

---
 ckanext/datastore/plugin.py               | 36 +++++++++++++++++++++++
 ckanext/datastore/tests/test_datastore.py | 19 +++++++++++-
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/ckanext/datastore/plugin.py b/ckanext/datastore/plugin.py
index 849ba69c906..2a9e4f32e6a 100644
--- a/ckanext/datastore/plugin.py
+++ b/ckanext/datastore/plugin.py
@@ -1,6 +1,8 @@
 import ckan.plugins as p
 import ckanext.datastore.logic.action as action
 import ckanext.datastore.logic.auth as auth
+import ckanext.datastore.db as db
+import ckan.logic as logic
 
 
 class DatastoreException(Exception):
@@ -21,6 +23,40 @@ def configure(self, config):
             error_msg = 'ckan.datastore_write_url not found in config'
             raise DatastoreException(error_msg)
 
+        ## Do light wrapping around action function to add datastore_active
+        ## to resource dict.  Not using IAction extension as this prevents other plugins
+        ## from having a custom resource_read.
+
+        # Make sure actions are cached
+        resource_show = p.toolkit.get_action('resource_show')
+
+        def new_resource_show(context, data_dict):
+            engine = db._get_engine(
+                context,
+                {'connection_url': config['ckan.datastore_write_url']}
+            )
+            new_data_dict = resource_show(context, data_dict)
+            try:
+                connection = engine.connect()
+                result = connection.execute(
+                    'select 1 from pg_tables where tablename = %s',
+                    new_data_dict['id']
+                ).fetchone()
+                if result:
+                    new_data_dict['datastore_active'] = True
+                else:
+                    new_data_dict['datastore_active'] = False
+            finally:
+                connection.close()
+            return new_data_dict
+
+        ## Make sure do not run many times if configure is called repeatedly
+        ## as in tests.
+        if not hasattr(resource_show, '_datastore_wrapped'):
+            new_resource_show._datastore_wrapped = True
+            logic._actions['resource_show'] = new_resource_show
+
+
     def get_actions(self):
         return {'datastore_create': action.datastore_create,
                 'datastore_delete': action.datastore_delete,
diff --git a/ckanext/datastore/tests/test_datastore.py b/ckanext/datastore/tests/test_datastore.py
index 4dd3fc43cb7..e237f5509f3 100644
--- a/ckanext/datastore/tests/test_datastore.py
+++ b/ckanext/datastore/tests/test_datastore.py
@@ -11,10 +11,10 @@
 class TestDatastoreCreate(tests.WsgiAppCase):
     sysadmin_user = None
     normal_user = None
+    p.load('datastore')
 
     @classmethod
     def setup_class(cls):
-        p.load('datastore')
         ctd.CreateTestData.create()
         cls.sysadmin_user = model.User.get('testsysadmin')
         cls.normal_user = model.User.get('annafan')
@@ -141,6 +141,15 @@ def test_create_basic(self):
                         {'book': 'annakarenina', 'author': ['tolstoy', 'putin']},
                         {'book': 'warandpeace'}]  # treat author as null
         }
+        ### Firstly test to see if resource things it has datastore table
+        postparams = '%s=1' % json.dumps({'id': resource.id})
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
+        res = self.app.post('/api/action/resource_show', params=postparams,
+                            extra_environ=auth)
+        res_dict = json.loads(res.body)
+        assert res_dict['result']['datastore_active'] == False
+
+
         postparams = '%s=1' % json.dumps(data)
         auth = {'Authorization': str(self.sysadmin_user.apikey)}
         res = self.app.post('/api/action/datastore_create', params=postparams,
@@ -167,6 +176,14 @@ def test_create_basic(self):
         assert results.rowcount == 2
         model.Session.remove()
 
+        # check to test to see if resource now has a datastore table
+        postparams = '%s=1' % json.dumps({'id': resource.id})
+        auth = {'Authorization': str(self.sysadmin_user.apikey)}
+        res = self.app.post('/api/action/resource_show', params=postparams,
+                            extra_environ=auth)
+        res_dict = json.loads(res.body)
+        assert res_dict['result']['datastore_active'] == True
+
         #######  insert again simple
         data2 = {
             'resource_id': resource.id,

From 95c97528e67de2bd8221449d0f574c4759b48a05 Mon Sep 17 00:00:00 2001
From: Rufus Pollock <rufus.pollock@okfn.org>
Date: Tue, 28 Aug 2012 12:54:01 +0100
Subject: [PATCH 116/130] [#2733,js][s]: data viewer working with new (v2)
 DataStore.

* Upgraded to latest recline.js which has support for new CKAN datastore
* Refactor application.js setup code to use this plus new datastore_active flag
---
 ckan/public/scripts/application.js            |   13 +-
 ckan/public/scripts/vendor/recline/recline.js | 1146 +++++++++++------
 2 files changed, 745 insertions(+), 414 deletions(-)

diff --git a/ckan/public/scripts/application.js b/ckan/public/scripts/application.js
index 87cba35b006..7e3b8c6d9fe 100644
--- a/ckan/public/scripts/application.js
+++ b/ckan/public/scripts/application.js
@@ -1669,8 +1669,8 @@ CKAN.DataPreview = function ($, my) {
     }
 
     // 4 situations
-    // a) webstore_url is active (something was posted to the datastore)
-    // b) csv or xls (but not webstore)
+    // a) something was posted to the datastore - need to check for this
+    // b) csv or xls (but not datastore)
     // c) can be treated as plain text
     // d) none of the above but worth iframing (assumption is
     // that if we got here (i.e. preview shown) worth doing
@@ -1688,9 +1688,12 @@ CKAN.DataPreview = function ($, my) {
       }
     }
 
-    if (resourceData.webstore_url) {
-      resourceData.url = '/api/data/' + resourceData.id;
-      resourceData.backend =  'elasticsearch';
+    // Set recline CKAN backend API endpoint to right location (so it can locate
+    // CKAN DataStore)
+    recline.Backend.Ckan.API_ENDPOINT = CKAN.SITE_URL + '/api';
+
+    if (resourceData.datastore_active) {
+      resourceData.backend =  'ckan';
       var dataset = new recline.Model.Dataset(resourceData);
       var errorMsg = CKAN.Strings.errorLoadingPreview + ': ' + CKAN.Strings.errorDataStore;
       dataset.fetch()
diff --git a/ckan/public/scripts/vendor/recline/recline.js b/ckan/public/scripts/vendor/recline/recline.js
index f5b4090bccb..f863649826d 100644
--- a/ckan/public/scripts/vendor/recline/recline.js
+++ b/ckan/public/scripts/vendor/recline/recline.js
@@ -1,5 +1,105 @@
 this.recline = this.recline || {};
 this.recline.Backend = this.recline.Backend || {};
+this.recline.Backend.Ckan = this.recline.Backend.Ckan || {};
+
+(function($, my) {
+  // ## CKAN Backend
+  //
+  // This provides connection to the CKAN DataStore (v2)
+  //
+  // General notes
+  // 
+  // * Every dataset must have an id equal to its resource id on the CKAN instance
+  // * You should set the CKAN API endpoint for requests by setting API_ENDPOINT value on this module (recline.Backend.Ckan.API_ENDPOINT)
+
+  my.__type__ = 'ckan';
+
+  // Default CKAN API endpoint used for requests (you can change this but it will affect every request!)
+  my.API_ENDPOINT = 'http://datahub.io/api';
+
+  // ### fetch
+  my.fetch = function(dataset) {
+    var wrapper = my.DataStore();
+    var dfd = $.Deferred();
+    var jqxhr = wrapper.search({resource_id: dataset.id, limit: 0});
+    jqxhr.done(function(results) {
+      // map ckan types to our usual types ...
+      var fields = _.map(results.result.fields, function(field) {
+        field.type = field.type in CKAN_TYPES_MAP ? CKAN_TYPES_MAP[field.type] : field.type;
+        return field;
+      });
+      var out = {
+        fields: fields,
+        useMemoryStore: false
+      };
+      dfd.resolve(out);  
+    });
+    return dfd.promise();
+  };
+
+  // only put in the module namespace so we can access for tests!
+  my._normalizeQuery = function(queryObj, dataset) {
+    var actualQuery = {
+      resource_id: dataset.id,
+      q: queryObj.q,
+      limit: queryObj.size || 10,
+      offset: queryObj.from || 0
+    };
+    if (queryObj.sort && queryObj.sort.length > 0) {
+      var _tmp = _.map(queryObj.sort, function(sortObj) {
+        return sortObj.field + ' ' + (sortObj.order || '');
+      });
+      actualQuery.sort = _tmp.join(',');
+    }
+    return actualQuery;
+  }
+
+  my.query = function(queryObj, dataset) {
+    var actualQuery = my._normalizeQuery(queryObj, dataset);
+    var wrapper = my.DataStore();
+    var dfd = $.Deferred();
+    var jqxhr = wrapper.search(actualQuery);
+    jqxhr.done(function(results) {
+      var out = {
+        total: results.result.total,
+        hits: results.result.records,
+      };
+      dfd.resolve(out);  
+    });
+    return dfd.promise();
+  };
+
+  // ### DataStore
+  //
+  // Simple wrapper around the CKAN DataStore API
+  //
+  // @param endpoint: CKAN api endpoint (e.g. http://datahub.io/api)
+  my.DataStore = function(endpoint) { 
+    var that = {
+      endpoint: endpoint || my.API_ENDPOINT
+    };
+    that.search = function(data) {
+      var searchUrl = that.endpoint + '/3/action/datastore_search';
+      var jqxhr = $.ajax({
+        url: searchUrl,
+        data: data,
+        dataType: 'json'
+      });
+      return jqxhr;
+    }
+
+    return that;
+  }
+
+  var CKAN_TYPES_MAP = {
+    'int4': 'integer',
+    'float8': 'float',
+    'text': 'string'
+  };
+
+}(jQuery, this.recline.Backend.Ckan));
+this.recline = this.recline || {};
+this.recline.Backend = this.recline.Backend || {};
 this.recline.Backend.CSV = this.recline.Backend.CSV || {};
 
 (function(my) {
@@ -149,6 +249,69 @@ this.recline.Backend.CSV = this.recline.Backend.CSV || {};
     return out;
   };
 
+  // Converts an array of arrays into a Comma Separated Values string.
+  // Each array becomes a line in the CSV.
+  //
+  // Nulls are converted to empty fields and integers or floats are converted to non-quoted numbers.
+  //
+  // @return The array serialized as a CSV
+  // @type String
+  // 
+  // @param {Array} a The array of arrays to convert
+  // @param {Object} options Options for loading CSV including
+  //	@param {String} [separator=','] Separator for CSV file
+  // Heavily based on uselesscode's JS CSV parser (MIT Licensed):
+  // http://www.uselesscode.org/javascript/csv/
+  my.serializeCSV= function(a, options) {
+    var options = options || {};
+    var separator = options.separator || ',';
+    var delimiter = options.delimiter || '"';
+
+    var cur = '', // The character we are currently processing.
+      field = '', // Buffer for building up the current field
+      row = '',
+      out = '',
+      i,
+      j,
+      processField;
+
+    processField = function (field) {
+      if (field === null) {
+        // If field is null set to empty string
+        field = '';
+      } else if (typeof field === "string" && rxNeedsQuoting.test(field)) {
+        // Convert string to delimited string
+        field = delimiter + field + delimiter;
+      } else if (typeof field === "number") {
+        // Convert number to string
+        field = field.toString(10);
+      }
+
+      return field;
+    };
+
+    for (i = 0; i < a.length; i += 1) {
+      cur = a[i];
+
+      for (j = 0; j < cur.length; j += 1) {
+        field = processField(cur[j]);
+        // If this is EOR append row to output and flush row
+        if (j === (cur.length - 1)) {
+          row += field;
+          out += row + "\n";
+          row = '';
+        } else {
+          // Add the current field to the current row
+          row += field + separator;
+        }
+        // Flush the field buffer
+        field = '';
+      }
+    }
+
+    return out;
+  };
+
   var rxIsInt = /^\d+$/,
     rxIsFloat = /^\d*\.\d+$|^\d+\.\d*$/,
     // If a string has leading or trailing space,
@@ -372,6 +535,19 @@ this.recline.Backend.ElasticSearch = this.recline.Backend.ElasticSearch || {};
       return out;
     },
 
+    // convert from Recline sort structure to ES form
+    // http://www.elasticsearch.org/guide/reference/api/search/sort.html
+    this._normalizeSort = function(sort) {
+      var out = _.map(sort, function(sortObj) {
+        var _tmp = {};
+        var _tmp2 = _.clone(sortObj);
+        delete _tmp2['field'];
+        _tmp[sortObj.field] = _tmp2;
+        return _tmp;
+      });
+      return out;
+    },
+
     this._convertFilter = function(filter) {
       var out = {};
       out[filter.type] = {}
@@ -390,10 +566,12 @@ this.recline.Backend.ElasticSearch = this.recline.Backend.ElasticSearch || {};
     // @return deferred supporting promise API
     this.query = function(queryObj) {
       var esQuery = (queryObj && queryObj.toJSON) ? queryObj.toJSON() : _.extend({}, queryObj);
-      var queryNormalized = this._normalizeQuery(queryObj);
+      esQuery.query = this._normalizeQuery(queryObj);
       delete esQuery.q;
       delete esQuery.filters;
-      esQuery.query = queryNormalized;
+      if (esQuery.sort && esQuery.sort.length > 0) {
+        esQuery.sort = this._normalizeSort(esQuery.sort);
+      }
       var data = {source: JSON.stringify(esQuery)};
       var url = this.endpoint + '/_search';
       var jqxhr = makeRequest({
@@ -549,19 +727,43 @@ this.recline.Backend.GDocs = this.recline.Backend.GDocs || {};
   // * fields: array of Field objects
   // * records: array of objects for each row
   my.fetch = function(dataset) {
-    var dfd = $.Deferred(); 
-    var url = my.getSpreadsheetAPIUrl(dataset.url);
-    $.getJSON(url, function(d) {
-      result = my.parseData(d);
-      var fields = _.map(result.fields, function(fieldId) {
-        return {id: fieldId};
+    var dfd  = $.Deferred(); 
+    var urls = my.getGDocsAPIUrls(dataset.url);
+
+    // TODO cover it with tests
+    // get the spreadsheet title
+    (function () {
+      var titleDfd = $.Deferred();
+
+      $.getJSON(urls.spreadsheet, function (d) {
+          titleDfd.resolve({
+              spreadsheetTitle: d.feed.title.$t
+          });
       });
-      dfd.resolve({
-        records: result.records,
-        fields: fields,
-        useMemoryStore: true
+
+      return titleDfd.promise();
+    }()).then(function (response) {
+
+      // get the actual worksheet data
+      $.getJSON(urls.worksheet, function(d) {
+        var result = my.parseData(d);
+        var fields = _.map(result.fields, function(fieldId) {
+          return {id: fieldId};
+        });
+
+        dfd.resolve({
+          metadata: {
+              title: response.spreadsheetTitle +" :: "+ result.worksheetTitle,
+              spreadsheetTitle: response.spreadsheetTitle,
+              worksheetTitle  : result.worksheetTitle
+          },
+          records       : result.records,
+          fields        : fields,
+          useMemoryStore: true
+        });
       });
     });
+
     return dfd.promise();
   };
 
@@ -575,71 +777,86 @@ this.recline.Backend.GDocs = this.recline.Backend.GDocs || {};
   // :return: tabular data object (hash with keys: field and data).
   // 
   // Issues: seems google docs return columns in rows in random order and not even sure whether consistent across rows.
-  my.parseData = function(gdocsSpreadsheet) {
-    var options = {};
-    if (arguments.length > 1) {
-      options = arguments[1];
-    }
+  my.parseData = function(gdocsSpreadsheet, options) {
+    var options  = options || {};
+    var colTypes = options.colTypes || {};
     var results = {
-      fields: [],
+      fields : [],
       records: []
     };
-    // default is no special info on type of columns
-    var colTypes = {};
-    if (options.colTypes) {
-      colTypes = options.colTypes;
-    }
-    if (gdocsSpreadsheet.feed.entry.length > 0) {
-      for (var k in gdocsSpreadsheet.feed.entry[0]) {
-        if (k.substr(0, 3) == 'gsx') {
-          var col = k.substr(4);
-          results.fields.push(col);
-        }
+    var entries = gdocsSpreadsheet.feed.entry || [];
+    var key;
+    var colName;
+    // percentage values (e.g. 23.3%)
+    var rep = /^([\d\.\-]+)\%$/;
+
+    for(key in entries[0]) {
+      // it's barely possible it has inherited keys starting with 'gsx$'
+      if(/^gsx/.test(key)) {
+        colName = key.substr(4);
+        results.fields.push(colName);
       }
     }
 
     // converts non numberical values that should be numerical (22.3%[string] -> 0.223[float])
-    var rep = /^([\d\.\-]+)\%$/;
-    results.records = _.map(gdocsSpreadsheet.feed.entry, function(entry) {
+    results.records = _.map(entries, function(entry) {
       var row = {};
+
       _.each(results.fields, function(col) {
         var _keyname = 'gsx$' + col;
-        var value = entry[_keyname]['$t'];
+        var value = entry[_keyname].$t;
+        var num;
+ 
+        // TODO cover this part of code with test
+        // TODO use the regexp only once
         // if labelled as % and value contains %, convert
-        if (colTypes[col] == 'percent') {
-          if (rep.test(value)) {
-            var value2 = rep.exec(value);
-            var value3 = parseFloat(value2);
-            value = value3 / 100;
-          }
+        if(colTypes[col] === 'percent' && rep.test(value)) {
+          num   = rep.exec(value)[1];
+          value = parseFloat(num) / 100;
         }
+
         row[col] = value;
       });
+
       return row;
     });
+
+    results.worksheetTitle = gdocsSpreadsheet.feed.title.$t;
     return results;
   };
 
   // Convenience function to get GDocs JSON API Url from standard URL
-  my.getSpreadsheetAPIUrl = function(url) {
-    if (url.indexOf('feeds/list') != -1) {
-      return url;
-    } else {
-      // https://docs.google.com/spreadsheet/ccc?key=XXXX#gid=0
-      var regex = /.*spreadsheet\/ccc?.*key=([^#?&+]+).*/;
-      var matches = url.match(regex);
-      if (matches) {
-        var key = matches[1];
-        var worksheet = 1;
-        var out = 'https://spreadsheets.google.com/feeds/list/' + key + '/' + worksheet + '/public/values?alt=json';
-        return out;
-      } else {
-        alert('Failed to extract gdocs key from ' + url);
-      }
+  my.getGDocsAPIUrls = function(url) {
+    // https://docs.google.com/spreadsheet/ccc?key=XXXX#gid=YYY
+    var regex = /.*spreadsheet\/ccc?.*key=([^#?&+]+).*gid=([\d]+).*/;
+    var matches = url.match(regex);
+    var key;
+    var worksheet;
+    var urls;
+    
+    if(!!matches) {
+        key = matches[1];
+        // the gid in url is 0-based and feed url is 1-based
+        worksheet = parseInt(matches[2]) + 1;
+        urls = {
+          worksheet  : 'https://spreadsheets.google.com/feeds/list/'+ key +'/'+ worksheet +'/public/values?alt=json',
+          spreadsheet: 'https://spreadsheets.google.com/feeds/worksheets/'+ key +'/public/basic?alt=json'
+        }
     }
+    else {
+        // we assume that it's one of the feeds urls
+        key = url.split('/')[5];
+        // by default then, take first worksheet
+        worksheet = 1;
+        urls = {
+          worksheet  : 'https://spreadsheets.google.com/feeds/list/'+ key +'/'+ worksheet +'/public/values?alt=json',
+          spreadsheet: 'https://spreadsheets.google.com/feeds/worksheets/'+ key +'/public/basic?alt=json'
+        }            
+    }
+
+    return urls;
   };
 }(jQuery, this.recline.Backend.GDocs));
-
 this.recline = this.recline || {};
 this.recline.Backend = this.recline.Backend || {};
 this.recline.Backend.Memory = this.recline.Backend.Memory || {};
@@ -705,16 +922,19 @@ this.recline.Backend.Memory = this.recline.Backend.Memory || {};
       var numRows = queryObj.size || this.data.length;
       var start = queryObj.from || 0;
       var results = this.data;
+      
       results = this._applyFilters(results, queryObj);
       results = this._applyFreeTextQuery(results, queryObj);
-      // not complete sorting!
+
+      // TODO: this is not complete sorting!
+      // What's wrong is we sort on the *last* entry in the sort list if there are multiple sort criteria
       _.each(queryObj.sort, function(sortObj) {
-        var fieldName = _.keys(sortObj)[0];
+        var fieldName = sortObj.field;
         results = _.sortBy(results, function(doc) {
           var _out = doc[fieldName];
           return _out;
         });
-        if (sortObj[fieldName].order == 'desc') {
+        if (sortObj.order == 'desc') {
           results.reverse();
         }
       });
@@ -730,15 +950,51 @@ this.recline.Backend.Memory = this.recline.Backend.Memory || {};
 
     // in place filtering
     this._applyFilters = function(results, queryObj) {
-      _.each(queryObj.filters, function(filter) {
-        // if a term filter ...
-        if (filter.type === 'term') {
-          results = _.filter(results, function(doc) {
-            return (doc[filter.field] == filter.term);
-          });
-        }
+      var filters = queryObj.filters;
+      // register filters
+      var filterFunctions = {
+        term         : term,
+        range        : range,
+        geo_distance : geo_distance
+      };
+      var dataParsers = {
+        number : function (e) { return parseFloat(e, 10); },
+        string : function (e) { return e.toString() },
+        date   : function (e) { return new Date(e).valueOf() }
+      };
+
+      // filter records
+      return _.filter(results, function (record) {
+        var passes = _.map(filters, function (filter) {
+          return filterFunctions[filter.type](record, filter);
+        });
+
+        // return only these records that pass all filters
+        return _.all(passes, _.identity);
       });
-      return results;
+
+      // filters definitions
+
+      function term(record, filter) {
+        var parse = dataParsers[filter.fieldType];
+        var value = parse(record[filter.field]);
+        var term  = parse(filter.term);
+
+        return (value === term);
+      }
+
+      function range(record, filter) {
+        var parse = dataParsers[filter.fieldType];
+        var value = parse(record[filter.field]);
+        var start = parse(filter.start);
+        var stop  = parse(filter.stop);
+
+        return (value >= start && value <= stop);
+      }
+
+      function geo_distance() {
+        // TODO code here
+      }
     };
 
     // we OR across fields but AND across terms in query string
@@ -810,7 +1066,7 @@ this.recline.Backend.Memory = this.recline.Backend.Memory || {};
     };
 
     this.transform = function(editFunc) {
-      var toUpdate = costco.mapDocs(this.data, editFunc);
+      var toUpdate = recline.Data.Transform.mapDocs(this.data, editFunc);
       // TODO: very inefficient -- could probably just walk the documents and updates in tandem and update
       _.each(toUpdate.updates, function(record, idx) {
         self.data[idx] = record;
@@ -820,74 +1076,73 @@ this.recline.Backend.Memory = this.recline.Backend.Memory || {};
   };
 
 }(jQuery, this.recline.Backend.Memory));
+this.recline = this.recline || {};
+this.recline.Data = this.recline.Data || {};
+
+(function(my) {
 // adapted from https://github.com/harthur/costco. heather rules
 
-var costco = function() {
+my.Transform = {};
+
+my.Transform.evalFunction = function(funcString) {
+  try {
+    eval("var editFunc = " + funcString);
+  } catch(e) {
+    return {errorMessage: e+""};
+  }
+  return editFunc;
+};
+
+my.Transform.previewTransform = function(docs, editFunc, currentColumn) {
+  var preview = [];
+  var updated = my.Transform.mapDocs($.extend(true, {}, docs), editFunc);
+  for (var i = 0; i < updated.docs.length; i++) {      
+    var before = docs[i]
+      , after = updated.docs[i]
+      ;
+    if (!after) after = {};
+    if (currentColumn) {
+      preview.push({before: before[currentColumn], after: after[currentColumn]});      
+    } else {
+      preview.push({before: before, after: after});      
+    }
+  }
+  return preview;
+};
+
+my.Transform.mapDocs = function(docs, editFunc) {
+  var edited = []
+    , deleted = []
+    , failed = []
+    ;
   
-  function evalFunction(funcString) {
+  var updatedDocs = _.map(docs, function(doc) {
     try {
-      eval("var editFunc = " + funcString);
+      var updated = editFunc(_.clone(doc));
     } catch(e) {
-      return {errorMessage: e+""};
+      failed.push(doc);
+      return;
     }
-    return editFunc;
-  }
-  
-  function previewTransform(docs, editFunc, currentColumn) {
-    var preview = [];
-    var updated = mapDocs($.extend(true, {}, docs), editFunc);
-    for (var i = 0; i < updated.docs.length; i++) {      
-      var before = docs[i]
-        , after = updated.docs[i]
-        ;
-      if (!after) after = {};
-      if (currentColumn) {
-        preview.push({before: before[currentColumn], after: after[currentColumn]});      
-      } else {
-        preview.push({before: before, after: after});      
-      }
+    if(updated === null) {
+      updated = {_deleted: true};
+      edited.push(updated);
+      deleted.push(doc);
     }
-    return preview;
-  }
-
-  function mapDocs(docs, editFunc) {
-    var edited = []
-      , deleted = []
-      , failed = []
-      ;
-    
-    var updatedDocs = _.map(docs, function(doc) {
-      try {
-        var updated = editFunc(_.clone(doc));
-      } catch(e) {
-        failed.push(doc);
-        return;
-      }
-      if(updated === null) {
-        updated = {_deleted: true};
-        edited.push(updated);
-        deleted.push(doc);
-      }
-      else if(updated && !_.isEqual(updated, doc)) {
-        edited.push(updated);
-      }
-      return updated;      
-    });
-    
-    return {
-      updates: edited, 
-      docs: updatedDocs, 
-      deletes: deleted, 
-      failed: failed
-    };
-  }
+    else if(updated && !_.isEqual(updated, doc)) {
+      edited.push(updated);
+    }
+    return updated;      
+  });
   
   return {
-    evalFunction: evalFunction,
-    previewTransform: previewTransform,
-    mapDocs: mapDocs
+    updates: edited, 
+    docs: updatedDocs, 
+    deletes: deleted, 
+    failed: failed
   };
-}();
+};
+
+}(this.recline.Data))
 // # Recline Backbone Models
 this.recline = this.recline || {};
 this.recline.Model = this.recline.Model || {};
@@ -1181,36 +1436,6 @@ my.Dataset = Backbone.Model.extend({
 });
 
 
-// ### Dataset.restore
-//
-// Restore a Dataset instance from a serialized state. Serialized state for a
-// Dataset is an Object like:
-// 
-// <pre>
-// {
-//   backend: {backend type - i.e. value of dataset.backend.__type__}
-//   dataset: {dataset info needed for loading -- result of dataset.toJSON() would be sufficient but can be simpler }
-//   // convenience - if url provided and dataste not this be used as dataset url
-//   url: {dataset url}
-//   ...
-// }
-my.Dataset.restore = function(state) {
-  var dataset = null;
-  // hack-y - restoring a memory dataset does not mean much ...
-  if (state.backend === 'memory') {
-    var datasetInfo = {
-      records: [{stub: 'this is a stub dataset because we do not restore memory datasets'}]
-    };
-  } else {
-    var datasetInfo = {
-      url: state.url,
-      backend: state.backend
-    };
-  }
-  dataset = new recline.Model.Dataset(datasetInfo);
-  return dataset;
-};
-
 // ## <a id="record">A Record</a>
 // 
 // A single record (or row) in the dataset
@@ -1385,10 +1610,17 @@ my.Query = Backbone.Model.extend({
   _filterTemplates: {
     term: {
       type: 'term',
+      // TODO do we need this attribute here?
       field: '',
       term: ''
     },
+    range: {
+      type: 'range',
+      start: '',
+      stop: ''
+    },
     geo_distance: {
+      type: 'geo_distance',
       distance: 10,
       unit: 'km',
       point: {
@@ -1406,7 +1638,8 @@ my.Query = Backbone.Model.extend({
     // crude deep copy
     var ourfilter = JSON.parse(JSON.stringify(filter));
     // not full specified so use template and over-write
-    if (_.keys(filter).length <= 2) {
+    // 3 as for 'type', 'field' and 'fieldType'
+    if (_.keys(filter).length <= 3) {
       ourfilter = _.extend(this._filterTemplates[filter.type], ourfilter);
     }
     var filters = this.get('filters');
@@ -1518,22 +1751,22 @@ this.recline.View = this.recline.View || {};
 // NB: should *not* provide an el argument to the view but must let the view
 // generate the element itself (you can then append view.el to the DOM.
 my.Graph = Backbone.View.extend({
-  tagName:  "div",
-  className: "recline-graph",
-
   template: ' \
-  <div class="panel graph"> \
-    <div class="js-temp-notice alert alert-block"> \
-      <h3 class="alert-heading">Hey there!</h3> \
-      <p>There\'s no graph here yet because we don\'t know what fields you\'d like to see plotted.</p> \
-      <p>Please tell us by <strong>using the menu on the right</strong> and a graph will automatically appear.</p> \
+    <div class="recline-graph"> \
+      <div class="panel graph" style="display: block;"> \
+        <div class="js-temp-notice alert alert-block"> \
+          <h3 class="alert-heading">Hey there!</h3> \
+          <p>There\'s no graph here yet because we don\'t know what fields you\'d like to see plotted.</p> \
+          <p>Please tell us by <strong>using the menu on the right</strong> and a graph will automatically appear.</p> \
+        </div> \
+      </div> \
     </div> \
-  </div> \
-</div> \
 ',
 
   initialize: function(options) {
     var self = this;
+    this.graphColors = ["#edc240", "#afd8f8", "#cb4b4b", "#4da74d", "#9440ed"];
+
     this.el = $(this.el);
     _.bindAll(this, 'render', 'redraw');
     this.needToRedraw = false;
@@ -1542,12 +1775,6 @@ my.Graph = Backbone.View.extend({
     this.model.fields.bind('add', this.render);
     this.model.records.bind('add', this.redraw);
     this.model.records.bind('reset', this.redraw);
-    // because we cannot redraw when hidden we may need when becoming visible
-    this.bind('view:show', function() {
-      if (this.needToRedraw) {
-        self.redraw();
-      }
-    });
     var stateData = _.extend({
         group: null,
         // so that at least one series chooser box shows up
@@ -1566,7 +1793,6 @@ my.Graph = Backbone.View.extend({
       self.redraw();
     });
     this.elSidebar = this.editor.el;
-    this.render();
   },
 
   render: function() {
@@ -1590,14 +1816,21 @@ my.Graph = Backbone.View.extend({
       this.needToRedraw = true;
       return;
     }
+
     // check we have something to plot
     if (this.state.get('group') && this.state.get('series')) {
       // faff around with width because flot draws axes *outside* of the element width which means graph can get push down as it hits element next to it
       this.$graph.width(this.el.width() - 20);
       var series = this.createSeries();
       var options = this.getGraphOptions(this.state.attributes.graphType);
-      this.plot = $.plot(this.$graph, series, options);
-      this.setupTooltips();
+      this.plot = Flotr.draw(this.$graph.get(0), series, options);
+    }
+  },
+
+  show: function() {
+    // because we cannot redraw when hidden we may need to when becoming visible
+    if (this.needToRedraw) {
+      this.redraw();
     }
   },
 
@@ -1610,138 +1843,142 @@ my.Graph = Backbone.View.extend({
   // @param typeId graphType id (lines, lines-and-points etc)
   getGraphOptions: function(typeId) { 
     var self = this;
-    // special tickformatter to show labels rather than numbers
-    // TODO: we should really use tickFormatter and 1 interval ticks if (and
-    // only if) x-axis values are non-numeric
-    // However, that is non-trivial to work out from a dataset (datasets may
-    // have no field type info). Thus at present we only do this for bars.
-    var tickFormatter = function (val) {
-      if (self.model.records.models[val]) {
-        var out = self.model.records.models[val].get(self.state.attributes.group);
-        // if the value was in fact a number we want that not the 
-        if (typeof(out) == 'number') {
-          return val;
-        } else {
-          return out;
-        }
-      }
-      return val;
+
+    var tickFormatter = function (x) {
+      return getFormattedX(x);
     };
+    
+    var trackFormatter = function (obj) {
+          var x = obj.x;
+          var y = obj.y;
+          // it's horizontal so we have to flip
+          if (self.state.attributes.graphType === 'bars') {
+            var _tmp = x;
+            x = y;
+            y = _tmp;
+          }
+          
+          x = getFormattedX(x);
 
-    var xaxis = {};
-    // check for time series on x-axis
-    if (this.model.fields.get(this.state.get('group')).get('type') === 'date') {
-      xaxis.mode = 'time';
-      xaxis.timeformat = '%y-%b';
+          var content = _.template('<%= group %> = <%= x %>, <%= series %> = <%= y %>', {
+            group: self.state.attributes.group,
+            x: x,
+            series: obj.series.label,
+            y: y
+          });
+        
+        return content;
+    };
+    
+    var getFormattedX = function (x) {
+      var xfield = self.model.fields.get(self.state.attributes.group);
+
+      // time series
+      var isDateTime = xfield.get('type') === 'date';
+
+      if (self.model.records.models[parseInt(x)]) {
+        x = self.model.records.models[parseInt(x)].get(self.state.attributes.group);
+        if (isDateTime) {
+          x = new Date(x).toLocaleDateString();
+        }
+      } else if (isDateTime) {
+        x = new Date(parseInt(x)).toLocaleDateString();
+      }
+      return x;    
     }
+    
+    var xaxis = {};
+    xaxis.tickFormatter = tickFormatter;
+
+    var yaxis = {};
+    yaxis.autoscale = true;
+    yaxis.autoscaleMargin = 0.02;
+    
+    var mouse = {};
+    mouse.track = true;
+    mouse.relative = true;
+    mouse.trackFormatter = trackFormatter;
+    
+    var legend = {};
+    legend.position = 'ne';
+    
+    // mouse.lineColor is set in createSeries
     var optionsPerGraphType = { 
       lines: {
-        series: { 
-          lines: { show: true }
-        },
-        xaxis: xaxis
+        legend: legend,
+        colors: this.graphColors,
+        lines: { show: true },
+        xaxis: xaxis,
+        yaxis: yaxis,
+        mouse: mouse
       },
       points: {
-        series: {
-          points: { show: true }
-        },
+        legend: legend,
+        colors: this.graphColors,
+        points: { show: true, hitRadius: 5 },
         xaxis: xaxis,
+        yaxis: yaxis,
+        mouse: mouse,
         grid: { hoverable: true, clickable: true }
       },
       'lines-and-points': {
-        series: {
-          points: { show: true },
-          lines: { show: true }
-        },
+        legend: legend,
+        colors: this.graphColors,
+        points: { show: true, hitRadius: 5 },
+        lines: { show: true },
         xaxis: xaxis,
+        yaxis: yaxis,
+        mouse: mouse,
         grid: { hoverable: true, clickable: true }
       },
       bars: {
-        series: {
-          lines: {show: false},
-          bars: {
+        legend: legend,
+        colors: this.graphColors,
+        lines: { show: false },
+        xaxis: yaxis,
+        yaxis: xaxis,
+        mouse: { 
+            track: true,
+            relative: true,
+            trackFormatter: trackFormatter,
+            fillColor: '#FFFFFF',
+            fillOpacity: 0.3,
+            position: 'e'
+        },
+        bars: {
             show: true,
-            barWidth: 1,
-            align: "center",
-            fill: true,
-            horizontal: true
-          }
+            horizontal: true,
+            shadowSize: 0,
+            barWidth: 0.8         
         },
-        grid: { hoverable: true, clickable: true },
-        yaxis: {
-          tickSize: 1,
-          tickLength: 1,
-          tickFormatter: tickFormatter,
-          min: -0.5,
-          max: self.model.records.length - 0.5
-        }
-      }
+      },
+      columns: {
+        legend: legend,
+        colors: this.graphColors,
+        lines: { show: false },
+        xaxis: xaxis,
+        yaxis: yaxis,
+        mouse: { 
+            track: true,
+            relative: true,
+            trackFormatter: trackFormatter,
+            fillColor: '#FFFFFF',
+            fillOpacity: 0.3,
+            position: 'n'
+        },
+        bars: {
+            show: true,
+            horizontal: false,
+            shadowSize: 0,
+            barWidth: 0.8         
+        },
+      },
+      grid: { hoverable: true, clickable: true },
     };
     return optionsPerGraphType[typeId];
   },
 
-  setupTooltips: function() {
-    var self = this;
-    function showTooltip(x, y, contents) {
-      $('<div id="flot-tooltip">' + contents + '</div>').css( {
-        position: 'absolute',
-        display: 'none',
-        top: y + 5,
-        left: x + 5,
-        border: '1px solid #fdd',
-        padding: '2px',
-        'background-color': '#fee',
-        opacity: 0.80
-      }).appendTo("body").fadeIn(200);
-    }
-
-    var previousPoint = null;
-    this.$graph.bind("plothover", function (event, pos, item) {
-      if (item) {
-        if (previousPoint != item.datapoint) {
-          previousPoint = item.datapoint;
-          
-          $("#flot-tooltip").remove();
-          var x = item.datapoint[0];
-          var y = item.datapoint[1];
-          // it's horizontal so we have to flip
-          if (self.state.attributes.graphType === 'bars') {
-            var _tmp = x;
-            x = y;
-            y = _tmp;
-          }
-          // convert back from 'index' value on x-axis (e.g. in cases where non-number values)
-          if (self.model.records.models[x]) {
-            x = self.model.records.models[x].get(self.state.attributes.group);
-          } else {
-            x = x.toFixed(2);
-          }
-          y = y.toFixed(2);
-
-          // is it time series
-          var xfield = self.model.fields.get(self.state.attributes.group);
-          var isDateTime = xfield.get('type') === 'date';
-          if (isDateTime) {
-            x = new Date(parseInt(x)).toLocaleDateString();
-          }
-          
-          var content = _.template('<%= group %> = <%= x %>, <%= series %> = <%= y %>', {
-            group: self.state.attributes.group,
-            x: x,
-            series: item.series.label,
-            y: y
-          });
-          showTooltip(item.pageX, item.pageY, content);
-        }
-      }
-      else {
-        $("#flot-tooltip").remove();
-        previousPoint = null;            
-      }
-    });
-  },
-
-  createSeries: function () {
+  createSeries: function() {
     var self = this;
     var series = [];
     _.each(this.state.attributes.series, function(field) {
@@ -1749,19 +1986,30 @@ my.Graph = Backbone.View.extend({
       _.each(self.model.records.models, function(doc, index) {
         var xfield = self.model.fields.get(self.state.attributes.group);
         var x = doc.getFieldValue(xfield);
+
         // time series
         var isDateTime = xfield.get('type') === 'date';
+        
         if (isDateTime) {
-          x = moment(x).toDate();
-        }
-        var yfield = self.model.fields.get(field);
-        var y = doc.getFieldValue(yfield);
-        if (typeof x === 'string') {
+          // datetime
+          if (self.state.attributes.graphType != 'bars' && self.state.attributes.graphType != 'columns') {
+            // not bar or column
+            x = new Date(x).getTime();
+          } else {
+            // bar or column
+            x = index;
+          }
+        } else if (typeof x === 'string') {
+          // string
           x = parseFloat(x);
           if (isNaN(x)) {
             x = index;
           }
         }
+
+        var yfield = self.model.fields.get(field);
+        var y = doc.getFieldValue(yfield);
+        
         // horizontal bar chart
         if (self.state.attributes.graphType == 'bars') {
           points.push([y, x]);
@@ -1769,7 +2017,7 @@ my.Graph = Backbone.View.extend({
           points.push([x, y]);
         }
       });
-      series.push({data: points, label: field});
+      series.push({data: points, label: field, mouse:{lineColor: self.graphColors[series.length]}});
     });
     return series;
   }
@@ -1788,6 +2036,7 @@ my.GraphControls = Backbone.View.extend({
           <option value="lines">Lines</option> \
           <option value="points">Points</option> \
           <option value="bars">Bars</option> \
+          <option value="columns">Columns</option> \
           </select> \
         </div> \
         <label>Group Column (x-axis)</label> \
@@ -2222,11 +2471,10 @@ this.recline.View = this.recline.View || {};
 //   }
 // </pre>
 my.Map = Backbone.View.extend({
-  tagName:  'div',
-  className: 'recline-map',
-
   template: ' \
-    <div class="panel map"></div> \
+    <div class="recline-map"> \
+      <div class="panel map"></div> \
+    </div> \
 ',
 
   // These are the default (case-insensitive) names of field that are used if found.
@@ -2238,6 +2486,18 @@ my.Map = Backbone.View.extend({
   initialize: function(options) {
     var self = this;
     this.el = $(this.el);
+    this.visible = true;
+    this.mapReady = false;
+
+    var stateData = _.extend({
+        geomField: null,
+        lonField: null,
+        latField: null,
+        autoZoom: true
+      },
+      options.state
+    );
+    this.state = new recline.Model.ObjectState(stateData);
 
     // Listen to changes in the fields
     this.model.fields.bind('change', function() {
@@ -2254,31 +2514,6 @@ my.Map = Backbone.View.extend({
     this.model.records.bind('remove', function(doc){self.redraw('remove',doc)});
     this.model.records.bind('reset', function(){self.redraw('reset')});
 
-    this.bind('view:show',function(){
-      // If the div was hidden, Leaflet needs to recalculate some sizes
-      // to display properly
-      if (self.map){
-        self.map.invalidateSize();
-        if (self._zoomPending && self.state.get('autoZoom')) {
-          self._zoomToFeatures();
-          self._zoomPending = false;
-        }
-      }
-      self.visible = true;
-    });
-    this.bind('view:hide',function(){
-      self.visible = false;
-    });
-
-    var stateData = _.extend({
-        geomField: null,
-        lonField: null,
-        latField: null,
-        autoZoom: true
-      },
-      options.state
-    );
-    this.state = new recline.Model.ObjectState(stateData);
     this.menu = new my.MapMenu({
       model: this.model,
       state: this.state.toJSON()
@@ -2288,10 +2523,6 @@ my.Map = Backbone.View.extend({
       self.redraw();
     });
     this.elSidebar = this.menu.el;
-
-    this.mapReady = false;
-    this.render();
-    this.redraw();
   },
 
   // ### Public: Adds the necessary elements to the page.
@@ -2303,6 +2534,7 @@ my.Map = Backbone.View.extend({
     htmls = Mustache.render(this.template, this.model.toTemplateJSON());
     $(this.el).html(htmls);
     this.$map = this.el.find('.panel.map');
+    this.redraw();
     return this;
   },
 
@@ -2344,6 +2576,23 @@ my.Map = Backbone.View.extend({
     }
   },
 
+  show: function() {
+    // If the div was hidden, Leaflet needs to recalculate some sizes
+    // to display properly
+    if (this.map){
+      this.map.invalidateSize();
+      if (this._zoomPending && this.state.get('autoZoom')) {
+        this._zoomToFeatures();
+        this._zoomPending = false;
+      }
+    }
+    this.visible = true;
+  },
+
+  hide: function() {
+    this.visible = false;
+  },
+
   _geomReady: function() {
     return Boolean(this.state.get('geomField') || (this.state.get('latField') && this.state.get('lonField')));
   },
@@ -2802,6 +3051,30 @@ this.recline.View = this.recline.View || {};
 // ];
 // </pre>
 //
+// **sidebarViews**: (optional) the sidebar views (Filters, Fields) for
+// MultiView to show. This is an array of view hashes. If not provided
+// initialize with (recline.View.)FilterEditor and Fields views (with obvious 
+// id and labels!).
+//
+// <pre>
+// var sidebarViews = [
+//   {
+//     id: 'filterEditor', // used for routing
+//     label: 'Filters', // used for view switcher
+//     view: new recline.View.FielterEditor({
+//       model: dataset
+//     })
+//   },
+//   {
+//     id: 'fieldsView',
+//     label: 'Fields',
+//     view: new recline.View.Fields({
+//       model: dataset
+//     })
+//   }
+// ];
+// </pre>
+//
 // **state**: standard state config for this view. This state is slightly
 //  special as it includes config of many of the subviews.
 //
@@ -2859,6 +3132,7 @@ my.MultiView = Backbone.View.extend({
     var self = this;
     this.el = $(this.el);
     this._setupState(options.state);
+
     // Hash of 'page' views (i.e. those for whole page) keyed by page name
     if (options.views) {
       this.pageViews = options.views;
@@ -2899,6 +3173,24 @@ my.MultiView = Backbone.View.extend({
         })
       }];
     }
+    // Hashes of sidebar elements
+    if(options.sidebarViews) {
+      this.sidebarViews = options.sidebarViews;
+    } else {
+      this.sidebarViews = [{
+        id: 'filterEditor',
+        label: 'Filters',
+        view: new my.FilterEditor({
+          model: this.model
+        })
+      }, {
+        id: 'fieldsView',
+        label: 'Fields',
+        view: new my.Fields({
+          model: this.model
+        })
+      }];
+    }
     // these must be called after pageViews are created
     this.render();
     this._bindStateChanges();
@@ -2964,12 +3256,18 @@ my.MultiView = Backbone.View.extend({
 
     // the main views
     _.each(this.pageViews, function(view, pageName) {
+      view.view.render();
       $dataViewContainer.append(view.view.el);
       if (view.view.elSidebar) {
         $dataSidebar.append(view.view.elSidebar);
       }
     });
 
+    _.each(this.sidebarViews, function(view) {
+      this['$'+view.id] = view.view.el;
+      $dataSidebar.append(view.view.el);
+    });
+
     var pager = new recline.View.Pager({
       model: this.model.queryState
     });
@@ -2980,17 +3278,6 @@ my.MultiView = Backbone.View.extend({
     });
     this.el.find('.query-editor-here').append(queryEditor.el);
 
-    var filterEditor = new recline.View.FilterEditor({
-      model: this.model
-    });
-    this.$filterEditor = filterEditor.el;
-    $dataSidebar.append(filterEditor.el);
-
-    var fieldsView = new recline.View.Fields({
-      model: this.model
-    });
-    this.$fieldsView = fieldsView.el;
-    $dataSidebar.append(fieldsView.el);
   },
 
   updateNav: function(pageName) {
@@ -3004,13 +3291,17 @@ my.MultiView = Backbone.View.extend({
         if (view.view.elSidebar) {
           view.view.elSidebar.show();
         }
-        view.view.trigger('view:show');
+        if (view.view.show) {
+          view.view.show();
+        }
       } else {
         view.view.el.hide();
         if (view.view.elSidebar) {
           view.view.elSidebar.hide();
         }
-        view.view.trigger('view:hide');
+        if (view.view.hide) {
+          view.view.hide();
+        }
       }
     });
   },
@@ -3055,6 +3346,7 @@ my.MultiView = Backbone.View.extend({
         'view-graph': graphState,
         backend: this.model.backend.__type__,
         url: this.model.get('url'),
+        dataset: this.model.toJSON(),
         currentView: null,
         readOnly: false
       },
@@ -3147,8 +3439,24 @@ my.MultiView = Backbone.View.extend({
 // ### MultiView.restore
 //
 // Restore a MultiView instance from a serialized state including the associated dataset
+//
+// This inverts the state serialization process in Multiview
 my.MultiView.restore = function(state) {
-  var dataset = recline.Model.Dataset.restore(state);
+  // hack-y - restoring a memory dataset does not mean much ... (but useful for testing!)
+  if (state.backend === 'memory') {
+    var datasetInfo = {
+      backend: 'memory',
+      records: [{stub: 'this is a stub dataset because we do not restore memory datasets'}]
+    };
+  } else {
+    var datasetInfo = _.extend({
+        url: state.url,
+        backend: state.backend
+      },
+      state.dataset
+    );
+  }
+  var dataset = new recline.Model.Dataset(datasetInfo);
   var explorer = new my.MultiView({
     model: dataset,
     state: state
@@ -3156,7 +3464,6 @@ my.MultiView.restore = function(state) {
   return explorer;
 }
 
-
 // ## Miscellaneous Utilities
 var urlPathRegex = /^([^?]+)(\?.*)?/;
 
@@ -3246,9 +3553,6 @@ this.recline.View = this.recline.View || {};
 //
 // NB: you need an explicit height on the element for slickgrid to work
 my.SlickGrid = Backbone.View.extend({
-  tagName:  "div",
-  className: "recline-slickgrid",
-
   initialize: function(modelEtc) {
     var self = this;
     this.el = $(this.el);
@@ -3267,23 +3571,6 @@ my.SlickGrid = Backbone.View.extend({
       }, modelEtc.state
     );
     this.state = new recline.Model.ObjectState(state);
-
-    this.bind('view:show',function(){
-      // If the div is hidden, SlickGrid will calculate wrongly some
-      // sizes so we must render it explicitly when the view is visible
-      if (!self.rendered){
-        if (!self.grid){
-          self.render();
-        }
-        self.grid.init();
-        self.rendered = true;
-      }
-      self.visible = true;
-    });
-    this.bind('view:hide',function(){
-      self.visible = false;
-    });
-
   },
 
   events: {
@@ -3371,15 +3658,17 @@ my.SlickGrid = Backbone.View.extend({
     // Column sorting
     var sortInfo = this.model.queryState.get('sort');
     if (sortInfo){
-      var column = _.keys(sortInfo[0])[0];
-      var sortAsc = !(sortInfo[0][column].order == 'desc');
+      var column = sortInfo[0].field;
+      var sortAsc = !(sortInfo[0].order == 'desc');
       this.grid.setSortColumn(column, sortAsc);
     }
 
     this.grid.onSort.subscribe(function(e, args){
       var order = (args.sortAsc) ? 'asc':'desc';
-      var sort = [{}];
-      sort[0][args.sortCol.field] = {order: order};
+      var sort = [{
+        field: args.sortCol.field,
+        order: order
+      }];
       self.model.query({sort: sort});
     });
 
@@ -3411,7 +3700,24 @@ my.SlickGrid = Backbone.View.extend({
     }
 
     return this;
- }
+ },
+
+  show: function() {
+    // If the div is hidden, SlickGrid will calculate wrongly some
+    // sizes so we must render it explicitly when the view is visible
+    if (!this.rendered){
+      if (!this.grid){
+        this.render();
+      }
+      this.grid.init();
+      this.rendered = true;
+    }
+    this.visible = true;
+  },
+
+  hide: function() {
+    this.visible = false;
+  }
 });
 
 })(jQuery, recline.View);
@@ -3548,8 +3854,6 @@ if (typeof VMM !== 'undefined') {
 //
 // Timeline view using http://timeline.verite.co/
 my.Timeline = Backbone.View.extend({
-  tagName:  'div',
-
   template: ' \
     <div class="recline-timeline"> \
       <div id="vmm-timeline-id"></div> \
@@ -3567,12 +3871,6 @@ my.Timeline = Backbone.View.extend({
     this.el = $(this.el);
     this.timeline = new VMM.Timeline();
     this._timelineIsInitialized = false;
-    this.bind('view:show', function() {
-      // only call _initTimeline once view in DOM as Timeline uses $ internally to look up element
-      if (self._timelineIsInitialized === false) {
-        self._initTimeline();
-      }
-    });
     this.model.fields.bind('reset', function() {
       self._setupTemporalField();
     });
@@ -3587,7 +3885,12 @@ my.Timeline = Backbone.View.extend({
     );
     this.state = new recline.Model.ObjectState(stateData);
     this._setupTemporalField();
-    this.render();
+  },
+
+  render: function() {
+    var tmplData = {};
+    var htmls = Mustache.render(this.template, tmplData);
+    this.el.html(htmls);
     // can only call _initTimeline once view in DOM as Timeline uses $
     // internally to look up element
     if ($(this.elementId).length > 0) {
@@ -3595,10 +3898,11 @@ my.Timeline = Backbone.View.extend({
     }
   },
 
-  render: function() {
-    var tmplData = {};
-    var htmls = Mustache.render(this.template, tmplData);
-    this.el.html(htmls);
+  show: function() {
+    // only call _initTimeline once view in DOM as Timeline uses $ internally to look up element
+    if (this._timelineIsInitialized === false) {
+      this._initTimeline();
+    }
   },
 
   _initTimeline: function() {
@@ -3724,21 +4028,22 @@ this.recline.View = this.recline.View || {};
 //
 // View (Dialog) for doing data transformations
 my.Transform = Backbone.View.extend({
-  className: 'recline-transform',
   template: ' \
-    <div class="script"> \
-      <h2> \
-        Transform Script \
-        <button class="okButton btn btn-primary">Run on all records</button> \
-      </h2> \
-      <textarea class="expression-preview-code"></textarea> \
-    </div> \
-    <div class="expression-preview-parsing-status"> \
-      No syntax error. \
-    </div> \
-    <div class="preview"> \
-      <h3>Preview</h3> \
-      <div class="expression-preview-container"></div> \
+    <div class="recline-transform"> \
+      <div class="script"> \
+        <h2> \
+          Transform Script \
+          <button class="okButton btn btn-primary">Run on all records</button> \
+        </h2> \
+        <textarea class="expression-preview-code"></textarea> \
+      </div> \
+      <div class="expression-preview-parsing-status"> \
+        No syntax error. \
+      </div> \
+      <div class="preview"> \
+        <h3>Preview</h3> \
+        <div class="expression-preview-container"></div> \
+      </div> \
     </div> \
   ',
 
@@ -3749,7 +4054,6 @@ my.Transform = Backbone.View.extend({
 
   initialize: function(options) {
     this.el = $(this.el);
-    this.render();
   },
 
   render: function() {
@@ -3770,7 +4074,7 @@ my.Transform = Backbone.View.extend({
   onSubmit: function(e) {
     var self = this;
     var funcText = this.el.find('.expression-preview-code').val();
-    var editFunc = costco.evalFunction(funcText);
+    var editFunc = recline.Data.Transform.evalFunction(funcText);
     if (editFunc.errorMessage) {
       this.trigger('recline:flash', {message: "Error with function! " + editFunc.errorMessage});
       return;
@@ -3810,13 +4114,13 @@ my.Transform = Backbone.View.extend({
     // if you don't setTimeout it won't grab the latest character if you call e.target.value
     window.setTimeout( function() {
       var errors = self.el.find('.expression-preview-parsing-status');
-      var editFunc = costco.evalFunction(e.target.value);
+      var editFunc = recline.Data.Transform.evalFunction(e.target.value);
       if (!editFunc.errorMessage) {
         errors.text('No syntax error.');
         var docs = self.model.records.map(function(doc) {
           return doc.toJSON();
         });
-        var previewData = costco.previewTransform(docs, editFunc);
+        var previewData = recline.Data.Transform.previewTransform(docs, editFunc);
         var $el = self.el.find('.expression-preview-container');
         var fields = self.model.fields.toJSON();
         var rows = _.map(previewData.slice(0,4), function(row) {
@@ -4057,6 +4361,7 @@ my.FilterEditor = Backbone.View.extend({
           <label>Filter type</label> \
           <select class="filterType"> \
             <option value="term">Term (text)</option> \
+            <option value="range">Range</option> \
             <option value="geo_distance">Geo distance</option> \
           </select> \
           <label>Field</label> \
@@ -4090,6 +4395,20 @@ my.FilterEditor = Backbone.View.extend({
         </fieldset> \
       </div> \
     ',
+    range: ' \
+      <div class="filter-{{type}} filter"> \
+        <fieldset> \
+          <legend> \
+            {{field}} <small>{{type}}</small> \
+            <a class="js-remove-filter" href="#" title="Remove this filter">&times;</a> \
+          </legend> \
+          <label class="control-label" for="">From</label> \
+          <input type="text" value="{{start}}" name="start" data-filter-field="{{field}}" data-filter-id="{{id}}" data-filter-type="{{type}}" /> \
+          <label class="control-label" for="">To</label> \
+          <input type="text" value="{{stop}}" name="stop" data-filter-field="{{field}}" data-filter-id="{{id}}" data-filter-type="{{type}}" /> \
+        </fieldset> \
+      </div> \
+    ',
     geo_distance: ' \
       <div class="filter-{{type}} filter"> \
         <fieldset> \
@@ -4147,8 +4466,9 @@ my.FilterEditor = Backbone.View.extend({
     var $target = $(e.target);
     $target.hide();
     var filterType = $target.find('select.filterType').val();
-    var field = $target.find('select.fields').val();
-    this.model.queryState.addFilter({type: filterType, field: field});
+    var field      = $target.find('select.fields').val();
+    var fieldType  = this.model.fields.find(function (e) { return e.get('id') === field }).get('type');
+    this.model.queryState.addFilter({type: filterType, field: field, fieldType: fieldType});
     // trigger render explicitly as queryState change will not be triggered (as blank value for filter)
     this.render();
   },
@@ -4165,19 +4485,27 @@ my.FilterEditor = Backbone.View.extend({
     var $form = $(e.target);
     _.each($form.find('input'), function(input) {
       var $input = $(input);
-      var filterType = $input.attr('data-filter-type');
-      var fieldId = $input.attr('data-filter-field');
+      var filterType  = $input.attr('data-filter-type');
+      var fieldId     = $input.attr('data-filter-field');
       var filterIndex = parseInt($input.attr('data-filter-id'));
-      var name = $input.attr('name');
-      var value = $input.val();
-      if (filterType === 'term') {
-        filters[filterIndex].term = value;
-      } else if (filterType === 'geo_distance') {
-        if (name === 'distance') {
-          filters[filterIndex].distance = parseFloat(value);
-        } else {
-          filters[filterIndex].point[name] = parseFloat(value);
-        }
+      var name        = $input.attr('name');
+      var value       = $input.val();
+
+      switch (filterType) {
+        case 'term':
+          filters[filterIndex].term = value;
+          break;
+        case 'range':
+          filters[filterIndex][name] = value;
+          break;
+        case 'geo_distance':
+          if(name === 'distance') {
+            filters[filterIndex].distance = parseFloat(value);
+          }
+          else {
+            filters[filterIndex].point[name] = parseFloat(value);
+          }
+          break;
       }
     });
     self.model.queryState.set({filters: filters});

From 4b9cd18676747ec15ddaf946906494cc771c7977 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Tue, 28 Aug 2012 15:32:30 +0100
Subject: [PATCH 117/130] [#2618] Minimise the monkey patching of fanstatic

---
 ckan/lib/fanstatic_extensions.py | 112 -------------------------------
 ckan/lib/fanstatic_resources.py  |  22 ++++--
 2 files changed, 17 insertions(+), 117 deletions(-)

diff --git a/ckan/lib/fanstatic_extensions.py b/ckan/lib/fanstatic_extensions.py
index 2d89b71b082..30a2039ab1d 100644
--- a/ckan/lib/fanstatic_extensions.py
+++ b/ckan/lib/fanstatic_extensions.py
@@ -58,118 +58,6 @@ def render_js(url):
     return '<script type="text/javascript" src="%s"></script>' % (url,)
 
 
-# Fanstatic Patch #
-# FIXME add full license info & push upstream
-def __init__(self, library, relpath, **kw):
-
-    depends = kw.get('depends', None)
-    supersedes = kw.get('supersedes', None)
-    bottom = kw.get('bottom', False)
-    renderer = kw.get('renderer', None)
-    dont_bundle = kw.get('dont_bundle', False)
-    custom_renderer_order = kw.get('custom_renderer_order', None)
-    custom_order = kw.get('custom_order', 0)
-
-    # we don't want to pass these again
-    minified = kw.pop('minified', None)
-    debug = kw.pop('debug', None)
-
-    self.library = library
-    fullpath = os.path.normpath(os.path.join(library.path, relpath))
-    if core._resource_file_existence_checking \
-                                    and not os.path.exists(fullpath) \
-                                    and not kw.get('fake_resource', False):
-        raise core.UnknownResourceError("Resource file does not exist: %s" %
-                                   fullpath)
-    self.relpath = relpath
-    self.dirname, self.filename = os.path.split(relpath)
-    if self.dirname and not self.dirname.endswith('/'):
-        self.dirname += '/'
-    self.bottom = bottom
-    self.dont_bundle = dont_bundle
-    self.custom_order = custom_order
-
-    self.ext = os.path.splitext(self.relpath)[1]
-    if renderer is None:
-        # No custom, ad-hoc renderer for this Resource, so lookup
-        # the default renderer by resource filename extension.
-        if self.ext not in core.inclusion_renderers:
-            raise core.UnknownResourceExtensionError(
-                "Unknown resource extension %s for resource: %s" %
-                (self.ext, repr(self)))
-        self.order, self.renderer = core.inclusion_renderers[self.ext]
-    else:
-        # Use the custom renderer.
-        self.renderer = renderer
-        # If we do not know about the filename extension inclusion
-        # order, we render the resource after all others.
-        self.order, _ = core.inclusion_renderers.get(
-            self.ext, (sys.maxint, None))
-
-    if custom_renderer_order is not None:
-        self.order = custom_renderer_order
-    assert not isinstance(depends, basestring)
-    self.depends = set()
-    if depends is not None:
-        # Normalize groups into the underlying resources...
-        depends = core.normalize_groups(depends)
-        # ...before updating the set of dependencies of this resource.
-        self.depends.update(depends)
-
-    self.resources = set([self])
-    for depend in self.depends:
-        self.resources.update(depend.resources)
-
-    # Check for library dependency cycles.
-    self.library.check_dependency_cycle(self)
-
-    # generate an internal number for sorting the resource
-    # on dependency within the library
-    self.init_dependency_nr()
-
-    self.modes = {}
-    for mode_name, argument in [(core.DEBUG, debug),
-                                (core.MINIFIED, minified)]:
-        if argument is None:
-            continue
-        elif isinstance(argument, basestring):
-            mode_resource = Resource(library, argument, **kw)
-        else:
-            # The dependencies of a mode resource should be the same
-            # or a subset of the dependencies this mode replaces.
-            if len(argument.depends - self.depends) > 0:
-                raise core.ModeResourceDependencyError
-            mode_resource = argument
-
-        mode_resource.dependency_nr = self.dependency_nr
-        self.modes[mode_name] = mode_resource
-
-    assert not isinstance(supersedes, basestring)
-    self.supersedes = supersedes or []
-
-    self.rollups = []
-    # create a reference to the superseder in the superseded resource
-    for resource in self.supersedes:
-        resource.rollups.append(self)
-    # also create a reference to the superseding mode in the superseded
-    # mode
-    # XXX what if mode is full-fledged resource which lists
-    # supersedes itself?
-    for mode_name, mode in self.modes.items():
-        for resource in self.supersedes:
-            superseded_mode = resource.mode(mode_name)
-            # if there is no such mode, let's skip it
-            if superseded_mode is resource:
-                continue
-            mode.supersedes.append(superseded_mode)
-            superseded_mode.rollups.append(mode)
-
-    # Register ourself with the Library.
-    self.library.register(self)
-
-core.Resource.__init__ = __init__
-
-
 def render(self, library_url):
 
     paths = [resource.relpath for resource in self._resources]
diff --git a/ckan/lib/fanstatic_resources.py b/ckan/lib/fanstatic_resources.py
index d64ad068ee0..1e45d8567d0 100644
--- a/ckan/lib/fanstatic_resources.py
+++ b/ckan/lib/fanstatic_resources.py
@@ -68,22 +68,20 @@ def create_resource(path, lib_name, count, inline=False):
                     kw['bottom'] = True
             if filename.endswith('.css'):
                 renderer = core.render_css
+            core.set_resource_file_existence_checking(True)
         else:
-            kw['fake_resource'] = True
+            # This doesn't exist so stop fanstatic checking the filesystem
+            core.set_resource_file_existence_checking(False)
         dependencies = []
         if path in depends:
             for dependency in depends[path]:
                 dependencies.append(get_resource(name, dependency))
         if depend_base:
             dependencies.append(getattr(module, 'base/main'))
-
         if dependencies:
             kw['depends'] = dependencies
         if path in dont_bundle:
             kw['dont_bundle'] = True
-        if path in custom_render_order:
-            kw['custom_renderer_order'] = custom_render_order[path]
-        kw['custom_order'] = count
         # IE conditionals
         condition = None
         other_browsers = False
@@ -102,6 +100,20 @@ def create_resource(path, lib_name, count, inline=False):
                                         renderer=renderer,
                                         other_browsers=other_browsers)
         resource = Resource(library, path, **kw)
+
+        # Add our customised ordering
+        if path in custom_render_order:
+            resource.order = custom_render_order[path]
+        resource.custom_order = count
+        # Update the attributes of the minified version of the resource to
+        # that of the parents as fanstatic does not pass these on.
+        update_attributes = ['custom_order', 'order', 'bottom', 'depends',
+                             'dont_bundle', 'renderer']
+        if 'minified' in resource.modes:
+            min_res = resource.modes['minified']
+            for attribute in update_attributes:
+                setattr(min_res, attribute, getattr(resource, attribute))
+
         # add the resource to this module
         fanstatic_name = '%s/%s' % (lib_name, path)
         log.debug('create resource %s' % fanstatic_name)

From 2cccb0b9c37f57d6ab76967b4e454d8daa0cbd10 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Tue, 28 Aug 2012 15:55:29 +0100
Subject: [PATCH 118/130] [#2618] Cut down to one custom renderer

---
 ckan/lib/fanstatic_extensions.py | 23 ++---------------------
 ckan/lib/fanstatic_resources.py  |  4 ++--
 2 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/ckan/lib/fanstatic_extensions.py b/ckan/lib/fanstatic_extensions.py
index 30a2039ab1d..6f8dff383a8 100644
--- a/ckan/lib/fanstatic_extensions.py
+++ b/ckan/lib/fanstatic_extensions.py
@@ -6,27 +6,8 @@
 import fanstatic.core as core
 
 
-class IEConditionalRenderer(object):
-    ''' Allows for IE conditionals. '''
-    def __init__(self, condition, renderer, other_browsers=False):
-        self.condition = condition
-        self.renderer = renderer
-        if other_browsers:
-            self.other_browsers_start = '<!-->'
-            self.other_browsers_end = '<!--'
-        else:
-            self.other_browsers_start = ''
-            self.other_browsers_end = ''
-
-    def __call__(self, url):
-        return '<!--[if %s]>%s%s%s<![endif]-->' % (self.condition,
-                                                   self.other_browsers_start,
-                                                   self.renderer(url),
-                                                   self.other_browsers_end)
-
-
-class InlineJSRenderer(object):
-    ''' Allows for in-line js via fanstatic. '''
+class CkanCustomRenderer(object):
+    ''' Allows for in-line js and IE conditionals via fanstatic. '''
     def __init__(self, script=None, renderer=None, condition=None,
                  other_browsers=False):
         self.script = script
diff --git a/ckan/lib/fanstatic_resources.py b/ckan/lib/fanstatic_resources.py
index 1e45d8567d0..475ef4c5231 100644
--- a/ckan/lib/fanstatic_resources.py
+++ b/ckan/lib/fanstatic_resources.py
@@ -89,13 +89,13 @@ def create_resource(path, lib_name, count, inline=False):
             other_browsers = ('others' in IE_conditionals[path])
             condition = IE_conditionals[path][0]
         if inline:
-            kw['renderer'] = fanstatic_extensions.InlineJSRenderer(
+            kw['renderer'] = fanstatic_extensions.CkanCustomRenderer(
                                         condition=condition,
                                         script=inline,
                                         renderer=renderer,
                                         other_browsers=other_browsers)
         elif condition:
-            kw['renderer'] = fanstatic_extensions.IEConditionalRenderer(
+            kw['renderer'] = fanstatic_extensions.CkanCustomRenderer(
                                         condition=condition,
                                         renderer=renderer,
                                         other_browsers=other_browsers)

From 92b23f99051feba3a3332fb92df304dc53887332 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Tue, 28 Aug 2012 15:56:12 +0100
Subject: [PATCH 119/130] [#2618] Add better comments to the monkey patches

---
 ckan/lib/fanstatic_extensions.py | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/ckan/lib/fanstatic_extensions.py b/ckan/lib/fanstatic_extensions.py
index 6f8dff383a8..cfc5f74b239 100644
--- a/ckan/lib/fanstatic_extensions.py
+++ b/ckan/lib/fanstatic_extensions.py
@@ -36,14 +36,26 @@ def __call__(self, url):
 
 
 def render_js(url):
-    return '<script type="text/javascript" src="%s"></script>' % (url,)
+    return '<script src="%s"></script>' % (url,)
 
+#    __  __             _                ____       _       _
+#   |  \/  | ___  _ __ | | _____ _   _  |  _ \ __ _| |_ ___| |__
+#   | |\/| |/ _ \| '_ \| |/ / _ \ | | | | |_) / _` | __/ __| '_ \
+#   | |  | | (_) | | | |   <  __/ |_| | |  __/ (_| | || (__| | | |
+#   |_|  |_|\___/|_| |_|_|\_\___|\__, | |_|   \__,_|\__\___|_| |_|
+#                                |___/
 
 def render(self, library_url):
 
     paths = [resource.relpath for resource in self._resources]
-    # URL may become too long:
-    # http://www.boutell.com/newfaq/misc/urllength.html
+
+    # MONKEY PATCH
+    # We have changed the relpath to just use the bundle path as we don't
+    # care about the dir name of the resource as that is now part of the
+    # resource name.  We need this so that we can actually get to all the
+    # resources regardless of the actual directory they are in.
+
+    # relpath = ''.join([self.dirname, BUNDLE_PREFIX, ';'.join(paths)])
     relpath = ''.join([core.BUNDLE_PREFIX, ';'.join(paths)])
 
     return self.renderer('%s/%s' % (library_url, relpath))
@@ -61,6 +73,11 @@ def fits(self, resource):
     bundle_resource = self._resources[0]
     return (resource.library is bundle_resource.library and
             resource.renderer is bundle_resource.renderer and
+
+            # MONKEY PATCH
+            # We allow .js files to be bundled even if they are in different
+            # directories as the directory location doesn't actually matter
+            # to javascript files just css files.
             (resource.ext == '.js' or
              resource.dirname == bundle_resource.dirname))
 
@@ -94,11 +111,9 @@ def key(resource):
             resource.order,
             resource.library.library_nr,
             resource.library.name,
-            resource.custom_order,
+            resource.custom_order,  # Added in MONKEY PATCH
             resource.dependency_nr,
-            resource.renderer,
             resource.relpath)
     return sorted(resources, key=key)
 
 core.sort_resources = sort_resources
-# Fanstatic Patch #

From 81ce1e98a9fc71e645b72e8f29d17f5d003deeb1 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Tue, 28 Aug 2012 15:58:11 +0100
Subject: [PATCH 120/130] [#2618] Futher code reduction

---
 ckan/lib/fanstatic_resources.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/ckan/lib/fanstatic_resources.py b/ckan/lib/fanstatic_resources.py
index 475ef4c5231..a8e82fa73c8 100644
--- a/ckan/lib/fanstatic_resources.py
+++ b/ckan/lib/fanstatic_resources.py
@@ -88,17 +88,12 @@ def create_resource(path, lib_name, count, inline=False):
         if path in IE_conditionals:
             other_browsers = ('others' in IE_conditionals[path])
             condition = IE_conditionals[path][0]
-        if inline:
+        if inline or condition:
             kw['renderer'] = fanstatic_extensions.CkanCustomRenderer(
                                         condition=condition,
                                         script=inline,
                                         renderer=renderer,
                                         other_browsers=other_browsers)
-        elif condition:
-            kw['renderer'] = fanstatic_extensions.CkanCustomRenderer(
-                                        condition=condition,
-                                        renderer=renderer,
-                                        other_browsers=other_browsers)
         resource = Resource(library, path, **kw)
 
         # Add our customised ordering

From fe9758c2eb3a2f135c5d4a91bf2295720cd95bde Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Tue, 28 Aug 2012 15:59:51 +0100
Subject: [PATCH 121/130] [#2618] Remove unused imports

---
 ckan/lib/fanstatic_extensions.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/ckan/lib/fanstatic_extensions.py b/ckan/lib/fanstatic_extensions.py
index cfc5f74b239..5bf5f016071 100644
--- a/ckan/lib/fanstatic_extensions.py
+++ b/ckan/lib/fanstatic_extensions.py
@@ -1,8 +1,3 @@
-import os.path
-import sys
-
-from fanstatic import Resource
-
 import fanstatic.core as core
 
 

From ed356363a7f9ea594ab093cfde3b76302b43e5a1 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Tue, 4 Sep 2012 17:34:50 +0100
Subject: [PATCH 122/130] [#2375] Fix test when db not built

---
 ckan/lib/app_globals.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ckan/lib/app_globals.py b/ckan/lib/app_globals.py
index 5ada3e690b1..92fd5c9469e 100644
--- a/ckan/lib/app_globals.py
+++ b/ckan/lib/app_globals.py
@@ -70,7 +70,10 @@ def get_globals_key(key):
 def reset():
     ''' set updatable values from config '''
     def get_config_value(key, default=''):
-        value = model.get_system_info(key)
+        if model.meta.engine.has_table('system_info'):
+            value = model.get_system_info(key)
+        else:
+            value = None
         # we want to store the config the first time we get here so we can
         # reset them if needed
         config_value = config.get(key)

From f92c23a2d6c8e483442074bb700173cde2a918a3 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Wed, 5 Sep 2012 13:10:56 +0100
Subject: [PATCH 123/130] [2618] remove scripts

---
 ckan/templates/page.html             |  6 ++++-
 ckan/templates/snippets/scripts.html | 40 ----------------------------
 2 files changed, 5 insertions(+), 41 deletions(-)
 delete mode 100644 ckan/templates/snippets/scripts.html

diff --git a/ckan/templates/page.html b/ckan/templates/page.html
index 64a01385d5d..665b127be87 100644
--- a/ckan/templates/page.html
+++ b/ckan/templates/page.html
@@ -95,6 +95,10 @@ <h2>A sidebar item</h2>
 {%- endblock -%}
 
 {%- block scripts %}
+    {% resource 'base/main' %}
+
+    {% if config.get('ckan.tracking_enabled', 'false') %}
+      {% snippet 'snippets/internal_tracking.html' %}
+    {% endif %}
   {{ super() }}
-  {% snippet "snippets/scripts.html" %}
 {% endblock -%}
diff --git a/ckan/templates/snippets/scripts.html b/ckan/templates/snippets/scripts.html
deleted file mode 100644
index 2235b1e3cc0..00000000000
--- a/ckan/templates/snippets/scripts.html
+++ /dev/null
@@ -1,40 +0,0 @@
-{# <script src="{% url_for_static "/base/vendor/jquery.js" %}"></script> #}
-{#
-<script src="{% url_for_static "/base/vendor/jed.js" %}"></script>
-<script src="{% url_for_static "/base/vendor/select2/select2.js" %}"></script>
-<script src="{% url_for_static "/base/vendor/bootstrap/js/bootstrap-transition.js" %}"></script>
-<script src="{% url_for_static "/base/vendor/bootstrap/js/bootstrap-modal.js" %}"></script>
-<script src="{% url_for_static "/base/vendor/bootstrap/js/bootstrap-alert.js" %}"></script>
-<script src="{% url_for_static "/base/vendor/bootstrap/js/bootstrap-tab.js" %}"></script>
-<script src="{% url_for_static "/base/vendor/bootstrap/js/bootstrap-button.js" %}"></script>
-#}
-
-{% resource 'vendor/vendor' %}
-{#  <script src="{% url_for_static "/base/javascript/plugins/jquery.inherit.js" %}"></script>
-<script src="{% url_for_static "/base/javascript/plugins/jquery.proxy-all.js" %}"></script>
-<script src="{% url_for_static "/base/javascript/plugins/jquery.url-helpers.js" %}"></script>
-<script src="{% url_for_static "/base/javascript/plugins/jquery.date-helpers.js" %}"></script>
-<script src="{% url_for_static "/base/javascript/plugins/jquery.slug.js" %}"></script>
-<script src="{% url_for_static "/base/javascript/plugins/jquery.slug-preview.js" %}"></script>
-<script src="{% url_for_static "/base/javascript/plugins/jquery.truncator.js" %}"></script>
-<script src="{% url_for_static "/base/javascript/plugins/jquery.form-warning.js" %}"></script>
-<script src="{% url_for_static '/base/javascript/sandbox.js' %}"></script>
-<script src="{% url_for_static '/base/javascript/module.js' %}"></script>
-<script src="{% url_for_static '/base/javascript/pubsub.js' %}"></script>
-<script src="{% url_for_static '/base/javascript/client.js' %}"></script>
-<script src="{% url_for_static '/base/javascript/notify.js' %}"></script>
-<script src="{% url_for_static '/base/javascript/i18n.js' %}"></script>
-<script src="{% url_for_static '/base/javascript/main.js' %}"></script>
-<script src="{% url_for_static '/base/javascript/modules/select-switch.js' %}"></script>
-<script src="{% url_for_static '/base/javascript/modules/slug-preview.js' %}"></script>
-<script src="{% url_for_static '/base/javascript/modules/basic-form.js' %}"></script>
-<script src="{% url_for_static '/base/javascript/modules/confirm-action.js' %}"></script>
-<script src="{% url_for_static '/base/javascript/modules/api-info.js' %}"></script>
-<script src="{% url_for_static '/base/javascript/modules/autocomplete.js' %}"></script>
-<script src="{% url_for_static '/base/javascript/modules/custom-fields.js' %}"></script>
-<script src="{% url_for_static '/base/javascript/modules/related-item.js' %}"></script>
-#}
-{% resource 'base/main' %}
-{% if config.get('ckan.tracking_enabled', 'false') %}
-  {% snippet 'snippets/internal_tracking.html' %}
-{% endif %}

From a1fb03e6f19da7721b0afe1a0d70e9c54a604784 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Wed, 5 Sep 2012 15:50:36 +0100
Subject: [PATCH 124/130] [#2375] Add .gitignore for minified stats files

---
 ckanext/stats/public/.gitignore | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 ckanext/stats/public/.gitignore

diff --git a/ckanext/stats/public/.gitignore b/ckanext/stats/public/.gitignore
new file mode 100644
index 00000000000..6ac02e79926
--- /dev/null
+++ b/ckanext/stats/public/.gitignore
@@ -0,0 +1,2 @@
+**.min.js
+**.min.css

From 2968f8e9d029b2640db60a776d697037bc7fe3c2 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Wed, 5 Sep 2012 16:00:02 +0100
Subject: [PATCH 125/130] [#2375] Remove unused file config.ini

---
 ckan/public/base/javascript/config.ini | 52 --------------------------
 1 file changed, 52 deletions(-)
 delete mode 100644 ckan/public/base/javascript/config.ini

diff --git a/ckan/public/base/javascript/config.ini b/ckan/public/base/javascript/config.ini
deleted file mode 100644
index df3426105fa..00000000000
--- a/ckan/public/base/javascript/config.ini
+++ /dev/null
@@ -1,52 +0,0 @@
-[main]
-order =
-    plugins/jquery.inherit.js
-    plugins/jquery.proxy-all.js
-    plugins/jquery.url-helpers.js
-    plugins/jquery.date-helpers.js
-    plugins/jquery.slug.js
-    plugins/jquery.slug-preview.js
-    plugins/jquery.form-warning.js
-
-    sandbox.js
-    module.js
-    pubsub.js
-    client.js
-    notify.js
-    i18n.js
-    main.js
-
-    modules/select-switch.js
-    modules/slug-preview.js
-    modules/basic-form.js
-    modules/confirm-delete.js
-    modules/api-info.js
-    modules/autocomplete.js
-    modules/custom-fields.js
-
-[groups]
-main =
-    plugins/jquery.inherit.js
-    plugins/jquery.proxy-all.js
-    plugins/jquery.url-helpers.js
-    plugins/jquery.date-helpers.js
-    plugins/jquery.slug.js
-    plugins/jquery.slug-preview.js
-    plugins/jquery.form-warning.js
-
-    sandbox.js
-    module.js
-    pubsub.js
-    client.js
-    notify.js
-    i18n.js
-    main.js
-
-    modules/select-switch.js
-    modules/slug-preview.js
-    modules/basic-form.js
-    modules/confirm-delete.js
-    modules/api-info.js
-    modules/autocomplete.js
-    modules/custom-fields.js
-

From b9a9006f419951017ddcea043feb908eb481f06e Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Wed, 5 Sep 2012 16:02:18 +0100
Subject: [PATCH 126/130] [#2375] Tracking (internal) now uses fanstatic

---
 ckan/public/base/javascript/resource.config   |  1 +
 ckan/public/base/javascript/tracking.js       | 22 +++++++++++++++++
 ckan/templates/page.html                      |  3 +--
 .../templates/snippets/internal_tracking.html | 24 -------------------
 4 files changed, 24 insertions(+), 26 deletions(-)
 create mode 100644 ckan/public/base/javascript/tracking.js
 delete mode 100644 ckan/templates/snippets/internal_tracking.html

diff --git a/ckan/public/base/javascript/resource.config b/ckan/public/base/javascript/resource.config
index 5b715c05d4e..3af45427c83 100644
--- a/ckan/public/base/javascript/resource.config
+++ b/ckan/public/base/javascript/resource.config
@@ -1,6 +1,7 @@
 [depends]
 
 main = vendor/jquery.js
+tracking.js = vendor/jquery.js
 
 [custom render order]
 
diff --git a/ckan/public/base/javascript/tracking.js b/ckan/public/base/javascript/tracking.js
new file mode 100644
index 00000000000..cf3a14badab
--- /dev/null
+++ b/ckan/public/base/javascript/tracking.js
@@ -0,0 +1,22 @@
+$(function (){
+  // Tracking
+  var url = location.pathname;
+  // remove any site root from url
+  console.log($('body').data('site-root'));
+  url = url.substring($('body').data('locale-root'), url.length);
+  // trim any trailing /
+  url = url.replace(/\/*$/, '');
+  $.ajax({url : $('body').data('site-root') + '_tracking',
+          type : 'POST',
+          data : {url:url, type:'page'},
+          timeout : 300 });
+  $('a.resource-url-analytics').click(function (e){
+    var url = $(e.target).closest('a').attr('href');
+    $.ajax({url : $('body').data('site-root') + '_tracking',
+            data : {url:url, type:'resource'},
+            type : 'POST',
+            complete : function () {location.href = url;},
+            timeout : 30});
+    e.preventDefault();
+  });
+});
diff --git a/ckan/templates/page.html b/ckan/templates/page.html
index 665b127be87..dd1c5a7d4af 100644
--- a/ckan/templates/page.html
+++ b/ckan/templates/page.html
@@ -96,9 +96,8 @@ <h2>A sidebar item</h2>
 
 {%- block scripts %}
     {% resource 'base/main' %}
-
     {% if config.get('ckan.tracking_enabled', 'false') %}
-      {% snippet 'snippets/internal_tracking.html' %}
+        {% resource 'base/tracking.js' %}
     {% endif %}
   {{ super() }}
 {% endblock -%}
diff --git a/ckan/templates/snippets/internal_tracking.html b/ckan/templates/snippets/internal_tracking.html
deleted file mode 100644
index 408a3ef74fe..00000000000
--- a/ckan/templates/snippets/internal_tracking.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<script type="text/javascript">
-  $(function (){
-    // Tracking
-    var url = location.pathname;
-    // remove any site root from url
-    console.log($('body').data('site-root'));
-    url = url.substring($('body').data('locale-root'), url.length);
-    // trim any trailing /
-    url = url.replace(/\/*$/, '');
-    $.ajax({url : $('body').data('site-root') + '_tracking',
-            type : 'POST',
-            data : {url:url, type:'page'},
-            timeout : 300 });
-    $('a.resource-url-analytics').click(function (e){
-      var url = $(e.target).closest('a').attr('href');
-      $.ajax({url : $('body').data('site-root') + '_tracking',
-              data : {url:url, type:'resource'},
-              type : 'POST',
-              complete : function () {location.href = url;},
-              timeout : 30});
-      e.preventDefault();
-    });
-  });
-</script>

From 857118bd8e88cbe9cc85021ca682bdb265dadad3 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Wed, 5 Sep 2012 16:08:25 +0100
Subject: [PATCH 127/130] [#2375] Add vendor scripts to page

---
 ckan/templates/page.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ckan/templates/page.html b/ckan/templates/page.html
index dd1c5a7d4af..c2fec995854 100644
--- a/ckan/templates/page.html
+++ b/ckan/templates/page.html
@@ -96,6 +96,7 @@ <h2>A sidebar item</h2>
 
 {%- block scripts %}
     {% resource 'base/main' %}
+    {% resource 'vendor/vendor' %}
     {% if config.get('ckan.tracking_enabled', 'false') %}
         {% resource 'base/tracking.js' %}
     {% endif %}

From 53e1467b9befb83a73d25989d2f746a7bdd628c9 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Wed, 5 Sep 2012 17:24:11 +0100
Subject: [PATCH 128/130] [#2375] Fanstatic inline script fixes

---
 ckan/lib/fanstatic_resources.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ckan/lib/fanstatic_resources.py b/ckan/lib/fanstatic_resources.py
index a8e82fa73c8..c36779ef392 100644
--- a/ckan/lib/fanstatic_resources.py
+++ b/ckan/lib/fanstatic_resources.py
@@ -71,6 +71,8 @@ def create_resource(path, lib_name, count, inline=False):
             core.set_resource_file_existence_checking(True)
         else:
             # This doesn't exist so stop fanstatic checking the filesystem
+            if path not in force_top:
+                kw['bottom'] = True
             core.set_resource_file_existence_checking(False)
         dependencies = []
         if path in depends:
@@ -203,6 +205,8 @@ def create_resource(path, lib_name, count, inline=False):
     # add inline scripts
     for inline in inline_scripts:
         resource_list.append(inline)
+        if inline not in custom_render_order:
+            custom_render_order[inline] = 20
 
     # order resource_list so that resources are created in the correct order
     for resource_name in reversed(order):

From a1370367eb2217698284fb170ab224a643c2d363 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Wed, 5 Sep 2012 17:45:29 +0100
Subject: [PATCH 129/130] [#2375] Stop minification errors if no permission

---
 ckan/lib/fanstatic_resources.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/ckan/lib/fanstatic_resources.py b/ckan/lib/fanstatic_resources.py
index c36779ef392..a023a377639 100644
--- a/ckan/lib/fanstatic_resources.py
+++ b/ckan/lib/fanstatic_resources.py
@@ -46,10 +46,13 @@ def minify(filename, resource_path, min_function):
         if op.exists(path_min) and op.getmtime(path) < op.getmtime(path_min):
             return
         source = open(path, 'r').read()
-        f = open(path_min, 'w')
-        f.write(min_function(source))
-        f.close()
-        log.debug('minified %s' % path)
+        try:
+            f = open(path_min, 'w')
+            f.write(min_function(source))
+            f.close()
+            log.debug('minified %s' % path)
+        except IOError:
+            pass
 
     def create_resource(path, lib_name, count, inline=False):
         ''' create the fanstatic Resource '''

From 11389bfd0ed9db5c967617b77349f1236eaa65f7 Mon Sep 17 00:00:00 2001
From: tobes <toby.junk@gmail.com>
Date: Wed, 5 Sep 2012 17:58:00 +0100
Subject: [PATCH 130/130] [#2375] css fix

---
 ckan/public/base/css/main.css | 37 +++++++++++++++++------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/ckan/public/base/css/main.css b/ckan/public/base/css/main.css
index 01420ef95ee..9b454097752 100644
--- a/ckan/public/base/css/main.css
+++ b/ckan/public/base/css/main.css
@@ -1,4 +1,3 @@
-@import "../vendor/select2/select2.css";
 article,
 aside,
 details,
@@ -3752,8 +3751,8 @@ a.badge:hover {
     */
 @font-face {
   font-family: 'FontAwesome';
-  src: url('../vendor/font-awesome/fonts/fontawesome-webfont.eot');
-  src: url('../vendor/font-awesome/fonts/fontawesome-webfont.eot?#iefix') format('embedded-opentype'), url('../vendor/font-awesome/fonts/fontawesome-webfont.woff') format('woff'), url('../vendor/font-awesome/fonts/fontawesome-webfont.ttf') format('truetype'), url('../vendor/font-awesome/fonts/fontawesome-webfont.svg#FontAwesome') format('svg');
+  src: url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.eot');
+  src: url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.eot?#iefix') format('embedded-opentype'), url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.woff') format('woff'), url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.ttf') format('truetype'), url('../../../base/vendor/font-awesome/fonts/fontawesome-webfont.svg#FontAwesome') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -4461,7 +4460,7 @@ ul.icons li .icon-large:before {
   font-size: 11px;
 }
 .tag {
-  background: url("../images/background-tag.png") no-repeat -13px center;
+  background: url("../../../base/images/background-tag.png") no-repeat -13px center;
   position: relative;
   display: block;
   font-size: 11px;
@@ -4473,7 +4472,7 @@ ul.icons li .icon-large:before {
 }
 .tag:before {
   content: "";
-  background: url("../images/background-tag.png") no-repeat center left;
+  background: url("../../../base/images/background-tag.png") no-repeat center left;
   position: absolute;
   display: block;
   top: 0;
@@ -4895,7 +4894,7 @@ ol.media-grid:after {
   display: block;
 }
 .nav-item.active > a {
-  background: url("../images/background-tag.png") no-repeat -13px center;
+  background: url("../../../base/images/background-tag.png") no-repeat -13px center;
   position: relative;
   display: block;
   font-size: 11px;
@@ -4920,7 +4919,7 @@ ol.media-grid:after {
 }
 .nav-item.active > a:before {
   content: "";
-  background: url("../images/background-tag.png") no-repeat center left;
+  background: url("../../../base/images/background-tag.png") no-repeat center left;
   position: absolute;
   display: block;
   top: 0;
@@ -4966,7 +4965,7 @@ ol.media-grid:after {
   top: 2px;
   width: 16px;
   height: 16px;
-  background-image: url("../images/sprite-ckan-icons.png");
+  background-image: url("../../../base/images/sprite-ckan-icons.png");
   background-repeat: no-repeat;
   background-position: 16px 16px;
   content: "";
@@ -5183,7 +5182,7 @@ textarea {
   top: 2px;
   width: 16px;
   height: 16px;
-  background-image: url("../images/sprite-ckan-icons.png");
+  background-image: url("../../../base/images/sprite-ckan-icons.png");
   background-repeat: no-repeat;
   background-position: 16px 16px;
   width: 17px;
@@ -5545,7 +5544,7 @@ textarea {
 }
 .resource-upload-field.loading {
   display: inline-block;
-  background: url("../images/loading-spinner.gif") no-repeat center right;
+  background: url("../../../base/images/loading-spinner.gif") no-repeat center right;
   padding-right: 5px;
 }
 .select2-container .select2-choice input,
@@ -5707,7 +5706,7 @@ textarea {
   margin-top: -17px;
   width: 30px;
   height: 30px;
-  background: transparent url("../images/icon-search-27x26.png") no-repeat center center;
+  background: transparent url("../../../base/images/icon-search-27x26.png") no-repeat center center;
   text-indent: -900em;
 }
 .control-order-by {
@@ -5775,7 +5774,7 @@ textarea {
   top: 2px;
   width: 16px;
   height: 16px;
-  background-image: url("../images/sprite-ckan-icons.png");
+  background-image: url("../../../base/images/sprite-ckan-icons.png");
   background-repeat: no-repeat;
   background-position: 16px 16px;
   width: 16px;
@@ -6282,7 +6281,7 @@ textarea {
   top: 2px;
   width: 16px;
   height: 16px;
-  background-image: url("../images/sprite-ckan-icons.png");
+  background-image: url("../../../base/images/sprite-ckan-icons.png");
   background-repeat: no-repeat;
   background-position: 16px 16px;
 }
@@ -6474,11 +6473,11 @@ textarea {
   top: 2px;
   width: 16px;
   height: 16px;
-  background-image: url("../images/sprite-ckan-icons.png");
+  background-image: url("../../../base/images/sprite-ckan-icons.png");
   background-repeat: no-repeat;
   background-position: 16px 16px;
   text-indent: -900em;
-  background: url("../images/sprite-resource-icons.png") no-repeat 0 0;
+  background: url("../../../base/images/sprite-resource-icons.png") no-repeat 0 0;
 }
 .format-label:last-child {
   *margin-left: 0;
@@ -6608,7 +6607,7 @@ li .icon-large:before {
   margin-bottom: 0;
 }
 .hero {
-  background: url("../images/background-tile.png");
+  background: url("../../../base/images/background-tile.png");
 }
 .hero:after {
   background-color: rgba(0, 0, 0, 0.09);
@@ -6990,7 +6989,7 @@ li .icon-large:before {
   width: 65px;
   height: 21px;
   margin-top: 2px;
-  background: url("../images/ckan-logo-footer.png") no-repeat top left;
+  background: url("../../../base/images/ckan-logo-footer.png") no-repeat top left;
   text-indent: -900em;
 }
 .lang-select {
@@ -7019,7 +7018,7 @@ li .icon-large:before {
 .lang-dropdown .select2-result-label[data-value]:before {
   content: "";
   display: inline-block;
-  background-image: url("../images/flags.png");
+  background-image: url("../../../base/images/flags.png");
   background-repeat: no-repeat;
   background-position: 0 11px;
   width: 17px;
@@ -7425,7 +7424,7 @@ iframe {
 .ie7 .toolbar .breadcrumb li {
   padding-right: 10px;
   margin-right: 5px;
-  background: transparent url("../images/breadcrumb-slash-ie7.png") 100% 50% no-repeat;
+  background: transparent url("../../../base/images/breadcrumb-slash-ie7.png") 100% 50% no-repeat;
 }
 .ie7 .toolbar .breadcrumb li.active {
   background-image: none;