diff --git a/.gitignore b/.gitignore index 405b110..ad4c1cf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *.pyc db.sqlite3 +.vscode/ migrations/ .viminfo .cache/ diff --git a/cms/static/cms/images/logo.png b/cms/static/cms/images/logo.png new file mode 100644 index 0000000..f25a863 Binary files /dev/null and b/cms/static/cms/images/logo.png differ diff --git a/cms/static/frosh/css/bootstrap.css b/cms/static/frosh/css/bootstrap.css index 20749f0..fa0dd03 100644 --- a/cms/static/frosh/css/bootstrap.css +++ b/cms/static/frosh/css/bootstrap.css @@ -2597,8 +2597,8 @@ fieldset[disabled] .btn-info.active { .btn-warning { color: #fff; - background-color: #914220; - border-color: #914220; + background-color: #CC0854; + border-color: #CC0854; } .btn-warning:hover, diff --git a/cms/static/frosh/css/overrides.css b/cms/static/frosh/css/overrides.css index d6d0a60..921f951 100644 --- a/cms/static/frosh/css/overrides.css +++ b/cms/static/frosh/css/overrides.css @@ -122,18 +122,18 @@ h1 { } .navbar-inverse { - background-color: #00B75A; - border-color: #00B75A; + background-color: #08A8CC; + border-color: #08A8CC; } .navbar-inverse .navbar-nav>.active>a, .navbar-inverse .navbar-nav>.active>a:hover, .navbar-inverse .navbar-nav>.active>a:focus { - background-color: #b7005d; + background-color: #CC0854; } .navbar-header a img { - background-color: #00B75A; + background-color: #08A8CC; padding: 4px 10px 4px 0px; } @@ -150,8 +150,8 @@ h1 { } .carousel-indicators .active { - background-color: #914220; - border: 2px solid #914220; + background-color: #CC0854; + border: 2px solid #CC0854; } #carousel { @@ -199,7 +199,7 @@ h1 { #footerwrap, #footerwrap a { - background-color: #00B75A; + background-color: #08A8CC; color: white; margin-top: 10px; padding-bottom: 5px; diff --git a/cms/static/frosh/img/FROSH_THEME_2019.png b/cms/static/frosh/img/FROSH_THEME_2019.png new file mode 100644 index 0000000..8a39c72 Binary files /dev/null and b/cms/static/frosh/img/FROSH_THEME_2019.png differ diff --git a/cms/static/frosh/img/favicon19.png b/cms/static/frosh/img/favicon19.png new file mode 100644 index 0000000..0de4215 Binary files /dev/null and b/cms/static/frosh/img/favicon19.png differ diff --git a/cms/static/frosh/js/soon/custom.js b/cms/static/frosh/js/soon/custom.js index c682163..f0073d6 100644 --- a/cms/static/frosh/js/soon/custom.js +++ b/cms/static/frosh/js/soon/custom.js @@ -6,7 +6,7 @@ COMMING SOON PAGE * Set your date here (YEAR, MONTH (0 for January/11 for December), DAY, HOUR, MINUTE, SECOND) * according to the GMT+0 Timezone **/ - var launch = new Date(2018, 8, 4, 11, 0, 0); + var launch = new Date(2019, 8, 3, 11, 0, 0); /** * The script **/ diff --git a/cms/static/frosh/mainsite/css/bootstrap.css b/cms/static/frosh/mainsite/css/bootstrap.css index 8bb6e82..738068e 100644 --- a/cms/static/frosh/mainsite/css/bootstrap.css +++ b/cms/static/frosh/mainsite/css/bootstrap.css @@ -2597,8 +2597,8 @@ fieldset[disabled] .btn-info.active { .btn-warning { color: #fff; - background-color: #914220; - border-color: #914220; + background-color: #CC0854; + border-color: #CC0854; } .btn-warning:hover { diff --git a/cms/static/frosh/mainsite/css/main.css b/cms/static/frosh/mainsite/css/main.css index 75a170a..f34b254 100644 --- a/cms/static/frosh/mainsite/css/main.css +++ b/cms/static/frosh/mainsite/css/main.css @@ -667,7 +667,7 @@ td a { .table-schedule tr:nth-child(odd) {} .table-title { - background-color: #00B75A; + background-color: #08A8CC; color: #FFFFFF; } @@ -677,7 +677,7 @@ td a { .emphasis, .question { - color: #914220; + color: #CC0854; } .alt_emphasis { @@ -695,11 +695,11 @@ td a { h3 { color: white; - background-color: #00B75A; + background-color: #08A8CC; padding: 5px; } -.package ul li, +.package ul li { color: #e88530; } diff --git a/cms/static/frosh/mainsite/img/FROSH_THEME_2019.png b/cms/static/frosh/mainsite/img/FROSH_THEME_2019.png new file mode 100644 index 0000000..8a39c72 Binary files /dev/null and b/cms/static/frosh/mainsite/img/FROSH_THEME_2019.png differ diff --git a/cms/static/frosh/mainsite/img/gallery/2019Photos/0_regDay.jpg b/cms/static/frosh/mainsite/img/gallery/2019Photos/0_regDay.jpg new file mode 100644 index 0000000..9d40978 Binary files /dev/null and b/cms/static/frosh/mainsite/img/gallery/2019Photos/0_regDay.jpg differ diff --git a/cms/static/frosh/mainsite/img/gallery/2019Photos/1_dusan.jpg b/cms/static/frosh/mainsite/img/gallery/2019Photos/1_dusan.jpg new file mode 100644 index 0000000..ff37f5b Binary files /dev/null and b/cms/static/frosh/mainsite/img/gallery/2019Photos/1_dusan.jpg differ diff --git a/cms/static/frosh/mainsite/img/gallery/2019Photos/2_slurpee1.JPG b/cms/static/frosh/mainsite/img/gallery/2019Photos/2_slurpee1.JPG new file mode 100644 index 0000000..321367d Binary files /dev/null and b/cms/static/frosh/mainsite/img/gallery/2019Photos/2_slurpee1.JPG differ diff --git a/cms/static/frosh/mainsite/img/gallery/2019Photos/3_slurpee3.JPG b/cms/static/frosh/mainsite/img/gallery/2019Photos/3_slurpee3.JPG new file mode 100644 index 0000000..f12e53f Binary files /dev/null and b/cms/static/frosh/mainsite/img/gallery/2019Photos/3_slurpee3.JPG differ diff --git a/cms/static/frosh/mainsite/img/gallery/2019Photos/4_mmDodgeball.JPG b/cms/static/frosh/mainsite/img/gallery/2019Photos/4_mmDodgeball.JPG new file mode 100644 index 0000000..bec3d8e Binary files /dev/null and b/cms/static/frosh/mainsite/img/gallery/2019Photos/4_mmDodgeball.JPG differ diff --git a/cms/static/frosh/mainsite/img/gallery/2019Photos/5_winfieldAndGroup.jpg b/cms/static/frosh/mainsite/img/gallery/2019Photos/5_winfieldAndGroup.jpg new file mode 100644 index 0000000..d0720f7 Binary files /dev/null and b/cms/static/frosh/mainsite/img/gallery/2019Photos/5_winfieldAndGroup.jpg differ diff --git a/cms/static/frosh/mainsite/img/gallery/2019Photos/6_bGames.jpg b/cms/static/frosh/mainsite/img/gallery/2019Photos/6_bGames.jpg new file mode 100644 index 0000000..ea3acd9 Binary files /dev/null and b/cms/static/frosh/mainsite/img/gallery/2019Photos/6_bGames.jpg differ diff --git a/cms/static/frosh/mainsite/img/gallery/2019Photos/7_slurpee0.JPG b/cms/static/frosh/mainsite/img/gallery/2019Photos/7_slurpee0.JPG new file mode 100644 index 0000000..3405dc2 Binary files /dev/null and b/cms/static/frosh/mainsite/img/gallery/2019Photos/7_slurpee0.JPG differ diff --git a/cms/static/frosh/mainsite/img/gallery/2019Photos/8_mmGeneral2.JPG b/cms/static/frosh/mainsite/img/gallery/2019Photos/8_mmGeneral2.JPG new file mode 100644 index 0000000..6e90f19 Binary files /dev/null and b/cms/static/frosh/mainsite/img/gallery/2019Photos/8_mmGeneral2.JPG differ diff --git a/cms/static/frosh/mainsite/img/gallery/2019Photos/9_groupShot.jpg b/cms/static/frosh/mainsite/img/gallery/2019Photos/9_groupShot.jpg new file mode 100644 index 0000000..211d9e4 Binary files /dev/null and b/cms/static/frosh/mainsite/img/gallery/2019Photos/9_groupShot.jpg differ diff --git a/frosh/templates/frosh/frosh.html b/frosh/templates/frosh/frosh.html index 918a0d3..d893408 100755 --- a/frosh/templates/frosh/frosh.html +++ b/frosh/templates/frosh/frosh.html @@ -5,13 +5,13 @@
- + - - - + + + -
+                            
                         
+                            
                         
                         
                         
+                            
                         
+                            
+                            
+                            
                         if you would like to add the CSSS Frosh Week Schedule to your own calendar, you can do so by subscribing to the following link:
-Mobile Friendly Link: Click here and hold, then press "copy link address"
-Desktop Friendly Link: https://calendar.google.com/calendar/ical/hnv4o6itvcii9027ra34q7gh04%40group.calendar.google.com/public/basic.ics
+Mobile Friendly Link: Click here and hold, then press "copy link address"
+Desktop Friendly Link: https://calendar.google.com/calendar/ical/17v5up6pdbp9t0smngvag6q81k%40group.calendar.google.com/public/basic.ics
Welcome BBQ: Following from the CS Info Session, head outside to eat some delicious hamburgers, hot dogs, and more. All made by your fellow CS students!
                         
Location: Outside of ASB Atrium
WiCS Pepper Programming Workshop: WiCS is hosting an event for those interested in robotics! Led by Dr. Angelica Lim, this workshop will teach you the basics of programming a Pepper robot. Dr. Lim received her B.Sc. in Computing Science (specializing in Artificial Intelligence) at SFU, and her M.Sc. and Ph.D. from Kyoto University, Japan, specialized in Artificial Intelligence applied to Robotics. You are required to register ahead of time for this workshop and details will be sent out soon after registration. We’re excited to see everyone there!
Hosted by Women in Computing Science
-                        
Location: TASC1 9204
Data Center Tours: Ever wondered what it is like to be in "the cloud"? Now is your chance to find out. This year we are offering 3 different tours to our froshees to get the "Data Center Experience". Complete with loud fans, and hundeds of thousands of computer processing power that is used for products like Google Drive, Amazon AWS, and Digital Ocean. We will be visiting the main SFU data center [which consists of Cedar and Bugabo] located in the water tower building. Please note that we are offering 3 different tours to allow for all our froshees to experience the tour as well as to make sure that any froshees who wish to attend the WiCS Pepper Programming Workshop can also partake.
-
-                    Rules for Data Center: closed toe shoes, no food or drink.
-                        Location: Meet at SFU Burnaby, ASB Atrium. Go to Water Tower Building
Pac Macro: Have you ever felt your life was missing something? Sure, you've got friends, school, and homework, but have you ever just felt the need to wakka wakka? Well now you can through the power of Pac Macro! Don the Pacman costume, made in-house by a CS student (sorry!), and evade your undead nemeses Inky, Blinky, Pinky, and Clyde. But these aren’t just any old undead menaces, these are your fellow students in more costumes homemade by a CS student (again, really sorry!). We’ll start by meeting up in the ASB Atrium and then head downtown together as a group. Afterwards we head back to campus for a hearty dinner to help ready you for the long night ahead
                         
Location: Meet at SFU Burnaby, ASB Atrium. Then head downtown to SFU Vancouver, room HCC2245 and HCC2260
Dinner Downtown: As you lick your wounds from the field of battle, know that it was but a small rehearsal in a larger campaign. As you sit amongst your brethren, fill your stomach with food so that it may prepare you for the events that lay ahead of you. Discuss strategy and seek wisdom from your leaders. Above all, prepare yourself for a long night of hunting, cheering and celebration as you will match wits with yourself, your peers and most dastardly of all: the filthy engineers.
-                        
Location: The Old Spaghetti Factory (Gastown)
WiCS Welcome Tea/Ice Cream: SFU Women in Computing Science (WiCS) invites you to drop in for drinks and snacks. This is a great opportunity to meet other new students in a laid back setting. You can also talk to WiCS members about what they do and how to get involved. And most importantly, re-caffeinate after that 8:30 math class! Feel free to drop in and leave as you please. Like most WiCS events, this tea is open to students of any gender.
Hosted by Women in Computing Science
+                    
WiCS Welcome Tea + Pepper Programming Workshop:SFU Women in Computing Science (WiCS) invites you to drop in for drinks and snacks. This is a great opportunity to meet other new students in a laid back setting. You can also talk to WiCS members about what they do and how to get involved. And most importantly, re-caffeinate after that 8:30 math class! Feel free to drop in and leave as you please. While you're there you can also drop in next door where WiCS will simultaneously being running our Pepper Programming Workshop. At the workshop your fellow women in Computing Science will teach your the basics of programming a Pepper robot. We hope to see everyone there!
Hosted by Women in Computing Science
                         
Location: TASC1 9204
Downtown PhotoHunt: There are so many strange things in our beautiful city, and in this event you'll get the chance to see them! Perhaps there will also be a secret mission in order to defend your honour. Want to know more? Well, you'll just have to wait, won't you... 
-                        
Location: Meet at SFU Burnaby, ASB Atrium. Go downtown.
Dinner: As you lick your wounds from the field of battle, know that it was but a small rehearsal in a larger campaign. As you sit amongst your brethren, fill your stomach with food so that it may prepare you for the events that lay ahead of you that night. Discuss strategy and seek wisdom from your leaders. Above all, prepare yourself for a long night of hunting, cheering and celebration as you will match wits with yourself, your peers and most dastardly of all: the filthy engineers.
+                        
Location: Club Ilia SFU
Midnight Madness: You’ve heard whispers in the shadows and tales on the streets, but this is finally it. The time has arrived for the weak to fall by the wayside and for the strong to survive. It’s time to learn the joy of all-nighters with all the work and none of the fun. We do battle against the engineers at the Frosh Slurpee drink-off, dodgeball game, and more. Inbetween these grueling battles we'll help keep you up all night with adrenaline filled skirmishes containing copious quantities of games, random prize opportunities, and other such mischief.
                         
                         
Make sure to tell your parents not to wait up. You probably don’t want them to know of the horrors that go on during the night so... Tell them you’re studying! Ya, they'll totally believe that! Now remember, Midnight Madness goes all night so prepare to be at SFU till the wee hours of the morning on Saturday. The culmination of the week long mystery which may or may not exist will be revealed during the night, so make sure you stay to find out the maybe-possibly-not-sure twist ending.
@@ -308,7 +297,7 @@ 
What's the difference between Frosh Week and SFU Welcome Day? +
What's the difference between Frosh Week and SFU Welcome Day?
                         
SFU Welcome Day is a very informative event held in August that teaches you where stuff on campus is, how to be successful, and prepares you for a solid start at university. You will meet one upper-year student, called your Orientation Leader (OL) who may or may not be in Computing Science, and ~15 other students in Applied Science. It's useful, especially for those who don't know the campus very well. Frosh Week is just pure, unadulterated FUN, and is for all CS students, regardless of how well you know the campus. You will meet dozens of wise upper-year students and other first years in CS. You will learn things the Orientation Leaders aren't allowed to tell you. You'll compete for awesome prizes, and receive tons of food. You'll make memories that you'll look back on 20 years down the road. Awesome! Frosh Week is the easiest way to meet people, and is completely different from the 2 days of information you'll receive during SFU Orientation.
Will there be alcohol?
                         
No! We will not be providing you with alcohol.
I am located at the Surrey campus, can I still attend Frosh Week?
-                        
Yes, Frosh Week is open to any and all Computing Science Students, but on-campus events are held at the SFU Burnaby Campus. Feel free to come join us for any of the events that you are able to make. Unfortunately some events will be during your classes at Surrey, other events are held later in the day or in downtown Vancouver.  Software Systems [ Facebook Event Page] and Mechatronics [ Facebook Event Page ] usually have events at the Surrey campus also. Additionally, Engineering Science Student Society has a schedule and a Facebook page for their Frosh Week Events.
How much does Frosh Week cost?
                         
It's free!
Do I have to go to every event? @@ -335,10 +324,10 @@
Where should I go on the first day?
                         
The Atrium of the Applied Science Building. We’ll be there waiting!
Where can I get a digital copy of the Survival Guide?
-                        
Link to online copy is now available!
Is there a Facebook Page for this?
-                        
Yup! - Link to CSSS FroshWeek 2018 Facebook Page
Organizing and running Frosh is a team effort. Everyone has a say in the look, theme, events, and other aspects of Frosh Week.
-
-                        
-                        A Main sponsor's branding is displayed more promeniently than other sponsor levels in all media (print, online, and social). The Main Sponsor will be the highest pledged sponsor at the Gold tier as of July 31st.
+A Main sponsor's branding is displayed more promeniently than other sponsor levels in all media (print, online, and social). The Main Sponsor will be the highest pledged sponsor at the Gold tier as of August 15th.
@@ -595,11 +489,11 @@Please email our sponsorship coordinator Paymon Jalali at csss-doc@sfu.ca if you are interested in sponsoring us and he'll get back to you as soon as possible.
+Please email our sponsorship coordinator VJ at csss-vp@sfu.ca if you are interested in sponsoring us and he'll get back to you as soon as possible.
-For prizes or contributions to the FroshKits, pickup arrangements can be made if you are located in the Metro Vancouver area. If you are shipping the items, please provide us with a tracking number and estimated time of arrival. Also, please note that the deadline for the sponsorship submission is July 31st 2018 . This is so that we may have adequate time to add your information to our t-shirts and other printed materials.
+For prizes or contributions to the FroshKits, pickup arrangements can be made if you are located in the Metro Vancouver area. If you are shipping the items, please provide us with a tracking number and estimated time of arrival. Also, please note that the deadline for the sponsorship submission is August 15th 2019 . This is so that we may have adequate time to add your information to our t-shirts and other printed materials.
-Paymon Jalali, Sponsorship Coordinator, Frosh Week 2018
+VJ, Frosh Chair, Frosh Week 2019
+