From c6ba9680a632c196ce8a695b2a48ff2071eddac9 Mon Sep 17 00:00:00 2001 From: Andrew Scholer Date: Wed, 22 Mar 2023 07:07:04 -0700 Subject: [PATCH 1/7] Get rid of col-md-12 in interactives Was there from an experiment with code/output side/side --- runestone/activecode/activecode.py | 2 +- runestone/activecode/css/activecode.css | 4 ---- runestone/activecode/js/activecode.js | 7 ++----- runestone/common/js/presenter_mode.js | 2 +- runestone/hparsons/hparsons.py | 2 +- runestone/hparsons/js/SQLFeedback.js | 2 +- runestone/hparsons/js/hparsons.js | 1 - 7 files changed, 6 insertions(+), 14 deletions(-) diff --git a/runestone/activecode/activecode.py b/runestone/activecode/activecode.py index d565ff78f..34d974c1f 100644 --- a/runestone/activecode/activecode.py +++ b/runestone/activecode/activecode.py @@ -87,7 +87,7 @@ def setup(app): TEMPLATE_START = """
-
+
""" TEMPLATE_END = """ diff --git a/runestone/activecode/css/activecode.css b/runestone/activecode/css/activecode.css index 36475353c..719ab4561 100644 --- a/runestone/activecode/css/activecode.css +++ b/runestone/activecode/css/activecode.css @@ -102,10 +102,6 @@ border: 2px solid black; } -.ac_section > .col-md-12 { - max-width: 100% !important; -} - .full_width ol { max-width: 100% !important; } diff --git a/runestone/activecode/js/activecode.js b/runestone/activecode/js/activecode.js index c4610ab2d..968ec6219 100755 --- a/runestone/activecode/js/activecode.js +++ b/runestone/activecode/js/activecode.js @@ -159,7 +159,7 @@ export class ActiveCode extends RunestoneBase { var linkdiv = document.createElement("div"); linkdiv.id = this.divid.replace(/_/g, "-").toLowerCase(); // :ref: changes _ to - so add this as a target var codeDiv = document.createElement("div"); - $(codeDiv).addClass("ac_code_div col-md-12"); + $(codeDiv).addClass("ac_code_div"); this.codeDiv = codeDiv; this.outerDiv.lang = this.language; $(this.origElem).replaceWith(this.outerDiv); @@ -286,7 +286,6 @@ export class ActiveCode extends RunestoneBase { var ctrlDiv = document.createElement("div"); var butt; $(ctrlDiv).addClass("ac_actions"); - $(ctrlDiv).addClass("col-md-12"); // Run butt = document.createElement("button"); $(butt).text($.i18n("msg_activecode_run_code")); @@ -703,7 +702,7 @@ export class ActiveCode extends RunestoneBase { // to hold turtle graphics output. We use a div in case the turtle changes from // using a canvas to using some other element like svg in the future. var outDiv = document.createElement("div"); - $(outDiv).addClass("ac_output col-md-12"); + $(outDiv).addClass("ac_output"); this.outDiv = outDiv; this.output = document.createElement("pre"); this.output.id = this.divid + "_stdout"; @@ -731,12 +730,10 @@ export class ActiveCode extends RunestoneBase { this.outerDiv.appendChild(outDiv); var lensDiv = document.createElement("div"); lensDiv.id = `${this.divid}_codelens`; - $(lensDiv).addClass("col-md-12"); $(lensDiv).css("display", "none"); this.codelens = lensDiv; this.outerDiv.appendChild(lensDiv); var coachDiv = document.createElement("div"); - $(coachDiv).addClass("col-md-12"); $(coachDiv).css("display", "none"); this.codecoach = coachDiv; this.outerDiv.appendChild(coachDiv); diff --git a/runestone/common/js/presenter_mode.js b/runestone/common/js/presenter_mode.js index d7277d2ec..5edb6da06 100644 --- a/runestone/common/js/presenter_mode.js +++ b/runestone/common/js/presenter_mode.js @@ -138,7 +138,7 @@ function codelensListener(duration) { function configureCodelens() { let acCodeTitle = document.createElement("h4"); acCodeTitle.textContent = "Active Code Window"; - let acCode = $(".ac_code_div").removeClass("col-md-12"); + let acCode = $(".ac_code_div"); $(".ac_code_div").addClass("col-md-6"); acCode.prepend(acCodeTitle); diff --git a/runestone/hparsons/hparsons.py b/runestone/hparsons/hparsons.py index 1971d288d..a0b69672a 100755 --- a/runestone/hparsons/hparsons.py +++ b/runestone/hparsons/hparsons.py @@ -39,7 +39,7 @@ def setup(app): TEMPLATE_START = """
-
+
""" TEMPLATE_END = """ diff --git a/runestone/hparsons/js/SQLFeedback.js b/runestone/hparsons/js/SQLFeedback.js index 55b5ca097..7cb0163cb 100644 --- a/runestone/hparsons/js/SQLFeedback.js +++ b/runestone/hparsons/js/SQLFeedback.js @@ -9,7 +9,7 @@ export default class SQLFeedback extends HParsonsFeedback { createOutput() { var outDiv = document.createElement("div"); - $(outDiv).addClass("hp_output col-md-12"); + $(outDiv).addClass("hp_output"); this.outDiv = outDiv; this.output = document.createElement("pre"); this.output.id = this.hparsons.divid + "_stdout"; diff --git a/runestone/hparsons/js/hparsons.js b/runestone/hparsons/js/hparsons.js index e242ef91b..30f903f15 100644 --- a/runestone/hparsons/js/hparsons.js +++ b/runestone/hparsons/js/hparsons.js @@ -125,7 +125,6 @@ export default class HParsons extends RunestoneBase { createControls() { var ctrlDiv = document.createElement("div"); $(ctrlDiv).addClass("hp_actions"); - $(ctrlDiv).addClass("col-md-12"); // Run Button this.runButton = document.createElement("button"); From 8f3eea2e0aaab36943eea3796e92f0736659988a Mon Sep 17 00:00:00 2001 From: Andrew Scholer Date: Wed, 22 Mar 2023 07:07:38 -0700 Subject: [PATCH 2/7] Margin tweaks for activecode --- runestone/activecode/css/activecode.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/runestone/activecode/css/activecode.css b/runestone/activecode/css/activecode.css index 719ab4561..30936129e 100644 --- a/runestone/activecode/css/activecode.css +++ b/runestone/activecode/css/activecode.css @@ -67,6 +67,7 @@ .ac_output { margin-top: 10px; + margin-bottom: -10px; display: none; background-color: inherit; } @@ -146,3 +147,7 @@ margin-bottom: 10px; min-height: 0px !important; } + +.codelens { + margin-bottom: 20px; +} \ No newline at end of file From c7206fdd1deacf749f5f7346f5c690944ada06fc Mon Sep 17 00:00:00 2001 From: Andrew Scholer Date: Wed, 22 Mar 2023 07:08:16 -0700 Subject: [PATCH 3/7] Activecode - remove useless divs. Add class to codelens and codecoach divs --- runestone/activecode/js/activecode.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/runestone/activecode/js/activecode.js b/runestone/activecode/js/activecode.js index 968ec6219..a6f060f70 100755 --- a/runestone/activecode/js/activecode.js +++ b/runestone/activecode/js/activecode.js @@ -722,24 +722,20 @@ export class ActiveCode extends RunestoneBase { $(this.graphics).addClass("visible-ac-canvas"); }.bind(this) ); - var clearDiv = document.createElement("div"); - $(clearDiv).css("clear", "both"); // needed to make parent div resize properly - this.outerDiv.appendChild(clearDiv); outDiv.appendChild(this.output); outDiv.appendChild(this.graphics); this.outerDiv.appendChild(outDiv); var lensDiv = document.createElement("div"); + lensDiv.classList.add("codelens"); lensDiv.id = `${this.divid}_codelens`; $(lensDiv).css("display", "none"); this.codelens = lensDiv; this.outerDiv.appendChild(lensDiv); var coachDiv = document.createElement("div"); + coachDiv.classList.add("codecoach"); $(coachDiv).css("display", "none"); this.codecoach = coachDiv; this.outerDiv.appendChild(coachDiv); - clearDiv = document.createElement("div"); - $(clearDiv).css("clear", "both"); // needed to make parent div resize properly - this.outerDiv.appendChild(clearDiv); } disableSaveLoad() { From 7edee14ea180cfcaf096c46e678121c1ad1ec4e3 Mon Sep 17 00:00:00 2001 From: Andrew Scholer Date: Wed, 22 Mar 2023 07:09:05 -0700 Subject: [PATCH 4/7] Remove alignVertical from activecode --- runestone/activecode/js/acfactory.js | 3 --- runestone/activecode/js/activecode.js | 1 - runestone/activecode/js/activecode_html.js | 13 ------------- 3 files changed, 17 deletions(-) diff --git a/runestone/activecode/js/acfactory.js b/runestone/activecode/js/acfactory.js index 9f907eed9..40051f1fa 100644 --- a/runestone/activecode/js/acfactory.js +++ b/runestone/activecode/js/acfactory.js @@ -86,9 +86,6 @@ export default class ACFactory { sid: sid, graderactive: true, }; - if (language === "htmlmixed") { - addopts["vertical"] = true; - } newac = ACFactory.createActiveCode(thepre, language, addopts); var savediv = newac.divid; newac.divid = savediv; diff --git a/runestone/activecode/js/activecode.js b/runestone/activecode/js/activecode.js index a6f060f70..4c382928c 100755 --- a/runestone/activecode/js/activecode.js +++ b/runestone/activecode/js/activecode.js @@ -63,7 +63,6 @@ export class ActiveCode extends RunestoneBase { this.containerDiv = opts.orig; this.useRunestoneServices = opts.useRunestoneServices; this.python3 = true; - this.alignVertical = opts.vertical; this.origElem = orig; this.origText = this.origElem.textContent; this.divid = opts.orig.id; diff --git a/runestone/activecode/js/activecode_html.js b/runestone/activecode/js/activecode_html.js index 5912bd588..c6844789a 100644 --- a/runestone/activecode/js/activecode_html.js +++ b/runestone/activecode/js/activecode_html.js @@ -3,7 +3,6 @@ import { ActiveCode } from "./activecode.js"; export default class HTMLActiveCode extends ActiveCode { constructor(opts) { super(opts); - opts.alignVertical = true; this.code = $("