From c247ec246065b2e64e5ae243729c9637c6a30fef Mon Sep 17 00:00:00 2001 From: AurelioAHeckert Date: Thu, 7 Feb 2008 21:43:56 +0000 Subject: [PATCH] ActionItem152: coisas aleatorias --- app/helpers/tags_helper.rb | 9 ++++----- app/models/tags_block.rb | 4 +++- app/views/cms/edit.rhtml | 4 +++- app/views/shared/tiny_mce.rhtml | 2 +- public/500.html | 42 ++++++++++++++++++++++++++++++++++++++---- public/designs/templates/default/stylesheets/style.css | 10 ++++++++++ public/stylesheets/blocks/tags-block.css | 6 +++++- public/stylesheets/common.css | 30 ------------------------------ public/stylesheets/controller_cms.css | 34 ++++++++++++++++++++++++++++++++++ 9 files changed, 98 insertions(+), 43 deletions(-) diff --git a/app/helpers/tags_helper.rb b/app/helpers/tags_helper.rb index 23a038a..b79be58 100644 --- a/app/helpers/tags_helper.rb +++ b/app/helpers/tags_helper.rb @@ -42,13 +42,12 @@ module TagsHelper tags.map do |tag,count| v = count.to_f / max - style = <<-EOS - font-size: #{ (v * delta).round + min_size }px; - top: #{ -4 - (v * 4).round }px; - EOS + style = ""+ + "font-size: #{ (v * delta).round + min_size }px;"+ + "top: #{ -4 - (v * 4).round }px;" destination = url.kind_of?(Hash) ? url_for(url.merge(tagname_option => tag)) : (url.to_s + tag) - link_to "#{tag} (#{count})", destination, :style => style + link_to "#{tag}(#{count})", destination, :style => style end.join("\n") end diff --git a/app/models/tags_block.rb b/app/models/tags_block.rb index 3fa8969..851a334 100644 --- a/app/models/tags_block.rb +++ b/app/models/tags_block.rb @@ -13,9 +13,11 @@ class TagsBlock < Block _('The tag is created when you add some one to your article. Try to add some tags to some articles and see your tag cloud to grow.'), _('How tags works here?'), :class => 'help_tags' ) + + "\n
\n"+ tag_cloud( owner.tags, :id, owner.generate_url(:controller => 'profile', :action => 'tag') + '/', - :max_size => 20, :min_size => 10 ) + :max_size => 18, :min_size => 9 ) + + "\n
\n"; end end diff --git a/app/views/cms/edit.rhtml b/app/views/cms/edit.rhtml index 12a525a..d448b21 100644 --- a/app/views/cms/edit.rhtml +++ b/app/views/cms/edit.rhtml @@ -11,7 +11,9 @@ <%= select_categories(:article) %> <%# TODO display the tooltip (title below) in a directly visible way %> - <%= f.text_field('tag_list', :size => 64, :title => _('Separate tags with commas')) %> + <%= f.text_field('tag_list', :size => 64) + + content_tag( 'small', _('Separate tags with commas') ) + %> <% button_bar do %> <%= submit_button('save', _('Save'), :cancel => [:action => (@article.parent ? 'view' : 'index')], :id => @article.parent) %> diff --git a/app/views/shared/tiny_mce.rhtml b/app/views/shared/tiny_mce.rhtml index 2876dc4..7dd4e22 100644 --- a/app/views/shared/tiny_mce.rhtml +++ b/app/views/shared/tiny_mce.rhtml @@ -10,6 +10,6 @@ tinyMCE.init({ theme_advanced_buttons2 : "bold,italic,underline,strikethrough,separator,bullist,numlist,separator,justifyleft,justifycenter,justifyright,justifyfull,separator,link,unlink,image,table,separator,cleanup,code", theme_advanced_buttons3 : "", apply_source_formatting : true, - language: <%= tinymce_language.inspect %>, + language: <%= tinymce_language.inspect %> }); diff --git a/public/500.html b/public/500.html index cdf7cd5..2b2e848 100644 --- a/public/500.html +++ b/public/500.html @@ -1,8 +1,42 @@ - + + Noosfero - Application error + + -

Application error

-

Change this error message for exceptions thrown outside of an action (like in Dispatcher setups or broken Ruby code) in public/500.html

+ +
+ +ERROR CODE 500 +

Application error

+ +
+ +

+ Ups... Hããã... Sory. :-( +
+ That is a bug in our system! +
+ Pleas, help us. + File this bug. +

+ diff --git a/public/designs/templates/default/stylesheets/style.css b/public/designs/templates/default/stylesheets/style.css index 3ec904f..fa9f9ac 100644 --- a/public/designs/templates/default/stylesheets/style.css +++ b/public/designs/templates/default/stylesheets/style.css @@ -20,5 +20,15 @@ } .block { + position: relative; padding: 10px 0px; + float: none; +} + +.msie .box-2 .block, +.msie .box-3 .block { + /* IE SUX A LOT!!! */ + top: -65px; + left: -2px; } + diff --git a/public/stylesheets/blocks/tags-block.css b/public/stylesheets/blocks/tags-block.css index 8fbe9df..934a9f6 100644 --- a/public/stylesheets/blocks/tags-block.css +++ b/public/stylesheets/blocks/tags-block.css @@ -1,5 +1,4 @@ .tags-block { - position: relative; } .tags-block .block-title { @@ -11,3 +10,8 @@ top: 10px; right: 2px; } + +.tag_cloud a { + text-decoration: none; + padding: 0px 4px; +} diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css index 51d3e05..e6e26b8 100644 --- a/public/stylesheets/common.css +++ b/public/stylesheets/common.css @@ -263,36 +263,6 @@ div.file-manager-button a:hover { text-align: right; } -/*************************** cms stuff ******************************/ - -#article-subitems-hide.hide-button { - float: right; - color: white; -} -#article-subitems-show.show-button { - float: right; -} -#article-subitems-hide.hide-button:hover { - background-color: transparent; - color: black; -} - -#article-full-path { - border: 1px solid gray; - margin: 0px; - font-size: 120%; - overflow: auto; - padding: 2px; - background: #abc; -} - -#article-controls { - background: white; - border: 1px solid gray; - padding-top: 4px; - padding-bottom: 4px; - margin-bottom: 1em; -} /*********************************************************/ diff --git a/public/stylesheets/controller_cms.css b/public/stylesheets/controller_cms.css index b12a98a..c337919 100644 --- a/public/stylesheets/controller_cms.css +++ b/public/stylesheets/controller_cms.css @@ -8,3 +8,37 @@ font-weight: bold; } +#article-subitems-hide.hide-button { + float: right; + color: white; +} +#article-subitems-show.show-button { + float: right; +} +#article-subitems-hide.hide-button:hover { + background-color: transparent; + color: black; +} + +#article-full-path { + border: 1px solid gray; + margin: 0px; + font-size: 120%; + overflow: auto; + padding: 2px; + background: #abc; +} + +#article-controls { + background: white; + border: 1px solid gray; + padding-top: 0px; + padding-bottom: 4px; + margin-bottom: 1em; +} + +#article-controls .button { + position: relative; + top: -5px; +} + -- libgit2 0.21.2