community_engine 2.3.2 → 3.0.0

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

@@ -1,49 +1,51 @@
-.yui-b.sidebar
-  -box do 
-    %h3=:links.l
-    %ul.checks
-      %li=link_to :view_all_my_photos.l, user_photos_path(current_user)
-      %li=link_to :new_photo.l, new_user_photo_path(current_user)
-      %li=link_to :new_album.l, new_user_album_path(current_user)
+-@page_title = :photo_manager.l
+-widget do
+  %h4
+    .small=:links.l
+  %p=link_to :view_all_my_photos.l, user_photos_path(current_user)
+  %p=link_to :new_photo.l, new_user_photo_path(current_user)
+  %p=link_to :new_album.l, new_user_album_path(current_user)
 
-#yui-main
-  .yui-b
-    -box do 
-      %h3= :albums.l
-      %table{:border => 0, :width => '100%'}
-        %thead
-          %tr
-            %th=:title.l
-            %th=:preview.l
-            %th=:created_at.l
-            %th=:actions.l
-        %tbody
-          - @albums.each do |album|
-            %tr            
-              %td= link_to album.title, user_album_path(current_user,album)
-              %td
-                - if album.photos[0] 
-                  =link_to image_tag( album.photos[0].photo.url(:thumb), :size => "50x50"), user_photo_path(current_user, album.photos[0])
-                - if album.photos[1] 
-                  =link_to image_tag( album.photos[1].photo.url(:thumb), :size => "50x50"), user_photo_path(current_user, album.photos[1])
-                - if album.photos[2] 
-                  =link_to image_tag( album.photos[2].photo.url(:thumb), :size => "50x50"), user_photo_path(current_user, album.photos[2])
-              %td
-                %abbr{:title=>"#{album.created_at}"}= album.created_at.strftime("%Y/%m/%d")
-              %td
-                = link_to :edit.l, edit_user_album_path(current_user,album) 
-                = " | "
-                = link_to :add_photos.l, new_user_album_photo_path(current_user,album)
-                = " | "
-                = link_to :destroy.l, user_album_path(current_user,album), :confirm => :delete_album_and_photos.l, :method => :delete
-      .pagination= paginating_links(@albums,{:name => "page_albums"}) if @albums.total_count > 1
+%h2= :albums.l
+%table.table.table-bordered.table-striped
+  %thead
+    %tr
+      %th=:title.l
+      %th=:preview.l
+      %th=:created_at.l
+      %th=:actions.l
+  %tbody
+    - @albums.each do |album|
+      %tr
+        %td= link_to album.title, user_album_path(current_user,album)
+        %td
+          - if album.photos[0]
+            =link_to image_tag( album.photos[0].photo.url(:thumb), :size => "50x50"), user_photo_path(current_user, album.photos[0])
+          - if album.photos[1]
+            =link_to image_tag( album.photos[1].photo.url(:thumb), :size => "50x50"), user_photo_path(current_user, album.photos[1])
+          - if album.photos[2]
+            =link_to image_tag( album.photos[2].photo.url(:thumb), :size => "50x50"), user_photo_path(current_user, album.photos[2])
+        %td
+          %abbr{:title=>"#{album.created_at}"}= album.created_at.strftime("%Y/%m/%d")
+        %td
+          = link_to :show.l, user_album_path(current_user,album), :class => 'btn btn-default'
+          = link_to :edit.l, edit_user_album_path(current_user,album), :class => 'btn btn-warning'
+          = link_to :add_photos.l, new_user_album_photo_path(current_user,album), :class => 'btn btn-primary'
+          = link_to :delete.l, user_album_path(current_user,album), data: { confirm: :delete_album_and_photos.l }, :method => :delete, :class => 'btn btn-danger'
+=paginate @albums, :theme => 'bootstrap'
+=link_to :new_album.l, new_user_album_path(current_user), :class => 'btn btn-success'
 
+%h2= :not_assigned_photos.l
+%ul.list-inline.thumbnails
+  - @photos_no_albums.each do |photo|
+    %li.col-sm-2
+      = link_to image_tag( photo.photo.url(:thumb)), user_photo_path(current_user, photo), :class => 'thumbnail'
+      = link_to :show.l, user_photo_path(current_user, photo), :class => 'btn btn-xs btn-default'
+      = link_to :edit.l, edit_user_photo_path(current_user, photo), :class => 'btn btn-warning btn-xs'
+      = link_to :delete.l, edit_user_photo_path(current_user, photo), data: { confirm: :are_you_sure.l }, :method => :delete, :class => 'btn btn-danger btn-xs'
 
-      %h3= :not_assigned_photos.l
-      #photos.yui-u.box
-        - @photos_no_albums.each do |photo|
-          = link_to image_tag( photo.photo.url(:thumb), :class => "polaroid"), user_photo_path(current_user, photo)
-        .pagination= paginating_links @photos_no_albums if @photos_no_albums.total_count > 1
+  =paginate @photos_no_albums, :theme => 'bootstrap'
+=link_to :new_photo.l, new_user_photo_path(current_user), :class => 'btn btn-success'
 
 
 

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

@@ -0,0 +1,24 @@
+-if @photo.new_record?
+  -object = @photo
+  -url = user_photos_path
+-else
+  -object = [@user, @photo]
+  -url = user_photo_path(@user, @photo)
+
+= bootstrap_form_for object, :url => url, :layout => :horizontal  do |f|
+  -if @photo.photo_file_name.blank?
+    = f.file_field :photo
+    %p.help-block=:megabyte_upload_limit.l(:count => configatron.photo.validation_options.max_size)
+  -else
+    = image_tag( @photo.photo.url(:large), :id => 'photo', :class => 'thumbnail' )
+  = f.text_field :tag_list, :autocomplete => "off", :label => :tags.l, :help => :optional_keywords_describing_this_photo_separated_by_commas.l
+
+  -content_for :end_javascript do
+    = tag_auto_complete_field 'photo_tag_list', {:url => { :controller => "tags", :action => 'auto_complete_for_tag_name'}, :tokens => [','] }
+  = f.text_field :name
+  = f.text_area :description, :rows => 5
+  - unless params[:album_id] || current_user.albums.empty?
+    = f.select(:album_id, current_user.albums.collect {|album| [album.title, album.id ] }, { :include_blank => true })
+
+  = f.form_group :submit_group do
+    = f.primary :save.l

data/app/views/photos/_manage_photos.html.haml

@@ -1,13 +1,21 @@
 = render :partial => 'show_image_list', :locals => { :photos => photos }
 
 #image_list_pages.clear
-  = paginate @photos
+  = paginate @photos, :per_page => 20
 
 :javascript
-  $('image_list_pages').select('a').invoke('observe', 'click', remote_paginate )
+  $('#image_list_pages a').click(remote_paginate);
+  
   function remote_paginate(event){
-    $('dynamic_images_list').update("Loading images...<br /><img src='/assets/spinner.gif'>");
-    element = Event.element(event);
-    new Ajax.Request(element.href, {asynchronous:true, evalScripts:true, method:'get'});
-    Event.stop(event);
+    $('#dynamic_images_list').html("Loading images...<br /><img src='/assets/spinner.gif'>");
+    element = $(this);
+    $.ajax({
+        url : element.attr('href'),
+        type: 'GET',
+        beforeSend: function(xhr, settings) {
+            xhr.setRequestHeader('accept', '*/*;q=0.5, ' + settings.accepts.script);
+        }    
+    });
+    event.stopPropagation();
+    return false;
   }

data/app/views/photos/_show_image_list.html.haml

@@ -12,12 +12,12 @@
           %a{:href=>p.photo.url(:large), :alt => p.display_name}
             = :large.l
           %br
-          %a{:href=>'#', :onclick=>"$(this).up('li').removeClassName('selected');return false;", :style => 'float:right; font-size: 10px;'}
+          %a{:href=>'#', :onclick=>"$(this).parents('li').removeClass('selected');return false;", :style => 'float:right; font-size: 10px;'}
             = :cancel.l
         %a{:href=>'#', :onclick=>"select_image(this);return false;"}
           = image_tag( p.photo.url(:thumb), :alt => p.display_name )
           
   :javascript
-    $$('.thumbs a').invoke("observe", 'click', select_thumb)
+    $('.thumbs a').click(select_thumb)
 - else
   = :no_images_uploaded_yet.l

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

@@ -0,0 +1 @@
+upload_image_callback('<%= @photo.photo.url() %>', '<%= @photo.display_name %>', '<%= @photo.id %>');

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

@@ -1,41 +1,13 @@
-.yui-b
-  -box do 
-    %h3= :help.l
-    %p
-      = :tags_are_keywords_you_use_to_organize_your_photos.l
-    = link_to :show_this_photo.l, user_photo_path(@user, @photo)
-    |
-    = link_to :back_to_my_photos.l, user_photos_path(@user)
+-@page_title= :editing_photo.l
 
-  -box :class => 'alt' do
-    = link_to :delete_this_photo.l, user_photo_path(@user, @photo), :method => :delete, :confirm => :are_you_sure_you_want_to_delete_this_photo.l
+-widget do
+  %h3= :help.l
+  %p
+    = :tags_are_keywords_you_use_to_organize_your_photos.l
 
-#yui-main
-  -box :class => "yui-b" do
-    %h3= :editing_photo.l  
-
-    = error_messages_for :photo
-    = form_for(:photo, :url => user_photo_path(@user, @photo), :html => { :method => :put, :class => "MainForm" }) do |f|
-      
-      = image_tag( @photo.photo.url(:medium), :id => 'photo', :class => 'polaroid' )
-      
-      %label 
-        = :tags.l
-        %em="(#{:optional_keywords_describing_this_photo_separated_by_commas.l})"
-      = text_field_tag 'tag_list', @photo.tag_list.to_s, {:autocomplete => "off", :size => 35}
-      #tag_list_auto_complete.auto_complete{"class"=>"auto_complete"} 
-      -content_for :end_javascript do
-        = auto_complete_field 'tag_list', {:url => { :controller => "tags", :action => 'auto_complete_for_tag_name'}, :tokens => [','] }
-
-      %label= :title.l + ":"
-      = f.text_field :name, :size => 35
-      %label= :description.l + ":"
-      = f.text_area :description, :size => "58x5"
-      %label= :album.l + ":"
-      = f.select(:album_id, current_user.albums.collect {|album| [album.title, album.id ] }, { :include_blank => true })
-
-      %p
-        = submit_tag :update.l
-        = :or.l
-        = link_to :cancel_and_go_back_to_my_photos.l, user_photos_path(@user)
+%p
+  = link_to :back.l, user_photos_path(@user), :class => 'btn btn-default'
+  = link_to :show.l, user_photo_path(@user, @photo), :class => 'btn btn-primary'
+  = link_to :delete.l, user_photo_path(@user, @photo), :method => :delete, data: { confirm: :are_you_sure_you_want_to_delete_this_photo.l }, :class => 'btn btn-danger'
 
+=render 'form'

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

@@ -1,28 +1,28 @@
-.yui-b
-  = render :partial => 'posts/author_profile', :locals => {:user => @user}
+-@page_title=:users_photos.l(:user=>@user.login)
+= render :partial => 'posts/author_profile', :locals => {:user => @user}
 
-  -box :class => 'yui-u first' do
+-if @tags.any?
+  -widget do
     %h3=:tags.l
-    %ul.tags        
+    %ul.list-unstyled
       - @tags.each do |tag|
         %li
           - if (tag.name.eql?(params[:tag_name]) )
-            = link_to tag.name, user_photos_path(@user), :class => "selected"
+            %a.active.label.label-info{:href => user_photos_path(@user)}
+              =fa_icon "tag inverse", :text => tag.name
           - else
-            = link_to tag.name, user_photos_path(:user_id => @user, :tag_name => tag.name)    
-  
+            %a.label.label-info{:href => user_photos_path(:user_id => @user, :tag_name => tag.name)}
+              =fa_icon "tag inverse", :text => tag.name
 
-#yui-main
-  .yui-b
-  
-    -box :id => "photos" do
-      %h3= link_to :users_photos.l(:user=>@user.login), user_photos_path(@user)
-      = link_to( :new_photo.l, new_user_photo_path(@user), {:class => 'right'})  if @is_current_user
+%ul.list-unstyled.thumbnails
+  - @photos.each do |photo|
+    %li.col-sm-3
+      = link_to image_tag(photo.photo.url(:medium)), user_photo_path(@user, photo), :class => 'thumbnail'
+      -if @is_current_user
+        =link_to :show.l, user_photo_path(@user, photo), :class => 'btn btn-xs btn-default'
+        =link_to :edit.l, edit_user_photo_path(@user, photo), :class => 'btn btn-xs btn-warning'
+        =link_to :delete.l, user_photo_path(@user, photo), :method => 'delete', data: { confirm: :are_you_sure.l }, :class => 'btn btn-xs btn-danger'
 
-      .clear
-      - @photos.each do |photo|
-        = link_to tag('img', :src => photo.photo.url(:thumb), :class => "polaroid"), user_photo_path(@user, photo)
-        
-      .pagination=paginating_links @photos if @photos.total_count > 1
-
-      
+=paginate @photos, :theme => 'bootstrap'
+-if @is_current_user
+  = link_to :new_photo.l, new_user_photo_path(@user), :class => 'btn btn-success'

data/app/views/photos/manage_photos.js.erb

@@ -0,0 +1,5 @@
+<%- if logged_in? %>
+  $("#dynamic_images_list").html("<%= escape_javascript(render(:partial => 'manage_photos', :locals => { :photos => @photos })) %>");
+<%- else %>
+  mcTabs.displayTab('general_tab','general_panel'); $('dynamic_select_tab').hide(); $('image_upload_form').up('fieldset').hide(); 
+<%- end -%>

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

@@ -1,52 +1,14 @@
-.yui-b
-  -box do 
-    %h3
-      =:tips.l
-    %p 
-      =:photo_tip_1.l
-    %p 
-      =:photo_tip_2.l
+-@page_title=:new_photo.l
 
-  -box :class => 'alt' do
-    = link_to "» ".html_safe + :back_to_my_photos.l, user_photos_path(@user)
+-widget do 
+  %h3
+    =:tips.l
+  %p 
+    =:photo_tip_1.l
+  %p 
+    =:photo_tip_2.l
 
-#yui-main
-  .yui-b
-    -box :id => "single_upload" do
-      %h3 
-        =:new_photo.l
-
-      = error_messages_for :photo
-
-      = form_for(:photo, :url => user_photos_path(:user_id => current_user.id, :album_id => params[:album_id]), :html => {:multipart =>true, :class => "MainForm"} ) do |f|
-      
-        = f.file_field :photo
-        
-        %label
-          %em= " " + :megabyte_upload_limit.l(:count => configatron.photo.validation_options.max_size)
-
-        %label=:title.l + ":"
-        = f.text_field :name, :size => 35
-
-        %label 
-          = :tags.l
-          %em="(#{:optional_keywords_describing_this_photo_separated_by_commas.l})"
-        = text_field_tag 'tag_list', @photo.tag_list, {:autocomplete => "off", :size => 35}
-
-        #tag_list_auto_complete.auto_complete
-        -content_for :end_javascript do        
-          = auto_complete_field 'tag_list', {:url => { :controller => "tags", :action => 'auto_complete_for_tag_name'}, :tokens => [','] }
-
-        %label=:description.l + ":"
-        = f.text_area :description, :size => "58x5"
-
-        - unless params[:album_id] || current_user.albums.empty?
-          %label=:assign_album.l + ":"
-          = select_tag 'album_selected', options_for_select([''] +current_user.albums.collect{ |album| [album.title, album.id] })
-
-
-        %p
-          = submit_tag :create.l
-          = :or.l
-          = link_to :cancel_and_go_back_to_photo_manager.l, user_photo_manager_index_path(current_user)
+%p
+  = link_to :back.l, user_photos_path(@user), :class => 'btn btn-default'
 
+=render 'form'

data/app/views/photos/recent.html.haml

@@ -1,8 +1,8 @@
--box do
-  %h3=:recent_photos.l
+-@page_title=:recent_photos.l
 
-  .pagination= paginating_links @photos if @photos.total_count > 1
+%ul.list-unstyled.thumbnails
+  - @photos.each do |photo|
+    %li.col-sm-3
+      = link_to image_tag(photo.photo.url(:medium)), user_photo_path(photo.user, photo), :class => 'thumbnail'
 
-  %ul
-    - @photos.each do |photo|
-      %li= image_tag photo.photo.url(:thumb) 
+=paginate @photos, :theme => 'bootstrap'

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

@@ -1,53 +1,49 @@
-.profile
-  .yui-b
-    = render :partial => 'posts/author_profile', :locals => {:user => @user}
-
-    - if @photo.album
-      -box :class => "photo_nav alt" do
-        %h3= "#{:album.l}: #{link_to @photo.album.title, user_album_path(@user, @photo.album)}".html_safe
-        
-        = link_to "<img src='#{@photo.previous_in_album.photo.url(:thumb)}' /><br />&laquo; ".html_safe + :previous.l, user_photo_path(@user, @photo.previous_in_album), :class => 'left' if @photo.previous_in_album
-        
-        = link_to "<img src='#{@photo.next_in_album.photo.url(:thumb)}' /><br />".html_safe + :next.l + "&raquo;".html_safe, user_photo_path(@user, @photo.next_in_album), :class => 'right' if @photo.next_in_album    
-        
-    - elsif @previous || @next
-      -box :class => "photo_nav alt" do
-        = link_to "<img src='#{@previous.photo.url(:thumb)}' /><br />&laquo; ".html_safe + :previous.l, user_photo_path(@user, @previous), :class => 'left' if @previous
-        
-        = link_to "<img src='#{@next.photo.url(:thumb)}' /><br />".html_safe + :next.l + "&raquo;".html_safe, user_photo_path(@user, @next), :class => 'right' if @next
-
-    - if @related.any?
-      -box :class => "alt" do 
-        %h3=:related_photos_all_members.l
-        .centered
-          - @related.each do |photo|
-            = link_to image_tag( photo.photo.url(:thumb), :class => "polaroid"), user_photo_path(photo.user, photo), {:title => :photo_from_user.l_with_args(:photo_description => h(photo.description), :user => photo.user.login)}
-
-  #yui-main
-    .yui-b
-      -box :class => "hfeed" do 
-        %h3
-          = link_to :users_photos.l_with_args(:user => @user.login), user_photos_path(@user)
-          \:
-          = link_to h(@photo.display_name), user_photo_path(@user, @photo)
-
-        - if @is_current_user
-          -box :class => "alt" do 
-            = link_to :make_this_my_profile_photo.l, change_profile_photo_user_path(@user, :photo_id => @photo), :method => :put
-            |
-            = link_to :edit_this_photo_details.l, edit_user_photo_path(@user, @photo) if @is_current_user
-            |
-            = link_to(:delete_this_photo.l, user_photo_path(@user, @photo), :method => :delete) + "<br class='clear' />".html_safe
-
-        %p.centered= tag(:img, :src => @photo.photo(:large), :class => "polaroid" )
-        %p= h @photo.description
-        %p= @photo.tags.collect{|t| link_to( h(t.name), tag_url(t), :class => 'tag') }.join(" ").html_safe
-
-      -box :class => "hfeed comments", :id => 'comments' do
-        %h3=:photo_comments.l
-        %h2=:add_your_comment.l
-        %p= render :partial => 'comments/comment_form', :locals => {:commentable => @photo}
-        %a#newest_comment
-        = render :partial => 'comments/comment', :collection => @photo.comments
-        %span#more_comments_links= more_comments_links(@photo)
+-@page_title = @photo.display_name
+
+- if @related.any?
+  -widget do
+    %h3=:related_photos_all_members.l
+    - @related.each do |photo|
+      = link_to image_tag( photo.photo.url(:thumb), :class => "thumbnail"), user_photo_path(photo.user, photo), {:title => :photo_from_user.l_with_args(:photo_description => h(photo.description), :user => photo.user.login)}
+
+- if @is_current_user
+  -widget do
+    = link_to :make_this_my_profile_photo.l, change_profile_photo_user_path(@user, :photo_id => @photo), :method => :patch
+
+  %p
+    = link_to :back.l, user_photos_path(@user), :class => 'btn btn-default'
+    = link_to :edit.l, edit_user_photo_path(@user, @photo), :class => 'btn btn-warning'
+    = link_to :delete.l, user_photo_path(@user, @photo), :method => :delete, data: { confirm: :are_you_sure.l }, :class => 'btn btn-danger'
+
+= render :partial => 'posts/author_profile', :locals => {:user => @user}
+
+.clearfix
+  - if @photo.album
+    %h3= "#{:album.l}: #{link_to @photo.album.title, user_album_path(@user, @photo.album)}".html_safe
+    .pull-left.col-sm-2
+      = link_to "<img src='#{@photo.previous_in_album.photo.url(:thumb)}' class='thumbnail' /><br />&laquo; ".html_safe + :previous.l, user_photo_path(@user, @photo.previous_in_album) if @photo.previous_in_album
+    .pull-right.col-sm-2
+      = link_to "<img src='#{@photo.next_in_album.photo.url(:thumb)}' class='thumbnail' /><br />".html_safe + :next.l + "&raquo;".html_safe, user_photo_path(@user, @photo.next_in_album) if @photo.next_in_album
+
+  - elsif @previous || @next
+    .pull-left.col-sm-2
+      = link_to "<img src='#{@previous.photo.url(:thumb)}' class='thumbnail' /><br />&laquo; ".html_safe + :previous.l, user_photo_path(@user, @previous) if @previous
+    .pull-right.col-sm-2
+      = link_to "<img src='#{@next.photo.url(:thumb)}' class='thumbnail' /><br />".html_safe + :next.l + "&raquo;".html_safe, user_photo_path(@user, @next) if @next
+
+  .col-sm-8
+    = image_tag @photo.photo(:large), :class => "thumbnail"
+%p= h @photo.description
+%p
+  - for tag in @photo.tags
+    %a.label.label-info{:href => user_photos_path(@photo.user, :tag_name => tag.name)}
+      =fa_icon "tag inverse", :text => tag.name
+
+-box :id => 'comments' do
+  %h2=:photo_comments.l
+  %h3=:add_your_comment.l
+  %p= render :partial => 'comments/comment_form', :locals => {:commentable => @photo}
+  %a#newest_comment
+  = render :partial => 'comments/comment', :collection => @photo.comments
+  %span#more_comments_links= more_comments_links(@photo)