pages_cms 2.0.1 → 2.1.0

data/app/views/pages_cms/admin/images/index.html.haml

@@ -2,30 +2,20 @@
 = render 'pages_cms/admin/shared/tabs', active: 'Images'
 
 %div.container-fluid.back
-  %div.row
-    %div.col-md-6
-      %h4 Upload Image
-      = form_for @image, url: admin_images_path, method: :post, multipart: true do |f|
-        = f.text_field :name, placeholder: 'give your image a title', class: 'form-control'
-        = f.file_field :file, class: 'form-control'
-        <br />
-        = f.submit 'Upload', class: 'btn btn-primary'
-    %div.col-md-6
-      %h4 Image Url
-      = form_for @image, url: admin_images_path, method: :post do |f|
-        = f.hidden_field :is_url, value: true
-        = f.text_field :name, placeholder: 'give your image a title', class: 'form-control'
-        = f.text_field :file, placeholder: 'give me an image url', class: 'form-control'
-        <br />
-        = f.submit 'Insert', class: 'btn btn-primary'
-
-  <hr>
-
-  %div.row
+  %div.row.back
+    %div.col-md-3.col-sm-4.col-xs-6
+      %div.thumbnail
+        = form_for @image, url: admin_images_path, method: :post, multipart: true do |f|
+          %div{ style: 'height:190px;overflow:hidden;'}
+            = f.file_field :file, class: 'form-control'
+          %p
+            = f.text_field :name, placeholder: 'give your image a title', class: 'form-control'
+          = f.submit 'Upload', class: 'btn btn-primary btn-xs'
     - @images.each do |image|
       %div.col-md-3.col-sm-4.col-xs-6
-        .thumbnail
-          = image_tag image.file
+        %div.thumbnail
+          %div{ style: 'height:200px;overflow:hidden;'}
+            = image_tag image.file
           %p
-            = link_to image.name, image.file
+            = link_to image.name, image.file.url
           = link_to 'delete', admin_image_path(image), method: :delete, class: 'btn btn-xs btn-default'

data/app/views/pages_cms/admin/pages/index.html.haml

@@ -1,12 +1,12 @@
 <br />
 = render 'pages_cms/admin/shared/tabs', active: 'AdminPanel'
 
-<br />
 %div.container-fluid
-  %div.row
+  %div.row.back
     %div.col-md-6
-      %div.space-bottom.back
+      %div.space-bottom
         %h3 Pages
+        <hr>
         = link_to 'New Page', admin_pages_path(page: {title: "my page #{PagesCms::Page.last.id.to_i+1 if PagesCms::Page.last }"}), method: :post, class: 'btn btn-default'
         = params[:sortable] == 'on' ? link_to('Done Sorting', admin_pages_path, class: 'btn btn-default') : link_to('Sort', admin_pages_path(sortable: 'on'),class: 'btn btn-default')
         %hr
@@ -53,7 +53,7 @@
                       - else
                         - break
     %div.col-md-6
-      %div.space-bottom.back
+      %div.space-bottom
         %h3 New Contacts
         %table.table
           - PagesCms::Contact.all.reverse_order.limit(5).each do |contact|
@@ -64,7 +64,7 @@
                 = contact.email
               %td
                 = truncate(contact.message, length: 50)
-      %div.space-bottom.back
+      %div.space-bottom
         %h3 New Articles
         %table.table
           - PagesCms::Article.all.reverse_order.limit(5).each do |article|
@@ -78,6 +78,17 @@
               %td
                 %small
                   = truncate(strip_tags(article.content_either), length: 50)
+      %div.space-bottom
+        %h3 Accounts
+        %table.table
+          - PagesCms::Account.all.each do |account|
+            %tr
+              %td
+                = account.name
+              %td
+                = account.mount_location
+              %td
+                = link_to 'Switch To', admin_accounts_site_path(account: account.id), method: :post
 
 
 :javascript

data/app/views/pages_cms/pages/_main.html.haml

@@ -10,7 +10,7 @@
           %div.back.col-md-4
             %div.thumbnail
               - if thumb.image
-                = image_tag thumb.image.file
+                = image_tag thumb.image.file.url
               - else
                 = image_tag '/images/default.jpg'
               %h4
@@ -27,7 +27,7 @@
         - block.image_boxes.each do |box|
           %div.image-box
             - if box.image
-              = image_tag box.image.file
+              = image_tag box.image.file.url
             - else
               = image_tag '/images/default.jpg'
             %h3

data/app/views/pages_cms/pages/_slider.html.erb

@@ -28,7 +28,7 @@
 					<% set = true %>
 				<% end %>
 				<div class="item <%= active %>">
-					<%= image_tag element.image.file, class: "img-responsive center-block" %>
+					<%= image_tag element.image.file.url, class: "img-responsive center-block" %>
 					<div class="carousel-caption">
 						<h1><%= link_to element.header, element.link %></h1>
 					</div>

data/app/views/pages_cms/pages/show.html.haml

@@ -4,12 +4,12 @@
 
 - if @sliders && @sliders.count == 1
   %div.container-contain.main-background
-    = image_tag @sliders.first.image.file if @sliders.first.image
+    = image_tag @sliders.first.image.file.url if @sliders.first.image
     %div.header-text
       %h1
-        = @sliders.first.header if @sliders.first.header
+        = @sliders.first.header
       %p
-        = @sliders.first.subheading if @sliders.first.subheading
+        = @sliders.first.subheading
 
 - elsif @sliders
   = render 'slider', slider_elements: @sliders

data/config/routes.rb

@@ -13,7 +13,7 @@ PagesCms::Engine.routes.draw do
     post '/accounts/site' => 'accounts#site'
   end
 
-  if PagesCms.const_defined?('Account')
+  # if PagesCms.const_defined?('Account')
     PagesCms::Account.where("mount_location != '/'").each do |account|
       get "/#{account.mount_location}/:parent/:slug"  => 'pages#show', account: account.id
       get "/#{account.mount_location}/:slug"          => 'pages#show', account: account.id
@@ -26,6 +26,6 @@ PagesCms::Engine.routes.draw do
       get '/:slug'          => 'pages#show', account: raccount.id, root: true
       get '/'               => 'pages#home', account: raccount.id, root: true, as: :root
     end
-  end
+  # end
 
 end

data/lib/pages_cms/engine.rb

@@ -4,6 +4,9 @@ require 'jquery-rails'
 require 'cocoon'
 require 'html_truncator'
 require 'redcarpet'
+require 'carrierwave'
+require 'fog'
+require 'mini_magick'
 
 module PagesCms
   class Engine < ::Rails::Engine

data/lib/pages_cms/version.rb

@@ -1,3 +1,3 @@
 module PagesCms
-  VERSION = '2.0.1'
+  VERSION = '2.1.0'
 end

data/test/dummy/config/initializers/carrier_wave.rb

@@ -0,0 +1,11 @@
+if Rails.env.production?
+  CarrierWave.configure do |config|
+    config.fog_credentials = {
+      # Configuration for Amazon S3
+      :provider              => 'AWS',
+      :aws_access_key_id     => ENV['S3_ACCESS_KEY'],
+      :aws_secret_access_key => ENV['S3_SECRET_KEY']
+    }
+    config.fog_directory     =  ENV['S3_BUCKET']
+  end
+end