move pages to new website style #45

Closed
wants to merge 7 commits into
from
View
@@ -185,6 +185,7 @@ def get(self, id):
logout_url = users.create_logout_url('/')
rooms = ROOM_OPTIONS
hours = [1,2,3,4,5,6,7,8,9,10,11,12]
+ page_title = event.name
self.response.out.write(template.render('templates/edit.html', locals()))
else:
self.response.out.write("Access denied")
@@ -286,6 +287,7 @@ def get(self, id):
event.details = db.Text(event.details.replace('\n','<br/>'))
show_all_nav = user
event.notes = db.Text(event.notes.replace('\n','<br/>'))
+ page_title = event.name
self.response.out.write(template.render('templates/event.html', locals()))
def post(self, id):
@@ -343,6 +345,7 @@ def get(self):
login_url = users.create_login_url('/')
today = local_today()
show_all_nav = user
+ page_title = 'Approved Events'
events = Event.get_approved_list_with_multiday()
tomorrow = today + timedelta(days=1)
whichbase = 'base.html'
@@ -361,6 +364,7 @@ def get(self):
login_url = users.create_login_url('/')
events = Event.all().filter('member = ', user).order('start_time')
show_all_nav = user
+ page_title = 'My Events'
today = local_today()
tomorrow = today + timedelta(days=1)
self.response.out.write(template.render('templates/myevents.html', locals()))
@@ -376,6 +380,7 @@ def get(self):
today = local_today()
show_all_nav = user
events = Event.all().filter('start_time < ', today).order('-start_time')
+ page_title = 'Past Events'
self.response.out.write(template.render('templates/past.html', locals()))
@@ -410,6 +415,7 @@ def get(self):
events = Event.get_all_future_list()
today = local_today()
tomorrow = today + timedelta(days=1)
+ page_title = 'All Future Events'
self.response.out.write(template.render('templates/all_future.html', locals()))
class LargeHandler(webapp.RequestHandler):
@@ -435,6 +441,7 @@ def get(self):
login_url = users.create_login_url('/')
events = Event.get_pending_list()
show_all_nav = user
+ page_title = 'Pending Events'
today = local_today()
tomorrow = today + timedelta(days=1)
self.response.out.write(template.render('templates/pending.html', locals()))
@@ -450,6 +457,7 @@ def get(self):
else:
login_url = users.create_login_url('/')
rooms = ROOM_OPTIONS
+ page_title = 'Adding New Event'
rules = memcache.get("rules")
if(rules is None):
try:
@@ -551,6 +559,7 @@ def get(self):
else:
login_url = users.create_login_url('/')
show_all_nav = user
+ page_title = 'Event Logs'
self.response.out.write(template.render('templates/logs.html', locals()))
class FeedbackHandler(webapp.RequestHandler):
View
@@ -45,14 +45,14 @@ class Event(db.Model):
notes = db.TextProperty()
type = db.StringProperty(required=True)
estimated_size = db.StringProperty(required=True)
- reminded = db.BooleanProperty(default=False)
+ reminded = db.BooleanProperty(default=False)
- contact_name = db.StringProperty()
- contact_phone = db.StringProperty()
+ contact_name = db.StringProperty()
+ contact_phone = db.StringProperty()
- expired = db.DateTimeProperty()
- created = db.DateTimeProperty(auto_now_add=True)
- updated = db.DateTimeProperty(auto_now=True)
+ expired = db.DateTimeProperty()
+ created = db.DateTimeProperty(auto_now_add=True)
+ updated = db.DateTimeProperty(auto_now=True)
@classmethod
def check_conflict(cls,proposed_start_time,proposed_end_time,proposed_rooms,optional_existing_event_id = 0):
View
@@ -1,8 +1,9 @@
-body { font-family: Verdana,Arial,sans-serif; margin: 0px;}
-#wrapper, #top > div { margin-left: auto; margin-right: auto; width: 700px; position: relative;}
+body { font-family: Verdana,Arial,sans-serif; margin: 0px; }
+#wrapper, #top > div { margin-left: auto; margin-right: auto; width: 980px; position: relative;}
-#top a:visited { color: blue;}
-#top { height: 20px; border-bottom: 1px solid #ccc; text-align: right; font-size: 12px; padding-right: 5px; padding-top: 4px; }
+#top a, #top a:visited { color: #fff; }
+#top { height: 14px; background-color: #000; text-align: right; font-size: 12px; padding: 4px 5px; }
+nav {margin-top: 50px;}
#header { margin-left: auto; margin-right: auto; width: 670px; height: 125px;}
#header img { margin-right: 10px;}
@@ -24,12 +25,25 @@ table{ border-collapse: collapse; border-spacing: 0;}
table td { padding-top: 8px; padding-left: 4px; vertical-align: top; }
table td span { font-size: smaller;}
table td.first { width: 110px; padding-right: 20px; }
+#terms { width: 31%; float: right; font-size: smaller; padding: 8px; -moz-border-radius: 8px; -webkit-border-radius: 8px; background: #eee; line-height: normal; }
#terms h3 {margin-top: 10px; margin-bottom: 0px;}
#terms div { font-size: 11px; }
#terms ol { padding-left: 25px;}
#terms li { margin-top: 10px;}
+.postForm {width: 64%;}
+.postForm input[type=text], .postForm textarea {width: 400px;}
+.postForm input[type=text].small {width: 100px;}
+.postForm input[type=submit] {font-size: 116%; margin: 5px;}
nobr label { display: inline;}
+p.info {margin-top: 20px; line-height: 1.2;}
+
+span.required {
+ font-weight: bold;
+ font-size: 12px;
+ color: #FF0000;
+}
+
#log-list {width:100%;}
#log-list th {text-align: left;}
#log-list .desc-line {border-bottom: 1px solid #e0e0e0; line-height: 5px;}
@@ -41,14 +55,16 @@ label { display: block; font-size: smaller;}
a:visited { color: blue;}
h3 a {text-decoration: none; color:#0000bb;}
-#content { border-top: 3px solid #d50025; background: #eee; padding: 10px; }
-#primary { background: white; width: 660px; padding: 10px; line-height: 1.5;}
+#main { background: url('http://cdn.hackerdojo.com/static/images/dotted-background.jpg') #eee; padding: 10px; }
+#createNewEvent {float: right; width: 120px; position: relative; margin-right: 10px; }
+#primary { background: white; width: 940px; padding: 10px; line-height: 1.5; font-size: 18px; overflow: auto; }
#secondary {font-size: 80%;}
+#pastLink { margin-top:20px; border-top:1px solid #e4e4e4; padding-top: 10px; }
h4 { font-size: smaller; }
.b-block {overflow: auto;}
-.b-label {float: left; width: 150px; font-weight: bold;}
+.b-label {float: left; width: 150px; font-weight: bold; font-size: 90%;}
.b-data {float: left; width: 500px;}
.thin-border, .thinner-border {background-color: #ff0000; margin: 10px 0px;}
@@ -61,36 +77,36 @@ h4 { font-size: smaller; }
/* for DatePicker widget */
a.dp-choose-date {
- float: left;
- width: 16px;
- height: 16px;
- padding: 0;
- margin: 3px 3px 0;
- display: block;
- text-indent: -2000px;
- overflow: hidden;
- background: url(/static/calendar.png) no-repeat;
+ float: left;
+ width: 16px;
+ height: 16px;
+ padding: 0;
+ margin: 3px 3px 0;
+ display: block;
+ text-indent: -2000px;
+ overflow: hidden;
+ background: url(/static/calendar.png) no-repeat;
}
a.dp-choose-date.dp-disabled {
- background-position: 0 -20px;
- cursor: default;
+ background-position: 0 -20px;
+ cursor: default;
}
/* makes the input field shorter once the date picker code
* has run (to allow space for the calendar icon
*/
input.dp-applied {
- width: 85px;
- float: right;
+ width: 85px;
+ float: right;
}
/* menu */
-#menu {float: right; margin: 10px; font-size: smaller;}
+#menu {float: right; padding: 10px; margin-bottom: 10px; font-size: small; border-radius: 6px; background-color: #FFF;}
.emph {font-weight: bold;}
#menu .current {text-decoration: none; color: #000; cursor: tex;}
#edit-approve-btns, #cancel-delete-btns {
display: inline;
-
+
}
#edit-approve-btns {
@@ -3,6 +3,7 @@
{% include 'nav_menu.html' %}
<div id="primary">
+ <form action="/new" id="createNewEvent" method="get"><div id='new-event-link'><button type="submit" id="nav_new" class="emph">New Event</button></div></form>
{% ifnotequal whichbase "mini.html" %}<h3>All Events</h3>{% endifnotequal %}
{% regroup events by start_date as grouped_events %}
@@ -14,11 +15,8 @@
{% endfor %}
</table>
{% endfor %}
-
- <p><a href="/past" style="font-size: smaller;">&larr; Past Events</a></p>
-
- <div style="font-size: x-small; float: right; color: gray;">{{ today }}</div>
+ <p id="pastLink"><a href="/past" style="font-size: smaller;">&larr; Past Events</a></p>
</div>
View
@@ -3,6 +3,7 @@
{% include 'nav_menu.html' %}
<div id="primary">
+ <form action="/new" id="createNewEvent" method="get"><div id='new-event-link'><button type="submit" id="nav_new" class="emph">New Event</button></div></form>
{% ifnotequal whichbase "mini.html" %}<h3>Upcoming Events</h3>{% endifnotequal %}
{% regroup events by start_date as grouped_events %}
@@ -14,10 +15,9 @@
{% endfor %}
</table>
{% endfor %}
-
- <p><a href="/past" style="font-size: smaller;">&larr; Past Events</a></p>
-
- <div style="font-size: x-small; float: right; color: gray;">{{ today }}</div>
+
+ <p id="pastLink"><a href="/past" style="font-size: smaller;">&larr; Past Events</a></p>
+
<p style="font-size: x-small;">Alternative formats: <a href="/events.ics">iCal</a> | <a href="/events.rss">RSS</a> | <a href="/events.json">JSON</a></p>
</div>
View
@@ -1,10 +1,11 @@
<html>
<head>
<title>{% block title %}Events at Hacker Dojo{% endblock %}</title>
- <link href="/static/style.css" type="text/css" rel="stylesheet" />
- {% block feed %}
+ <link href="http://cdn.hackerdojo.com/static/style/hackerdojo.css" rel="stylesheet" />
+ <link href="/static/style.css" type="text/css" rel="stylesheet" />
+ {% block feed %}
<link rel="alternate" type="application/xml" title="Hacker Dojo events feed" href="/events.rss" />
- {% endblock %}
+ {% endblock %}
<link type="text/css" href="/static/css/blitzer/jquery-ui-1.8.1.custom.css" rel="stylesheet" />
<script type="text/javascript" src="/static/js/jquery-1.4.2.min.js"></script>
<script type="text/javascript" src="/static/js/jquery.cookies.js"></script>
@@ -13,26 +14,28 @@
<script type="text/javascript" src="/static/js/hd-events.js"></script>
</head>
<body>
- <div id="top">
- <div>
- <span id="contact-link"><a href="http://wiki.hackerdojo.com/w/page/40789209/Contacting-Events-Team">Contact Events Team</a></span>
- {% if user %}
- <strong>{{user.email}}</strong> | <a href="/myevents">My Events</a> | <a href="{{logout_url}}">Logout</a>
- {% else %}
- <a style="font-weight: bold;" href="{{login_url}}">Login</a> | <a href="http://signup.hackerdojo.com/upgrade/needaccount">Need an account?</a>
- {% endif %}
- </div>
- </div>
- <div id="wrapper">
- <div id="header">
- <form action="/new" method="get"><div id='new-event-link'><button type="submit" id="nav_new" class="emph">New Event</button></div></form>
- <div onclick="document.location.href='/';" style="cursor:pointer">
- <img src="/static/dojo_icon.png" style="float: left;" />
- <h1>Events</h1>
- <h2 style="font-size: x-large;">at Hacker Dojo</h2>
- </div>
- </div>
- <div id="content">
+ <div id="content">
+ <hr class="black">
+ <section>
+ <a href="/"><h1 class="logo">Hacker Dojo</h1></a>
+ <nav>
+ {% if user %}
+ <a href="{{logout_url}}" title="Click to logout"><strong>Logout</strong></a>
+ {% else %}
+ <a style="font-weight: bold;" href="{{login_url}}">Login</a> <a href="http://signup.hackerdojo.com/upgrade/needaccount">Need an account?</a>
+ {% endif %}
+ <a href="http://wiki.hackerdojo.com/w/page/40789209/Contacting-Events-Team">Contact Events Team</a>
+ <br/>
+ <br/>
+ <a href="http://hackerdojo.com/Contact">Contact</a>
+ <a href="http://wiki.hackerdojo.com/">Wiki</a>
+ <a href="http://hackerdojo.com/About">About</a><a href="/Membership">Membership</a>
+ <a href="http://events.hackerdojo.com/">Events</a>
+ </nav>
+ <hr class="red">
+ </section>
+ <hr class="clear">
+ <div id="main">
{% block content %}{% endblock %}
</div>
</div>
@@ -41,7 +44,7 @@ <h2 style="font-size: x-large;">at Hacker Dojo</h2>
var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-27117910-3']);
- _gaq.push(['_setDomainName', '.hackerdojo.com']);
+ _gaq.push(['_setDomainName', '.hackerdojo.com']);
_gaq.push(['_trackPageview']);
(function() {
@@ -50,5 +53,5 @@ <h2 style="font-size: x-large;">at Hacker Dojo</h2>
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
})();
-</script>
+</script>
</html>
View
@@ -3,7 +3,6 @@
<link href="/static/css/edit.css" type="text/css" rel="stylesheet" />
<script type="text/javascript" src="/static/js/edit.js"></script>
-<form method=POST>
<div id="primary">
<h3>Edit: {{event.name}}</h3>
<div class='b-block'><div class='b-label'>Title:</div><div class='b-data'><input type="text" name="name" value="{{event.name}}"/></div></div>
@@ -57,23 +56,25 @@
</table>
</div>
- <div class='b-block'>
- <div class='b-label'>Rooms:<br /><span style="font-size:10; font-weight: normal;">(Capacity in<br/>parentheses)</span></div>
- <div class='b-data checklist' id="roomlist">
- {% for room in rooms %}
- <nobr><input type="checkbox" id="room-{{room.0}}" name="rooms" value="{{room.0}}" {{event.rooms|check_filter:room.0}} /><label for="room-{{room.0}}">{{room.0|title}} ({{room.1}})</label></nobr>
- {% endfor %}
+ <div class='b-block'>
+ <div class='b-label'>Rooms<br /><span style="font-size:10; font-weight: normal;">(Capacity in<br/>parentheses)</span></div>
+ <div class='b-data checklist' id="roomlist">
+ {% for room in rooms %}
+ <nobr><input type="checkbox" id="room-{{room.0}}" name="rooms" value="{{room.0}}" {{event.rooms|check_filter:room.0}} /><label for="room-{{room.0}}">{{room.0|title}} ({{room.1}})</label></nobr>
+ {% endfor %}
+ </div>
</div>
- </div>
- <div class='b-block'><div class='b-label'>More Info:</div><div class='b-data'><textarea rows=4 name="details">{{event.details}}</textarea></div></div>
- <div class='b-block'><div class='b-label'>Notes:</div><div class='b-data'><textarea rows=3 name="notes">{{event.notes}}</textarea></div></div>
- <div class='b-block'><div class='b-label'>Estimated Size:</div><div class='b-data'><input type="text" name="estimated_size" value="{{event.estimated_size}}"/></div></div>
- <div class='b-block'><div class='b-label'>Contact Name:</div><div class='b-data'><input type="text" name="contact_name" value="{{event.contact_name|title}}"/></div></div>
- <div class='b-block'><div class='b-label'>Contact Phone:</div><div class='b-data'><input type="text" name="contact_phone" value="{{event.contact_phone}}"/></div></div>
- <div class='b-block'><div class='b-label'>URL:</div><div class='b-data'><input type="text" name="url" value="{{event.url}}"/></div></div>
- <div class='b-block'><div class='b-label'>Fee:</div><div class='b-data'><input type="text" name="fee" value="{{event.fee}}"/></div></div>
- <br/>
- <input type=submit value="Save">
+ <div class='b-block'><div class='b-label'>More Info</div><div class='b-data'><textarea rows=4 name="details">{{event.details}}</textarea></div></div>
+ <div class='b-block'><div class='b-label'>Notes</div><div class='b-data'><textarea rows=3 name="notes">{{event.notes}}</textarea></div></div>
+ <div class='b-block'><div class='b-label'>Category <span class="required">*</span></div><div class='b-data'><input type="text" name="type" value="{{event.type}}"/></div></div>
+ <div class='b-block'><div class='b-label'>Expected Size <span class="required">*</span></div><div class='b-data'><input type="text" name="estimated_size" value="{{event.estimated_size}}"/></div></div>
+ <div class='b-block'><div class='b-label'>Contact Name</div><div class='b-data'><input type="text" name="contact_name" value="{{event.contact_name|title}}"/></div></div>
+ <div class='b-block'><div class='b-label'>Contact Phone</div><div class='b-data'><input type="text" name="contact_phone" value="{{event.contact_phone}}"/></div></div>
+ <div class='b-block'><div class='b-label'>URL</div><div class='b-data'><input type="text" name="url" value="{{event.url}}"/></div></div>
+ <div class='b-block'><div class='b-label'>Fee</div><div class='b-data'><input type="text" name="fee" value="{{event.fee}}"/></div></div>
+ <br/>
+ <input type="submit" value="Save">
+ </form>
</div>
{% endblock %}
Oops, something went wrong.