Download as
Browse Code »

Commit 7e753c77831a4e15d17fe37d47a47976b0893deb

Authored by AurelioAHeckert
1 parent c761df2c
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

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
  Diff comments   View file @7e753c7
... ... @@ -9,10 +9,6 @@ module AssetsHelper
9 9 [ "#", "icon-menu-enterprise", _('Enterprises') ],
10 10 [ "#", "icon-menu-community", _('Communities') ],
11 11  
12   - # FIXME remove these
13   - [ "#", "icon-menu-", _('bli 1') ],
14   - [ "#", "icon-menu-", _('bli 2') ],
15   -
16 12 ].map do |target,css_class,name|
17 13 content_tag('li', link_to(content_tag('span', '', :class => css_class) + name, target))
18 14 end.join("\n")
... ...
app/helpers/boxes_helper.rb
  Diff comments   View file @7e753c7
... ... @@ -44,9 +44,18 @@ module BoxesHelper
44 44 result = extract_block_content(content)
45 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 59 end
51 60  
52 61 def extract_block_content(content)
... ...
app/models/tags_block.rb
  Diff comments   View file @7e753c7
... ... @@ -7,12 +7,13 @@ class TagsBlock < Block
7 7 _('List count of contents by tag')
8 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 15 def content
11 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 17 "\n<div class='tag_cloud'>\n"+
17 18 tag_cloud( owner.tags, :id,
18 19 owner.generate_url(:controller => 'profile', :action => 'tag') + '/',
... ...
public/designs/icons/default/help-off-32x32-HC.gif
View file @7e753c7

254 Bytes | W: | H:

256 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
public/designs/icons/default/help-on-32x32-HC.gif
View file @7e753c7

273 Bytes | W: | H:

250 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
public/images/logo-anhetegua.png
View file @7e753c7

1.75 KB | W: | H:

17.8 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
public/img-source/help.xcf
View file @7e753c7
No preview for this file type
public/javascripts/show-mouse-help.js
  Diff comments   View file @7e753c7
... ... @@ -121,7 +121,7 @@ function getHelp( ev ) {
121 121 var txtEl = el.ownerDocument.getElementById( txt.replace(/#/,"") );
122 122 if ( txtEl ) txt = txtEl.innerHTML;
123 123 }
124   - box.content.innerHTML = '<p/>'+ txt +
  124 + box.content.innerHTML = '<p>'+ txt +'</p>'+
125 125 '<br style="clear:both" />'+
126 126 '<div class="help-force-clear-ieworkarroundbug"'+
127 127 ' style="height:1px; overflow:hidden"></div>';
... ...
public/stylesheets/common.css
  Diff comments   View file @7e753c7
... ... @@ -313,6 +313,12 @@ div#notice {
313 313 margin: 10px 0px;
314 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 322 body.category1 #content h1, body.category1 #content h2, body.category1 #content h3,
317 323 body.category1 #content h4, body.category1 #content h5, body.category1 #content h6
318 324 { color: #E26B00 }
... ...