nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

main_stream ported, no further styling applied

Browse source
This commit is contained in:
Pablo Cuadrado 2014-09-23 17:23:58 -03:00 committed by Steffen van Bergerem
parent a3cc24eced
commit c4fda4b563
3 changed files with 37 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/stylesheets/leftnavbar.scss
View file

@ -4,6 +4,7 @@
ul { ul {
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
list-style: none;
} }
a { a {

4
app/controllers/streams_controller.rb
View file

@ -7,6 +7,9 @@ class StreamsController < ApplicationController
before_action :save_selected_aspects, :only => :aspects before_action :save_selected_aspects, :only => :aspects
before_action :redirect_unless_admin, :only => :public before_action :redirect_unless_admin, :only => :public
layout ->(c) { request.format == :mobile ? "application" : "with_header_with_footer" }
use_bootstrap_for :aspects, :public, :activity, :multi, :commented, :liked, :mentioned, :followed_tags
respond_to :html, respond_to :html,
:mobile, :mobile,
:json :json
@ -50,6 +53,7 @@ class StreamsController < ApplicationController
private private
def stream_responder(stream_klass=nil) def stream_responder(stream_klass=nil)
if stream_klass.present? if stream_klass.present?
@stream ||= stream_klass.new(current_user, :max_time => max_time) @stream ||= stream_klass.new(current_user, :max_time => max_time)
end end

60
app/views/streams/main_stream.html.haml
View file

@ -24,38 +24,40 @@
%br %br
%br %br
.span-5#leftNavBar .bootstrap_header_padding
#home_user_badge .container
= owner_image_link .row-fluid
%h4 .span3#leftNavBar
= link_to current_user.first_name, local_or_remote_person_path(current_user.person) #home_user_badge
= owner_image_link
%h4
= link_to current_user.first_name, local_or_remote_person_path(current_user.person)
%ul#stream_selection %ul#stream_selection
%li{:data => {:stream => 'stream'}} %li.hoverable{:data => {:stream => 'stream'}}
= link_to t("streams.multi.title"), stream_path, :rel => 'backbone', :class => 'hoverable' = link_to t("streams.multi.title"), stream_path, :rel => 'backbone'
%li{:data => {:stream => 'activity'}} %li.hoverable{:data => {:stream => 'activity'}}
= link_to t("streams.activity.title"), activity_stream_path, :rel => 'backbone', :class => 'hoverable' = link_to t("streams.activity.title"), activity_stream_path, :rel => 'backbone'
%li{:data => {:stream => 'mentions'}} %li.hoverable{:data => {:stream => 'mentions'}}
= link_to t('streams.mentions.title'), mentioned_stream_path, :rel => 'backbone', :class => 'hoverable' = link_to t('streams.mentions.title'), mentioned_stream_path, :rel => 'backbone'
%li.all_aspects %li.all_aspects
= render 'aspects/aspect_listings', :stream => @stream = render 'aspects/aspect_listings', :stream => @stream
%li %li
= render 'tags/followed_tags_listings' = render 'tags/followed_tags_listings'
.span6
#aspect_stream_container.stream_container
= render 'aspects/aspect_stream', :stream => @stream
.span3.rightBar
#selected_aspect_contacts.section
.title.no_icon
%h5.stream_title
= @stream.title
.content
.span-13.append-1 = render 'shared/right_sections'
#aspect_stream_container.stream_container
= render 'aspects/aspect_stream', :stream => @stream
.span-5.rightBar.last %a{:id=>"back-to-top", :title=>"#{t('layouts.application.back_to_top')}", :href=>"#"}
#selected_aspect_contacts.section &#8679;
.title.no_icon
%h5.stream_title
= @stream.title
.content
= render 'shared/right_sections'
%a{:id=>"back-to-top", :title=>"#{t('layouts.application.back_to_top')}", :href=>"#"}
&#8679;