Skip to content

Commit a5b2aad

Browse files
committed
minor wording edits
1 parent 6f49bd8 commit a5b2aad

4 files changed

Lines changed: 73 additions & 3 deletions

File tree

v3/composingprograms.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
data-scope="https://www.googleapis.com/auth/plus.profile.emails.read">
8989
</span>
9090

91-
Use either your UC Berkeley account or personal Google account to
91+
[optional] Use your UC Berkeley email or personal Google account to
9292
identify yourself when chatting.
9393

9494
</div>

v3/css/composingprograms.css

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,55 @@ div.ExecutionVisualizer div.highlightedStackFrame {
2323
border-left: 2px solid #686f70;
2424
}
2525

26+
/* from http://rog.ie/blog/css-star-rater */
27+
.star-rating {
28+
font-size: 0;
29+
white-space: nowrap;
30+
display: inline-block;
31+
/* pgbovine - scale this appropriately with a 5:1 ratio */
32+
width: 100px;
33+
height: 20px;
34+
overflow: hidden;
35+
position: relative;
36+
background: url('data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiB3aWR0aD0iMjBweCIgaGVpZ2h0PSIyMHB4IiB2aWV3Qm94PSIwIDAgMjAgMjAiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDIwIDIwIiB4bWw6c3BhY2U9InByZXNlcnZlIj48cG9seWdvbiBmaWxsPSIjREREREREIiBwb2ludHM9IjEwLDAgMTMuMDksNi41ODMgMjAsNy42MzkgMTUsMTIuNzY0IDE2LjE4LDIwIDEwLDE2LjU4MyAzLjgyLDIwIDUsMTIuNzY0IDAsNy42MzkgNi45MSw2LjU4MyAiLz48L3N2Zz4=');
37+
background-size: contain;
38+
}
39+
.star-rating i {
40+
opacity: 0;
41+
position: absolute;
42+
left: 0;
43+
top: 0;
44+
height: 100%;
45+
width: 20%;
46+
z-index: 1;
47+
background: url('data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4IiB3aWR0aD0iMjBweCIgaGVpZ2h0PSIyMHB4IiB2aWV3Qm94PSIwIDAgMjAgMjAiIGVuYWJsZS1iYWNrZ3JvdW5kPSJuZXcgMCAwIDIwIDIwIiB4bWw6c3BhY2U9InByZXNlcnZlIj48cG9seWdvbiBmaWxsPSIjRkZERjg4IiBwb2ludHM9IjEwLDAgMTMuMDksNi41ODMgMjAsNy42MzkgMTUsMTIuNzY0IDE2LjE4LDIwIDEwLDE2LjU4MyAzLjgyLDIwIDUsMTIuNzY0IDAsNy42MzkgNi45MSw2LjU4MyAiLz48L3N2Zz4=');
48+
background-size: contain;
49+
}
50+
.star-rating input {
51+
-moz-appearance: none;
52+
-webkit-appearance: none;
53+
opacity: 0;
54+
display: inline-block;
55+
width: 20%;
56+
height: 100%;
57+
margin: 0;
58+
padding: 0;
59+
z-index: 2;
60+
position: relative;
61+
}
62+
.star-rating input:hover + i,
63+
.star-rating input:checked + i {
64+
opacity: 1;
65+
}
66+
.star-rating i ~ i {
67+
width: 40%;
68+
}
69+
.star-rating i ~ i ~ i {
70+
width: 60%;
71+
}
72+
.star-rating i ~ i ~ i ~ i {
73+
width: 80%;
74+
}
75+
.star-rating i ~ i ~ i ~ i ~ i {
76+
width: 100%;
77+
}

v3/js/composingprograms.js

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,27 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
4242
var originFrontendJsFile = 'composingprograms.js';
4343

4444

45-
var chatDisplayName = null; // sign in with Google account to get your real chat name
45+
var postSessionSurvey = '\n\
46+
<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\
48+
How useful was this particular session? (click star to rate)\n\
49+
<span class="star-rating">\n\
50+
<input type="radio" name="rating" value="1"/><i></i>\n\
51+
<input type="radio" name="rating" value="2"/><i></i>\n\
52+
<input type="radio" name="rating" value="3"/><i></i>\n\
53+
<input type="radio" name="rating" value="4"/><i></i>\n\
54+
<input type="radio" name="rating" value="5"/><i></i>\n\
55+
</span>\n\
56+
<br/>\
57+
What did you just learn? <input type="text" id="what-learned" class="surveyQ" size=60 maxlength=140/>\n\
58+
<button id="submitSessionSurveyBtn" type="button" style="font-size: 8pt;">Submit</button>\n\
59+
</div>'
60+
4661

4762
function TogetherjsReadyHandler() {
4863
populateTogetherJsShareUrl();
4964
$("#togetherjsStatus").append(informedConsentText);
65+
$("#togetherjsStatus").append(postSessionSurvey);
5066

5167
updateChatName();
5268
}
@@ -91,6 +107,8 @@ $(document).ready(function() {
91107
});
92108

93109

110+
var chatDisplayName = null; // sign in with Google account to get your real chat name
111+
94112
// for Google+ Web signin:
95113
// https://developers.google.com/+/web/signin/add-button
96114
function signinCallback(authResult) {

v3/js/opt-frontend-common.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ var pendingCodeOutputScrollTop = null;
102102
var codeMirrorScroller = '#codeInputPane .CodeMirror-scroll';
103103

104104

105-
var informedConsentText = '<div style="font-size: 8pt; color: #666;">During shared sessions, chat logs and code may be recorded and published for<br/>research and education. Please do not reveal any private or sensitive information.</div>';
105+
var informedConsentText = '<div style="font-size: 8pt; color: #666;">Your chat logs and code may be recorded, anonymized, and published for research purposes.</div>';
106106

107107

108108
function requestSync() {

0 commit comments

Comments
 (0)