From 8157cdc088895c242a7434f681447696b79fe5d3 Mon Sep 17 00:00:00 2001 From: Matt Rogers Date: Thu, 22 Sep 2011 22:09:56 -0500 Subject: [PATCH 1/4] Add ruby-debug to the Gemfile ruby-debug is referenced in the 'Setting up a development environment' page on the Tracks wiki. Include it in the Gemfile as part of the development group --- Gemfile | 4 ++++ Gemfile.lock | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/Gemfile b/Gemfile index e4f5bdad..03b85a34 100644 --- a/Gemfile +++ b/Gemfile @@ -22,6 +22,10 @@ gem "webrat", ">=0.7.0", :groups => [:cucumber, :test] gem "database_cleaner", ">=0.5.0", :groups => [:cucumber, :selenium] gem "cucumber-rails", "~>0.3.0", :groups => :cucumber +group :development do + gem "ruby-debug" +end + group :test do gem "flexmock" gem "ZenTest", ">=4.0.0" diff --git a/Gemfile.lock b/Gemfile.lock index a952d7a4..a35a77c8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,6 +27,7 @@ GEM bcrypt-ruby (2.1.4) builder (3.0.0) cgi_multipart_eof_fix (2.5.0) + columnize (0.3.4) cucumber (1.0.2) builder (>= 2.1.2) diff-lcs (>= 1.1.2) @@ -51,6 +52,8 @@ GEM hpricot (0.8.4) httpclient (2.2.1) json (1.5.3) + linecache (0.46) + rbx-require-relative (> 0.0.4) memory_test_fix (0.1.3) mongrel (1.1.5) cgi_multipart_eof_fix (>= 2.4) @@ -69,10 +72,16 @@ GEM activesupport (= 2.3.14) rake (>= 0.8.3) rake (0.8.7) + rbx-require-relative (0.0.5) rspec (1.3.2) rspec-rails (1.3.4) rack (>= 1.0.0) rspec (~> 1.3.1) + ruby-debug (0.10.4) + columnize (>= 0.1) + ruby-debug-base (~> 0.10.4.0) + ruby-debug-base (0.10.4) + linecache (>= 0.3) ruby-openid (2.1.8) rubycas-client (2.2.1) activesupport @@ -113,6 +122,7 @@ DEPENDENCIES rails (~> 2.3.12) rake (~> 0.8.7) rspec-rails (~> 1.3.3) + ruby-debug ruby-openid rubycas-client (~> 2.2.1) sanitize (~> 1.2.1) From fd44a1fb4b14311d28c30d6b2211b7e44ab5e43a Mon Sep 17 00:00:00 2001 From: sfischme Date: Fri, 23 Sep 2011 18:22:20 -0400 Subject: [PATCH 2/4] fixed the boxes --- public/stylesheets/standard.css | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/public/stylesheets/standard.css b/public/stylesheets/standard.css index 6b5a3438..8a1ab422 100644 --- a/public/stylesheets/standard.css +++ b/public/stylesheets/standard.css @@ -1,3 +1,21 @@ +div.depends_on label { + float: left; +} + +div#input_box div#todo_new_action_container div#todo_multi_add form#todo-form-multi-new-action.inline-form label { + float: center; +} + +div#input_box div#todo_new_action_container div#todo_multi_add form#todo-form-multi-new-action.inline-form input#todos_sequential { + float:left; + width:30px; +} + + +input#project_name.project-name, input#project_default_context_name.ui-autocomplete-input, textarea#project_description.project-description, input#project_default_tags.ui-autocomplete-input { + width:100%; +} + 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; From f15017c972201992777171e6d9562ecca42172ec Mon Sep 17 00:00:00 2001 From: Andreas Brandl Date: Tue, 27 Sep 2011 01:07:02 +0200 Subject: [PATCH 3/4] Decode HTML entities when displaying todos formatted as TXT. When rendering the text-feed for todos (_text_todo.rhtml) this uses localized string 'as-is'. Those are html-encoded which is not appropriate for TXT feeds (e.g. 'todos.due' is 'Fällig' in German locale). --- Gemfile | 1 + Gemfile.lock | 2 ++ app/views/todos/_text_todo.rhtml | 7 +++++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index e4f5bdad..4ed10df6 100644 --- a/Gemfile +++ b/Gemfile @@ -17,6 +17,7 @@ gem "rubycas-client", "~>2.2.1" gem "ruby-openid", :require => "openid" gem "sqlite3" gem 'bcrypt-ruby', '~> 2.1.4' +gem 'htmlentities', '~> 4.3.0' gem "webrat", ">=0.7.0", :groups => [:cucumber, :test] gem "database_cleaner", ">=0.5.0", :groups => [:cucumber, :selenium] diff --git a/Gemfile.lock b/Gemfile.lock index a952d7a4..8b5104f8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -49,6 +49,7 @@ GEM hoe (2.12.0) rake (~> 0.8) hpricot (0.8.4) + htmlentities (4.3.0) httpclient (2.2.1) json (1.5.3) memory_test_fix (0.1.3) @@ -107,6 +108,7 @@ DEPENDENCIES highline (~> 1.5.0) hoe hpricot + htmlentities (~> 4.3.0) memory_test_fix (~> 0.1.3) mongrel rack (= 1.1.0) diff --git a/app/views/todos/_text_todo.rhtml b/app/views/todos/_text_todo.rhtml index 291bd60c..adc39b91 100644 --- a/app/views/todos/_text_todo.rhtml +++ b/app/views/todos/_text_todo.rhtml @@ -1,4 +1,7 @@ <% +require 'htmlentities' +htmlentities = HTMLEntities.new + todo = text_todo if (todo.starred?) @@ -8,11 +11,11 @@ else end if (todo.completed?) && todo.completed_at - result_string << "["+ t('todos.completed') +": " + format_date(todo.completed_at) + "] " + result_string << "["+ htmlentities.decode(t('todos.completed')) +": " + format_date(todo.completed_at) + "] " end if todo.due - result_string << "[" + t('todos.due') + ": " + format_date(todo.due) + "] " + result_string << "[" + htmlentities.decode(t('todos.due')) + ": " + format_date(todo.due) + "] " result_string << todo.description + " " else result_string << todo.description + " " From 1a127e5d1e5230e9f28f94bf8ed43321e594b7f1 Mon Sep 17 00:00:00 2001 From: Reinier Balt Date: Fri, 16 Sep 2011 07:31:31 +0200 Subject: [PATCH 4/4] fix #1208 by removing an unused partial --- app/views/projects/_edit_project.rhtml | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 app/views/projects/_edit_project.rhtml diff --git a/app/views/projects/_edit_project.rhtml b/app/views/projects/_edit_project.rhtml deleted file mode 100644 index e2d377af..00000000 --- a/app/views/projects/_edit_project.rhtml +++ /dev/null @@ -1,5 +0,0 @@ -<%= hidden_field( "project", "id" ) %> -
-<%= text_field( "project", "name" ) %> -
-
\ No newline at end of file