Commit 778373b6408ac372cf915b06efae22171f698ed7
Exists in
master
and in
22 other branches
Merge commit 'refs/merge-requests/16' of git://gitorious.org/noosfero/noosfero i…
…nto merge-requests/16
Showing
2 changed files
with
2 additions
and
2 deletions
Show diff stats
app/views/cms/view.rhtml
| @@ -50,7 +50,7 @@ | @@ -50,7 +50,7 @@ | ||
| 50 | </td> | 50 | </td> |
| 51 | <td class="article-controls"> | 51 | <td class="article-controls"> |
| 52 | <%= button_without_text :edit, _('Edit'), :action => 'edit', :id => article.id %> | 52 | <%= button_without_text :edit, _('Edit'), :action => 'edit', :id => article.id %> |
| 53 | - <%= button_without_text :eyes, _('Public view'), article.url %> | 53 | + <%= button_without_text :eyes, _('Public view'), article.view_url %> |
| 54 | <%= display_spread_button(profile, article) unless article.folder? %> | 54 | <%= display_spread_button(profile, article) unless article.folder? %> |
| 55 | <% if !environment.enabled?('cant_change_homepage') %> | 55 | <% if !environment.enabled?('cant_change_homepage') %> |
| 56 | <%= button_without_text :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %> | 56 | <%= button_without_text :home, _('Use as homepage'), { :action => 'set_home_page', :id => article.id }, :method => :post %> |
app/views/search/_article.rhtml
| 1 | <li class="<%= icon_for_article(article) %>"> | 1 | <li class="<%= icon_for_article(article) %>"> |
| 2 | - <strong><%= link_to(article.title, article.url) %></strong> | 2 | + <strong><%= link_to(article.title, article.view_url) %></strong> |
| 3 | <div class="item_meta"> | 3 | <div class="item_meta"> |
| 4 | <% if article.last_changed_by %> | 4 | <% if article.last_changed_by %> |
| 5 | <span class="cat_item_by"> | 5 | <span class="cat_item_by"> |