browsercms 3.5.7 → 4.0.0.alpha

data/app/assets/stylesheets/cms/styles/_progress.css.scss

@@ -0,0 +1,43 @@
+/* PROGRESS BAR STYLES */
+.progress {
+    @include rem(height,1.75rem);
+    @include rem(margin-bottom,1.5rem);
+    overflow: hidden;
+    background: $light;
+    @include border-radius(4px);
+    border: 1px solid rgba(black,0.1);
+
+    .bar {
+        float: left;
+        width: 0;
+        height: 100%;
+        @include rem(font-size,0.75rem);
+        border-right: 1px solid rgba(black,0.05);
+        color: white;
+        -webkit-font-smoothing: antialiased;
+        text-align: center;
+        background: $primary;
+        @include transition(width 0.6s);
+    }
+
+    &.progress-info {
+        .bar {
+            background: $secondary;
+        }
+    }
+    &.progress-success {
+        .bar {
+            background: $success;
+        }
+    }
+    &.progress-warning {
+        .bar {
+            background: $warning;
+        }
+    }
+    &.progress-danger {
+        .bar {
+            background: $danger;
+        }
+    }
+}

data/app/assets/stylesheets/cms/styles/_tables.css.scss

@@ -0,0 +1,141 @@
+/* TABLE STYLES */
+.table {
+	width: 100%;
+	font-family: 'Source Sans Pro', sans-serif;
+	font-weight: 400;
+	@include rem(font-size, 1.1rem);
+	color: $dark;
+	@include rem(margin-bottom,1.5rem);
+	border-spacing: 0;
+	display: table;
+
+	thead {
+		display: table-header-group;
+		background: $light;
+		border-bottom: 1px solid rgba(black,0.07);
+
+		th {
+			display: table-cell;
+			font-weight: 600;
+			@include rem(padding,0.7rem);
+		}
+	}
+
+	tr {
+		display: table-row;
+		border-bottom: 1px solid rgba(black,0.05);
+
+		&:last-child {
+			border: 0;
+		}
+	}
+
+	td {
+		display: table-cell;
+		@include rem(padding,0.7rem);
+	}
+}
+
+.table-striped {
+	thead {
+		border-bottom: 1px solid rgba(black,0.05);
+	}
+	tbody {
+		tr {
+			border-bottom: 1px solid rgba(black,0.035);
+
+			&:nth-child(odd) {
+				background: rgba($light,0.25);
+			}
+			&:last-child {
+				border-bottom: 0;
+			}
+		}
+	}
+}
+
+.table-bordered {
+	border: 1px solid rgba(black,0.1);
+	border-collapse: separate;
+	*border-collapse: collapse;
+	@include border-radius(5px);
+
+	thead {
+		display: table-header-group;
+		@include border-radius(5px 5px 0 0);
+
+		th {
+			border-bottom: 1px solid rgba(black,0.07);
+			border-right: 1px solid rgba(black,0.07);
+
+			&:first-child {
+				@include border-radius(5px 0 0 0);
+			}
+			&:last-child {
+				@include border-radius(0 5px 0 0);
+				border-right: 0;
+			}
+
+			&:only-child {
+				@include border-radius(5px 5px 0 0);
+			}
+		}
+	}
+	tbody {
+		tr {
+			td {
+				border-bottom: 1px solid rgba(black,0.07);
+				border-right: 1px solid rgba(black,0.07);
+
+				&:last-child {
+					border-right: 0;
+				}
+			}
+
+			&:last-child {
+				td {
+					border-bottom: 0;
+
+					&:first-child {
+						@include border-radius(0 0 0 5px);
+					}
+					&:last-child {
+						@include border-radius(0 0 5px 0);
+					}
+
+					&:only-child {
+						@include border-radius(0 0 5px 5px);
+					}
+				}
+			}
+		}
+	}
+}
+
+.table-hover {
+	tbody {
+		tr {
+			&:hover {
+				background: rgba($light,0.65);
+			}
+		}
+	}
+}
+
+.table-condensed {
+	@include rem(font-size,1rem);
+
+	thead th, td {
+		@include rem(padding,0.35rem 0.7rem);
+	}
+}
+
+.success {
+	background: rgba($success,0.3);
+}
+.error {
+	background: rgba($danger,0.3);
+}
+.warning {
+	background: rgba($warning,0.3);
+}

data/app/assets/stylesheets/cms/styles/_text.css.scss

@@ -0,0 +1,134 @@
+/* TEXT ELEMENTS */
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+	font-family: 'Roboto', sans-serif;
+	font-weight: 500;
+	line-height: 1.25;
+    margin-top: 0;
+}
+
+h1 {
+	@include rem(font-size,2.3rem);
+	@include rem(margin-bottom,1rem);
+	margin-top: -5px;
+}
+h2 {
+	@include rem(font-size,1.85rem);
+	@include rem(margin-bottom,0.875rem);
+}
+h3 {
+	@include rem(font-size,1.4rem);
+	@include rem(margin-bottom,0.75rem);
+}
+h4 {
+	@include rem(font-size,1.1rem);
+	@include rem(margin-bottom,0.75rem);
+}
+h5 {
+	@include rem(font-size, 0.9rem);
+	@include rem(margin-bottom,0.5rem);
+}
+h6 {
+	@include rem(font-size, 0.75rem);
+	margin-bottom: 0;
+}
+
+p {
+	font-family: 'Source Sans Pro', sans-serif;
+	@include rem(font-size, 1.1rem);
+	line-height: 1.3;
+	@include rem(margin-bottom, 1.1rem);
+	font-weight: 400;
+
+	&.lead {
+		@include rem(font-size, 1.35rem);
+	}
+
+	small {
+		@include rem(font-size,0.875rem);
+	}
+}
+strong {
+	font-weight: 700;
+}
+em {
+	font-style: italic;
+}
+
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p,
+li {
+	color: $dark;
+}
+.primary-color {
+	color: $primary;
+}
+.secondary-color {
+	color: $secondary;
+}
+.dark {
+	color: $dark;
+}
+.gray {
+	color: $gray;
+}
+.light {
+	color: $light;
+}
+
+.text-left {
+	text-align: left;
+}
+.text-right {
+	text-align: right;
+}
+.text-center {
+	text-align: center;
+}
+.text-justify {
+	text-align: justify;
+}
+
+blockquote {
+	display: block;
+	width: 100%;
+	border-left: 7px solid $primary;
+	@include rem(padding, 0.25rem 0 0.5rem 1.5rem);
+	@include rem(margin, 2rem 0);
+
+	p {
+		@include rem(font-size, 1.5rem);
+		@include rem(margin-bottom, 0.5rem);
+		line-height: 1.2;
+		font-weight: 300;
+	}
+
+	small {
+		font-family: 'Source Sans Pro', sans-serif;
+		text-transform: uppercase;
+		@include rem(font-size,0.875rem);
+		font-weight: 600;
+	}
+
+	cite {
+		font-style: italic;
+	}
+}
+
+hr {
+	border: 0;
+	background: $light;
+	height: 1px;
+	width: 70%;
+	@include rem(margin,2.25rem auto);
+	display: block;
+}

data/app/controllers/cms/application_controller.rb

@@ -1,71 +1,6 @@
 module Cms
-class ApplicationController < ::ApplicationController
-  include Cms::Authentication::Controller
-  include Cms::ErrorHandling
-  include Cms::DomainSupport
+  class ApplicationController < ::ApplicationController
+    include Cms::AdminController
 
-  helper Cms::ApplicationHelper
-  helper Cms::FormTagHelper
-  include Cms::PathHelper
-  helper Cms::PathHelper
-  include Cms::PageHelper
-  helper Cms::PageHelper
-  helper Cms::MenuHelper
-  helper Cms::RenderingHelper
-  helper Cms::UiElementsHelper
-
-  protected
-    def escape_javascript(javascript)
-      (javascript || '').gsub('\\','\0\0').gsub('</','<\/').gsub(/\r\n|\n|\r/, "\\n").gsub(/["']/) { |m| "\\#{m}" }
-    end
-  
-    def redirect_to_first(*urls)
-      urls.each do |url|
-        unless url.blank?
-          return redirect_to(url)
-        end
-      end
-    end
-    
-    def current_site
-      @current_site ||= Site.find_by_domain(request.host)
-    end
-     
-    def redirect_to_cms_site
-      if using_cms_subdomains? && !request_is_for_cms_subdomain?
-        redirect_to(url_with_cms_domain_prefix)
-      end
-    end 
-  
-    def append_to_query_string(url, *params)
-      new_url = url["?"] ? url : "#{url}?"
-      new_url << params.map{|k,v| "#{k.to_s}=#{CGI::escape(v.to_s)}"}.join("&")
-    end
-  
-    def cms_access_required
-      raise Cms::Errors::AccessDenied unless current_user.able_to?(:administrate, :edit_content, :publish_content)
-    end
-  
-    def self.check_permissions(*perms)
-      opts = Hash === perms.last ? perms.pop : {}
-      before_filter(opts) do |controller|
-        raise Cms::Errors::AccessDenied unless controller.send(:current_user).able_to?(*perms)
-      end      
-    end
-  
-    def url_with_cms_domain_prefix
-      if cms_site?
-        request.url
-      elsif request.subdomains.first == "www"
-        request.url.sub(/www\./, "#{cms_domain_prefix}.")
-      else
-        request.url.sub(/:\/\//, "://#{cms_domain_prefix}.")
-      end
-    end
-  
-    def url_without_cms_domain_prefix
-      request.url.sub(/#{cms_domain_prefix}\./,'')
-    end
-  
-end
+  end
 end

data/app/controllers/cms/attachments_controller.rb

@@ -1,9 +1,7 @@
 module Cms
   class AttachmentsController < Cms::BaseController
 
-    skip_before_filter :redirect_to_cms_site, :only => [:download]
-    skip_before_filter :login_required, :only => [:download]
-    skip_before_filter :cms_access_required, :only => [:download]
+    allow_guests_to [:download]
 
     include ContentRenderingSupport
     include Cms::Attachments::Serving
@@ -26,7 +24,7 @@ module Cms
     end
 
     def create
-      @attachment = Attachment.new(params[:attachment])
+      @attachment = Attachment.new(permitted_params())
       @attachment.published = true
       if @attachment.save
         render :partial => 'cms/attachments/attachment_wrapper', :locals => {:attachment => @attachment}
@@ -43,6 +41,8 @@ module Cms
     end
 
     private
-
+    def permitted_params
+      params.require(:attachment).permit(Attachment.permitted_params)
+    end
   end
 end

data/app/controllers/cms/base_controller.rb

@@ -1,15 +1,22 @@
 module Cms
-class BaseController < Cms::ApplicationController
-  
-  before_filter :redirect_to_cms_site
-  before_filter :login_required
-  before_filter :cms_access_required
-
-  layout 'cms/application'
-    
-#  verify :method => :post, :only => [:create]
-#  verify :method => :put, :only => [:update]
-#  verify :method => :delete, :only => [:destroy]
-    
-end
+  class BaseController < Cms::ApplicationController
+
+    before_filter :redirect_to_cms_site
+    before_action :authenticate_cms_user!
+    before_filter :cms_access_required
+
+    layout 'cms/application'
+
+
+    # Disables the default security level for actions, meaning they will be available for guests to access.
+    # Users will not need to login prior to accessing these methods.
+    #
+    # @param [Array<Symbol>] methods List of methods to disable security for.
+    def self.allow_guests_to(methods)
+      skip_before_action :redirect_to_cms_site, only: methods
+      skip_before_action :authenticate_cms_user!, only: methods
+      skip_before_action :cms_access_required, only: methods
+    end
+
+  end
 end