community_engine 2.3.2 → 3.0.0

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

@@ -1,27 +1,18 @@
-.yui-b
-  -box do 
-    %h3= :what_are_tags.l
-    %p
-      %strong= :tags_are_one_word_descriptors_users_assign_to_blog_posts_pictures_and_clippings_on.l+" #{configatron.community_name}."
-    %p
-      %strong= :bigger_font_size_more_popular_tag.l
-      
-  -box :class => "alt" do 
-    %h3= :search.l
-    %form.MainForm{"action"=>"/search/tags/", "method"=>"get"}
-      %label= :tag_name.l+":"
-      = text_field_tag 'id', params[:id], :autocomplete => "off"
-      #id_auto_complete.auto_complete{"class"=>"auto_complete", "id"=>"id_auto_complete"}
-      -content_for :end_javascript do
-        = auto_complete_field 'id', {:url => { :controller => "tags", :action => 'auto_complete_for_tag_name'}, :tokens => [','] }
-        
-      %p
-        %input{"type"=>"submit", "value"=>:go.l}
+-@page_title= :browse_content_by_tags.l
 
+-widget do 
+  %h3= :what_are_tags.l
+  %p= :tags_are_one_word_descriptors_users_assign_to_blog_posts_pictures_and_clippings_on.l+" #{configatron.community_name}."
+  %p= :bigger_font_size_more_popular_tag.l
+    
+-widget do 
+  %h3= :search.l
+  =bootstrap_form_tag :url => search_tags_path, :method => 'get', :class => 'form' do
+    .form-group
+      = text_field_tag 'id', params[:id], :autocomplete => "off", :placeholder => 'search tags'
+    -content_for :end_javascript do
+      = tag_auto_complete_field 'id', {:url => { :controller => "tags", :action => 'auto_complete_for_tag_name'}, :tokens => [','] }
+    = submit_tag :go.l, :class => 'btn btn-primary'
 
-#yui-main
-  .yui-b
-    -box do
-      %h3= :browse_content_by_tags.l
-      -tag_cloud @tags, %w(css1 css2 css3 css4) do |tag, css_class|
-        =link_to tag.name, tag_url(tag.to_param), :class => css_class
+-tag_cloud @tags, %w(css1 css2 css3 css4 css5) do |tag, css_class|
+  =link_to tag.name, tag_url(tag.to_param), :class => css_class

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

@@ -1,39 +1,30 @@
-.yui-b.sidebar
-  = render :partial => 'shared/admin_nav'
-  
-  -box do
-    %h3=:search.l
-    = form_for @search, :url => tags_path, :html => {:class => "MainForm"} do |f|
+-@page_title=:tags.l
+= render :partial => 'shared/admin_nav'
 
-      %label= :name.l
-      = f.text_field :name_starts_with
+-box do
+  %h3=:search.l
+  = bootstrap_form_for @search, :url => admin_tags_path, :layout => :horizontal do |f|
+    = f.text_field :name_start, :label => :name.l
 
-      %p= f.submit :search.l
-  
-#yui-main
-  .yui-b
-    -box do 
-      %h3=:tags.l
+    = f.form_group :submit_group do
+      = f.primary :search.l
 
-      %table{:width=>"100%"}
-        %tr 
-          %th
-            =sort_link @search, :name, :name.l            
-          %th 
-            =sort_link @search, :taggings_count, :taggings.l
-          %th=:actions.l
+%table.table.table-bordered.table-striped
+  %tr
+    %th
+      =sort_link @search, :name, :name.l
+    %th
+      =sort_link @search, :taggings_count, :taggings.l
+    %th=:actions.l
 
-        - for tag in @tags
-          %tr
-            %td= tag.name
-            %td= tag.taggings.size	
-            %td
-              = link_to :show.l, tag_path(tag)
-              | 
-              = link_to :edit.l, edit_tag_path(tag)
-              |
-              = link_to :destroy.l, tag_path(tag), :confirm => :are_you_sure.l, :method => :delete
-              
+  - for tag in @tags
+    %tr
+      %td= tag.name
+      %td= tag.taggings.count
+      %td
+        = link_to :show.l, tag_path(tag), :class => 'btn btn-default'
+        = link_to :edit.l, edit_tag_path(tag), :class => 'btn btn-warning'
+        = link_to :destroy.l, tag_path(tag), data: { confirm: :are_you_sure.l }, :method => :delete, :class => 'btn btn-danger'
 
-    .pagination=paginate @tags if @tags.total_count > 1
+=paginate @tags, :theme => 'bootstrap'
 

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

@@ -1,65 +1,59 @@
-.yui-b.sidebar
-  .yui-u
-    -box :class => "alt first_alt" do 
-      %h3
-        - if params[:type]
-          = (params[:type].downcase.pluralize + '_tagged').l
-        - else
-          = :items_tagged.l
-        - @tags.each do |tag|
-          = link_to h(tag.name), tag_path(tag)
+-widget do
+  %h4
+    .small
+      - if params[:type]
+        = (params[:type].downcase.pluralize + '_tagged').l
+      - else
+        = :items_tagged.l
+  %ul.list-unstyled
+    - @tags.each do |tag|
+      %li= link_to h(tag.name), tag_path(tag)
        
-    -if @related_tags.to_a.size > 0
-      -box do 
-        %h3.tags=:related_tags.l
-        -tag_cloud @related_tags, %w(css1 css2 css3 css4) do |tag, css_class|
-          =link_to h(tag.name), tag_path(tag), :class => css_class
-      
-        %h6.all= link_to :all_tags.l, tags_path
-      
-    = Ad.display(:new_sidebar_3, logged_in?) #REDESIGN-FIX      
+-if @related_tags.to_a.size > 0
+  -widget do
+    %h3=:related_tags.l
+    -tag_cloud @related_tags, %w(css1 css2 css3 css4 css5) do |tag, css_class|
+      =link_to h(tag.name), tag_path(tag), :class => css_class
+    %p
+      = link_to fa_icon('plus-circle', :text => :all_tags.l), tags_path
 
-#yui-main
-  .yui-b
-    - if @posts.any?
-      -unless params[:type]
-        #posts        
-          %h3=:posts.l
-          %ul.list.page
-            - @posts.each do |post|
-              %li
-                = link_to( truncate(post.display_title, :length => 75), user_post_path(post.user, post), :title => :by.l(:login => post.user.login) )
-                %p.post_excerpt= truncate_words(post.post, 35, '...' )
-          %h6.all= link_to :all_posts_tagged.l(:tag_name => @tags_raw), show_tag_type_path(:id => @tags_raw, :type => 'Post') unless params[:type]
-      -else 
-        -box :class => 'first_alt hfeed' do
-          = render :partial => 'posts/post', :collection => @posts      
-          - if @pages
-            = paginate @pages
-          
+.clearfix    
+  - if @posts.any?
+    -unless params[:type]    
+      %h2=:posts.l
+      %ul
+        - @posts.each do |post|
+          %li
+            = link_to( truncate(post.display_title, :length => 75), user_post_path(post.user, post), :title => :by.l(:login => post.user.login) )
+            %p.post_excerpt= truncate_words(post.post, 35, '...' )
+      = link_to fa_icon('plus-circle', :text => :all_posts_tagged.l(:tag_name => @tags_raw)), show_tag_type_path(:id => @tags_raw, :type => 'Post') unless params[:type]
+    -else
+      = render :partial => 'posts/post', :collection => @posts
+      = paginate @posts, :theme => 'bootstrap'
 
-    - if @photos.any?
-      %br.clear
-      %h3=:photos.l(:count => @photos.size)
+.clearfix
+  - if @photos.any?
+    %h2=:photos.l(:count => @photos.size)
+    %ul.list-unstyled.thumbnails
       - @photos.each do |photo|
-        = link_to image_tag(photo.photo.url(:thumb), :title => "#{photo.description} ("+:uploaded_by.l+" #{photo.user.login})", :class => "polaroid"), user_photo_path(photo.user, photo)
-      %h6.all= link_to :all_photos_tagged.l(:tag_name => @tags_raw), show_tag_type_path(:id => @tags_raw, :type => 'Photo') unless params[:type]
-      
-    - if @users.any?
-      .user
-        %h3= t('tags.show.users')
-        - @users.each do |user|
-          = link_to image_tag(user.avatar_photo_url(:thumb), :class => "polaroid"), user_path(user), :title => user.login
-        %h6.all= link_to :all_users_tagged.l(:tag_name => @tags_raw), show_tag_type_path(:id => @tags_raw, :type => 'User') unless params[:type]
+        %li.col-sm-3= link_to image_tag(photo.photo.url(:medium), :title => "#{photo.description} ("+:uploaded_by.l+" #{photo.user.login})"), user_photo_path(photo.user, photo), :class => "thumbnail"
+    = link_to fa_icon('plus-circle', :text => :all_photos_tagged.l(:tag_name => @tags_raw)), show_tag_type_path(:id => @tags_raw, :type => 'Photo') unless params[:type]
 
+.clearfix
+  - if @users.any?
+    %h2= t('tags.show.users')
+    %ul.list-unstyled.thumbnails
+      - @users.each do |user|
+        %li.col-sm-3= link_to image_tag(user.avatar_photo_url(:medium)), user_path(user), :title => user.login, :class => "thumbnail"
+    = link_to fa_icon('plus-circle', :text => :all_users_tagged.l(:tag_name => @tags_raw)), show_tag_type_path(:id => @tags_raw, :type => 'User') unless params[:type]
 
-    - unless @clippings.empty?
-      .blog
-        %h3= :clippings.l
-        - @clippings.each do |clipping|
-          %a{"href"=>"#{h user_clipping_url(clipping.user, clipping) }"}
-            %img.polaroid.clipping{"src"=>"#{h clipping.image_uri}", "style"=>"width:108px"}
-        %h6.all= link_to :all_clippings_tagged.l(:tag_name => @tags_raw), show_tag_type_path(:id => @tags_raw, :type => 'Clipping') unless params[:type]
+.clearfix
+  - unless @clippings.empty?
+    %h2= :clippings.l
+    %ul.list-unstyled.thumbnails
+      - @clippings.each do |clipping|
+        %li.col-sm-3=render :partial => 'clippings/clipping', :locals => {:clipping => clipping}
+    = link_to fa_icon('plus-circle', :text => :all_clippings_tagged.l(:tag_name => @tags_raw)), show_tag_type_path(:id => @tags_raw, :type => 'Clipping') unless params[:type]
 
-    - if @pages && !params[:type].eql?('Post')
-      = paginate @pages
+- if @pages && !params[:type].eql?('Post')
+  = paginate @pages, :theme => 'bootstrap'

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

@@ -1,30 +1,28 @@
-%label{"for"=>"topic_title"}= :title.l
-= form.text_field :title, :class => "primary"
+-if @topic.new_record?
+  -url = forum_topics_path(@forum)
+  -object = @topic
+-else
+  -url = forum_topic_path(@forum, @topic)
+  -object = [@forum, @topic]
 
-- if admin? or current_user.moderator_of?(@topic.forum)
-  %fieldset
-    %label
-      = form.check_box :sticky
-      = :sticky.l
-    %label
-      = form.check_box :locked
-      = :locked.l
+= bootstrap_form_for object, :url => url, :layout => :horizontal do |f|
+  = f.text_field :title
 
-%label
-  = :tags.l
-  %em="(#{:optional_keywords_describing_this_topic_separated_by_commas.l})"
-= text_field_tag 'tag_list', @topic.tag_list.to_s, {:autocomplete => "off", :size => 35}
-#tag_list_auto_complete.auto_complete
+  - if admin? or current_user.moderator_of?(@topic.forum)
+    = f.form_group :options_group do
+      = f.check_box :sticky
+      = f.check_box :locked
+  = f.text_field :tag_list, :autocomplete => "off", :label => :tags.l, :help => :optional_keywords_describing_this_topic_separated_by_commas.l
 
--content_for :end_javascript do
-  = auto_complete_field 'tag_list', {:url => { :controller => "tags", :action => 'auto_complete_for_tag_name'}, :tokens => [','] }
+  -content_for :end_javascript do
+    = tag_auto_complete_field 'topic_tag_list', {:url => { :controller => "tags", :action => 'auto_complete_for_tag_name'}, :tokens => [','] }
+
+  - if @topic.new_record?
+    = f.fields_for :sb_posts do |x|
+      = x.text_area :body, :rows => 12, :class => 'rich_text_editor', :label => :body_text.l, :required => false
 
-- if @topic.new_record?
-  %label{"for"=>"topic_body"}= :body_text.l
-  = form.fields_for :sb_posts do |x|
-    = x.text_area :body, :rows => 12, :class => 'rich_text_editor'
-  
   - if admin? and not @topic.new_record?
-    %p#topic_forum_id
-      %label{"for"=>"topic_forum_id"}= :forum.l
-      = form.select :forum_id, Forum.find(:all, :order => "position").map {|x| [x.name, x.id] }
+    = f.select :forum_id, Forum.order("position ASC").map {|x| [x.name, x.id] }, :label => :forum.l
+
+  = f.form_group :submit_group do
+    = f.primary :save.l

data/app/views/topics/_recent_topics_sidebar.haml

@@ -10,7 +10,7 @@
     -@topics.each do |topic|
       %tr
         %td
-          =link_to truncate(strip_tags(topic.title), :length => 45), forum_topic_path(:forum_id => topic.forum, :id => topic.sb_posts.last.topic.id, :page => topic.last_page, :anchor => topic.sb_posts.last.dom_id)
+          =link_to truncate(strip_tags(topic.title), :length => 45), forum_topic_path(topic.forum, topic.sb_posts.last.topic, :page => topic.last_page, :anchor => topic.sb_posts.last.dom_id)
           %br
           %p.small.quiet  
             = "in #{link_to topic.forum.name, forum_path(topic.forum)} by <strong>#{topic.sb_posts.last.user.login}</strong>:".html_safe

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

@@ -1,10 +1,8 @@
--box do
-  %h3= :edit_topic.l
+-@page_title= :edit_topic.l
 
-  = error_messages_for :topic
-  = form_for :topic,:url  => forum_topic_path(@forum, @topic), :html => { :method => :put, :class => "MainForm" } do |f|
-    = render :partial => "form", :object => f 
-    %p
-      = submit_tag :save_changes.l
-      = :or.l
-      = link_to(:cancel.l, forum_topic_path(@forum, @topic))
+%p
+  =link_to :back.l, @forum, :class => 'btn btn-default'
+  =link_to :show.l, [@forum, @topic], :class => 'btn btn-primary'
+  =link_to :delete.l, [@forum, @topic], :class => 'btn', :method => 'delete', data: { confirm: :are_you_sure.l }, :class => 'btn btn-danger'
+
+=render 'form'

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

@@ -1,22 +1,7 @@
--box :class => 'alt first_alt' do
-  = link_to :forums.l, forum_home_path
-  %span.arrow →
-  = link_to h(@forum.name), forum_path(@forum)
-  %span.arrow →
-  = :new_topic.l
+-@page_title= :new_topic.l
+%h2
+  = :by.l :login => current_user.display_name
+%p
+  =link_to :back.l, @forum, :class => 'btn btn-default'
 
--box do 
-  %h3#new_topic= :new_topic.l
-  %p.subtitle
-    = :by.l :login => current_user.display_name
-    
-  = error_messages_for :topic
-  = form_for @topic, :url  => forum_topics_path(@forum), :html => {:class => "MainForm"} do |f|
-    = render :partial => "form", :object => f
-    %p
-      = submit_tag :post_topic.l
-      = :or.l
-      = link_to(:cancel.l, forum_path(@forum))
-
-  -content_for :end_javascript do
-    = javascript_tag "$('topic_title').focus();"
+= render 'form'

data/app/views/topics/show.html.haml

@@ -4,115 +4,57 @@
 - @monitoring = logged_in? && current_user.monitoring_topic?(@topic)
 
 -content_for :end_javascript do
-  :javascript
-    function monitor_click(checkbox){
-      if (checkbox.checked) {
-        #{remote_function :url => forum_topic_monitorship_path(@forum, @topic)}
-      } else {
-        #{remote_function :url => forum_topic_monitorship_path(@forum, @topic), :method => :delete}
-      }}
+  =javascript_include_tag 'forum'
 
-
--box :class => "alt first_alt" do 
+-widget do
   - if logged_in?
-    = form_tag forum_topic_monitorship_path(@forum, @topic), :style => 'margin-top:0em; float:right;' do
-      #monitor_topic
-        %input#monitor_checkbox{:type=>"checkbox", :checked=> @monitoring, :onclick=>"monitor_click(this);"}
+    = bootstrap_form_tag :url => forum_topic_monitorship_path(@forum, @topic) do
+      #monitor_topic.form.form-horizontal
+        %input#monitor_checkbox{:type=>"checkbox", :checked=> @monitoring}
         %label#monitor_label{"for"=>"monitor_checkbox"}
           = @monitoring ? :watching_topic.l : :watch_topic.l
-        = hidden_field_tag '_method', 'delete' if @monitoring
-        = submit_tag :Set, :id => 'monitor_submit', :style => "display:none"
-        
-  = link_to :forums.l, forum_home_path
-  %span.arrow →
-  = link_to h(@topic.forum.name), forum_path(@topic.forum)
-  %span.arrow →
-  = h @topic.title
-  
-    
-    
--box :class => "forum" do 
-  %h3#topic-title
-    = h @topic.title
-    - if @topic.locked?
-      %span= :locked2.l
-    - if logged_in?
-      %span#topic_mod{"style"=>"display:none;"}
-        - if @topic.editable_by?(current_user)
-          = link_to(:edit.l, edit_forum_topic_path(@forum, @topic), :class => "utility")
-          |
-          = link_to(:delete.l, forum_topic_path(@forum, @topic), :class => "utility", :method => :delete, :confirm => :delete_this_topic_forever.l)
-
-
-      -content_for :end_javascript do
-        :javascript
-          $('topic-title').observe('mouseover', function(){ $('topic_mod').show()});
-          $('topic-title').observe('mouseout', function(){ $('topic_mod').hide()});        
-
-  %p.subtitle
-    = feed_icon_tag @topic.title, forum_topic_path(@forum, @topic, :format => :rss)
-    = "#{pluralize @topic.sb_posts.count, :post.l}, #{pluralize @topic.voices, :voice.l}"
-    -if @topic.tags.any?
-      =:tags.l
-      \:
-      =raw @topic.tags.collect{|t| link_to( h(t.name), tag_url(t), :class => 'tag').html_safe }.join(" ")
-
-
-  
-  %ul.flat.talking
-    %li.label= :voices.l + ":"
-    - @voices.each do |user|
-      %li= link_to h(user.display_name), user_path(user)
-
-  - if logged_in? || configatron.allow_anonymous_forum_posting
-    %h6.all.right= link_to_function :reply_to_topic.l, "ReplyForm.init()", :class => "utility"
-  -else
-    %h6.all.right= link_to :reply_to_topic.l, new_forum_topic_sb_post_path(@topic.forum, @topic), :class => "utility"  
-  
-  
-  - if @posts.total_count > 1
-    .pagination.clear= paginating_links @posts
-
-  %a{"name"=>"#{@posts.to_a.first.dom_id}", "id"=>"#{@posts.to_a.first.dom_id}"}  
-  %br.clear
-  %br
-  %table#posts.wide{"cellspacing"=>"0", "border"=>"0", "cellpadding"=>"0"}
-    - for post in @posts do
-      =render :partial => 'sb_posts/sb_post', :locals => {:post => post}
-
-
-  - if @posts.total_count > 1
-    .pagination= paginating_links @posts
-
-  - if logged_in? || configatron.allow_anonymous_forum_posting  
-    #edit
-    - if @topic.locked?
-      %p
-        = image_tag "clearbits/lock.gif", :class => "icon grey", :title => :topic_locked.l
-        %label= :this_topic_is_locked.l
-    - else
-      %h6.all.right= link_to_function :reply_to_topic.l, "ReplyForm.init()", :class => "utility"
-      #reply.editbox
-        .container
-          =render :partial => 'sb_posts/reply_form'
-          
-    -content_for :end_javascript do      
-      = javascript_tag "$('reply').hide();"
-      
+        = submit_tag :save.l, :id => 'monitor_submit', :style => "display:none"
+
+- if @topic.locked?
+  %h2= :locked2.l
+
+- if logged_in? && @topic.editable_by?(current_user)
+  %p
+    = link_to :back.l, @forum, :class => 'btn btn-default'
+    = link_to :edit.l, edit_forum_topic_path(@forum, @topic), :class => "btn btn-warning"
+    = link_to :delete.l, forum_topic_path(@forum, @topic), :class => "btn btn-danger", :method => :delete, data: { confirm: :delete_this_topic_forever.l }
+
+%p
+  %a{:href => forum_topic_path(@forum, @topic, :format => :rss)}
+    =fa_icon "rss"
+  = "#{pluralize @topic.sb_posts.count, :post.l}, #{pluralize @topic.voices, :voice.l}"
+  -if @topic.tags.any?
+    %h2=:tags.l
+    %p=raw @topic.tags.collect{|t| link_to( h(t.name), tag_url(t), :class => 'tag').html_safe }.join(" ")
+
+%h2= :voices.l
+%ul.flat.talking
+  - @voices.each do |user|
+    %li= link_to h(user.display_name), user_path(user)
+
+%a{"name"=>"#{@posts.to_a.first.dom_id}"}
+%table.table.table-bordered.table-striped#posts
+  - for post in @posts do
+    =render :partial => 'sb_posts/sb_post', :locals => {:post => post}
+
+=paginate @posts, :theme => 'bootstrap'
+
+- if logged_in? || configatron.allow_anonymous_forum_posting
+  #edit
+  - if @topic.locked?
+    %p
+      =fa_icon "lock"
+      %label= :this_topic_is_locked.l
   - else
-    %p= link_to :log_in_to_reply_to_this_topic.l, new_forum_topic_sb_post_path(@topic.forum, @topic), :class => "utility"
+    = link_to fa_icon("plus", :text => :reply_to_topic.l), new_forum_topic_sb_post_path(@topic.forum, @topic), :class => 'reply-toggle'
+    .reply
+      =render :partial => 'sb_posts/reply_form'
+
+- else
+  %p= link_to :log_in_to_reply_to_this_topic.l, new_forum_topic_sb_post_path(@topic.forum, @topic)
 
--box :class => "alt" do 
-  = link_to :forums.l, forum_home_path
-  %span.arrow →
-  = link_to h(@topic.forum.name), forum_path(@topic.forum)
-  %span.arrow →
-  = h @topic.title
-  
--content_for :end_javascript do
-  :javascript
-    Event.observe(window, 'load', function(){
-      if(document.location.href.include('#reply-form')){
-      ReplyForm.init();
-      }
-    })