Index: app/views/admin/projects.rhtml =================================================================== --- app/views/admin/projects.rhtml (revision 650) +++ app/views/admin/projects.rhtml (working copy) @@ -27,7 +27,7 @@ <% for project in @projects %> "> <%= project.active? ? link_to(project.name, :controller => 'projects', :action => 'settings', :id => project) : h(project.name) %> - <%=h project.description %> + <%= textilizable project.description %> <%= image_tag 'true.png' if project.is_public? %> <%= project.children.size %> <%= format_date(project.created_on) %> Index: app/views/projects/_form.rhtml =================================================================== --- app/views/projects/_form.rhtml (revision 650) +++ app/views/projects/_form.rhtml (working copy) @@ -9,6 +9,7 @@ <% end %>

<%= f.text_area :description, :required => true, :cols => 60, :rows => 3 %>
<%= l(:text_caracters_maximum, 255) %>

+<%= wikitoolbar_for 'project_description' %>

<%= f.text_field :identifier, :required => true, :size => 15, :disabled => @project.identifier_frozen? %>
<%= l(:text_length_between, 3, 12) %> <%= l(:text_project_identifier_info) unless @project.identifier_frozen? %>

<%= f.text_field :homepage, :size => 40 %>

<%= f.check_box :is_public %>

Index: app/views/projects/list.rhtml =================================================================== --- app/views/projects/list.rhtml (revision 650) +++ app/views/projects/list.rhtml (working copy) @@ -11,7 +11,7 @@ "> <%= link_to project.name, {:action => 'show', :id => project}, :class => (@logged_in_user && @logged_in_user.role_for_project(project) ? "icon icon-fav" : "") %>
- <%=h project.description %> + <%= textilizable project.description %> <%= link_to(project.parent.name, :action => 'show', :id => project.parent) unless project.parent.nil? %> <%= format_date(project.created_on) %> Index: app/views/settings/edit.rhtml =================================================================== --- app/views/settings/edit.rhtml (revision 650) +++ app/views/settings/edit.rhtml (working copy) @@ -11,6 +11,7 @@

<%= text_area_tag 'settings[welcome_text]', Setting.welcome_text, :cols => 60, :rows => 5 %>

+<%= wikitoolbar_for 'settings[welcome_text]' %>

<%= select_tag 'settings[default_language]', options_for_select( lang_options_for_select(false), Setting.default_language) %>

Index: app/views/welcome/index.rhtml =================================================================== --- app/views/welcome/index.rhtml (revision 650) +++ app/views/welcome/index.rhtml (working copy) @@ -15,7 +15,7 @@ <% for project in @projects %>
  • <%= link_to project.name, :controller => 'projects', :action => 'show', :id => project %> (<%= format_time(project.created_on) %>)
    - <%=h project.description %> + <%= textilizable project.description %>
  • <% end %>