From 173f7c37a4597a223e22ef62ff0a1b34e32ac49f Mon Sep 17 00:00:00 2001 From: Jan-Pascal van Best Date: Wed, 10 Feb 2016 22:38:51 +0100 Subject: [PATCH] Mostly works --- .gitignore | 1 + TODO | 3 + dependencies | 7 + tweet/__init__.py | 29 + tweet/config.py | 16 +- tweet/jobrunner.py | 108 +- tweet/migrations/0005_auto_20160205_0946.py | 43 + tweet/migrations/0006_auto_20160205_1024.py | 25 + tweet/migrations/0007_auto_20160205_1132.py | 26 + tweet/models.py | 202 +- tweet/static/tweet/favicon.ico | Bin 0 -> 1150 bytes .../static/tweet/javascript/bootstrap.min.js | 7 +- .../tweet/javascript/jquery-1.9.0.min.js | 4 - .../javascript/jquery-ui-1.10.3.custom.min.js | 7 - .../static/tweet/javascript/jquery-ui.min.js | 1 + tweet/static/tweet/javascript/jquery.min.js | 1 + tweet/static/tweet/stylesheets/bootstrap.css | 2471 +---------------- .../tweet/stylesheets/bootstrap.min.css | 10 +- tweet/static/tweet/stylesheets/ui-lightness | 1 + .../ui-lightness/images/animated-overlay.gif | Bin 1738 -> 0 bytes .../ui-bg_diagonals-thick_18_b81900_40x40.png | Bin 418 -> 0 bytes .../ui-bg_diagonals-thick_20_666666_40x40.png | Bin 312 -> 0 bytes .../images/ui-bg_flat_10_000000_40x100.png | Bin 205 -> 0 bytes .../images/ui-bg_glass_100_f6f6f6_1x400.png | Bin 262 -> 0 bytes .../images/ui-bg_glass_100_fdf5ce_1x400.png | Bin 348 -> 0 bytes .../images/ui-bg_glass_65_ffffff_1x400.png | Bin 207 -> 0 bytes .../ui-bg_gloss-wave_35_f6a828_500x100.png | Bin 5815 -> 0 bytes .../ui-bg_highlight-soft_100_eeeeee_1x100.png | Bin 278 -> 0 bytes .../ui-bg_highlight-soft_75_ffe45c_1x100.png | Bin 328 -> 0 bytes .../images/ui-icons_222222_256x240.png | Bin 6922 -> 0 bytes .../images/ui-icons_228ef1_256x240.png | Bin 4549 -> 0 bytes .../images/ui-icons_ef8c08_256x240.png | Bin 4549 -> 0 bytes .../images/ui-icons_ffd27a_256x240.png | Bin 4549 -> 0 bytes .../images/ui-icons_ffffff_256x240.png | Bin 6299 -> 0 bytes .../ui-lightness/jquery-ui-1.10.3.custom.css | 1177 -------- .../jquery-ui-1.10.3.custom.min.css | 5 - tweet/streamrunner.py | 69 + tweet/templates/tweet/base.html | 29 +- tweet/templates/tweet/edit_stream_terms.html | 66 + tweet/templates/tweet/index.html | 2 +- tweet/templates/tweet/list_jobs.html | 66 +- tweet/templates/tweet/list_stream.html | 53 + tweet/templates/tweet/pagination_snippet.html | 20 + tweet/templates/tweet/selectconfig.html | 2 + tweet/urls.py | 10 + tweet/utils.py | 68 + tweet/views.py | 149 +- tweet_django/settings.py | 31 + 48 files changed, 924 insertions(+), 3785 deletions(-) create mode 100644 TODO create mode 100644 tweet/migrations/0005_auto_20160205_0946.py create mode 100644 tweet/migrations/0006_auto_20160205_1024.py create mode 100644 tweet/migrations/0007_auto_20160205_1132.py create mode 100644 tweet/static/tweet/favicon.ico mode change 100644 => 120000 tweet/static/tweet/javascript/bootstrap.min.js delete mode 100644 tweet/static/tweet/javascript/jquery-1.9.0.min.js delete mode 100644 tweet/static/tweet/javascript/jquery-ui-1.10.3.custom.min.js create mode 120000 tweet/static/tweet/javascript/jquery-ui.min.js create mode 120000 tweet/static/tweet/javascript/jquery.min.js mode change 100644 => 120000 tweet/static/tweet/stylesheets/bootstrap.css mode change 100644 => 120000 tweet/static/tweet/stylesheets/bootstrap.min.css create mode 120000 tweet/static/tweet/stylesheets/ui-lightness delete mode 100644 tweet/static/tweet/stylesheets/ui-lightness/images/animated-overlay.gif delete mode 100644 tweet/static/tweet/stylesheets/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png delete mode 100644 tweet/static/tweet/stylesheets/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png delete mode 100644 tweet/static/tweet/stylesheets/ui-lightness/images/ui-bg_flat_10_000000_40x100.png delete mode 100644 tweet/static/tweet/stylesheets/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png delete mode 100644 tweet/static/tweet/stylesheets/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png delete mode 100644 tweet/static/tweet/stylesheets/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png delete mode 100644 tweet/static/tweet/stylesheets/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png delete mode 100644 tweet/static/tweet/stylesheets/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png delete mode 100644 tweet/static/tweet/stylesheets/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png delete mode 100644 tweet/static/tweet/stylesheets/ui-lightness/images/ui-icons_222222_256x240.png delete mode 100644 tweet/static/tweet/stylesheets/ui-lightness/images/ui-icons_228ef1_256x240.png delete mode 100644 tweet/static/tweet/stylesheets/ui-lightness/images/ui-icons_ef8c08_256x240.png delete mode 100644 tweet/static/tweet/stylesheets/ui-lightness/images/ui-icons_ffd27a_256x240.png delete mode 100644 tweet/static/tweet/stylesheets/ui-lightness/images/ui-icons_ffffff_256x240.png delete mode 100644 tweet/static/tweet/stylesheets/ui-lightness/jquery-ui-1.10.3.custom.css delete mode 100644 tweet/static/tweet/stylesheets/ui-lightness/jquery-ui-1.10.3.custom.min.css create mode 100644 tweet/streamrunner.py create mode 100644 tweet/templates/tweet/edit_stream_terms.html create mode 100644 tweet/templates/tweet/list_stream.html create mode 100644 tweet/templates/tweet/pagination_snippet.html create mode 100644 tweet/utils.py diff --git a/.gitignore b/.gitignore index 0b6bd05..8cf8bb1 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /results __pycache__ *.pyc +*.log diff --git a/TODO b/TODO new file mode 100644 index 0000000..026c16e --- /dev/null +++ b/TODO @@ -0,0 +1,3 @@ +- Reverse geocoding: the Nominatim service used currently will give an error + when it is used too heavily +- Time zones: Check time zone handling in all use cases diff --git a/dependencies b/dependencies index 806a860..d49ef03 100644 --- a/dependencies +++ b/dependencies @@ -2,3 +2,10 @@ python3-django python3-mysqldb python3-requests-oauthlib python3-twython +python3-xlsxwriter +python3-geopy +python3-django-jsonfield (>= 0.9.15-2) +libjs-jquery +libjs-jquery-ui +libjs-jquery-ui-theme-ui-lightness +libjs-bootstrap diff --git a/tweet/__init__.py b/tweet/__init__.py index 5785fa0..012103f 100644 --- a/tweet/__init__.py +++ b/tweet/__init__.py @@ -1 +1,30 @@ # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4 + +import threading +import time + +import django.apps + +_started = False + +def startup_thread(): + global _started + + if _started: + return + _started = True + print("Waiting until app starts..") + # Wait until the app started before accessing the database + while not django.apps.apps.ready: + time.sleep(1) + + # Only import streamrunner here, because it imports models which won't + # be available earlier + from . import streamrunner + from .models import Settings + settings = Settings.get() + streamrunner.start_stream(settings.stream_terms) + +print("Starting startup thread...") +thread = threading.Thread(target=startup_thread) +thread.start() diff --git a/tweet/config.py b/tweet/config.py index 4587d99..7cd57b3 100644 --- a/tweet/config.py +++ b/tweet/config.py @@ -12,9 +12,9 @@ class Config: def __init__(self, f): self.load(f) - def load(self, f): + def load(self, filename): config = configparser.ConfigParser() - config.read_file(f) + config.read(filename) self.page_size = config.getint('general', 'pagesize', fallback=100) self.max_pages = config.getint('general', 'maxpages', fallback=500) @@ -25,12 +25,18 @@ class Config: terms = config['excel'][key].split(",") self.excels[key] = terms - print("terms: " + str(self.terms)) - print("excels: " + str(self.excels)) - def query_names(self): return self.terms.keys() + def query(self, name): + return self.terms[name] + def all_search_terms(self): return self.terms.values() + + def excel_names(self): + return self.excels.keys() + + def excel_query(self, excel_name): + return self.excels[excel_name] diff --git a/tweet/jobrunner.py b/tweet/jobrunner.py index 67f581b..5a52fc4 100644 --- a/tweet/jobrunner.py +++ b/tweet/jobrunner.py @@ -1,18 +1,59 @@ # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4 -import time from concurrent.futures import ThreadPoolExecutor +import logging +import os.path +import time from django.conf import settings from twython import Twython +from .models import Job, Tweet +from .utils import ExcelExporter + +# Get an instance of a logger +logger = logging.getLogger(__name__) + _running = [] _pool = ThreadPoolExecutor(max_workers=15) -def _handle_tweet(query_name, status): - print("==========") - print(status) +class JobHandler: + def __init__(self, job): + self.job = job + self.config = job.get_config() + self.exporters = [ + ( self.config.excel_query(filename), + ExcelExporter(os.path.join(self.job.job_path(), filename)) + ) + for filename in self.config.excel_names() ] + + def log(self, s): + logger.info(s) + self.job.add_log(s) + + def tweet(self, query_name, status): + self.job.num_tweets += 1 + self.job.save() + #self.log(str(tweet)) + for (terms, exporter) in self.exporters: + if query_name in terms: + tweet = Tweet.from_status(status) + exporter.add_tweet(tweet) + tweet.delete() + + #self.log(" [{}] {}".format(self.config.query(query_name), tweet["text"])) + + def status(self, status, seconds=None): + self.job.status = status + if seconds is not None: + self.job.seconds_to_wait = seconds + self.job.save() + + def close(self): + self.job.close_log() + for (terms, exporter) in self.exporters: + exporter.close() def _get_rate_status(twitter): rate_status = None @@ -29,12 +70,11 @@ def _get_rate_status(twitter): time.sleep(1) print("Sleep time remaining: {} seconds".format(i)) - print("A") return rate_status -def _fetch(query_name, terms, max_pages, page_size): - print("_fetch...") +def _fetch(query_name, terms, max_pages, page_size, handler): + handler.log("_fetch()") # TODO use global twitter object? twitter = Twython(settings.TWEET_OAUTH_CONSUMER_KEY, settings.TWEET_OAUTH_CONSUMER_SECRET, @@ -42,25 +82,25 @@ def _fetch(query_name, terms, max_pages, page_size): settings.TWEET_OAUTH_ACCESS_TOKEN_SECRET) rate_status = _get_rate_status(twitter) - print("B") remaining = rate_status["remaining"] - print("C") max_id = -1 previous_last_id = float('inf') - print("max_pages: {}".format(max_pages)) + handler.log("max_pages: {}".format(max_pages)) for k in range(max_pages): - print("k: {}".format(k)) while remaining<10: - seconds = rate_status["reset"] - time.time() - print("Running into Twitter rate limiting, need to wait {} seconds...".format(seconds)) - for i in range(max(60, seconds), 0, -1): - print("still waiting: {}".format(i)) + seconds = int(rate_status["reset"] - time.time()) + handler.log("Twitter rate limiting, need to wait {} seconds...".format(seconds)) + handler.status(Job.STATUS_WAITING, seconds) + for i in range(min(60, seconds)): + handler.status(Job.STATUS_WAITING, seconds-i) time.sleep(1) rate_status = _get_rate_status(twitter) - remaining = rate_status.remaining + remaining = rate_status["remaining"] remaining -= 1 + handler.status(Job.STATUS_RUNNING) + query = {'q':terms, 'result_type':'recent', 'count': page_size} if max_id>0: query["max_id"]= max_id @@ -68,45 +108,55 @@ def _fetch(query_name, terms, max_pages, page_size): try: results = twitter.search(**query) except TwythonError as e: - print("search exception, error code = {}: {}".format(e.error_code, e)) + handler.log("search exception, error code = {}: {}".format(e.error_code, e)) + handler.status(Job.STATUS_FAILED) # FIXME break remaining = int(twitter.get_lastfunction_header('x-rate-limit-remaining')) - print("remaining: {}".format(remaining)) + handler.log("remaining: {}".format(remaining)) max_id = results["search_metadata"]["max_id"] - print("Number of results: {}".format(results["search_metadata"]["count"])) + handler.log("Number of results: {}".format(results["search_metadata"]["count"])) last_id = float('inf') for status in results["statuses"]: - _handle_tweet(query_name, status) + handler.tweet(query_name, status) if status["id"]=previous_last_id: - print("max_id not descending, quitting") + handler.log("max_id not descending, quitting") break previous_last_id = max_id if k >= max_pages-1: - print("Warning, more than {} pages of results, ignoring the rest!!!".format(max_pages)); + handler.log("Warning, more than {} pages of results, ignoring the rest!!!".format(max_pages)); #results = twitter.search(q='nlalert', result_type='recent') # since_id=, max_id=,count=, #for result in results: # print(results[result]) # Runs in a thread pool thread -def _execute_job(job): +def _execute_job(job, handler): + logger.debug("_execute_job") try: - _fetch("testing", "amsterdam", 4, 10) + config = job.get_config() + handler.status(Job.STATUS_RUNNING) + print(str(config.query_names())) + for query_name in config.query_names(): + handler.log("Running query {}".format(query_name)); + _fetch(query_name, config.query(query_name), config.max_pages, config.page_size, handler) + handler.status(Job.STATUS_DONE) except Exception as e: - print("Exception in _execute_job:") - print(str(e)) + handler.status(Job.STATUS_FAILED) + logger.exception("Exception in _execute_job") + handler.close() + logger.debug("_execute_job done") -def run_job(job): +def run_job(job, handler): _running.append(job.id) - _pool.submit(_execute_job, job) + _pool.submit(_execute_job, job, handler) diff --git a/tweet/migrations/0005_auto_20160205_0946.py b/tweet/migrations/0005_auto_20160205_0946.py new file mode 100644 index 0000000..73f6883 --- /dev/null +++ b/tweet/migrations/0005_auto_20160205_0946.py @@ -0,0 +1,43 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.1 on 2016-02-05 08:46 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('tweet', '0004_auto_20160201_0937'), + ] + + operations = [ + migrations.CreateModel( + name='Settings', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('stream_terms_json', models.TextField(verbose_name='Stream search terms')), + ], + ), + migrations.RemoveField( + model_name='joboutput', + name='job_description', + ), + migrations.RemoveField( + model_name='joboutput', + name='queries', + ), + migrations.RemoveField( + model_name='jobquery', + name='job_description', + ), + migrations.DeleteModel( + name='JobDescription', + ), + migrations.DeleteModel( + name='JobOutput', + ), + migrations.DeleteModel( + name='JobQuery', + ), + ] diff --git a/tweet/migrations/0006_auto_20160205_1024.py b/tweet/migrations/0006_auto_20160205_1024.py new file mode 100644 index 0000000..ae62199 --- /dev/null +++ b/tweet/migrations/0006_auto_20160205_1024.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.1 on 2016-02-05 09:24 +from __future__ import unicode_literals + +from django.db import migrations +import jsonfield.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('tweet', '0005_auto_20160205_0946'), + ] + + operations = [ + migrations.RemoveField( + model_name='settings', + name='stream_terms_json', + ), + migrations.AddField( + model_name='settings', + name='stream_terms', + field=jsonfield.fields.JSONField(default=['nlalert', 'amsterdam'], verbose_name='Stream search terms'), + ), + ] diff --git a/tweet/migrations/0007_auto_20160205_1132.py b/tweet/migrations/0007_auto_20160205_1132.py new file mode 100644 index 0000000..b8be8a2 --- /dev/null +++ b/tweet/migrations/0007_auto_20160205_1132.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.1 on 2016-02-05 10:32 +from __future__ import unicode_literals + +from django.db import migrations, models +import jsonfield.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('tweet', '0006_auto_20160205_1024'), + ] + + operations = [ + migrations.AlterField( + model_name='settings', + name='stream_terms', + field=jsonfield.fields.JSONField(default=['nlalert', 'rotterdam'], verbose_name='Stream search terms'), + ), + migrations.AlterField( + model_name='tweet', + name='id', + field=models.BigIntegerField(primary_key=True, serialize=False, verbose_name='id'), + ), + ] diff --git a/tweet/models.py b/tweet/models.py index db8bc80..9240bc7 100644 --- a/tweet/models.py +++ b/tweet/models.py @@ -1,14 +1,51 @@ # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4 +import datetime +from enum import Enum +import json +import logging +import os.path +import shutil +import zipfile + from django.conf import settings from django.db import models from django.utils import timezone -import os.path -from enum import Enum -from . import config +import jsonfield +from geopy.geocoders import OpenMapQuest +from geopy.exc import GeocoderServiceError + +from .config import Config + +logger = logging.getLogger(__name__) + +class Settings(models.Model): + stream_terms = jsonfield.JSONField('Stream search terms', default=["nlalert", "rotterdam"]) + + def __str__(self): + return str(self.stream_terms) + +# stream_terms is now a JSONField instead of TextField, keeping this code in +# case JSONField breaks, it's giving Deprecation warnings already... +# @property +# def stream_terms(self): +# return json.loads(self.stream_terms_json) +# +# @stream_terms.setter +# def stream_terms(self, terms): +# self.stream_terms = json.dumps(stream_terms) + + @staticmethod + def get(): + settings = Settings.objects.first() + if settings is None: + settings = Settings() + settings.save() + return settings class Tweet(models.Model): + id = models.BigIntegerField('id', primary_key=True) created_at = models.DateTimeField('date and time', default=timezone.now) from_user = models.CharField('sender screen name', max_length=20) from_user_id = models.BigIntegerField('sender user id') @@ -24,28 +61,37 @@ class Tweet(models.Model): class Meta: db_table = "tweet" -class JobDescription(models.Model): - name = models.CharField("job name", max_length=80) - - def __str__(self): - return self.name - - -class JobQuery(models.Model): - job_description = models.ForeignKey(JobDescription, on_delete=models.CASCADE) - name = models.CharField("name", max_length=80) - terms = models.TextField("search terms") - - def __str__(self): - return self.name - -class JobOutput(models.Model): - job_description = models.ForeignKey(JobDescription, on_delete=models.CASCADE) - filename = models.CharField("file name", max_length=1024) - queries = models.ManyToManyField(JobQuery) - - def __str__(self): - return self.filename + @staticmethod + def from_status(status): + in_reply_to = None + if "in_reply_to_screen_name" in status: + in_reply_to = status["in_reply_to_screen_name"] + if in_reply_to is None: + in_reply_to = "" + tweet = Tweet( + id = status["id"], + created_at = datetime.datetime.strptime(status["created_at"], "%a %b %d %H:%M:%S %z %Y"), + from_user = status["user"]["screen_name"], + from_user_id = str(status["user"]["id"]), + in_reply_to = in_reply_to, + text = status["text"], + conforms_to_terms = True) + if status["geo"] is not None: + (tweet.latitude,tweet.longitude) = status['geo']['coordinates'] + return tweet + + def location(self): + if self.latitude is not None and self.longitude is not None: + try: + geolocator = OpenMapQuest(api_key = settings.TWEET_MAPQUEST_API_KEY, timeout=10) + #print("lat,long:[{},{}]".format(self.latitude,self.longitude)) + location = geolocator.reverse((self.latitude, self.longitude), exactly_one=True) + return location.address + except GeocoderServiceError as e: + logger.exception("Error during reverse geocoding") + return None + else: + return None class Job(models.Model): STATUS_INIT = 0 @@ -54,6 +100,14 @@ class Job(models.Model): STATUS_FAILED = 3 STATUS_DONE = 4 + STATUS_STRINGS = { + STATUS_INIT: "Starting", + STATUS_RUNNING: "Running", + STATUS_WAITING: "Waiting", + STATUS_FAILED: "Failed", + STATUS_DONE: "Done" + } + name = models.CharField("name", max_length=80) start_time = models.DateTimeField("start time", default=timezone.now) num_tweets = models.BigIntegerField("number of tweets found", default=0) @@ -66,17 +120,32 @@ class Job(models.Model): self.xls = None self.zipfile = None self.logfile = None - self.logwriter = None + self.loghandle = None self.loaded = False self.config = None def __str__(self): return self.name + def remove(self): + shutil.rmtree(self.job_path()) + self.delete() + + def status_string(self): + if self.status == Job.STATUS_WAITING: + return "Waiting ({}s)".format(self.seconds_to_wait) + elif self.status in Job.STATUS_STRINGS: + return Job.STATUS_STRINGS[self.status] + else: + return "Unknown" + def job_path(self): base_path = settings.TWEET_BASEPATH - path = os.path.join(settings.TWEET_BASEPATH, str(self.id)) - os.makedirs(path) + path = os.path.join(base_path, str(self.id)) + try: + os.makedirs(path) + except FileExistsError: + pass return path def add_config(self, f): @@ -84,23 +153,84 @@ class Job(models.Model): with open(self.inifile, 'wb+') as destination: for chunk in f.chunks(): destination.write(chunk) - with open(self.inifile, 'r') as ini: - self.config = config.Config(ini) + + def get_inifile(self): + if self.inifile is None: + self.inifile = os.path.join(self.job_path(), "config.ini") + return self.inifile def get_config(self): - if self.config is not None: - return self.config - inifile = os.path.join(self.job_path(), "config.ini") - self.config = Config(inifile) + if self.config is None: + self.config = Config(self.get_inifile()) return self.config + def get_logfile(self): + if self.logfile is None: + self.logfile = os.path.join(self.job_path(), "log.txt") + return self.logfile + + def get_zipfile(self): + if self.zipfile is None: + self.zipfile = os.path.join(self.job_path(), "results.zip") + with zipfile.ZipFile(self.zipfile, "w", zipfile.ZIP_DEFLATED, True) as zip: + for filename in self.get_results(): + zip.write(os.path.join(self.job_path(), filename), filename) + zip.write(self.get_inifile(), "config.ini") + zip.write(self.get_logfile(), "log.txt") + + return self.zipfile + + def get_loghandle(self): + if self.loghandle is None: + self.loghandle = open(self.get_logfile(), "w") + return self.loghandle + + def add_log(self, s): + f = self.get_loghandle() + f.write(s) + f.write("\n") + + def close_log(self): + f = self.get_loghandle() + f.close() + self.loghandle = None + def get_queries(self): result = set() try: config = self.get_config() result = config.all_search_terms() except Exception as e: - print("Exception getting config:") - print(e) + logging.exception("Exception getting config") return result + def get_results(self): + if self.xls is None: + job_dir = self.job_path() + self.xls = [fn for fn in os.listdir(job_dir) + if any(fn.endswith(ext) for ext in + [".xls",".xlsx"])] + return self.xls + +##class JobDescription(models.Model): +## name = models.CharField("job name", max_length=80) +## +## def __str__(self): +## return self.name +## +## +##class JobQuery(models.Model): +## job_description = models.ForeignKey(JobDescription, on_delete=models.CASCADE) +## name = models.CharField("name", max_length=80) +## terms = models.TextField("search terms") +## +## def __str__(self): +## return self.name +## +##class JobOutput(models.Model): +## job_description = models.ForeignKey(JobDescription, on_delete=models.CASCADE) +## filename = models.CharField("file name", max_length=1024) +## queries = models.ManyToManyField(JobQuery) +## +## def __str__(self): +## return self.filename diff --git a/tweet/static/tweet/favicon.ico b/tweet/static/tweet/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..8a66efe9314195b51575f93cfd0631105a9dbbff GIT binary patch literal 1150 zcmc&!T_{6g7=A^$k?jJv$AycPV&zu2l1mrvxpZglwYXUnBNsyQ6E%x)C1IOLR;z90 zr-`;{w5FUh4rZdy`(&p+Y+O30=e%F<`#jJ0zUMm~q9VS{X5wcxb(auT5s`(#Db9T6 zIS_H}`z3@RMlqv;p)hJ0mfRXS)W9hOrYvfSNdFAzq z`0N9lgJ#t;L?S#vBIzQbu1eT2>F|2bYR&AE*8{z!lR<0Z$UbuEQf|KJb6)qm){9>} z;M?#Ln;k;$`Si%aV@?+@W`a2b>Ltxd;_74uDK^Is-Sk`w>t~z^`LE;ITrQG*Opi!;T>1v_y(Xe5cNBI zQIkDzMws{7U9Mkjb-AE9n63}MW>k}*Ga_=Rfgf8Sf!RF6ru6Za&AB&e4W-W4JHXAS zl|8^eoNw{Tv!QOxX>k815?u-YD>M_u6^4muuk;iB#Y6@iMMQH<^KlfT4AuZ2GGg6l literal 0 HcmV?d00001 diff --git a/tweet/static/tweet/javascript/bootstrap.min.js b/tweet/static/tweet/javascript/bootstrap.min.js deleted file mode 100644 index f9cbdae..0000000 --- a/tweet/static/tweet/javascript/bootstrap.min.js +++ /dev/null @@ -1,6 +0,0 @@ -/*! -* Bootstrap.js by @fat & @mdo -* Copyright 2012 Twitter, Inc. -* http://www.apache.org/licenses/LICENSE-2.0.txt -*/ -!function(e){"use strict";e(function(){e.support.transition=function(){var e=function(){var e=document.createElement("bootstrap"),t={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},n;for(n in t)if(e.style[n]!==undefined)return t[n]}();return e&&{end:e}}()})}(window.jQuery),!function(e){"use strict";var t='[data-dismiss="alert"]',n=function(n){e(n).on("click",t,this.close)};n.prototype.close=function(t){function s(){i.trigger("closed").remove()}var n=e(this),r=n.attr("data-target"),i;r||(r=n.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,"")),i=e(r),t&&t.preventDefault(),i.length||(i=n.hasClass("alert")?n:n.parent()),i.trigger(t=e.Event("close"));if(t.isDefaultPrevented())return;i.removeClass("in"),e.support.transition&&i.hasClass("fade")?i.on(e.support.transition.end,s):s()};var r=e.fn.alert;e.fn.alert=function(t){return this.each(function(){var r=e(this),i=r.data("alert");i||r.data("alert",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.alert.Constructor=n,e.fn.alert.noConflict=function(){return e.fn.alert=r,this},e(document).on("click.alert.data-api",t,n.prototype.close)}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.button.defaults,n)};t.prototype.setState=function(e){var t="disabled",n=this.$element,r=n.data(),i=n.is("input")?"val":"html";e+="Text",r.resetText||n.data("resetText",n[i]()),n[i](r[e]||this.options[e]),setTimeout(function(){e=="loadingText"?n.addClass(t).attr(t,t):n.removeClass(t).removeAttr(t)},0)},t.prototype.toggle=function(){var e=this.$element.closest('[data-toggle="buttons-radio"]');e&&e.find(".active").removeClass("active"),this.$element.toggleClass("active")};var n=e.fn.button;e.fn.button=function(n){return this.each(function(){var r=e(this),i=r.data("button"),s=typeof n=="object"&&n;i||r.data("button",i=new t(this,s)),n=="toggle"?i.toggle():n&&i.setState(n)})},e.fn.button.defaults={loadingText:"loading..."},e.fn.button.Constructor=t,e.fn.button.noConflict=function(){return e.fn.button=n,this},e(document).on("click.button.data-api","[data-toggle^=button]",function(t){var n=e(t.target);n.hasClass("btn")||(n=n.closest(".btn")),n.button("toggle")})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.$indicators=this.$element.find(".carousel-indicators"),this.options=n,this.options.pause=="hover"&&this.$element.on("mouseenter",e.proxy(this.pause,this)).on("mouseleave",e.proxy(this.cycle,this))};t.prototype={cycle:function(t){return t||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(e.proxy(this.next,this),this.options.interval)),this},getActiveIndex:function(){return this.$active=this.$element.find(".item.active"),this.$items=this.$active.parent().children(),this.$items.index(this.$active)},to:function(t){var n=this.getActiveIndex(),r=this;if(t>this.$items.length-1||t<0)return;return this.sliding?this.$element.one("slid",function(){r.to(t)}):n==t?this.pause().cycle():this.slide(t>n?"next":"prev",e(this.$items[t]))},pause:function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&e.support.transition.end&&(this.$element.trigger(e.support.transition.end),this.cycle(!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(t,n){var r=this.$element.find(".item.active"),i=n||r[t](),s=this.interval,o=t=="next"?"left":"right",u=t=="next"?"first":"last",a=this,f;this.sliding=!0,s&&this.pause(),i=i.length?i:this.$element.find(".item")[u](),f=e.Event("slide",{relatedTarget:i[0],direction:o});if(i.hasClass("active"))return;this.$indicators.length&&(this.$indicators.find(".active").removeClass("active"),this.$element.one("slid",function(){var t=e(a.$indicators.children()[a.getActiveIndex()]);t&&t.addClass("active")}));if(e.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(f);if(f.isDefaultPrevented())return;i.addClass(t),i[0].offsetWidth,r.addClass(o),i.addClass(o),this.$element.one(e.support.transition.end,function(){i.removeClass([t,o].join(" ")).addClass("active"),r.removeClass(["active",o].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger("slid")},0)})}else{this.$element.trigger(f);if(f.isDefaultPrevented())return;r.removeClass("active"),i.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return s&&this.cycle(),this}};var n=e.fn.carousel;e.fn.carousel=function(n){return this.each(function(){var r=e(this),i=r.data("carousel"),s=e.extend({},e.fn.carousel.defaults,typeof n=="object"&&n),o=typeof n=="string"?n:s.slide;i||r.data("carousel",i=new t(this,s)),typeof n=="number"?i.to(n):o?i[o]():s.interval&&i.pause().cycle()})},e.fn.carousel.defaults={interval:5e3,pause:"hover"},e.fn.carousel.Constructor=t,e.fn.carousel.noConflict=function(){return e.fn.carousel=n,this},e(document).on("click.carousel.data-api","[data-slide], [data-slide-to]",function(t){var n=e(this),r,i=e(n.attr("data-target")||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,"")),s=e.extend({},i.data(),n.data()),o;i.carousel(s),(o=n.attr("data-slide-to"))&&i.data("carousel").pause().to(o).cycle(),t.preventDefault()})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.collapse.defaults,n),this.options.parent&&(this.$parent=e(this.options.parent)),this.options.toggle&&this.toggle()};t.prototype={constructor:t,dimension:function(){var e=this.$element.hasClass("width");return e?"width":"height"},show:function(){var t,n,r,i;if(this.transitioning||this.$element.hasClass("in"))return;t=this.dimension(),n=e.camelCase(["scroll",t].join("-")),r=this.$parent&&this.$parent.find("> .accordion-group > .in");if(r&&r.length){i=r.data("collapse");if(i&&i.transitioning)return;r.collapse("hide"),i||r.data("collapse",null)}this.$element[t](0),this.transition("addClass",e.Event("show"),"shown"),e.support.transition&&this.$element[t](this.$element[0][n])},hide:function(){var t;if(this.transitioning||!this.$element.hasClass("in"))return;t=this.dimension(),this.reset(this.$element[t]()),this.transition("removeClass",e.Event("hide"),"hidden"),this.$element[t](0)},reset:function(e){var t=this.dimension();return this.$element.removeClass("collapse")[t](e||"auto")[0].offsetWidth,this.$element[e!==null?"addClass":"removeClass"]("collapse"),this},transition:function(t,n,r){var i=this,s=function(){n.type=="show"&&i.reset(),i.transitioning=0,i.$element.trigger(r)};this.$element.trigger(n);if(n.isDefaultPrevented())return;this.transitioning=1,this.$element[t]("in"),e.support.transition&&this.$element.hasClass("collapse")?this.$element.one(e.support.transition.end,s):s()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}};var n=e.fn.collapse;e.fn.collapse=function(n){return this.each(function(){var r=e(this),i=r.data("collapse"),s=e.extend({},e.fn.collapse.defaults,r.data(),typeof n=="object"&&n);i||r.data("collapse",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.collapse.defaults={toggle:!0},e.fn.collapse.Constructor=t,e.fn.collapse.noConflict=function(){return e.fn.collapse=n,this},e(document).on("click.collapse.data-api","[data-toggle=collapse]",function(t){var n=e(this),r,i=n.attr("data-target")||t.preventDefault()||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,""),s=e(i).data("collapse")?"toggle":n.data();n[e(i).hasClass("in")?"addClass":"removeClass"]("collapsed"),e(i).collapse(s)})}(window.jQuery),!function(e){"use strict";function r(){e(".dropdown-backdrop").remove(),e(t).each(function(){i(e(this)).removeClass("open")})}function i(t){var n=t.attr("data-target"),r;n||(n=t.attr("href"),n=n&&/#/.test(n)&&n.replace(/.*(?=#[^\s]*$)/,"")),r=n&&e(n);if(!r||!r.length)r=t.parent();return r}var t="[data-toggle=dropdown]",n=function(t){var n=e(t).on("click.dropdown.data-api",this.toggle);e("html").on("click.dropdown.data-api",function(){n.parent().removeClass("open")})};n.prototype={constructor:n,toggle:function(t){var n=e(this),s,o;if(n.is(".disabled, :disabled"))return;return s=i(n),o=s.hasClass("open"),r(),o||("ontouchstart"in document.documentElement&&e('
').insertBefore(e(this)).on("click",r),s.toggleClass("open")),n.focus(),!1},keydown:function(n){var r,s,o,u,a,f;if(!/(38|40|27)/.test(n.keyCode))return;r=e(this),n.preventDefault(),n.stopPropagation();if(r.is(".disabled, :disabled"))return;u=i(r),a=u.hasClass("open");if(!a||a&&n.keyCode==27)return n.which==27&&u.find(t).focus(),r.click();s=e("[role=menu] li:not(.divider):visible a",u);if(!s.length)return;f=s.index(s.filter(":focus")),n.keyCode==38&&f>0&&f--,n.keyCode==40&&f').appendTo(document.body),this.$backdrop.click(this.options.backdrop=="static"?e.proxy(this.$element[0].focus,this.$element[0]):e.proxy(this.hide,this)),i&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in");if(!t)return;i?this.$backdrop.one(e.support.transition.end,t):t()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),e.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(e.support.transition.end,t):t()):t&&t()}};var n=e.fn.modal;e.fn.modal=function(n){return this.each(function(){var r=e(this),i=r.data("modal"),s=e.extend({},e.fn.modal.defaults,r.data(),typeof n=="object"&&n);i||r.data("modal",i=new t(this,s)),typeof n=="string"?i[n]():s.show&&i.show()})},e.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},e.fn.modal.Constructor=t,e.fn.modal.noConflict=function(){return e.fn.modal=n,this},e(document).on("click.modal.data-api",'[data-toggle="modal"]',function(t){var n=e(this),r=n.attr("href"),i=e(n.attr("data-target")||r&&r.replace(/.*(?=#[^\s]+$)/,"")),s=i.data("modal")?"toggle":e.extend({remote:!/#/.test(r)&&r},i.data(),n.data());t.preventDefault(),i.modal(s).one("hide",function(){n.focus()})})}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("tooltip",e,t)};t.prototype={constructor:t,init:function(t,n,r){var i,s,o,u,a;this.type=t,this.$element=e(n),this.options=this.getOptions(r),this.enabled=!0,o=this.options.trigger.split(" ");for(a=o.length;a--;)u=o[a],u=="click"?this.$element.on("click."+this.type,this.options.selector,e.proxy(this.toggle,this)):u!="manual"&&(i=u=="hover"?"mouseenter":"focus",s=u=="hover"?"mouseleave":"blur",this.$element.on(i+"."+this.type,this.options.selector,e.proxy(this.enter,this)),this.$element.on(s+"."+this.type,this.options.selector,e.proxy(this.leave,this)));this.options.selector?this._options=e.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(t){return t=e.extend({},e.fn[this.type].defaults,this.$element.data(),t),t.delay&&typeof t.delay=="number"&&(t.delay={show:t.delay,hide:t.delay}),t},enter:function(t){var n=e.fn[this.type].defaults,r={},i;this._options&&e.each(this._options,function(e,t){n[e]!=t&&(r[e]=t)},this),i=e(t.currentTarget)[this.type](r).data(this.type);if(!i.options.delay||!i.options.delay.show)return i.show();clearTimeout(this.timeout),i.hoverState="in",this.timeout=setTimeout(function(){i.hoverState=="in"&&i.show()},i.options.delay.show)},leave:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);this.timeout&&clearTimeout(this.timeout);if(!n.options.delay||!n.options.delay.hide)return n.hide();n.hoverState="out",this.timeout=setTimeout(function(){n.hoverState=="out"&&n.hide()},n.options.delay.hide)},show:function(){var t,n,r,i,s,o,u=e.Event("show");if(this.hasContent()&&this.enabled){this.$element.trigger(u);if(u.isDefaultPrevented())return;t=this.tip(),this.setContent(),this.options.animation&&t.addClass("fade"),s=typeof this.options.placement=="function"?this.options.placement.call(this,t[0],this.$element[0]):this.options.placement,t.detach().css({top:0,left:0,display:"block"}),this.options.container?t.appendTo(this.options.container):t.insertAfter(this.$element),n=this.getPosition(),r=t[0].offsetWidth,i=t[0].offsetHeight;switch(s){case"bottom":o={top:n.top+n.height,left:n.left+n.width/2-r/2};break;case"top":o={top:n.top-i,left:n.left+n.width/2-r/2};break;case"left":o={top:n.top+n.height/2-i/2,left:n.left-r};break;case"right":o={top:n.top+n.height/2-i/2,left:n.left+n.width}}this.applyPlacement(o,s),this.$element.trigger("shown")}},applyPlacement:function(e,t){var n=this.tip(),r=n[0].offsetWidth,i=n[0].offsetHeight,s,o,u,a;n.offset(e).addClass(t).addClass("in"),s=n[0].offsetWidth,o=n[0].offsetHeight,t=="top"&&o!=i&&(e.top=e.top+i-o,a=!0),t=="bottom"||t=="top"?(u=0,e.left<0&&(u=e.left*-2,e.left=0,n.offset(e),s=n[0].offsetWidth,o=n[0].offsetHeight),this.replaceArrow(u-r+s,s,"left")):this.replaceArrow(o-i,o,"top"),a&&n.offset(e)},replaceArrow:function(e,t,n){this.arrow().css(n,e?50*(1-e/t)+"%":"")},setContent:function(){var e=this.tip(),t=this.getTitle();e.find(".tooltip-inner")[this.options.html?"html":"text"](t),e.removeClass("fade in top bottom left right")},hide:function(){function i(){var t=setTimeout(function(){n.off(e.support.transition.end).detach()},500);n.one(e.support.transition.end,function(){clearTimeout(t),n.detach()})}var t=this,n=this.tip(),r=e.Event("hide");this.$element.trigger(r);if(r.isDefaultPrevented())return;return n.removeClass("in"),e.support.transition&&this.$tip.hasClass("fade")?i():n.detach(),this.$element.trigger("hidden"),this},fixTitle:function(){var e=this.$element;(e.attr("title")||typeof e.attr("data-original-title")!="string")&&e.attr("data-original-title",e.attr("title")||"").attr("title","")},hasContent:function(){return this.getTitle()},getPosition:function(){var t=this.$element[0];return e.extend({},typeof t.getBoundingClientRect=="function"?t.getBoundingClientRect():{width:t.offsetWidth,height:t.offsetHeight},this.$element.offset())},getTitle:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-original-title")||(typeof n.title=="function"?n.title.call(t[0]):n.title),e},tip:function(){return this.$tip=this.$tip||e(this.options.template)},arrow:function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},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(t){var n=t?e(t.currentTarget)[this.type](this._options).data(this.type):this;n.tip().hasClass("in")?n.hide():n.show()},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}};var n=e.fn.tooltip;e.fn.tooltip=function(n){return this.each(function(){var r=e(this),i=r.data("tooltip"),s=typeof n=="object"&&n;i||r.data("tooltip",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.tooltip.Constructor=t,e.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'
',trigger:"hover focus",title:"",delay:0,html:!1,container:!1},e.fn.tooltip.noConflict=function(){return e.fn.tooltip=n,this}}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("popover",e,t)};t.prototype=e.extend({},e.fn.tooltip.Constructor.prototype,{constructor:t,setContent:function(){var e=this.tip(),t=this.getTitle(),n=this.getContent();e.find(".popover-title")[this.options.html?"html":"text"](t),e.find(".popover-content")[this.options.html?"html":"text"](n),e.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var e,t=this.$element,n=this.options;return e=(typeof n.content=="function"?n.content.call(t[0]):n.content)||t.attr("data-content"),e},tip:function(){return this.$tip||(this.$tip=e(this.options.template)),this.$tip},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}});var n=e.fn.popover;e.fn.popover=function(n){return this.each(function(){var r=e(this),i=r.data("popover"),s=typeof n=="object"&&n;i||r.data("popover",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.popover.Constructor=t,e.fn.popover.defaults=e.extend({},e.fn.tooltip.defaults,{placement:"right",trigger:"click",content:"",template:'

'}),e.fn.popover.noConflict=function(){return e.fn.popover=n,this}}(window.jQuery),!function(e){"use strict";function t(t,n){var r=e.proxy(this.process,this),i=e(t).is("body")?e(window):e(t),s;this.options=e.extend({},e.fn.scrollspy.defaults,n),this.$scrollElement=i.on("scroll.scroll-spy.data-api",r),this.selector=(this.options.target||(s=e(t).attr("href"))&&s.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=e("body"),this.refresh(),this.process()}t.prototype={constructor:t,refresh:function(){var t=this,n;this.offsets=e([]),this.targets=e([]),n=this.$body.find(this.selector).map(function(){var n=e(this),r=n.data("target")||n.attr("href"),i=/^#\w/.test(r)&&e(r);return i&&i.length&&[[i.position().top+(!e.isWindow(t.$scrollElement.get(0))&&t.$scrollElement.scrollTop()),r]]||null}).sort(function(e,t){return e[0]-t[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},process:function(){var e=this.$scrollElement.scrollTop()+this.options.offset,t=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,n=t-this.$scrollElement.height(),r=this.offsets,i=this.targets,s=this.activeTarget,o;if(e>=n)return s!=(o=i.last()[0])&&this.activate(o);for(o=r.length;o--;)s!=i[o]&&e>=r[o]&&(!r[o+1]||e<=r[o+1])&&this.activate(i[o])},activate:function(t){var n,r;this.activeTarget=t,e(this.selector).parent(".active").removeClass("active"),r=this.selector+'[data-target="'+t+'"],'+this.selector+'[href="'+t+'"]',n=e(r).parent("li").addClass("active"),n.parent(".dropdown-menu").length&&(n=n.closest("li.dropdown").addClass("active")),n.trigger("activate")}};var n=e.fn.scrollspy;e.fn.scrollspy=function(n){return this.each(function(){var r=e(this),i=r.data("scrollspy"),s=typeof n=="object"&&n;i||r.data("scrollspy",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.scrollspy.Constructor=t,e.fn.scrollspy.defaults={offset:10},e.fn.scrollspy.noConflict=function(){return e.fn.scrollspy=n,this},e(window).on("load",function(){e('[data-spy="scroll"]').each(function(){var t=e(this);t.scrollspy(t.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t){this.element=e(t)};t.prototype={constructor:t,show:function(){var t=this.element,n=t.closest("ul:not(.dropdown-menu)"),r=t.attr("data-target"),i,s,o;r||(r=t.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));if(t.parent("li").hasClass("active"))return;i=n.find(".active:last a")[0],o=e.Event("show",{relatedTarget:i}),t.trigger(o);if(o.isDefaultPrevented())return;s=e(r),this.activate(t.parent("li"),n),this.activate(s,s.parent(),function(){t.trigger({type:"shown",relatedTarget:i})})},activate:function(t,n,r){function o(){i.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),t.addClass("active"),s?(t[0].offsetWidth,t.addClass("in")):t.removeClass("fade"),t.parent(".dropdown-menu")&&t.closest("li.dropdown").addClass("active"),r&&r()}var i=n.find("> .active"),s=r&&e.support.transition&&i.hasClass("fade");s?i.one(e.support.transition.end,o):o(),i.removeClass("in")}};var n=e.fn.tab;e.fn.tab=function(n){return this.each(function(){var r=e(this),i=r.data("tab");i||r.data("tab",i=new t(this)),typeof n=="string"&&i[n]()})},e.fn.tab.Constructor=t,e.fn.tab.noConflict=function(){return e.fn.tab=n,this},e(document).on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(t){t.preventDefault(),e(this).tab("show")})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.typeahead.defaults,n),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.source=this.options.source,this.$menu=e(this.options.menu),this.shown=!1,this.listen()};t.prototype={constructor:t,select:function(){var e=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(e)).change(),this.hide()},updater:function(e){return e},show:function(){var t=e.extend({},this.$element.position(),{height:this.$element[0].offsetHeight});return this.$menu.insertAfter(this.$element).css({top:t.top+t.height,left:t.left}).show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(t){var n;return this.query=this.$element.val(),!this.query||this.query.length"+t+""})},render:function(t){var n=this;return t=e(t).map(function(t,r){return t=e(n.options.item).attr("data-value",r),t.find("a").html(n.highlighter(r)),t[0]}),t.first().addClass("active"),this.$menu.html(t),this},next:function(t){var n=this.$menu.find(".active").removeClass("active"),r=n.next();r.length||(r=e(this.$menu.find("li")[0])),r.addClass("active")},prev:function(e){var t=this.$menu.find(".active").removeClass("active"),n=t.prev();n.length||(n=this.$menu.find("li").last()),n.addClass("active")},listen:function(){this.$element.on("focus",e.proxy(this.focus,this)).on("blur",e.proxy(this.blur,this)).on("keypress",e.proxy(this.keypress,this)).on("keyup",e.proxy(this.keyup,this)),this.eventSupported("keydown")&&this.$element.on("keydown",e.proxy(this.keydown,this)),this.$menu.on("click",e.proxy(this.click,this)).on("mouseenter","li",e.proxy(this.mouseenter,this)).on("mouseleave","li",e.proxy(this.mouseleave,this))},eventSupported:function(e){var t=e in this.$element;return t||(this.$element.setAttribute(e,"return;"),t=typeof this.$element[e]=="function"),t},move:function(e){if(!this.shown)return;switch(e.keyCode){case 9:case 13:case 27:e.preventDefault();break;case 38:e.preventDefault(),this.prev();break;case 40:e.preventDefault(),this.next()}e.stopPropagation()},keydown:function(t){this.suppressKeyPressRepeat=~e.inArray(t.keyCode,[40,38,9,13,27]),this.move(t)},keypress:function(e){if(this.suppressKeyPressRepeat)return;this.move(e)},keyup:function(e){switch(e.keyCode){case 40:case 38:case 16:case 17:case 18:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}e.stopPropagation(),e.preventDefault()},focus:function(e){this.focused=!0},blur:function(e){this.focused=!1,!this.mousedover&&this.shown&&this.hide()},click:function(e){e.stopPropagation(),e.preventDefault(),this.select(),this.$element.focus()},mouseenter:function(t){this.mousedover=!0,this.$menu.find(".active").removeClass("active"),e(t.currentTarget).addClass("active")},mouseleave:function(e){this.mousedover=!1,!this.focused&&this.shown&&this.hide()}};var n=e.fn.typeahead;e.fn.typeahead=function(n){return this.each(function(){var r=e(this),i=r.data("typeahead"),s=typeof n=="object"&&n;i||r.data("typeahead",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.typeahead.defaults={source:[],items:8,menu:'
    ',item:'
    • ',minLength:1},e.fn.typeahead.Constructor=t,e.fn.typeahead.noConflict=function(){return e.fn.typeahead=n,this},e(document).on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(t){var n=e(this);if(n.data("typeahead"))return;n.typeahead(n.data())})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=e.extend({},e.fn.affix.defaults,n),this.$window=e(window).on("scroll.affix.data-api",e.proxy(this.checkPosition,this)).on("click.affix.data-api",e.proxy(function(){setTimeout(e.proxy(this.checkPosition,this),1)},this)),this.$element=e(t),this.checkPosition()};t.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var t=e(document).height(),n=this.$window.scrollTop(),r=this.$element.offset(),i=this.options.offset,s=i.bottom,o=i.top,u="affix affix-top affix-bottom",a;typeof i!="object"&&(s=o=i),typeof o=="function"&&(o=i.top()),typeof s=="function"&&(s=i.bottom()),a=this.unpin!=null&&n+this.unpin<=r.top?!1:s!=null&&r.top+this.$element.height()>=t-s?"bottom":o!=null&&n<=o?"top":!1;if(this.affixed===a)return;this.affixed=a,this.unpin=a=="bottom"?r.top-n:null,this.$element.removeClass(u).addClass("affix"+(a?"-"+a:""))};var n=e.fn.affix;e.fn.affix=function(n){return this.each(function(){var r=e(this),i=r.data("affix"),s=typeof n=="object"&&n;i||r.data("affix",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.affix.Constructor=t,e.fn.affix.defaults={offset:0},e.fn.affix.noConflict=function(){return e.fn.affix=n,this},e(window).on("load",function(){e('[data-spy="affix"]').each(function(){var t=e(this),n=t.data();n.offset=n.offset||{},n.offsetBottom&&(n.offset.bottom=n.offsetBottom),n.offsetTop&&(n.offset.top=n.offsetTop),t.affix(n)})})}(window.jQuery); \ No newline at end of file diff --git a/tweet/static/tweet/javascript/bootstrap.min.js b/tweet/static/tweet/javascript/bootstrap.min.js new file mode 120000 index 0000000..22d433b --- /dev/null +++ b/tweet/static/tweet/javascript/bootstrap.min.js @@ -0,0 +1 @@ +/usr/share/javascript/bootstrap/js/bootstrap.min.js \ No newline at end of file diff --git a/tweet/static/tweet/javascript/jquery-1.9.0.min.js b/tweet/static/tweet/javascript/jquery-1.9.0.min.js deleted file mode 100644 index 50d1b22..0000000 --- a/tweet/static/tweet/javascript/jquery-1.9.0.min.js +++ /dev/null @@ -1,4 +0,0 @@ -/*! jQuery v1.9.0 | (c) 2005, 2012 jQuery Foundation, Inc. | jquery.org/license */(function(e,t){"use strict";function n(e){var t=e.length,n=st.type(e);return st.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}function r(e){var t=Tt[e]={};return st.each(e.match(lt)||[],function(e,n){t[n]=!0}),t}function i(e,n,r,i){if(st.acceptData(e)){var o,a,s=st.expando,u="string"==typeof n,l=e.nodeType,c=l?st.cache:e,f=l?e[s]:e[s]&&s;if(f&&c[f]&&(i||c[f].data)||!u||r!==t)return f||(l?e[s]=f=K.pop()||st.guid++:f=s),c[f]||(c[f]={},l||(c[f].toJSON=st.noop)),("object"==typeof n||"function"==typeof n)&&(i?c[f]=st.extend(c[f],n):c[f].data=st.extend(c[f].data,n)),o=c[f],i||(o.data||(o.data={}),o=o.data),r!==t&&(o[st.camelCase(n)]=r),u?(a=o[n],null==a&&(a=o[st.camelCase(n)])):a=o,a}}function o(e,t,n){if(st.acceptData(e)){var r,i,o,a=e.nodeType,u=a?st.cache:e,l=a?e[st.expando]:st.expando;if(u[l]){if(t&&(r=n?u[l]:u[l].data)){st.isArray(t)?t=t.concat(st.map(t,st.camelCase)):t in r?t=[t]:(t=st.camelCase(t),t=t in r?[t]:t.split(" "));for(i=0,o=t.length;o>i;i++)delete r[t[i]];if(!(n?s:st.isEmptyObject)(r))return}(n||(delete u[l].data,s(u[l])))&&(a?st.cleanData([e],!0):st.support.deleteExpando||u!=u.window?delete u[l]:u[l]=null)}}}function a(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(Nt,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:wt.test(r)?st.parseJSON(r):r}catch(o){}st.data(e,n,r)}else r=t}return r}function s(e){var t;for(t in e)if(("data"!==t||!st.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}function u(){return!0}function l(){return!1}function c(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}function f(e,t,n){if(t=t||0,st.isFunction(t))return st.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return st.grep(e,function(e){return e===t===n});if("string"==typeof t){var r=st.grep(e,function(e){return 1===e.nodeType});if(Wt.test(t))return st.filter(t,r,!n);t=st.filter(t,r)}return st.grep(e,function(e){return st.inArray(e,t)>=0===n})}function p(e){var t=zt.split("|"),n=e.createDocumentFragment();if(n.createElement)for(;t.length;)n.createElement(t.pop());return n}function d(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function h(e){var t=e.getAttributeNode("type");return e.type=(t&&t.specified)+"/"+e.type,e}function g(e){var t=nn.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function m(e,t){for(var n,r=0;null!=(n=e[r]);r++)st._data(n,"globalEval",!t||st._data(t[r],"globalEval"))}function y(e,t){if(1===t.nodeType&&st.hasData(e)){var n,r,i,o=st._data(e),a=st._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)st.event.add(t,n,s[n][r])}a.data&&(a.data=st.extend({},a.data))}}function v(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!st.support.noCloneEvent&&t[st.expando]){r=st._data(t);for(i in r.events)st.removeEvent(t,i,r.handle);t.removeAttribute(st.expando)}"script"===n&&t.text!==e.text?(h(t).text=e.text,g(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),st.support.html5Clone&&e.innerHTML&&!st.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Zt.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}function b(e,n){var r,i,o=0,a=e.getElementsByTagName!==t?e.getElementsByTagName(n||"*"):e.querySelectorAll!==t?e.querySelectorAll(n||"*"):t;if(!a)for(a=[],r=e.childNodes||e;null!=(i=r[o]);o++)!n||st.nodeName(i,n)?a.push(i):st.merge(a,b(i,n));return n===t||n&&st.nodeName(e,n)?st.merge([e],a):a}function x(e){Zt.test(e.type)&&(e.defaultChecked=e.checked)}function T(e,t){if(t in e)return t;for(var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=Nn.length;i--;)if(t=Nn[i]+n,t in e)return t;return r}function w(e,t){return e=t||e,"none"===st.css(e,"display")||!st.contains(e.ownerDocument,e)}function N(e,t){for(var n,r=[],i=0,o=e.length;o>i;i++)n=e[i],n.style&&(r[i]=st._data(n,"olddisplay"),t?(r[i]||"none"!==n.style.display||(n.style.display=""),""===n.style.display&&w(n)&&(r[i]=st._data(n,"olddisplay",S(n.nodeName)))):r[i]||w(n)||st._data(n,"olddisplay",st.css(n,"display")));for(i=0;o>i;i++)n=e[i],n.style&&(t&&"none"!==n.style.display&&""!==n.style.display||(n.style.display=t?r[i]||"":"none"));return e}function C(e,t,n){var r=mn.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function k(e,t,n,r,i){for(var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;4>o;o+=2)"margin"===n&&(a+=st.css(e,n+wn[o],!0,i)),r?("content"===n&&(a-=st.css(e,"padding"+wn[o],!0,i)),"margin"!==n&&(a-=st.css(e,"border"+wn[o]+"Width",!0,i))):(a+=st.css(e,"padding"+wn[o],!0,i),"padding"!==n&&(a+=st.css(e,"border"+wn[o]+"Width",!0,i)));return a}function E(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=ln(e),a=st.support.boxSizing&&"border-box"===st.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=un(e,t,o),(0>i||null==i)&&(i=e.style[t]),yn.test(i))return i;r=a&&(st.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+k(e,t,n||(a?"border":"content"),r,o)+"px"}function S(e){var t=V,n=bn[e];return n||(n=A(e,t),"none"!==n&&n||(cn=(cn||st("