Skip to content

Commit 8abbe0e

Browse files
committed
CSS tweaks
1 parent 4182092 commit 8abbe0e

File tree

5 files changed

+36
-188
lines changed

5 files changed

+36
-188
lines changed

controllers.py

+11-9
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from novaconfig import apikey, logger
77

88
logger = logging.getLogger(__name__)
9-
logger.setLevel(logging.DEBUG)
9+
logger.setLevel(logging.INFO)
1010

1111
class MeetupMembers(object):
1212
'''
@@ -89,25 +89,27 @@ class MeetupRsvp(object):
8989
'''
9090

9191
def GET(self, cmd):
92-
logger.debug('GET /meetup/rsvp/%s' % cmd)
93-
decoder = json.JSONDecoder()
94-
'''
92+
"""
9593
The first call get a list of all our past meetups. This
9694
list expand as meetups complete, so we should refresh it
9795
once a day
98-
'''
96+
"""
97+
logger.debug('GET /meetup/rsvp/%s' % cmd)
98+
decoder = json.JSONDecoder()
99+
99100
meetup = MeetupAPI(apikey, lifetime=86400)
100101

101-
'''
102+
"""
102103
The second meetup instance uses a deprecated API to list
103104
the 'attended' counts. This is only available on completed
104105
meetups, and is requested per meetup. So it never changes,
105106
and we can permanently cache the response.
106-
'''
107+
"""
107108
m1 = MeetupAPI(apikey, 'http://api.meetup.com/', lifetime=0)
108109
finished = False
109110
results = []
110111
offset = 0
112+
count = 0
111113

112114
while finished is False:
113115
eventlist = meetup.events({'status': 'past',
@@ -162,9 +164,9 @@ def GET(self, cmd):
162164
logger.warning('%s' % e)
163165
pass
164166

165-
result.append({'rsvp': count,
167+
results.append({'rsvp': count,
166168
'attended': attendee,
167169
'name': name,
168170
'date': eventdate})
169171

170-
return json.dumps(result)
172+
return json.dumps(results)

router.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
import logging
55
from templates import render_template
66

7-
''' Find out where we live '''
7+
""" Find out where we live """
88
abspath = os.path.dirname(__file__)
99
site.addsitedir(abspath)
1010

1111
import controllers
1212

1313
logger = logging.getLogger(__name__)
14+
logger.setLevel(logging.INFO)
1415

1516
urls = (
1617
'^/events/(.*)$', 'controllers.MeetupEvents',

static/css/novapython.css

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
body {
2+
padding-top: 60px;
3+
}
4+
.sidebar-nav {
5+
padding: 9px 0;
6+
}
7+
8+
.txtright {
9+
text-align: right;
10+
}
11+
12+
.pymenu {
13+
background-color: #366d9b;
14+
}
15+
16+
.pymenu .nav > li > a {
17+
color: #fff;
18+
}
19+
20+
.pymenu .nav > li > a:hover {
21+
color: yellow;
22+
}

static/css/style.css

-160
This file was deleted.

templates/index.html

+1-18
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,9 @@
77
<meta name="description" content="Nova Python User Group">
88
<meta name="author" content="Ryan Day">
99

10-
<!-- Le styles -->
1110
<link href="/static/css/bootstrap.min.css" rel="stylesheet">
12-
<style type="text/css">
13-
body {
14-
padding-top: 60px;
15-
}
16-
.sidebar-nav {
17-
padding: 9px 0;
18-
}
11+
<link href="/static/css/novapython.css" rel="stylesheet">
1912

20-
.txtright {
21-
text-align: right;
22-
}
23-
24-
.pymenu {
25-
background-color: #366d9b;
26-
}
27-
</style>
28-
29-
<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
3013
<!--[if lt IE 9]>
3114
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
3215
<![endif]-->

0 commit comments

Comments
 (0)