Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

cleared it up

  • Loading branch information...
commit f5d4d2e41abd3e8d5bd027a7db436f1dbbeb4f56 1 parent 2f79fdf
@ahmednuaman authored
View
2  app.yaml
@@ -1,4 +1,4 @@
-application: 0147bbh
+application: YOUR_APP_ID
version: 2
runtime: python
api_version: 1
View
9 app/controller/api_controller.py
@@ -156,15 +156,6 @@ def post(self):
load( self, d )
-class AddInitDataController(webapp.RequestHandler):
- def get(self):
- participant_model.add_participant( 'ahmednuaman@googlemail.com', '7:00' )
- participant_model.add_participant( 'tmillar48@hotmail.co.uk', '8:00' ) # 8
- participant_model.add_participant( 'martin.reed@bbh.co.uk', '8:10' ) # 8.10
- participant_model.add_participant( 'daniel@mothernewyork.com', '8:20' ) # 8.20
- participant_model.add_participant( 'melanie.arrow@bbh.co.uk', '8:30' ) # 8.30
-
-
def config():
c = config_helper.config()
View
25 app/model/channel_model.py
@@ -1,25 +0,0 @@
-#!/usr/bin/env python
-
-from google.appengine.ext import db
-
-class ChannelModel(db.Model):
- channel = db.StringProperty()
-
-def add_channel(s):
- m = ChannelModel()
-
- m.channel = s
-
- m.put()
-
-def get_channels():
- q = ChannelModel().all()
-
- cs = [ ]
-
- if q is not None:
- for c in q:
- cs.append( c.channel )
-
-
- return cs
View
12 config.yaml
@@ -1,12 +1,12 @@
tokbox:
- api_key: 4901211
- secret: 2089103c3f545555cda734358711f685ec7355f6
+ api_key: YOUR_API_KEY
+ secret: YOUR_SECRET
props: '{ width: 400, height: 300 }'
- session_id: 2_MX40OTAxMjExfn4yMDExLTA5LTI2IDIwOjEyOjUyLjkzNjk2NyswMDowMH4wLjcxMTkwMDc3MzU5fg
-cookie_name: FLokfGUUiprgVdCUHSKZvxb8qV5yWVjA0WS3z6UXJliYCXRAsSoJJ4BCi6GcTZb
+ session_id: YOUR_SESSION_ID
+cookie_name: A_COOKIE_NAME
pre:
- username: Christy
- password: mklohyzaxiW9VMIi1hTLmRoX8tL3bPU4bQIoAjyHH9Ih6GaBtUpymkFR49yO4qd
+ username: USERNAME
+ password: PASSWORD
role:
presenter: MODERATOR
participant: PUBLISHER
View
3  main.py
@@ -13,8 +13,7 @@ def main():
( '/api/presenter', api_controller.PresenterController ),
( '/api/participant', api_controller.ParticipantController ),
( '/presenter/login', api_controller.LoginController ),
- ( '/participant/login', api_controller.LoginController )#,
- # ( '/add_init_data', api_controller.AddInitDataController )
+ ( '/participant/login', api_controller.LoginController )
], debug=True )
util.run_wsgi_app( application )
View
8 template/participant.html
@@ -8,7 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link rel="stylesheet" href="http://twitter.github.com/bootstrap/1.3.0/bootstrap.min.css" />
<link rel="stylesheet" href="/assets/css/styles.css" />
- <title>{% if logged_in %}Company for Christy{% else %}Log in{% endif %}</title>
+ <title>{% if logged_in %}Some title{% else %}Log in{% endif %}</title>
</head>
<body>
<div id="container">
@@ -17,7 +17,7 @@
Hello {{ email }}!
</h1>
<p>
- This is Christy's and the current participant's web cam feeds:
+ This is presenter's and the current participant's web cam feeds:
</p>
<div class="row">
<div class="span8">
@@ -33,7 +33,7 @@
You're booked in for {{ time }}.
</h3>
<p>
- <strong>Please note:</strong> Christy has full control over the people she wants to chat with and she may not stick to the scheduled times, so please be patient and enjoy the show.
+ <strong>Please note:</strong> The presenter has full control over the people they want to chat with and they may not stick to the scheduled times, so please be patient and enjoy the show.
</p>
</div>
<div class="span-two-third">
@@ -232,7 +232,7 @@
</script>
{% endif %}
<script>
- var _gaq=[['_setAccount','UA-25967876-1'],['_trackPageview'],['_trackPageLoadTime']];
+ var _gaq=[['_setAccount','X'],['_trackPageview'],['_trackPageLoadTime']];
(function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.async=1;
g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
s.parentNode.insertBefore(g,s)}(document,'script'));
View
4 template/presenter.html
@@ -14,7 +14,7 @@
<div id="container">
{% if logged_in %}
<h1>
- Hello Christy!
+ Hello Presenter!
</h1>
<h3>
Hope you're sitting comfortably cos all these lovely people below would like to chat with you.
@@ -190,7 +190,7 @@
</script>
{% endif %}
<script>
- var _gaq=[['_setAccount','UA-25967876-1'],['_trackPageview'],['_trackPageLoadTime']];
+ var _gaq=[['_setAccount','X'],['_trackPageview'],['_trackPageLoadTime']];
(function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.async=1;
g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
s.parentNode.insertBefore(g,s)}(document,'script'));
View
39 template/public.html
@@ -9,12 +9,9 @@
<link rel="stylesheet" href="http://twitter.github.com/bootstrap/1.3.0/bootstrap.min.css" />
<link type="text/css" rel="stylesheet" href="/assets/css/styles.css" />
<link type="text/plain" rel="author" href="/assets/humans.txt" />
- <title>Company for Christy</title>
+ <title>Some title</title>
</head>
<body>
- <!-- <div id="loader">
- <div id="loader-inner"></div>
- </div> -->
<div id="container" class="container">
<h1>
Welcome!
@@ -29,38 +26,6 @@
<div class="span8" id="participant-webcam"></div>
</div>
</div>
- <!-- <div id="badbrowser" class="alert-message block-message error container-fluid">
- <h1>
- Someone's old skool
- </h1>
- <h3>
- Your browser is pretty old and that's not cool in internet town. The only way you're going to be able to take part is if you download a new web browser; trust me, they're good:
- </h3>
- <div class="alert-actions">
- <a class="btn large primary" href="http://google.com/chrome/">Get Google Chrome</a>
- <a class="btn large" href="http://getfirefox.com/">Get FireFox</a>
- <a class="btn large" href="http://www.apple.com/safari/">Get Safari</a>
- <a class="btn large" href="http://www.opera.com/">Get Opera</a>
- </div>
- <h4>
- Wait, what's <em>exactly</em> wrong with my browser?
- </h4>
- <p>
- Well my old fruity, we require that your web browser have a the ability to subscribe to <a href="http://dev.w3.org/html5/eventsource/">server-sent events</a> (or 'EventSource'). This feature allows your browser to listen to changes that will occur during this broadcast and act accordingly.
- </p>
- <h4>
- But what's wrong with AJAX?
- </h4>
- <p>
- Nothing, but in this case it's way too slow. The beauty of 'EventSource' is that there are no headers, no polling and it's simply one-way communication from the server right down to your clever browser. AJAX has too much overhead and is way too slow for what we want to do.
- </p>
- <h4>
- Why have you highlighted Google Chrome?
- </h4>
- <p>
- Chrome is moving very fast. It may not be the 'best' browser out there according to everyone but it's very well supported, it automatically updates itself and its plugins (such as Flash) and is generally very well behaved. We love the other browsers too, but in this case we feel Chrome is the winner.
- </p>
- </div> -->
<div id="no-js" class="alert-message block-message error container-fluid">
<h1>
Oh dear...
@@ -204,7 +169,7 @@
-->
</script>
<script>
- var _gaq=[['_setAccount','UA-25967876-1'],['_trackPageview'],['_trackPageLoadTime']];
+ var _gaq=[['_setAccount','X'],['_trackPageview'],['_trackPageLoadTime']];
(function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.async=1;
g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
s.parentNode.insertBefore(g,s)}(document,'script'));
Please sign in to comment.
Something went wrong with that request. Please try again.