From 98fcd3b38a06ed889c84f54ab7e829659a5c1ce0 Mon Sep 17 00:00:00 2001 From: Aleksei Kvitinskii Date: Sun, 6 Nov 2011 20:48:21 +0200 Subject: [PATCH 1/6] correct html on project page --- app/views/projects/index.html.haml | 32 ++++++++++++++++-------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/app/views/projects/index.html.haml b/app/views/projects/index.html.haml index a35ead82..ba860571 100644 --- a/app/views/projects/index.html.haml +++ b/app/views/projects/index.html.haml @@ -1,18 +1,20 @@ - content_for(:body_class, "projects-page") - content_for(:page_title) do - .grid_4 - - if current_user.can_create_project? - %a.grey-button.right{:href => new_project_path} Create new project - %h2.icon - %span - Projects + .container_4 + .grid_4 + - if current_user.can_create_project? + %a.grey-button.right{:href => new_project_path} Create new project + %h2.icon + %span + Projects -- unless @projects.empty? - %div{:class => "tile", :style => view_mode_style("tile")} - = render "tile" - %div{:class => "list", :style => view_mode_style("list")} - = render "list" -- else - %center.prepend-top - %h2 - %cite Nothing here + %div.clear + - unless @projects.empty? + %div{:class => "tile", :style => view_mode_style("tile")} + = render "tile" + %div{:class => "list", :style => view_mode_style("list")} + = render "list" + - else + %center.prepend-top + %h2 + %cite Nothing here From 060a2e225755aedc99a8cdbc5fae8296daa7a958 Mon Sep 17 00:00:00 2001 From: Aleksei Kvitinskii Date: Mon, 7 Nov 2011 13:40:22 +0200 Subject: [PATCH 2/6] move tag path to the appropriate helper --- app/helpers/tags_helper.rb | 5 +++++ app/views/projects/_list.html.haml | 2 +- app/views/tags/index.html.haml | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 app/helpers/tags_helper.rb diff --git a/app/helpers/tags_helper.rb b/app/helpers/tags_helper.rb new file mode 100644 index 00000000..1e82e34d --- /dev/null +++ b/app/helpers/tags_helper.rb @@ -0,0 +1,5 @@ +module TagsHelper + def tag_path tag + "/tags/#{tag}" + end +end diff --git a/app/views/projects/_list.html.haml b/app/views/projects/_list.html.haml index 7976b11f..89deb76d 100644 --- a/app/views/projects/_list.html.haml +++ b/app/views/projects/_list.html.haml @@ -14,7 +14,7 @@ = project.name .small-tags - project.tag_list.each do |tag| - = link_to tag, "/tags/#{tag}" + = link_to tag, tag_path(tag) %td= truncate project.url_to_repo %td= project.code diff --git a/app/views/tags/index.html.haml b/app/views/tags/index.html.haml index c83d62c7..ba16b92b 100644 --- a/app/views/tags/index.html.haml +++ b/app/views/tags/index.html.haml @@ -7,5 +7,5 @@ .tags-list - @tags.all.each do |tag| - = link_to "#{tag.name}(#{tag.count})", "/tags/#{tag.name}" + = link_to "#{tag.name}(#{tag.count})", tag_path(name) From af7bed2aa5476ca6f359f0b0c67f46151b5db9b9 Mon Sep 17 00:00:00 2001 From: Aleksei Kvitinskii Date: Mon, 7 Nov 2011 19:48:58 +0200 Subject: [PATCH 3/6] add tag links to project page --- app/assets/stylesheets/tags.css.css | 14 ++++++++++++++ app/helpers/tags_helper.rb | 10 ++++++++++ app/views/layouts/project.html.haml | 3 +++ app/views/projects/_list.html.haml | 5 ++--- app/views/projects/_tile.html.haml | 4 +--- 5 files changed, 30 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/tags.css.css b/app/assets/stylesheets/tags.css.css index afd458fd..e65918ea 100644 --- a/app/assets/stylesheets/tags.css.css +++ b/app/assets/stylesheets/tags.css.css @@ -27,4 +27,18 @@ color: #FFF; text-shadow: none; font-weight: bold; +} + + +.medium-tags a{ + font-size: 12px; + + display: inline-block; + padding: 3px 4px 2px 4px; + margin: 0px 7px 8px 0px; + border-radius: 3px; + background-color: #72bbdf; + color: #FFF; + text-shadow: none; + font-weight: bold; } \ No newline at end of file diff --git a/app/helpers/tags_helper.rb b/app/helpers/tags_helper.rb index 1e82e34d..5c1ecc86 100644 --- a/app/helpers/tags_helper.rb +++ b/app/helpers/tags_helper.rb @@ -2,4 +2,14 @@ module TagsHelper def tag_path tag "/tags/#{tag}" end + + def tag_list project + html = '' + project.tag_list.each do |tag| + html += link_to tag, tag_path(tag) + end + + html.html_safe + end + end diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml index ee6581ec..70ebb890 100644 --- a/app/views/layouts/project.html.haml +++ b/app/views/layouts/project.html.haml @@ -39,6 +39,9 @@ %span{ :class => "number" }= @project.snippets.non_expired.count - if @commit = link_to truncate(commit_name(@project,@commit), :length => 15), project_commit_path(@project, :id => @commit.id), :class => current_page?(:controller => "commits", :action => "show", :project_id => @project, :id => @commit.id) ? "current" : nil + + .medium-tags{:style => 'padding: 10px 0 0 10px; width: 210px;'}= tag_list @project + .project-content = yield diff --git a/app/views/projects/_list.html.haml b/app/views/projects/_list.html.haml index 89deb76d..f41fb3e4 100644 --- a/app/views/projects/_list.html.haml +++ b/app/views/projects/_list.html.haml @@ -12,9 +12,8 @@ %tr{ :class => "project", :url => project_path(project) } %td = project.name - .small-tags - - project.tag_list.each do |tag| - = link_to tag, tag_path(tag) + .small-tags= tag_list project + %td= truncate project.url_to_repo %td= project.code diff --git a/app/views/projects/_tile.html.haml b/app/views/projects/_tile.html.haml index cc891f63..1f2a4a97 100644 --- a/app/views/projects/_tile.html.haml +++ b/app/views/projects/_tile.html.haml @@ -13,9 +13,7 @@ - last_note = project.notes.last = last_note ? last_note.created_at.stamp("24 Aug, 2011") : "Never" - %p.small-tags - - project.tag_list.each do |tag| - = link_to tag, "/tags/#{tag}" + %p.small-tags= tag_list project .buttons %a.browse-code.button.yellow{:href => tree_project_path(project)} Browse code From 4a1b70f7b2d55bf26be35a2544e3b8e76bdc0585 Mon Sep 17 00:00:00 2001 From: Aleksei Kvitinskii Date: Mon, 7 Nov 2011 20:38:54 +0200 Subject: [PATCH 4/6] add tags to admin project form --- app/assets/javascripts/projects.js | 16 ++++++++ app/views/admin/projects/_form.html.haml | 49 ++++++++++++++---------- app/views/projects/_form.html.haml | 17 ++------ 3 files changed, 48 insertions(+), 34 deletions(-) diff --git a/app/assets/javascripts/projects.js b/app/assets/javascripts/projects.js index 87be2f07..b4521fab 100644 --- a/app/assets/javascripts/projects.js +++ b/app/assets/javascripts/projects.js @@ -40,3 +40,19 @@ $(document).ready(function(){ function focusSearch() { $("#search").focus(); } + +function taggifyForm(){ + var tag_field = $('#tag_field').tagify(); + + tag_field.tagify('inputField').autocomplete({ + source: '/tags.json' + }); + + + $('form').submit( function() { + var tag_field = $('#tag_field') + tag_field.val( tag_field.tagify('serialize') ); + return true; + }); +} + diff --git a/app/views/admin/projects/_form.html.haml b/app/views/admin/projects/_form.html.haml index 9823e594..f64e10fd 100644 --- a/app/views/admin/projects/_form.html.haml +++ b/app/views/admin/projects/_form.html.haml @@ -1,30 +1,39 @@ = form_for [:admin, @admin_project] do |f| -if @admin_project.errors.any? #error_explanation - %h2= "#{pluralize(@admin_project.errors.count, "error")} prohibited this admin_project from being saved:" + %h2= "#{pluralize(@admin_project.errors.count, "error")} prohibited this admin_project from being saved:" %ul - @admin_project.errors.full_messages.each do |msg| %li= msg - .span-24 - .span-12 - .field - = f.label :name - %br - = f.text_field :name - .field - = f.label :code - %br - = f.text_field :code - .field - = f.label :path - %br - = f.text_field :path - .span-10 - .field - = f.label :description - %br - = f.text_area :description + .form-row + = f.label :name + %br + = f.text_field :name + .form-row + = f.label :code + %br + = f.text_field :code + .form-row + = f.label :path + %br + = f.text_field :path + + + .form-row + = f.label :tag_list + %br + = f.text_area :tag_list, :placeholder => "project tags", :style => "height:50px", :id => :tag_field + + .form-row + = f.label :description + %br + = f.text_area :description .clear .actions = f.submit 'Save', :class => "lbutton" + +:javascript + $(function(){ + taggifyForm(); + }) diff --git a/app/views/projects/_form.html.haml b/app/views/projects/_form.html.haml index 2ddfda48..53b23f5f 100644 --- a/app/views/projects/_form.html.haml +++ b/app/views/projects/_form.html.haml @@ -29,8 +29,8 @@ %tr %td= f.label :tag_list %td= f.text_area :tag_list, :placeholder => "project tags", :style => "height:50px", :id => :tag_field - - .field + + .form-row = f.label :description %br/ = f.text_area :description, :style => "height:140px;width:932px;" @@ -55,16 +55,5 @@ :javascript $(function(){ - var tag_field = $('#tag_field').tagify(); - - tag_field.tagify('inputField').autocomplete({ - source: '/tags.json' - }); - - - $('form').submit( function() { - var tag_field = $('#tag_field') - tag_field.val( tag_field.tagify('serialize') ); - return true; - }); + taggifyForm(); }) From 9e3915b25948878d31de78c5ced43e288e0cadfe Mon Sep 17 00:00:00 2001 From: Aleksei Kvitinskii Date: Mon, 7 Nov 2011 21:39:24 +0200 Subject: [PATCH 5/6] fix typo in the template --- app/views/layouts/project.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml index 959cdbe9..becdf99c 100644 --- a/app/views/layouts/project.html.haml +++ b/app/views/layouts/project.html.haml @@ -31,7 +31,7 @@ %span{ :class => "number" }= @project.issues.opened.count = link_to wall_project_path(@project), :class => current_page?(:controller => "projects", :action => "wall", :id => @project) ? "current" : nil do Wall - - if @project.common_nsotes.count > 0 + - if @project.common_notes.count > 0 %span{ :class => "number" }= @project.common_notes.count = link_to project_snippets_path(@project), :class => (controller.controller_name == "snippets") ? "current" : nil do Snippets From 1fa01cbcc9f8fb5a9dbf5974496d029f1d189cfc Mon Sep 17 00:00:00 2001 From: Aleksei Kvitinskii Date: Tue, 8 Nov 2011 00:02:50 +0200 Subject: [PATCH 6/6] fix typo --- app/views/layouts/project.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/project.html.haml b/app/views/layouts/project.html.haml index becdf99c..70ebb890 100644 --- a/app/views/layouts/project.html.haml +++ b/app/views/layouts/project.html.haml @@ -26,7 +26,7 @@ - if @project.users_projects.count > 0 %span{ :class => "number" }= @project.users_projects.count = link_to project_issues_path(@project), :class => (controller.controller_name == "issues") ? "current" : nil do - Issuess + Issues - if @project.issues.opened.count > 0 %span{ :class => "number" }= @project.issues.opened.count = link_to wall_project_path(@project), :class => current_page?(:controller => "projects", :action => "wall", :id => @project) ? "current" : nil do