community_engine 2.3.2 → 3.0.0

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

@@ -1,13 +1,15 @@
-.yui-u.first
-  -box :class => "fresh" do 
-    %h3=:whats_fresh.l
+.col-sm-9
+  %hr
+  %h2=:whats_fresh.l
+  %table{:width => '100%'}
     - @recent_activity.each do |activity|
       =render :partial => "activities/activity", :locals => {:activity => activity }
-    %h6.all= link_to :see_all_activity.l, activities_path
+  =link_to fa_icon('plus-circle', :text => :see_all_activity.l), activities_path
 
-.yui-u
-  -box do 
-    %h3=:tags.l
-    - tag_cloud @popular_tags, %w(nube1 nube2 nube3 nube4 nube5) do |tag, css_class|
-      = link_to tag.name, tag_path(tag.to_param), :class => css_class
-    %h6.all=link_to :all_tags.l, tags_path
+.col-sm-3
+  %hr
+  %h2=:tags.l
+  - tag_cloud @popular_tags, %w(css1 css2 css3 css4 css5) do |tag, css_class|
+    = link_to tag.name, tag_path(tag.to_param), :class => css_class
+  %p
+    =link_to fa_icon('plus-circle', :text => :all_tags.l), tags_path

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

@@ -0,0 +1,18 @@
+%ul.nav.nav-pills
+  %li{:class => current_page?(home_url) ? 'active' : 'inactive'}
+    %a{:href=>home_url, :title=>"#{configatron.community_name} " + :home.l}= :home.l
+  - if !logged_in?
+    %li{:class => current_page?(login_path) ? 'active' : 'inactive'}
+      = link_to :log_in.l, login_path
+  - else
+    %li{:class => current_page?(logout_path) ? 'active' : 'inactive'}
+      %a{:href=>logout_path, :title=>:log_out_of_your.l + " #{configatron.community_name} " + :account.l}
+        =:log_out.l
+
+  - Page.all.each do |page|
+    - if (logged_in? || page.page_public)
+      %li{:class => current_page?(pages_path(page)) ? 'active' : 'inactive'}
+        = link_to page.title, pages_path(page)
+
+  - if @rss_title && @rss_url
+    %li#rss= link_to :rss.l, @rss_url, {:title => @rss_title}

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

@@ -0,0 +1,25 @@
+%span.friend_request{:id => "friend_request_#{user.id}"}
+  = link_to :request_friendship.l, user_friendship_path(current_user, user), :data => { :userid => user.id }, :class => "add_friend_button friendship_link", :remote => true, :method => :post
+  %span.spinner{:style => "display:none"}
+    = image_tag('spinner.gif')
+    = "#{:request_friendship.l} ..."
+-content_for :end_javascript do
+  :javascript
+    // This should be moved to someplae more generic
+    $$(".friendship_link").each(function (link) {
+      link.observe("ajax:loading", function () {
+        var id = link.readAttribute('data-userid');
+        $$('span#friend_request_' + id + ' span.spinner')[0].show();
+        $$('span#friend_request_' + id + ' a.add_friend_button')[0].hide();
+      });
+      link.observe("ajax:complete", function () {
+        var id = link.readAttribute('data-userid');
+        new Effect.Highlight(link, 1);
+      });
+      link.observe("ajax:failure", function () {
+        alert('#{escape_javascript(:sorry_there_was_an_error_requesting_friendship.l)}')
+      });
+      link.observe("ajax:success", function (data) {
+        link.innerHTML = data;
+      });
+    });

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

@@ -1,42 +1,22 @@
-#hd
-  %h1
-    %a{:href=>home_url, :title=>"#{configatron.community_name}"}= configatron.community_name
-  - if logged_in?
-    = render :partial => 'shared/user_menu'
-    - if current_user.unread_messages?
-      %h2#newmail
-        = link_to :unread_messages.l(:count => current_user.unread_message_count), user_messages_path(current_user)
-  - else
-    %h2
-      =:welcome_message.l(:login_link => link_to(:log_in.l, login_path), :signup_link => link_to(:sign_up.l, signup_path))
-    
-  #NavBar
-    %ul
-      - Category.find(:all).each do |c|
-        = topnav_tab c.name, {:url => category_path(c), :section => [c.name]}
-      = topnav_tab :forums.l, { :url => forums_path, :section => ['forums'] }
-      = topnav_tab :popular.l, { :url => popular_path, :section => ['popular'] }
-      = topnav_tab :people.l, { :url => users_path, :section => ['users'] }
-      - if current_user 
-        = topnav_tab :my_profile.l, { :url => user_path(current_user), :section => ['my_profile']}   
-      - if @header_tabs.any?
-        - @header_tabs.each do |tab|
-          = topnav_tab tab[:name], {:url => tab[:url], :section => [tab[:section]] } 
-      
-    / SiteSearch Google 
-    %form{:method=>"get", :action=>"http://www.google.com/custom", :target=>"_top"}
-      %input{ :type=>"hidden", :name=>"domains", :value=>"#{home_url}"}
-      %label{ :for=>"search",  :style=>"display: none"}
-        = :search.l+" #{configatron.community_name}"
-      %input{ :type=>"text",:name=>"q", :size=>"17", :maxlength=>"255", :id=>"search"}
-      %input{ :type=>"hidden", :name=>"sitesearch", :value=>"#{home_url}", :id=>"ss1"}
-      %input{ :type=>"hidden", :name=>"client", :value=>"pub-9113954708528841"}
-      %input{ :type=>"hidden", :name=>"forid", :value=>"1"}
-      %input{ :type=>"hidden", :name=>"channel", :value=>"1842224655"}
-      %input{ :type=>"hidden", :name=>"ie", :value=>"ISO-8859-1"}
-      %input{ :type=>"hidden", :name=>"oe", :value=>"ISO-8859-1"}
-      %input{ :type=>"hidden", :name=>"cof", :value=>"GALT:#008000;GL:1;DIV:#FFFFFF;VLC:663399;AH:center;BGC:FFFFFF;LBGC:FFFFFF;ALC:0066CC;LC:0066CC;T:000000;GFNT:0000FF;GIMP:0000FF;LH:50;LW:90;S:http://#{home_url};FORID:1"}
-      %input{ :type=>"hidden", :name=>"hl", :value=>"en"}
-      
-  / NavBar 
-/ header
+-# .navbar-toggle is used as the toggle for when the responsive design gets narrow and the navbar goes away
+.navbar-header
+  %button.navbar-toggle{"data-target" => ".navbar-collapse", "data-toggle" => "collapse", type: "button"}
+    %span.sr-only Toggle navigation
+    %span.icon-bar
+    %span.icon-bar
+    %span.icon-bar
+  = link_to configatron.community_name, home_path, :class => 'navbar-brand'
+.navbar-collapse.collapse
+  %ul.nav.navbar-nav
+    = render 'categories/menu_item'
+    = render 'clippings/menu_item'
+    = render 'events/menu_item'
+    = render 'forums/menu_item'
+    = render 'posts/menu_item'
+    = render 'users/menu_item'
+    - if @header_tabs.any?
+      - for tab in @header_tabs
+        %li= link_to tab.name, tab.url
+  %ul.nav.navbar-nav.pull-right
+    = render 'messages/menu_item'
+    = render 'sessions/menu_item'

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

@@ -0,0 +1,3 @@
+.box{html_options}
+  %div{:class => "jumbotron #{html_options[:content_class]}"}
+    =body

data/app/views/shared/_load_tinymce.js.erb

@@ -0,0 +1,15 @@
+// Because the dom is loaded already we have to set up the tinymce config.
+$(".rich_text_editor").each(function(){
+    var options = <%= @tiny_mce_configuration.to_json.html_safe %>;
+    $this = $(this);
+    
+    // fix tinymce bug with html5 and required fields
+    if($this.is("[required]")){
+        options.oninit = function(editor){
+            $this.closest("form").find(":submit").on("click", function(){
+              editor.save();
+            });
+        }
+    }
+    $this.tinymce(options);
+ });

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

@@ -1,31 +1,40 @@
 #location_chooser
   %label= :country.l
-  = select_tag(:country_id, options_from_collection_for_select(Country.find_countries_with_metros, "id", "name", selected_country), {:include_blank => true})
+  = select_tag(:country_id, options_from_collection_for_select(Country.find_countries_with_metros, "id", "name", selected_country), {:include_blank => true, :class => "form-control"})
 
   %br
-  %label= :state.l 
-  = select_tag(:state_id, options_from_collection_for_select(states, "id", "name", (selected_state rescue nil)), {:disabled => states.empty? })
+  %label= :state.l
+  = select_tag(:state_id, options_from_collection_for_select(states, "id", "name", (selected_state rescue nil)), {:disabled => states.empty?, :class => "form-control" })
 
-  = image_tag 'spinner.gif', :style => 'display:none;'
+  = ajax_spinner_for 'location_chooser'
 
   %br
   %label= :metro_area.l
-  = select_tag(:metro_area_id, options_from_collection_for_select(metro_areas, "id", "name", (selected_metro_area rescue nil)), {:disabled => metro_areas.empty? })
+  = select_tag(:metro_area_id, options_from_collection_for_select(metro_areas, "id", "name", (selected_metro_area rescue nil)), {:disabled => metro_areas.empty?, :class => "form-control" })
 
-  = image_tag 'spinner.gif', :style => 'display:none;'
-
-%span
+  = ajax_spinner_for 'location_chooser'
 
 - js ||= nil
 - if js
-  = observe_field("state_id", {:url => {:controller => 'users', :action => 'metro_area_update'}, :with => "'state_id=' + $('state_id').value + '&country_id=' + $('country_id').value", :loading => "$$('div#location_chooser img')[0].show();", 500 => "alert('"+:sorry_there_was_an_error.l+"'); return false", :update => "location_chooser"})
-  = observe_field("country_id", {:url => {:controller => 'users', :action => 'metro_area_update'}, :with => "country_id", :loading => "$$('div#location_chooser img')[0].show();", 500 => "alert('"+:sorry_there_was_an_error.l+"'); return false", :update => "location_chooser"})
+  :javascript
+    function refreshLocationChooser(html) {
+      $('#location_chooser').html(html);
+      $('#location_chooser img').addClass('hide');
+    }
+    $(document).on('change', '#country_id', function(){
+      $('#location_chooser img').removeClass('hide');
+      $.post('#{users_metro_area_update_path}?country_id=' + $('#country_id').val(), {}, refreshLocationChooser);
+    });
+    $(document).on('change', '#state_id', function(){
+      $('#location_chooser img').removeClass('hide');
+      $.post('#{users_metro_area_update_path}?country_id=' + $('#country_id').val() + '&state_id=' + $('#state_id').val(), {}, refreshLocationChooser);
+    });
 - else
   -content_for :end_javascript do
-    = observe_field("state_id", {:url => {:controller => 'users', :action => 'metro_area_update'}, :with => "'state_id=' + $('state_id').value + '&country_id=' + $('country_id').value", :loading => "$$('div#location_chooser img')[0].show();", 500 => "alert('"+:sorry_there_was_an_error.l+"'); return false", :update => "location_chooser"})
-    = observe_field("country_id", {:url => {:controller => 'users', :action => 'metro_area_update'}, :with => "country_id", :loading => "$$('div#location_chooser img')[0].show();", 500 => "alert('"+:sorry_there_was_an_error.l+"'); return false", :update => "location_chooser"})
-  
-
-
-
-
+    :javascript
+      $(document).on('change', '#country_id', function(){
+        updateElementFromPost($('#location_chooser'), '#{users_metro_area_update_path}?country_id=' + $('#country_id').val());
+      });
+      $(document).on('change', '#state_id', function(){
+        updateElementFromPost($('#location_chooser'), '#{users_metro_area_update_path}?country_id=' + $('#country_id').val() + '&state_id=' + $('#state_id').val());
+      });

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

@@ -1,14 +1,15 @@
--box do
-  %h3=:help.l
+-widget do
+  %h4
+    .small=:help.l
   %p
     =:dont_have_an_account.l
-    %br/
+    %br
     = link_to :click_here_to_sign_up.l, "/signup"
   %p
     =:forgot_your_password.l
-    %br/
+    %br
     = link_to :click_here_to_retrieve_it.l, forgot_password_url
   %p
     =:forgot_your_username.l
-    %br/
+    %br
     = link_to :click_here_to_retrieve_it.l, forgot_username_url

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

@@ -1,8 +1,6 @@
-- %w(info notice error).each do |type|
-  - if flash[type.to_sym]
-    .warning.flash_message{:class => "#{type.to_s}"}
-      %span= h(flash[type.to_sym])
-      %small
-        %a{:href=>"#", :onclick=>"$$('div.flash_message')[0].hide();return false"}=:close_this_message.l
-      
-      
+-[:notice, :error, :alert].each do |level|
+  -unless flash[level].blank?
+    %div{:class => 'alert alert-dismissible ' + flash_class(level), :role => 'alert'}
+      %button.close{:type => 'button', 'data-dismiss' => 'alert', 'aria-hidden' => 'true'}
+        ×
+      =content_tag :p, flash[level]

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

@@ -1,9 +1,8 @@
 = stylesheet_link_tag 'community_engine'
 
 - if forum_page?
-  = stylesheet_link_tag 'forum'
   - unless @feed_icons.blank?
     - @feed_icons.each do |feed|
       = auto_discovery_link_tag :rss, feed[:url], :title => "Subscribe to '#{feed[:title]}'"
 
-= yield :head_css
+= yield :head_css

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

@@ -0,0 +1 @@
+= render_widgets

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

@@ -0,0 +1,19 @@
+-content_for :head_css do
+  =stylesheet_link_tag 'tag-it/tag-it'
+  =stylesheet_link_tag 'tag-it/tagit.ui-zendesk'
+
+-content_for :end_javascript do
+  =javascript_include_tag 'tag-it/tag-it'
+  :javascript
+    $.ajax({
+      type: '#{options[:method] || 'get'}',
+      url: '#{url_for options[:url]}',
+      success: function(data){
+        $('##{id}').tagit({
+          availableTags: data,
+          allowSpaces: true,
+          tagLimit: '#{options[:tagLimit]}',
+          stopWritingOnTagLimit: true
+        });
+      }
+    });

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

@@ -0,0 +1,3 @@
+.box{html_options}
+  %div{:class => "well #{html_options[:content_class]}"}
+    =body

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

@@ -1,21 +1,16 @@
-.col_full.sitemap
-  -box do
-    %h2= "#{configatron.community_name} Sitemap"
-    
-    .yui-g
-      .yui-g.first
-        %h3 Categories
-        %ul
-          - @categories.each do |c|
-            %li= link_to c.name, category_path(c)      
-      .yui-g
-        %h3= :pages.l
-        %ul
-          %li=link_to :home.l, '/'
-          %li= link_to t('sitemaps.index.users'), users_path
-          - Page.find(:all).each do |page|
-            - if (logged_in? || page.page_public)
-              %li= link_to page.title, pages_path(page)
-          %li=link_to :log_in.l, '/login'
-          
+-@page_title= "#{configatron.community_name} Sitemap"
+-box do
+  %h2 Categories
+  %ul
+    - @categories.each do |c|
+      %li= link_to c.name, category_path(c)
+  %h2= :pages.l
+  %ul
+    %li=link_to :home.l, '/'
+    %li= link_to t('sitemaps.index.users'), users_path
+    - Page.all.each do |page|
+      - if (logged_in? || page.page_public)
+        %li= link_to page.title, pages_path(page)
+    %li=link_to :log_in.l, '/login'
+
 

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

@@ -1,38 +1,33 @@
-.yui-b.sidebar= render :partial => 'shared/admin_nav'
-
-#yui-main
-  -box :class => "yui-b main_column" do
-    %h3= :statistics.l
-
-    %h3
-      = :total_users.l+":"
-      = @total_users
-
-    %h3
-      = :unactivated_users.l+":"
-      = @unactivated_users
-    %h3
-      = :new_today.l+":"
-      = @today_new_users.size
+= render :partial => 'shared/admin_nav'
+-@page_title = :statistics.l
+%dl.dl-horizontal
+  %dt= :total_users.l
+  %dd= @total_users
+  %dt= :unactivated_users.l
+  %dd= @unactivated_users
+  %dt= :new_today.l
+  %dd
+    = @today_new_users.size
     %ul
       - @today_new_users.each do |user|
         %li= link_to user.login, user_path(user)
 
-    %h3
-      = :new_yesterday.l+":"
-      = @yesterday_new_users.size
+  %dt= :new_yesterday.l
+  %dd
+    = @yesterday_new_users.size
     %ul
-      - @yesterday_new_users.each do |user|
-        %li= link_to user.login, user_path(user)
+    - @yesterday_new_users.each do |user|
+      %li= link_to user.login, user_path(user)
 
-    %h3
-      = :active.l+":"
-      = pluralize @active_users_count, :user.l
-      (
-      = number_to_percentage((@active_users_count/@total_users.to_f)*100, :precision => 1)
-      =", 1 "+:month.l+")"
-    %h3
-      = :most_active_1_month.l
+  %dt= :active.l
+  %dd
+    = pluralize @active_users_count, :user.l
+    (
+    = number_to_percentage((@active_users_count/@total_users.to_f)*100, :precision => 1)
+    =", 1 "+:month.l+")"
+  %dt= :most_active_1_month.l
+  %dd
+    ='Users'
     %ul
       - @active_users.each do |user|
         %li
@@ -40,17 +35,14 @@
           \(
           = user.activities_count
           \)
-
-    %h3
-      \% Reporting ZIP:
-      = number_to_percentage @percent_reporting_zip, :precision => 1
-    %h3
-      =:male.l+":"
-      = number_to_percentage @percent_male
-      =", "+:female.l+":"
-      = number_to_percentage @percent_female
-    %h3
-      = :featured_writer.l
+  %dt='Reporting ZIP'
+  %dd= number_to_percentage @percent_reporting_zip, :precision => 1
+  %dt=:male.l
+  %dd= number_to_percentage @percent_male
+  %dt=:female.l
+  %dd= number_to_percentage @percent_female
+  %dt= :featured_writer.l
+  %dd
     %ul
       - @featured_writers.each do |w|
         %li= link_to w.login, statistics_user_path(w)

data/app/views/tags/edit.html.haml

@@ -1,19 +1,12 @@
-.yui-b.sidebar
-  = render :partial => 'shared/admin_nav'
-
-#yui-main
-  -box :class => "yui-b" do
-    %h3=:editing_tag.l
-    = form_for(:tag, :url => tag_path(@tag), :html => { :method => :put, :class => "MainForm" }) do |f|
-
-      %label
-        =:name.l
-        \:
-      = f.text_field :name
-
-      %p
-        = submit_tag :update.l
-
-    = link_to :show.l, tag_path(@tag)
-    |
-    = link_to :back.l, admin_tags_path(:action=>:manage)
+-@page_title=:editing_tag.l
+= render :partial => 'shared/admin_nav'
+
+%p
+  =link_to :back.l, admin_tags_path, :class => 'btn btn-default'
+  =link_to :show.l, tag_path(@tag), :class => 'btn btn-primary'
+  =link_to :delete.l, tag_path(@tag), :method => 'delete', data: { confirm: :are_you_sure.l }, :class => 'btn btn-danger'
+
+= bootstrap_form_for :tag, :url => tag_path(@tag), :layout => :horizontal, :html => {:method => 'put'} do |f|
+  = f.text_field :name
+  = f.form_group :submit_group do
+    = f.primary :update.l