From a833d705314875afc9eae31ee9e003dfef2c8d40 Mon Sep 17 00:00:00 2001 From: Clara Raubertas Date: Wed, 18 Mar 2015 15:34:36 -0500 Subject: [PATCH 01/48] bootstrap breaks my local install --- Gemfile | 4 ++-- app.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index fcd0104f8..19f18afee 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org/" -ruby '2.2.0' +ruby '2.1.2' gem 'activesupport' gem "erector", "~> 0.10.0" @@ -17,7 +17,7 @@ gem "redcarpet" gem "rubyzip" gem "i18n", "~> 0.7" gem 'font-awesome-sass' -gem 'bootstrap-sass' +#gem 'bootstrap-sass' gem 'jquery-cdn' gem 'sprockets' diff --git a/app.rb b/app.rb index 4f0faeb8a..7d5b385f1 100755 --- a/app.rb +++ b/app.rb @@ -5,7 +5,7 @@ require 'i18n' require 'i18n/backend/fallbacks' require 'font-awesome-sass' -require 'bootstrap-sass' +#require 'bootstrap-sass' require 'zip' require 'tmpdir' @@ -41,7 +41,7 @@ class InstallFest < Sinatra::Application # todo: use Sinatra::Base instead, wi settings.assets.append_path "assets/stylesheets" settings.assets.append_path "assets/javascripts" settings.assets.append_path "public/fonts" - settings.assets.append_path Bootstrap.javascripts_path +# settings.assets.append_path Bootstrap.javascripts_path JqueryCdn.install(settings.assets) if settings.environment == :development From 1b3665e880be4a0f529d21d2a10b49dd32e41d4a Mon Sep 17 00:00:00 2001 From: Clara Raubertas Date: Fri, 27 Mar 2015 17:11:52 -0500 Subject: [PATCH 02/48] big ol' curriculum rewrite --- lib/doc_page.rb | 16 +- lib/site_index.rb | 4 +- sites/en/docs/docs.step | 77 +- sites/en/frontend/HTML_attributes.step | 167 ----- sites/en/frontend/HTML_structure.step | 83 --- sites/en/frontend/HTML_tags.step | 216 ------ .../_consider_deploying_to_github.step | 7 - sites/en/frontend/_developer_tools.step | 67 -- .../_working_effectively_and_efficiently.md | 15 - sites/en/frontend/add_more_elements.step | 66 -- sites/en/frontend/add_starter_files.step | 43 -- sites/en/frontend/basic_CSS.step | 127 ---- sites/en/frontend/basic_javascript.step | 108 --- .../frontend/deploying_to_github_pages.step | 146 ---- sites/en/frontend/developer_tools.step | 3 - sites/en/frontend/frontend.step | 45 -- sites/en/frontend/get_a_sticker.step | 56 -- .../frontend/get_a_sticker_admin_button.png | Bin 44119 -> 0 bytes .../frontend/get_a_sticker_admin_settings.png | Bin 44000 -> 0 bytes .../en/frontend/get_a_sticker_fork_button.png | Bin 57649 -> 0 bytes sites/en/frontend/get_a_sticker_https.png | Bin 41954 -> 0 bytes sites/en/frontend/get_a_sticker_output.png | Bin 16281 -> 0 bytes sites/en/frontend/html_quick_reference.md | 94 --- sites/en/frontend/img/boxmodel.png | Bin 5839 -> 0 bytes sites/en/frontend/img/css.png | Bin 41083 -> 0 bytes sites/en/frontend/img/css_bundler.png | Bin 81985 -> 0 bytes sites/en/frontend/img/css_class.png | Bin 61755 -> 0 bytes sites/en/frontend/img/css_id.png | Bin 60292 -> 0 bytes sites/en/frontend/img/css_zen.png | Bin 170866 -> 0 bytes sites/en/frontend/img/devtools.png | Bin 35975 -> 0 bytes sites/en/frontend/img/devtools_console.png | Bin 53940 -> 0 bytes sites/en/frontend/img/devtools_elements.png | Bin 109517 -> 0 bytes sites/en/frontend/img/devtools_network.png | Bin 102631 -> 0 bytes sites/en/frontend/img/devtools_script.png | Bin 88713 -> 0 bytes sites/en/frontend/img/github.png | Bin 67774 -> 0 bytes sites/en/frontend/img/github_create_repo.png | Bin 80846 -> 0 bytes .../en/frontend/img/github_name_your_repo.png | Bin 51003 -> 0 bytes sites/en/frontend/img/hello_html.png | Bin 47942 -> 0 bytes sites/en/frontend/img/hello_omg.png | Bin 56019 -> 0 bytes sites/en/frontend/img/hello_structure.png | Bin 63912 -> 0 bytes sites/en/frontend/img/hello_style.png | Bin 52727 -> 0 bytes sites/en/frontend/img/hello_title.png | Bin 52200 -> 0 bytes sites/en/frontend/img/hello_world.png | Bin 39745 -> 0 bytes sites/en/frontend/img/hello_world_2line.png | Bin 42839 -> 0 bytes sites/en/frontend/img/hello_world_2line2.png | Bin 46365 -> 0 bytes sites/en/frontend/img/hello_world_jazzy.png | Bin 40156 -> 0 bytes sites/en/frontend/img/html_tags_list.png | Bin 53431 -> 0 bytes sites/en/frontend/img/jquery_result.png | Bin 69382 -> 0 bytes sites/en/frontend/img/page.png | Bin 50562 -> 0 bytes sites/en/frontend/img/page_anchors.png | Bin 52500 -> 0 bytes sites/en/frontend/img/page_html.png | Bin 66934 -> 0 bytes sites/en/frontend/img/page_img.png | Bin 23647 -> 0 bytes sites/en/frontend/img/page_sample.jpg | Bin 28116 -> 0 bytes sites/en/frontend/img/page_sample.png | Bin 199868 -> 0 bytes sites/en/frontend/img/prompt.png | Bin 30251 -> 0 bytes sites/en/frontend/img/zip.png | Bin 64853 -> 0 bytes sites/en/frontend/introduction_to_html.step | 92 --- sites/en/frontend/jquery.step | 88 --- sites/en/frontend/jquery_vs_javascript.step | 46 -- sites/en/frontend/make_a_web_page.step | 97 --- sites/en/frontend/make_columns.step | 49 -- sites/en/frontend/resources.step | 16 - sites/en/frontend/tool_installation.step | 69 -- .../add_other_features_of_your_choosing.step | 16 - ...o_create_and_look_at_individual_posts.step | 58 -- sites/en/intermediate-rails/add_replying.step | 42 -- sites/en/intermediate-rails/commands.md | 79 -- ...new_rails_app_with_a_static_home_page.step | 35 - .../creating_a_new_controller.md | 79 -- .../en/intermediate-rails/img/create_post.png | Bin 10575 -> 0 bytes .../intermediate-rails/img/create_reply.png | Bin 10180 -> 0 bytes sites/en/intermediate-rails/img/header.png | Bin 12637 -> 0 bytes .../intermediate-rails/img/inline_reply.png | Bin 31854 -> 0 bytes .../en/intermediate-rails/img/post_index.png | Bin 22893 -> 0 bytes .../intermediate-rails/img/request-cycle.jpg | Bin 140706 -> 0 bytes sites/en/intermediate-rails/img/show_post.png | Bin 16319 -> 0 bytes .../intermediate-rails/img/show_replies.png | Bin 31243 -> 0 bytes .../img/static_home_page.png | Bin 13302 -> 0 bytes .../inline_replying_on_a_post.step | 22 - .../en/intermediate-rails/install_devise.step | 46 -- .../intermediate-rails.step | 40 - .../make_a_posts_index_page.step | 24 - .../make_it_pretty_with_bootstrap.step | 58 -- sites/en/intermediate-rails/mvc_overview.md | 24 - .../intermediate-rails/the_request_cycle.md | 12 - .../intro-to-rails/CRUD_with_scaffolding.step | 107 --- .../add_the_project_to_a_git_repo.step | 2 +- .../intro-to-rails/allow_people_to_vote.step | 85 --- .../clean_up_links_on_the_topics_list.step | 44 -- .../intro-to-rails/creating_a_migration.step | 47 -- .../credits_and_next_steps.step | 39 - sites/en/intro-to-rails/datatypes.step | 87 +++ .../intro-to-rails/deploying_to_heroku.step | 69 +- sites/en/intro-to-rails/dog_scaffold.step | 173 +++++ sites/en/intro-to-rails/getting_started.step | 23 +- .../hooking_up_votes_and_topics.step | 127 ---- sites/en/intro-to-rails/intro-to-rails.step | 46 +- .../make_the_topic_title_a_link.step | 59 -- sites/en/intro-to-rails/pictures.step | 116 +++ .../en/intro-to-rails/rails_architecture.step | 4 +- ...opics_list_after_creating_a_new_topic.step | 74 -- sites/en/intro-to-rails/ruby_language.step | 4 +- .../running_your_application_locally.step | 38 - .../setting_the_default_page.step | 48 +- sites/en/intro-to-rails/sorting.step | 105 +++ sites/en/intro-to-rails/voting_on_topics.step | 28 - .../javascript-snake-game/img/helloworld.png | Bin 60297 -> 0 bytes .../javascript-snake-game.step | 56 -- .../js-snake-game-tutorial.zip-manifest | 3 - sites/en/javascript-snake-game/js/chunk.js | 102 --- .../en/javascript-snake-game/js/lesson-10.js | 54 -- .../en/javascript-snake-game/js/lesson-11.js | 53 -- .../en/javascript-snake-game/js/lesson-12.js | 63 -- .../en/javascript-snake-game/js/lesson-13.js | 77 -- sites/en/javascript-snake-game/js/lesson-2.js | 4 - sites/en/javascript-snake-game/js/lesson-3.js | 7 - sites/en/javascript-snake-game/js/lesson-4.js | 15 - sites/en/javascript-snake-game/js/lesson-5.js | 21 - sites/en/javascript-snake-game/js/lesson-6.js | 35 - sites/en/javascript-snake-game/js/lesson-7.js | 41 -- sites/en/javascript-snake-game/js/lesson-8.js | 46 -- sites/en/javascript-snake-game/js/lesson-9.js | 49 -- sites/en/javascript-snake-game/js/snake.js | 81 --- sites/en/javascript-snake-game/lesson-10.step | 73 -- sites/en/javascript-snake-game/lesson-11.step | 46 -- sites/en/javascript-snake-game/lesson-12.step | 56 -- sites/en/javascript-snake-game/lesson-13.step | 58 -- sites/en/javascript-snake-game/lesson-14.step | 1 - sites/en/javascript-snake-game/lesson-2.step | 100 --- sites/en/javascript-snake-game/lesson-3.step | 76 -- sites/en/javascript-snake-game/lesson-4.step | 60 -- sites/en/javascript-snake-game/lesson-5.step | 42 -- sites/en/javascript-snake-game/lesson-6.step | 76 -- sites/en/javascript-snake-game/lesson-7.step | 32 - sites/en/javascript-snake-game/lesson-8.step | 39 - sites/en/javascript-snake-game/lesson-9.step | 66 -- .../zip_content/index.html | 19 - .../zip_content/snake.js | 0 .../adding_an_item.step | 183 ----- ...lding_complex_applications_with_react.step | 179 ----- .../creating_a_list.step | 164 ----- .../deploying_your_site.step | 3 - .../developer_tools.step | 3 - .../javascript-to-do-list-with-react.step | 78 -- .../loading_items.step | 131 ---- .../marking_an_item_as_complete.step | 187 ----- .../next_steps.step | 22 - .../_deploying_your_site.md | 54 -- .../javascript-to-do-list/adding_an_item.step | 143 ---- .../creating_a_list.step | 165 ----- .../deploying_your_site.step | 3 - .../developer_tools.step | 3 - .../img/browser_console.png | Bin 37735 -> 0 bytes .../img/finished_app.png | Bin 219764 -> 0 bytes .../javascript-to-do-list/img/network_tab.png | Bin 87614 -> 0 bytes .../img/text_editor_html.png | Bin 119787 -> 0 bytes .../javascript-to-do-list.step | 76 -- .../javascript-to-do-list/loading_items.step | 105 --- .../marking_an_item_as_complete.step | 144 ---- .../en/javascript-to-do-list/next_steps.step | 22 - .../playing_with_jquery.step | 106 --- .../programming_with_javascript.step | 139 ---- .../the_basics_of_a_website.step | 97 --- sites/en/job-board/add_a_navbar.step | 115 --- sites/en/job-board/add_a_new_job_form.step | 83 --- sites/en/job-board/add_more_things.step | 18 - sites/en/job-board/create_a_rails_app.step | 75 -- .../crud_and_resourceful_routing.step | 38 - sites/en/job-board/delete_job_listings.step | 66 -- sites/en/job-board/img/crud_grid.jpg | Bin 147731 -> 0 bytes sites/en/job-board/img/crud_rails_methods.jpg | Bin 105091 -> 0 bytes sites/en/job-board/img/rails-routes.png | Bin 85412 -> 0 bytes sites/en/job-board/img/request-cycle.jpg | Bin 140706 -> 0 bytes sites/en/job-board/job-board.step | 30 - sites/en/job-board/listing_the_jobs.step | 51 -- sites/en/job-board/make_a_jobs_home_page.step | 120 --- sites/en/job-board/make_the_form_work.step | 132 ---- .../job-board/store_jobs_in_the_database.step | 85 --- sites/en/job-board/the_request_cycle.step | 9 - sites/en/job-board/update_job_listings.step | 171 ----- sites/en/learn-to-code/argv.md | 54 -- sites/en/learn-to-code/arrays.md | 126 ---- sites/en/learn-to-code/computers.md | 106 --- sites/en/learn-to-code/extra.md | 17 - sites/en/learn-to-code/functions.md | 58 -- sites/en/learn-to-code/hashes.md | 14 - sites/en/learn-to-code/img/cookie-recipe.gif | Bin 4217 -> 0 bytes sites/en/learn-to-code/img/dot.jpg | Bin 48551 -> 0 bytes .../img/fruit-banana-snack-banana.svg | 199 ----- .../learn-to-code/img/one-infinite-loop.jpg | Bin 86988 -> 0 bytes sites/en/learn-to-code/img/snack-apple.svg | 148 ---- sites/en/learn-to-code/img/snack-fruit.svg | 178 ----- sites/en/learn-to-code/img/spoon.jpg | Bin 25425 -> 0 bytes sites/en/learn-to-code/img/truthiness.png | Bin 235908 -> 0 bytes sites/en/learn-to-code/img/warehouse.jpg | Bin 42935 -> 0 bytes .../learn-to-code/img/wargames-terminal.jpg | Bin 62872 -> 0 bytes sites/en/learn-to-code/input_and_output.md | 114 --- sites/en/learn-to-code/learn-to-code.md | 79 -- sites/en/learn-to-code/logic.md | 111 --- sites/en/learn-to-code/loops.md | 232 ------ sites/en/learn-to-code/methods.md | 7 - sites/en/learn-to-code/next_steps.md | 19 - sites/en/learn-to-code/nil.md | 40 - sites/en/learn-to-code/numbers.md | 156 ---- sites/en/learn-to-code/objects.md | 81 --- sites/en/learn-to-code/sinatra.md | 67 -- sites/en/learn-to-code/strings.md | 45 -- sites/en/learn-to-code/the_command_line.md | 106 --- sites/en/learn-to-code/todo-learntocode.md | 18 - sites/en/learn-to-code/variables.md | 114 --- sites/en/ruby/arrays.step | 102 --- sites/en/ruby/booleans.step | 117 --- sites/en/ruby/classes.step | 43 -- sites/en/ruby/command_line.step | 162 ----- sites/en/ruby/conditionals.step | 100 --- sites/en/ruby/datatypes.step | 98 --- sites/en/ruby/functions.step | 69 -- sites/en/ruby/hashes.step | 50 -- sites/en/ruby/how_to_write_a_program.step | 240 ------ sites/en/ruby/input_and_output.step | 67 -- sites/en/ruby/irb.step | 84 --- sites/en/ruby/loops.step | 88 --- sites/en/ruby/nil.step | 97 --- sites/en/ruby/numbers_and_arithmetic.step | 85 --- sites/en/ruby/overview:_building_blocks.step | 11 - sites/en/ruby/overview:_organizing.step | 7 - sites/en/ruby/ruby.step | 76 -- .../en/ruby/running_programs_from_a_file.step | 92 --- sites/en/ruby/strings.step | 97 --- sites/en/ruby/summary:_basics.step | 18 - sites/en/ruby/summary:_tools.step | 17 - sites/en/ruby/symbols.step | 103 --- sites/en/ruby/using_virtual_machines.step | 114 --- sites/en/ruby/variables.step | 104 --- sites/en/ruby/what_is_ruby.step | 23 - sites/en/ruby/working_with_collections.step | 16 - sites/en/workshop/beginners.mw | 22 - sites/en/workshop/closing.deck.md | 35 - sites/en/workshop/command_prompt.mw | 19 - sites/en/workshop/diagrams.mw | 66 -- sites/en/workshop/foundational_skills.deck.md | 118 --- sites/en/workshop/helpful_examples.mw | 23 - .../en/workshop/img/Win7_search_programs.jpg | Bin 17269 -> 0 bytes sites/en/workshop/img/acrobat.jpg | Bin 20325 -> 0 bytes sites/en/workshop/img/agile.jpg | Bin 84510 -> 0 bytes sites/en/workshop/img/cheatsheet.png | Bin 407493 -> 0 bytes sites/en/workshop/img/ey_logo_rgb.png | Bin 117701 -> 0 bytes sites/en/workshop/img/firefox.png | Bin 22873 -> 0 bytes sites/en/workshop/img/git.png | Bin 32469 -> 0 bytes sites/en/workshop/img/git_bash.png | Bin 3185 -> 0 bytes sites/en/workshop/img/itunes.png | Bin 20771 -> 0 bytes sites/en/workshop/img/linux_logo.gif | Bin 3453 -> 0 bytes sites/en/workshop/img/mac_terminal_sm.png | Bin 9229 -> 0 bytes sites/en/workshop/img/os_x_logo.jpg | Bin 4584 -> 0 bytes sites/en/workshop/img/rails_logo.jpg | Bin 35255 -> 0 bytes sites/en/workshop/img/railsbridge_logo.png | Bin 37510 -> 0 bytes sites/en/workshop/img/ruby-logo.jpg | Bin 49129 -> 0 bytes sites/en/workshop/img/rubygems.png | Bin 12342 -> 0 bytes sites/en/workshop/img/windows_logo.gif | Bin 2214 -> 0 bytes sites/en/workshop/img/wordpress.jpg | Bin 8486 -> 0 bytes .../en/workshop/more_teacher_training.deck.md | 251 ------- sites/en/workshop/noobie-outline.txt | 53 -- sites/en/workshop/resources.md | 53 -- sites/en/workshop/ruby_for_beginners.deck.md | 688 ------------------ .../en/workshop/ruby_for_programmers.deck.md | 290 -------- sites/en/workshop/teaching_tips.md | 31 - sites/en/workshop/topics.md | 48 -- sites/en/workshop/web_apps.deck.md | 26 - sites/en/workshop/welcome.deck.md | 104 --- sites/en/workshop/workshop.md | 38 - sites/es/hola/hola.step | 1 - sites/zh-tw/nihao/nihao.step | 1 - 272 files changed, 580 insertions(+), 13564 deletions(-) delete mode 100644 sites/en/frontend/HTML_attributes.step delete mode 100644 sites/en/frontend/HTML_structure.step delete mode 100644 sites/en/frontend/HTML_tags.step delete mode 100644 sites/en/frontend/_consider_deploying_to_github.step delete mode 100644 sites/en/frontend/_developer_tools.step delete mode 100644 sites/en/frontend/_working_effectively_and_efficiently.md delete mode 100644 sites/en/frontend/add_more_elements.step delete mode 100644 sites/en/frontend/add_starter_files.step delete mode 100644 sites/en/frontend/basic_CSS.step delete mode 100644 sites/en/frontend/basic_javascript.step delete mode 100644 sites/en/frontend/deploying_to_github_pages.step delete mode 100644 sites/en/frontend/developer_tools.step delete mode 100755 sites/en/frontend/frontend.step delete mode 100644 sites/en/frontend/get_a_sticker.step delete mode 100644 sites/en/frontend/get_a_sticker_admin_button.png delete mode 100644 sites/en/frontend/get_a_sticker_admin_settings.png delete mode 100644 sites/en/frontend/get_a_sticker_fork_button.png delete mode 100644 sites/en/frontend/get_a_sticker_https.png delete mode 100644 sites/en/frontend/get_a_sticker_output.png delete mode 100644 sites/en/frontend/html_quick_reference.md delete mode 100644 sites/en/frontend/img/boxmodel.png delete mode 100644 sites/en/frontend/img/css.png delete mode 100644 sites/en/frontend/img/css_bundler.png delete mode 100644 sites/en/frontend/img/css_class.png delete mode 100644 sites/en/frontend/img/css_id.png delete mode 100644 sites/en/frontend/img/css_zen.png delete mode 100644 sites/en/frontend/img/devtools.png delete mode 100644 sites/en/frontend/img/devtools_console.png delete mode 100644 sites/en/frontend/img/devtools_elements.png delete mode 100644 sites/en/frontend/img/devtools_network.png delete mode 100644 sites/en/frontend/img/devtools_script.png delete mode 100644 sites/en/frontend/img/github.png delete mode 100644 sites/en/frontend/img/github_create_repo.png delete mode 100644 sites/en/frontend/img/github_name_your_repo.png delete mode 100644 sites/en/frontend/img/hello_html.png delete mode 100644 sites/en/frontend/img/hello_omg.png delete mode 100644 sites/en/frontend/img/hello_structure.png delete mode 100644 sites/en/frontend/img/hello_style.png delete mode 100644 sites/en/frontend/img/hello_title.png delete mode 100644 sites/en/frontend/img/hello_world.png delete mode 100644 sites/en/frontend/img/hello_world_2line.png delete mode 100644 sites/en/frontend/img/hello_world_2line2.png delete mode 100644 sites/en/frontend/img/hello_world_jazzy.png delete mode 100644 sites/en/frontend/img/html_tags_list.png delete mode 100644 sites/en/frontend/img/jquery_result.png delete mode 100644 sites/en/frontend/img/page.png delete mode 100644 sites/en/frontend/img/page_anchors.png delete mode 100644 sites/en/frontend/img/page_html.png delete mode 100644 sites/en/frontend/img/page_img.png delete mode 100644 sites/en/frontend/img/page_sample.jpg delete mode 100644 sites/en/frontend/img/page_sample.png delete mode 100644 sites/en/frontend/img/prompt.png delete mode 100644 sites/en/frontend/img/zip.png delete mode 100644 sites/en/frontend/introduction_to_html.step delete mode 100644 sites/en/frontend/jquery.step delete mode 100644 sites/en/frontend/jquery_vs_javascript.step delete mode 100644 sites/en/frontend/make_a_web_page.step delete mode 100644 sites/en/frontend/make_columns.step delete mode 100644 sites/en/frontend/resources.step delete mode 100644 sites/en/frontend/tool_installation.step delete mode 100644 sites/en/intermediate-rails/add_other_features_of_your_choosing.step delete mode 100644 sites/en/intermediate-rails/add_pages_to_create_and_look_at_individual_posts.step delete mode 100644 sites/en/intermediate-rails/add_replying.step delete mode 100644 sites/en/intermediate-rails/commands.md delete mode 100644 sites/en/intermediate-rails/create_a_new_rails_app_with_a_static_home_page.step delete mode 100644 sites/en/intermediate-rails/creating_a_new_controller.md delete mode 100644 sites/en/intermediate-rails/img/create_post.png delete mode 100644 sites/en/intermediate-rails/img/create_reply.png delete mode 100644 sites/en/intermediate-rails/img/header.png delete mode 100644 sites/en/intermediate-rails/img/inline_reply.png delete mode 100644 sites/en/intermediate-rails/img/post_index.png delete mode 100644 sites/en/intermediate-rails/img/request-cycle.jpg delete mode 100644 sites/en/intermediate-rails/img/show_post.png delete mode 100644 sites/en/intermediate-rails/img/show_replies.png delete mode 100644 sites/en/intermediate-rails/img/static_home_page.png delete mode 100644 sites/en/intermediate-rails/inline_replying_on_a_post.step delete mode 100644 sites/en/intermediate-rails/install_devise.step delete mode 100644 sites/en/intermediate-rails/intermediate-rails.step delete mode 100644 sites/en/intermediate-rails/make_a_posts_index_page.step delete mode 100644 sites/en/intermediate-rails/make_it_pretty_with_bootstrap.step delete mode 100644 sites/en/intermediate-rails/mvc_overview.md delete mode 100644 sites/en/intermediate-rails/the_request_cycle.md delete mode 100644 sites/en/intro-to-rails/CRUD_with_scaffolding.step delete mode 100644 sites/en/intro-to-rails/allow_people_to_vote.step delete mode 100644 sites/en/intro-to-rails/clean_up_links_on_the_topics_list.step delete mode 100644 sites/en/intro-to-rails/creating_a_migration.step delete mode 100644 sites/en/intro-to-rails/credits_and_next_steps.step create mode 100644 sites/en/intro-to-rails/datatypes.step create mode 100644 sites/en/intro-to-rails/dog_scaffold.step delete mode 100644 sites/en/intro-to-rails/hooking_up_votes_and_topics.step delete mode 100644 sites/en/intro-to-rails/make_the_topic_title_a_link.step create mode 100644 sites/en/intro-to-rails/pictures.step delete mode 100644 sites/en/intro-to-rails/redirect_to_the_topics_list_after_creating_a_new_topic.step delete mode 100644 sites/en/intro-to-rails/running_your_application_locally.step create mode 100644 sites/en/intro-to-rails/sorting.step delete mode 100644 sites/en/intro-to-rails/voting_on_topics.step delete mode 100644 sites/en/javascript-snake-game/img/helloworld.png delete mode 100644 sites/en/javascript-snake-game/javascript-snake-game.step delete mode 100644 sites/en/javascript-snake-game/js-snake-game-tutorial.zip-manifest delete mode 100644 sites/en/javascript-snake-game/js/chunk.js delete mode 100644 sites/en/javascript-snake-game/js/lesson-10.js delete mode 100644 sites/en/javascript-snake-game/js/lesson-11.js delete mode 100644 sites/en/javascript-snake-game/js/lesson-12.js delete mode 100644 sites/en/javascript-snake-game/js/lesson-13.js delete mode 100644 sites/en/javascript-snake-game/js/lesson-2.js delete mode 100644 sites/en/javascript-snake-game/js/lesson-3.js delete mode 100644 sites/en/javascript-snake-game/js/lesson-4.js delete mode 100644 sites/en/javascript-snake-game/js/lesson-5.js delete mode 100644 sites/en/javascript-snake-game/js/lesson-6.js delete mode 100644 sites/en/javascript-snake-game/js/lesson-7.js delete mode 100644 sites/en/javascript-snake-game/js/lesson-8.js delete mode 100644 sites/en/javascript-snake-game/js/lesson-9.js delete mode 100644 sites/en/javascript-snake-game/js/snake.js delete mode 100644 sites/en/javascript-snake-game/lesson-10.step delete mode 100644 sites/en/javascript-snake-game/lesson-11.step delete mode 100644 sites/en/javascript-snake-game/lesson-12.step delete mode 100644 sites/en/javascript-snake-game/lesson-13.step delete mode 100644 sites/en/javascript-snake-game/lesson-14.step delete mode 100644 sites/en/javascript-snake-game/lesson-2.step delete mode 100644 sites/en/javascript-snake-game/lesson-3.step delete mode 100644 sites/en/javascript-snake-game/lesson-4.step delete mode 100644 sites/en/javascript-snake-game/lesson-5.step delete mode 100644 sites/en/javascript-snake-game/lesson-6.step delete mode 100644 sites/en/javascript-snake-game/lesson-7.step delete mode 100644 sites/en/javascript-snake-game/lesson-8.step delete mode 100644 sites/en/javascript-snake-game/lesson-9.step delete mode 100644 sites/en/javascript-snake-game/zip_content/index.html delete mode 100644 sites/en/javascript-snake-game/zip_content/snake.js delete mode 100644 sites/en/javascript-to-do-list-with-react/adding_an_item.step delete mode 100644 sites/en/javascript-to-do-list-with-react/building_complex_applications_with_react.step delete mode 100644 sites/en/javascript-to-do-list-with-react/creating_a_list.step delete mode 100644 sites/en/javascript-to-do-list-with-react/deploying_your_site.step delete mode 100644 sites/en/javascript-to-do-list-with-react/developer_tools.step delete mode 100644 sites/en/javascript-to-do-list-with-react/javascript-to-do-list-with-react.step delete mode 100644 sites/en/javascript-to-do-list-with-react/loading_items.step delete mode 100644 sites/en/javascript-to-do-list-with-react/marking_an_item_as_complete.step delete mode 100644 sites/en/javascript-to-do-list-with-react/next_steps.step delete mode 100644 sites/en/javascript-to-do-list/_deploying_your_site.md delete mode 100644 sites/en/javascript-to-do-list/adding_an_item.step delete mode 100644 sites/en/javascript-to-do-list/creating_a_list.step delete mode 100644 sites/en/javascript-to-do-list/deploying_your_site.step delete mode 100644 sites/en/javascript-to-do-list/developer_tools.step delete mode 100644 sites/en/javascript-to-do-list/img/browser_console.png delete mode 100644 sites/en/javascript-to-do-list/img/finished_app.png delete mode 100644 sites/en/javascript-to-do-list/img/network_tab.png delete mode 100644 sites/en/javascript-to-do-list/img/text_editor_html.png delete mode 100644 sites/en/javascript-to-do-list/javascript-to-do-list.step delete mode 100644 sites/en/javascript-to-do-list/loading_items.step delete mode 100644 sites/en/javascript-to-do-list/marking_an_item_as_complete.step delete mode 100644 sites/en/javascript-to-do-list/next_steps.step delete mode 100644 sites/en/javascript-to-do-list/playing_with_jquery.step delete mode 100644 sites/en/javascript-to-do-list/programming_with_javascript.step delete mode 100644 sites/en/javascript-to-do-list/the_basics_of_a_website.step delete mode 100644 sites/en/job-board/add_a_navbar.step delete mode 100644 sites/en/job-board/add_a_new_job_form.step delete mode 100644 sites/en/job-board/add_more_things.step delete mode 100644 sites/en/job-board/create_a_rails_app.step delete mode 100644 sites/en/job-board/crud_and_resourceful_routing.step delete mode 100644 sites/en/job-board/delete_job_listings.step delete mode 100644 sites/en/job-board/img/crud_grid.jpg delete mode 100644 sites/en/job-board/img/crud_rails_methods.jpg delete mode 100644 sites/en/job-board/img/rails-routes.png delete mode 100644 sites/en/job-board/img/request-cycle.jpg delete mode 100644 sites/en/job-board/job-board.step delete mode 100644 sites/en/job-board/listing_the_jobs.step delete mode 100644 sites/en/job-board/make_a_jobs_home_page.step delete mode 100644 sites/en/job-board/make_the_form_work.step delete mode 100644 sites/en/job-board/store_jobs_in_the_database.step delete mode 100644 sites/en/job-board/the_request_cycle.step delete mode 100644 sites/en/job-board/update_job_listings.step delete mode 100644 sites/en/learn-to-code/argv.md delete mode 100644 sites/en/learn-to-code/arrays.md delete mode 100644 sites/en/learn-to-code/computers.md delete mode 100644 sites/en/learn-to-code/extra.md delete mode 100644 sites/en/learn-to-code/functions.md delete mode 100644 sites/en/learn-to-code/hashes.md delete mode 100644 sites/en/learn-to-code/img/cookie-recipe.gif delete mode 100644 sites/en/learn-to-code/img/dot.jpg delete mode 100644 sites/en/learn-to-code/img/fruit-banana-snack-banana.svg delete mode 100644 sites/en/learn-to-code/img/one-infinite-loop.jpg delete mode 100644 sites/en/learn-to-code/img/snack-apple.svg delete mode 100644 sites/en/learn-to-code/img/snack-fruit.svg delete mode 100644 sites/en/learn-to-code/img/spoon.jpg delete mode 100644 sites/en/learn-to-code/img/truthiness.png delete mode 100644 sites/en/learn-to-code/img/warehouse.jpg delete mode 100644 sites/en/learn-to-code/img/wargames-terminal.jpg delete mode 100644 sites/en/learn-to-code/input_and_output.md delete mode 100644 sites/en/learn-to-code/learn-to-code.md delete mode 100644 sites/en/learn-to-code/logic.md delete mode 100644 sites/en/learn-to-code/loops.md delete mode 100644 sites/en/learn-to-code/methods.md delete mode 100644 sites/en/learn-to-code/next_steps.md delete mode 100644 sites/en/learn-to-code/nil.md delete mode 100644 sites/en/learn-to-code/numbers.md delete mode 100644 sites/en/learn-to-code/objects.md delete mode 100644 sites/en/learn-to-code/sinatra.md delete mode 100644 sites/en/learn-to-code/strings.md delete mode 100644 sites/en/learn-to-code/the_command_line.md delete mode 100644 sites/en/learn-to-code/todo-learntocode.md delete mode 100644 sites/en/learn-to-code/variables.md delete mode 100644 sites/en/ruby/arrays.step delete mode 100644 sites/en/ruby/booleans.step delete mode 100644 sites/en/ruby/classes.step delete mode 100755 sites/en/ruby/command_line.step delete mode 100644 sites/en/ruby/conditionals.step delete mode 100644 sites/en/ruby/datatypes.step delete mode 100644 sites/en/ruby/functions.step delete mode 100644 sites/en/ruby/hashes.step delete mode 100644 sites/en/ruby/how_to_write_a_program.step delete mode 100644 sites/en/ruby/input_and_output.step delete mode 100755 sites/en/ruby/irb.step delete mode 100644 sites/en/ruby/loops.step delete mode 100644 sites/en/ruby/nil.step delete mode 100644 sites/en/ruby/numbers_and_arithmetic.step delete mode 100644 sites/en/ruby/overview:_building_blocks.step delete mode 100644 sites/en/ruby/overview:_organizing.step delete mode 100755 sites/en/ruby/ruby.step delete mode 100644 sites/en/ruby/running_programs_from_a_file.step delete mode 100644 sites/en/ruby/strings.step delete mode 100644 sites/en/ruby/summary:_basics.step delete mode 100644 sites/en/ruby/summary:_tools.step delete mode 100644 sites/en/ruby/symbols.step delete mode 100644 sites/en/ruby/using_virtual_machines.step delete mode 100755 sites/en/ruby/variables.step delete mode 100755 sites/en/ruby/what_is_ruby.step delete mode 100644 sites/en/ruby/working_with_collections.step delete mode 100644 sites/en/workshop/beginners.mw delete mode 100644 sites/en/workshop/closing.deck.md delete mode 100644 sites/en/workshop/command_prompt.mw delete mode 100644 sites/en/workshop/diagrams.mw delete mode 100644 sites/en/workshop/foundational_skills.deck.md delete mode 100644 sites/en/workshop/helpful_examples.mw delete mode 100644 sites/en/workshop/img/Win7_search_programs.jpg delete mode 100644 sites/en/workshop/img/acrobat.jpg delete mode 100644 sites/en/workshop/img/agile.jpg delete mode 100644 sites/en/workshop/img/cheatsheet.png delete mode 100644 sites/en/workshop/img/ey_logo_rgb.png delete mode 100644 sites/en/workshop/img/firefox.png delete mode 100644 sites/en/workshop/img/git.png delete mode 100644 sites/en/workshop/img/git_bash.png delete mode 100644 sites/en/workshop/img/itunes.png delete mode 100644 sites/en/workshop/img/linux_logo.gif delete mode 100644 sites/en/workshop/img/mac_terminal_sm.png delete mode 100644 sites/en/workshop/img/os_x_logo.jpg delete mode 100644 sites/en/workshop/img/rails_logo.jpg delete mode 100644 sites/en/workshop/img/railsbridge_logo.png delete mode 100644 sites/en/workshop/img/ruby-logo.jpg delete mode 100644 sites/en/workshop/img/rubygems.png delete mode 100644 sites/en/workshop/img/windows_logo.gif delete mode 100644 sites/en/workshop/img/wordpress.jpg delete mode 100644 sites/en/workshop/more_teacher_training.deck.md delete mode 100644 sites/en/workshop/noobie-outline.txt delete mode 100644 sites/en/workshop/resources.md delete mode 100644 sites/en/workshop/ruby_for_beginners.deck.md delete mode 100644 sites/en/workshop/ruby_for_programmers.deck.md delete mode 100644 sites/en/workshop/teaching_tips.md delete mode 100644 sites/en/workshop/topics.md delete mode 100644 sites/en/workshop/web_apps.deck.md delete mode 100644 sites/en/workshop/welcome.deck.md delete mode 100644 sites/en/workshop/workshop.md delete mode 100644 sites/es/hola/hola.step delete mode 100644 sites/zh-tw/nihao/nihao.step diff --git a/lib/doc_page.rb b/lib/doc_page.rb index 099bdb7b8..9c82f48b8 100644 --- a/lib/doc_page.rb +++ b/lib/doc_page.rb @@ -49,11 +49,7 @@ def src_url end def top_links - [ - TopLink.new(name: "toc", href: "#", extraclass: 'show-when-small', toggle_selector: '#table_of_contents'), - TopLink.new(name: "src", href: src_url, extraclass: 'hidden-sm'), - TopLink.new(name: "git", href: git_url, extraclass: 'hidden-sm'), - ] + [] end def body_attributes @@ -74,12 +70,12 @@ def body_content } } ul(class: "navbar-nav nav") { - widget Flags, locale: @locale +# widget Flags, locale: @locale - li(class: "dropdown") { - a("sites", href: "#", class: "dropdown-toggle", "data-toggle" => "dropdown") - widget SiteIndex, site_name: site_name, locale: @locale - } +# li(class: "dropdown") { +# a("sites", href: "#", class: "dropdown-toggle", "data-toggle" => "dropdown") +# widget SiteIndex, site_name: site_name, locale: @locale +# } top_links.each do |top_link| widget top_link diff --git a/lib/site_index.rb b/lib/site_index.rb index d6bd8f172..d3f455d8e 100644 --- a/lib/site_index.rb +++ b/lib/site_index.rb @@ -5,9 +5,7 @@ class SiteIndex < Erector::Widget def categorized_sites { 'setup' => ['installfest'], - 'rails' => ['intro-to-rails', 'job-board', 'intermediate-rails'], - 'frontend' => ['frontend', 'javascript-snake-game', 'javascript-to-do-list', 'javascript-to-do-list-with-react'], - 'ruby' => ['learn-to-code', 'ruby'] + 'rails' => ['intro-to-rails'] } end diff --git a/sites/en/docs/docs.step b/sites/en/docs/docs.step index df5acdd32..464242aa0 100644 --- a/sites/en/docs/docs.step +++ b/sites/en/docs/docs.step @@ -1,7 +1,3 @@ -message <volunteer-created Railsbridge curriculum." -h1 'Other' - -site_desc 'workshop', <<-MARKDOWN -The Railsbridge junkyard! Slide decks for opening/closing presentations, teacher training. -MARKDOWN - -message <" - message <<-MARKDOWN - -looks like a radio button: , but - - MARKDOWN - source_code :html, "" - message <<-MARKDOWN - -looks like a password text input: even though they use the same **tag**. - -## IDs and Classes - -Two of the most important attributes that an element can have are its `id` and its `class`. With these attributes, -we can assign names to elements and groups of elements, then apply CSS styles using the names we give them. - -MARKDOWN - - source_code :html, <<-MARKDOWN -

- This is my intro paragraph! -

-MARKDOWN - - message <<-MARKDOWN -In our CSS, we use special syntax to tell the browser if we're talking about an ID or a class name. IDs are indicated with a -hash, like this: `#intro`. Classes are indicated with a dot: `.special` - MARKDOWN - - tip do message <<-MARKDOWN -## When should I use a class, and when should I use an ID? - -**ID** attributes are unique labels, for identifying things you'll only ever have one -of. For example, if you ran a news website, you might have an masthead element -that only appears once, so you could give it an id -like `handsome-header`. - -**Class** attributes should be used to group together similar elements; for example, you might give certain -paragraphs a class of `special` and use that class to highlight them. - -In general, only use `id` if you're certain that it will only appear on a single element. For everything else, -use `class`. - - MARKDOWN - end - message <<-MARKDOWN - -Let's look at IDs and classes in action. So far we've only applied styles to HTML tags like `

` and `

`. But what if we want to apply a style to only a few of the instances of a given tag? We don't want _every_ paragraph to look special, so we can't add our style directly to the `

` tag. - -MARKDOWN - -end - -steps do - - step do - message "Let's add some classes and ids to our HTML. Start by adding one or two more paragraphs of text to the bottom of your HTML document. The last lines might look like this:" - source_code :html, <Hello World!

-

My name is Rachel.

-

I like:

-
    -
  • Polka Dots
    • -
  • Soccer
    • -
  • Programming
    • -
-

I hear RailsBridge needs volunteers, should I volunteer!?!

-HTML - end - - step do - message "Add the class 'special' to your first paragraph. It'll look something like this:" - source_code :html, <Hello World! -

My name is Rachel.

-

I like:

-
    -
  • Polka Dots
    • -
  • Soccer
    • -
  • Programming
    • -
-

I hear RailsBridge needs volunteers, should I volunteer!?!

-HTML - message "Refresh the page in the browser. You should see any new paragraphs you added, but no styling changes." - message "Many HTML attributes, like classes and ids, don't directly convey visual information. Your site will look the exact same until we use the class to add CSS styling." - end - - step do - message "To add a style rule that will apply to a class, use the syntax `.class-name` for your selector. It will be almost the same as the styles that you added to `

` and `

`, but with a period at the beginning of your class name." - message "Try giving the 'special' class a green border. Add this rule inside of your `style` tag:" - source_code :css, <Hello World!

-

My name is - Rachel -

-

I like:

-
    -
  • Polka Dots
    • -
  • Soccer
    • -
  • Programming
    • -
-

I hear RailsBridge needs volunteers, should I volunteer!?!

-HTML - message "Save and refresh the page in the browser. Again, you shouldn't see any difference." - end - - step do - message "Now, add the corresponding style rule for your ID, using the syntax `#id-name` for your selector. Try making the 'user-name' id look bold. Add this rule inside of your `style` tag:" - source_code :css, <` is called the doctype, and it tells the browser which flavor of HTML you're using. `` tells your browser you're using HTML5, the latest version of HTML. - -(You may see older doctypes out there that are longer and a lot more complicated, from when people -used various HTML and XHTML versions, but those are annoying, and you can usually just -use this short version for new websites.) - -The `` encloses all the rest of your page, and states unequivocally, "Here is my HTML!!!" - -## Pages, Like People, Have a Head and a Body - - MARKDOWN - source_code :html, < - - Invisible, Important Stuff - Actual Visible Content - -HTML - message <<-MARKDOWN - -### The Head - -The head contains information _about_ the document, including: - -* what language or character set you're using -* what the page title should be -* what CSS and JavaScript files to include (and where they are) - -Information in the `` section is __not__ displayed. - -It can also contain metadata tags that can tell a search engine or another -program more about the file, like who wrote it or what keywords are relevant. - -### The Body - -The Body contains the actual content of your file, the things you'll want your users -to be able to see, read, or interact with! - - MARKDOWN - -end - -steps do - - step do - message <<-MARKDOWN -Let's add the doctype, HTML, head, and body tags to your file. It should look like this: - - - -Save the file and refresh your browser. Everything should look mostly the same. - - MARKDOWN - end - - step do - message "Let's add a title to our page within the `` section. Add this line:" - source_code :html, "My Sample HTML page" - message <<-MARKDOWN -When you refresh your browser, you should see the title on the tab in Chrome. - - - -(If it doesn't show up, double check that you put the line between the opening and closing head tags, and that you saved your file before refreshing.) - MARKDOWN - end - -end - -next_step "basic_CSS" - diff --git a/sites/en/frontend/HTML_tags.step b/sites/en/frontend/HTML_tags.step deleted file mode 100644 index 260881d78..000000000 --- a/sites/en/frontend/HTML_tags.step +++ /dev/null @@ -1,216 +0,0 @@ -goals do - goal "Add some tags to your HTML file" - goal "Learn more about available tags" -end - -overview do - - message <<-MARKDOWN - -## Use Tags to Separate Blocks of Content - - -Tags convey meaning. And in order to display your content well, everything should be inside of a tag, not just words you want emphasized. So let's use the paragraph tag `

` and the header 1 tag `

`. - -You'll notice that even if you put in extra lines and spaces, HTML will treat any number of -new line or space characters like there's just one space there. When you're getting started -with HTML, this can seem like a pain, because you have to type - MARKDOWN - - source_code :html, <first sentence

-

second sentence

-HTML - message <<-MARKDOWN - -when all you want is a blank line between two sentences. But as you get more advanced, this -aspect of HTML will feel more useful, because it means you can format your code however is -most readable for **you**, without worrying about what the browser will think of your blank -lines and spaces. - -## Nested Tags - -It's common for an HTML tag to be nested inside another tag. In the example above, you saw: - MARKDOWN - - source_code :html, "

" - - important do - message "Just make sure that the tags are correctly _nested_. For example, you can't do:" - - source_code :html, "

Hello World!

I like you!" - - message "The inner tag, `em`, needs to close before the outer tag closes." - end -end - -steps do - - step do - message "Add some more lines of content to your HTML file. Introduce yourself." - - source_code :html, <<-HTML -Hello World! - -My name is Rachel. - HTML - - message "Now save the file and refresh your browser." - img src: 'img/hello_world_2line.png' - end - - step do - message "Even though we put in some blank lines, the browser ignored them. So we'll have to use tags to break up our content." - message "Update your HTML with an `h1` tag and a `p` tag:" - - source_code :html, <<-HTML -

Hello World!

-

My name is Rachel.

- HTML - - message "Now save the file and refresh your browser." - img src: 'img/hello_world_2line2.png' - end - - step do - message "Now let's add a list of things we like." - - source_code :html, <<-HTML -

Hello World!

-

My name is Rachel.

-

I like:

-
    -
  • Polka Dots
    • -
  • Soccer
    • -
  • Programming
    • -
- HTML - - message "Now save the file and refresh your browser." - img src: 'img/html_tags_list.png' - end - -end - - -explanation do - - message <<-MARKDOWN - -## Tags for Every Occasion - -The meteoric rise in popularity of the world-wide-web and the recent proliferation of web -applications has made HTML hugely popular. While originally used only for simple documents, -HTML now has tags for embedded video and music playback, embedding images, filling out -web forms, and all kinds of other useful tags. - -You just used two well-known tags, `h1` for a headline and `p` for a paragraph. But there -are a ton of other tags you might use: - -## More Tags - - MARKDOWN - - table border: "1", cellspacing: "0", cellpadding: "3", align: "center" do - tr { - th "Tag" - th "Purpose" - } - tr { - td "a" - td "A link (the 'a' stands for Anchor)" - } - tr { - td "h1-h6" - td "Various headers, h1 is the most important, h6 the least." - } - tr { - td "ul" - td "Start a bulleted list (an 'unordered list')" - } - tr { - td "ol" - td "Start a numbered list (an 'ordered list')" - } - tr { - td "li" - td "A single thing within a list (a 'list item')" - } - tr { - td "table, tr, td" - td "You can make tables (like this one) with table rows and data cells" - } - tr { - td "form" - td "A form that can collect data from user input" - } - tr { - td "input" - td "A text input, a button, or a checkbox in a form" - } - tr { - td "div" - td "A section marker that doesn't do anything specific to the contents itself, but does make a new line after. (More on this later.)" - } - tr { - td "span" - td "Another section marker that doesn't do anything to its contents, but is inline - it does not make a new line after." - } - end - - message <<-MARKDOWN - - And HTML5 introduced lots of new HTML tags to make the HTML more *semantic*, meaning the tags should describe the content they describe. Some of the new elements introduced by HTML5 include: - - MARKDOWN - - table border: "1", cellspacing: "0", cellpadding: "3", align: "center" do - tr { - th "Tag" - th "Purpose" - } - tr { - td "section" - td "A section of a document" - } - tr { - td "nav" - td "A navigation section" - } - tr { - td "header" - td "The header for a page. (This is different from the head element, which contains metadata about the page!)" - } - tr { - td "footer" - td "The footer for a page" - } - tr { - td "main" - td "The important content on a page" - } - tr{ - td "aside" - td "Content not essential to the main content" - } - end - - message <<-MARKDOWN - -Don't try to memorize all the tags! You can always look them up on sites like: - -* [Sitepoint](http://reference.sitepoint.com/html) -* [Mozilla Developer Network](https://developer.mozilla.org/en/HTML/Element) - -## Try This -What happens if you change the `