Skip to content

Commit

Permalink
auth and messaging are back also other things
Browse files Browse the repository at this point in the history
  • Loading branch information
@potch
potch committed Sep 21, 2010
1 parent 5d73f49 commit 1e106e3
Show file tree
Hide file tree
Showing 5 changed files with 94 additions and 55 deletions.
2 changes: 1 addition & 1 deletion apps/core/context_processors.py
View file
Expand Up @@ -6,7 +6,7 @@ def nav(request):
('Competition Home', 'home'),
('How It Works', 'how'),
('Rules', 'rules'),
('Judges', 'judges'),
('Judging', 'judges'),
('Prizes', 'prizes'),
('Resources', 'resources'),
],
Expand Down
30 changes: 4 additions & 26 deletions apps/static/templates/static/how.html
View file
@@ -1,32 +1,10 @@
{% extends "base.html" %}

{% block content %}
<img class="sub-header-right" src="images/sword.png">
<img class="sub-footer-right" src="images/raygun.png">

<div class="subTitle">How It Works</div>

<div class="subCopy">

<h1>Sep 11-18:</h1>
<p>The competition is open! Submit your art as a Persona design here. How do you create a Persona design? <a href="http://www.getpersonas.com/demo_create">Follow this easy-to-use tutorial</a>.

<h1>Sep 22 - Oct 6:</h1>
<p>Community voting period! The 10 Persona designs with the most active daily
users (ADUs) at the end of the competition advance to the finals.
{% block class %}copy{% endblock %}

<p>What is an active daily user (ADU)? An active daily user is a person that
selects and keeps your Persona design in their browser. Once a day, we count
the number of people that have selected and kept your design in their browser
for more than 24 hours.

<p>Invite your friends, family, and fans to download your Persona!

<h1>Oct 12-16:</h1>
<p><a href="judges.html">Celebrity judges</a> review the top 10 Personas.
{% block content %}

<h1>Oct 21:</h1>
<p>Top 3 Winners are announced and awarded prizes.
</div>
<h1>How It Works</h1>


{% endblock %}
4 changes: 2 additions & 2 deletions apps/static/templates/static/rules.html
View file
Expand Up @@ -15,8 +15,8 @@ <h2 id="technology">Technology</h2>
</p>

<h2 id="timing">Timing</h2>
<h3>Start 9/29/10 (September 29th, 2010)</h3>
<h3>Finish 1/11/11 (January 11th, 2011)</h3>
<h3>submission period starts September 29th, 2010</h3>
<h3>submissions close January 11th, 2011</h3>

<p>
This gives you a little over 3 months and an entire holiday season to develop
Expand Down
96 changes: 70 additions & 26 deletions media/css/screen.css
View file
Expand Up @@ -6,12 +6,12 @@ html {
}

body {
font-family: 'Lucida Grande', 'Lucida Sans Unicode', Lucida, Arial, Helvetica, sans-serif;
font-family: Verdana, sans-serif;
background: #9aa451 url('/media/img/tile.png') repeat top center; /* for non-css3 browsers */
background: -moz-linear-gradient(left, rgba(31,25,2,0.5) 0%, rgba(0,0,0,0) 40%, rgba(0,0,0,0) 60%, rgba(31,25,2,0.5) 100%), url('/media/img/paper.png') no-repeat top left, url('/media/img/paper2.png') no-repeat top right, url('/media/img/tile.png') repeat top center;
padding: 0px;
font-size:12px;
line-height: 18px;
line-height: 1.6em;
margin: 0 auto;

}
Expand Down Expand Up @@ -45,6 +45,9 @@ a:hover {color: #fdeb6a; text-decoration: underline;}

h1, h2, h3 {font-family: 'OrbitronMed', Verdana, sans-serif; text-transform: uppercase; letter-spacing: 1px;}

.copy h1, .copy h2, .copy h3 {
text-shadow: 0 1px 2px rgba(0,0,0,.5);
}
.copy h1 {
font-size: 4em;
margin-top: 1em;
Expand Down Expand Up @@ -86,7 +89,6 @@ h2:target:after {
position: relative;
overflow: visible;
background:transparent url('/media/img/lines.png') no-repeat 0px 0px;
top: -60px;
width: 900px;
height: 600px;
}
Expand Down Expand Up @@ -138,30 +140,43 @@ body.landing #home-header{
right: 95px;
}

body.copy #page {
background: url('/media/img/mountains.png') no-repeat 100px 20px;
-moz-border-radius-bottomleft: 2em;
-moz-border-radius-bottomright: 2em;
background-color: rgba(0,0,0,0.1);
}


#page {
position: relative;
color: #fff;
background: url('/media/img/mountains.png') no-repeat 100px 20px, -moz-radial-gradient(50% 50%, rgba(203,210,96,0.6) 10%, rgba(203,210,96,0.4) 30%, rgba(203,210,96,0) 60%, rgba(203,210,96,0) 100%);
background:
url('/media/img/mountains.png') no-repeat 100px 20px,
-moz-radial-gradient(50% 50%,
rgba(203,210,96,0.6) 10%,
rgba(203,210,96,0.4) 30%,
rgba(203,210,96,0) 60%,
rgba(203,210,96,0) 100%);
background:
url('/media/img/mountains.png') no-repeat 100px 20px,
-webkit-gradient(radial, 50% 50%, 0, 50% 50%, 450,
from(rgba(203,210,96,0.6)),
to(rgba(203,210,96,0)),
color-stop(30%, rgba(203,210,96,0.4)),
color-stop(60%, rgba(203,210,96,0)));
margin: 0px auto;
overflow: visible;
max-width: 900px;
font-size: 12px;
text-align: left;
padding: 20px 40px;
-moz-border-radius-bottomleft: 2em;
-moz-border-radius-bottomright: 2em;
background-color: rgba(0,0,0,0.1);
-moz-border-radius: 0 0 2em 2em;
-webkit-border-radius: 0 0 2em 2em;
background-color: rgba(0,0,0,0.2);
width: 900px;
margin-bottom: 20px;
}

body.copy #page {
background: url('/media/img/mountains.png') no-repeat 100px 20px;
background-color: rgba(0,0,0,0.2);
}

.message {
position: absolute;
top: 100px;
Expand Down Expand Up @@ -191,8 +206,7 @@ footer {
/* ----------------------------------------- */

header {
font-family: 'Matiz';
text-transform: uppercase;
font-family: 'Matiz', Verdana, sans-serif;
z-index: 2;
max-width: 900px;
padding: 0;
Expand All @@ -205,19 +219,28 @@ header {
float: left;
}

nav {
#auth {
color: #FDEB6A;
font-family: Verdana, sans-serif;
margin: 1em 8px 0 0;
clear: right;
float: right;
display: inline-block;
margin-top: 20px;
text-shadow: 0 1px 1px rgba(0,0,0,.5);
}

nav ul {
list-style-type: none;
display: inline-block;
#auth a {
margin: 0 8px;
}
#auth a:hover {
color: white;
text-decoration: underline;
}

nav ul li {
display: inline;
nav {
text-transform: uppercase;
float: right;
display: inline-block;
margin-top: 20px;
}

nav .selected {
Expand All @@ -230,19 +253,40 @@ nav .selected {
inset rgba(255, 255, 255, 0.2) 0 1px 0px,
inset rgba(255, 255, 255, 0.2) 0 -3px 4px,
inset rgba(255, 255, 255, 0.2) 0 20px 6px;
-webkit-box-shadow:
inset rgba(108, 15, 0, 0.4) 0 -2px 0px,
inset rgba(255, 255, 255, 0.2) 0 1px 0px,
inset rgba(255, 255, 255, 0.2) 0 -3px 4px,
inset rgba(255, 255, 255, 0.2) 0 20px 6px;
background-color: rgba(230, 32, 0, 0.8);
padding: 6px 8px 4px 8px;
margin-right: 8px;
text-shadow: 0 1px 1px rgba(0,0,0,.5);
}

nav a {color: rgba(255, 255, 255, 0.6); text-decoration: none; padding: 4px 8px; margin-right: 8px;}
nav a {
color: rgba(255, 255, 255, 0.6);
text-decoration: none;
padding: 4px 8px;
margin-right: 8px;
text-shadow: 0 1px 1px rgba(0,0,0,.5);
}
nav a:hover {

color: rgba(255, 255, 255, 1);
text-decoration: none;
-moz-border-radius: 0.5em;
-webkit-border-radius: 0.5em;
-moz-box-shadow:
-moz-box-shadow:
inset rgba(108, 15, 0, 0.4) 0 -2px 0px,
inset rgba(255, 255, 255, 0.2) 0 1px 0px,
inset rgba(255, 255, 255, 0.2) 0 -3px 4px,
inset rgba(255, 255, 255, 0.2) 0 20px 6px;
-webkit-box-shadow:
inset rgba(108, 15, 0, 0.4) 0 -2px 0px,
inset rgba(255, 255, 255, 0.2) 0 1px 0px,
inset rgba(255, 255, 255, 0.2) 0 -3px 4px,
inset rgba(255, 255, 255, 0.2) 0 20px 6px;
box-shadow:
inset rgba(108, 15, 0, 0.4) 0 -2px 0px,
inset rgba(255, 255, 255, 0.2) 0 1px 0px,
inset rgba(255, 255, 255, 0.2) 0 -3px 4px,
Expand Down
17 changes: 17 additions & 0 deletions templates/base.html
View file
Expand Up @@ -14,8 +14,25 @@
<img src="{{ MEDIA_URL }}img/logo.png" border="0">
</a>
{% navigation %}
<section id="auth">
{% if user.is_authenticated %}
signed in as {{ user.username }}
<a href="{% url auth_logout %}">logout</a>
{% else %}
<a class="login" href="{% url auth_login %}">login</a>
or
<a class="join" href="{% url registration_register %}">register</a>
{% endif %}
</section>
</header>

{% if messages %}
<ul class="messages">
{% for message in messages %}
<li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
{% endfor %}
</ul>
{% endif %}
<div id="content">
{% block content %}

Expand Down

0 comments on commit 1e106e3

Please sign in to comment.