Skip to content

Commit d586e41

Browse files
committed
deploy updates
1 parent a94a53f commit d586e41

16 files changed

+205
-223
lines changed

_images/instructor_cursor.png

164 KB
Loading

_images/mentioning_student.png

219 KB
Loading

_images/student_got_mentioned.png

236 KB
Loading

_images/student_replies.png

227 KB
Loading

_sources/backups.rst.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ Backups
88
:local:
99
:depth: 1
1010

11+
.. _snapshots:
12+
1113
###################
1214
Snapshots
1315
###################

_sources/teaching-course-management.rst.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.. _assignments-and-handouts:
2+
13
Assignments and Handouts
24
************************
35

Lines changed: 66 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,114 +1,88 @@
11
.. index:: Collaboration
22
.. _collaboration:
33

4-
=========================================================
54
Collaboration
6-
=========================================================
7-
8-
There are multiple ways in which you can interact with your students or collaborators, in this section we will present some features that you might find useful when managing a course.
5+
=============
96

7+
In principle, collaboration for the instructor project and all student projects is "the same" as for all other CoCalc projects. Here we will highlight some features and ways of using them that you might find useful specifically when managing a course.
108

119
.. contents::
1210
:local:
1311
:depth: 2
12+
13+
14+
Look at Students Work
15+
---------------------
16+
17+
As described in the handling of :ref:`assignments-and-handouts`, you can always open the files that each student is working on: before collecting them, during grading, or after. There can be several reasons for this:
18+
19+
- you may wonder how students are doing on a newly developed assignment that may need some tweaking to become more clear or more challenging
20+
- you may wonder if particular students need some extra help
21+
- unfortunately, sometimes you may wonder if some students are cheating...
22+
23+
Not only you can open each file at its current state, but you can also use :doc:`time-travel` to get a sense of its evolution and see what approaches have students tried to solve a problem or deal with code errors. If you see big chunks of text/code appearing in a single revision, they were likely copy-pasted from somewhere else.
24+
25+
26+
Edit Students Files
27+
-------------------
28+
29+
You do have write access to students projects and can make edits in their files and notebooks, even while students are actively editing these files as well. :doc:`time-travel` will keep track of who has done which change. If you are editing or looking at sections that are close to each other, you will see each other moving cursors with name tags:
30+
31+
.. figure:: img/teaching/instructor_cursor.png
32+
:width: 90%
33+
:align: center
34+
:alt: Instructor's Cursor in Student's View
35+
36+
Instructor's Cursor in Student's View
37+
38+
39+
Side Chats and Mentions
40+
-----------------------
41+
42+
Of course, it may be difficult to notice if you edit a file of a student, and it may be unexpected. Instead of editing the file directly or in addition to it, you can leave comments in a :ref:`side-chat` of any file and attract student's attention using :ref:`chat-at-mentions`. The student will get a notification, can reply to you, and then you will get a notification as well:
43+
44+
.. figure:: img/teaching/mentioning_student.png
45+
:width: 90%
46+
:align: center
47+
:alt: Mentioning Student in a Side Chat
48+
49+
Mentioning Student in a Side Chat
50+
51+
.. figure:: img/teaching/student_got_mentioned.png
52+
:width: 90%
53+
:align: center
54+
:alt: Student Sees a Mention Notification
55+
56+
Student Sees a Mention Notification
57+
58+
.. figure:: img/teaching/student_replies.png
59+
:width: 90%
60+
:align: center
61+
:alt: Student Replies to the Instructor
62+
63+
Student Replies to the Instructor
64+
65+
This may be even more useful in the other direction - any student can ask an instructor or a TA for help! They may also ask our :doc:`ai` for help, if you have not :ref:`disabled this functionality <restrict-student-projects>`.
1466

15-
.. index:: Collaboration; chat rooms
16-
.. _teaching-chatrooms:
17-
18-
#####################
19-
Real-time chatrooms
20-
#####################
21-
22-
You can create general real-time chatrooms for your CoCalc projects.
23-
You can create a project chat room by clicking on the **New** button, this will create a file with `.sage-chat` extension.
24-
25-
In addition, every file in CoCalc has a separate chat that can be found on the upper left corner of your screen.
26-
27-
.. image:: img/teaching/chat_button.png
28-
:width: 30%
29-
:alt: button at upper right for side chat with any file
30-
31-
Every time one of your students writes something into a chat on any one of their files,
32-
you will get a notification displayed on the top bar.
33-
34-
.. image:: img/teaching/instructor_notification.png
35-
:width: 66%
36-
:alt: notification count shown inside bell icon
37-
38-
Clicking on the notification button (bell icon on the top of the screen) displays a notification menu with the latest chats and modifications in the project or specific files.
39-
40-
.. image:: img/teaching/notification_highlighted.png
41-
:width: 100%
42-
:alt: click notification bell for list of latest notifications
43-
44-
The chat notifications are always presented at the top of the menu, followed by any updates you or your collaborators have done to the project. Clicking on a chat notification will take you to **the student's copy** of the file inside **his/her project**.
45-
From there, you can both reply to their questions and look at their work simultaneously.
46-
47-
.. image:: img/teaching/student_question.png
48-
:width: 66%
49-
:alt: clicking on notification expands to show detail
50-
51-
Once you have replied to the student's question (s)he will receive a notification.
52-
53-
54-
.. index:: Collaboration; multi-user editing
55-
.. _multi-user-edit:
56-
57-
############################
58-
Live collaborative editing
59-
############################
60-
61-
Multiple users can collaborate on a project.
62-
As soon as a collaborator is added to a a project (see :doc:`teaching-create-course`) they share both the project and the associated files.
63-
64-
Live collaborative editing is possible in CoCalc.
65-
If one of your collaborators updates a notebook, the rest can see the changes as they are being made (similar to Google Docs).
66-
67-
.. index:: @Mentions in chat
68-
.. index:: Mentions in chat
69-
.. index:: Chat; @mentions
70-
71-
.. _at-mention-chat:
72-
73-
################################
74-
@-Mention collaborators in chat
75-
################################
76-
77-
Using ``@`` followed by a recipient's name in a chat message you send, you can cause an email notification to be sent. See :ref:`chat-at-mentions` for more information.
7867

7968
.. index:: Shared project; in course
8069
.. index:: Collaboration; shared project
8170

82-
################################
83-
Shared Project
84-
################################
71+
Shared Project and Chat Rooms
72+
-----------------------------
8573

86-
You can create a common shared project for your course. Think of a shared project as your private course website for the students with automatic forum and code support. By default everybody (collaborators and students) will have **write** access to the project and its associated files.
74+
While regular student projects are isolated from each other, a shared project allows all students in a class to collaborate on a document or discuss some topics. For example, you can put an article into a shared project and all students can leave comments and ask/answer questions in a :ref:`side-chat`. Or you can create any number of standalone :ref:`chatroom`. To create or access your **Shared Project** use the corresponding tab in the course file.
8775

88-
To create a shared project you need to go to your **.course** file and click on the **Shared Project** button.
76+
Note that all students have equal access to the shared project. In particular, they are capable of deleting files or corrupting code in them, but if that happens it should be possible to restore the documents using :doc:`time-travel` and :ref:`snapshots`. Also, as a safeguard against accidents, you can change permission of some files to read-only in a :ref:`terminal`. For example, you can use ``chmod a-w filename`` to make a file read-only and ``chmod a+w filename`` to make it writable again.
8977

90-
.. image:: img/teaching/shared1.png
91-
:width: 100%
92-
:alt: creating a project that will be shared by all students
9378

94-
If you create a **.sage-chat** file here, all students will receive automatic notifications when questions are posted on the chat.
95-
96-
If you want to make a file or an assignment **read-only** so that students cannot modify it, you need to modify the file permissions. Launch a terminal and type::
97-
98-
chmod a-w filename
99-
100-
If you want to check the access permissions of all the files contained in a given directory, use the following::
101-
102-
ls -l
103-
104-
In case you want to change a read only file into a read and write, type::
79+
Group Projects
80+
--------------
10581

106-
chmod a+w filename
82+
When individual and shared projects are too extreme, you can also create projects for smaller groups.
10783

108-
################################
109-
Group Projects
110-
################################
84+
At the moment we do not provide a completely hassle free way of creating projects for groups, but it is on our road map and a possible workaround meanwhile is to create another course file where only some of the students are "enrolled" - these are "group leaders" designated by you. Once their projects are created, you or these leaders may add other members of each group as collaborators.
11185

112-
If you want students to work together in groups, you can assign a "leader" for each group, have them create a project, and add other members and you as collaborators. (Of course, you can also create all such projects yourself, although it can take some time.) Everybody will be able to collaborate on this project and modify files simultaneously.
86+
.. hint::
11387

114-
If you want to use automatic distribution and collection of assignments with group projects, you can create a course file with only group "leaders" added as students and then manually add other group memebers as collaborators. We do plan to add a more direct support for groups in the future.
88+
It is possible to edit student names in the course file. Such edits are local to that file, i.e. it does not affect student accounts. In the context of group projects you may change your leaders names to either group titles or names of all students in the group.

_static/custom.css

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ nav.wy-nav-top {
1212
background: #4375c1;
1313
}
1414

15+
.wy-body-for-nav {
16+
max-width: 2000px; /* Adjust this value as needed */
17+
width: 100%;
18+
padding: 20px;
19+
box-sizing: border-box;
20+
}
21+
1522
/* role: strike and :strike:`...` */
1623
span.strike {
1724
text-decoration: line-through;
@@ -31,7 +38,10 @@ div.sphinxsidebar h3 {
3138
}
3239

3340
div.body {
34-
max-width: 900px;
41+
display: flex;
42+
justify-content: center;
43+
margin: 0;
44+
padding: 0;
3545
}
3646

3747
/* https://github.com/sagemathinc/cocalc-doc/issues/4 */

backups.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -159,13 +159,13 @@
159159
<span id="index-0"></span><h1>Backups<a class="headerlink" href="#backups" title="Link to this heading"></a></h1>
160160
<nav class="contents local" id="contents">
161161
<ul class="simple">
162-
<li><p><a class="reference internal" href="#snapshots" id="id1">Snapshots</a></p></li>
163-
<li><p><a class="reference internal" href="#timetravel" id="id2">TimeTravel</a></p></li>
164-
<li><p><a class="reference internal" href="#off-site-backups" id="id3">Off-site backups</a></p></li>
162+
<li><p><a class="reference internal" href="#snapshots" id="id2">Snapshots</a></p></li>
163+
<li><p><a class="reference internal" href="#timetravel" id="id3">TimeTravel</a></p></li>
164+
<li><p><a class="reference internal" href="#off-site-backups" id="id4">Off-site backups</a></p></li>
165165
</ul>
166166
</nav>
167167
<section id="snapshots">
168-
<h2><a class="toc-backref" href="#id1" role="doc-backlink">Snapshots</a><a class="headerlink" href="#snapshots" title="Link to this heading"></a></h2>
168+
<span id="id1"></span><h2><a class="toc-backref" href="#id2" role="doc-backlink">Snapshots</a><a class="headerlink" href="#snapshots" title="Link to this heading"></a></h2>
169169
<p>All files in every project are snapshotted every couple of minutes.
170170
You can browse your snapshots by clicking the <strong>“Backups”</strong> link at the upper right of the <a class="reference internal" href="explorer.html"><span class="doc">Explorer</span></a> file listing.</p>
171171
<center><iframe
@@ -178,12 +178,12 @@ <h2><a class="toc-backref" href="#id1" role="doc-backlink">Snapshots</a><a class
178178
</iframe></center><p><em>Snapshot storage does not count against your disk space quota.</em> We provide all snapshot space for no additional charge.</p>
179179
</section>
180180
<section id="timetravel">
181-
<h2><a class="toc-backref" href="#id2" role="doc-backlink">TimeTravel</a><a class="headerlink" href="#timetravel" title="Link to this heading"></a></h2>
181+
<h2><a class="toc-backref" href="#id3" role="doc-backlink">TimeTravel</a><a class="headerlink" href="#timetravel" title="Link to this heading"></a></h2>
182182
<p>Also, CoCalc records the <a class="reference internal" href="time-travel.html"><span class="doc">history of all edits</span></a> you or your collaborators make to most files,
183183
and you can browse that history with a slider by clicking on the “Time Travel” button in sthe (next to save) in files.</p>
184184
</section>
185185
<section id="off-site-backups">
186-
<h2><a class="toc-backref" href="#id3" role="doc-backlink">Off-site backups</a><a class="headerlink" href="#off-site-backups" title="Link to this heading"></a></h2>
186+
<h2><a class="toc-backref" href="#id4" role="doc-backlink">Off-site backups</a><a class="headerlink" href="#off-site-backups" title="Link to this heading"></a></h2>
187187
<p>We care about your data, and also make offsite backups periodically to encrypted USB
188188
drives that are not physically connected to the internet.</p>
189189
</section>

genindex.html

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,6 @@ <h2 id="Symbols">Symbols</h2>
159159
<table style="width: 100%" class="indextable genindextable"><tr>
160160
<td style="width: 33%; vertical-align: top;"><ul>
161161
<li><a href="plus-new.html#index-0">(+) New</a>
162-
</li>
163-
</ul></td>
164-
<td style="width: 33%; vertical-align: top;"><ul>
165-
<li><a href="teaching-interactions.html#index-3">@Mentions in chat</a>
166162
</li>
167163
</ul></td>
168164
</tr></table>
@@ -295,8 +291,6 @@ <h2 id="C">C</h2>
295291
Chat
296292

297293
<ul>
298-
<li><a href="teaching-interactions.html#index-5">@mentions</a>
299-
</li>
300294
<li><a href="chat.html#index-0">chat rooms</a>
301295
</li>
302296
<li><a href="chat.html#index-2">side chat</a>
@@ -320,11 +314,7 @@ <h2 id="C">C</h2>
320314
<li><a href="teaching-interactions.html#index-0">Collaboration</a>
321315

322316
<ul>
323-
<li><a href="teaching-interactions.html#index-1">chat rooms</a>
324-
</li>
325-
<li><a href="teaching-interactions.html#index-2">multi-user editing</a>
326-
</li>
327-
<li><a href="teaching-interactions.html#index-7">shared project</a>
317+
<li><a href="teaching-interactions.html#index-2">shared project</a>
328318
</li>
329319
</ul></li>
330320
<li><a href="project-settings.html#index-13">Collaborators</a>
@@ -950,8 +940,6 @@ <h2 id="M">M</h2>
950940
<li><a href="howto/low-memory.html#index-1">low</a>
951941
</li>
952942
</ul></li>
953-
<li><a href="teaching-interactions.html#index-4">Mentions in chat</a>
954-
</li>
955943
<li><a href="howto/multiple-accounts.html#index-0">Multiple CoCalc Accounts</a>
956944
</li>
957945
<li><a href="howto/parallel.html#index-1">Multiple CPUs</a>
@@ -1227,7 +1215,7 @@ <h2 id="S">S</h2>
12271215
Shared project
12281216

12291217
<ul>
1230-
<li><a href="teaching-interactions.html#index-6">in course</a>
1218+
<li><a href="teaching-interactions.html#index-1">in course</a>
12311219
</li>
12321220
</ul></li>
12331221
<li><a href="howto/overleaf.html#index-1">Sharelatex</a>

0 commit comments

Comments
 (0)