From e5a2c7212320ec74aaad2c09ec03cc44009a0d1d Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Wed, 4 Jan 2012 19:01:56 -0500 Subject: [PATCH 1/6] Wiki now supports circuits, modulo bugs --- edit_circuit.html | 8 ++++++++ problem.js | 6 +++++- show_circuit.html | 2 ++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 edit_circuit.html create mode 100644 show_circuit.html diff --git a/edit_circuit.html b/edit_circuit.html new file mode 100644 index 0000000000..ca72cf040d --- /dev/null +++ b/edit_circuit.html @@ -0,0 +1,8 @@ +
+
+ +${ circuit_line } + + +
+
diff --git a/problem.js b/problem.js index bb2d07ce8b..516198a8b3 100644 --- a/problem.js +++ b/problem.js @@ -12,7 +12,11 @@ function ${ id }_load() { postJSON('/modx/problem/${ id }/problem_check', submit_data, function(json) { - ${ id }_load(); + + if(json['success'] == 'syntax') + alert('Syntax error'); + else + ${ id }_load(); }); log_event('problem_check', submit_data); }); diff --git a/show_circuit.html b/show_circuit.html new file mode 100644 index 0000000000..69a66f9a03 --- /dev/null +++ b/show_circuit.html @@ -0,0 +1,2 @@ +
+
From f25219cb744430e1751cce85cabb1cb7603c77de Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Thu, 5 Jan 2012 14:28:54 -0500 Subject: [PATCH 2/6] Login page has 'Remember Me' --- index.html | 1 + login.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index e8c98e8d60..d1ae7f8168 100644 --- a/index.html +++ b/index.html @@ -38,6 +38,7 @@ $(function() { $.each($("[id^=li_]"), function(index,value){ submit_data[value.name]=value.value; }); + submit_data["remember"] = ($('#remember').attr("checked")? true : false); postJSON('/login', submit_data, diff --git a/login.html b/login.html index 5dea8835e4..5aa402eb6f 100644 --- a/login.html +++ b/login.html @@ -6,7 +6,7 @@
E-mail Password - +Remember me From af7167dbbeb86f1c6af2a08f962d80dae20e4739 Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Thu, 5 Jan 2012 20:28:14 -0500 Subject: [PATCH 3/6] Working calculator --- credits.html | 3 +-- main.html | 42 ++++++++++++++++++++++++++++++++++++++++-- profile.html | 3 --- 3 files changed, 41 insertions(+), 7 deletions(-) diff --git a/credits.html b/credits.html index f790099074..42cd8fa3d3 100644 --- a/credits.html +++ b/credits.html @@ -48,8 +48,7 @@ the few, genuinely free template web sites (although you have to e-mail the owner to find that out), and was heavily modified by Piotr Mitros, and later, thoughtbot. -

The system is running in the Amazon cloud, which allows us to hold up -to anticipated loads. +

The system is running in the Amazon cloud. diff --git a/main.html b/main.html index eac56c4027..bdc339cc9f 100644 --- a/main.html +++ b/main.html @@ -25,18 +25,56 @@ + ${self.body()}

+
Found a bug? Got an +idea for improving our system? Please give us your feedback. +
Subject:
+
Feedback:
+
+
+ +
+ + + +
+Supported operations: ^ * / + - || () +
+Supported suffixes: %kMGTcmunp + +
diff --git a/profile.html b/profile.html index 7e60afd1ec..71403bc28c 100644 --- a/profile.html +++ b/profile.html @@ -45,9 +45,6 @@ $(function() { } }); - $("a#inline").fancybox({ - 'hideOnContentClick': false - }); $('#change_password').click(function(){ $('#inline').trigger('click'); From 3c95aabbd7ae56f4df801235248c36bde51cca67 Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Thu, 5 Jan 2012 20:29:07 -0500 Subject: [PATCH 4/6] Feedback e-mail template --- feedback_email.txt | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 feedback_email.txt diff --git a/feedback_email.txt b/feedback_email.txt new file mode 100644 index 0000000000..fce463ff58 --- /dev/null +++ b/feedback_email.txt @@ -0,0 +1,6 @@ +Feedback from: ${ user } +url: ${ url } +time: ${ time } +Subject: ${ subject } +Feedback: +${ feedback } From 4c7da227a3d59a606537d22dab2c3867429e937b Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Thu, 5 Jan 2012 22:09:51 -0500 Subject: [PATCH 5/6] Feedback button works --- main.html | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/main.html b/main.html index bdc339cc9f..a2da48ce57 100644 --- a/main.html +++ b/main.html @@ -52,10 +52,23 @@ ${self.body()}
Found a bug? Got an idea for improving our system? Please give us your feedback. -
Subject:
-
Feedback:
-
+
+ + +
From a0abfe178d9caf8bb644e04e20cebd9874cac001 Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Fri, 6 Jan 2012 09:53:33 -0500 Subject: [PATCH 6/6] Feedback text a bit better. Window clears when submitted --- main.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/main.html b/main.html index a2da48ce57..0189a0f644 100644 --- a/main.html +++ b/main.html @@ -51,7 +51,7 @@ ${self.body()}
Found a bug? Got an -idea for improving our system? Please give us your feedback. +idea for improving our system? Let us know.
Subject:

Feedback:
@@ -63,8 +63,9 @@ idea for improving our system? Please give us your feedback. "url":document.URL, "message":$("#feedback_message").attr("value")}, function(data){ - $("#feedback_subject").attr("value","") - $("#feedback_message").attr("value","") + $("#feedback_subject").attr("value",""); + $("#feedback_message").attr("value",""); + $("#feedback_div").html("Feedback submitted. Thank you"); }); }); });