diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-08-17 11:21:58 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-08-17 11:21:58 +0000 |
| commit | 7b366758fdc4867d4f5174e924464fffdcda6a72 (patch) | |
| tree | 492bc8b302664fd3ee28ca0e646efcbe6a7feb7d /app/views | |
| parent | a7033c8bacdaf476d79a40ac0311bac0c177ae62 (diff) | |
| download | redmine-7b366758fdc4867d4f5174e924464fffdcda6a72.tar.gz redmine-7b366758fdc4867d4f5174e924464fffdcda6a72.zip | |
Textilized project descriptions on project list and home page.
Added jsToolbar on project form.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@651 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/projects.rhtml | 2 | ||||
| -rw-r--r-- | app/views/projects/_form.rhtml | 3 | ||||
| -rw-r--r-- | app/views/projects/list.rhtml | 2 | ||||
| -rw-r--r-- | app/views/welcome/index.rhtml | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/app/views/admin/projects.rhtml b/app/views/admin/projects.rhtml index e181f85c5..d231be102 100644 --- a/app/views/admin/projects.rhtml +++ b/app/views/admin/projects.rhtml @@ -27,7 +27,7 @@ <% for project in @projects %> <tr class="<%= cycle("odd", "even") %>"> <td><%= project.active? ? link_to(project.name, :controller => 'projects', :action => 'settings', :id => project) : h(project.name) %> - <td><%=h project.description %> + <td><%= textilizable project.description, :project => project %> <td align="center"><%= image_tag 'true.png' if project.is_public? %> <td align="center"><%= project.children.size %> <td align="center"><%= format_date(project.created_on) %> diff --git a/app/views/projects/_form.rhtml b/app/views/projects/_form.rhtml index 9eb933035..585217e16 100644 --- a/app/views/projects/_form.rhtml +++ b/app/views/projects/_form.rhtml @@ -8,10 +8,11 @@ <p><%= f.select :parent_id, (@root_projects.collect {|p| [p.name, p.id]}), { :include_blank => true } %></p> <% end %> -<p><%= f.text_area :description, :required => true, :cols => 60, :rows => 3 %><br /><em><%= l(:text_caracters_maximum, 255) %></em></p> +<p><%= f.text_area :description, :required => true, :cols => 60, :rows => 5 %><em><%= l(:text_caracters_maximum, 255) %></em></p> <p><%= f.text_field :identifier, :required => true, :size => 15, :disabled => @project.identifier_frozen? %><br /><em><%= l(:text_length_between, 3, 12) %> <%= l(:text_project_identifier_info) unless @project.identifier_frozen? %></em></p> <p><%= f.text_field :homepage, :size => 40 %></p> <p><%= f.check_box :is_public %></p> +<%= wikitoolbar_for 'project_description' %> <% for @custom_value in @custom_values %> <p><%= custom_field_tag_with_label @custom_value %></p> diff --git a/app/views/projects/list.rhtml b/app/views/projects/list.rhtml index 54cc78738..24448be48 100644 --- a/app/views/projects/list.rhtml +++ b/app/views/projects/list.rhtml @@ -11,7 +11,7 @@ <tr class="<%= cycle("odd", "even") %>"> <td> <%= link_to project.name, {:action => 'show', :id => project}, :class => (@logged_in_user && @logged_in_user.role_for_project(project) ? "icon icon-fav" : "") %><br /> - <%=h project.description %> + <%= textilizable project.description, :project => project %> </td> <td><%= link_to(project.parent.name, :action => 'show', :id => project.parent) unless project.parent.nil? %></td> <td align="center"><%= format_date(project.created_on) %></td> diff --git a/app/views/welcome/index.rhtml b/app/views/welcome/index.rhtml index b91efec28..399e444ed 100644 --- a/app/views/welcome/index.rhtml +++ b/app/views/welcome/index.rhtml @@ -15,7 +15,7 @@ <% for project in @projects %> <li> <%= link_to project.name, :controller => 'projects', :action => 'show', :id => project %> (<%= format_time(project.created_on) %>)<br /> - <%=h project.description %> + <%= textilizable project.description, :project => project %> </li> <% end %> </ul> |