Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed footer for FB icons, fixed gallery item size

  • Loading branch information...
commit 149b7518c0228f441a0d47eb67338c1bdd3995d6 1 parent 84978a0
@adahmash adahmash authored
View
2  app/assets/stylesheets/default_v3.sass
@@ -1252,6 +1252,8 @@ p
width: $ninesixty_grid_width
.fb-fanapp
height: 60px
+ .fb-likeapp
+ height: 30px
.footer-panel
margin-bottom: $ninesixty_gutter_width
&.one
View
3  app/views/gallery_items/show.html.haml
@@ -31,6 +31,9 @@
.mod-panel.clearfix
.float-right= render :partial => 'shared/moderate_form', :locals => { :moderatable => @item }
.float-left= render :partial => 'shared/flag_form', :locals => { :flaggable => @item }
+ .panel-2
+ %ul
+ %li=link_to('Back to Gallery', @gallery)
= render_ad(:banner, @ad_layout, @ad_banner)
.panel-2.comment-list
= render :partial => 'shared/comments', :locals => { :comments => @item.comments }
View
5 app/views/shared/_footer.html.haml
@@ -7,9 +7,12 @@
-#= link_to t('post_story_button'), new_story_path, :class => "button-link"
.foot-item-wrap.first
- app_id_setting = get_setting('app_id')
+ - display_facebook_badge_setting = get_setting('display_facebook_app_badge').value
- if app_id_setting.present?
- - if app_id_setting.value != '111111111111'
+ - if app_id_setting.value != '111111111111' and display_facebook_badge_setting
%iframe{:src => "http://www.facebook.com/connect/connect.php?id=#{get_setting('app_id').value}&connections=0&stream=0", :frameborder => 0, :scrolling => "no", :class => "fb-fanapp", :allowtransparency => "true"}
+ - elsif app_id_setting.value != '111111111111' and !display_facebook_badge_setting
+ %iframe{:src => "http://www.facebook.com/plugins/like.php?href=#{APP_CONFIG['base_site_url']}", :frameborder => 0, :scrolling => "no", :class => "fb-likeapp", :allowtransparency => "true"}
- else
= link_to t('footer.setup_app_id', :setup_app_id_path => edit_admin_metadata_setting_path(app_id_setting), :learn_more_path => "http://support.newscloud.com/kb/configuring-your-application/how-to-setup-your-facebook-application-id" ).html_safe
View
1  db/seeds.rb
@@ -368,6 +368,7 @@
{ :key_sub_type => 'options', :key_name => 'native_voting', :value => "false" , :hint => 'False turns on Add This toolbar with Facebook Likes. True turns on native likes and Twitter Connect.' },
{ :key_sub_type => 'options', :key_name => 'framed_item_content', :value => "false" , :hint => 'True makes links to destination item urls appear in a frameset.' },
{ :key_sub_type => 'options', :key_name => 'extended_footer_content', :value => "false" , :hint => 'Advanced users only - place additional javascript for the footer here.' },
+ { :key_sub_type => 'facebook', :key_name => 'display_facebook_app_badge', :value => "false" , :hint => 'Display App badge from Facebook in footer' },
]
settings.each do |setting|
Please sign in to comment.
Something went wrong with that request. Please try again.