Download as
Browse Code »

Commit 6744cb133db8e7e5d34de2f8bdc4307548b9ef86

Authored by Aurelio A. Heckert
Committed by Antonio Terceiro
1 parent 373fb7b6
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

ActionItem1050: nice features

Showing 4 changed files with 14 additions and 5 deletions   Show diff stats
app/helpers/application_helper.rb
  Diff comments   View file @6744cb1
@@ -466,7 +466,7 @@ module ApplicationHelper @@ -466,7 +466,7 @@ module ApplicationHelper
466 # displays a link to the community homepage with its image (as generated by 466 # displays a link to the community homepage with its image (as generated by
467 # #profile_image) and its name and number of members beside it. 467 # #profile_image) and its name and number of members beside it.
468 def community_image_link( profile, size=:portrait, tag='li' ) 468 def community_image_link( profile, size=:portrait, tag='li' )
469 - name = profile.short_name 469 + name = profile.name
470 content_tag tag, 470 content_tag tag,
471 link_to( 471 link_to(
472 content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) + 472 content_tag( 'span', profile_image( profile, size ), :class => 'profile-image' ) +
@@ -476,7 +476,8 @@ module ApplicationHelper @@ -476,7 +476,8 @@ module ApplicationHelper
476 :onclick => 'document.location.href = this.href', # work-arround for ie. 476 :onclick => 'document.location.href = this.href', # work-arround for ie.
477 :class => 'profile_link url', 477 :class => 'profile_link url',
478 :help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name, 478 :help => _('Click on this icon to go to the <b>%s</b>\'s home page') % profile.name,
479 - :title => profile.name ), 479 + :title => profile.name ) +
  480 + '<br class="may-clear"/>',
480 :class => 'vcard' 481 :class => 'vcard'
481 end 482 end
482 483
app/helpers/block_helper.rb
  Diff comments   View file @6744cb1
1 module BlockHelper 1 module BlockHelper
2 2
3 def block_title(title) 3 def block_title(title)
4 - content_tag('h3', title, :class => 'block-title') 4 + tag_class = 'block-title'
  5 + tag_class += ' empty' if title.empty?
  6 + content_tag 'h3', title, :class => tag_class
5 end 7 end
6 8
7 end 9 end
app/views/layouts/application-ng.rhtml
  Diff comments   View file @6744cb1
@@ -102,8 +102,6 @@ @@ -102,8 +102,6 @@
102 <div id="theme-footer"> 102 <div id="theme-footer">
103 <%= theme_footer %> 103 <%= theme_footer %>
104 </div><!-- end id="theme-footer" --> 104 </div><!-- end id="theme-footer" -->
105 -  
106 <%= noosfero_layout_features %> 105 <%= noosfero_layout_features %>
107 -  
108 </body> 106 </body>
109 </html> 107 </html>
app/views/shared/noosfero_layout_features.rhtml
  Diff comments   View file @6744cb1
@@ -5,3 +5,11 @@ @@ -5,3 +5,11 @@
5 <% if ask_to_join? %> 5 <% if ask_to_join? %>
6 <%= render :file => 'shared/join_community_popup' %> 6 <%= render :file => 'shared/join_community_popup' %>
7 <% end %> 7 <% end %>
  8 +
  9 + <script type="text/javascript">
  10 + $$("a").each(function(a){
  11 + if ( a.href == document.location.href ) {
  12 + a.className += " link-this-page";
  13 + }
  14 + });
  15 + </script>