diff options
| author | Xavier Noria <fxn@hashref.com> | 2012-10-06 17:08:50 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2012-10-06 17:08:50 -0700 |
| commit | 93d22512f9f8b753af8fe3f9148bba7cc05654ce (patch) | |
| tree | d3e6787a101705b23d6fd60d326da0c662813089 /guides/source | |
| parent | 410d376d3c78e6b7740d73bb04dc4a59629518c9 (diff) | |
| parent | 65a2977cdd55678d3eab06434625375914511786 (diff) | |
| download | rails-93d22512f9f8b753af8fe3f9148bba7cc05654ce.tar.gz rails-93d22512f9f8b753af8fe3f9148bba7cc05654ce.tar.bz2 rails-93d22512f9f8b753af8fe3f9148bba7cc05654ce.zip | |
Merge pull request #6475 from joefiorini/responsive-guides
Responsive guides
Diffstat (limited to 'guides/source')
| -rw-r--r-- | guides/source/action_controller_overview.md | 4 | ||||
| -rw-r--r-- | guides/source/layout.html.erb | 52 | ||||
| -rw-r--r-- | guides/source/migrations.md | 2 |
3 files changed, 40 insertions, 18 deletions
diff --git a/guides/source/action_controller_overview.md b/guides/source/action_controller_overview.md index e6a6b05166..824ffb5d7a 100644 --- a/guides/source/action_controller_overview.md +++ b/guides/source/action_controller_overview.md @@ -174,8 +174,8 @@ Your application has a session for each user in which you can store small amount * ActionDispatch::Session::CookieStore - Stores everything on the client. * ActionDispatch::Session::CacheStore - Stores the data in the Rails cache. -* ActionDispatch::Session::ActiveRecordStore - Stores the data in a database using Active Record. (require `activerecord-session_store` gem). -* ActionDispatch::Session::MemCacheStore - Stores the data in a memcached cluster (this is a legacy implementation; consider using CacheStore instead). +* @ActionDispatch::Session::ActiveRecordStore@ - Stores the data in a database using Active Record. (require `activerecord-session_store` gem). +* @ActionDispatch::Session::MemCacheStore@ - Stores the data in a memcached cluster (this is a legacy implementation; consider using CacheStore instead). All session stores use a cookie to store a unique ID for each session (you must use a cookie, Rails will not allow you to pass the session ID in the URL as this is less secure). diff --git a/guides/source/layout.html.erb b/guides/source/layout.html.erb index 0a8daf7ae5..397dd62638 100644 --- a/guides/source/layout.html.erb +++ b/guides/source/layout.html.erb @@ -4,9 +4,9 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> +<meta name="viewport" content="width=device-width, initial-scale=1"> <title><%= yield(:page_title) || 'Ruby on Rails Guides' %></title> - <link rel="stylesheet" type="text/css" href="stylesheets/style.css" /> <link rel="stylesheet" type="text/css" href="stylesheets/print.css" media="print" /> @@ -25,24 +25,30 @@ <% end %> <div id="topNav"> <div class="wrapper"> - <strong>More at <a href="http://rubyonrails.org/">rubyonrails.org:</a> </strong> - <a href="http://rubyonrails.org/">Overview</a> | - <a href="http://rubyonrails.org/download">Download</a> | - <a href="http://rubyonrails.org/deploy">Deploy</a> | - <a href="https://github.com/rails/rails">Code</a> | - <a href="http://rubyonrails.org/screencasts">Screencasts</a> | - <a href="http://rubyonrails.org/documentation">Documentation</a> | - <a href="http://rubyonrails.org/ecosystem">Ecosystem</a> | - <a href="http://rubyonrails.org/community">Community</a> | - <a href="http://weblog.rubyonrails.org/">Blog</a> + <strong class="more-info-label">More at <a href="http://rubyonrails.org/">rubyonrails.org:</a> </strong> + <span class="red-button more-info-button"> + More Ruby on Rails + </span> + <ul class="more-info-links s-hidden"> + <li class="more-info"><a href="http://rubyonrails.org/">Overview</a></li> + <li class="more-info"><a href="http://rubyonrails.org/download">Download</a></li> + <li class="more-info"><a href="http://rubyonrails.org/deploy">Deploy</a></li> + <li class="more-info"><a href="https://github.com/rails/rails">Code</a></li> + <li class="more-info"><a href="http://rubyonrails.org/screencasts">Screencasts</a></li> + <li class="more-info"><a href="http://rubyonrails.org/documentation">Documentation</a></li> + <li class="more-info"><a href="http://rubyonrails.org/ecosystem">Ecosystem</a></li> + <li class="more-info"><a href="http://rubyonrails.org/community">Community</a></li> + <li class="more-info"><a href="http://weblog.rubyonrails.org/">Blog</a></li> + </ul> </div> </div> <div id="header"> <div class="wrapper clearfix"> <h1><a href="index.html" title="Return to home page">Guides.rubyonrails.org</a></h1> <ul class="nav"> - <li><a href="index.html">Home</a></li> - <li class="index"><a href="index.html" onclick="guideMenu(); return false;" id="guidesMenu">Guides Index</a> + <li><a class="nav-item" href="index.html">Home</a></li> + <li class="guides-index guides-index-large"> + <a href="index.html" onclick="guideMenu(); return false;" id="guidesMenu" class="guides-index-item nav-item">Guides Index</a> <div id="guides" class="clearfix" style="display: none;"> <hr /> <% ['L', 'R'].each do |position| %> @@ -57,9 +63,22 @@ <% end %> </div> </li> - <li><a href="contributing_to_ruby_on_rails.html">Contribute</a></li> - <li><a href="credits.html">Credits</a></li> + <li><a class="nav-item" href="contributing_to_ruby_on_rails.html">Contribute</a></li> + <li><a class="nav-item" href="credits.html">Credits</a></li> + <li class="guides-index guides-index-small"> + <select class="guides-index-item nav-item"> + <option value="index.html">Guides Index</option> + <% docs_for_menu.each do |section| %> + <optgroup label="<%= section['name'] %>"> + <% finished_documents(section['documents']).each do |document| %> + <option value="<%= document['url'] %>"><%= document['name'] %></option> + <% end %> + </optgroup> + <% end %> + </select> + </li> </ul> + </div> </div> </div> <hr class="hide" /> @@ -113,6 +132,8 @@ </div> </div> + <script type="text/javascript" src="javascripts/jquery.min.js"></script> + <script type="text/javascript" src="javascripts/responsive-tables.js"></script> <script type="text/javascript" src="javascripts/guides.js"></script> <script type="text/javascript" src="javascripts/syntaxhighlighter/shCore.js"></script> <script type="text/javascript" src="javascripts/syntaxhighlighter/shBrushRuby.js"></script> @@ -121,6 +142,7 @@ <script type="text/javascript" src="javascripts/syntaxhighlighter/shBrushPlain.js"></script> <script type="text/javascript"> SyntaxHighlighter.all() + $(guidesIndex.bind); </script> </body> </html> diff --git a/guides/source/migrations.md b/guides/source/migrations.md index ccbdffc9c7..705b65ee8b 100644 --- a/guides/source/migrations.md +++ b/guides/source/migrations.md @@ -330,7 +330,7 @@ end As always, what has been generated for you is just a starting point. You can add or remove from it as you see fit by editing the -db/migrate/YYYYMMDDHHMMSS_add_details_to_products.rb file. +@db/migrate/YYYYMMDDHHMMSS_add_details_to_products.rb@ file. NOTE: The generated migration file for destructive migrations will still be old-style using the `up` and `down` methods. This is because Rails needs to know |