diff --git a/Gemfile b/Gemfile index e4f5bdad..64f83507 100644 --- a/Gemfile +++ b/Gemfile @@ -16,6 +16,7 @@ gem "actionwebservice", :git => "git://github.com/dejan/actionwebservice.git" gem "rubycas-client", "~>2.2.1" gem "ruby-openid", :require => "openid" gem "sqlite3" +gem "ruby-debug" gem 'bcrypt-ruby', '~> 2.1.4' gem "webrat", ">=0.7.0", :groups => [:cucumber, :test] diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index a952d7a4..00000000 --- a/Gemfile.lock +++ /dev/null @@ -1,124 +0,0 @@ -GIT - remote: git://github.com/dejan/actionwebservice.git - revision: f0d48a4f747a998cc431615d69a0bdf089b18be3 - specs: - actionwebservice (2.3.2.1705) - actionpack (>= 2.3.2) - activerecord (>= 2.3.2) - -GEM - remote: http://rubygems.org/ - remote: http://gems.github.com/ - specs: - RedCloth (4.2.3) - ZenTest (4.6.1) - aasm (2.2.0) - actionmailer (2.3.14) - actionpack (= 2.3.14) - actionpack (2.3.14) - activesupport (= 2.3.14) - rack (~> 1.1.0) - activerecord (2.3.14) - activesupport (= 2.3.14) - activeresource (2.3.14) - activesupport (= 2.3.14) - activesupport (2.3.14) - acts_as_list (0.1.4) - bcrypt-ruby (2.1.4) - builder (3.0.0) - cgi_multipart_eof_fix (2.5.0) - cucumber (1.0.2) - builder (>= 2.1.2) - diff-lcs (>= 1.1.2) - gherkin (~> 2.4.5) - json (>= 1.4.6) - term-ansicolor (>= 1.0.5) - cucumber-rails (0.3.2) - cucumber (>= 0.8.0) - daemons (1.1.4) - database_cleaner (0.6.7) - diff-lcs (1.1.2) - fastthread (1.0.7) - flexmock (0.9.0) - gem_plugin (0.2.3) - gherkin (2.4.11) - json (>= 1.4.6) - has_many_polymorphs (2.13) - activerecord - highline (1.5.2) - hoe (2.12.0) - rake (~> 0.8) - hpricot (0.8.4) - httpclient (2.2.1) - json (1.5.3) - memory_test_fix (0.1.3) - mongrel (1.1.5) - cgi_multipart_eof_fix (>= 2.4) - daemons (>= 1.0.3) - fastthread (>= 1.0.1) - gem_plugin (>= 0.2.3) - nokogiri (1.4.7) - rack (1.1.0) - rack-test (0.6.1) - rack (>= 1.0) - rails (2.3.14) - actionmailer (= 2.3.14) - actionpack (= 2.3.14) - activerecord (= 2.3.14) - activeresource (= 2.3.14) - activesupport (= 2.3.14) - rake (>= 0.8.3) - rake (0.8.7) - rspec (1.3.2) - rspec-rails (1.3.4) - rack (>= 1.0.0) - rspec (~> 1.3.1) - ruby-openid (2.1.8) - rubycas-client (2.2.1) - activesupport - sanitize (1.2.1) - nokogiri (~> 1.4.1) - selenium-client (1.2.18) - soap4r (1.5.8) - httpclient (>= 2.1.1) - sqlite3 (1.3.4) - term-ansicolor (1.0.6) - thoughtbot-factory_girl (1.2.2) - webrat (0.7.3) - nokogiri (>= 1.2.0) - rack (>= 1.0) - rack-test (>= 0.5.3) - will_paginate (2.3.16) - -PLATFORMS - ruby - -DEPENDENCIES - RedCloth (= 4.2.3) - ZenTest (>= 4.0.0) - aasm (~> 2.2.0) - actionwebservice! - acts_as_list (~> 0.1.4) - bcrypt-ruby (~> 2.1.4) - cucumber-rails (~> 0.3.0) - database_cleaner (>= 0.5.0) - flexmock - has_many_polymorphs (~> 2.13) - highline (~> 1.5.0) - hoe - hpricot - memory_test_fix (~> 0.1.3) - mongrel - rack (= 1.1.0) - rails (~> 2.3.12) - rake (~> 0.8.7) - rspec-rails (~> 1.3.3) - ruby-openid - rubycas-client (~> 2.2.1) - sanitize (~> 1.2.1) - selenium-client - soap4r (~> 1.5.8) - sqlite3 - thoughtbot-factory_girl - webrat (>= 0.7.0) - will_paginate (~> 2.3.15) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 5f681aa4..6d216e44 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -51,6 +51,20 @@ class ProjectsController < ApplicationController render end + def set_reviewed + template = 'projects/update.js.erb' + + #@source_view = 'project' + @project = current_user.projects.find(params[:id]) + + @project.todos.each do |todo| + todo.created_at = Time.now + todo.save + end + + redirect_to :action => 'show' + end + def projects_and_actions @projects = current_user.projects.active respond_to do |format| diff --git a/app/views/projects/_edit_project.rhtml b/app/views/projects/_edit_project.rhtml index e2d377af..41927dd5 100644 --- a/app/views/projects/_edit_project.rhtml +++ b/app/views/projects/_edit_project.rhtml @@ -1,4 +1,5 @@ <%= hidden_field( "project", "id" ) %> +MUUUUUAAHAHAHAHAH!!!!
<%= text_field( "project", "name" ) %>
diff --git a/app/views/projects/_project_form.rhtml b/app/views/projects/_project_form.rhtml index f6b67b6c..b1e30107 100644 --- a/app/views/projects/_project_form.rhtml +++ b/app/views/projects/_project_form.rhtml @@ -40,6 +40,10 @@ project = project_form <%=image_tag("cancel.png", :alt => "") %> Cancel + " id="<%= dom_id(project, 'reviewed') %>" class="reviewed"> + <%=image_tag("reviewed.png", :alt => "") %> + Reviewed +

diff --git a/config/routes.rb b/config/routes.rb index 1838b1bc..98307766 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -13,7 +13,7 @@ ActionController::Routing::Routes.draw do |map| end map.resources :projects, :collection => {:order => :post, :alphabetize => :post, :actionize => :post, :done => :get}, - :member => {:done_todos => :get, :all_done_todos => :get} do |projects| + :member => {:done_todos => :get, :all_done_todos => :get, :set_reviewed => :get} do |projects| projects.resources :todos, :name_prefix => "project_" end diff --git a/public/images/reviewed.png b/public/images/reviewed.png new file mode 100755 index 00000000..b4c38a0b Binary files /dev/null and b/public/images/reviewed.png differ diff --git a/public/stylesheets/standard.css b/public/stylesheets/standard.css index 6b5a3438..19398cd7 100644 --- a/public/stylesheets/standard.css +++ b/public/stylesheets/standard.css @@ -1,3 +1,7 @@ +.widgets a.reviewed, button.reviewed{ + float:right; +} + div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,p,blockquote,th,td { margin:0; padding:0;