diff --git a/deploy/wsgi/employers_wsgi.py b/deploy/wsgi/employers_wsgi.py new file mode 100644 index 0000000..c48cd8c --- /dev/null +++ b/deploy/wsgi/employers_wsgi.py @@ -0,0 +1,13 @@ +SITE_DIR = '/var/www/employers.txt2wrk.net/src/txt2wrk' +import site +site.addsitedir(SITE_DIR) + +import os +import sys +sys.path.append(SITE_DIR) + +os.environ['DJANGO_SETTINGS_MODULE'] = 'txt2wrk.settings' +import django.core.handlers.wsgi +application = django.core.handlers.wsgi.WSGIHandler() + + diff --git a/deploy/wsgi/txt2wrk_wsgi.py b/deploy/wsgi/txt2wrk_wsgi.py new file mode 100644 index 0000000..8dad574 --- /dev/null +++ b/deploy/wsgi/txt2wrk_wsgi.py @@ -0,0 +1,13 @@ +SITE_DIR = '/var/www/www.txt2wrk.net/src/txt2wrk' +import site +site.addsitedir(SITE_DIR) + +import os +import sys +sys.path.append(SITE_DIR) + +os.environ['DJANGO_SETTINGS_MODULE'] = 'txt2wrk.settings' +import django.core.handlers.wsgi +application = django.core.handlers.wsgi.WSGIHandler() + + diff --git a/media/css/loggedin.css b/media/css/loggedin.css index 487dad1..37733e6 100644 --- a/media/css/loggedin.css +++ b/media/css/loggedin.css @@ -95,4 +95,4 @@ div#demo-header h2 { font-size: 18px; font-weight: normal; color: #fff; -} \ No newline at end of file +} diff --git a/media/css/loggedout.css b/media/css/loggedout.css index 70fc700..d09d7c4 100644 --- a/media/css/loggedout.css +++ b/media/css/loggedout.css @@ -16,6 +16,7 @@ body > div > header > h1 { color: transparent; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; font-size: 80px; + -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; } body > div > header > h1 > a, @@ -416,4 +417,4 @@ input.phone_part_last { .contact label { font-size: 13px; line-height: 13px; -} \ No newline at end of file +} diff --git a/templates/500.html b/templates/500.html new file mode 100644 index 0000000..e937a98 --- /dev/null +++ b/templates/500.html @@ -0,0 +1,10 @@ + +Whoops + + +

Whoa, whoa, whoa

+ +

Something bad happened here. We're on it. If you want to contact us, feel free to do so. Otherwise, head on out of here and don't do it again.

+ + + diff --git a/templates/about/about.html b/templates/about/about.html index bb24d2a..f5b55af 100644 --- a/templates/about/about.html +++ b/templates/about/about.html @@ -73,7 +73,7 @@

Contributors

Allison McKeever
Advisor
Alex Tam
-
Advisor
+
Designer
diff --git a/templates/about/homepage_base.html b/templates/about/homepage_base.html index ca3f599..b278e3b 100644 --- a/templates/about/homepage_base.html +++ b/templates/about/homepage_base.html @@ -21,8 +21,33 @@ location.href = $(this).parent().attr('href'); return false; }); +<<<<<<< HEAD }) +======= + $('form button').click(function() { + if (!$(this).hasClass('no-submit')) { + $(this).closest('form').submit(); + return false; + } + }); + }) + + +>>>>>>> 6b1732c297e2e0346cf3eb150a5220dd99757b00
diff --git a/templates/applicant/registration/verify_phone.html b/templates/applicant/registration/verify_phone.html index cfba8f7..6925df9 100644 --- a/templates/applicant/registration/verify_phone.html +++ b/templates/applicant/registration/verify_phone.html @@ -50,4 +50,4 @@

Problems?

-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/base.html b/templates/base.html index 2e4420f..19fe45e 100644 --- a/templates/base.html +++ b/templates/base.html @@ -17,10 +17,16 @@ +<<<<<<< HEAD +======= + +>>>>>>> 6b1732c297e2e0346cf3eb150a5220dd99757b00 {% if DEMO_ENABLED %} @@ -53,4 +76,4 @@
Thanks for visiting!
- \ No newline at end of file +