A bunch of stuff that was never committed. Committing now so we can p…

…ut this on github.
derekzhang79 · Apr 29, 2012 · dd38647 · dd38647
1 parent 5ea52d5
commit dd38647
Show file tree

Hide file tree

Showing 9 changed files with 203 additions and 61 deletions.
diff --git a/prod_site.wsgi b/prod_site.wsgi
@@ -0,0 +1,9 @@
+#!/usr/bin/env python
+import os
+import sys
+sys.path.append('/srv/w8upd.org/')
+sys.path.append('/srv/w8upd.org/w8upd/')
+os.environ['DJANGO_SETTINGS_MODULE'] = 'w8upd.settings'
+
+import django.core.handlers.wsgi
+application = django.core.handlers.wsgi.WSGIHandler()
diff --git a/w8upd/media/css/master.css b/w8upd/media/css/master.css
@@ -1,6 +1,7 @@
+/* Global to everything, used throughout. */
 html, body {
     margin: 0 auto;
-    font-family: helvetica, sans-serif;
+    font-family: Helvetica, sans-serif;
     background-color: #F2F2F2;
     text-align: center;
 }
@@ -10,68 +11,127 @@ html, body {
 .alignright {
     float: right;
 }
+#maxwidth {
+    width: 930px !important;
+    margin: 0 auto;
+}
+
+/* Header */
 #namebar {
+    /* The bar that has the big ol' "W8UPD" stuff. */
     background-color: #222222;
-    height: 25px;
+    height: 60px;
     padding: 10px;
     padding-left: 20px;
     padding-right: 20px;
+    text-align: left;
 }
-#namebarcontainer {
-    width: 940px;
-    margin: 0 auto;
+
+/* Left side, club name/callsign */
+#namebar #headerleft {
+    float: left;
 }
-.clubname {
+#namebar #headerleft .clubname {
     font-size: 1.2em;
     color: #AAAAAA;
     text-align: left;
 }
-.callsign {
-    font-size: 1.2em;
+#namebar #headerleft .clubcall {
+    font-size: 2em;
     font-weight: bold;
     color: #0099CC;
     text-align: left;
 }
+
+/* Right side, login/prof info */
+#namebar #headerright {
+    float: right;
+}
+#namebar #headerright input.field {
+    background-color: #FFFFFF;
+    border: 1px solid #AAAAAA:
+}
+#namebar #headerright input.submit {
+    border: 2px solid #BBBBBB;
+    background-color: #BBBBBB;
+}
+#namebar #headerright input.submit:hover {
+    border: 2px solid #0099CC;
+}
+#namebar #headerright input.submit:active {
+    background-color: #999999;
+}
+#namebar #headerright label {
+    /* Used in the login form, for unauth'd visitors */
+    color: #AAAAAA;
+    font-size: 0.8em;
+}
+img.profileimg {
+    /* Global because this is used in the directory listing, too. */
+    float: left;
+    height: 100%;
+    width: 80px; /* TODO */
+    padding-right: 10px;
+}
+#namebar #headerright a.headerlink {
+    font-size: 0.8em;
+    color: #AAAAAA;
+    font-style: italic;
+}
+
+/* Linkbar; which will eventually be dynamic */
 #linkbar {
+    /* The...bar with the links. ;) */
     background-color: #444444;
-    height: 25px;
-    padding: 10px;
-    padding-left: 22px;
-    padding-right: 20px;
-}
-#linkbarcontainer {
-    width: 950px;
-    margin: 0px auto;
-    height: 25px;
+    height: 35px;
 }
 #linkbarlist {
     padding: 0;
-    margin-top: 3px;
+    margin: 0;
     float: left;
+    line-height: 35px;
 }
-#linkbarlist li {
-    display: inline;
+#linkbarlistright {
+    padding: 0;
+    margin: 0;
+    float: right;
+    line-height: 35px;
+}
+#linkbarlist li, #linkbarlistright li {
+    float: left;
     list-style-type: none;
-    margin-right: 15px;
 }
-#linkbarlist li a {
+#linkbarlist li a, #linkbarlistright li a {
+    display: block;
     text-decoration: none;
     color: #999999;
+    padding-left: 7px;
+    padding-right: 7px;
+    font-size: 0.8em;
 }
-#linkbarlist li a:hover {
-    color: #EEEEEE;
+#linkbarlist li a:hover, #linkbarlistright li a:hover {
+    background-color: #555;
 }
+
+/* Site Body */
 #content {
     margin: 10px auto;
     width: 930px;
-    padding: 10px;
     background-color: #F8F8F8;
     border: 1px solid #CCCCCC;
     text-align: left;
+/*
+    padding-left: 10px;
+    padding-right: 10px;
+*/
 }
 #content #page p {
     margin-left: 30px;
 }
+#content #page {
+    padding-left: 10px;
+    padding-right: 10px;
+}
 #triportal {
     margin: 15px auto;
     padding: 5px;
@@ -98,8 +158,10 @@ html, body {
     float: left;
     width: 290px;
 }
+
+/* Footer */
 #footer {
-    width: 950px;
+    width: 930px;
     margin: 0 auto;
     padding-bottom: 10px;
     font-size: 13px;

diff --git a/w8upd/media/css/profile.css b/w8upd/media/css/profile.css
@@ -2,16 +2,30 @@
 }
 
 #quickview .profpic {
-    width: 80px;
-    height: 80px;
+    width: 100%;
 }
 
-#quickview #userpicture {
+#quickview #leftcol {
     float: left;
+    width: 170px;
 }
 
 #quickview #userinfo {
     display: block;
     float: left;
     margin-left: 10px;
 }
+
+/* Used in editing a profile; should be moved to separate css file */
+table#profileeditform {
+    text-align: left;
+}
+
+table#profileeditform td {
+    padding: 10px 0 10px 0;
+}
+
+.member {
+    height: 150px;
+    border-bottom: 2px solid black;
+}
diff --git a/w8upd/media/rotatepics/pic4.jpg b/w8upd/media/rotatepics/pic4.jpg
diff --git a/w8upd/templates/index.html b/w8upd/templates/index.html
@@ -2,17 +2,19 @@
 {% block content %}
             <div id="slider">
                 <ul id="sliderContent">
+                <li class="sliderImage">
+                    <img src="/media/rotatepics/pic4.jpg" alt="1" />
+                    <span class="top"><strong>W8UPD Group Photo, April 2012</strong></span>
+                </li>
                 <li class="sliderImage">
                     <img src="/media/rotatepics/pic1.jpg" alt="1" />
-
                     <span class="top"><strong>Towers on the hills to Cleveland</strong></span>
                 </li>
                 <li class="sliderImage">
                     <img src="/media/rotatepics/pic2.jpg" alt="2" />
                     <span class="top"><strong>Sunset at Zook</strong></span>
                 </li>
                 <li class="sliderImage">
-
                     <img src="/media/rotatepics/pic3.jpg" alt="3" />
                     <span class="bottom"><strong>The Union, Soccer field, and Football Stadium to Zooks south at night</strong></span>
                 </li>
@@ -21,28 +23,28 @@
             </div> 
             <div id="triportal">
                 <div id="leftportal">
+                    <div class="title">Upcoming Events</div>
+		    <p><h3>October:</h3></p>
+		    <li><i>10 Mon - W8UPD Meeting Zook 501 7pm</i></li>
+		    <li>17-22 Mon-Sat - ARRL School Club Roundup</li>
+		    <li><i>17 Mon - W8UPD Meeting Zook 501 7pm</i><li>
+		    <li>21-22 Fri-Sat - Orionids Meteor Shower, 20 ZHR</li>
+		    <li><i>24 Mon - W8UPD Meeting Zook 501 7pm</i></li>
+		    <li>29-30 Sat-Sun - CQ World Wide DX Contest, SSB</li>
+	    	    </p>
+               </div>
+                <div id="middleportal">
+                    <div class="title">Club News</div>
+	    <p>Club Elections Have now taken place new officers include:<br><br>President: Jimmy Carter<br>Vice President: Ricky Elrod<br>Secretary/Treasurer: Andrew Hewko<br>System Admin: Chris Egeland <br><br></p>
+		</div>
+                <div id="rightportal">
                     <div class="title">Recent Contacts</div>
                     <ul>
                         {% for contact in contacts %}
                         <li>{{ contact.callsign }}</li>
                         {% endfor %}
                     </ul>                    
-                </div>
-                <div id="middleportal">
-                    <div class="title">Club News</div>
-                    <p>This site now live.</p>
-                </div>
-                <div id="rightportal">
-                    <div class="title">Upcoming Events</div>
-                    <p>April</p>
-                    <p>- 11 Mon - Meeting</p>
-                    <p>- 15 Fri - Meeting</p>
-                    <p>- 18 Mon - Meeting</p>
-                    <p>- 22 Fri - Meeting</p>
-                    <p>- 24 Sun - Easter</p>
-                    <p>- 25 Mon - Meeting</p>
-                    <p>- 29 Fri - Meeting</p>
-                </div>
+               </div>
                 <div style="clear: both;"></div>
             </div>
         </div>

diff --git a/w8upd/templates/main.html b/w8upd/templates/main.html
@@ -32,31 +32,68 @@
 <body>
     <div id="global">
         <div id="namebar">
-            <div id="namebarcontainer">
-                <span class="alignleft clubname">The University of Akron Amateur Radio Club</span>
-                <span class="alignright callsign">W8UPD</span>
+            <div id="maxwidth">
+                <div id="headerleft">
+                    <div class="clubcall">W8UPD</div>
+                    <div class="clubname">University of Akron Amateur Radio Club</div>
+                </div>
+                <div id="headerright">
+                    {% if user.is_authenticated %}
+                    <img class="profileimg" src="{{ user.get_profile.picture_url }}" alt="{{ user.get_full_name }}'s profile picture" />
+                    <span style="color: #AAAAAA; float:left">Hello, {{ user.username }}!</span><br />
+                    {% else %}
+                    <form action="/login/" method="post">{% csrf_token %}
+                        <table>
+                            <tr>
+                                <td><label for="username">Callsign</label></td>
+                                <td><label for="password">Password</label></td>
+                            </tr>
+                            <tr>
+                                <input type="hidden" name="next" value="/profile/" />
+                                <td><input class="field" type="text" name="username" /></td>
+                                <td><input class="field" type="password" name="password" /></td>
+                                <td><input class="submit" type="submit" value="Login" /></td>
+                            </tr>
+                        </table>
+                    </form>
+                    {% endif %}
+                </div>
             </div>
         </div>
         <div id="linkbar">
-            <div id="linkbarcontainer">
+            <div id="maxwidth">
                 <ul id="linkbarlist">
                     <li><a href="/">Home</a></li>
                     <li><a href="/club-info/">Club</a></li>
                     <li><a href="/repeater/">Repeater</a></li>
                     <li><a href="/calendar/">Calendar</a></li>
-                    {#<li><a href="http://old.w8upd.org/">Old Site</a></li>#}
+		    <li><a href="/projects/">Projects</a></li>
+		    <li><a href="/net/">Nets</a></li>
+		    <li><a href="/links/">Links</a></li>
+		    <li><a href="/irc/">IRC Chat</a>
+		    <li><a href="/newsletters/">News Letters</a></li>
+		    <li><a href="http://group.w8upd.org/">Email List</a></li>
+                    <li><a href="http://oldsite.w8upd.org/">Old Site</a></li>
                     {# <li><a href="/logbook/">Log Book</a></li> #}
                     {% if user.is_authenticated %}
-                    <li><a href="/documentation/">Documentation</a></li>
-                    <li><a href="/logout">Log Out</a></li>
+                    {% if user.is_staff %}
+                        {# Only those who can edit will care about this. #}
+                        <li><a href="/documentation/">Documentation</a></li>
+                    {% endif %}
                     {% else %}
-                    <li><a href="/profile/">Member Login</a></li>
                     {% endif %}
                 </ul>
+                {% if user.is_authenticated %}
+                <ul id="linkbarlistright">
+                    <li><a href="/profile/">Profile</a></li>
+                    <li><a href="/logout/">Log Out</a></li>
+                </ul>
+                {% endif %}
             </div>
         </div>
         {% block beforecontent %}{% endblock %}
         <div id="content">
+            {% block pagetitle %}{% endblock %}
             {% block content %}{% endblock %}
             <div style="clear: both"></div>
         </div>

diff --git a/w8upd/templates/profiles/edit.html b/w8upd/templates/profiles/edit.html
@@ -1,8 +1,20 @@
 {% extends "main.html" %}
+
+{% block appendheader %}
+<link rel="stylesheet" href="/media/css/profile.css" type="text/css" />
+{% endblock %}
+
+{% block pagetitle %}
+    <b>{{ request.user.get_full_name }}</b> :: Edit Profile
+{% endblock %}
+
 {% block content %}
-    <h3>Edit Your Profile</h3>
     <form action='' method='post'>{% csrf_token %}
-    {{ profileform.as_p }}
-    <input type='submit' value='Save Profile'>
+        <table id="profileeditform">
+            {{ profileform.as_table }}
+            <tr>
+                <td><input type='submit' value='Save Profile'></td>
+            </tr>
+        </table>
     </form>
 {% endblock %}