From 7766cd517b6c255c0c5181b691aa65ea8a7991a3 Mon Sep 17 00:00:00 2001 From: Wynne Crisman Date: Mon, 16 Nov 2020 19:15:49 -0800 Subject: [PATCH] Recoded it to not use the editor for the Second Chance page. The editor was not able to handle a download link (the link failed to work without a page refresh after clicking, and the download property of the link could not be set). --- client/main.styl | 3 +- imports/startup/client/routes.js | 11 +-- imports/ui/Home.html | 3 +- imports/ui/PhotoGallery.html | 52 ++++++----- imports/ui/PhotoGallery.import.styl | 34 ++++++- imports/ui/PhotoGallery.js | 7 +- imports/ui/SecondChance.html | 50 +++++++++++ imports/ui/SecondChance.import.styl | 83 ++++++++++++++++++ imports/ui/SecondChance.js | 2 + imports/ui/layouts/Admin.html | 5 -- imports/ui/layouts/Public.html | 2 +- ...d_Chance_Scholarship_Application_Form.pdf} | Bin 12 files changed, 208 insertions(+), 44 deletions(-) create mode 100644 imports/ui/SecondChance.html create mode 100644 imports/ui/SecondChance.import.styl create mode 100644 imports/ui/SecondChance.js rename public/forms/{Second_Chance_Scholarship_Form.pdf => Second_Chance_Scholarship_Application_Form.pdf} (100%) diff --git a/client/main.styl b/client/main.styl index b7a01a2..4f1426d 100644 --- a/client/main.styl +++ b/client/main.styl @@ -43,7 +43,7 @@ h3 background-color: #EEE .textView - border: 1px solid #DDD + //border: 1px solid #DDD padding: 10px font-family: Palatino, "Palatino Linotype", "Palatino LT STD", "Book Antiqua", Georgia, serif font-size: 16px @@ -202,6 +202,7 @@ h3 @import "../imports/ui/Grants.import.styl" @import "../imports/ui/Internships.import.styl" @import "../imports/ui/Scholarships.import.styl" +@import "../imports/ui/SecondChance.import.styl" @import "../imports/ui/Fellowships.import.styl" @import "../imports/ui/News&Notices.import.styl" @import "../imports/ui/PhotoGallery.import.styl" diff --git a/imports/startup/client/routes.js b/imports/startup/client/routes.js index 7248f0c..e656b25 100644 --- a/imports/startup/client/routes.js +++ b/imports/startup/client/routes.js @@ -76,13 +76,6 @@ pri.route("/Admin/NewsEditor", { BlazeLayout.render("Admin", {content: "PageEditor"}); } }); -pri.route("/Admin/SecondChanceEditor", { - name: "SecondChanceEditor", - action: function(params, queryParams) { - require("/imports/ui/Admin/PageEditor.js"); - BlazeLayout.render("Admin", {content: "PageEditor"}); - } -}); pri.route("/Admin/SlideshowEditor", { name: "SlideshowEditor", action: function(params, queryParams) { @@ -203,8 +196,8 @@ pub.route("/News", { pub.route("/SecondChance", { name: 'SecondChance', action: function(params, queryParams) { - require("/imports/ui/EditablePage.js"); - BlazeLayout.render("Public", {content: "EditablePage"}); + require("/imports/ui/SecondChance.js"); + BlazeLayout.render("Public", {content: "SecondChance"}); } }); pub.route("/PhotoGallery", { diff --git a/imports/ui/Home.html b/imports/ui/Home.html index 20a9d3d..b137672 100644 --- a/imports/ui/Home.html +++ b/imports/ui/Home.html @@ -33,7 +33,8 @@
- + +
diff --git a/imports/ui/PhotoGallery.html b/imports/ui/PhotoGallery.html index 496fdd4..3652fb1 100644 --- a/imports/ui/PhotoGallery.html +++ b/imports/ui/PhotoGallery.html @@ -1,28 +1,34 @@