expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2026-03-30 08:29:51 +01:00
Code Issues 18 Projects 3 Activity

[svn] Improve registration system.

Browse Source 
Add jquery fade effects and quick search.
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8334 by cucc @ 5/10/2009 5:23 AM
This commit is contained in:
substantialnoninfringinguser
2009-05-13 06:22:07 +01:00
parent 9972e28a91
commit 1b06243dab
16 changed files with 466 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
templates/base.html
View File

@@ -3,64 +3,10 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/main3.css" />
<title>{% block title %}THE TITLE{% endblock %}</title>
<title>{% block title %}Troggle{% endblock %}</title>
<script src="{{ settings.MEDIA_URL }}js/jquery.js" type="text/javascript"></script>
<script src="{{ settings.MEDIA_URL }}js/jquery.quicksearch.js" type="text/javascript"></script>
<script src="{{ settings.MEDIA_URL }}js/base.js" type="text/javascript"></script>
<script src="http://code.jquery.com/jquery-latest.js" type="text/javascript"></script>
<script src="http://ejohn.org/apps/livesearch/jquery.livesearch.js" type="text/javascript"></script>
<script type="text/javascript">
$(document).ready(function() {
$(".toggleEyeCandy").click(function () {
$(".leftMargin,.rightMargin").toggle("fade");
$(".toggleEyeCandy").toggle();
});
$(".nav").css('opacity','7')
$(".eyeCandy").hide();
setTimeout("$('.leftMargin').fadeIn(3000);",2000);
setTimeout("$('.rightMargin').fadeIn(3000);",4000);
/*$("#footerLinks").hover(
function() {$(".footer").fadeIn("slow")},
function() {$(".footer").fadeOut("slow")}
);*/
$("#expoWebsiteLink").hover(
function() {$("#richardBanner").fadeIn("slow")},
function() {$("#richardBanner").fadeOut("slow")}
);
$("#cuccLink").hover(
function() {
$("#timeMachine").fadeIn("slow");
$(".rightMargin,.leftMargin").fadeTo("30","fast");
},
function() {$("#timeMachine").fadeOut("slow")}
);
});
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);
}
$('#q').liveUpdate('posts').focus();
</script>
{% block head %}{% endblock %}
@@ -71,8 +17,11 @@ $('#q').liveUpdate('posts').focus();
<h1>CUCC Expeditions to Austria: 1976 - 2009</h1>
<div id="editLinks"> {% block loginInfo %}
{% if user.username %}
You are logged in as {{ user.username }} {% if user.person %}(<a href="{{ user.person.get_absolute_url }}">{{ user.person }}</a>){% endif %}.
| <a href="{{ settings.URL_ROOT }}/accounts/logout/">Log out</a> {% else %} <a href="{{ settings.URL_ROOT }}/accounts/register">Sign up</a> | <a href="{{ settings.URL_ROOT }}/accounts/login/">Log in</a> {% endif %}
You are logged in as {{ user.username }}
{% if user.person %}(<a href="{{ user.person.get_absolute_url }}">{{ user.person }}</a>)
{% else %} <a href="{% url profiles_create_profile %}">sort your profile</a>
{% endif %}.
| <a href="{% url auth_logout %}">Log out</a> {% else %} <a href="{% url registration_register %}">Sign up</a> | <a href="{% url auth_login %}">Log in</a> {% endif %}
{% endblock%}
| <a href="{{ settings.URL_ROOT }}">Home</a> | <a class="toggleEyeCandy">Kill Eyecandy</a><a class="toggleEyeCandy" style="display: none;">Show Eyecandy</a>
{% block editLink %}
@@ -101,9 +50,11 @@ $('#q').liveUpdate('posts').focus();
<img id="richardBanner" class="footer eyeCandy" src="{{ settings.MEDIA_URL }}expoBanner.gif"/>
<img id="timeMachine" class="footer eyeCandy" src="{{ settings.MEDIA_URL }}timemachine.gif"/>
<img class="caversLink eyeCandy" src="{{ settings.MEDIA_URL }}expoBanner.gif"/>
<img id="surveyHover" class="footer eyeCandy" src="{{ settings.MEDIA_URL }}surveyHover.gif"/>
{% block margins %}
<img class="leftMargin eyeCandy" src="{{ settings.MEDIA_URL }}eieshole.jpg">
<img class="rightMargin eyeCandy" src="{{ settings.MEDIA_URL }}goesser.jpg">
{% endblock margins %}
<div id="footerLinks">
@@ -113,9 +64,9 @@ $('#q').liveUpdate('posts').focus();
<a href="{% url frontpage %}">Troggle front page</a> |
<a href="{% url caveindex %}">Caves</a> |
<a id="caversLink" href="{% url personindex %}">Cavers</a> |
<a href="{% url survey %}"> Survey binder</a> |
<a id="surveyBinderLink" href="{% url survey %}"> Survey binder</a> |
<a href="{% url stats %}"> Statistics</a> |
<a href="{% url calendar 2007 %}">Expedition calendar</a>
<a href="{% url calendar 2008 %}">Expedition calendar</a>
</div>
</body>

2
templates/cave.html
View File

@@ -68,7 +68,7 @@
{% if cave.get_QMs %}
<h2>Question marks</h2>
<h3>Extant</h3>
<ul>
<ul id="cavelist">
{% for QM in cave.get_QMs %}
{% if QM.ticked_off_by %}
{% else %}

8
templates/caveindex.html
View File

@@ -14,13 +14,7 @@
<h3>All caves</h3>
<form method="get">
<div>
<input type="text" value="" name="q" id="q" />
</div>
</form>
<ul id="posts">
<ul class="searchable">
{% for cave in caves %}
<li> <a href="{{ cave.get_absolute_url }}">{{cave.official_name|wiki_to_html_short}} ({{cave}})</a> </li>
{% endfor %}

6
templates/frontpage.html
View File

@@ -7,7 +7,6 @@
<div id="col2">
Recent edits
</ul>
</div>
<div id="col1">
@@ -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 <a href="{%url todo%}">much work to do</a>.
</p>
</div>
{% endblock content %}
{% block margins %}
<img class="leftMargin eyeCandy fadeIn" src="{{ settings.MEDIA_URL }}eieshole.jpg">
<img class="rightMargin eyeCandy fadeIn" src="{{ settings.MEDIA_URL }}goesser.jpg">
{% endblock content %}
{% endblock margins %}

5
templates/personindex.html
View File

@@ -6,7 +6,7 @@
{% block content %}
<h2>Notable expoers</h2>
<table>
<table class="searchable">
<tr><th>Person</th><th>First</th><th>Last</th><th>Notability</th></tr>
{% for person in notablepersons %}
<tr>
@@ -20,10 +20,11 @@
<h2>All expoers</h2>
<table>
<table class="searchable">
<tr>
{% for persons in personss %}
<td>
<table>
<tr><th>Person</th><th>First</th><th>Last</th></tr>
{% for person in persons %}

7
templates/registration/activate.html
View File

@@ -10,11 +10,16 @@ New troggle account registered
{% block content %}
{% if account %}
<p>
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 <a href="{%url auth_login%}">log in</a> with the password you chose. Use the links in the upper right to control this in the future.
</p>
<p>
If you have been on the expedition in the past, you already have a profile in the system; <a href={% url profiles_select_profile %}>click here </a> to find it and link it to your account. Otherwise, please <a href={% url profiles_create_profile %}> create yourself a new profile</a>.
</p>
{% endif %}
The activation key you entered has already been used or was invalid.
{% endblock %}

4
templates/registration/activation_email.txt
View File

@@ -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

8
templates/registration/registration_complete.html
View File

@@ -1,13 +1,13 @@
{% extends "base.html" %}
{% block title %}
registration_complete.html | {{ block.super }}
{{ block.super }}: registration complete
{% endblock %}
{% block header %}
<h1>registration_complete.html</h1>
{% block contentheader %}
<h1>Registration Complete</h1>
{% endblock %}
{% block content %}
Thank you for signing up. An email with the activation code has been sent to your inbox.
<p>Thank you for signing up. An email with the activation code has been sent to your inbox. </p>
{% endblock %}

2
templates/survey.html
View File

@@ -75,7 +75,6 @@
</div>
{% block nav %}
<div id="nav">
<br />
<h3>Choose a year</h3>
@@ -133,7 +132,6 @@
<div id="mainSketchIntegration" class="menuBarItem" onMouseOver="highlight(this)" onMouseOut="unhighlight(this)" onClick="toggle(this)">add to main sketch</div>
</div>
</div>
</div>
{% endblock %}
{% block content %}