RubyGems - casein - Versions diffs - 4.0.0 → 5.0.0.0 - Mend

casein 4.0.0 → 5.0.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (83) hide show

data/app/views/layouts/casein_auth.html.erb CHANGED

@@ -1,24 +1,36 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-		<title>Welcome to <%= casein_config_website_name %></title>
-		<%= stylesheet_link_tag "casein/login" %>
-		<%= javascript_include_tag "casein/login" %>
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Welcome to <%= casein_config_website_name %></title>
+    <%= stylesheet_link_tag "casein/login" %>
+		<%= javascript_include_tag "casein/casein" %>
 		<%= csrf_meta_tag %>
-	</head>
-	<body>
-		<div id="header">
-			<h1><%= image_tag(casein_config_logo, :alt => casein_config_website_name) %></h1>
-		</div>
-		<div id="content">
-			<%= yield %>
-		</div>
-		<div id="footer">
-			<p>Based on <%= link_to "Casein", "http://www.caseincms.com" %> <%= casein_get_short_version_string %> technology,
-			an open-source project.</p>
+		<!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
+    <!--[if lt IE 9]>
+      <%= javascript_include_tag("casein/html5shiv") %>
+    <![endif]-->
+  </head>
+  <body>
+  	<div class="container-narrow">
+			<div class="jumbotron">
+				<div class="row brand">
+					<%= image_tag(casein_config_logo, :alt => casein_config_website_name) %>
+				</div>
+				<%= yield %>
+			</div>
+			<div class="row">
+				<div class="col-lg-12">
+					<hr />
+					<footer>
+						<p><%= casein_get_footer_string(false) %></p>
+					</footer>
+				</div>
+			</div>
 		</div>
-	</body>
-</html>
+  </body>
+</html>

data/app/views/layouts/casein_main.html.erb CHANGED

@@ -1,67 +1,114 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-		<title><%= casein_generate_page_title %></title>
-		<% casein_config_stylesheet_includes.each do |stylesheet| %>
-			<%= stylesheet_link_tag(stylesheet) %>
-		<% end %>
-		<% casein_config_javascript_includes.each do |javascript| %>
-			<%= javascript_include_tag(javascript) %>
-		<% end %>
+  	<title><%= casein_generate_page_title %></title>
+  	<% casein_config_stylesheet_includes.each do |stylesheet| %>
+  		<%= stylesheet_link_tag(stylesheet) %>
+  	<% end %>
+  	<% casein_config_javascript_includes.each do |javascript| %>
+  		<%= javascript_include_tag(javascript) %>
+  	<% end %>
-		<%= csrf_meta_tag %>
-	</head>
-	<body>
-		<div id="header">
-			<h1><%= link_to(image_tag(casein_config_logo, :alt => casein_config_website_name), :controller => :casein) %></h1>
-			<div id="dashboard">
-				<% if @session_user != nil %>
-				<ul>
-					<li>Hello <%= @session_user.name %></li>
-					<li><%= Time.zone.name %></li>
-					<li><%= link_to 'Profile', casein_user_path(@session_user) %></li>
-					<li class="lastItem"><%= link_to 'Logout', casein_user_session_path, :method => :delete %></li>
-				</ul>
-				<% end %>
-			</div>
-			<div id="navigation">
-				<ul>
-					<%= render :partial => '/casein/layouts/left_navigation' %>
-				</ul>
-			</div>
-			<div id="altNavigation">
-				<ul>
-					<% if @session_user.is_admin? %>
-						<li><%= link_to 'Users', casein_users_path %></li>
-					<% end %>
-					<%= render :partial => '/casein/layouts/right_navigation' %>
-				</ul>
-			</div>
-		</div>
-		<div id="rightBar">
-			<div class="spacer"></div>
-			<ul>
-				<%= yield :sidebar %>
-			</ul>
-		</div>
-		<div id="content">
-			<div id="data">
-				<% if flash[:warning] %>
-					<div id="error">
-						<%= flash[:warning] %>
-					</div>
-				<% end %>
-				<% if flash[:notice] %>
-					<div id="notice">
-						<%= flash[:notice] %>
-					</div>
-				<% end %>
-				<%= yield %>
-			</div>
-		</div>
-	</body>
+  	<%= csrf_meta_tag %>
+    <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
+    <!--[if lt IE 9]>
+      <%= javascript_include_tag("casein/html5shiv") %>
+    <![endif]-->
+    <script type="text/javascript">
+      var current_controller = "<%= controller_name %>";
+    </script>
+  </head>
+  <body>
+    <div class="navbar navbar-static-top">
+      <% if @session_user != nil %>
+        <div class="container">
+          <div id="user-info">
+            <ul>
+              <li class="hidden-sm">Hello <%= @session_user.name %></li>
+              <li class="hidden-sm"><%= Time.zone.name %></li>
+              <li><%= link_to 'Profile', casein_admin_user_path(@session_user) %></li>
+              <% if @session_user.is_admin? %>
+                <li><%= link_to 'Users', casein_admin_users_path %></li>
+              <% end %>
+              <%= render :partial => '/casein/layouts/top_navigation' %>
+              <li class="last-item signout"><%= link_to 'Sign out', casein_admin_user_session_path, :method => :delete %></li>
+            </ul>
+          </div>
+        </div>
+      <% end %>
+      <div class="container">
+        <%= link_to(image_tag(casein_config_logo, :alt => casein_config_website_name), {:controller => :casein}, :class => "navbar-brand") %>
+      </div>
+      <div class="container">
+        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse">
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </button>
+        <div class="nav-collapse collapse">
+          <ul class="nav navbar-nav">
+            <%= render :partial => '/casein/layouts/tab_navigation' %>
+          </ul>
+        </div>
+      </div>
+    </div>
+    <div class="container">
+      <div id="content">
+        <div class="row">
+          <% if content_for?(:sidebar) %>
+             <div id="right-column" class="col-lg-2">
+                <ul class="nav nav-pills nav-stacked content-bottom-padding">
+                  <%= yield :sidebar %>
+                </ul>
+            </div>
+            <div id="left-column" class="col-lg-10 content-bottom-padding">
+          <% else %>
+            <div class="col-lg-12 content-bottom-padding">
+          <% end %>
+            <% if flash[:warning] %>
+              <div id="error" class="alert alert-danger">
+                <%= flash[:warning] %>
+              </div>
+            <% end %>
+            <% if flash[:notice] %>
+              <div id="notice" class="alert alert-success">
+                <%= flash[:notice] %>
+              </div>
+            <% end %>
+            <% if content_for?(:help) %>
+              <div id="help" class="alert alert-info">
+                <%= yield :help %>
+              </div>
+            <% end %>
+            <%= yield %>
+            </div>
+        </div>
+        <div class="row">
+          <div class="col-lg-12">
+           <hr />
+           <footer>
+              <p><%= casein_get_footer_string(true) %></p>
+            </footer>
+          </div>
+        </div>
+      </div>
+    </div>
+  </body>
 </html>

data/config/initializers/will_paginate.rb ADDED

@@ -0,0 +1,40 @@
+# config/initializers/will_paginate.rb
+#
+# This extension code was written by Isaac Bowen, originally found
+# at http://isaacbowen.com/blog/using-will_paginate-action_view-and-bootstrap/
+require 'will_paginate/view_helpers/action_view'
+module WillPaginate
+  module ActionView
+    def will_paginate(collection = nil, options = {})
+      options, collection = collection, nil if collection.is_a? Hash
+      # Taken from original will_paginate code to handle if the helper is not passed a collection object.
+      collection ||= infer_collection_from_controller
+      options[:renderer] ||= BootstrapLinkRenderer
+      super.try :html_safe
+    end
+    class BootstrapLinkRenderer < LinkRenderer
+      protected
+      def html_container(html)
+        tag :div, tag(:ul, html, :class => "pagination"), container_attributes
+      end
+      def page_number(page)
+        tag :li, link(page, page, :rel => rel_value(page)), :class => ('active' if page == current_page)
+      end
+      def gap
+        tag :li, link('&hellip;'.html_safe, '#'), :class => 'disabled'
+      end
+      def previous_or_next_page(page, text, classname)
+        tag :li, link(text, page || '#'),
+	    :class => [(classname[0..3] if  @options[:page_links]), (classname if @options[:page_links]), ('disabled' unless page)].join(' ')
+      end
+    end
+  end
+end

data/config/routes.rb CHANGED

@@ -4,13 +4,13 @@ Rails.application.routes.draw do
   namespace :casein do
-    resources :users do
+    resources :admin_users do
       member do
         patch :update_password, :reset_password
       end
     end
-    resource :user_session
+    resource :admin_user_session
     resource :password_reset, :only => [:create, :edit, :update]
     match "/blank" => "casein#blank", :via => :get

data/lib/casein.rb CHANGED

@@ -1,3 +1,9 @@
-require 'casein/engine' if defined?(Rails) && Rails::VERSION::MAJOR == 4
-require 'will_paginate'
-require 'authlogic'
+if defined?(Rails) && Rails::VERSION::MAJOR == 4
+	require 'casein/engine'
+	require 'will_paginate'
+	require 'authlogic'
+else
+	puts("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")
+	puts("!!! WARNING !!! This version of Casein requires Rails 4.x !!!")
+	puts("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")
+end

data/lib/casein/engine.rb CHANGED

@@ -4,8 +4,12 @@ require "rails"
 module Casein
   class Engine < Rails::Engine
+    config.after_initialize do
+      Rails.application.config.assets.paths << root.join("app", "assets", "fonts")
+    end
     initializer "casein.assets.precompile" do |app|
-      app.config.assets.precompile += %w(casein/login.js casein/login.css casein/casein.css casein/casein.js casein/custom.css.scss casein/custom.js casein/*.png casein/login/*.png casein/icons/*.png)
+      app.config.assets.precompile += %w(casein/*.svg casein/*.eot casein/*.woff casein/*.ttf casein/login.css casein/casein.css casein/casein.js casein/html5shiv.js casein/custom.css casein/custom.js casein/*.png)
     end
     rake_tasks do

data/lib/generators/casein/install/install_generator.rb CHANGED

@@ -19,8 +19,8 @@ module Casein
         copy_file "app/helpers/casein/config_helper.rb", "app/helpers/casein/config_helper.rb"
         #initial view partials
-        copy_file "app/views/casein/layouts/_left_navigation.html.erb", "app/views/casein/layouts/_left_navigation.html.erb"
-        copy_file "app/views/casein/layouts/_right_navigation.html.erb", "app/views/casein/layouts/_right_navigation.html.erb"
+        copy_file "app/views/casein/layouts/_tab_navigation.html.erb", "app/views/casein/layouts/_tab_navigation.html.erb"
+        copy_file "app/views/casein/layouts/_top_navigation.html.erb", "app/views/casein/layouts/_top_navigation.html.erb"
         #robots.txt
         puts " ** Overwrite if you haven't yet modified your robots.txt, otherwise add disallow rules for /casein and /admin manually **"
@@ -31,7 +31,7 @@ module Casein
   			copy_file "app/assets/javascripts/casein/custom.js", "app/assets/javascripts/casein/custom.js"
   			#migrations
-  			migration_template 'db/migrate/casein_create_users.rb', "db/migrate/casein_create_users.rb"
+  			migration_template 'db/migrate/casein_create_admin_users.rb', "db/migrate/casein_create_admin_users.rb"
       end
   end
 end

data/lib/generators/casein/install/templates/app/helpers/casein/config_helper.rb CHANGED

@@ -1,45 +1,44 @@
 module Casein
   module ConfigHelper
-    # Text string containing the name of the website or client
-    # Used in text and titles throughout Casein
+    # Name of website or client — used throughout Casein.
     def casein_config_website_name
       'Casein'
     end
-    # URL to the logo used for the login screen and top banner - it should be a transparent PNG
+    # Filename of logo image. Ideally, it should be a transparent PNG around 140x30px
     def casein_config_logo
       'casein/casein.png'
     end
     # The server hostname where Casein will run
     def casein_config_hostname
-      if ENV['RAILS_ENV'] == 'production'
+      if Rails.env.production?
         'http://www.caseincms.com'
       else
         'http://0.0.0.0:3000'
       end
     end
-    # The sender email address used for notifications
+    # The sender address used for email notifications
     def casein_config_email_from_address
       'donotreply@caseincms.com'
     end
-    # The page that the user is shown when they login or click the logo
-    # do not point this at casein/index!
+    # The initial page the user is shown after they sign in or click the logo. Probably this should be set to the first tab.
+    # Do not point this at casein/index!
     def casein_config_dashboard_url
       url_for :controller => :casein, :action => :blank
     end
-    # A list of stylesheet files to include in the page head section
+    # A list of stylesheets to include. Do not remove the core casein/casein, but you can change the load order, if required.
     def casein_config_stylesheet_includes
-      %w[casein/custom casein/casein]
+      %w[casein/casein casein/custom]
     end
-    # A list of JavaScript files to include in the page head section
+    # A list of JavaScript files to include. Do not remove the core casein/casein, but you can change the load order, if required.
     def casein_config_javascript_includes
-      %w[casein/custom casein/casein]
+      %w[casein/casein casein/custom]
     end
   end

data/lib/generators/casein/install/templates/app/views/casein/layouts/{_left_navigation.html.erb → _tab_navigation.html.erb} RENAMED

File without changes

data/lib/generators/casein/install/templates/app/views/casein/layouts/_top_navigation.html.erb ADDED

@@ -0,0 +1,4 @@
+<!-- NOTE: add "hidden-sm" class to li elements you want to be hidden at small browser widths -->
+<!-- e.g. <li class="hidden-sm"><%= link_to "Visit site", casein_config_hostname, :target => "_blank" %></li> -->
+<li><%= link_to "Visit site", casein_config_hostname, :target => "_blank" %></li>

data/lib/generators/casein/install/templates/db/migrate/{casein_create_users.rb → casein_create_admin_users.rb} RENAMED

@@ -1,7 +1,7 @@
-class CaseinCreateUsers < ActiveRecord::Migration
+class CaseinCreateAdminUsers < ActiveRecord::Migration
   def self.up
-    create_table :casein_users do |t|
+    create_table :casein_admin_users do |t|
       t.string    :login, :null => false
       t.string    :name
       t.string    :email
@@ -24,7 +24,7 @@ class CaseinCreateUsers < ActiveRecord::Migration
   end
   def self.down
-    drop_table :casein_users
+    drop_table :casein_admin_users
   end
 end

data/lib/generators/casein/scaffold/scaffold_generator.rb CHANGED

@@ -7,7 +7,7 @@ module Casein
     argument :attributes, :type => :array, :required => true, :desc => "attribute list required"
-    class_options :create_model_and_migration => false, :force_plural => false
+    class_options :create_model_and_migration => false, :read_only => false, :no_index => false
     def self.next_migration_number dirname
       if ActiveRecord::Base.timestamped_migrations
@@ -19,17 +19,19 @@ module Casein
     def generate_files
       @plural_route = (plural_name != singular_name) ? plural_name : "#{plural_name}_index"
+      @read_only = options[:read_only]
+      @no_index = options[:no_index]
       template 'controller.rb', "app/controllers/casein/#{plural_name}_controller.rb"
-      template 'views/index.html.erb', "app/views/casein/#{plural_name}/index.html.erb"
+      template 'views/index.html.erb', "app/views/casein/#{plural_name}/index.html.erb" unless @no_index
       template 'views/show.html.erb', "app/views/casein/#{plural_name}/show.html.erb"
-      template 'views/new.html.erb', "app/views/casein/#{plural_name}/new.html.erb"
+      template 'views/new.html.erb', "app/views/casein/#{plural_name}/new.html.erb" unless @read_only
       template 'views/_form.html.erb', "app/views/casein/#{plural_name}/_form.html.erb"
       template 'views/_table.html.erb', "app/views/casein/#{plural_name}/_table.html.erb"
       add_namespace_to_routes
       add_to_routes
-      add_to_navigation
+      add_to_navigation unless @no_index
       if options[:create_model_and_migration]
         template 'model.rb', "app/models/#{singular_name}.rb"
@@ -53,15 +55,25 @@ module Casein
     def add_to_routes
       puts "   casein     adding #{plural_name} resources to routes.rb"
       file_to_update = Rails.root + 'config/routes.rb'
-      line_to_add = "resources :#{plural_name}"
+      if @no_index && @read_only
+        line_to_add = "resources :#{plural_name}, :only => [:show]"
+      elsif @no_index
+        line_to_add = "resources :#{plural_name}, :except => [:index]"
+      elsif @read_only
+        line_to_add = "resources :#{plural_name}, :only => [:index, :show]"
+      else
+        line_to_add = "resources :#{plural_name}"
+      end
       insert_sentinel = 'namespace :casein do'
       gsub_add_once plural_name, file_to_update, "\t\t" + line_to_add, insert_sentinel
     end
     def add_to_navigation
       puts "   casein     adding #{plural_name} to left navigation bar"
-      file_to_update = Rails.root + 'app/views/casein/layouts/_left_navigation.html.erb'
-      line_to_add = "<li id=\"visitSite\"><%= link_to \"#{plural_name.humanize.capitalize}\", casein_#{@plural_route}_path %></li>"
+      file_to_update = Rails.root + 'app/views/casein/layouts/_tab_navigation.html.erb'
+      line_to_add = "<li id=\"tab-#{@plural_route}\"><%= link_to \"#{plural_name.humanize.capitalize}\", casein_#{@plural_route}_path %></li>"
       insert_sentinel = '<!-- SCAFFOLD_INSERT -->'
       gsub_add_once plural_name, file_to_update, line_to_add, insert_sentinel
     end