Download as
Browse Code »

Commit d9f5bcd5e0296d07277352e75307c78c2930fb65

Authored by AntonioTerceiro
1 parent 322a5d33
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, rounding the corners 



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@974 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 9 changed files with 37 additions and 18 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @d9f5bcd
... ... @@ -327,10 +327,11 @@ module ApplicationHelper
327 327 show_button_id = id + "-show"
328 328  
329 329 result = ""
330   - result << button_to_function('close', hide_label, hide(id) + hide(hide_button_id) + show(show_button_id), :id => hide_button_id, :class => 'hide-button with_text')
331   - result < " "
332 330 result << button_to_function('open', show_label, show(id) + show(hide_button_id) + hide(show_button_id), :id => show_button_id, :class => 'show-button with_text', :style => 'display: none;' )
333 331  
  332 + result < " "
  333 + result << button_to_function('close', hide_label, hide(id) + hide(hide_button_id) + show(show_button_id), :id => hide_button_id, :class => 'hide-button with_text')
  334 +
334 335 result
335 336 end
336 337  
... ...
app/views/cms/text_html_new.rhtml
  Diff comments   View file @d9f5bcd
... ... @@ -10,6 +10,6 @@
10 10  
11 11 <%= f.text_area('body', :cols => 64) %>
12 12  
13   - <%= submit_tag _('Save') %>
  13 + <%= design_display_button_submit('save', _('Save')) %>
14 14  
15 15 <% end %>
... ...
app/views/cms/view.rhtml
  Diff comments   View file @d9f5bcd
... ... @@ -17,8 +17,9 @@
17 17 <% end %>
18 18  
19 19 <%# subitem %>
20   -
21   -<%= toggle_panel(_('Hide subitems'), _('Show subitems'), 'article-subitems') unless @subitems.empty? %>
  20 +<% if !@subitems.empty? && @article %>
  21 + <%= toggle_panel(_('Hide subitems'), _('Show subitems'), 'article-subitems') %>
  22 +<% end %>
22 23  
23 24 <div id='article-subitems'>
24 25 <div class='file-manager-title'><%= @article ? _('Subitems') : _('Articles') %></div>
... ... @@ -36,6 +37,7 @@
36 37 <% if @article %>
37 38 <% button_bar(:class => 'file-manager-controls') do %>
38 39 <%= button('new', _('New subitem'), :action => 'new', :parent_id => @article.id) %>
  40 + <%= button('up', _('Go up one level'), :action => (@article.parent ? 'view' : 'index'), :id => @article.parent) %>
39 41 <% end %>
40 42 <% end %>
41 43 </div>
... ...
public/designs/icons/default/README
  Diff comments   View file @d9f5bcd
1 1 Source and Licensing
2 2 ====================
3 3  
4   -Icon Source theme Source section License
5   -------------------------- ------------ -------------- -------
6   -gtk-edit.png dlg-neu stock/ GPLv2+
7   -gnome-home.png Nuovo apps/ GPLv2+
8   -gtk-new.png Nuovo stock/ GPLv2+
9   -gtk-close.png Nuovo stock/ GPLv2+
10   -gtk-open.png Nuovo stock/ GPLv2+
11   -abiword_48.png dlg-neu apps/ GPLv2+
  4 +Icons are taken from GNOME/Gtk+ themes on Debian systems. Normally they are
  5 +converted from SVG to PNG using rsvg (from package librsvg2-bin).
  6 +
  7 +Icon Source theme Source section
  8 +------------------------- ------------ --------------
  9 +gtk-edit.png dlg-neu stock/
  10 +gnome-home.png Nuovo apps/
  11 +gtk-new.png Nuovo stock/
  12 +gtk-close.png Nuovo stock/
  13 +gtk-open.png Nuovo stock/
  14 +abiword_48.png dlg-neu apps/
  15 +gtk-save.png Nuovo stock/
  16 +gtk-go-up.png Nuovo stock/
  17 +
  18 +Licensing of GNOME themes
  19 +=========================
  20 +
  21 +Nuovo: GPL 2 or later
  22 +dlg-neu: GPL 2 or later
... ...
public/designs/icons/default/gtk-go-up.png 0 → 100644
View file @d9f5bcd

1.01 KB
public/designs/icons/default/gtk-save.png 0 → 100644
View file @d9f5bcd

729 Bytes
public/designs/icons/default/style.css
  Diff comments   View file @d9f5bcd
... ... @@ -4,4 +4,5 @@
4 4 .button.close { background-image: url(gtk-close.png); }
5 5 .button.open { background-image: url(gtk-open.png); }
6 6 .button.cms { background-image: url(abiword_48.png)}
7   -
  7 +.button.save { background-image: url(gtk-save.png); }
  8 +.button.up { background-image: url(gtk-go-up.png); }
... ...
public/stylesheets/button.css
  Diff comments   View file @d9f5bcd
... ... @@ -6,18 +6,22 @@
6 6 background-position: 0px;
7 7  
8 8 padding-left: 25px;
  9 + padding-right: 2px;
9 10  
10 11 float: left;
11 12 display: block;
12 13 height: 26px;
  14 +
13 15 }
14 16  
15   -a.button , a.button:visited {
  17 +.button , .button:visited {
16 18 color: black;
17 19 text-decoration: none;
  20 + border: 1px solid transparent;
18 21 }
19 22  
20   -a.button:hover {
21   - background-color: #ace;
  23 +.button:hover {
  24 + border: 1px solid black;
  25 + background-color: #eee;
22 26 }
23 27  
... ...
public/stylesheets/common.css
  Diff comments   View file @d9f5bcd
... ... @@ -146,6 +146,7 @@ div.file-manager-button a:hover {
146 146 padding: 2px;
147 147 background: #579;
148 148 color: white;
  149 + height: 24px;
149 150 }
150 151  
151 152 .file-manager-small ul {
... ... @@ -198,7 +199,6 @@ div.file-manager-button a:hover {
198 199  
199 200 #article-subitems-hide.hide-button {
200 201 float: right;
201   - margin-right: 4px;
202 202 color: white;
203 203 }
204 204 #article-subitems-hide.hide-button:hover {
... ...