diff --git a/expo/views_caves.py b/expo/views_caves.py index 02994b6..1e11602 100644 --- a/expo/views_caves.py +++ b/expo/views_caves.py @@ -77,12 +77,12 @@ def caveSearch(request): def surveyindex(request): surveys=Survey.objects.all() - expeditions=Expedition.objects.all() + expeditions=Expedition.objects.order_by("-year") return render_response(request,'survey.html',locals()) def survey(request,year,wallet_number): surveys=Survey.objects.all() - expeditions=Expedition.objects.all() + expeditions=Expedition.objects.order_by("-year") current_expedition=Expedition.objects.filter(year=year)[0] if wallet_number!='': diff --git a/media/css/main3.css b/media/css/main3.css index 467de9d..4dbac32 100644 --- a/media/css/main3.css +++ b/media/css/main3.css @@ -16,7 +16,7 @@ table, caption, tbody, tfoot, thead, tr, th, td } html, body { - height: 100% + height: 100%; } @@ -207,10 +207,6 @@ td { } -#nav { - -} - .redtext{ color:#F00; } @@ -292,7 +288,9 @@ div#content { margin-top: 50px; margin-left: 120px; margin-right: 120px; - padding: 5em; + padding-top: 10px; + padding-left: 5em; + padding-right: 5em; background:#CCC; } @@ -361,6 +359,16 @@ h1 { left:auto; } +#surveyHover { + width:auto; + right:auto; + left:auto; +} + #col1 { width:60% +} + +#quicksearch { + margin-left:40px; } \ No newline at end of file diff --git a/media/css/nav.css b/media/css/nav.css index 4fc7b3d..1c97c51 100644 --- a/media/css/nav.css +++ b/media/css/nav.css @@ -1,9 +1,12 @@ div#nav { + position:fixed; width: 12em; - float: left; background: rgb(153, 153, 153); - padding: 15px 0; - height:100% + margin-top: 0px; + margin-left: 120px; + border-top: thin black solid; } - -div#content { margin-left:13em } \ No newline at end of file + +div#content { + padding-left:240px; +} \ No newline at end of file diff --git a/media/js/base.js b/media/js/base.js index 17a664e..0dc562b 100644 --- a/media/js/base.js +++ b/media/js/base.js @@ -1,46 +1,74 @@ - function showDiv(collapsed,expanded){ - document.getElementById(collapsed).style.display = 'none'; - document.getElementById(expanded).style.display = 'block'; - } - - function hideDiv(collapsed,expanded){ - document.getElementById(collapsed).style.display = 'block'; - document.getElementById(expanded).style.display = 'none'; - } +$(document).ready(function() { - function makeDivTransparent(div){ - document.getElementById(div).style.backgroundColor = 'transparent'; - } +$('.searchable li').quicksearch({ + position: 'before', + attached: 'ul.searchable', + labelText: '', + loaderText: '', + delay: 100 +}) + +$('table.searchable tr').quicksearch({ + position: 'before', + attached: 'table.searchable:first', +}); + +$(".toggleEyeCandy").click(function () { + $(".leftMargin,.rightMargin").toggle("fade"); + $(".toggleEyeCandy").toggle(); + }); + +$(".nav").css('opacity','7') +$(".footer").hide(); +$(".fadeIn").hide(); +setTimeout("$('.leftMargin.fadeIn').fadeIn(3000);",1000); +setTimeout("$('.rightMargin.fadeIn').fadeIn(3000);",2000); + + +/*$("#footerLinks").hover( + function() {$(".footer").fadeIn("slow")}, + function() {$(".footer").fadeOut("slow")} +);*/ + +function linkHover(hoverLink,image){ + +$(hoverLink).hover( + function() { + $(image).fadeIn("slow"); + $(hoverLink).css("background","gray"); + }, + function() { + $(image).fadeOut("slow"); + $(hoverLink).css("background","black"); + } +); -hex=0 // Initial color value. -leftPos=25 -year=1976 -currentDate= new Date() -currentYear = currentDate.getFullYear() -function fadeText(){ -if(hex<153) { //If color is not black yet - hex=hex+10; // increase color darkness - leftPos-=1; - document.getElementById("expoHeader").style.color="rgb("+0+","+hex+","+0+")"; -// document.getElementById("expoFinalDate").style.color="rgb("+0+","+hex+","+0+")"; - document.getElementById("expoHeader").style.left=leftPos; - setTimeout("fadeText()",50) - setTimeout("countUpYear()",1000) -} -else { - hex=0; - leftPos=25; -} +}; + +linkHover("#expoWebsiteLink","#richardBanner"); +linkHover("#cuccLink","#timeMachine"); +linkHover("#surveyBinderLink","#surveyHover"); +linkHover("#troggle","#timeMachine"); + + +}); + +function contentHeight(){ +setMaxHeight($(".rightMargin,#content,.leftMargin,#col2"),$("#content")); +}; + +function setMaxHeight(group, target) { + tallest = 0; + group.each(function() { + thisHeight = $(this).height(); + if(thisHeight > tallest) { + tallest = thisHeight; + } + }); + target.height(tallest); } -function countUpYear(){ - if (year" - setTimeout("countUpYear()",1000) - } -} \ No newline at end of file + diff --git a/media/js/jquery.quicksearch.js b/media/js/jquery.quicksearch.js new file mode 100644 index 0000000..fec6967 --- /dev/null +++ b/media/js/jquery.quicksearch.js @@ -0,0 +1,328 @@ +jQuery(function ($) { + $.fn.quicksearch = function (opt) { + + function is_empty(i) + { + return (i === null || i === undefined || i === false) ? true: false; + } + + function strip_html(input) + { + var regexp = new RegExp(/\<[^\<]+\>/g); + var output = input.replace(regexp, ""); + output = $.trim(output.toLowerCase().replace(/\n/, '').replace(/\s{2,}/, ' ')); + return output; + } + + function get_key() + { + var input = strip_html($('input[rel="' + options.randomElement + '"]').val()); + + if (input.indexOf(' ') === -1) + { + return input; + } + else + { + return input.split(" "); + } + } + + function test_key(k, value, type) + { + if (type === "string") + { + return test_key_string(k, value); + } + else + { + return test_key_arr(k, value); + } + } + + function test_key_string(k, value) + { + return (value.indexOf(k) > -1); + } + + function test_key_arr(k, value) + { + for (var i = 0; i < k.length; i++) { + var test = value.indexOf(k[i]); + if (test === -1) { + return false; + } + } + return true; + } + + function select_element(el) + { + if (options.hideElement === "grandparent") + { + return $(el).parent().parent(); + } + else if (options.hideElement === "parent") + { + return $(el).parent(); + } + else + { + return $(el); + } + } + + function stripe(el) + { + if (doStripe) + { + var i = 0; + select_element(el).filter(':visible').each(function () { + + for (var j = 0; j < stripeRowLength; j++) + { + if (i === j) + { + $(this).addClass(options.stripeRowClass[i]); + + } + else + { + $(this).removeClass(options.stripeRowClass[j]); + } + } + i = (i + 1) % stripeRowLength; + }); + } + } + + function fix_widths(el) + { + $(el).find('td').each(function () { + $(this).attr('width', parseInt($(this).css('width'))); + }); + } + + function loader(o) { + if (options.loaderId) + { + var l = $('input[rel="' + options.randomElement + '"]').parent().find('.loader'); + if (o === 'hide') + { + l.hide(); + } + else + { + l.show(); + } + } + } + + function place_form() { + var formPosition = options.position; + var formAttached = options.attached; + + if (formPosition === 'before') { + $(formAttached).before(make_form()); + } else if (formPosition === 'prepend') { + $(formAttached).prepend(make_form()); + } else if (formPosition === 'append') { + $(formAttached).append(make_form()); + } else { + $(formAttached).after(make_form()); + } + } + + function make_form_label() + { + if (!is_empty(options.labelText)) { + return ' '; + } + return ''; + } + + function make_form_input() + { + var val = (!is_empty(options.inputText)) ? options.inputText : "" + return ' '; + } + + function make_form_loader() + { + if (!is_empty(options.loaderImg)) { + return 'Loading'; + } else { + return '' + options.loaderText + ''; + } + } + + function make_form() + { + var f = (!options.isFieldset) ? 'form' : 'fieldset'; + return '<' + f + ' action="#" ' + 'id="'+ options.formId + '" ' + 'class="quicksearch">' + + make_form_label() + make_form_input() + make_form_loader() + + ''; + } + + function focus_on_load() + { + $('input[rel="' + options.randomElement + '"]').get(0).focus(); + } + + function toggle_text() { + $('input[rel="' + options.randomElement + '"]').focus(function () { + if ($(this).val() === options.inputText) { + $(this).val(''); + } + }); + $('input[rel="' + options.randomElement + '"]').blur(function () { + if ($(this).val() === "") { + $(this).val(options.inputText); + } + }); + } + + function get_cache(el) + { + return $(el).map(function(){ + return strip_html(this.innerHTML); + }); + } + + function init() + { + place_form(); + if (options.fixWidths) fix_widths(el); + if (options.focusOnLoad) focus_on_load(); + if (options.inputText != "" && options.inputText != null) toggle_text(); + + cache = get_cache(el); + + stripe(el); + loader('hide'); + } + + function qs() + { + clearTimeout(timeout); + timeout = setTimeout(function () { + + loader('show'); + + setTimeout(function () { + options.onBefore(); + + var k = get_key(); + var k_type = (typeof k); + var i = 0; + + k = options.filter(k); + + if (k != "") + { + if (typeof score[k] === "undefined") + { + score[k] = new Array(); + cache.each(function (i) { + if (test_key(k, cache[i], k_type)) + { + score[k][i] = true; + } + }); + } + + if (score[k].length === 0) + { + select_element(el).hide(); + } + else + { + $(el).each(function (i) { + if (score[k][i]) + { + select_element(this).show(); + } + else + { + select_element(this).hide(); + } + }); + + } + } + else + { + select_element(el).show(); + } + + stripe(el); + }, options.delay/2); + + setTimeout( function () { + loader('hide'); + }, options.delay/2); + + options.onAfter(); + + }, options.delay/2); + } + + var options = $.extend({ + position: 'prepend', + attached: 'body', + formId: 'quicksearch', + labelText: 'Quick Search', + labelClass: 'qs_label', + inputText: null, + inputClass: 'qs_input', + loaderId: 'loader', + loaderClass: 'loader', + loaderImg: null, + loaderText: 'Loading...', + stripeRowClass: null, + hideElement: null, + delay: 500, + focusOnLoad: false, + onBefore: function () { }, + onAfter: function () { }, + filter: function (i) { + return i; + }, + randomElement: 'qs' + Math.floor(Math.random() * 1000000), + isFieldset: false, + fixWidths: false + }, opt); + + var timeout; + var score = {}; + var stripeRowLength = (!is_empty(options.stripeRowClass)) ? options.stripeRowClass.length : 0; + var doStripe = (stripeRowLength > 0) ? true : false; + var el = this; + var cache; + var selector = $(this).selector; + + $.fn.extend({ + reset_cache: function () { + el = $(selector); + cache = get_cache(el); + } + }); + + init(); + + $('input[rel="' + options.randomElement + '"]').keydown(function (e) { + var keycode = e.keyCode; + if (!(keycode === 9 || keycode === 13 || keycode === 16 || keycode === 17 || keycode === 18 || keycode === 38 || keycode === 40 || keycode === 224)) + { + qs(); + } + }); + + $('form.quicksearch, fieldset.quicksearch').submit( function () { return false; }); + + return this; + }; +}); \ No newline at end of file diff --git a/media/surveyHover.gif b/media/surveyHover.gif new file mode 100644 index 0000000..3538728 Binary files /dev/null and b/media/surveyHover.gif differ diff --git a/registration/views.py b/registration/views.py index aac17c5..2d4373a 100644 --- a/registration/views.py +++ b/registration/views.py @@ -2,13 +2,16 @@ Views which allow users to create and activate accounts. """ - +from django.contrib.auth import login +from django.contrib.auth import authenticate from django.conf import settings from django.core.urlresolvers import reverse from django.http import HttpResponseRedirect from django.shortcuts import render_to_response from django.template import RequestContext +from django.contrib.auth import login + from registration.forms import RegistrationForm from registration.models import RegistrationProfile @@ -60,8 +63,14 @@ def activate(request, activation_key, registration/activate.html or ``template_name`` keyword argument. """ + + activation_key = activation_key.lower() # Normalize before trying anything with it. account = RegistrationProfile.objects.activate_user(activation_key) + try: + print account + except: + pass if extra_context is None: extra_context = {} context = RequestContext(request) @@ -139,6 +148,7 @@ def register(request, success_url=None, # a default value using reverse() will cause circular-import # problems with the default URLConf for this application, which # imports this file. + return HttpResponseRedirect(success_url or reverse('registration_complete')) else: form = form_class() diff --git a/templates/base.html b/templates/base.html index eb478c5..c44212f 100644 --- a/templates/base.html +++ b/templates/base.html @@ -3,64 +3,10 @@ -{% block title %}THE TITLE{% endblock %} +{% block title %}Troggle{% endblock %} + + - - - - {% block head %}{% endblock %} @@ -71,8 +17,11 @@ $('#q').liveUpdate('posts').focus();

CUCC Expeditions to Austria: 1976 - 2009

@@ -35,6 +34,9 @@ Everyone is gearing up for the 2009 expedition; please see the link below for th Troggle is still under development, and there is much work to do.

+{% endblock content %} + +{% block margins %} -{% endblock content %} \ No newline at end of file +{% endblock margins %} \ No newline at end of file diff --git a/templates/personindex.html b/templates/personindex.html index e684ad8..ea97f43 100644 --- a/templates/personindex.html +++ b/templates/personindex.html @@ -6,7 +6,7 @@ {% block content %}

Notable expoers

- +
{% for person in notablepersons %} @@ -20,10 +20,11 @@

All expoers

-
PersonFirstLastNotability
+
{% for persons in personss %}
+ {% for person in persons %} diff --git a/templates/registration/activate.html b/templates/registration/activate.html index eb8ec61..ca50e6c 100644 --- a/templates/registration/activate.html +++ b/templates/registration/activate.html @@ -10,11 +10,16 @@ New troggle account registered {% block content %} +{% if account %}

-Hello, {{user}}! Your account is now activated. You've also been logged in automatically for your convenience. Use the links in the upper right to control this in the future. +Hello, {{ account }}! Your account is now activated. Now you can log in with the password you chose. Use the links in the upper right to control this in the future.

If you have been on the expedition in the past, you already have a profile in the system; click here to find it and link it to your account. Otherwise, please create yourself a new profile.

+{% endif %} + +The activation key you entered has already been used or was invalid. + {% endblock %} \ No newline at end of file diff --git a/templates/registration/activation_email.txt b/templates/registration/activation_email.txt index 163e313..20aad5f 100644 --- a/templates/registration/activation_email.txt +++ b/templates/registration/activation_email.txt @@ -1,10 +1,10 @@ -Hello, +Hello {{ form.user }}, Glad you're joining the CUCC EXPO team! Please go to {{ site }}{% url registration_activate activation_key %} -to activate your account. Do this within {{ expiration_days }}, or else you'll have to sign up again. +to activate your account. Do this within {{ expiration_days }} days, or else you'll have to sign up again. Yours, The magical troggle \ No newline at end of file diff --git a/templates/registration/registration_complete.html b/templates/registration/registration_complete.html index 552fa04..78684fe 100644 --- a/templates/registration/registration_complete.html +++ b/templates/registration/registration_complete.html @@ -1,13 +1,13 @@ {% extends "base.html" %} {% block title %} -registration_complete.html | {{ block.super }} +{{ block.super }}: registration complete {% endblock %} -{% block header %} -

registration_complete.html

+{% block contentheader %} +

Registration Complete

{% endblock %} {% block content %} -Thank you for signing up. An email with the activation code has been sent to your inbox. +

Thank you for signing up. An email with the activation code has been sent to your inbox.

{% endblock %} \ No newline at end of file diff --git a/templates/survey.html b/templates/survey.html index 6fce15f..fcdf65e 100644 --- a/templates/survey.html +++ b/templates/survey.html @@ -75,7 +75,6 @@ {% block nav %} - - {% endblock %} {% block content %}
PersonFirstLast