diff options
| -rw-r--r-- | aloha/static/js/browser-check.js | 11 | ||||
| -rw-r--r-- | aloha/template/500.html | 27 | ||||
| -rw-r--r-- | aloha/template/allotter/apply.html | 16 | ||||
| -rw-r--r-- | aloha/template/allotter/login.html | 16 | ||||
| -rw-r--r-- | aloha/template/base.html | 18 |
5 files changed, 49 insertions, 39 deletions
diff --git a/aloha/static/js/browser-check.js b/aloha/static/js/browser-check.js new file mode 100644 index 0000000..17bda46 --- /dev/null +++ b/aloha/static/js/browser-check.js @@ -0,0 +1,11 @@ +$(document).ready(function(){ + if(($.browser.msie) && ($.browser.version <8)){ + window.location="/browser-version" + } + if(($.browser.mozilla) && (parseInt($.browser.version) <=5)){ + window.location="/browser-version" + } + if(($.browser.webkit) && (parseInt($.browser.version <=530))){ + window.location="/browser-version" + } +}); diff --git a/aloha/template/500.html b/aloha/template/500.html index d5c4f7e..4dd1575 100644 --- a/aloha/template/500.html +++ b/aloha/template/500.html @@ -1,15 +1,18 @@ -{% extends "base.html" %} +<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" + "http://www.w3.org/TR/html4/strict.dtd"> +<html lang="en"> +<head> + <title>Page unavailable</title> +</head> +<body> + <h1>Page unavailable</h1> + <p>Sorry, but the requested page is unavailable due to a + server hiccup.</p> -{% block title %}Internal Server Error...{% endblock title %} - -{% block content %} -<h2> Welcome to the JAM 2012 Admission website</h2> -<h2>Internal Server Error...</h2> -<h3>Looks like something has gone wrong. An email has been sent to the administrator</h3> -<hr /> - -<h3>Please follow this <a href="/allotter">link</a> to login</h3> - -{% endblock content %} + <p>Our engineers have been notified, so check back later.</p> + <hr /> + <p>Try to <a href="/allotter">Login</a> again.</p> +</body> +</html> diff --git a/aloha/template/allotter/apply.html b/aloha/template/allotter/apply.html index 3f820be..39d1411 100644 --- a/aloha/template/allotter/apply.html +++ b/aloha/template/allotter/apply.html @@ -4,19 +4,9 @@ {% block title %} JAM 2012 Application form {% endblock %} {% block scripts %} -<script> -$(document).ready(function(){ - if(($.browser.msie) && ($.browser.version <=8)){ - window.location="/browser-version" - } - if(($.browser.mozilla) && (parseInt($.browser.version) <=5)){ - window.location="/browser-version" - } - if(($.browser.webkit) && (parseInt($.browser.version <=530))){ - window.location="/browser-version" - } -}); -</script> +<link href="{{ STATIC_URL }}css/style.css" rel="stylesheet"> +<script src="{{ STATIC_URL }}js/browser-check.js" type="text/javascript"></script> + <script> jQuery.fn.reset = function () { $(this).each (function() { this.reset(); }); diff --git a/aloha/template/allotter/login.html b/aloha/template/allotter/login.html index ca8dc57..1e0fa49 100644 --- a/aloha/template/allotter/login.html +++ b/aloha/template/allotter/login.html @@ -3,19 +3,9 @@ {% block title %}Login{% endblock title %} {% block scripts %} -<script> -$(document).ready(function(){ - if(($.browser.msie) && ($.browser.version <=8)){ - window.location="/browser-version" - } - if(($.browser.mozilla) && (parseInt($.browser.version) <=5)){ - window.location="/browser-version" - } - if(($.browser.webkit) && (parseInt($.browser.version <=530))){ - window.location="/browser-version" - } -}); -</script> +<link href="{{ STATIC_URL }}css/style.css" rel="stylesheet"> +<script src="{{ STATIC_URL }}js/browser-check.js" type="text/javascript"></script> + {% endblock scripts %} {% block content %} <h2> Welcome to the JAM 2012 Admission website</h2> diff --git a/aloha/template/base.html b/aloha/template/base.html index 0ea92ed..4e3431f 100644 --- a/aloha/template/base.html +++ b/aloha/template/base.html @@ -21,6 +21,18 @@ <link href="{{ STATIC_URL }}css/bootstrap-responsive.css" rel="stylesheet"> <link href="{{ STATIC_URL }}css/style.css" rel="stylesheet"> <script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" type="text/javascript"></script> + <script type="text/javascript"> + + var _gaq = _gaq || []; + _gaq.push(['_setAccount', 'UA-30557017-1']); + _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> {% block scripts %}{% endblock %} <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements --> @@ -69,7 +81,7 @@ <li class="nav-header">Notices</li> <li><hr></li> <li><span class="label label-important pull-right">Important</span></li> - <li>Supported Browsers : <br />Google chrome >= 12, FF >= 5, IE >= 9</li> + <li>Supported Browsers : <br />Google chrome >= 12<br /> Mozilla Firefox >= 5<br /> Microsoft Internet Explorer >= 9 <br />Opera >=11.0</li> <li><hr></li> <li><span class="label label-info pull-right">Info</span></li> <li>JAM 2012 allotment online form filling starts from : 12-4-2012.</li> @@ -83,6 +95,10 @@ <li><span class="label label-important pull-right">Important</span></li> <li>You would be automatically logged out after 15 mins of inactivity.</li> <li><hr></li> + <li><span class="label label-info pull-right">Info</span></li> + <li>This webstie can also be accesed from Andriod and iPhone browsers.</li> + <li><hr></li> + </ul> </ul> </div><!--/.well --> {% block sidebar %}{% endblock %} |