community_engine 2.3.2 → 3.0.0

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

@@ -1,43 +1,29 @@
-.yui-b
-  = render :partial => 'shared/admin_nav'
-  
-  -box do
-    %h3=:search.l
-    = form_for @search, :url => ads_path, :html => {:class => "MainForm"} do |f|
+-@page_title = :ads.l
+= render :partial => 'shared/admin_nav'
 
-      %label= :name.l
-      = f.text_field :name_starts_with
-      
-      %label= :location.l
-      = f.text_field :location_contains
+%h2=:search.l
+= bootstrap_form_for @search, :url => ads_path, :layout => :horizontal do |f|
+  = f.text_field :name_start, :label => :name.l
+  = f.text_field :location_cont, :label => :location.l
+  = f.form_group :submit_group do
+    = f.primary :search.l
 
-      %p= f.submit :search.l
-  
+%table.table.table-bordered.table-striped
+  %tr
+    %th=sort_link @search, :name, :name.l
+    %th=sort_link @search, :published, :published.l
+    %th=sort_link @search, :location, :location.l
+    %th=:actions.l
 
-#yui-main
-  .yui-b  
-    -box do
-      %h3= :ads.l
-      %table{"width"=>"100%"}
-        %tr
-          %th=sort_link @search, :name, :name.l                    
-          %th 
-            =sort_link @search, :published, :published.l
-          %th
-            =sort_link @search, :location, :location.l                              
-          %th  
+  - for ad in @ads
+    %tr
+      %td= link_to h(ad.name), ad_path(ad)
+      %td= h ad.published?
+      %td= h ad.location
+      %td
+        = link_to :show.l, ad_path(ad), :class => 'btn btn-default'
+        = link_to :edit.l, edit_ad_path(ad), :class => 'btn btn-warning'
+        = link_to :delete.l, ad_path(ad), data: { confirm: :are_you_sure.l }, :method => :delete, :class => 'btn btn-danger'
 
-        - for ad in @ads
-          %tr
-            %td= link_to h(ad.name), ad_path(ad)
-            %td= h ad.published?
-            %td= h ad.location
-            %td{:colspan => 3}
-              = link_to :edit.l, edit_ad_path(ad)
-              |
-              = link_to :destroy.l, ad_path(ad), :confirm => :are_you_sure.l, :method => :delete
-            
-      .pagination=paginate @ads
-      
-      %br
-      = link_to :new_ad.l, new_ad_path
+= paginate @ads, :theme => 'bootstrap'
+= link_to :new_ad.l, new_ad_path, :class => 'btn btn-success'

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

@@ -1,45 +1,6 @@
--box do
-  %h3=:new_ad.l
-  = error_messages_for :ad
-  = form_for(:ad, :url => ads_path, :html => {:class => "MainForm" }) do |f|
-    %label=:name.l
-    = f.text_field :name
+-@page_title=:new_ad.l
 
-    %label=:html.l
-    = f.text_area :html, :size => '80x10', :class => "rich_text_editor"
+%p
+  = link_to :back.l, ads_path, :class => 'btn btn-default'
 
-    %label=:frequency.l
-    = f.select :frequency, Ad.frequencies_for_select
-
-    %label=:audience.l
-    = f.select :audience, Ad.audiences_for_select
-
-    %fieldset{"for"=>"ad_published"}
-      = f.check_box :published
-      %label
-        =:published.l
-        \?
-
-    %fieldset{"for"=>"ad_time_constrained"}
-      = f.check_box :time_constrained
-      %label
-        =:time_constrained.l
-        \?
-
-    #time_constraints{"style"=>"display:#{ @ad.time_constrained? ? 'block' : 'none'}"}
-      %label=:start_date.l
-      = f.datetime_select :start_date
-      %label=:end_date.l
-      = f.datetime_select :end_date
-
-    -content_for :end_javascript do
-      :javascript
-        Event.observe("ad_time_constrained", "click", function(){$('time_constraints').toggle()})
-
-    %label=:location.l
-    = f.text_field :location
-
-    %p
-      = submit_tag :create.l
-
-  = link_to :back.l, ads_path
+=render 'form'

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

@@ -1,36 +1,19 @@
--box do
-  %h3=:showing_ad.l
-  %p
-    %b
-      =:name.l
-      \:
-    = h @ad.name
-  %p
-    %b
-      =:html.l
-      \:
-    = raw @ad.html
-  %p
-    %b
-      =:frequency.l
-      \:
-    = h @ad.frequency
-  %p
-    %strong
-      =:published.l
-      \?
-    = @ad.published?
-  %p
-    %b 
-      =:run.l
-      \:
-    = h @ad.time_constrained? ? "#{@ad.start_date.to_formatted_s(:long)} - #{@ad.end_date.to_formatted_s(:long)}" : 'n/a'
-  %p
-    %b 
-      =:location.l
-      \:
-    = h @ad.location
+-@page_title=@ad.name
+%p
+  = link_to :back.l, ads_path, :class => 'btn btn-default'
+  = link_to :edit.l, edit_ad_path(@ad), :class => 'btn btn-warning'
+  = link_to :destroy.l, ad_path(@ad), data: { confirm: :are_you_sure.l }, :method => :delete, :class => 'btn btn-danger'
 
-  = link_to :edit.l, edit_ad_path(@ad)
-  |
-  = link_to :back.l, ads_path
+%dl.dl-horizontal
+  %dt=:name.l
+  %dd= h @ad.name
+  %dt=:html.l
+  %dd= raw @ad.html
+  %dt=:frequency.l
+  %dd= h @ad.frequency
+  %dt=:published.l
+  %dd= @ad.published?
+  %dt=:run.l
+  %dd= h @ad.time_constrained? ? "#{@ad.start_date.to_formatted_s(:long)} - #{@ad.end_date.to_formatted_s(:long)}" : 'n/a'
+  %dt=:location.l
+  %dd= h @ad.location

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

@@ -1,14 +1,19 @@
-%label 
-  =:title.l + ":"
-= f.text_field :title, :size => 35
+-if @album.new_record?
+  - url = user_albums_path(@user)
+  - object = @album
+  - button1 = :create_and_add_photos.l
+  - button2 = :create_album.l
+-else
+  - url = user_album_path(@user, @album)
+  - object = [@user, @album]
+  - button1 = :edit_and_add_photos.l
+  - button2 = :edit_album.l
 
-%label
-  =:description.l + ":"
-= f.text_area :description, :size => "58x5"
+=bootstrap_form_for object, :url => url, :layout => :horizontal do |f|
+  = f.text_field :title
+  = f.text_area :description
+  = hidden_field_tag :go_to
 
-= hidden_field_tag :go_to
-
-%p
-  = f.submit button1
-  = :or.l
-  =  f.submit button2, :onclick => "Form.getInputs(this.form, null, 'go_to')[0].value = 'only_create'"
+  .btn-group
+    = f.primary button2, :onclick => "Form.getInputs(this.form, null, 'go_to')[0].value = 'only_create'"
+    = f.primary button1

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

@@ -1,16 +1,14 @@
-.yui-b
-  -box do 
-    %h3 Tips
-    %p 
-      =:album_tip.l :community_name => configatron.community_name
+-@page_title = :edit_album.l
 
-  -box :class => 'alt' do
-    = link_to :back_to_photo_manager.l, user_photo_manager_index_path(current_user)
+-widget do
+  %h3 Tips
+  %p=:album_tip.l :community_name => configatron.community_name
+
+= link_to :back.l, user_photo_manager_index_path(current_user), :class => 'btn btn-default'
+= link_to :show.l, user_album_path(current_user, @album), :class => 'btn btn-primary'
+= link_to :add_photos.l, new_user_album_photo_path(@album.user,@album), :class => 'btn btn-primary'
+= link_to :delete.l, user_album_path(current_user, @album), :method => 'delete', data: { confirm: :are_you_sure.l }, :class => 'btn btn-danger'
+
+%h3= "Album Details"
+= render 'form'
 
-#yui-main
-  .yui-b
-    -box :id => "single_upload", :class => ".yui-b" do
-      %h3= :new_album.l
-      = form_for(@album, :url => user_album_path(current_user, @album),:html => {:class => "MainForm"}) do |f|  
-        = render :partial => 'form', :locals => {:f => f, :button1 => :edit_and_add_photos.l, :button2 => :edit_album.l }
-    

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

@@ -1,15 +1,10 @@
-.yui-b
-  -box do 
-    %h3 Tips
-    %p 
-      =:album_tip.l :community_name => configatron.community_name
+-@page_title= :new_album.l
+-widget do 
+  %h3 Tips
+  %p=:album_tip.l :community_name => configatron.community_name
 
-  -box :class => 'alt' do
-    = link_to :back_to_photo_manager.l, user_photo_manager_index_path(current_user)
+%p
+  = link_to :back.l, user_photo_manager_index_path(current_user), :class => 'btn btn-default'
 
-#yui-main
-  .yui-b
-    -box :id => "single_upload", :class => ".yui-b" do
-      %h3= :new_album.l
-      = form_for(@album, :url => user_albums_path(current_user.id), :html => {:class => "MainForm"}) do |f|
-        = render :partial => 'form', :locals => {:f => f, :button1 => :create_and_add_photos.l, :button2 => :create_album.l }
+%h2= 'Album Details'
+=render 'form'

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

@@ -1,32 +1,25 @@
-.profile
-  .yui-b
-    = render :partial => 'posts/author_profile', :locals => {:user => @album.user}
-    = link_to :back_to_photo_manager.l, user_photo_manager_index_path(@album.user) 
-
-  #yui-main
-    .yui-b
-      -box :class => "hfeed" do 
-        %h3= h @album.title
-        %p= h @album.description
-
-
-        %h3= :photos_of_this_album.l
-        #photos.yui-u.box
-          - @album_photos.each do |photo|
-            = link_to image_tag( photo.photo.url(:thumb), :class => "polaroid"), | 
-              user_photo_path(photo.user, photo) |
-          = paginate @album_photos
-
-
-      -box :class => "hfeed comments", :id => 'comments' do
-        %h3=:album_comments.l
-        %h2=:add_your_comment.l
-        %p= render :partial => 'comments/comment_form', :locals => {:commentable => @album}
-        %a#newest_comment
-        = render :partial => 'comments/comment', :collection => @album.comments
-        %span#more_comments_links= more_comments_links(@album)
-
-
-
-
-
+-@page_title = @album.title
+= render :partial => 'posts/author_profile', :locals => {:user => @album.user}
+
+-if @album.user == current_user
+  %p
+    = link_to :back.l, user_photo_manager_index_path(@album.user), :class => 'btn btn-default'
+    = link_to :edit.l, edit_user_album_path(@album.user,@album), :class => 'btn btn-warning'
+    = link_to :add_photos.l, new_user_album_photo_path(@album.user,@album), :class => 'btn btn-primary'
+    = link_to :delete.l, user_album_path(@album.user,@album), data: { confirm: :delete_album_and_photos.l }, :method => :delete, :class => 'btn btn-danger'
+
+%p= h @album.description
+%h2= :photos_of_this_album.l
+%ul.list-unstyled.thumbnails
+  - @album_photos.each do |photo|
+    %li.col-sm-2
+      = link_to image_tag(photo.photo.url(:thumb)), user_photo_path(photo.user, photo), :class => 'thumbnail'
+= paginate @album_photos, :theme => 'bootstrap'
+
+-box :id => 'comments' do
+  %h2=:album_comments.l
+  %h3=:add_your_comment.l
+  %p= render :partial => 'comments/comment_form', :locals => {:commentable => @album}
+  %a#newest_comment
+  = render :partial => 'comments/comment', :collection => @album.comments
+  %span#more_comments_links= more_comments_links(@album)

data/app/views/base/_homepage_banner_message.html.haml

@@ -1,19 +1,5 @@
-#welcome
-  .yui-gc
-    .yui-u.first
-      -box do 
-        %h2
-          =:get_started_banner.l :site=>configatron.community_name
-        %p
-          =:homepage_banner_msg.l
-        %h4
-          %a{:href=>"http://www.missingmethod.com/projects/community_engine"}
-            =:homepage_banner_download_msg.l
-    .yui-u
-      -box do 
-        %h2
-          =:homepage_banner_signup_prompt.l
-        %p
-          =:create_your_account.l
-        %h4 
-          =link_to :sign_up.l, signup_path
+-jumbotron do
+  %h1
+    =:get_started_banner.l :site=>configatron.community_name
+  %p.lead
+    =link_to :sign_up.l, signup_path

data/app/views/base/advertise.html.haml

@@ -1,8 +1,5 @@
-= render :partial => 'about_nav'
-
-#yui-main
-  .yui-b
-    -box do 
-      %h3
-        =:advertise_on.l
-        =" #{configatron.community_name}"
+-@page_title = :advertise_on.l + " #{configatron.community_name}"
+%p
+  Contact us at
+  =mail_to "#{configatron.support_email}"
+  to discuss advertising. We'd love to hear from you!

data/app/views/base/site_index.html.haml

@@ -1,35 +1,33 @@
+- @page_title = configatron.community_name + ' ' + :home.l
 - @meta = { :description => configatron.meta_description, :keywords => configatron.meta_keywords, :robots => configatron.robots_meta_list_content }
 
 -unless logged_in?
   =render :partial => 'base/homepage_banner_message'
 
-#yui-main
-  .yui-b
-    -box :class => "hfeed" do 
-      %h3
-        =:recent_posts.l
-      = render :partial => 'posts/post', :collection => @posts
-      %h6.all= link_to :see_all_recent_posts.l, recent_path
-.yui-b  
-  =render :partial => 'shared/explore'
+-box :class => "hfeed" do 
+  %h2
+    =:recent_posts.l
+  = render :partial => 'posts/post', :collection => @posts
+  =link_to fa_icon('plus-circle', :text => :see_all_recent_posts.l), recent_path
 
-  -box :class => "alt" do 
-    %h3
-      = :whats_hot.l
-      
-    %ul.list.page
-      -@popular_posts.each do |post|
-        =render :partial => 'posts/sidebar_post', :locals => {:post => post}
-    %h6.all
-      %a{:href=>popular_url}= :see_all.l
+=render :partial => 'shared/explore'
 
-  -box :class => "alt" do 
-    %h3
-      =:featured_writer.l
-    -@featured_writers.each do |user|
-      =render :partial => "users/sidebar_user", :locals => {:user => user}
+-widget do
+  %h4
+    .small= :whats_hot.l
+  %ul.list-unstyled
+    -@popular_posts.each do |post|
+      =render :partial => 'posts/sidebar_post', :locals => {:post => post}
+  =link_to fa_icon('plus-circle', :text => :see_all.l), popular_url
 
-  -box :class => "alt" do 
-    %h3= :active_users.l
-    -@active_users.each do |user|    
-      =render :partial => "users/sidebar_user", :locals => {:user => user}      
+-widget do
+  %h4
+    .small=:featured_writer.l
+  -@featured_writers.each do |user|
+    =render :partial => "users/sidebar_user", :locals => {:user => user}
+
+-widget do
+  %h4
+    .small= :active_users.l
+  -@active_users.each do |user|
+    =render :partial => "users/sidebar_user", :locals => {:user => user}

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

@@ -0,0 +1,8 @@
+= bootstrap_form_for(@category, :layout => :horizontal) do |f|
+  = f.text_field :name
+  = f.text_area :tips, :rows => 3, :help => 'Encourages people to add to this category'
+  = f.text_field :new_post_text, :help => 'Text For New Post Link'
+  = f.text_field :nav_text, :help => 'Text for Nav Link'
+
+  = f.form_group :submit_group do
+    = f.primary :save.l

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

@@ -0,0 +1,13 @@
+- if params[:controller] == 'categories'
+  - css_class = 'active'
+- else
+  - css_class = 'inactive'
+
+- if Category.all.any?
+  %li{:class => 'dropdown ' + css_class}
+    %a.dropdown-toggle{:href => categories_path, 'data-target' => '#', 'data-toggle' => 'dropdown'}
+      =:categories.l
+      %b.caret
+    %ul.dropdown-menu
+      -for category in Category.order('name')
+        %li=link_to category.name, category

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

@@ -1,10 +1,10 @@
-- if category 
+- if !category.nil? && !category.tips.blank?
   %h3= category.name
   %p= category.tips
 - else 
   %h3=:we_need_you.l
   %p
-    %em
+    %em
       =:every_person_has_something_to_say.l