Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
  • 2 commits
  • 6 files changed
  • 0 commit comments
  • 1 contributor
View
17 app/assets/stylesheets/application.css.scss
@@ -208,8 +208,6 @@
//**************REPOSITORIES css *************/
-
-
[class^="iconx-"], [class*=" iconx-"] {
display: inline-block;
width: 32px;
@@ -279,6 +277,21 @@
+
+/*************** MESSAGES ICONS **********/
+
+.icon-msg-inbox{
+
+}
+.icon-msg-new{
+
+}
+.icon-msg-sent{
+
+}
+.icon-msg-trash{
+
+
//**************info devise *************/
.form-horizontal2 input,
View
96 app/helpers/toolbar_helper.rb
@@ -0,0 +1,96 @@
+# The toolbar is the left-side bar in Social Stream's layout
+#
+module ToolbarHelper
+ # Configuration of toolbar items
+ include SocialStream::Views::Toolbar
+
+ # This method define the toolbar content for your view. The toolbar is at the left
+ # side of the screen in vanilla SocialStream distribution.
+ #
+ # The {type} argument chooses diffent configurations. There are three build-in cases:
+ # * :home, render the home menu
+ # * :profile, render the profile menu for the {SocialStream::Models::Subject subject}
+ # this {type} needs a :subject {option} with the subject in the sidebar
+ # * :messages, render the messages menu
+ #
+ # Autoexpand a menu section on your view:
+ #
+ # Toolbar allows you to autoexpand certain menu section that may be of interest for your view.
+ # For example, the messages menu when you are looking your inbox. This is done through :option element.
+ #
+ # To get it working, you should use the proper :option to be expanded. For instance,
+ # ":options => :contacts" it will try to expand "#contacts_menu".
+ #
+ # Examples:
+ #
+ # Render the home toolbar:
+ #
+ # <% toolbar %>
+ #
+ # or
+ #
+ # <% toolbar :home %>
+ #
+ # Render the profile toolbar for a user:
+ #
+ # <% toolbar :profile, :subject => @user %>
+ #
+ # Render the messages menu:
+ #
+ # <% toolbar :messages %>
+ #
+ # Render the profile toolbar for group changing the contacts menu option:
+ #
+ # <% toolbar :profile, :subject => @group, :option => :contacts %>
+ #
+ def toolbar(type = :home, options = {})
+ content = toolbar_items(type, options).inject(ActiveSupport::SafeBuffer.new){ |result, item|
+ result + item[:html]
+ }
+
+ case request.format
+ when Mime::JS
+ response = <<-EOJ
+ $('#toolbarContent').html("#{ escape_javascript(content) }");
+ SocialStream.Toolbar.init({ option: '#{ options[:option] }' });
+ EOJ
+
+ response.html_safe
+ else
+ content_for(:toolbar) do
+ content
+ end
+
+ content_for(:javascript) do
+ <<-EOJ
+ SocialStream.Toolbar.init({ option: '#{ options[:option] }' });
+ EOJ
+ end
+ end
+ end
+
+ def toolbar_menu(type, options = {})
+ ActiveSupport::SafeBuffer.new.tap do |menu|
+ menu << '<div class="toolbar_menu">'.html_safe
+
+ toolbar_menu_render(toolbar_menu_items(type, options), menu)
+
+ menu << '</div>'.html_safe
+ end
+ end
+
+ def toolbar_menu_render(items, menu)
+ menu << '<ul class="nav nav-pills nav-stacked">'.html_safe
+ items.each do |item|
+ menu << '<li>'.html_safe
+
+ menu << item[:html]
+ if item[:items].present?
+ toolbar_menu_render(item[:items], menu)
+ end
+
+ menu << '</li>'.html_safe
+ end
+ menu << '</ul>'.html_safe
+ end
+end
View
42 app/views/conversations/_conversation.html.erb
@@ -1,48 +1,14 @@
<%= div_for(conversation, :class => read_class) do %>
<div class="notification">
</div>
-<div class="row">
-<div class="span2">
- <div class="left">
- <ul class="thumbnails">
- <li class="span1">
- <%= link_to image_tag(conversation.last_sender.logo.url(:actor),
- :title => conversation.last_sender.name, :alt => conversation.last_sender.name),
- conversation.last_sender.subject %>
- </li>
- <li class="span2">
- <div class="caption">
- <h4><%= link_to truncate_name(conversation.last_sender.name), conversation.last_sender.subject %></h4>
- <h5>Virtual Meeting</h5>
- </div>
- </li>
- </ul>
- </div>
-
-
-
-</div>
- <div class="span4">jhgfjh</div>
- <div class="span1">jhvjh</div>
-
- </div>
-
-
-
-
-
-
-
-
-
-
-
<div class="sender_photo">
-
+ <%= link_to image_tag(conversation.last_sender.logo.url(:actor),
+ :title => conversation.last_sender.name, :alt => conversation.last_sender.name),
+ conversation.last_sender.subject %>
</div>
<div class="content_left">
<div class="sender_name">
-
+ <%= link_to truncate_name(conversation.last_sender.name), conversation.last_sender.subject %>
</div>
<div class="date">
<%= t('time.ago', :time => time_ago_in_words(conversation.updated_at)) %>
View
10 app/views/conversations/_index.html.erb
@@ -1,7 +1,11 @@
-<ul class="nav nav-tabs">
- <li class="active"><a href="#wall-1" data-toggle="tab"><%= t('message.' + @box) %></a></li>
-</ul>
+<br class="clearfloat" />
+<div class="space_center">
+</div>
+<div class="space_center"></div>
+
+
+<h2><%= t('message.' + @box) %></h2>
<div class="conversations">
<%= render :partial => 'conversations' %>
</div>
View
5 app/views/conversations/_show.html.erb
@@ -4,7 +4,10 @@
) %>
<br class="clearfloat" />
-
+<div class="space_center">
+</div>
+<div class="space_center">
+</div>
<div class="conversation_full">
<%= render :partial => 'conversation_full', :locals =>{:conversation => @conversation} %>
</div>
View
4 app/views/messages/new.js.erb
@@ -3,8 +3,8 @@ $("#content").html("<%= escape_javascript(render :partial => 'new') %>");
<%= toolbar :messages %>
<%= location(
- link_to(image_tag("btn/new.png", :class => "menu_icon")+t('message.other'), conversations_path,:remote => true),
- link_to(image_tag("btn/message_new.png", :class => "menu_icon")+ t('message.new'), new_message_path, :remote => true)
+ link_to( raw("<i class='icon-book'></i>")+t('message.other'), conversations_path,:remote => true),
+ link_to( raw("<i class='icon-book'></i>")+t('message.new'), new_message_path, :remote => true)
) %>

No commit comments for this range

Something went wrong with that request. Please try again.