Merge branch 'master' of github.com:rogerly/txt2wrk

Conflicts: templates/about/homepage_base.html templates/base.html
rogerly · Jan 5, 2012 · dadda98 · dadda98
2 parents 61e0d50 + 6b1732c
commit dadda98
Show file tree

Hide file tree

Showing 9 changed files with 90 additions and 5 deletions.
diff --git a/deploy/wsgi/employers_wsgi.py 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
@@ -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
@@ -95,4 +95,4 @@ div#demo-header h2 {
     font-size: 18px;
     font-weight: normal;
     color: #fff;
-}
+}
diff --git 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;
-}
+}
diff --git a/templates/500.html b/templates/500.html
@@ -0,0 +1,10 @@
+<html>
+<head><title>Whoops</title></head>
+<body>
+
+<h1>Whoa, whoa, whoa</h1>
+
+<p>Something bad happened here.  We're on it.  If you want to <a href="{% url contact %}">contact us</a>, feel free to do so.  Otherwise, <a href="/">head on out of here</a> and don't do it again.</p>
+</body>
+</html>
+
diff --git a/templates/about/about.html b/templates/about/about.html
@@ -73,7 +73,7 @@ <h3>Contributors</h3>
             <dt>Allison McKeever</dt>
             <dd>Advisor</dd>
             <dt>Alex Tam</dt>
-            <dd>Advisor</dd>
+            <dd>Designer</dd>
         </dl>
     </div>
     <div class="clearing"></div>

diff --git 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
             })
         </script>
+=======
+                $('form button').click(function() {
+                    if (!$(this).hasClass('no-submit')) {
+                        $(this).closest('form').submit();
+                        return false;
+                    }
+                });
+            })
+        </script>
+<script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-26098347-1']);
+  _gaq.push(['_setDomainName', '.txt2wrk.net']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+</script>
+>>>>>>> 6b1732c297e2e0346cf3eb150a5220dd99757b00
     </head>
     <body class="{% block page_class %}{% endblock %}">
         <div>

diff --git a/templates/applicant/registration/verify_phone.html b/templates/applicant/registration/verify_phone.html
@@ -50,4 +50,4 @@ <h2>Problems?</h2>
             <button>Sign In</button>
         </form>
     </section>
-{% endblock %}
+{% endblock %}
diff --git a/templates/base.html b/templates/base.html
@@ -17,10 +17,16 @@
         <script type="text/javascript">
             $(document).ready(function() {
                 $('a > button').click(function() {
+<<<<<<< HEAD
                     location.href = $(this).parent().attr('href');
                     return false;
                 });
 
+=======
+                        location.href = $(this).parent().attr('href');
+                    return false;
+                });
+>>>>>>> 6b1732c297e2e0346cf3eb150a5220dd99757b00
                 $('form button').click(function() {
                     if (!$(this).hasClass('no-submit')) {
                         $(this).closest('form').submit();
@@ -29,6 +35,23 @@
                 });
             })
         </script>
+<<<<<<< HEAD
+=======
+<script type="text/javascript">
+
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', 'UA-26098347-1']);
+  _gaq.push(['_setDomainName', '.txt2wrk.net']);
+  _gaq.push(['_trackPageview']);
+
+  (function() {
+    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+  })();
+
+</script>
+>>>>>>> 6b1732c297e2e0346cf3eb150a5220dd99757b00
 	</head>
 	<body class="{% block page_class %}{% endblock %}">
         {% if DEMO_ENABLED %}
@@ -53,4 +76,4 @@ <h5>Thanks for visiting!</h5>
             </footer>
         </div>
 	</body>
-</html>
+</html>