community_engine 2.3.2 → 3.0.0

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

@@ -1,34 +1,4 @@
-.yui-b.sidebar
-  = render :partial => 'shared/admin_nav'
+-@page_title = :editing_category.l
+= render :partial => 'shared/admin_nav'
 
-#yui-main
-  -box :class => "yui-b" do
-    %h3=:editing_category.l
-    = form_for(:category, :url => category_path(@category), :html => { :method => :put, :class => "MainForm" }) do |f|
-
-      %label
-        =:name.l
-        \:
-      = f.text_field :name
-
-      %label
-        =:posting_tips.l
-        \:
-      = f.text_area :tips, :rows => 3
-
-      %label
-        =:new_post_text.l
-        \:
-      = f.text_field :new_post_text
-
-      %label
-        =:navigation_menu_text.l
-        \:
-      = f.text_field :nav_text
-
-      %p
-        = submit_tag :update.l
-
-    = link_to :show.l, category_path(@category)
-    |
-    = link_to :back.l, categories_path
+=render 'form'

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

@@ -1,30 +1,20 @@
-.yui-b
-  = render :partial => 'shared/admin_nav'
+-@page_title=:categories.l
+= render :partial => 'shared/admin_nav'
 
-#yui-main
-  .yui-b
-    -box do 
-      %h3=:categories.l
+%table.table.table-bordered.table-striped
+  %tr
+    %th=:name.l
+    %th
+      \#
+      =:posts.l
+    %th=:actions.l
 
-      %table{:width=>"100%"}
-        %tr 
-          %th=:name.l
-          %th 
-            \# 
-            =:posts.l
-          %th=:actions.l
-
-        - for category in @categories
-          %tr
-            %td= category.name
-            %td= category.posts.size	
-            %td
-              = link_to :show.l, category_path(category)
-              | 
-              = link_to :edit.l, edit_category_path(category)
-              |
-              = link_to :destroy.l, category_path(category), :confirm => :are_you_sure.l, :method => :delete
-
-      %br
-
-      = link_to :new_category.l, new_category_path
+  - for category in @categories
+    %tr
+      %td= category.name
+      %td= category.posts.size
+      %td
+        = link_to :show.l, category_path(category), :class => 'btn btn-default'
+        = link_to :edit.l, edit_category_path(category), :class => 'btn btn-warning'
+        = link_to :delete.l, category_path(category), data: { confirm: :are_you_sure.l }, :method => :delete, :class => 'btn btn-danger'
+= link_to :new_category.l, new_category_path, :class => 'btn btn-success'

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

@@ -1,9 +1,4 @@
--box do
-  %h3= :new_category.l
+-@page_title= :new_category.l
+= render :partial => 'shared/admin_nav'
 
-  = form_for(:category, :url => categories_path, :html => {:class => "MainForm"}) do |f|
-    %label= :name.l
-    = f.text_field :name
-    %p= submit_tag :create.l
-
-  = link_to :back.l, categories_path 
+=render 'form'

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

@@ -1,45 +1,42 @@
 - @meta = { :description => "#{@category.name} posts.",:keywords => "#{@category.name}"}
 - @section = @category.name
 
-.yui-b
-  -box do 
-    - if logged_in?
-      %h3.signup=:have_something_to_contribute.l
-      %ul.list.checks
-        %li= link_to @category.display_new_post_text() || :write_new_post.l(:category=>@category.name), new_user_post_path({:user_id => current_user, 'post[category_id]' => @category.id})
-    - else
-      %h3.signup= @category.display_new_post_text() || :write_new_post.l(:category=>@category.name)
-      %ul.list.checks
-        %li
-          %a{:href=>signup_url, :title=>:sign_up_for_a_.l+" #{configatron.community_name} "+:account.l}=:sign_up_for_an_account.l
-          %br
-            %small
-              =:have_an_account.l
-              %a{:href=>login_url, :title=>:log_in_to_your.l+" #{configatron.community_name} "+:account.l}
-                »
-                =:login.l
+-unless @active_users.empty?
+  -widget do
+    %h4
+      .small=:top_writers.l
+    %ul.list-unstyled
+      - @active_users.each do |user|
+        = render :partial => "users/sidebar_user", :locals => {:user => user} 
 
-  -box :class => "alt" do 
-    %h3=:top_writers.l
-    - @active_users.each do |user|
-      = render :partial => "users/sidebar_user", :locals => {:user => user} 
-      
-  -box :class => "alt" do 
-    %h3=:popular_category.l(:name => @category.name)
-    %ul.list.page    
+-unless @popular_posts.empty?
+  -widget do
+    %h4
+      .small=:popular_category.l(:name => @category.name)
+    %ul.list-unstyled
       - @popular_posts.each do |post|
         =render :partial => 'posts/sidebar_post', :locals => {:post => post}
 
+- if logged_in?
+  %h2.signup=:have_something_to_contribute.l
+  %ul.list-unstyled
+    %li=link_to fa_icon('check', :text => @category.display_new_post_text() || :write_new_post.l(:category=>@category.name)), new_user_post_path({:user_id => current_user, :category_id => @category.id})
+- else
+  %h2.signup= @category.display_new_post_text() || :write_new_post.l(:category=>@category.name)
+  %ul.list-unstyled
+    %li
+      =link_to fa_icon('check', :text => :sign_up_for_an_account.l), signup_url
+    %li
+      %small
+        =:have_an_account.l
+        =link_to fa_icon('arrow-right', :text => :login.l), login_url
 
-#yui-main
-  .yui-b
-    -box :class => "hfeed" do 
-      %h3      
-        =:show_category.l :category => @category.name
-        %ul.subnav
-          %li= link_to :recent.l, category_path(@category), {:class => (params[:popular] ? '' : 'active')}
-          %li= link_to :popular.l, category_path(@category, :popular => 'DESC'), {:class => (params[:popular] ? 'active' : '')}  
+%h2      
+  =:show_category.l :category => @category.name
+%ul
+  %li= link_to :recent.l, category_path(@category), {:class => (params[:popular] ? '' : 'active')}
+  %li= link_to :popular.l, category_path(@category, :popular => 'DESC'), {:class => (params[:popular] ? 'active' : '')}  
 
-      = render :partial => 'posts/post', :collection => @posts      
-      - if @posts.total_count > 1
-        = paginate @posts
+= render :partial => 'posts/post', :collection => @posts      
+= paginate @posts, :theme => 'bootstrap'
+  

data/app/views/clippings/_clipping.html.haml

@@ -1,18 +1,11 @@
-.clipping{:id => "clipping_#{clipping.id}"}
-  %a{:href=>"#{user_clipping_url(clipping.user, clipping)}", :title => h(truncate_words(clipping.description)) }     
-    = image_tag clipping.image_uri(:medium_square), :class => 'clipping_image'
-  %p
+%div{ :id => "clipping_#{clipping.id}"}
+  =render :partial => 'clippings/favorite', :locals => {:clipping => clipping}
+  %a{:href=>"#{user_clipping_url(clipping.user, clipping)}", :title => h(truncate_words(clipping.description)) }
     = h(truncate_words(clipping.description))
-
-  - if favorite = clipping.has_been_favorited_by(current_user, request.remote_ip)
-    .favorite
-      = image_tag 'icons/heart_off.png', :plugin => 'community_engine'
-      = clipping.favorited_count
-      %br
-      %small.quiet= link_to :in_your_favorites.l, user_favorite_path(current_user, favorite) if logged_in?    
-
-      %small= link_to_remote '(un-favorite)', :url => favorite_path('clipping', clipping.id, favorite.id), :method => :delete, :loading => "new Effect.Fade($$('#clipping_#{clipping.id} .favorite img').first())", :title => :un_favorite_this.l if logged_in?
-  - else
-    .favorite  
-      = link_to_remote image_tag('icons/heart.png', :plugin => 'community_engine'), :url => favorites_path('clipping', clipping.id), :loading => "new Effect.Pulsate($$('#clipping_#{clipping.id} .favorite img').first() )", :title => :un_favorite_this.l
-      = clipping.favorited_count
+    %br
+    = link_to image_tag( clipping.image_uri(:medium)), user_clipping_url(clipping.user, clipping), :class => 'thumbnail'
+  %br
+  -if clipping.user = current_user
+    =link_to :show.l, [current_user, clipping], :class => 'btn btn-xs btn-default'
+    =link_to :edit.l, edit_user_clipping_path(current_user, clipping), :class => 'btn btn-xs btn-warning'
+    =link_to :delete.l, [current_user, clipping], :method => 'delete', data: { confirm: :are_you_sure.l }, :class => 'btn btn-xs btn-danger'

data/app/views/clippings/_favorite.html.haml

@@ -0,0 +1,14 @@
+- if favorite = clipping.has_been_favorited_by(current_user, request.remote_ip)
+  .favorite
+    = link_to favorite_path('clipping', clipping.id, favorite.id), :method => :delete, :class => 'act-via-ajax', :id => 'favorite-clipping-'+clipping.id.to_s if logged_in? do
+      %span.badge.badge-info
+        =fa_icon("heart")
+        =clipping.favorited_count.to_s
+      %span.label.label-info
+        =:in_your_favorites.l
+- else
+  .favorite
+    = link_to favorites_path('clipping', clipping.id), :method => :post, :class => 'act-via-ajax', :id => 'favorite-clipping-'+clipping.id.to_s do
+      %span.badge
+        =fa_icon("heart")
+        =clipping.favorited_count.to_s

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

@@ -0,0 +1,15 @@
+-if @clipping.new_record?
+  -url = user_clippings_path(@user)
+  -object =  @clipping
+-else
+  -url = user_clipping_path(@user, @clipping)
+  -object = [@user, @clipping]
+
+= bootstrap_form_for(object, :url => url, :layout => :horizontal) do |f|
+  = f.text_field :url
+  -if @clipping.new_record?
+    = f.text_field :image_url
+  = f.text_field :description
+  = f.text_field :tag_list
+  %p.help-block= :optional_keywords_describing_this_clipping_separated_by_commas.l
+  = f.primary :save.l

data/app/views/clippings/_images.html.haml

@@ -1,3 +1,3 @@
 - images.each do |src|
-  %li
+  %li.thumbnail
     %img{:src=>"#{src}"}

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

@@ -0,0 +1,6 @@
+- if current_page?(site_clippings_path)
+  - css_class = 'active'
+- else
+  - css_class = 'inactive'
+
+%li{:class => css_class}= link_to :clippings.l, site_clippings_path

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

@@ -1,26 +1,15 @@
-.yui-b
-  -box do 
-    %h3= :help.l
-    %p= :tags_are_keywords_you_use_to_organize_your_clippings_separate_multiple_tags_with_commas.l
+-@page_title = :editing_clipping.l
 
-#yui-main
-  .yui-b
-    -box do 
-      %h3= :editing_clipping.l
-      %img{"src"=>"#{h @clipping.image_uri(:large)}"}
-      = form_for(:clipping, :url => user_clipping_path(@user, @clipping), :html => { :method => :put, :class => "MainForm" }) do |f|
-        %label= :url.l
-        = f.text_field :url
-        
-        %label= :description.l
-        = f.text_field :description
+-widget do
+  %h3= :help.l
+  %p= :tags_are_keywords_you_use_to_organize_your_clippings_separate_multiple_tags_with_commas.l
 
-        %label
-          =:tags.l
-          %em="(#{:optional_keywords_describing_this_clipping_separated_by_commas.l})"
-        = text_field_tag 'tag_list', @clipping.tag_list.to_s
+%p
+  =link_to :back.l, user_clippings_path(@user), :class => 'btn btn-default'
+  =link_to :show.l, user_clipping_path(@user, @clipping), :class => 'btn btn-primary'
+  =link_to :delete.l, user_clipping_path(@user, @clipping), :method => 'delete', data: { confirm: :are_you_sure.l }, :class => 'btn btn-danger'
 
-        %p
-          = submit_tag :save.l
-          = :or.l
-          = link_to :cancel_and_go_back_to_my_clippings.l, user_clippings_path(@user)
+
+=image_tag @clipping.image_uri(:large), :class => 'thumbnail'
+
+=render 'form'

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

@@ -1,35 +1,34 @@
 -@section = 'my_clippings'
-.yui-b
-  =render :partial => 'posts/author_profile', :locals => {:user => @user}
 
-  - if @is_current_user
-    -box :class => "alt" do 
-      %h3=:help.l
-      %p=:clippings_let_you_to_save_cool_images_from_around_the_web.l
-      %p=:drag_the_bookmarklet.l :site => configatron.community_name
-      %p=:when_you_see_an_image_you_like_on_the_web.l :site => configatron.community_name
-      
-    -box :class => 'alt', :id => 'clipping_tools' do
-      %h3=:bookmarklet.l
-      %p=:drag_this_to_your_bookmarks_toolbar.l
-      %p= link_to "#{configatron.community_name} it!", clippings_link, :style=>"border:1px solid #ccc; background:#efefef; padding: 5px;", :title=>"#{configatron.community_name} "+:scrapbook.l
+- if @is_current_user
+  -widget :id => 'clipping_tools' do
+    %h4
+      .small=:bookmarklet.l
+    %p=:drag_this_to_your_bookmarks_toolbar.l
+    = link_to "Clip it!", clippings_link, :class => 'btn btn-primary', :title=>"#{configatron.community_name} "+:scrapbook.l
 
-#yui-main
-  .yui-b
-    -box :class => "hfeed", :id => 'clippings' do
-      %h3= link_to "#{:user_clippings.l :user =>@user.login}", user_clippings_path(@user)
-      - if @clippings.any?
-        -if @clippings.total_count > 1
-          .pagination=paginating_links @clippings
+  -widget do
+    %h4
+      .small=:help.l
+    %p=:clippings_let_you_to_save_cool_images_from_around_the_web.l
+    %p=:drag_the_bookmarklet.l :site => 'Clip'
+    %p=:when_you_see_an_image_you_like_on_the_web.l :site => configatron.community_name
 
-        - @clippings.each do |clipping|
-          %a{"href"=>"#{user_clipping_url(@user, clipping) }"}
-            %img.polaroid.clipping{"class"=>"polaroid clipping", "src"=>"#{h clipping.image_uri(:thumb) }"}/
-      - else
-        %p= @is_current_user ? :you_have_no_clippings_use_the_bookmarklet_on_the_right_to_add_some.l : :no_clippings_yet.l
+=render :partial => 'posts/author_profile', :locals => {:user => @user}
+
+-widget :id => 'tag_list' do
+  %h4
+    .small=:tags.l
+  - tag_cloud @tags, %w(nube1 nube2 nube3 nube4 nube5) do |name, css_class|
+    - css_class = css_class + (name.eql?(params[:tag_name]) ? " selected": "")
+    = link_to name, user_clippings_path(:user_id => @user, :tag_name => name), :class => css_class
+
+
+- if @clippings.any?
+  %ul.list-unstyled.thumbnails
+  - @clippings.each do |clipping|
+    %li.col-sm-3=render :partial => 'clippings/clipping', :locals => {:clipping => clipping}
+  =paginate @clippings, :theme => 'bootstrap'
+- else
+  %p= @is_current_user ? :you_have_no_clippings_use_the_bookmarklet_on_the_right_to_add_some.l : :no_clippings_yet.l
 
-    -box :class => 'alt', :id => 'tag_list' do
-      %h3=:tags.l
-      - tag_cloud @tags, %w(nube1 nube2 nube3 nube4 nube5) do |name, css_class|
-        - css_class = css_class + (name.eql?(params[:tag_name]) ? " selected": "")
-        = link_to name, user_clippings_path(:user_id => @user, :tag_name => name), :class => css_class

data/app/views/clippings/load_images_from_uri.js.erb

@@ -0,0 +1 @@
+$('#clipping_image_list').html("<%= @images ? render(:partial => 'clippings/images', :formats => [:html], :locals => {:images => @images}).gsub('"', '\\"').gsub("\n", "").html_safe : "<h1>Sorry, there was an error fetching the images from the page you requested</h1><a href='#{params[:uri]}'>Go back...</a>" %>")

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

@@ -1,29 +1,12 @@
-.yui-b
-  -box do 
-    %h3= :help.l
-    %p= :clippings_are_a_way_to_save_images_you_like_from_around_the_web.l
+-@page_title= :new_clipping.l
+-widget do 
+  %h3= :help.l
+  %p= :clippings_are_a_way_to_save_images_you_like_from_around_the_web.l
 
-#yui-main
-  .yui-b
-    -box do 
-      %h3= :new_clipping.l
-      %img{"src"=>"#{h @clipping.image_uri}"}
-      = form_for(:clipping, :url => user_clippings_path(@user), :html => { :class => "MainForm" }) do |f|
-        %label= :url.l
-        = f.text_field :url
+%p
+  =link_to :back.l, user_clippings_path(@user), :class => 'btn btn-default'
 
-        %label= :image_url.l
-        = f.text_field :image_url
-        
-        %label= :description.l
-        = f.text_field :description
+-if @clipping.image_uri
+  =image_tag @clipping.image_uri(:large), :class => 'thumbnail'
 
-        %label
-          =:tags.l
-          %em="(#{:optional_keywords_describing_this_clipping_separated_by_commas.l})"
-        = text_field_tag 'tag_list', @clipping.tag_list
-
-        %p
-          = submit_tag :create.l
-          = :or.l
-          = link_to :cancel_and_go_back_to_my_clippings.l, user_clippings_path(@user)
+=render 'form'

data/app/views/clippings/new_clipping.html.haml

@@ -5,88 +5,41 @@
       = configatron.community_name
       \- 
       =:new_clipping.l
-    = render :partial => 'shared/scripts_and_styles'
-    = javascript_include_tag 'lightbox'
-    = stylesheet_link_tag 'lightbox'
-    %style{"type"=>"text/css"}
-      :plain
-        body {
-        font: 1em "Lucida Grande", "Trebuchet MS", Verdana, sans-serif;
-        background: none;
-        }
-        ul#clipping_image_list {
-        list-style:none;
-        padding:none;
-        width: 400px;
-        height: 400px;
-        overflow: auto;
-        }
-        ul#clipping_image_list li {
-        display:inline;
-        margin:1em;
-        }
-        ul#clipping_image_list li img {
-        cursor:pointer;
-        cursor: hand;
-        padding:3px;
-        border:1px solid #ccc;
-        width: 200px;
-        }
-      
-        div#form_div {
-        width:550px;
-        padding:10px;
-        }
+    = javascript_include_tag 'community_engine'
+    = stylesheet_link_tag 'application'
+    = stylesheet_link_tag 'layout'
   %body
-    #doc3
-      #bd
-        -box do
-          %h3 
-            =:create_a_clipping.l
-          %p
-            %small=:click_on_an_image_below_to_clip_it.l
-          %ul#clipping_image_list
-            = image_tag 'spinner.gif', :plugin => "community_engine"
-            =:loading_images.l
-            = javascript_include_tag 'community_engine'
-            %script{"type"=>"text/javascript"}
-              = remote_function(:url => { :controller => 'clippings', :action => "load_images_from_uri", :uri => params[:uri] }, :method => :post )
-          %small
-            %a{"href"=>"#{ params[:uri] }"}
-              =:cancel_and_go_back_to.l
-              = @clipping.url
-          #form_div{"style"=>"display:none;"}
-            = form_for(:clipping, :url => user_clippings_path(@user), :html => {:class => "MainForm"} ) do |f|
-              %label=:url.l
-              = f.text_field :url
+    .jumbotron
+      %h1
+        =:create_a_clipping.l
+      %p
+        =:click_on_an_image_below_to_clip_it.l
+    %ul#clipping_image_list.thumbnails
+      = image_tag 'spinner.gif', :plugin => "community_engine"
+      =:loading_images.l
+      %script{"type"=>"text/javascript"}
+        ="$('#clipping_image_list').html($.post('#{load_images_from_uri_path(:uri => params[:uri]).html_safe}'));"
+    =link_to :cancel_and_go_back_to.l + ' ' + @clipping.url, params[:uri], :class => 'btn btn-xs btn-primary'
+    #lightbox.modal.fade{:role => 'dialog', "aria-hidden" => "true", :"aria-labelledby" => "send_to_friend_label", :tabindex => "-1", :style => 'padding-top: 60px;'}
+      = bootstrap_form_for(:clipping, :url => user_clippings_path(@user), :layout => :horizontal) do |f|
+        = f.text_field :url
 
-              %img#clipping_preview{"src"=>nil, "width"=>"175px", "style"=>"float:right"}
-              
-              %label=:image_url.l
-              = f.text_field :image_url
+        %img#clipping_preview{"src"=>nil, "width"=>"100px", "style"=>"float:right"}
 
-              %label
-                =:tags.l
-                %em="(#{:optional_keywords_describing_this_clipping_separated_by_commas.l})"
-              = text_field_tag 'tag_list', @clipping.tag_list, {:autocomplete => "off",:id => 'clipping_tag_list'}
+        = f.text_field :image_url
 
-              #clipping_tag_list_auto_complete.auto_complete
-              = auto_complete_field 'clipping_tag_list', {:url => {:controller => "tags", :action => 'auto_complete_for_tag_name'}, :tokens => [','], :update => 'clipping_tag_list_auto_complete' }
+        = f.text_field :tag_list, {:help => :optional_keywords_describing_this_clipping_separated_by_commas.l, :autocomplete => "off",:id => 'clipping_tag_list'}
 
-              %label=:description.l
-              = f.text_field :description
+        = tag_auto_complete_field 'clipping_tag_list', {:url => {:controller => "tags", :action => 'auto_complete_for_tag_name'}, :tokens => [','] }
 
-              %p= submit_tag :create.l
+        = f.text_field :description
 
-        :javascript
-          image_list = $('clipping_image_list')
-          Event.observe(image_list, 'click', function(e){
-            element = Event.element(e);
-            if (element.parentNode.tagName.toLowerCase() == 'li' ){
-              $('clipping_image_url').value = element.src;
-              $('clipping_preview').src = element.src;
-              new Lightbox.base('form_div');
-            }
-            return;
-          });
+        = f.primary :create.l
+
+  :javascript
+    $("#clipping_image_list img").on('click', function(){
+      $('#clipping_image_url').val($(this).attr('src'));
+      $('#clipping_preview').attr('src', $(this).attr('src'));
+      $('#lightbox').modal();
+    });