community_engine 2.3.2 → 3.0.0

data/app/views/invitations/index.html.haml

@@ -0,0 +1,8 @@
+-@page_title = :listing_invitations.l
+
+%ul
+  -for invitation in @invitations
+    %li
+      = invitation.email_addresses
+
+= link_to fa_icon('plus-circle', :text => :new_invitation.l), new_user_invitation_path

data/app/views/invitations/new.html.haml

@@ -1,33 +1,24 @@
-%script{"type"=>"text/javascript", "src"=>"http://www.plaxo.com/css/m/js/util.js"}
-%script{"type"=>"text/javascript", "src"=>"http://www.plaxo.com/css/m/js/basic.js"}
-%script{"type"=>"text/javascript", "src"=>"http://www.plaxo.com/css/m/js/abc_launcher.js"}
+-@page_title=:invite_your_friends_to_join.l
+
+-widget do
+  %h4
+    .small=:spread_the_word.l
+  %p=:invite_message.l(:site => configatron.community_name)
+  %p
+    =:people_who_sign_up_using_your_invitation_will_automatically_be_added_as_your_friends_on.l
+    = configatron.community_name
+    \.
 
-.yui-b
-  -box :class => "alt first_alt" do 
-    %h3=:spread_the_word.l
-    %p
-      =:invite_message.l(:site => configatron.community_name)
-    %p
-      =:people_who_sign_up_using_your_invitation_will_automatically_be_added_as_your_friends_on.l
-      = configatron.community_name
-      \.
+= bootstrap_form_for [@user, @invitation], :layout => :horizontal do |f|
+  .pull-right
+    %a{"href"=>"#", "onclick"=>"showPlaxoABChooser('invitation_email_addresses', '/base/plaxo'); return false;"}
+      %img{"src"=>"http://www.plaxo.com/images/abc/buttons/add_button.gif", "alt"=>:add_from_my_address_book.l}/
+  = f.text_area :email_addresses , :rows => "5", :label => :enter_e_mail_addresses.l, :help => :comma_separated.l
+  = f.text_area :message, :rows => "5", :label => :write_a_message.l
 
-#yui-main
-  .yui-b
-    -box do 
-      %h3=:invite_your_friends_to_join.l
-      = form_for(:invitation, :url => user_invitations_path(:user_id => @user.id ), :html => {:class => "MainForm"} ) do |f|
-        .right
-          %a{"href"=>"#", "onclick"=>"showPlaxoABChooser('invitation_email_addresses', '/base/plaxo'); return false;"}
-            %img{"src"=>"http://www.plaxo.com/images/abc/buttons/add_button.gif", "alt"=>:add_from_my_address_book.l}/
-        %label{"for"=>"email_addresses"} 
-          =:enter_e_mail_addresses.l 
-          %em= :comma_separated.l
-        = f.text_area :email_addresses , :rows => "5"
-        %label{"for"=>"message"}= :write_a_message.l
-        = f.text_area :message, :rows => "5"
+  = f.form_group :submit_group do
+    = f.primary :send_invitations.l
 
-        %p
-          = submit_tag :send_invitations.l
-          = :or.l
-          = link_to :cancel.l, user_path(@user)
+%script{"type"=>"text/javascript", "src"=>"http://www.plaxo.com/css/m/js/util.js"}
+%script{"type"=>"text/javascript", "src"=>"http://www.plaxo.com/css/m/js/basic.js"}
+%script{"type"=>"text/javascript", "src"=>"http://www.plaxo.com/css/m/js/abc_launcher.js"}

data/app/views/kaminari/bootstrap/_first_page.html.erb

@@ -0,0 +1,13 @@
+<%# Link to the "First" page
+  - available local variables
+    url:           url to the first page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<% unless current_page.first? %>
+<li class="first">
+  <%= link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, :remote => remote %>
+</li>
+<% end %>

data/app/views/kaminari/bootstrap/_gap.html.erb

@@ -0,0 +1,8 @@
+<%# Non-link tag that stands for skipped pages...
+  - available local variables
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="page gap disabled"><a href="#" onclick="return false;"><%= raw(t 'views.pagination.truncate') %></a></li>

data/app/views/kaminari/bootstrap/_last_page.html.erb

@@ -0,0 +1,13 @@
+<%# Link to the "Last" page
+  - available local variables
+    url:           url to the last page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<% unless current_page.last? %>
+<li class="last next"><%# "next" class present for border styling in twitter bootstrap %>
+  <%= link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, {:remote => remote} %>
+</li>
+<% end %>

data/app/views/kaminari/bootstrap/_next_page.html.erb

@@ -0,0 +1,13 @@
+<%# Link to the "Next" page
+  - available local variables
+    url:           url to the next page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<% unless current_page.last? %>
+<li class="next_page">
+  <%= link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote %>
+</li>
+<% end %>

data/app/views/kaminari/bootstrap/_page.html.erb

@@ -0,0 +1,12 @@
+<%# Link showing page number
+  - available local variables
+    page:          a page object for "this" page
+    url:           url to this page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<li class="page<%= ' active' if page.current? %>">
+  <%= link_to page, url, opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
+</li>

data/app/views/kaminari/bootstrap/_paginator.html.erb

@@ -0,0 +1,25 @@
+<%# The container tag
+  - available local variables
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+    paginator:     the paginator that renders the pagination tags inside
+-%>
+<%= paginator.render do -%>
+  <div>
+    <ul class="pagination">
+    <%= first_page_tag unless current_page.first? %>
+    <%= prev_page_tag unless current_page.first? %>
+    <% each_page do |page| -%>
+      <% if page.left_outer? || page.right_outer? || page.inside_window? -%>
+        <%= page_tag page %>
+      <% elsif !page.was_truncated? -%>
+        <%= gap_tag %>
+      <% end -%>
+    <% end -%>
+    <%= next_page_tag unless current_page.last? %>
+    <%= last_page_tag unless current_page.last? %>
+    </ul>
+  </div>
+<% end -%>

data/app/views/kaminari/bootstrap/_prev_page.html.erb

@@ -0,0 +1,13 @@
+<%# Link to the "Previous" page
+  - available local variables
+    url:           url to the previous page
+    current_page:  a page object for the currently displayed page
+    num_pages:     total number of pages
+    per_page:      number of items to fetch per page
+    remote:        data-remote
+-%>
+<% unless current_page.first? %>
+<li class="prev">
+  <%= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote %>
+</li>
+<% end %>

data/app/views/layouts/application.html.haml

@@ -19,43 +19,32 @@
     -unless configatron.auth_providers.facebook.key.blank?
       =render :partial => 'facebook/fb_require'
 
-    #doc2{:class => "yui-t#{@sidebar_left ? 3 : 6}"}
-      = render :partial => "shared/header"
-
-      #bd
-        = render :partial => "shared/messages"
-
-        = yield
-
-
-      #ft
-        -if show_footer_content?
-          .yui-gc#footer_content
-            = image_tag 'spinner.gif', :plugin => 'community_engine'
-            =:loading_recent_content.l
-
-
-      #CommunityFooter
-        %ul
-          %li
-            %a{:href=>home_url, :title=>"#{configatron.community_name} " + :home.l}= :home.l
-          - if !logged_in?
-            %li
-              = link_to :log_in.l , login_path
-          - else
-            %li
-              %a{:href=>logout_url, :title=>:log_out_of_your.l + " #{configatron.community_name} " + :account.l}
-                =:log_out.l
-
-          - Page.find(:all).each do |page|
-            - if (logged_in? || page.page_public)
-              %li= link_to page.title, pages_path(page)
-
-          - if @rss_title && @rss_url
-            %li#rss= link_to :rss.l, @rss_url, {:title => @rss_title}
-
-        %p
-          = :community_tagline.l
+    .navbar.navbar-inverse.navbar-fixed-top{role: "navigation"}
+      .container-fluid
+        = render :partial => "shared/header"
+
+    .container
+      .row
+        = render_jumbotron
+      .row
+        .col-sm-9
+          %h1=container_title
+          = render :partial => "shared/messages"
+          = yield
+        .col-sm-3.pull-right
+          = render :partial => "shared/sidebar"
+
+
+      -if show_footer_content?
+        .row#footer-content
+          = image_tag 'spinner.gif', :plugin => 'community_engine'
+          =:loading_recent_content.l
+
+      .row
+        .col-sm-12
+          = render :partial => 'shared/footer_links'
+
+          %p= :community_tagline.l
 
     = render :partial => "shared/end_javascript"
     = yield :end_javascript

data/app/views/messages/_form.html.haml

@@ -1,25 +1,19 @@
-= form_for message, :url => user_messages_path(user), :html => {:class => "MainForm"} do |f|
+= bootstrap_form_for [user, message], :layout => :horizontal do |f|
 
   -if message.reply_to
     =f.hidden_field :to
     =f.hidden_field :parent_id
   -else
-    %label{:for => 'message_to'} 
-      =:to.l
-      %em= "(" + :type_a_username.l + ")"
-    = text_field_tag 'message[to]', @message.to, {:autocomplete => "off", :size => 35, :id => "message_to"}
-    .auto_complete#message_to_auto_complete
+    = f.text_field :to, :required => true, :autocomplete => "off", :id => "message_to", :label => :to.l, :placeholder => :type_a_username.l
+
     -content_for :end_javascript do
-      = auto_complete_field 'message_to', {:url => auto_complete_for_username_user_messages_path(@user), :tokens=>','}
+      = tag_auto_complete_field 'message_to', {:url => { :controller => "messages", :action => 'auto_complete_for_username'}, :tokens => [','], :tagLimit => 1 }
 
   -if @reply  
     = f.hidden_field :subject  
   -else
-    %label{:for => 'message_subject'}= :subject.l + ":"
     = f.text_field :subject
 
-  %label{:for => "message_body"}= :message.l + ":"
-  = f.text_area :body
+  = f.text_area :body, :label => :message.l, :rows => 10, :class => "col-sm-6"
 
-  %p
-    = submit_tag :send.l
+  = f.primary :send.l

data/app/views/messages/_inbox.html.haml

@@ -1,41 +1,36 @@
+-@page_title = :inbox.l
 
-
-#yui-main
-  .yui-b
-    -box do 
-      %h3= :inbox.l
-
-      %table.messages{:border => 0, :width => '100%'}
-        %tbody
-          - if @messages.empty?
-            %tr
-              %td{ :colspan => "5" }
-                = :no_messages.l
-          -else
-            - @messages.each do |message_thread|
-              - message = message_thread.message
-              - children = message_thread.parent_message.children              
-              %tr{:class => message_thread.read? ? :read.l : :unread.l}
-                %td{:width => '10px'}
-                  %fieldset.inline
-                    = check_box_tag "delete[]", message_thread.id
-                %td
-                  =link_to h(message_thread.subject), user_message_path(@user, message)
-                  =children.any? ? "(#{children.size} messages)" : ''
-                  %br
-                  %em
-                    =message.sender.login
-                    \: 
-                    =truncate(message.body)
-                
-                %td.meta{:width => '150px'}
-                  =time_ago_in_words_or_date(message_thread.updated_at)                
-                  
-        %tfoot
-          %tr
-            %td{ :colspan => "5" }
-              -if @messages.any?
-                %p= submit_tag :delete_selected.l              
-      
-      .pagination=paginating_links @messages if @messages.total_count > 1                
+- if @messages.empty?
+  %p= :no_messages.l
+-else
+  %table.table.table-bordered
+    - @messages.each do |message_thread|
+      - message = message_thread.message
+      - children = message_thread.parent_message.children              
+      %tr{:class => message_thread.read? ? '' : 'alert-success'}
+        %td
+          = check_box_tag "delete[]", message_thread.id
+        %td
+          -if children.any?
+            -if message_thread.read?
+              %span.badge
+                = children.size
+            -else
+              %span.badge.badge-success
+                = children.size
+          =link_to h(message_thread.subject), user_message_path(@user, message)
+          -if !message_thread.read?
+            %span.label.label-success
+              =:new.l
+          %br
+          %em
+            =message.sender.login
+            \: 
+            =truncate(message.body)
+        
+        %td
+          =time_ago_in_words_or_date(message_thread.updated_at)    
+  = submit_tag :delete_selected.l, :class => 'btn btn-danger'           
+        
+  =paginate @messages, :theme => 'bootstrap'             
 

data/app/views/messages/_menu_item.html.haml

@@ -0,0 +1,11 @@
+- if logged_in?
+  - if current_user.unread_messages?
+    -if params[:controller] == 'messages'
+      -css_class = 'active'
+    -else 
+      -css_class = 'inactive'
+    %li{:class => css_class}
+      %a{:href => user_messages_path(current_user)}
+        %span.badge.badge-success
+          =current_user.unread_message_count
+          =fa_icon "envelope inverse"

data/app/views/messages/_sent.html.haml

@@ -1,34 +1,23 @@
-#yui-main
-  .yui-b
-    -box do 
+-@page_title = :sent_messages.l
 
-      %h3= :sent_messages.l
-      %table.messages{:border => 0, :width => '100%'}
-        %tbody
-          - if @messages.empty?
-            %tr
-              %td{ :colspan => "4" }
-                = :no_messages.l
-          - else
-            - @messages.each do |message|
-              %tr
-                %td{:width => '10px'}
-                  %fieldset.inline= check_box_tag "delete[]", message.id
-                %td{:width => '60px'}
-                  .photo= link_to image_tag( message.recipient.avatar_photo_url(:thumb), "height"=>"50px", "alt"=>"#{message.recipient.login}", "width"=>"50px" ), user_path(message.recipient), :title => :users_profile.l(:user => message.recipient.login)
-
-                %td
-                  = link_to h(message.subject), user_message_path(message.sender, message)
-                  %br
-                  = :to.l 
-                  \:
-                  = link_to h(message.recipient.login), user_path(message.recipient)
-                %td.meta{:width => '150px'}
-                  = time_ago_in_words_or_date(message.created_at)                                  
-            
-            
-          %tfoot
-            %tr
-              %td{ :colspan => "4" }
-                -if @messages.any?
-                  %p= submit_tag :delete.l
+- if @messages.empty?
+  = :no_messages.l
+- else
+  %table.table.table-bordered
+    - @messages.each do |message|
+      %tr
+        %td.col-sm-1
+          %fieldset.inline= check_box_tag "delete[]", message.id
+        %td.col-sm-2
+          = :to.l
+          \:
+          = link_to h(message.recipient.login), user_path(message.recipient)
+          %br
+          = link_to image_tag( message.recipient.avatar_photo_url(:thumb), :alt => message.recipient.login , :class => 'thumbnail'), user_path(message.recipient), :title => :users_profile.l(:user => message.recipient.login)
+        %td
+          = link_to h(message.subject), user_message_path(message.sender, message)
+          %br
+        %td.col-sm-2
+          = time_ago_in_words_or_date(message.created_at)
+  = submit_tag :delete_selected.l, :class => 'btn btn-danger'
+  =paginate @messages, :theme => 'bootstrap'

data/app/views/messages/_sidebar_nav.html.haml

@@ -1,9 +1,12 @@
-.yui-b.sidebar
-  -box do 
-    %h3= :links.l
-    %ul.message_nav
-      %li{:class => "inbox#{@user.unread_messages? ? '_new': ''}"}
-        = link_to :inbox.l, user_messages_path(@user)
-        = "(#{@user.unread_message_count})" if @user.unread_messages?
-      %li.sent= link_to :sent_messages.l, user_messages_path(@user, :mailbox => :sent)
-      %li.compose= link_to :compose.l, new_user_message_path(@user)
+-widget do
+  %h4
+    .small= :links.l
+  %p
+    %a{:href=>user_messages_path(@user)}
+      =:inbox.l
+      - if @user.unread_messages?
+        %span.badge.badge-success
+          = "#{@user.unread_message_count}"
+          =fa_icon "envelope inverse"
+  %p.sent= link_to :sent_messages.l, user_messages_path(@user, :mailbox => :sent)
+  %p.compose= link_to :compose.l, new_user_message_path(@user)

data/app/views/messages/index.html.haml

@@ -1,8 +1,8 @@
 =render :partial => 'messages/sidebar_nav'
 
 - if params[:mailbox] == "sent"
-  = form_tag delete_selected_user_messages_path(@user), :class => "MainForm" do
+  = bootstrap_form_tag :url => delete_selected_user_messages_path(@user) do
     = render :partial => "sent"
 - else
-  = form_tag delete_message_threads_user_messages_path(@user), :class => "MainForm" do
+  = bootstrap_form_tag :url => delete_message_threads_user_messages_path(@user) do
     = render :partial => "inbox"