Mercurial > hg > soundsoftware-site
comparison app/views/users/show.rhtml @ 107:361f1e8b2e23 luisf
Feature #1:
Fixed the collection_select variable issue
User edit view: removed wiki toolbar and description from the description text area in the user;
User edit view: added institutions collection select;
User show view: institution name now visible.
Users_controller: fixed a bug retrieving the institution name
| author | luisf |
|---|---|
| date | Fri, 17 Dec 2010 11:18:51 +0000 |
| parents | d9df68bf8907 |
| children | 7fc15203288c |
comparison
equal
deleted
inserted
replaced
| 106:f6ea6ffaaeeb | 107:361f1e8b2e23 |
|---|---|
| 20 <% end %> | 20 <% end %> |
| 21 </ul> | 21 </ul> |
| 22 | 22 |
| 23 <h3><%=l(:label_ssamr_description)%></h3> | 23 <h3><%=l(:label_ssamr_description)%></h3> |
| 24 <%= textilizable @description %> | 24 <%= textilizable @description %> |
| 25 | |
| 26 <h3><%=l(:label_ssamr_institution)%></h3> | |
| 27 <%= h @institution_name %> | |
| 25 | 28 |
| 26 | 29 |
| 27 <% unless @memberships.empty? %> | 30 <% unless @memberships.empty? %> |
| 28 <h3><%=l(:label_project_plural)%></h3> | 31 <h3><%=l(:label_project_plural)%></h3> |
| 29 <ul> | 32 <ul> |