community_engine 2.3.2 → 3.0.0

data/app/views/sb_posts/_edit.html.haml

@@ -0,0 +1,6 @@
+= bootstrap_form_for post, :url => sb_post_path(:forum_id => post.forum_id, :topic_id => post.topic_id, :id => post), :layout => :horizontal, :html => {:class => "submit-via-ajax", :id => "edit-form-"+post.id.to_s} do |f|
+  = f.text_area :body, :rows => 10, :id => "edit_post_body_" + post.id.to_s, :class => "rich_text_editor"
+  = ajax_spinner_for "edit-form-" + post.id.to_s
+  = submit_tag :save_changes.l, :class => 'btn btn-primary'
+  or
+  = link_to :cancel.l, '#', :class => 'btn btn-default editor-cancel', 'data-target' => "post-body-#{post.id}"

data/app/views/sb_posts/_edit_script.js.erb

@@ -0,0 +1,14 @@
+console.log("configuring " + $('edit_post'));
+$('edit_post').observe("ajax:before", function () {
+    console.log("Submitting");
+    $('editbox_spinner').show();
+    tinyMCE.triggerSave();
+    console.log( "Returning " + tinyMCE.get('edit_post_body').save());
+    console.log("saved");
+    return false;
+});
+console.log("Setting button " + $('cancelButton'));
+$('cancelButton').observe('click', function () {
+    EditForm.cancel();
+    return false;
+});

data/app/views/sb_posts/_reply_form.html.haml

@@ -1,37 +1,16 @@
-= content_tag 'p', h(flash[:bad_reply]), :class => 'notice' if flash[:bad_reply]
-.errors
-= remote_form_for :post, @post, :url => sb_posts_path(:forum_id => @forum, :topic_id => @topic, :page => @topic.last_page), :html => {:class => "MainForm"}, :before => "$('editbox_spinner').show();tinyMCE.triggerSave()" do |f|
-  %table{"cellspacing"=>"0", "border"=>"0", "cellpadding"=>"0", "width"=>"100%"}
-    %tr
-      %td{"rowspan"=>"2", "width"=>"60%"}
-        = f.text_area :body, :style => "width: 99%; height: 300px;", :class => "rich_text_editor"
-      - if !logged_in? && configatron.recaptcha_pub_key && configatron.recaptcha_priv_key 
-        %td{"style"=>"vertical-align:top;"}
-          %label{"for"=>"comment[author_name"}
-            =:name.l
-            %em="(#{:optional.l})"
-          = f.text_field :author_name, :size => 35
+= bootstrap_form_for @post, :url => sb_posts_path(:forum_id => @forum, :topic_id => @topic, :page => @topic.last_page), :layout => :horizontal, :html => {:class => "submit-via-ajax", :id => "reply"} do |f|
+  = f.text_area :body, :rows => 10, :style => "width: 99%;", :class => "rich_text_editor", :required => false
 
-          %label{"for"=>"comment[author_email"}
-            ="#{:email.l}:"
-            %em="(#{:comment_author_email_required.l})"
-          = f.text_field :author_email, :size => 35        
+  - if !logged_in? && configatron.recaptcha_pub_key && configatron.recaptcha_priv_key
+    = f.text_field :author_name
+    = f.text_field :author_email, :required => true
+    = f.text_field :author_url, :label => :comment_web_site_label.l
 
-          %label{"for"=>"comment[author_url"}
-            =:comment_web_site_label.l
-            %em="(#{:optional.l})"
-          = f.text_field :author_url, :size => 35                  
-        %td{"style"=>"vertical-align:top; text-align: center;padding-left: 20px;"}
-          = recaptcha_tags :ajax => true
-          %p
-            = ajax_spinner_for "editbox", "spinner_black.gif"                    
-            = submit_tag :save_reply.l
-            =:or.l + " #{link_to_function :cancel.l, "$('reply').hide()"}"
-      -else
-        %td{"style"=>"vertical-align:top;"}
-          %p
-            = ajax_spinner_for "editbox", "spinner_black.gif"                    
-            = submit_tag :save_reply.l
-            ="#{:or.l} #{link_to_function :cancel.l, "$('reply').hide()"}".html_safe                  
-    %tr
-      %td{"style"=>"vertical-align: bottom; padding-bottom:15px;"}
+    = f.form_group do
+      = recaptcha_tags :ajax => true
+
+  = f.form_group do
+    = ajax_spinner_for "reply"
+    = f.primary :save_reply.l
+    = :or.l
+    = link_to :cancel.l, '#', :class => 'reply-toggle btn btn-default'

data/app/views/sb_posts/_reply_script.js.erb

@@ -0,0 +1,13 @@
+$('new_post').observe("ajax:before", function () {
+    console.log("Submitting");
+    $('editbox_spinner').show();
+    tinyMCE.triggerSave();
+    console.log( "Returning " + tinyMCE.get('edit_post_body').save());
+    console.log("saved");
+    return false;
+});
+console.log("Setting button");
+$('cancelButton').observe('click', function () {
+    $('reply').hide();
+    return false;
+});

data/app/views/sb_posts/_sb_post.html.haml

@@ -1,34 +1,32 @@
-- unless post.eql?(@posts.to_a.first)
-  %tr.spacer
-    %td{"colspan"=>"2"}
-      %a{"name"=>"#{post.dom_id}", "id"=>"#{post.dom_id}"}  
-    
-%tr.post{"id"=>"posts-#{post.dom_id}-row"}
-  %td.author.vcard{:width => "15%"}
-    .date
-      %a{"href"=>"##{post.dom_id}", "rel"=>"bookmark"}
-        %abbr.updated{"title"=>"#{post.created_at.xmlschema}"}= time_ago_in_words(post.created_at)
+%tr
+  
+  %td{:id=>"post-body-#{post.id}"}
+    .editable
+      - if logged_in?
+        = link_to fa_icon("comment"), new_forum_topic_sb_post_path(post.topic.forum, post.topic), :class => 'reply-toggle'
+      = post.body.html_safe
+    .editor.hide
 
-    -if post.user
-      = avatar_for post.user    
-      %span.fn
-        = link_to truncate(h(post.username), :length => 15), user_path(post.user), :class => (post.topic.editable_by?(post.user) ? "admin" : nil)
-      %span.posts= pluralize post.user.sb_posts_count, :post.l
-    -else
-      = image_tag(configatron.photo.missing_thumb, :height => '32', :width => '32', :class => 'photo')        
-      %span.fn
-        =truncate(h(post.username), :length => 15)
-
-
-    - if logged_in? && post.editable_by?(current_user)
-      %p
-        %span.edit
-          = ajax_spinner_for "edit-post-#{post.id}", "spinner_bounce.gif"
-          = link_to_remote(:edit_post.l, {:url => edit_forum_topic_sb_post_path(@forum, @topic, post), :method => :get, :before => "EditForm.init(#{post.id});", :condition => "!EditForm.isEditing(#{post.id})" }, {:class => "utility"})
-        - if admin? && post.user && !post.user.admin?
-          %div{"class"=>"make-moderator-#{post.user_id}"}
-            = render :partial => '/moderators/toggle', :locals => {:user => post.user, :forum => @forum}
-
-  %td.body.entry-content{"id"=>"post-body-#{post.id}", :width => '85%'}
-    = link_to_function image_tag('clearbits/comment.gif', :class => 'icon reply'), "$('reply').toggle()" if logged_in?
-    = raw post.body
+  %td.col-sm-3{:style => 'border-left:0'}
+    %ul.list-unstyled
+      -if post.user
+        %li= link_to avatar_for(post.user), post.user    
+        %li= link_to truncate(h(post.username), :length => 15), user_path(post.user), :class => (post.topic.editable_by?(post.user) ? "admin" : nil)
+        %li
+          = :post.l.pluralize
+          %span.badge.badge-info
+            =post.user.sb_posts_count
+      -else
+        %li= image_tag(configatron.photo.missing_thumb, :class => 'thumbnail')        
+        %li= truncate(h(post.username), :length => 15)
+      %li
+        %a{"href"=>"##{post.dom_id}", "rel"=>"bookmark"}
+          %abbr.updated{"title"=>"#{post.created_at.xmlschema}"}= time_ago_in_words(post.created_at)
+  
+      - if logged_in? && post.editable_by?(current_user)
+        %li
+          = ajax_spinner_for "edit-post-#{post.id}"   
+          = link_to :edit_post.l, edit_forum_topic_sb_post_path(@forum, @topic, post), :class => 'edit-via-ajax', :id => "edit-post-#{post.id}"
+      - if admin? && post.user && !post.user.admin?
+        %li{"class"=>"make-moderator-#{post.user_id}"}
+          = render :partial => '/moderators/toggle', :locals => {:user => post.user, :forum => @forum}

data/app/views/sb_posts/create.js.erb

@@ -0,0 +1,30 @@
+<% if @post.new_record? %>
+  reply = $('.reply');
+  reply.prepend(escape_javascript("<%=raw escape_javascript(render 'shared/messages') %>");
+  message = reply.find('.alert')
+  message.scrollTo();
+<% else %>
+  reply = $('.reply');
+  posts_table = $('#posts');
+  posts_table.append("<%= escape_javascript(render :partial => 'sb_posts/sb_post', :locals => {:post => @post}) %>")
+
+  my_post = $('#post-body-<%= @post.id %>')
+  my_post.scrollTo();
+
+  $('#reply_spinner').addClass('hide');
+  editable = my_post.find('.editable');
+
+  editable.switchClass('','alert alert-info', 500,'easeOutCubic',function(){
+	 editable.switchClass('alert alert-info','normal', 3000,'easeInCubic');
+  });
+
+  tinyMCE.activeEditor.setContent('')
+
+  reply.addClass('hide');
+<% end %>
+
+<% if configatron.has_key?(:recaptcha_pub_key) %>
+	if($('dynamic_recaptcha')){
+		Recaptcha.create('#{configatron.recaptcha_pub_key}', $('dynamic_recaptcha') )
+	}
+<% end %>

data/app/views/sb_posts/destroy.js.erb

@@ -0,0 +1,2 @@
+post = $('#post-body-<%= @post.id %>');
+post.remove();

data/app/views/sb_posts/edit.html.erb

@@ -2,12 +2,12 @@
 
 <h2><%= link_to h(@post.topic.title), forum_topic_path(@post.forum_id, @post.topic) %></h2>
 
-<%= link_to(:delete_this_post.l, sb_post_path(:forum_id => @post.forum_id, :topic_id => @post.topic, :id => @post, :page => params[:page]), 
-      :class => "utility", :method => :delete, :confirm => :are_you_sure_you_want_to_delete_this_post.l) %>
+<%= link_to(:delete_this_post.l, sb_post_path(@post, :forum_id => @post.forum_id, :topic_id => @post.topic, :page => params[:page]),
+      :class => "utility", :method => :delete, data: { confirm: :are_you_sure_you_want_to_delete_this_post.l } ) %>
 
 <%= error_messages_for :topic %>
-<% form_for :post, :html => { :method => :put }, 
-     :url  => sb_post_path(:forum_id => params[:forum_id], :id => params[:topic_id], :id => @post, :page => params[:page]) do |f| -%>
+<% form_for :post, :html => { :method => :patch },
+     :url  => sb_post_path(@post, :forum_id => params[:forum_id], :id => params[:topic_id], :page => params[:page]) do |f| -%>
 <%= f.text_area :body, :class => "rich_text_editor" %>
 <%= submit_tag :save.l %> <%= :or.l %> <%= link_to :cancel.l, forum_topic_path(:forum_id => params[:forum_id], :id => params[:topic_id], :page => params[:page]) %>
 <% end -%>

data/app/views/sb_posts/edit.js.erb

@@ -0,0 +1,14 @@
+post = $('#post-body-<%= @post.id %>');
+editor = post.find('.editor');
+editable = post.find('.editable');
+
+editable.addClass('hide');
+editor.html("<%= escape_javascript(render :partial => 'sb_posts/edit', :locals => {:post => @post}) %>");
+
+<%= render 'shared/load_tinymce' %>
+
+post.scrollTo();
+
+$('#edit-post-<%= @post.id %>_spinner').addClass('hide');
+
+editor.toggleClass('hide');

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

@@ -1,12 +1,6 @@
 -@section = 'forums'
 - @page_title = search_posts_title
 
--box :class => "alt first_alt" do 
-  = link_to :forums.l, forum_home_path
-  %span.arrow
-    →
-  = h @page_title
-
 -box do 
 
   .right=link_to :forums.l, forums_path
@@ -17,12 +11,9 @@
       ="#{:searching_for.l} '#{h params[:q]}'"
 
   %p.subtitle
-    = feed_icon_tag @page_title, all_sb_posts_path(:format => 'rss')
-    = :post_found.l(:count => @posts.size)
+    =link_to fa_icon("rss"), all_sb_posts_path(:format => 'rss')
+    =:post_found.l(:count => @posts.size)
 
-  - if @posts.total_count > 1
-    .pagination= paginating_links @posts
-        
   %table.posts.wide{ :cellspacing => "0", :border => "0", :cellpadding => "0", :width => '100%'}
     - for post in @posts do
       - unless post == @posts.to_a.first
@@ -52,9 +43,5 @@
             = link_to h(post.topic_title), forum_topic_path(post.forum, post.topic)
           =raw post.body
         
-  - if @posts.total_count > 1
-    .pagination
-      = :pages.l
-      %strong
-        = paginating_links @posts
+  =paginate @posts, :theme => 'bootstrap'
 

data/app/views/sb_posts/monitored.html.erb

@@ -2,21 +2,17 @@
 
 <h4><%= link_to @user.display_name, user_path(@user) %>'<%= 's '+:monitored_topics.l %></h4>
 <ul class="flat">
-<% @user.monitored_topics.find(:all, :limit => 25).each do |topic| %>
+<% @user.monitored_topics.limit(25).each do |topic| %>
   <li><%= link_to topic.title, forum_topic_path(topic.forum_id, topic) %></li>
 <% end %>
 </ul>
 
 <h1><%= @page_title %></h1>
 <p class="subtitle">
-  <%= feed_icon_tag @page_title, monitored_all_sb_posts_path(:user_id => @user, :format => 'rss') %>
+  <%= link_to fa_icon("rss"), monitored_all_sb_posts_path(:user_id => @user, :format => 'rss') %>
   <%= :post_found.l(:count => @posts.size) %>
 </p>
 
-<% if @posts.total_count > 1 -%>
-<div class="pagination"><%= "#{:pages.l}:" %> <strong><%= paginating_links @posts %></strong></div>
-<% end -%>
-
 <table border="0" cellspacing="0" cellpadding="0" class="posts wide">
 <% for post in @posts do %>
 <% unless post == @posts.to_a.first %>
@@ -50,6 +46,4 @@
 <% end %>
 </table>
 
-<% if @posts.total_count > 1 -%>
-<div class="pagination"><%= :pages.l %> <strong><%= paginating_links @posts %></strong></div>
-<% end -%>
+<%= paginate @posts, :theme => 'bootstrap' %>

data/app/views/sb_posts/update.js.erb

@@ -0,0 +1,11 @@
+post = $('#post-body-<%= @post.id %>');
+editor = post.find('.editor');
+editable = post.find('.editable');
+
+editor.addClass('hide');
+editable.html("<%=raw escape_javascript(@post.body) %>");
+post.scrollTo();
+
+editable.switchClass('hide','alert alert-info', 500,'easeOutCubic',function(){
+	editable.switchClass('alert alert-info','normal', 3000,'easeInCubic');
+});

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

@@ -0,0 +1,28 @@
+-if logged_in?
+  - if !current_page?(users_path) && (params[:controller] == 'users' && !@user.nil? && @user == current_user)
+    - css_class = 'active'
+  - else 
+    - css_class = 'inactive'
+  %li{:class => 'dropdown ' + css_class}
+    %a.dropdown-toggle{:href=>dashboard_user_path(current_user), 'data-target'=> '#', 'data-toggle' => 'dropdown'}
+      =:logged_in.l + ' ' + current_user.login
+      %b.caret
+    %ul.dropdown-menu
+      -if current_user.admin?
+        %li= link_to :admin_dashboard.l, admin_dashboard_path
+        %li.divider
+      %li= link_to :edit_profile.l, edit_user_path(current_user)
+      %li= link_to :edit_account.l, edit_account_user_path(current_user)
+      %li= link_to :manage_posts.l, manage_user_posts_path(current_user)
+      %li= link_to :inbox.l, user_messages_path(current_user)
+      %li.divider
+      %li= link_to :my_profile.l, user_path(current_user)
+      %li= link_to :my_blog.l, user_posts_path(current_user)
+      %li= link_to :photo_manager.l, user_photo_manager_index_path(current_user)
+      %li= link_to :my_clippings.l, user_clippings_path(current_user)
+      %li= link_to :my_friends.l, accepted_user_friendships_path(current_user)
+      %li.divider
+      %li= link_to :log_out.l, logout_path
+-else
+  %li= link_to(:log_in.l, login_path)
+  %li= link_to(:sign_up.l, signup_path)

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

@@ -1,27 +1,22 @@
-.yui-b.sidebar=render :partial => 'shared/login_sidebar'
+-@page_title=:log_in_to_site.l(:site => configatron.community_name)
+=render :partial => 'shared/login_sidebar'
+-if configatron.auth_providers.to_hash.keys.any?      
+  -widget do
+    %ul.list-unstyled
+      %h4
+        .small= t 'sessions.new.omniauth.header'
+      -configatron.auth_providers.to_hash.keys.each do |provider|
+        -alt = t('sessions.new.omniauth.button_alt', :provider => provider)
+        %li= link_to(image_tag("auth/#{provider.to_s}_64.png", :alt => alt), "/auth/#{provider.to_s}", :title => alt)
 
-#yui-main
-  .yui-b.main_column
-    -box do
-      %h3
-        =:log_in_to_site.l(:site => configatron.community_name)
-      = form_tag sessions_path, :class => 'MainForm' do
-        %label{"for"=>"email"}=:email.l
-        = text_field_tag 'email', nil, :size => 35
-        %label{"for"=>"password"}=:password.l
-        = password_field_tag 'password', nil, :size => 35
-        %fieldset
-          %label{"for"=>"remember_me"}
-            =:remember_me.l
-            = check_box_tag 'remember_me'
-        %p
-          = submit_tag :log_in.l
-
-    -if configatron.auth_providers.to_hash.keys.any?
-      -box :class => "alt" do
-        %h3= t 'sessions.new.omniauth.header'
-        -configatron.auth_providers.to_hash.keys.each do |provider|
-          -alt = t('sessions.new.omniauth.button_alt', :provider => provider.to_s.capitalize)
-          = link_to(image_tag("auth/#{provider.to_s}_64.png", :alt => alt), "/auth/#{provider.to_s}", :title => alt)
+%h3
+= bootstrap_form_tag :url => sessions_path, :layout => :horizontal do |f|
+  = f.email_field :email, value: params[:email]
+  = f.password_field :password
 
+  = f.form_group :remember_group do
+    = f.check_box :check_box do
+      =:remember_me.l
 
+  =f.form_group :submit_group do
+    = f.primary :log_in.l

data/app/views/shared/_add_friend_link.html.haml

@@ -0,0 +1,9 @@
+= button_to :request_friendship.l, user_friendships_url(:user_id => current_user.id, :friend_id => user.id), :class => "btn btn-primary btn-xs", :id => "friend_request_#{user.id}", :remote => true
+= ajax_spinner_for "friend_request_#{user.id}"
+
+- content_for :end_javascript do
+  :javascript
+    $("#friend_request_#{user.id}").on('click', function() {
+      $('#'+ $(this).attr('id') + '_spinner').removeClass('hide');
+      $(this).attr("value", "Sending request ...");
+    });

data/app/views/shared/_admin_nav.html.haml

@@ -1,19 +1,17 @@
--box do
+-widget do
   %h3=:admin.l
-
-  %ul.list
+  %ul.list-unstyled
     %li= link_to_unless_current :features.l, homepage_features_path
     %li= link_to_unless_current :categories.l, categories_path
     %li= link_to_unless_current :metro_areas.l, metro_areas_path
     %li= link_to_unless_current :events.l, admin_events_path
     %li= link_to_unless_current :statistics.l, statistics_path
-    %li= link_to_unless_current :ads.l, ads_path 
-    %li= link_to_unless_current :comments.l, admin_comments_path 
+    %li= link_to_unless_current :ads.l, ads_path
+    %li= link_to_unless_current :comments.l, admin_comments_path
     %li= link_to_unless_current :tags.l, admin_tags_path
     %li= link_to_unless_current :admin_pages.l, admin_pages_path
+    %li= link_to_unless_current :users.l, admin_users_path
     - if @admin_nav_links.any?
       - @admin_nav_links.each do |link|
         %li=link_to link[:name], link[:url]
-    
-    
-    %li= link_to :cache_clear_link.l, admin_clear_cache_path, :confirm => :are_you_sure.l
+    %li= link_to :cache_clear_link.l, admin_clear_cache_path, data: { confirm: :are_you_sure.l }

data/app/views/shared/_contact.html.haml

@@ -1,4 +1,4 @@
--box :class => "alt" do 
+-widget do 
   %h3=:need_to_contact_us.l
   %p
     =:dont_wait_its.l

data/app/views/shared/_end_javascript.html.haml

@@ -1,8 +1,8 @@
 = javascript_include_tag 'community_engine'
 = tiny_mce_init_if_needed
-- if forum_page?
-  = javascript_include_tag 'forum'
 
--if show_footer_content?        
+-if show_footer_content?
   :javascript
-    #{remote_function(:update => "footer_content", :method => :get, :url =>  footer_content_url )}
+    $(function() {
+      $('#footer-content').updateFromUrl("#{footer_content_path}")
+    });

data/app/views/shared/_explore.html.haml

@@ -1,9 +1,10 @@
--box do
-  %h3 Explore
-  %ul.list.checks
-    - Category.find(:all).each do |c|
+-widget do
+  %h4
+    .small Explore
+  %ul.list-unstyled
+    - Category.all.each do |c|
       %li= link_to c.name, category_path(c)
     %li= link_to :whats_popular.l, popular_url, {:class => 'popular'}
-    - Page.find(:all).each do |page|
+    - Page.all.each do |page|
       - if (logged_in? || page.page_public)
-        %li= link_to page.title, pages_path(page)
+        %li= link_to page.title, pages_path(page)