trusty-cms 3.1.8 → 3.1.9

data/app/views/admin/sites/index.haml

@@ -0,0 +1,43 @@
+= stylesheet_link_tag 'admin/multi_site'
+= render_region :top 
+
+%h1 Sites
+
+%table{:class => "index", :cellspacing => "0"}
+  %thead
+    %tr
+      - render_region :thead do |thead|
+        - thead.title_header do
+          %th.site Name
+        - thead.domain_header do
+          %th.domain Domain match
+        - thead.basedomain_header do
+          %th.basedomain Base domain
+        - thead.modify_header do
+          %th.remove Delete
+        - thead.order_header do
+          %th.order Order
+    %tbody
+    - @sites.each do |site|
+      %tr.node.level-1
+        - render_region :tbody do |tbody|
+          - tbody.title_cell do
+            %td.site
+              = link_to site.name, edit_admin_site_path(site)
+          - tbody.domain_cell do
+            %td.domain
+              = h(site.domain)
+          - tbody.basedomain_cell do
+            %td.basedomain
+              = h(site.base_domain)
+          - tbody.modify_cell do
+            %td.remove
+              = link_to image("remove.png", :alt => "Remove"), admin_site_path(site), :method => :delete, :confirm => "Are you sure you want to permanently remove #{site.name}?"
+          - tbody.order_cell do
+            %td.order
+              = order_links(site).html_safe
+
+- render_region :bottom do |bottom|
+  - bottom.new_button do
+    %p
+      = link_to "New Site", new_admin_site_path

data/app/views/admin/sites/new.haml

@@ -0,0 +1,7 @@
+= stylesheet_link_tag 'admin/multi_site'
+- render_region :main do |main|
+  - main.edit_header do
+    %h1 New Site
+  - main.edit_form do
+    = form_for @site, :url => admin_sites_path do |f|
+      = render :partial => "form", :locals => {:f => f}

data/app/views/admin/snippets/_choose_site.html.haml

@@ -0,0 +1,6 @@
+- unless current_user.site
+  %p{:style => 'float: left; margin-right: 32px'}
+    %label{:for=>"snippet_site_id", :Class => "admin_only"}
+      Site
+      - sites = Site.all.map { |s| [s.name, s.id] }
+      = select :snippet, :site_id, sites, :include_blank => Snippet.is_shareable?, :selected => @snippet.site_id || current_site.id

data/app/views/admin/users/_choose_site.html.haml

@@ -0,0 +1,8 @@
+- unless current_user.site
+  %tr
+    %th.label
+      %label{:for=>"user_admin"} Can edit site
+    %td.field{:style => 'text-align: left;'}
+      = select :user, :site_id, [['<any>', '']] + Site.all.map { |s| [s.name, s.id] }
+    %td.help
+      A user with no site is able to act (to whatever extent their status allows) on any site.

data/config/application.rb

@@ -92,8 +92,6 @@ module TrustyCms
     # TODO: Workaround from: https://github.com/rtomayko/rack-cache/issues/80
     config.middleware.insert_before(Rack::ConditionalGet, Rack::Cache)
     config.assets.enabled = true
-    config.assets.paths << Rails.root.join('vendor', 'assets', 'bower_components')
-
 
     config.filter_parameters += [:password, :password_confirmation]
 

data/config/initializers/trusty_cms_config.rb

@@ -1,3 +1,5 @@
+require 'multi_site/engine'
+
 TrustyCms.config do |config|
   config.define 'admin.title', :default => "TrustyCms CMS"
   config.define 'dev.host'
@@ -14,8 +16,12 @@ TrustyCms.config do |config|
   config.define 'site.host', :default => "www.example.com", :allow_blank => false
   config.define 'user.allow_password_reset?', :default => true
   config.define 'session_timeout', :default => 2.weeks
+  require 'multi_site/scoped_validation'
 end
 
 if TrustyCms.config_definitions['defaults.snippet.filter'].nil?
   TrustyCms.config.define 'defaults.snippet.filter', :select_from => lambda { TextFilter.descendants.map { |s| s.filter_name }.sort }, :allow_blank => true
 end
+
+Admin::LayoutsController.send :helper, MultiSite::SiteChooserHelper
+Admin::SnippetsController.send :helper, MultiSite::SiteChooserHelper

data/config/routes.rb

@@ -33,6 +33,14 @@ TrustyCms::Application.routes.draw do
     resources :page_parts
     resources :page_fields
     match '/reference/:type(.:format)' => 'references#show', :as => :reference, :via => :get
+
+    resources :sites do
+      get :remove, on: :member
+      post :move_higher, on: :member
+      post :move_lower, on: :member
+      put :move_to_top, on: :member
+      put :move_to_bottom, on: :member
+    end
   end
 
   get 'admin' => 'admin/welcome#index', :as => :admin