From 4605b17d3c1e17e2f4ae5eda5ae49123469487f9 Mon Sep 17 00:00:00 2001 From: Reinier Balt Date: Wed, 11 Apr 2012 17:36:22 +0200 Subject: [PATCH] home page renders... sort of --- Gemfile | 22 +- Gemfile.lock | 27 +- app/helpers/application_helper.rb | 28 +- .../{_context.rhtml => _context.html.erb} | 0 app/views/layouts/standard.html.erb | 18 +- ...form.rhtml => _add_new_item_form.html.erb} | 0 .../shared/{_flash.rhtml => _flash.html.erb} | 0 .../{_footer.rhtml => _footer.html.erb} | 0 .../{_completed.rhtml => _completed.html.erb} | 0 ...rm.rhtml => _new_multi_todo_form.html.erb} | 10 +- ...odo_form.rhtml => _new_todo_form.html.erb} | 10 +- app/views/todos/index.html.erb | 5 +- app/views/todos/list_deferred.html.erb | 8 +- config/application.rb | 3 +- config/routes.rb | 54 ++++ public/index.html | 241 ------------------ 16 files changed, 131 insertions(+), 295 deletions(-) rename app/views/contexts/{_context.rhtml => _context.html.erb} (100%) rename app/views/shared/{_add_new_item_form.rhtml => _add_new_item_form.html.erb} (100%) rename app/views/shared/{_flash.rhtml => _flash.html.erb} (100%) rename app/views/shared/{_footer.rhtml => _footer.html.erb} (100%) rename app/views/todos/{_completed.rhtml => _completed.html.erb} (100%) rename app/views/todos/{_new_multi_todo_form.rhtml => _new_multi_todo_form.html.erb} (90%) rename app/views/todos/{_new_todo_form.rhtml => _new_todo_form.html.erb} (94%) delete mode 100644 public/index.html diff --git a/Gemfile b/Gemfile index e4e9d0a8..388ce5cd 100644 --- a/Gemfile +++ b/Gemfile @@ -12,24 +12,24 @@ gem "mysql2" gem "highline", "~>1.5.0" gem "RedCloth" -# gem "sanitize", "~>1.2.1" -# gem "will_paginate" -gem "has_many_polymorphs", :git => "git://github.com/lrbalt/has_many_polymorphs.git", :branch => "try" +gem "sanitize", "~>1.2.1" +gem "will_paginate" gem "acts_as_list", "~>0.1.4" gem "aasm", "~>2.2.0" # TODO: gem "rubyjedi-actionwebservice", :require => "actionwebservice" # gem "rubycas-client", "~>2.2.1" # gem "ruby-openid", :require => "openid" # gem "open_id_authentication" -# gem 'htmlentities', '~> 4.3.0' -# gem "mail" -# gem "swf_fu" +gem 'htmlentities', '~> 4.3.0' +gem "mail" +gem "swf_fu" +gem "rails_autolink" -# if RUBY_VERSION.to_f >= 1.9 -# gem "soap4r-ruby1.9" -# else -# gem "soap4r", "~>1.5.8" -# end +if RUBY_VERSION.to_f >= 1.9 + gem "soap4r-ruby1.9" +else + gem "soap4r", "~>1.5.8" +end # Gems used only for assets and not required # in production environments by default. diff --git a/Gemfile.lock b/Gemfile.lock index c7d44b87..12caee79 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,11 +1,3 @@ -GIT - remote: git://github.com/lrbalt/has_many_polymorphs.git - revision: bb0a7af8ac7418717954cab42a5476ca9806f858 - branch: try - specs: - has_many_polymorphs (3.0.0.beta1) - activerecord - GEM remote: https://rubygems.org/ specs: @@ -54,6 +46,7 @@ GEM multi_json (~> 1.0) highline (1.5.2) hike (1.2.1) + htmlentities (4.3.1) i18n (0.6.0) journey (1.0.3) jquery-rails (2.0.2) @@ -67,6 +60,7 @@ GEM mime-types (1.18) multi_json (1.2.0) mysql2 (0.3.11) + nokogiri (1.4.7) polyglot (0.3.3) rack (1.4.1) rack-cache (1.2) @@ -83,6 +77,8 @@ GEM activesupport (= 3.2.3) bundler (~> 1.0) railties (= 3.2.3) + rails_autolink (1.0.6) + rails (~> 3.1) railties (3.2.3) actionpack (= 3.2.3) activesupport (= 3.2.3) @@ -93,16 +89,22 @@ GEM rake (0.9.2.2) rdoc (3.12) json (~> 1.4) + sanitize (1.2.1) + nokogiri (~> 1.4.1) sass (3.1.15) sass-rails (3.2.5) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) + soap4r-ruby1.9 (2.0.5) sprockets (2.1.2) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.5) + swf_fu (2.0.1) + coffee-script + rails (~> 3.1) thor (0.14.6) tilt (1.3.3) treetop (1.4.10) @@ -112,6 +114,7 @@ GEM uglifier (1.2.4) execjs (>= 0.3.0) multi_json (>= 1.0.2) + will_paginate (3.0.3) PLATFORMS ruby @@ -122,11 +125,17 @@ DEPENDENCIES acts_as_list (~> 0.1.4) bcrypt-ruby (~> 3.0.0) coffee-rails (~> 3.2.1) - has_many_polymorphs! highline (~> 1.5.0) + htmlentities (~> 4.3.0) jquery-rails + mail mysql2 rails (= 3.2.3) + rails_autolink + sanitize (~> 1.2.1) sass-rails (~> 3.2.3) + soap4r-ruby1.9 sqlite3 + swf_fu uglifier (>= 1.0.3) + will_paginate diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 183b4c31..3e4bf8cc 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -6,17 +6,19 @@ module ApplicationHelper # current page. If that matches the url, the link is marked id = "current" # def navigation_link(name, options = {}, html_options = nil, *parameters_for_method_reference) - if html_options - html_options = html_options.stringify_keys - convert_options_to_javascript!(html_options) - tag_options = tag_options(html_options) - else - tag_options = nil - end - url = options.is_a?(String) ? options : self.url_for(options, *parameters_for_method_reference) - id_tag = (request.request_uri == url) ? " id=\"current\"" : "" - - "#{name || url}" + link_to name, options, html_options + # TODO: check if this needs to be converted + # if html_options + # html_options = html_options.stringify_keys + # convert_options_to_javascript!(html_options) + # tag_options = tag_options(html_options) + # else + # tag_options = nil + # end + # url = options.is_a?(String) ? options : self.url_for(options, *parameters_for_method_reference) + # id_tag = (request.request_uri == url) ? " id=\"current\"" : "" + # + # "#{name || url}" end def days_from_today(date) @@ -235,7 +237,7 @@ module ApplicationHelper end def determine_done_path - case @controller.controller_name + case controller.controller_name when "contexts" done_todos_context_path(@context) when "projects" @@ -252,7 +254,7 @@ module ApplicationHelper end def determine_all_done_path - case @controller.controller_name + case controller.controller_name when "contexts" all_done_todos_context_path(@context) when "projects" diff --git a/app/views/contexts/_context.rhtml b/app/views/contexts/_context.html.erb similarity index 100% rename from app/views/contexts/_context.rhtml rename to app/views/contexts/_context.html.erb diff --git a/app/views/layouts/standard.html.erb b/app/views/layouts/standard.html.erb index 142ca88a..92af1ebb 100644 --- a/app/views/layouts/standard.html.erb +++ b/app/views/layouts/standard.html.erb @@ -2,22 +2,22 @@ - <%= stylesheet_link_tag 'standard','superfish','niftyCorners', 'jquery-ui-1.8.17.custom', :cache => 'tracks-cached' %> + <%#= stylesheet_link_tag 'standard','superfish','niftyCorners', 'jquery-ui-1.8.17.custom', :cache => 'tracks-cached' %> <%= stylesheet_link_tag "print", :media => "print" %> - <%= javascript_include_tag 'jquery-1.7.1.min', 'jquery-ui-1.8.17.custom.min', + <%#= javascript_include_tag 'jquery-1.7.1.min', 'jquery-ui-1.8.17.custom.min', 'jquery.truncator','jquery.jeditable.mini', 'jquery.cookie', 'jquery.blockUI', 'jquery.form', :cache => 'jquery-cached' %> - <%= javascript_tag_for_i18n_datepicker %> - <%= javascript_include_tag 'hoverIntent','superfish','application', + <%#= javascript_tag_for_i18n_datepicker %> + <%#= javascript_include_tag 'hoverIntent','superfish','application', 'accesskey-hints','niftycube','swfobject', :cache => 'tracks-cached' %> - <%= javascript_include_tag('jquery.simulate.drag-sortable') if ENV['RAILS_ENV']=='cucumber' -%> + <% #= javascript_include_tag('jquery.simulate.drag-sortable') if ENV['RAILS_ENV']=='cucumber' -%> <%= javascript_tag "var AUTH_TOKEN = #{form_authenticity_token.inspect};" if protect_against_forgery? %> - <%= javascript_tag "var SOURCE_VIEW = '#{@source_view}';" %> <%= javascript_tag "var TAG_NAME = '#{@tag_name}';" if @tag_name %> <%= csrf_meta_tag %> - - -
- - -
- - - - -
-

Getting started

-

Here’s how to get rolling:

- -
    -
  1. -

    Use rails generate to create your models and controllers

    -

    To see all available options, run it without parameters.

    -
  2. - -
  3. -

    Set up a default route and remove public/index.html

    -

    Routes are set up in config/routes.rb.

    -
  4. - -
  5. -

    Create your database

    -

    Run rake db:create to create your database. If you're not using SQLite (the default), edit config/database.yml with your username and password.

    -
  6. -
-
-
- - -
- -