simplify Slido Clicker

firasm · Sep 21, 2020 · 5db5e85 · 5db5e85
1 parent 02ef4b1
commit 5db5e85
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 16 deletions.
diff --git a/class/week01/lecture2.ipynb b/class/week01/lecture2.ipynb
@@ -629,7 +629,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 7,
    "metadata": {
     "slideshow": {
      "slide_type": "subslide"
@@ -650,10 +650,10 @@
        "        "
       ],
       "text/plain": [
-       "<IPython.lib.display.IFrame at 0x10c0cdfa0>"
+       "<IPython.lib.display.IFrame at 0x10a78bb20>"
       ]
      },
-     "execution_count": 3,
+     "execution_count": 7,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -711,7 +711,7 @@
        "        "
       ],
       "text/plain": [
-       "<IPython.lib.display.IFrame at 0x10c0cdd30>"
+       "<IPython.lib.display.IFrame at 0x10a78b850>"
       ]
      },
      "execution_count": 4,
@@ -747,23 +747,33 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": 5,
    "metadata": {
     "slideshow": {
      "slide_type": "fragment"
     }
    },
    "outputs": [
     {
-     "ename": "NameError",
-     "evalue": "name 'IFrame' is not defined",
-     "output_type": "error",
-     "traceback": [
-      "\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
-      "\u001b[0;31mNameError\u001b[0m                                 Traceback (most recent call last)",
-      "\u001b[0;32m<ipython-input-1-a770b2161931>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m\u001b[0m\n\u001b[0;32m----> 1\u001b[0;31m \u001b[0mIFrame\u001b[0m\u001b[0;34m(\u001b[0m\u001b[0;34m'https://ubc.ca1.qualtrics.com/jfe/form/SV_eboA3fyVCFkhixn'\u001b[0m\u001b[0;34m,\u001b[0m\u001b[0mwidth\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0;36m750\u001b[0m\u001b[0;34m,\u001b[0m\u001b[0mheight\u001b[0m\u001b[0;34m=\u001b[0m\u001b[0;36m1300\u001b[0m\u001b[0;34m)\u001b[0m\u001b[0;34m\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m",
-      "\u001b[0;31mNameError\u001b[0m: name 'IFrame' is not defined"
-     ]
+     "data": {
+      "text/html": [
+       "\n",
+       "        <iframe\n",
+       "            width=\"750\"\n",
+       "            height=\"1300\"\n",
+       "            src=\"https://ubc.ca1.qualtrics.com/jfe/form/SV_eboA3fyVCFkhixn\"\n",
+       "            frameborder=\"0\"\n",
+       "            allowfullscreen\n",
+       "        ></iframe>\n",
+       "        "
+      ],
+      "text/plain": [
+       "<IPython.lib.display.IFrame at 0x10c021430>"
+      ]
+     },
+     "execution_count": 5,
+     "metadata": {},
+     "output_type": "execute_result"
     }
    ],
    "source": [
@@ -839,7 +849,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 6,
    "metadata": {
     "slideshow": {
      "slide_type": "skip"

diff --git a/class/week04/week04_summary.md b/class/week04/week04_summary.md
@@ -10,4 +10,11 @@ This week in the lecture we will go through the following worksheet and clicker
 
 ## PhET Simulation
 
-<iframe src="https://phet.colorado.edu/sims/html/molecule-shapes/latest/molecule-shapes_en.html" width="100%" height="600" scrolling="no" allowfullscreen></iframe>
+<iframe src="https://phet.colorado.edu/sims/html/molecule-shapes/latest/molecule-shapes_en.html" width="100%" height="600" scrolling="no" allowfullscreen></iframe>
+
+## Drawing Molecules with MarvinJS
+
+More [details about MarvinJS here](https://chemaxon.com/products/marvin-js)
+
+<iframe id="sketch" src="https://marvinjs-demo.chemaxon.com/latest/editor.html" 
+style="overflow: hidden; width: 800px; min-height: 450px; border: 1px solid darkgray;"  width="100%" height="800px"/>