gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update chat rooms and news-nav banner

Browse Source
This commit is contained in:
Quincy Larson
2015-07-21 20:02:41 -07:00
parent a0c553f67d
commit 14de6fd3ef
2 changed files with 43 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
seed_data/field-guides.json
View File

@ -280,42 +280,47 @@
"description": [ "description": [
"<div class=\"text-left col-xs-12 col-md-10 col-md-offset-1\">", "<div class=\"text-left col-xs-12 col-md-10 col-md-offset-1\">",
" <h3>The following are our official chat rooms:</h3>", " <h3>The following are our official chat rooms:</h3>",
" <ul>", " <table class=\"table table-striped\">",
" <li class='large-li'><a href='//gitter.im/FreeCodeCamp/FreeCodeCamp' target='_blank'>Free Code Camp</a> - our main chat room - hang out and chat about life and learning to code</li>", " <tr><td><a href='//gitter.im/freecodecamp/FreeCodeCamp' target='_blank'>FreeCodeCamp</a></td><td>our main chat room - hang out and chat about life and learning to code</td></tr>",
" <li class='large-li'><a href='//gitter.im/FreeCodeCamp/Help' target='_blank'>Help</a> - get help with our coding challenges from your fellow campers</li>", " <tr><td><a href='//gitter.im/freecodecamp/Help' target='_blank'>Help</a></td><td>get help with our coding challenges from your fellow campers</td></tr>",
" <li class='large-li'><a href='//gitter.im/FreeCodeCamp/CodingJobs' target='_blank'>CodingJobs</a> - chat about the process of getting a coding job, such as portfolios, networking, and interviewing</li>", " <tr><td><a href='//gitter.im/freecodecamp/CodingJobs' target='_blank'>CodingJobs</a></td><td>chat about the process of getting a coding job, such as portfolios, networking, and interviewing</td></tr>",
" <li class='large-li'><a href='//gitter.im/FreeCodeCamp/YouCanDoThis' target='_blank'>YouCanDoThis</a> - it's natural to doubt yourself when learning to code - share your feelings and get moral support here</li>", " <tr><td><a href='//gitter.im/freecodecamp/YouCanDoThis' target='_blank'>YouCanDoThis</a></td><td>it's natural to doubt yourself when learning to code - share your feelings and get moral support here</td></tr>",
" <li class='large-li'><a href='//gitter.im/FreeCodeCamp/LetsPair' target='_blank'>LetsPair</a> - find fellow campers to pair program with using <a href='/field-guide/how-do-i-install-screenhero' target='_blank'>Screen Hero</li>", " <tr><td><a href='//gitter.im/freecodecamp/LetsPair' target='_blank'>LetsPair</a></td><td>find fellow campers to pair program with using <a href='/field-guide/how-do-i-install-screenhero' target='_blank'>Screen Hero</td></tr>",
" <li class='large-li'><a href='//gitter.im/FreeCodeCamp/TeamViewer' target='_blank'>TeamViewer</a> - find fellow campers who use Linux and pair program using <a href='https://www.teamviewer.com/en/download/linux.aspx' target='_blank'>Team Viewer</a></li>", " <tr><td><a href='//gitter.im/freecodecamp/TeamViewer' target='_blank'>TeamViewer</a></td><td>find fellow campers who use Linux and pair program using <a href='https://www.teamviewer.com/en/download/linux.aspx' target='_blank'>Team Viewer</a></td></tr>",
" <li class='large-li'><a href='//gitter.im/FreeCodeCamp/PairProgrammingWomen' target='_blank'>PairProgrammingWomen</a> - this women-only chat room helps women pair program together</li>", " <tr><td><a href='//gitter.im/freecodecamp/PairProgrammingWomen' target='_blank'>PairProgrammingWomen</a></td><td>this women-only chat room helps women pair program with other women if they so desire</td></tr>",
" <li class='large-li'><a href='//gitter.im/FreeCodeCamp/Hardware' target='_blank'>Hardware</a> - chat about computer hardware and Internet of Things</li>", " </table>",
" <li class='large-li'><a href='//gitter.im/FreeCodeCamp/GameDev' target='_blank'>GameDev</a> - chat about designing and developing video games</li>", " <h3>We also have the following casual chat rooms:</h3>",
" <li class='large-li'><a href='//gitter.im/FreeCodeCamp/Gaming' target='_blank'>Gaming</a> - chat about gaming of all kinds, such as video games and table top games</li>", " <table class=\"table table-striped\">",
" <li class='large-li'><a href='//gitter.im/FreeCodeCamp/TVandMovies' target='_blank'>TVandMovies</a> - chat about TV shows and movies</li>", " <tr><td><a href='//gitter.im/freecodecamp/Hardware' target='_blank'>Hardware</a></td><td>chat about computer hardware and Internet of Things</td></tr>",
" <li class='large-li'><a href='//gitter.im/FreeCodeCamp/Sports' target='_blank'>Sports</a> - chat about sports</li>", " <tr><td><a href='//gitter.im/freecodecamp/GameDev' target='_blank'>GameDev</a></td><td>chat about designing and developing video games</td></tr>",
" <li class='large-li'><a href='//gitter.im/FreeCodeCamp/Music' target='_blank'>Music</a> - chat about music</li>", " <tr><td><a href='//gitter.im/freecodecamp/Gaming' target='_blank'>Gaming</a></td><td>chat about gaming of all kinds, such as video games and table top games</td></tr>",
" <li class='large-li'><a href='//gitter.im/FreeCodeCamp/Photography' target='_blank'>Photography</a> - chat about photography and videography</li>", " <tr><td><a href='//gitter.im/freecodecamp/TVandMovies' target='_blank'>TVandMovies</a></td><td>chat about TV shows and movies</td></tr>",
" <li class='large-li'><a href='//gitter.im/FreeCodeCamp/Business' target='_blank'>Business</a> - chat about business and entrepreneurship</li>", " <tr><td><a href='//gitter.im/freecodecamp/Sports' target='_blank'>Sports</a></td><td>chat about sports</td></tr>",
" <li class='large-li'><a href='//gitter.im/FreeCodeCamp/Saving' target='_blank'>Saving</a> - chat about saving, investing, and home economics</li>", " <tr><td><a href='//gitter.im/freecodecamp/Music' target='_blank'>Music</a></td><td>chat about music</td></tr>",
" <li class='large-li'><a href='//gitter.im/FreeCodeCamp/SelfImprovement' target='_blank'>SelfImprovement</a> - chat about productivity, self improvement and quantified self</li>", " <tr><td><a href='//gitter.im/freecodecamp/Photography' target='_blank'>Art and Photography</a></td><td>chat about art, photography and videography</td></tr>",
" </ul>", " <tr><td><a href='//gitter.im/freecodecamp/Business' target='_blank'>Business</a></td><td>chat about business and entrepreneurship</td></tr>",
" <tr><td><a href='//gitter.im/freecodecamp/Saving' target='_blank'>Saving</a></td><td>chat about saving, investing, and home economics</td></tr>",
" <tr><td><a href='//gitter.im/freecodecamp/SelfImprovement' target='_blank'>SelfImprovement</a></td><td>chat about productivity, self improvement and quantified self</td></tr>",
" </table>",
" <p>You'll note that we do not have religion or politics chat rooms. Please don't discuss those things here :)</p>",
" <h3>We also have language-specific chat rooms:</h3>", " <h3>We also have language-specific chat rooms:</h3>",
" <ul>", " <table class=\"table table-striped\">",
" <li class='large-li'><a href='//gitter.im/FreeCodeCamp/Arabic' target='_blank'>Arabic</a></li>", " <tr><td><a href='//gitter.im/freecodecamp/Arabic' target='_blank'>Arabic</a></td></tr>",
" <li class='large-li'><a href='//gitter.im/FreeCodeCamp/Chinese' target='_blank'>Chinese</a></li>", " <tr><td><a href='//gitter.im/freecodecamp/Chinese' target='_blank'>Chinese</a></td></tr>",
" <li class='large-li'><a href='//gitter.im/FreeCodeCamp/Deutsch' target='_blank'>German</a></li>", " <tr><td><a href='//gitter.im/freecodecamp/Deutsch' target='_blank'>German</a></td></tr>",
" <li class='large-li'><a href='//gitter.im/FreeCodeCamp/Dutch' target='_blank'>Dutch</a></li>", " <tr><td><a href='//gitter.im/freecodecamp/Dutch' target='_blank'>Dutch</a></td></tr>",
" <li class='large-li'><a href='//gitter.im/FreeCodeCamp/Espanol' target='_blank'>Spanish</a></li>", " <tr><td><a href='//gitter.im/freecodecamp/Espanol' target='_blank'>Spanish</a></td></tr>",
" <li class='large-li'><a href='//gitter.im/FreeCodeCamp/Francais' target='_blank'>French</a></li>", " <tr><td><a href='//gitter.im/freecodecamp/Francais' target='_blank'>French</a></td></tr>",
" <li class='large-li'><a href='//gitter.im/FreeCodeCamp/Japanese' target='_blank'>Japanese</a></li>", " <tr><td><a href='//gitter.im/freecodecamp/Japanese' target='_blank'>Japanese</a></td></tr>",
" <li class='large-li'><a href='//gitter.im/FreeCodeCamp/Korean' target='_blank'>Korean</a></li>", " <tr><td><a href='//gitter.im/freecodecamp/Korean' target='_blank'>Korean</a></td></tr>",
" <li class='large-li'><a href='//gitter.im/FreeCodeCamp/Persian' target='_blank'>Persian</a></li>", " <tr><td><a href='//gitter.im/freecodecamp/Persian' target='_blank'>Persian</a></td></tr>",
" <li class='large-li'><a href='//gitter.im/FreeCodeCamp/Portugues' target='_blank'>Portugues</a></li>", " <tr><td><a href='//gitter.im/freecodecamp/Portugues' target='_blank'>Portugues</a></td></tr>",
" <li class='large-li'><a href='//gitter.im/FreeCodeCamp/Russian' target='_blank'>Russian</a></li>", " <tr><td><a href='//gitter.im/freecodecamp/Russian' target='_blank'>Russian</a></td></tr>",
" <li class='large-li'><a href='//gitter.im/FreeCodeCamp/Thai' target='_blank'>Thai</a></li>", " <tr><td><a href='//gitter.im/freecodecamp/Thai' target='_blank'>Thai</a></td></tr>",
" <li class='large-li'><a href='//gitter.im/FreeCodeCamp/Vietnamese' target='_blank'>Vietnamese</a></li>", " <tr><td><a href='//gitter.im/freecodecamp/Vietnamese' target='_blank'>Vietnamese</a></td></tr>",
" </ul>", " </table>",
" <h3>Finally, we have one room for <a href='/field-guide/how-can-i-find-other-free-code-camp-campers-in-my-city'>each of our local Campsites</a>.</h3>", " <h3>Finally, we have one room for <a href='/field-guide/how-can-i-find-other-free-code-camp-campers-in-my-city'>each of our local Campsites</a>.</h3>",
" <h3>By joining these chat rooms, you accept our <a href='/field-guide/what-is-the-free-code-camp-code-of-conduct'>Code of Conduct</a>.</h3>",
" <p class='large-p'>If you think we should add a chat room, please message @quincylarson in Gitter.</p>", " <p class='large-p'>If you think we should add a chat room, please message @quincylarson in Gitter.</p>",
"</div>" "</div>"
] ]
@ -967,7 +972,7 @@
" <p class='large-p'>Free Code Camp should be a harassment-free experience for everyone, regardless of gender, gender identity and expression, age, sexual orientation, disability, physical appearance, body size, race, national origin, or religion (or lack thereof).</p>", " <p class='large-p'>Free Code Camp should be a harassment-free experience for everyone, regardless of gender, gender identity and expression, age, sexual orientation, disability, physical appearance, body size, race, national origin, or religion (or lack thereof).</p>",
" <p class='large-p'>We do not tolerate harassment of campers in any form, anywhere on Free Code Camp's online media (Gitter, Twitch, etc.) or during pair programming. Harassment includes sexual language and imagery, deliberate intimidation, stalking, unwelcome sexual attention, libel, and any malicious hacking or social engineering.</p>", " <p class='large-p'>We do not tolerate harassment of campers in any form, anywhere on Free Code Camp's online media (Gitter, Twitch, etc.) or during pair programming. Harassment includes sexual language and imagery, deliberate intimidation, stalking, unwelcome sexual attention, libel, and any malicious hacking or social engineering.</p>",
" <p class='large-p'>If a camper engages in harassing behavior, our team will take any action we deem appropriate, up to and including banning them from Free Code Camp.</p>", " <p class='large-p'>If a camper engages in harassing behavior, our team will take any action we deem appropriate, up to and including banning them from Free Code Camp.</p>",
" <p class='large-p'>We want everyone to feel safe and respected. If you are being harassed or notice that someone else is being harassed, say something! Message @quincylarson, @terakilobyte and @codenonprofit in Gitter (preferably with a screen shot of the offending language) so we can take fast action.</p>", " <p class='large-p'>We want everyone to feel safe and respected. If you are being harassed or notice that someone else is being harassed, say something! Message @quincylarson, @brianamarie and @codenonprofit in Gitter (preferably with a screen shot of the offending language) so we can take fast action.</p>",
" <p class='large-p'>If you have questions about this code of conduct, email us at <a href='mailto:team@freecodecamp.com'>team@freecodecamp.com</a>.</p>", " <p class='large-p'>If you have questions about this code of conduct, email us at <a href='mailto:team@freecodecamp.com'>team@freecodecamp.com</a>.</p>",
"</div>" "</div>"
] ]

6
views/stories/news-nav.jade
View File

@ -14,9 +14,9 @@
.spacer .spacer
.row .row
.col-xs-12.col-sm-8.col-sm-offset-2.well .col-xs-12.col-sm-8.col-sm-offset-2.well
h3.text-center Watch us Code Games Live All Weekend h3.text-center We just added a ton of new chat rooms
img.img-responsive.img-center(src='https://www.evernote.com/l/AjnoItzbAtJEfKPD85t0waxHGgpMyr_G_qkB/image.png') img.img-responsive.img-center(src='https://www.evernote.com/l/AHTBwaDT-EdNLrMjK_9EBMO8Eqrt7Z87GhQB/image.png')
p.large-p We'll build JavaScript games all weekend and stream it all live. You should follow our <a href='http://twitch.tv/freecodecamp'>Twitch.tv channel</a>. See you there! p.large-p <a href='/field-guide/what-are-the-official-free-code-camp-chat-rooms' target='_blank'>Check out our full list of official chat rooms</a> and star the ones you want to keep at the top of your room list. Happy chatting!
.spacer .spacer
#search-results #search-results