From b426b0d673929d21aab7bd6dfd419ddeed58c036 Mon Sep 17 00:00:00 2001 From: Charger1256A Date: Sat, 17 Feb 2024 01:24:12 -0600 Subject: [PATCH 01/13] summer camp registration open --- Gemfile.lock | 2 +- summercamp.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 426087d0..aff50858 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -81,7 +81,7 @@ DEPENDENCIES webrick (~> 1.8) RUBY VERSION - ruby 2.7.8p225 + ruby 2.6.3p62 BUNDLED WITH 2.4.10 diff --git a/summercamp.html b/summercamp.html index 6b67a2f9..997c13e4 100644 --- a/summercamp.html +++ b/summercamp.html @@ -29,7 +29,7 @@

Paly Robotics Summer Camp 2024

  • Sessions
  • FAQ
    • - +
  • Registration
    • @@ -1041,7 +1041,7 @@

    {{item2.question}}

    From 104ea2239ebe304d5afd2cfbe2670f8111d0ba35 Mon Sep 17 00:00:00 2001 From: gryphon538 Date: Sat, 17 Feb 2024 09:36:35 -0500 Subject: [PATCH 02/13] asdded summer camp to main bar --- _layouts/home.html | 2 +- _layouts/pages.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_layouts/home.html b/_layouts/home.html index 920a5d5c..f74b2520 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -47,7 +47,7 @@

    Paly Robotics

    • Home
      • - +
    • Summer Camp
    • Sponsors
    • diff --git a/_layouts/pages.html b/_layouts/pages.html index 9086a6a9..97291248 100644 --- a/_layouts/pages.html +++ b/_layouts/pages.html @@ -45,7 +45,7 @@
      • Home
        • - +
      • Summer Camp
      • Sponsors
      • About Us From 3723ea3e06561914dcf936d232ff8d31bbdffa7b Mon Sep 17 00:00:00 2001 From: gryphon538 Date: Sat, 17 Feb 2024 09:41:07 -0500 Subject: [PATCH 03/13] removed waitlists --- summercamp.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/summercamp.html b/summercamp.html index 997c13e4..fb73f33d 100644 --- a/summercamp.html +++ b/summercamp.html @@ -894,7 +894,7 @@

        {{item2.question}}

        -
        +
        @@ -1041,7 +1041,7 @@

        {{item2.question}}

        From e16dce0794fb95419ac56f535c938d3a161fec37 Mon Sep 17 00:00:00 2001 From: palyrobotics <> Date: Sat, 17 Feb 2024 08:52:57 -0800 Subject: [PATCH 04/13] fix the dates in the form --- summercamp.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/summercamp.html b/summercamp.html index fb73f33d..0e23b058 100644 --- a/summercamp.html +++ b/summercamp.html @@ -796,7 +796,7 @@

        {{item2.question}}

        + >Week 1 (June 17 - June 21)
        @@ -840,7 +840,7 @@

        {{item2.question}}

        Week 2 (June 24 - June 28)
        {{item2.question}} - +
        From 0907dbdb88146c06d94fafd728b09c075fe61192 Mon Sep 17 00:00:00 2001 From: palyrobotics <> Date: Sat, 17 Feb 2024 08:56:58 -0800 Subject: [PATCH 06/13] typo again yikes --- summercamp.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/summercamp.html b/summercamp.html index e110d08b..bb4eec0f 100644 --- a/summercamp.html +++ b/summercamp.html @@ -894,7 +894,7 @@

        {{item2.question}}

        -
        +
        From 2d4ca9c5ba320ac895467ea9b8fd9e493de36e4e Mon Sep 17 00:00:00 2001 From: palyrobotics <> Date: Sat, 17 Feb 2024 09:25:14 -0800 Subject: [PATCH 07/13] paypal email address field --- assets/js/summercamp.js | 6 ++++++ summercamp.html | 19 +++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/assets/js/summercamp.js b/assets/js/summercamp.js index b9ff504d..01afd453 100644 --- a/assets/js/summercamp.js +++ b/assets/js/summercamp.js @@ -45,6 +45,12 @@ $("fieldset input, fieldset textarea").on("click keyup", function() { else { $(".other-choice-text-2").addClass("optional") } + if($(".other-choice-3").first().is(':checked')) { + $(".other-choice-text-3").removeClass("optional") + } + else { + $(".other-choice-text-3").addClass("optional") + } var empty = false; diff --git a/summercamp.html b/summercamp.html index bb4eec0f..28a0653a 100644 --- a/summercamp.html +++ b/summercamp.html @@ -163,7 +163,7 @@

        Sessions Offered

        - +
        @@ -1006,7 +1006,7 @@

        {{item2.question}}

        {{item2.question}}
        +
        + + +
        + Date: Sat, 17 Feb 2024 09:29:00 -0800 Subject: [PATCH 08/13] fix waitlist behaviors --- summercamp.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/summercamp.html b/summercamp.html index 28a0653a..d7da144e 100644 --- a/summercamp.html +++ b/summercamp.html @@ -1038,7 +1038,7 @@

        {{item2.question}}

        Date: Sat, 17 Feb 2024 09:53:13 -0800 Subject: [PATCH 09/13] grey out text box --- assets/css/summercamp.stylesheet.css | 4 ++++ assets/js/summercamp.js | 10 ++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/assets/css/summercamp.stylesheet.css b/assets/css/summercamp.stylesheet.css index e657b3a3..9eb26a4f 100644 --- a/assets/css/summercamp.stylesheet.css +++ b/assets/css/summercamp.stylesheet.css @@ -238,4 +238,8 @@ fieldset:not(:first-of-type) { font-size: 12px; display: block; font-weight: normal !important; +} + +.greyba { + background-color:rgba(178,178,178,1.00); } \ No newline at end of file diff --git a/assets/js/summercamp.js b/assets/js/summercamp.js index 01afd453..1392b2e9 100644 --- a/assets/js/summercamp.js +++ b/assets/js/summercamp.js @@ -45,11 +45,17 @@ $("fieldset input, fieldset textarea").on("click keyup", function() { else { $(".other-choice-text-2").addClass("optional") } + if($(".other-choice-3").first().is(':checked')) { - $(".other-choice-text-3").removeClass("optional") + $(".other-choice-text-3").removeClass("optional"); + $(".other-choice-text-3").removeClass("greyba"); + $(".other-choice-text-3").attr("readonly", false); } else { - $(".other-choice-text-3").addClass("optional") + $(".other-choice-text-3").addClass("optional"); + $(".other-choice-text-3").addClass("greyba"); + $(".other-choice-text-3").attr("readonly", true); + $(".other-choice-text-3").val(""); } var empty = false; From 932527d928e762ccb632dc7ec81159436bc3e87d Mon Sep 17 00:00:00 2001 From: palyrobotics <> Date: Sat, 17 Feb 2024 10:51:01 -0800 Subject: [PATCH 10/13] not sure why gemfile.lock was changed, reverting so there are no issues --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index aff50858..426087d0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -81,7 +81,7 @@ DEPENDENCIES webrick (~> 1.8) RUBY VERSION - ruby 2.6.3p62 + ruby 2.7.8p225 BUNDLED WITH 2.4.10 From 2a7140e2f4a4dd270a4b5e0000366d043c15f20d Mon Sep 17 00:00:00 2001 From: palyrobotics <> Date: Sat, 17 Feb 2024 10:55:12 -0800 Subject: [PATCH 11/13] split into multiple comment blocks --- summercamp.html | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/summercamp.html b/summercamp.html index d7da144e..d3898ed3 100644 --- a/summercamp.html +++ b/summercamp.html @@ -895,44 +895,44 @@

        {{item2.question}}

        + + + + + -
        - -
        + + + + + +
        --> +
        From a949d1bbc0923615d20d20d391d988d62269f120 Mon Sep 17 00:00:00 2001 From: palyrobotics <> Date: Sat, 17 Feb 2024 11:04:11 -0800 Subject: [PATCH 12/13] turn on wk2 waitlist question --- summercamp.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/summercamp.html b/summercamp.html index d3898ed3..e68e8aa5 100644 --- a/summercamp.html +++ b/summercamp.html @@ -914,8 +914,8 @@

        {{item2.question}}

        --> - +
        + - +
        From 08abcd15583ae77109d57ec285620cc1ecdc4db0 Mon Sep 17 00:00:00 2001 From: palyrobotics <> Date: Sat, 17 Feb 2024 11:04:50 -0800 Subject: [PATCH 13/13] disable wk2 prg --- summercamp.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/summercamp.html b/summercamp.html index e68e8aa5..e8aac8af 100644 --- a/summercamp.html +++ b/summercamp.html @@ -854,7 +854,7 @@

        {{item2.question}}

        >Robot Design and Hardware
        -
        +
        {{item2.question}}
        --> - +