Browse files

fixed registration password bug and figured out why you can't click a…

…llow in flash
  • Loading branch information...
1 parent 4770747 commit b2c9b0a2e6e91d35099925bad8ec43c6d6c9841f @tinabeans committed Apr 4, 2012
Showing with 347 additions and 124 deletions.
  1. +3 −0 config.py
  2. +14 −0 index.py
  3. +1 −4 socketstuff.py
  4. +181 −110 static/css/core.css
  5. +1 −1 static/js/validation.js
  6. +75 −6 static/sass/_room.scss
  7. +68 −0 templates/dressingRoom.html
  8. +1 −1 templates/index.html
  9. +3 −2 templates/room.html
View
3 config.py
@@ -1,5 +1,8 @@
import sys
+api_key = "6303111"
+api_secret = "45b94b30d4f5554ad7445950c13e8d78e099e92e"
+
if sys.argv[1] == "LIVE":
BASE_URL = 'http://letsgohotpot.com'
View
14 index.py
@@ -17,6 +17,9 @@
# config variables, to make moving to production easier
import config
+# opentok
+from lib import OpenTokSDK
+
##############################################################################
# GLOBAL VARIABLES & CONFIG
@@ -1108,6 +1111,17 @@ def sendCookingReminder():
##############################################################################
# HOTPOT ROOM
+
+@app.route('/getready/<id>')
+def showDressingRoom(id):
+
+ # generate an opentok session and token to send to the user
+ opentok_sdk = OpenTokSDK.OpenTokSDK(config.api_key, config.api_secret)
+ session = opentok_sdk.create_session()
+ token = opentok_sdk.generate_token(session.session_id)
+
+ return render_template('dressingRoom.html', roomId=id, token=token, sessionId=session.session_id)
+
# takes a meal dictionary and inserts notes into the appropriate step
def insertNotesIntoSteps(meal, notes):
View
5 socketstuff.py
@@ -36,10 +36,7 @@
openTokSessions = {}
# OpenTok setup
-api_key = "6303111"
-api_secret = "45b94b30d4f5554ad7445950c13e8d78e099e92e"
-
-opentok_sdk = OpenTokSDK.OpenTokSDK(api_key, api_secret)
+opentok_sdk = OpenTokSDK.OpenTokSDK(config.api_key, config.api_secret)
# no comment.
tornado.websocket.WebSocketHandler.allow_draft76 = lambda self:True
View
291 static/css/core.css
@@ -1729,44 +1729,115 @@ body#cover .message {
}
/**********************************************************/
+/* DRESSING ROOM */
+/* line 5, ../sass/_room.scss */
+#dressingRoom h1 {
+ padding: 40px;
+ text-align: center;
+}
+/* line 9, ../sass/_room.scss */
+#dressingRoom h1 img {
+ width: 230px;
+}
+
+/* line 17, ../sass/_room.scss */
+#dressingRoomBox {
+ width: 800px;
+ border: 6px solid rgba(115, 108, 91, 0.15);
+ background: #fff;
+ padding: 30px;
+ margin: 0px auto;
+ overflow: hidden;
+ *zoom: 1;
+}
+/* line 25, ../sass/_room.scss */
+#dressingRoomBox h2 {
+ font-family: "proxima-nova", sans-serif;
+ text-transform: uppercase;
+ font-weight: 900;
+ font-size: 30px;
+ text-align: center;
+ color: #1c6770;
+}
+/* line 32, ../sass/_room.scss */
+#dressingRoomBox p.intro {
+ margin-top: 10px;
+ text-align: center;
+ width: 80%;
+ margin: 10px auto 20px auto;
+}
+/* line 39, ../sass/_room.scss */
+#dressingRoomBox #testVideoContainer {
+ float: left;
+ width: 370px;
+ margin-right: 20px;
+ height: 240px;
+}
+/* line 46, ../sass/_room.scss */
+#dressingRoomBox h3 {
+ font-family: "proxima-nova", sans-serif;
+ text-transform: uppercase;
+ font-weight: 900;
+ font-size: 16px;
+ color: #3797a2;
+ margin-bottom: 10px;
+}
+/* line 53, ../sass/_room.scss */
+#dressingRoomBox ul {
+ margin-left: 400px;
+ padding-left: 25px;
+}
+/* line 58, ../sass/_room.scss */
+#dressingRoomBox li {
+ list-style-type: disc;
+ font-size: 16px;
+ padding: 5px 0px;
+}
+/* line 64, ../sass/_room.scss */
+#dressingRoomBox .bigButton {
+ margin-top: 20px;
+}
+
+/**********************************************************/
/* COOKING ROOM */
-/* line 4, ../sass/_room.scss */
+/* line 73, ../sass/_room.scss */
+#roomBg {
+ background: url(/static/images/bg_clouds.png) center top no-repeat;
+ padding: 0px 20px;
+}
+
+/* line 78, ../sass/_room.scss */
#cookingRoom {
background: white url(/static/images/textureSoft.png);
}
-/* line 7, ../sass/_room.scss */
+/* line 81, ../sass/_room.scss */
#cookingRoom #userId {
display: none;
}
-/* line 11, ../sass/_room.scss */
-#cookingRoom #roomBg {
- background: url(/static/images/bg_clouds.png) center top no-repeat;
- padding: 0px 20px;
-}
-/* line 16, ../sass/_room.scss */
+/* line 85, ../sass/_room.scss */
#cookingRoom header {
width: 100%;
height: 65px;
position: relative;
}
-/* line 21, ../sass/_room.scss */
+/* line 90, ../sass/_room.scss */
#cookingRoom header h1 {
margin: 0px;
padding-top: 10px;
text-align: center;
}
-/* line 26, ../sass/_room.scss */
+/* line 95, ../sass/_room.scss */
#cookingRoom header h1 img {
height: 48px;
}
-/* line 32, ../sass/_room.scss */
+/* line 101, ../sass/_room.scss */
#cookingRoom #serviceNav {
position: absolute;
top: 20px;
right: 0px;
}
-/* line 39, ../sass/_room.scss */
+/* line 108, ../sass/_room.scss */
#cookingArea {
-moz-border-radius: 10px;
-webkit-border-radius: 10px;
@@ -1784,7 +1855,7 @@ body#cover .message {
/**********************************************************/
/* COOKING ROOM: RECIPE */
-/* line 53, ../sass/_room.scss */
+/* line 122, ../sass/_room.scss */
#recipeContainer {
position: relative;
float: left;
@@ -1798,7 +1869,7 @@ body#cover .message {
padding-top: 65px;
padding-bottom: 45px;
}
-/* line 63, ../sass/_room.scss */
+/* line 132, ../sass/_room.scss */
#recipeContainer #recipeTitle {
position: absolute;
left: 0px;
@@ -1822,7 +1893,7 @@ body#cover .message {
font-weight: 700;
font-size: 19px;
}
-/* line 78, ../sass/_room.scss */
+/* line 147, ../sass/_room.scss */
#recipeContainer #recipeTitle .label {
font-family: "proxima-nova", sans-serif;
text-transform: uppercase;
@@ -1833,12 +1904,12 @@ body#cover .message {
margin-bottom: 3px;
}
-/* line 88, ../sass/_room.scss */
+/* line 157, ../sass/_room.scss */
#recipe {
height: 100%;
}
-/* line 92, ../sass/_room.scss */
+/* line 161, ../sass/_room.scss */
#recipeNav {
float: left;
width: 50px;
@@ -1851,7 +1922,7 @@ body#cover .message {
box-sizing: border-box;
background: #d9d6d1 url(/static/images/textureSoft.png);
}
-/* line 101, ../sass/_room.scss */
+/* line 170, ../sass/_room.scss */
#recipeNav .userStepIcon {
display: inline-block;
-moz-border-radius: 100px;
@@ -1888,15 +1959,15 @@ body#cover .message {
background: #fff;
}
-/* line 114, ../sass/_room.scss */
+/* line 183, ../sass/_room.scss */
#stepTabs li {
position: relative;
}
-/* line 117, ../sass/_room.scss */
+/* line 186, ../sass/_room.scss */
#stepTabs li .userStepIcon {
display: block;
}
-/* line 121, ../sass/_room.scss */
+/* line 190, ../sass/_room.scss */
#stepTabs li a {
display: block;
border-right: 0px;
@@ -1919,7 +1990,7 @@ body#cover .message {
color: #736c5b;
}
-/* line 137, ../sass/_room.scss */
+/* line 206, ../sass/_room.scss */
#cookingRoom #steps {
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
@@ -1931,7 +2002,7 @@ body#cover .message {
background: #fff;
font-size: 20px;
}
-/* line 146, ../sass/_room.scss */
+/* line 215, ../sass/_room.scss */
#cookingRoom .step, #cookingRoom #recipeStart {
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
@@ -1940,37 +2011,37 @@ body#cover .message {
padding: 25px;
height: 100%;
}
-/* line 151, ../sass/_room.scss */
+/* line 220, ../sass/_room.scss */
#cookingRoom .step p, #cookingRoom #recipeStart p {
line-height: 1.3em;
}
-/* line 156, ../sass/_room.scss */
+/* line 225, ../sass/_room.scss */
#cookingRoom #recipeStart {
position: relative;
overflow: hidden;
}
-/* line 160, ../sass/_room.scss */
+/* line 229, ../sass/_room.scss */
#cookingRoom #recipeStart #startButtonContainer {
margin-top: 27%;
background: rgba(165, 195, 73, 0.15);
padding: 25px;
text-align: center;
}
-/* line 166, ../sass/_room.scss */
+/* line 235, ../sass/_room.scss */
#cookingRoom #recipeStart #startButtonContainer p {
font-size: 17px;
line-height: 1.3em;
}
-/* line 172, ../sass/_room.scss */
+/* line 241, ../sass/_room.scss */
#cookingRoom #recipeStart .instructions {
position: absolute;
}
-/* line 175, ../sass/_room.scss */
+/* line 244, ../sass/_room.scss */
#cookingRoom #recipeStart .instructions p {
font-size: 14px;
line-height: 1.25em;
}
-/* line 180, ../sass/_room.scss */
+/* line 249, ../sass/_room.scss */
#cookingRoom #recipeStart .instructions h2 {
font-family: "proxima-nova", sans-serif;
text-transform: uppercase;
@@ -1980,48 +2051,48 @@ body#cover .message {
font-size: 11px;
margin-bottom: 5px;
}
-/* line 189, ../sass/_room.scss */
+/* line 258, ../sass/_room.scss */
#cookingRoom #recipeStart #instructionsCookingTimeline {
top: 25px;
}
-/* line 192, ../sass/_room.scss */
+/* line 261, ../sass/_room.scss */
#cookingRoom #recipeStart #instructionsCookingTimeline img {
position: absolute;
top: 47px;
left: -20px;
}
-/* line 199, ../sass/_room.scss */
+/* line 268, ../sass/_room.scss */
#cookingRoom #recipeStart #instructionsKeyboardNav {
position: relative;
margin-top: 25px;
}
-/* line 203, ../sass/_room.scss */
+/* line 272, ../sass/_room.scss */
#cookingRoom #recipeStart #instructionsKeyboardNav p {
margin-right: 150px;
}
-/* line 207, ../sass/_room.scss */
+/* line 276, ../sass/_room.scss */
#cookingRoom #recipeStart #instructionsKeyboardNav img {
width: 150px;
float: right;
}
-/* line 213, ../sass/_room.scss */
+/* line 282, ../sass/_room.scss */
#cookingRoom #recipeStart #instructionsCookingNotes {
bottom: 14px;
width: 243px;
}
-/* line 217, ../sass/_room.scss */
+/* line 286, ../sass/_room.scss */
#cookingRoom #recipeStart #instructionsCookingNotes img {
position: absolute;
right: 6px;
top: 28px;
}
-/* line 225, ../sass/_room.scss */
+/* line 294, ../sass/_room.scss */
#cookingRoom .step {
display: none;
overflow-y: auto;
overflow-x: hidden;
}
-/* line 230, ../sass/_room.scss */
+/* line 299, ../sass/_room.scss */
#cookingRoom .step h2 {
font-family: "proxima-nova", sans-serif;
text-transform: uppercase;
@@ -2031,28 +2102,28 @@ body#cover .message {
font-size: 14px;
margin-bottom: 4px;
}
-/* line 238, ../sass/_room.scss */
+/* line 307, ../sass/_room.scss */
#cookingRoom .step ul {
margin-left: 20px;
}
-/* line 241, ../sass/_room.scss */
+/* line 310, ../sass/_room.scss */
#cookingRoom .step ul li {
font-size: 18px;
margin: 10px 0px;
list-style-type: circle;
}
-/* line 249, ../sass/_room.scss */
+/* line 318, ../sass/_room.scss */
#cookingRoom .currentStep a {
background: #fff;
}
-/* line 253, ../sass/_room.scss */
+/* line 322, ../sass/_room.scss */
#cookingRoom .extra {
background: rgba(165, 195, 73, 0.15);
padding: 15px 15px 1px 15px;
font-size: 14px;
margin: 20px 0px;
}
-/* line 259, ../sass/_room.scss */
+/* line 328, ../sass/_room.scss */
#cookingRoom .extra h1 {
font-family: "proxima-nova", sans-serif;
text-transform: uppercase;
@@ -2065,7 +2136,7 @@ body#cover .message {
margin-right: 7px;
letter-spacing: .1em;
}
-/* line 272, ../sass/_room.scss */
+/* line 341, ../sass/_room.scss */
#cookingRoom .noteFormInline textarea {
background: #EBF4F5;
-moz-border-radius: 5px;
@@ -2077,12 +2148,12 @@ body#cover .message {
margin-bottom: 10px;
height: 50px;
}
-/* line 278, ../sass/_room.scss */
+/* line 347, ../sass/_room.scss */
#cookingRoom .noteFormInline textarea:focus {
outline: none;
background: #ddedee;
}
-/* line 284, ../sass/_room.scss */
+/* line 353, ../sass/_room.scss */
#cookingRoom .noteFormInline input[type=submit] {
color: #fff;
display: inline-block;
@@ -2123,11 +2194,11 @@ body#cover .message {
position: relative;
top: 2px;
}
-/* line 290, ../sass/_room.scss */
+/* line 359, ../sass/_room.scss */
#cookingRoom #ingredients {
margin: 0px;
}
-/* line 293, ../sass/_room.scss */
+/* line 362, ../sass/_room.scss */
#cookingRoom #ingredients li {
font-size: 16px;
height: 33px;
@@ -2141,45 +2212,45 @@ body#cover .message {
cursor: pointer;
background: url(/static/images/checkbox.png) 7px 9px no-repeat;
}
-/* line 303, ../sass/_room.scss */
+/* line 372, ../sass/_room.scss */
#cookingRoom #ingredients li.odd {
background: #f4f7f6 url(/static/images/checkbox.png) 7px 9px no-repeat;
}
-/* line 308, ../sass/_room.scss */
+/* line 377, ../sass/_room.scss */
#cookingRoom #ingredients .amount {
font-size: 12px;
font-weight: 700;
margin-left: 5px;
}
-/* line 314, ../sass/_room.scss */
+/* line 383, ../sass/_room.scss */
#cookingRoom #ingredients .crossedOut {
background: url(/static/images/checkboxChecked.png) 7px 8px no-repeat;
}
-/* line 317, ../sass/_room.scss */
+/* line 386, ../sass/_room.scss */
#cookingRoom #ingredients .crossedOut.odd {
background: #f4f7f6 url(/static/images/checkboxChecked.png) 7px 8px no-repeat;
}
-/* line 322, ../sass/_room.scss */
+/* line 391, ../sass/_room.scss */
#cookingRoom #ingredients .closeButton {
position: absolute;
right: 10px;
top: 10px;
}
-/* line 329, ../sass/_room.scss */
+/* line 398, ../sass/_room.scss */
#cookingRoom .notesContainer {
margin: 30px 0px;
}
-/* line 333, ../sass/_room.scss */
+/* line 402, ../sass/_room.scss */
#cookingRoom .cookingNote {
font-family: "proxima-nova", sans-serif;
margin: 15px 0px;
position: relative;
}
-/* line 338, ../sass/_room.scss */
+/* line 407, ../sass/_room.scss */
#cookingRoom .cookingNote p {
font-style: normal;
}
-/* line 342, ../sass/_room.scss */
+/* line 411, ../sass/_room.scss */
#cookingRoom .cookingNote .userpic {
display: inline-block;
-moz-border-radius: 100px;
@@ -2212,11 +2283,11 @@ body#cover .message {
border-radius: 100px;
background: #fff;
}
-/* line 349, ../sass/_room.scss */
+/* line 418, ../sass/_room.scss */
#cookingRoom .cookingNote .noteContent {
font-size: 12px;
}
-/* line 353, ../sass/_room.scss */
+/* line 422, ../sass/_room.scss */
#cookingRoom .cookingNote .timestamp {
text-align: right;
font-style: normal;
@@ -2225,7 +2296,7 @@ body#cover .message {
font-size: 10px;
text-transform: uppercase;
}
-/* line 364, ../sass/_room.scss */
+/* line 433, ../sass/_room.scss */
#cookingRoom .cookingNote.note .noteContent {
margin-left: 25px;
background: #f8f6f0 url(/static/images/textureSoft.png);
@@ -2237,15 +2308,15 @@ body#cover .message {
-khtml-border-radius: 5px;
border-radius: 5px;
}
-/* line 371, ../sass/_room.scss */
+/* line 440, ../sass/_room.scss */
#cookingRoom .cookingNote.note .userpic {
margin-top: 15px;
}
-/* line 378, ../sass/_room.scss */
+/* line 447, ../sass/_room.scss */
#cookingRoom .cookingNote.stamp .noteContent {
height: 40px;
}
-/* line 381, ../sass/_room.scss */
+/* line 450, ../sass/_room.scss */
#cookingRoom .cookingNote.stamp .noteContent p {
position: absolute;
background: #ff0000;
@@ -2258,7 +2329,7 @@ body#cover .message {
font-weight: bold;
font-size: 10px;
}
-/* line 394, ../sass/_room.scss */
+/* line 463, ../sass/_room.scss */
#cookingRoom .cookingNote.stamp .noteContent img {
width: 40px;
position: absolute;
@@ -2268,7 +2339,7 @@ body#cover .message {
/**********************************************************/
/* WIDGETS */
-/* line 406, ../sass/_room.scss */
+/* line 475, ../sass/_room.scss */
.widget {
display: none;
-moz-border-radius: 5px;
@@ -2294,20 +2365,20 @@ body#cover .message {
background: #828a91;
color: #fff;
}
-/* line 420, ../sass/_room.scss */
+/* line 489, ../sass/_room.scss */
.widget .closeButton {
position: absolute;
top: 5px;
right: 5px;
}
-/* line 429, ../sass/_room.scss */
+/* line 498, ../sass/_room.scss */
#notepad p {
line-height: 1.2em;
font-size: 13px;
margin-bottom: 4px;
}
-/* line 435, ../sass/_room.scss */
+/* line 504, ../sass/_room.scss */
#notepad textarea {
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
@@ -2322,13 +2393,13 @@ body#cover .message {
resize: none;
font-style: normal;
}
-/* line 445, ../sass/_room.scss */
+/* line 514, ../sass/_room.scss */
#notepad input[type=submit] {
width: 100%;
cursor: pointer;
}
-/* line 451, ../sass/_room.scss */
+/* line 520, ../sass/_room.scss */
#stampPicker ul {
margin: 10px 0px 0px 0px;
overflow: hidden;
@@ -2342,43 +2413,43 @@ body#cover .message {
border-radius: 5px;
}
-/* line 458, ../sass/_room.scss */
+/* line 527, ../sass/_room.scss */
#stampPicker .stamp {
font-family: "proxima-nova", sans-serif;
float: left;
}
-/* line 462, ../sass/_room.scss */
+/* line 531, ../sass/_room.scss */
#stampPicker .stamp .stampButton {
display: block;
height: 42px;
width: 43px;
padding: 10px;
}
-/* line 469, ../sass/_room.scss */
+/* line 538, ../sass/_room.scss */
#stampPicker .stamp .stampInfo {
display: none;
margin-top: 5px;
font-size: 13px;
}
-/* line 476, ../sass/_room.scss */
+/* line 545, ../sass/_room.scss */
#stampInfoDisplay, #stampInstructions {
font-style: normal;
height: 32px;
}
-/* line 480, ../sass/_room.scss */
+/* line 549, ../sass/_room.scss */
#stampInfoDisplay p, #stampInstructions p {
font-size: 13px;
line-height: 1.3em;
}
-/* line 487, ../sass/_room.scss */
+/* line 556, ../sass/_room.scss */
#stampInfoDisplay h3 {
font-weight: bold;
margin-bottom: 4px;
}
-/* line 493, ../sass/_room.scss */
+/* line 562, ../sass/_room.scss */
#widgetNav {
position: absolute;
bottom: 0;
@@ -2399,7 +2470,7 @@ body#cover .message {
border-bottom-left-radius: 10px;
padding: 7px;
}
-/* line 505, ../sass/_room.scss */
+/* line 574, ../sass/_room.scss */
#widgetNav a {
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
@@ -2419,11 +2490,11 @@ body#cover .message {
background-position: center center;
background-repeat: no-repeat;
}
-/* line 516, ../sass/_room.scss */
+/* line 585, ../sass/_room.scss */
#widgetNav a:hover {
background-color: rgba(115, 108, 91, 0.2);
}
-/* line 520, ../sass/_room.scss */
+/* line 589, ../sass/_room.scss */
#widgetNav a.active {
border-top: 1px solid #fff;
position: relative;
@@ -2432,18 +2503,18 @@ body#cover .message {
background-color: #fff;
background-repeat: no-repeat;
}
-/* line 530, ../sass/_room.scss */
+/* line 599, ../sass/_room.scss */
#widgetNav #stampPickerButton {
background-image: url(/static/images/icon_stamp.png);
}
-/* line 535, ../sass/_room.scss */
+/* line 604, ../sass/_room.scss */
#widgetNav #notepadButton {
background-image: url(/static/images/icon_note.png);
}
/**********************************************************/
/* VIDEOS */
-/* line 543, ../sass/_room.scss */
+/* line 612, ../sass/_room.scss */
#videoContainer {
margin-left: 360px;
height: 74%;
@@ -2454,13 +2525,13 @@ body#cover .message {
position: relative;
padding: 0px 0px;
}
-/* line 550, ../sass/_room.scss */
+/* line 619, ../sass/_room.scss */
#videoContainer.fullsize {
height: 100%;
padding-bottom: 40px;
}
-/* line 556, ../sass/_room.scss */
+/* line 625, ../sass/_room.scss */
#videos {
padding: 20px 20px 30px 20px;
height: 100%;
@@ -2471,7 +2542,7 @@ body#cover .message {
position: relative;
}
-/* line 563, ../sass/_room.scss */
+/* line 632, ../sass/_room.scss */
#friendVideoPlaceholder {
background-color: rgba(115, 108, 91, 0.1);
color: rgba(115, 108, 91, 0.4);
@@ -2481,32 +2552,32 @@ body#cover .message {
font-weight: 700;
border: 5px solid rgba(115, 108, 91, 0.1);
}
-/* line 572, ../sass/_room.scss */
+/* line 641, ../sass/_room.scss */
#friendVideoPlaceholder p {
position: absolute;
top: 45%;
width: 100%;
text-align: center;
}
-/* line 580, ../sass/_room.scss */
-#myVideoContainer, .friendVideo {
+/* line 649, ../sass/_room.scss */
+#myVideoContainer, .friendVideo, #testVideoContainer {
border: 5px solid #fff;
-moz-box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.5);
-webkit-box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.5);
-o-box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.5);
box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.5);
}
-/* line 585, ../sass/_room.scss */
+/* line 654, ../sass/_room.scss */
#myVideoContainer {
position: absolute;
bottom: 20px;
right: 20px;
z-index: 999;
}
-/* line 592, ../sass/_room.scss */
+/* line 661, ../sass/_room.scss */
.attendeeStatus {
position: absolute;
top: 20px;
@@ -2521,12 +2592,12 @@ body#cover .message {
-khtml-border-bottom-left-radius: 5px;
border-bottom-left-radius: 5px;
}
-/* line 601, ../sass/_room.scss */
+/* line 670, ../sass/_room.scss */
.attendeeStatus .status {
margin-left: 5px;
}
-/* line 606, ../sass/_room.scss */
+/* line 675, ../sass/_room.scss */
#myStatus {
position: absolute;
right: 0;
@@ -2541,23 +2612,23 @@ body#cover .message {
-khtml-border-bottom-left-radius: 5px;
border-bottom-left-radius: 5px;
}
-/* line 615, ../sass/_room.scss */
+/* line 684, ../sass/_room.scss */
#myStatus .status {
margin-left: 1px;
}
-/* line 620, ../sass/_room.scss */
+/* line 689, ../sass/_room.scss */
.attendeeStatus, #myStatus {
font-weight: 700;
z-index: 2;
}
-/* line 624, ../sass/_room.scss */
+/* line 693, ../sass/_room.scss */
.attendeeStatus .status, #myStatus .status {
color: #ef5922;
font-size: 11px;
}
-/* line 630, ../sass/_room.scss */
+/* line 699, ../sass/_room.scss */
.friendVideo {
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
@@ -2567,7 +2638,7 @@ body#cover .message {
/**********************************************************/
/* CHAT BOX */
-/* line 638, ../sass/_room.scss */
+/* line 707, ../sass/_room.scss */
#hideChatButton, #showChatButton {
font-weight: bold;
background: #3797a2;
@@ -2580,26 +2651,26 @@ body#cover .message {
font-size: 10px;
letter-spacing: .05em;
}
-/* line 648, ../sass/_room.scss */
+/* line 717, ../sass/_room.scss */
#hideChatButton:hover, #showChatButton:hover {
background: #31858f;
}
-/* line 653, ../sass/_room.scss */
+/* line 722, ../sass/_room.scss */
#hideChatButton {
position: absolute;
top: 5px;
right: 25px;
z-index: 3;
}
-/* line 660, ../sass/_room.scss */
+/* line 729, ../sass/_room.scss */
#showChatButton {
position: absolute;
right: 220px;
}
-/* line 665, ../sass/_room.scss */
+/* line 734, ../sass/_room.scss */
#chatBoxContainer {
margin-left: 360px;
margin-right: 200px;
@@ -2612,7 +2683,7 @@ body#cover .message {
position: relative;
}
-/* line 674, ../sass/_room.scss */
+/* line 743, ../sass/_room.scss */
#chatBox {
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
@@ -2632,7 +2703,7 @@ body#cover .message {
position: relative;
}
-/* line 685, ../sass/_room.scss */
+/* line 754, ../sass/_room.scss */
#chatMessages {
height: 100%;
-moz-box-sizing: border-box;
@@ -2642,16 +2713,16 @@ body#cover .message {
padding: 5px 15px;
overflow: auto;
}
-/* line 691, ../sass/_room.scss */
+/* line 760, ../sass/_room.scss */
#chatMessages .chatMessage {
margin: 5px 0px;
}
-/* line 695, ../sass/_room.scss */
+/* line 764, ../sass/_room.scss */
#chatMessages .chatMessageAuthor {
font-weight: bold;
}
-/* line 700, ../sass/_room.scss */
+/* line 769, ../sass/_room.scss */
#chatInputContainer {
position: absolute;
bottom: 0px;
@@ -2664,7 +2735,7 @@ body#cover .message {
padding: 5px;
height: 35px;
}
-/* line 709, ../sass/_room.scss */
+/* line 778, ../sass/_room.scss */
#chatInputContainer input {
display: block;
width: 100%;
@@ -2681,7 +2752,7 @@ body#cover .message {
border-radius: 3px;
font-size: 13px;
}
-/* line 721, ../sass/_room.scss */
+/* line 790, ../sass/_room.scss */
#chatInputContainer input:focus {
outline: none;
background: #ddedee;
View
2 static/js/validation.js
@@ -12,7 +12,7 @@ $(document).ready(function(){
};
- $('form').submit(function(e){
+ $(document).on('submit', 'form', function(e){
// clear previous errors
$('.formItemError').remove();
View
81 static/sass/_room.scss
@@ -1,5 +1,79 @@
/**********************************************************/
+/* DRESSING ROOM */
+
+#dressingRoom {
+ h1 {
+ padding:40px;
+ text-align: center;
+
+ img {
+ width:230px;
+ }
+ }
+
+
+}
+
+#dressingRoomBox {
+ width:800px;
+ @include lightBrownBorder;
+ background:#fff;
+ padding:30px;
+ margin:0px auto;
+ @include clearfix;
+
+ h2 {
+ @include bigFatLetters;
+ font-size:30px;
+ text-align: center;
+ color:$darkBlue;
+ }
+
+ p.intro {
+ margin-top:10px;
+ text-align: center;
+ width:80%;
+ margin:10px auto 20px auto;
+ }
+
+ #testVideoContainer {
+ float: left;
+ width:370px;
+ margin-right: 20px;
+ height:240px;
+ }
+
+ h3 {
+ @include bigFatLetters;
+ font-size:16px;
+ color:$mediumBlue;
+ margin-bottom:10px;
+ }
+
+ ul {
+ margin-left: 400px;
+ padding-left:25px;
+ }
+
+ li {
+ list-style-type: disc;
+ font-size:16px;
+ padding:5px 0px;
+ }
+
+ .bigButton {
+ margin-top:20px;
+ }
+}
+
+
+/**********************************************************/
/* COOKING ROOM */
+
+#roomBg {
+ background: url(/static/images/bg_clouds.png) center top no-repeat;
+ padding:0px 20px;
+}
#cookingRoom {
background: #fff url(/static/images/textureSoft.png);
@@ -8,11 +82,6 @@
display: none;
}
- #roomBg {
- background: url(/static/images/bg_clouds.png) center top no-repeat;
- padding:0px 20px;
- }
-
header {
width:100%;
height:65px;
@@ -577,7 +646,7 @@ $widgetNavHeight:45px;
}
}
-#myVideoContainer, .friendVideo {
+#myVideoContainer, .friendVideo, #testVideoContainer {
border:5px solid #fff;
@include box-shadow(0px 1px 4px rgba(0,0,0,.5));
}
View
68 templates/dressingRoom.html
@@ -0,0 +1,68 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+<head>
+<title>HotPot prototype! yeah!!</title>
+
+<!-- Typekit -->
+<script type="text/javascript" src="http://use.typekit.com/qje5yme.js"></script>
+<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
+
+<!-- jQuery -->
+<script src="http://code.jquery.com/jquery-1.6.4.min.js" type="text/javascript"></script>
+
+<!-- OpenTok JS -->
+<script src="http://static.opentok.com/v0.91/js/TB.min.js" type="text/javascript"></script>
+<script type="text/javascript">
+$(document).ready(function(){
+
+ var openTokAPIKey = "6303111";
+
+ // create and initialize a session object
+ openTokSession = TB.initSession("{{ sessionId }}");
+
+ // add event listeners... the handlers are in opentok.js
+ openTokSession.addEventListener('sessionConnected', sessionConnectedHandler);
+
+ // actually connect to that session using the API key and this user's token (generated in and sent over by socketstuff.py)
+ openTokSession.connect(openTokAPIKey, "{{ token }}");
+
+ function sessionConnectedHandler(event) {
+ // start publishing my video
+ publisher = openTokSession.publish('myVideo', { width: 370, height:240 });
+ }
+});
+
+</script>
+
+<link rel="stylesheet" href="/static/css/core.css" type="text/css" />
+
+</head>
+
+<body id="dressingRoom">
+
+<div id="roomBg">
+
+ <h1><img src="/static/images/HotpotLogo_Alpha.png"></h1>
+
+ <div id="dressingRoomBox">
+ <h2>Get Ready to Cook!</h2>
+
+ <p class="intro">Set up your webcam and check your hair below. When all looks good, click “Let’s Go!” to enter the Cooking Room.</p>
+
+ <div id="testVideoContainer">
+ <div id="myVideo"></div>
+ </div>
+
+ <h3>Video not working?</h3>
+ <ul>
+ <li>Click the settings icon to the left and select your camera.</li>
+ <li>Give Flash permission to access your camera.</li>
+ <li>(Make sure you have Flash 11 installed.)</li>
+ </ul>
+ <a href="/rooms/{{ roomId }}" class="bigButton">Let's Go!</a>
+
+ </div>
+
+</div><!-- #roomBg -->
+</body>
+</html>
View
2 templates/index.html
@@ -37,7 +37,7 @@
$('#registrationFormContainer').fadeIn();
});
- $('#registrationForm, #loginForm').submit(function(e){
+ $(document).on('submit', '#registrationForm, #loginForm', function(e){
// we're not sending passwords in the clear, yay!
// although yang says in a perfect world i would be using https...
// hmph.
View
5 templates/room.html
@@ -250,10 +250,11 @@ <h1 id="recipeTitle">
<!-- OpenTok adds video elements here -->
</div>
- <div id="myStatus">
+ <!-- apparently positioning this over the video container makes it impossible to click "allow" -->
+ <!-- div id="myStatus">
<span class="name">{{ user.name }}</span>
<span class="status"></span>
- </div>
+ </div> -->
</div>
<div id="chatBoxContainer">

0 comments on commit b2c9b0a

Please sign in to comment.