Skip to content

Commit 79109d8

Browse files
pgbovinepgbovine
committed
more tweaks
1 parent cc01e6c commit 79109d8

6 files changed

Lines changed: 31 additions & 23 deletions

File tree

‎v3/composingprograms.html‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,15 @@
7575

7676
<table id="experimentalHeader" style="margin-bottom: 15pt;">
7777

78-
79-
<div id="gplusDiv" style="margin-bottom: 10pt; margin-left: 5px;">
78+
<tr>
79+
<td valign="top">
8080

8181
<div id="signinButton" style="font-size: 8pt;">
82+
<div style="width: 200px; margin-bottom: 8px;">
83+
Teaching staff can sign in with either their Berkeley email or Google
84+
account to identify themselves when chatting.
85+
</div>
86+
8287
<span
8388
class="g-signin"
8489
data-callback="signinCallback"
@@ -87,22 +92,13 @@
8792
data-requestvisibleactions="http://schemas.google.com/AddActivity"
8893
data-scope="https://www.googleapis.com/auth/plus.profile.emails.read">
8994
</span>
90-
91-
[optional] Use your UC Berkeley email or personal Google account to
92-
identify yourself when chatting.
93-
9495
</div>
9596

96-
<div id="loggedInDiv" style="display: none;">
97-
<span id="loggedInNameDisplay"></span>
98-
<button id="signoutButton" style="font-size: 8pt; margin-left: 5px;">Sign out to chat anonymously</button>
97+
<div id="loggedInDiv" style="display: none; margin-bottom: 8px;">
98+
<div id="loggedInNameDisplay"></div>
99+
<button id="signoutButton" style="font-size: 8pt; margin-top: 5px;">Sign out to chat anonymously</button>
99100
</div>
100101

101-
</div>
102-
103-
104-
<tr>
105-
<td valign="top">
106102

107103
<div>
108104
<button id="sharedSessionBtn" type="button" class="togetherjsBtn">
@@ -112,9 +108,12 @@
112108

113109
<div>
114110
<button id="stopTogetherJSBtn" type="button" class="togetherjsBtn" style="display: none;">
115-
Quit shared session
111+
End shared session
116112
</button>
117113
</div>
114+
115+
<div><button id="syncBtn" type="button" style="display: none;">Force sync</button></div>
116+
118117
</td>
119118

120119
<td valign="top" style="padding-left: 20px;">

‎v3/csc108h.html‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,12 @@
8484

8585
<div>
8686
<button id="stopTogetherJSBtn" type="button" class="togetherjsBtn" style="display: none;">
87-
Quit shared session
87+
End shared session
8888
</button>
8989
</div>
90+
91+
<div><button id="syncBtn" type="button" style="display: none;">Force sync</button></div>
92+
9093
</td>
9194

9295
<td valign="top" style="padding-left: 20px;">

‎v3/css/opt-frontend.css‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,5 +100,10 @@ button.surveyBtn {
100100
margin-top: 6px;
101101
}
102102

103+
#syncBtn {
104+
font-size: 8pt;
105+
margin-top: 10px;
106+
}
107+
103108
/* necessary for CodeMirror error line highlighting to work! */
104109
.CodeMirror .errorLine { background: #ffff3f !important; }

‎v3/js/composingprograms.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ var originFrontendJsFile = 'composingprograms.js';
4444

4545
var postSessionSurvey = '\n\
4646
<div style="border: 1px solid #C2382F; padding: 5px; margin-top: 10px; line-height: 175%;">\n\
47-
<span style="font-size: 8pt; color: #666;">Support our research by answering these questions after you finish:</span><br/>\n\
47+
<span style="font-size: 8pt; color: #666;">Support our research by answering these questions before you leave:</span><br/>\n\
4848
How useful was this particular session? (click star to rate)\n\
4949
<span class="star-rating">\n\
5050
<input type="radio" name="rating" value="1"/><i></i>\n\

‎v3/js/opt-frontend-common.js‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -373,13 +373,14 @@ function initTogetherJS() {
373373

374374
$("#sharedSessionBtn").click(startSharedSession);
375375
$("#stopTogetherJSBtn").click(TogetherJS); // toggles off
376+
$("#syncBtn").click(requestSync);
376377

377378
// fired when TogetherJS is activated. might fire on page load if there's
378379
// already an open session from a prior page load in the recent past.
379380
TogetherJS.on("ready", function () {
380381
console.log("TogetherJS ready");
381382

382-
$("#stopTogetherJSBtn").show();
383+
$("#stopTogetherJSBtn,#syncBtn").show();
383384
$("#sharedSessionBtn").hide();
384385

385386
requestSync(); // immediately try to sync upon startup so that if
@@ -397,7 +398,7 @@ function initTogetherJS() {
397398
console.log("TogetherJS close");
398399

399400
$("#togetherjsStatus").html(''); // clear it
400-
$("#stopTogetherJSBtn").hide();
401+
$("#stopTogetherJSBtn,#syncBtn").hide();
401402
$("#sharedSessionBtn").show();
402403

403404
TogetherjsCloseHandler(); // needs to be defined in each frontend
@@ -429,10 +430,8 @@ function populateTogetherJsShareUrl() {
429430
<input type="text" style="font-size: 10pt; \
430431
font-weight: bold; padding: 3px;\
431432
margin-bottom: 6pt;" \
432-
id="togetherjsURL" size="80" readonly="readonly"/>\
433-
<button id="syncBtn" type="button" style="font-size: 8pt;">Force sync</button>');
433+
id="togetherjsURL" size="80" readonly="readonly"/>');
434434
$("#togetherjsURL").val(urlToShare).attr('size', urlToShare.length + 20);
435-
$("#syncBtn").click(requestSync);
436435
}
437436

438437
// END - shared session stuff

‎v3/visualize.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,12 @@
111111

112112
<div>
113113
<button id="stopTogetherJSBtn" type="button" class="togetherjsBtn" style="display: none;">
114-
Quit shared session
114+
End shared session
115115
</button>
116116
</div>
117117

118+
<div><button id="syncBtn" type="button" style="display: none;">Force sync</button></div>
119+
118120
</td>
119121
<td valign="top" style="padding-left: 20px;">
120122

0 commit comments

Comments
 (0)