From 534447bf8cbe043c99ca3ac1bb2907a6b375c190 Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Sun, 24 Apr 2016 14:56:21 +0200 Subject: Revert "Experiment: add "teacher helped" link to Prolog screen" This reverts commit 982522b5b9dfc39c10d08129b873aadf77b7293f. --- css/codeq.css | 5 ----- index.html | 6 ------ js/codeq/prolog.js | 18 ------------------ res/en.json | 2 -- res/sl.json | 2 -- 5 files changed, 33 deletions(-) diff --git a/css/codeq.css b/css/codeq.css index 56a086b..964909e 100644 --- a/css/codeq.css +++ b/css/codeq.css @@ -345,11 +345,6 @@ div.CodeMirror span.CodeMirror-matchingbracket { /***** responsiveness *****/ /* md & ld */ @media (min-width: 992px) { - /* experiment: Prolog hints */ - .teacher-help { - position: fixed; bottom: 0; left: 0; max-width: 30%; - } - /* end of experiment: Prolog hints */ /* BEGIN layouts */ /*~~ line-layout ~~*/ diff --git a/index.html b/index.html index d3bd219..004d0e7 100644 --- a/index.html +++ b/index.html @@ -375,12 +375,6 @@
- - -
diff --git a/js/codeq/prolog.js b/js/codeq/prolog.js index 62effd1..b0e8ebf 100644 --- a/js/codeq/prolog.js +++ b/js/codeq/prolog.js @@ -23,10 +23,6 @@ along with this program. If not, see . */ jqAllButtons = jqBtnPlan.add(jqBtnTest), // all the buttons prologHandler; // created when we enter the prolog state and destroyed once we leave it - // experiment: Prolog hints - var jqTeacherHelp = jqScreen.find('.teacher-help'); - // end of experiment: Prolog hints - var enterFun = function(problemDef, commonDef, currentSolution) { $('#navigation-problem-list').css('display', ''); var navigationProlog = $("#navigation-prolog"); @@ -52,11 +48,6 @@ along with this program. If not, see . */ .done(); }, 'exit': function () { - // experiment: Prolog hints - jqTeacherHelp.find('a').off('click'); - jqTeacherHelp.hide(); - // end of experiment: Prolog hints - jqScreen.css('display', 'none'); if (prologHandler) prologHandler.destroy(); prologHandler = null; @@ -254,15 +245,6 @@ along with this program. If not, see . */ .done(); }); - // experiment: Prolog hints - jqTeacherHelp.find('a').on('click', function(e) { - e.preventDefault(); - activityHandler.queueTrace({'typ': 'experiment', 'data': 'teacher help'}); - jqTeacherHelp.hide(); - }); - jqTeacherHelp.show(); - // end of experiment: Prolog hints - codeq.comms.loadProblem(problemDef.id).done(); activityHandler.queueTrace({ 'typ': 'open', diff --git a/res/en.json b/res/en.json index 55715e5..74a52c5 100644 --- a/res/en.json +++ b/res/en.json @@ -1,6 +1,4 @@ { - "teacher_help": "If a teacher helped you solve this problem, please click", - "here": "here", "connection_failed": "Could not connect to server.", "language": "Language", "ui_language_title": "Select the UI language.", diff --git a/res/sl.json b/res/sl.json index 99b88a1..7e337fb 100644 --- a/res/sl.json +++ b/res/sl.json @@ -1,6 +1,4 @@ { - "teacher_help": "Če ti je pri reševanju pomagal učitelj, klikni", - "here": "tukaj", "connection_failed": "Povezava na strežnik ni uspela.", "language": "Jezik", "ui_language_title": "Izberi jezik uporabniškega vmesnika.", -- cgit v1.2.1