Download as
Browse Code »

Commit 5905980f5cfe08ee67439346c79d98cfdf31a06f

Authored by AntonioTerceiro
1 parent 84f38b95
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem21: checkpoint 



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@981 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 5 changed files with 22 additions and 2 deletions   Show diff stats
app/views/cms/text_html_new.rhtml
  Diff comments   View file @5905980
... ... @@ -11,5 +11,6 @@
11 11 <%= f.text_area('body', :cols => 64) %>
12 12  
13 13 <%= design_display_button_submit('save', _('Save')) %>
  14 + <%= design_display_button('cancel', _('Cancel'), :action => 'view', :id => @article) %>
14 15  
15 16 <% end %>
... ...
app/views/cms/view.rhtml
  Diff comments   View file @5905980
... ... @@ -48,6 +48,16 @@
48 48 <% if @article %>
49 49 <h2><%= @article.name %></h2>
50 50 <% button_bar(:id => 'article-controls') do %>
  51 +
  52 + <ul>
  53 + <li>
  54 + <%= _('"%{article}", last changed by %{author}') % { :article => @article.name, :author => 'bli' } %>
  55 + </li>
  56 + <li>
  57 + <%= _('Public address of this article: %s') % (@article.public_path) %>
  58 + </li>
  59 + </ul>
  60 +
51 61 <%= link_to_edit_article(@article) %>
52 62 <%= button('home', _('Use as homepage'), { :action => 'set_home_page', :id => @article }, { :method => :post }) %>
53 63 <% end %>
... ...
app/views/content_viewer/no_home_page.rhtml 0 → 100644
  Diff comments   View file @5905980
... ... @@ -0,0 +1,5 @@
  1 +<h2><%= _("Missing home page") %></h2>
  2 +
  3 +<p>
  4 +<%= _('%s did not choose an article for homepage yet.') % profile.name %>
  5 +</p>
... ...
public/stylesheets/button.css
  Diff comments   View file @5905980
... ... @@ -3,14 +3,14 @@
3 3 margin-left: 5px;
4 4 background-color: transparent;
5 5 background-repeat: no-repeat;
6   - background-position: 0px;
  6 + background-position: 0 0;
7 7  
8 8 padding-left: 25px;
9 9 padding-right: 2px;
10 10  
11 11 float: left;
12 12 display: block;
13   - height: 26px;
  13 + height: 24px;
14 14  
15 15 }
16 16  
... ...
public/stylesheets/common.css
  Diff comments   View file @5905980
... ... @@ -201,6 +201,9 @@ div.file-manager-button a:hover {
201 201 float: right;
202 202 color: white;
203 203 }
  204 +#article-subitems-show.show-button {
  205 + float: right;
  206 +}
204 207 #article-subitems-hide.hide-button:hover {
205 208 background-color: transparent;
206 209 color: black;
... ... @@ -220,4 +223,5 @@ div.file-manager-button a:hover {
220 223 border: 1px solid gray;
221 224 padding-top: 4px;
222 225 padding-bottom: 4px;
  226 + margin-bottom: 1em;
223 227 }
... ...