Commit 621722e7ec8ccb1fd87680ad26d782491d1760d5

Authored by Augusto_Serpro
2 parents 3e028f74 237f98c7

Merge branch 'not_found_improvement' into stable

Showing 1 changed file with 14 additions and 3 deletions   Show diff stats
app/views/shared/not_found.html.erb
1 <div id='not-found'> 1 <div id='not-found'>
2 - <h1><%= _('There is no such page: %s') % (content_tag('tt', @path)) %></h1> 2 + <h1><%= _('Nonexistent content: %s') % (content_tag('tt', @path)) %></h1>
3 <p> 3 <p>
4 - <%= _('You may have clicked an expired link or mistyped the address.') %>  
5 - <%= _('If you clicked a link that was in another site, or was given to you by someone else, it would be nice if you tell them that their link is not valid anymore.') %> 4 + <%= _('.You may have clicked an expired link or mistyped the address.') %>
  5 + <%= _('.This page does not exist. Would you like to: Create a new conteúdoou Locate existing content.') %>
  6 + <!-- <%= _('If you clicked a link that was in another site, or was given to you by someone else, it would be nice if you tell them that their link is not valid anymore.') %> -->
6 </p> 7 </p>
  8 +
7 <% button_bar do %> 9 <% button_bar do %>
8 <%= button :back, _('Go back'), :back %> 10 <%= button :back, _('Go back'), :back %>
9 <%= button :home, _('Go to the home page'), '/' %> 11 <%= button :home, _('Go to the home page'), '/' %>
  12 + <% if logged_in? %>
  13 + <% parent_id = ((@article && @article.allow_children?) ? @article : nil) %>
  14 + <%= colorbox_button('new', _('New content'), :controller => 'cms', :action => 'new', :parent_id => parent_id, :cms => true) %>
  15 + <% end %>
10 <% end %> 16 <% end %>
  17 + <form action="/search">
  18 + <input id="searchGadget" class="searchField" type="text" accesskey="3" placeholder="Buscar no Site" title="Buscar no Site" size="18" name="query" autocomplete="off"></input>
  19 + <input class="searchButton" type="submit" value="Search Content"></input>
  20 + </form>
11 </div> 21 </div>
  22 +