# HG changeset patch
# User luisf
# Date 1292345532 0
# Node ID d9df68bf89076e4241b5df5e46feeea231ac9383
# Parent  b9c2324779f6f39f2de3bda2bd8aea7130289d02
Bug #57 - User Description can be entered as wiki text and is displayed as such.

diff -r b9c2324779f6 -r d9df68bf8907 app/views/account/register.rhtml
--- a/app/views/account/register.rhtml	Tue Dec 14 11:03:05 2010 +0000
+++ b/app/views/account/register.rhtml	Tue Dec 14 16:52:12 2010 +0000
@@ -34,7 +34,10 @@
 	
 		<% fields_for :ssamr_user_details, :builder => TabularFormBuilder, :lang => current_language do |ssamr_user_detail| %>	
 			<p>
-                          <%= ssamr_user_detail.text_area :description, :rows => 3, :cols => 40, :required => true  %>
+
+                          <%= ssamr_user_detail.text_area :description, :rows => 3, :cols => 40, :required => true, :class => 'wiki-edit' %>
+                          <%= wikitoolbar_for 'ssamr_user_details_description' %>
+
                           <br />
                           <em> <%=l(:text_user_ssamr_description_info)%></em>
                         </p>
diff -r b9c2324779f6 -r d9df68bf8907 app/views/users/_form.rhtml
--- a/app/views/users/_form.rhtml	Tue Dec 14 11:03:05 2010 +0000
+++ b/app/views/users/_form.rhtml	Tue Dec 14 16:52:12 2010 +0000
@@ -23,7 +23,8 @@
 	<h3><%=l(:label_ssamr_details)%></h3>
           <% fields_for :ssamr_user_details, :builder => TabularFormBuilder, :lang => current_language do |ssamr_user_detail| %>
             <p>
-              <%= ssamr_user_detail.text_area :description, :rows => 3, :cols => 40, :required => true  %>
+              <%= ssamr_user_detail.text_area :description, :rows => 3, :cols => 40, :required => true, :class => 'wiki-edit'  %>
+              <%= wikitoolbar_for 'ssamr_user_details_description' %>
               <br />
               <em> <%=l(:text_user_ssamr_description_info)%></em>
             </p>
diff -r b9c2324779f6 -r d9df68bf8907 app/views/users/show.rhtml
--- a/app/views/users/show.rhtml	Tue Dec 14 11:03:05 2010 +0000
+++ b/app/views/users/show.rhtml	Tue Dec 14 16:52:12 2010 +0000
@@ -21,7 +21,7 @@
 </ul>
 
 <h3><%=l(:label_ssamr_description)%></h3>
-<%= @description %>
+<%= textilizable @description %>
 
 
 <% unless @memberships.empty? %>