Commit 7e753c77831a4e15d17fe37d47a47976b0893deb
1 parent
c761df2c
Exists in
master
and in
29 other branches
ActionItem152: ta longe, mas ta andando
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1376 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing
9 changed files
with
23 additions
and
11 deletions
Show diff stats
app/helpers/assets_helper.rb
| @@ -9,10 +9,6 @@ module AssetsHelper | @@ -9,10 +9,6 @@ module AssetsHelper | ||
| 9 | [ "#", "icon-menu-enterprise", _('Enterprises') ], | 9 | [ "#", "icon-menu-enterprise", _('Enterprises') ], |
| 10 | [ "#", "icon-menu-community", _('Communities') ], | 10 | [ "#", "icon-menu-community", _('Communities') ], |
| 11 | 11 | ||
| 12 | - # FIXME remove these | ||
| 13 | - [ "#", "icon-menu-", _('bli 1') ], | ||
| 14 | - [ "#", "icon-menu-", _('bli 2') ], | ||
| 15 | - | ||
| 16 | ].map do |target,css_class,name| | 12 | ].map do |target,css_class,name| |
| 17 | content_tag('li', link_to(content_tag('span', '', :class => css_class) + name, target)) | 13 | content_tag('li', link_to(content_tag('span', '', :class => css_class) + name, target)) |
| 18 | end.join("\n") | 14 | end.join("\n") |
app/helpers/boxes_helper.rb
| @@ -44,9 +44,18 @@ module BoxesHelper | @@ -44,9 +44,18 @@ module BoxesHelper | ||
| 44 | result = extract_block_content(content) | 44 | result = extract_block_content(content) |
| 45 | footer = extract_block_content(footer) | 45 | footer = extract_block_content(footer) |
| 46 | 46 | ||
| 47 | - classes = ['block', block.css_class_name ].uniq.join(' ') | 47 | + options = { |
| 48 | + :class => classes = ['block', block.css_class_name ].uniq.join(' '), | ||
| 49 | + :id => "block-#{block.id}" | ||
| 50 | + } | ||
| 51 | + if ( block.respond_to? 'help' ) | ||
| 52 | + options[:help] = block.help | ||
| 53 | + end | ||
| 48 | 54 | ||
| 49 | - box_decorator.block_target(block.box, block) + content_tag('div', result + footer + box_decorator.block_edit_buttons(block), :class => classes, :id => "block-#{block.id}") + box_decorator.block_handle(block) | 55 | + box_decorator.block_target(block.box, block) + |
| 56 | + content_tag('div', result + footer + box_decorator.block_edit_buttons(block), | ||
| 57 | + options) + | ||
| 58 | + box_decorator.block_handle(block) | ||
| 50 | end | 59 | end |
| 51 | 60 | ||
| 52 | def extract_block_content(content) | 61 | def extract_block_content(content) |
app/models/tags_block.rb
| @@ -7,12 +7,13 @@ class TagsBlock < Block | @@ -7,12 +7,13 @@ class TagsBlock < Block | ||
| 7 | _('List count of contents by tag') | 7 | _('List count of contents by tag') |
| 8 | end | 8 | end |
| 9 | 9 | ||
| 10 | + def help | ||
| 11 | + _('The tag is created when you add some one to your article. <p/> | ||
| 12 | + Try to add some tags to some articles and see your tag cloud to grow.') | ||
| 13 | + end | ||
| 14 | + | ||
| 10 | def content | 15 | def content |
| 11 | block_title(_('Tags')) + | 16 | block_title(_('Tags')) + |
| 12 | - help_textile( | ||
| 13 | - _('The tag is created when you add some one to your article. | ||
| 14 | - Try to add some tags to some articles and see your tag cloud to grow.'), | ||
| 15 | - _('How tags works here?'), :class => 'help_tags' ) + | ||
| 16 | "\n<div class='tag_cloud'>\n"+ | 17 | "\n<div class='tag_cloud'>\n"+ |
| 17 | tag_cloud( owner.tags, :id, | 18 | tag_cloud( owner.tags, :id, |
| 18 | owner.generate_url(:controller => 'profile', :action => 'tag') + '/', | 19 | owner.generate_url(:controller => 'profile', :action => 'tag') + '/', |
public/designs/icons/default/help-off-32x32-HC.gif
public/designs/icons/default/help-on-32x32-HC.gif
public/images/logo-anhetegua.png
public/img-source/help.xcf
No preview for this file type
public/javascripts/show-mouse-help.js
| @@ -121,7 +121,7 @@ function getHelp( ev ) { | @@ -121,7 +121,7 @@ function getHelp( ev ) { | ||
| 121 | var txtEl = el.ownerDocument.getElementById( txt.replace(/#/,"") ); | 121 | var txtEl = el.ownerDocument.getElementById( txt.replace(/#/,"") ); |
| 122 | if ( txtEl ) txt = txtEl.innerHTML; | 122 | if ( txtEl ) txt = txtEl.innerHTML; |
| 123 | } | 123 | } |
| 124 | - box.content.innerHTML = '<p/>'+ txt + | 124 | + box.content.innerHTML = '<p>'+ txt +'</p>'+ |
| 125 | '<br style="clear:both" />'+ | 125 | '<br style="clear:both" />'+ |
| 126 | '<div class="help-force-clear-ieworkarroundbug"'+ | 126 | '<div class="help-force-clear-ieworkarroundbug"'+ |
| 127 | ' style="height:1px; overflow:hidden"></div>'; | 127 | ' style="height:1px; overflow:hidden"></div>'; |
public/stylesheets/common.css
| @@ -313,6 +313,12 @@ div#notice { | @@ -313,6 +313,12 @@ div#notice { | ||
| 313 | margin: 10px 0px; | 313 | margin: 10px 0px; |
| 314 | color: #2A5896; | 314 | color: #2A5896; |
| 315 | } | 315 | } |
| 316 | +#content h1 { font-size: 24px } | ||
| 317 | +#content h2 { font-size: 20px } | ||
| 318 | +#content h3 { font-size: 18px } | ||
| 319 | +#content h4 { font-size: 16px } | ||
| 320 | +#content h5 { font-size: 14px } | ||
| 321 | +#content h6 { font-size: 12px } | ||
| 316 | body.category1 #content h1, body.category1 #content h2, body.category1 #content h3, | 322 | body.category1 #content h1, body.category1 #content h2, body.category1 #content h3, |
| 317 | body.category1 #content h4, body.category1 #content h5, body.category1 #content h6 | 323 | body.category1 #content h4, body.category1 #content h5, body.category1 #content h6 |
| 318 | { color: #E26B00 } | 324 | { color: #E26B00 } |