tb_core 1.2.8 → 1.3.0.beta1

data/app/assets/stylesheets/admin/core/login.css.scss

@@ -1,16 +1,8 @@
-#content_wrapper {
-  position: relative;
-  width: 100%;
-  height: 100%;
-}
 .login-form {
-  width: 460px;
-  margin: 75px auto 0;
+  margin-top: 75px;
   padding: 0px;
   color:#000;
   background: #fff;
-  -webkit-border-radius: 10px;
-  -moz-border-radius: 10px;
   border-radius:10px;
   box-shadow: 2px 2px 10px #777;
   overflow-x: hidden;
@@ -19,20 +11,8 @@
 .login-form h1 {
   font-size: 28px;
   margin: 0 0 20px;
-  padding: 10px;
-  background:rgb(199,90,0);
-  background-image: linear-gradient(top, rgb(199,90,0) 5%, rgb(179,72,0) 53%);
-  background-image: -o-linear-gradient(top, rgb(199,90,0) 5%, rgb(179,72,0) 53%);
-  background-image: -moz-linear-gradient(top, rgb(199,90,0) 5%, rgb(179,72,0) 53%);
-  background-image: -webkit-linear-gradient(top, rgb(199,90,0) 5%, rgb(179,72,0) 53%);
-  background-image: -ms-linear-gradient(top, rgb(199,90,0) 5%, rgb(179,72,0) 53%);
-  background-image: -webkit-gradient(
-    linear,
-    left top,
-    left bottom,
-    color-stop(0.05, rgb(199,90,0)),
-    color-stop(0.53, rgb(179,72,0))
-  );
+  padding: 10px 20px;
+  background-color:#333;
   color: #fff;
 }
 .login-form .alert{
@@ -41,9 +21,3 @@
 .login-form form {
   margin: 20px;
 }
-.login-form .field-group {
-  margin: 0 0 15px;
-}
-.login-form label {
-  margin: 0 0 5px;
-}

data/app/controllers/admin/application_controller.rb

@@ -20,8 +20,7 @@ private
   def require_admin_user
     if current_user.blank?
       flash[:notice] = "You must be logged in to access the requested page"
-      store_location
-      redirect_to admin_login_path
+      redirect_to admin_login_path(:return_to => request.path)
       return false
     elsif !current_user.has_admin_rights?
       raise Spud::AccessDeniedError.new(:item => 'module', :template => '/layouts/admin/error_page')

data/app/controllers/admin/user_sessions_controller.rb

@@ -26,9 +26,6 @@ class Admin::UserSessionsController < Admin::ApplicationController
   def destroy
     current_user_session.destroy
     flash[:notice] = "Logout successful!"
-    if !request.referer.blank?
-      session[:return_to] = request.referer
-    end
     redirect_to admin_login_path
   end
 

data/app/controllers/admin/users_controller.rb

@@ -1,26 +1,16 @@
 class Admin::UsersController < Admin::ApplicationController
 
-  layout false
   belongs_to_spud_app :users
   add_breadcrumb "Users", :admin_users_path
   before_action :load_user, :only => [:edit, :update, :show, :destroy]
   respond_to :html
 
   def index
-    @users = SpudUser.order('login asc')
+    @spud_users = SpudUser.ordered.paginate(:page => params[:page], :per_page => 15)
     if params[:search]
-      @users = @users.where_name_like(params[:search])
-    end
-    @users = @users.paginate(:page => params[:page])
-    respond_with @users do |format|
-      format.html{
-        if request.xhr?
-          render :partial => 'index'
-        else
-          render 'index', :layout => 'admin/detail' 
-        end
-      }
+      @spud_users = @spud_users.where_name_like(params[:search])
     end
+    respond_with @spud_users
   end
 
   def show

data/app/controllers/password_resets_controller.rb

@@ -3,6 +3,7 @@ class PasswordResetsController < ApplicationController
   before_action :load_user_using_perishable_token, :only => [:show, :update]
   skip_before_action :require_user
   respond_to :html
+  layout 'user_sessions'
 
   def index
 

data/app/controllers/spud/application_controller.rb

@@ -45,9 +45,10 @@ private
 
   def require_user
     unless current_user
-      store_location
-      flash[:notice] = "You must be logged in to access the requested page"
-      redirect_to login_path
+      respond_to do |format|
+        format.html{ redirect_to login_path(:return_to => request.path) }
+        format.json{ raise Spud::AccessDeniedError.new() }
+      end
       return false
     end
     return true
@@ -55,29 +56,22 @@ private
 
   def require_admin_user
     if current_user.blank? || !current_user.has_admin_rights?
-      store_location()
       raise Spud::AccessDeniedError.new()
       return false
     end
   end
 
-  def store_location
-    if request.format.html? && !request.xhr?
-      session[:return_to] = request.url
-    end
-  end
-
   def redirect_back_or_default(default)
     redirect_to(back_or_default(default))
   end
 
   def back_or_default(default)
+    binding.pry
     if params[:return_to]
-      return params[:return_to]
-    elsif session[:return_to]
-      return session[:return_to]
+      uri = URI.parse(params[:return_to].to_s)
+      return uri.path
     else
-      return default
+      return default  
     end
   end
 

data/app/controllers/user_sessions_controller.rb

@@ -2,6 +2,7 @@ class UserSessionsController < ApplicationController
 
   skip_before_action :require_user
   respond_to :html
+  layout 'user_sessions'
   
   def new
     @user_session = SpudUserSession.new

data/app/helpers/admin/application_helper.rb

@@ -23,21 +23,6 @@ module Admin::ApplicationHelper
     return style_str
   end
 
-  def error_messages_for(object)
-    content = ""
-    if object.errors.any?
-      content += "<div class='spud_admin_form_error_list'>"
-      content += "<h4>#{pluralize(object.errors.count, "error")} prohibited you from saving:</h4>"
-      content +="<ul>"
-      object.errors.full_messages.each do |msg|
-        content+="<li>#{msg}</li>"
-      end
-      content +="</ul></div>"
-    end
-    return content.html_safe
-
-  end
-
   def url_for_admin_dashboard_application(url)
     if Rails.configuration.relative_url_root.blank?
       return url
@@ -46,6 +31,17 @@ module Admin::ApplicationHelper
     end
   end
 
+  # Build an icon with left padding to indicate nesting below the previous table row
+  #
+  def table_nesting_indicator(depth)
+    if depth > 0
+      depth.times do
+        concat content_tag(:span, '', :class => 'nesting-spacer')
+      end
+      content_tag(:span, "", :class => 'glyphicon glyphicon-chevron-right')
+    end
+  end
+
   # Build a Bootstrap nav-tabs element
   #
   # * url_helper: A symbol representing the url helper method. ie: admin_widgets_path

data/app/helpers/twice_baked/application_helper.rb

@@ -3,7 +3,7 @@ module TwiceBaked::ApplicationHelper
   def tb_form_errors(record)
     if record.errors.any?
       content_tag :div, :class => 'form-errors' do
-        concat(content_tag :h4, "Please correct the following #{pluralize(record.errors.size, 'error')}:")
+        concat(tb_form_error_header(record))
         concat(raw "<ul>")
         concat(raw record.errors.full_messages.collect{ |msg| "<li>#{msg}</li>" }.join())
         concat(raw "</ul>")
@@ -11,4 +11,27 @@ module TwiceBaked::ApplicationHelper
     end
   end
 
+  def tb_form_error_header(record)
+    if record.errors.any?
+      message = "Please correct the following #{'error'.pluralize(record.errors.size)}:"
+      return content_tag :h4, message, :class => 'form-field-error'
+    end
+  end
+
+  def tb_form_error_field(record, attribute)
+    message = record.errors[attribute].first
+    if message
+      return content_tag :p, message, :class => 'help-block form-field-error'
+    end
+  end
+
+  def tb_form_field(attribute)
+    content_tag :div, :class => 'form-group' do
+      concat label_tag attribute, attribute, :class => 'col-sm-2 control-label'
+      concat(content_tag(:div, :class => 'col-sm-10') do
+        text_field_tag attribute, :placeholder => attribute, :class => 'form-control'
+      end)
+    end
+  end
+
 end

data/app/models/spud/spud_user_model.rb

@@ -1,5 +1,6 @@
 class Spud::SpudUserModel < ActiveRecord::Base
   self.table_name = 'spud_users'
+  self.abstract_class = true
   
   acts_as_authentic do |c|
     c.transition_from_crypto_providers = Authlogic::CryptoProviders::Sha512
@@ -14,6 +15,12 @@ class Spud::SpudUserModel < ActiveRecord::Base
   has_many :spud_user_settings
   before_validation :set_login_to_email, :if => ->{ Spud::Core.config.use_email_as_login }
 
+  scope :admins, ->{
+    where('super_admin = 1 OR role_id IS NOT NULL')
+  }
+
+  scope :ordered, ->{ order('last_name asc, first_name asc, email asc') }
+
   def full_name
     if first_name.blank? && last_name.blank?
       return self.login

data/app/views/admin/dashboard/index.html.erb

@@ -1,11 +1,9 @@
 <div class="sortable">
   <% @admin_applications.each do |admin_application| %>
-    <div class="admin_application" id="application_name_<%= admin_application[:key] %>">
+    <div class="admin-application" id="application_name_<%= admin_application[:key] %>">
       <%= link_to url_for_admin_dashboard_application(admin_application[:url]) do %>
-        <div class="image_wrapper">
           <%= image_tag(admin_application[:thumbnail]) %>
-            <span class="dash_icon_badge" ></span>
-        </div>
+          <span class="dash-icon-badge" ></span>
         <span class="application_name"><%= admin_application[:name] %></span>
       <% end %>
     </div>

data/app/views/admin/password_resets/index.html.erb

@@ -1,10 +1,10 @@
 <% @login_title = 'Forgot Password' %>
 <%= form_tag admin_password_resets_path do  %>
-  <div class="login-form-row">
+  <div class="form-group">
 	  <%= label_tag :email %>
-	  <%= text_field_tag :email, params[:email], :placeholder => 'email', :autofocus => 'autofocus' %>
+	  <%= text_field_tag :email, params[:email], :class => 'form-control', :placeholder => 'email', :autofocus => 'autofocus' %>
   </div>
-  <div class="login-form-row">
-  	<%= submit_tag "Send Reset Instructions", :class => 'btn' %> or <%= link_to 'Cancel', admin_login_path %>
+  <div class="login-group">
+  	<%= submit_tag "Send Reset Instructions", :class => 'btn btn-primary' %> or <%= link_to 'Cancel', admin_login_path %>
   </div>
 <% end %>

data/app/views/admin/password_resets/show.html.erb

@@ -1,15 +1,16 @@
 <% @login_title = 'Password Reset' %>
+
 <%= form_for @user, url: admin_password_reset_path(:id => @user.perishable_token) do |f| %>
-  <%= error_messages_for(f.object) %>
-  <div class="field-group">
-  	<%= f.label :password %>
-  	<%= f.password_field :password, :placeholder => 'password', :autofocus => 'autofocus' %>
+  <%= tb_form_errors(f.object) %>
+  <div class="form-group">
+  	<%= f.label :password, :class => 'form-label' %>
+  	<%= f.password_field :password, :placeholder => 'password', :autofocus => 'autofocus', :class => 'form-control' %>
   </div>
-  <div class="field-group">
-  	<%= f.label :password_confirmation %>
-  	<%= f.password_field :password_confirmation %>
+  <div class="form-group">
+  	<%= f.label :password_confirmation, :class => 'form-label' %>
+  	<%= f.password_field :password_confirmation, :placeholder => 'confirm password', :class => 'form-control' %>
   </div>
-  <div class="field-group">
-  	<%= f.submit "Reset Password", :class => 'btn' %>
+  <div class="form-group">
+  	<%= f.submit "Reset Password", :class => 'btn btn-primary' %>
   </div>
 <% end %>

data/app/views/admin/roles/_form.html.erb

@@ -1,33 +1,31 @@
 <%= form_for @role, :url => path, :html => {:class => 'form-horizontal'} do |f| %>
-
-  <fieldset>
-    <div class="control-group">
-      <%= f.label :name, :class => 'control-label' %>
-      <div class="controls">
-        <%= f.text_field :name %>
-      </div>
+  
+  <div class="form-group">
+    <%= f.label :name, :required => true, :class => "col-sm-2 control-label" %>
+    <div class="col-sm-10">
+      <%= f.text_field :name, :title => "", :class => 'form-control'%>
     </div>
-  </fieldset>
+  </div>
 
-  <fieldset>
-    <legend>Permissions</legend>
-    <div class="spud-admin-role-permissions">
+  <div class="form-group">
+    <%= label_tag :permissions, 'Permissions', :required => true, :class => "col-sm-2 control-label" %>
+    <div class="col-sm-10">
       <% SpudPermission.sorted_by_tag.each do |permission| %>
-        <div class="control-group">
-          <div class="controls">
-            <label>
-              <%= check_box_tag 'spud_role[permission_tags][]', permission.tag, @role.permissions.include?(permission) %>
-              <%= permission.name %>
-            </label>
-          </div>
+        <div class="checkbox">
+          <label>
+            <%= check_box_tag 'spud_role[permission_tags][]', permission.tag, @role.permissions.include?(permission) %>
+            <%= permission.name %>
+          </label>
         </div>
       <% end %>
     </div>
-  </fieldset>
+  </div>
 
-  <div class="form-actions">
-    <%= f.submit "Save Role", :class=>"btn btn-primary", "data-loading-text" => "Saving..." %> 
-    or <%=link_to "Cancel", admin_roles_path, :class => "btn" %>
+  <div class="form-group">
+    <div class="col-sm-offset-2 col-sm-10">
+      <%= f.submit "Save Role", :class=>"btn btn-primary", "data-loading-text" => "Saving..." %> 
+      <%= link_to "Cancel", admin_roles_path, :class => "btn btn-default" %>
+    </div>
   </div>
 
 <% end %>

data/app/views/admin/roles/index.html.erb

@@ -5,27 +5,29 @@
 <% end %>
 
 <% content_for :detail do %>
-  <table class="table table-striped">
-    <thead>
-      <tr>
-        <th>Name</th>
-        <th># Users</th>
-        <th>Permissions</th>
-        <th></th>
-      </tr>
-    </thead>
-    <tbody>
-      <% @roles.each do |role| %>
+  <div class="table-responsive">
+    <table class="table table-striped table-hover">
+      <thead>
         <tr>
-          <td><%= role.name %></td>
-          <td><%= role.users.count %></td>
-          <td><%= role.permissions.collect(&:name).join(', ') %></td>
-          <td align="right">
-            <%= link_to 'Edit', edit_admin_role_path(role), :class => 'btn btn-mini' %>
-            <%= link_to 'Delete', admin_role_path(role), :method => :delete, :data => {:confirm => 'Are you sure?'}, :class => 'btn btn-mini btn-danger' %>
-          </td>
+          <th>Name</th>
+          <th># Users</th>
+          <th>Permissions</th>
+          <th></th>
         </tr>
-      <% end %>
-    </tbody>
-  </table>
+      </thead>
+      <tbody>
+        <% @roles.each do |role| %>
+          <tr>
+            <td><%= role.name %></td>
+            <td><%= role.users.count %></td>
+            <td><%= role.permissions.collect(&:name).join(', ') %></td>
+            <td align="right">
+              <%= link_to 'Edit', edit_admin_role_path(role), :class => 'btn btn-sm btn-default' %>
+              <%= link_to 'Delete', admin_role_path(role), :method => :delete, :data => {:confirm => 'Are you sure?'}, :class => 'btn btn-sm btn-danger' %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
 <% end %>

data/app/views/admin/settings/_form.html.erb

@@ -1,62 +1,53 @@
-<%= error_messages_for f.object %>
-<fieldset>
-  <legend>User Details</legend>
+<%= tb_form_errors f.object %>
 
-  <% if !Spud::Core.config.use_email_as_login %>
-		<div class="control-group">
-			<%= f.label :login, :required => true, :class => "control-label" %>
-			<div class="controls">
-				<%= f.text_field :login, :size => 25, :autocomplete => 'username' %>
-			</div>
-		</div>
-	<% end %>
+<h4>User Details</h4>
 
-<div class="control-group">
-	<%=f.label :email,:class=>"control-label"%>
-	<div class="controls">
-		<%=f.text_field :email, :title => "",:size => 25%>
+<% if !Spud::Core.config.use_email_as_login %>
+	<div class="form-group">
+		<%= f.label :login, :required => true, :class => "col-sm-2 control-label" %>
+		<div class="col-sm-10">
+			<%= f.text_field :login, :size => 25, :autocomplete => 'username', :class => 'form-control' %>
+		</div>
+	</div>
+<% end %>
+<div class="form-group">
+	<%= f.label :email, :class=>"col-sm-2 control-label" %>
+	<div class="col-sm-10">
+		<%= f.text_field :email, :title => "", :class=>'form-control' %>
 	</div>
-  
 </div>
-<div class="control-group">
-	<%=f.label :first_name,:class=>"control-label"%>
-	<div class="controls">
-		<%=f.text_field :first_name, :title => "",:size => 25%>
+<div class="form-group">
+	<%= f.label :first_name, :class => "col-sm-2 control-label" %>
+	<div class="col-sm-10">
+		<%= f.text_field :first_name, :title => "", :class=>'form-control' %>
 	</div>
 </div>
-<div class="control-group">
-	<%=f.label :last_name,:class=>"control-label"%>
-	<div class="controls">
-		<%=f.text_field :last_name, :title => "",:size => 25%>
+<div class="form-group">
+	<%= f.label :last_name, :class => "col-sm-2 control-label" %>
+	<div class="col-sm-10">
+		<%= f.text_field :last_name, :title => "", :class=>'form-control' %>
 	</div>
 </div>
-<div class="control-group">
-  <%=f.label :time_zone,:class => "control-label"%>
-  <div class="controls">
-    <%=f.time_zone_select :time_zone,ActiveSupport::TimeZone.us_zones,:default => Rails.application.config.time_zone%>
+<div class="form-group">
+  <%= f.label :time_zone, :class => "col-sm-2 control-label" %>
+  <div class="col-sm-10">
+    <%= f.time_zone_select :time_zone, ActiveSupport::TimeZone.us_zones, {:default => Rails.application.config.time_zone}, {:class=>'form-control'} %>
   </div>
 </div>
 
+<h4>Credentials</h4>
 
-</fieldset>
-<fieldset>
-  <legend>Credentials</legend>
-
-<div class="control-group">
-	<%= f.label :password,:class=>"control-label" %>
-	<div class="controls">
-		<%= f.password_field :password, :size => 25, :autocomplete => 'new-password' %>
+<div class="form-group">
+	<%= f.label :password, :class => "col-sm-2 control-label" %>
+	<div class="col-sm-10">
+		<%= f.password_field :password, :title => "", :class => 'form-control', :autocomplete => 'new-password' %>
 		<p class="help-block">Password must be at least 8 characters</p>
-	</div>
-  
+	</div>  
 </div>
-<div class="control-group">
-	<%= f.label :password_confirmation,"Confirm",:class=>"control-label" %>
-	<div class="controls">
-		<%= f.password_field :password_confirmation, :size => 25, :autocomplete => 'new-password' %>
+<div class="form-group">
+	<%= f.label :password_confirmation, "Confirm", :class => "col-sm-2 control-label" %>
+	<div class="col-sm-10">
+		<%= f.password_field :password_confirmation, :title => "", :class => 'form-control', :autocomplete => 'new-password' %>
 		<p class="help-block">Retype your password here.</p>
 	</div>
-  
 </div>
-
-</fieldset>

data/app/views/admin/settings/edit.html.erb

@@ -9,6 +9,6 @@
   <%= render :partial => "form", :locals => {:f => f} %>
   <div class="form-actions">
   	<%= f.submit "Save Settings", :class=>"btn btn-primary"%> or 
-    <%=link_to "cancel", (@current_user.has_admin_rights? ? admin_root_path : root_path), :class => "btn" %>
+    <%=link_to "cancel", (@current_user.has_admin_rights? ? admin_root_path : root_path), :class => "btn btn-default" %>
   </div>
 <% end %>

data/app/views/admin/setup/new.html.erb

@@ -5,54 +5,45 @@
 
 <% content_for :detail do %>
 	<% form_for @spud_user, :url => admin_setup_path, :html => {:class => "form-horizontal"} do |f| %>
-		<%= error_messages_for f.object %>
-		<fieldset>
-			<legend>New Admin Account</legend>
-				<% if !Spud::Core.config.use_email_as_login %>
-					<div class="control-group">
-						<%= f.label :login, "Login", :class => "control-label" %>
-						<div class="controls">
-							<%= f.text_field :login %>
-						</div>
-					</div>
-				<% end %>
-				<div class="control-group">
-					<%= f.label :email, "Email", :class => "control-label" %>
-					<div class="controls">
-						<%= f.text_field :email %>
-					</div>
-				</div>
-				<div class="control-group">
-					<%= f.label :first_name, :class => "control-label" %>
-					<div class="controls">
-						<%= f.text_field :first_name %>
-					</div>
-				</div>
-				<div class="control-group">
-					<%= f.label :last_name, :class => "control-label" %>
-					<div class="controls">
-						<%= f.text_field :last_name %>
-					</div>
-				</div>
-				<div class="control-group">
-					<%= f.label :password, "Password", :class => "control-label" %>
-					<div class="controls">
-						<%= f.password_field :password %>
-						<p class="help-block">Password must be at least 8 characters</p>
-					</div>
-				</div>
-				<div class="control-group">
-					<%= f.label :password_confirmation, "Confirm", :class => "control-label" %>
-					<div class="controls">
-						<%= f.password_field :password_confirmation %>
-						<p class="help-block">Retype your password here.</p>
-					</div>
-				</div>
-		</fieldset>
+		<%= tb_form_errors f.object %>
 
-		<div class="form-actions">
-			<%=submit_tag "Create Admin Account", :class=>"btn btn-primary"%>
+		<% if !Spud::Core.config.use_email_as_login %>
+			<div class="form-group">
+				<%= f.label :login, "Login", :class => "col-sm-2 control-label" %>
+				<div class="col-sm-10">
+					<%= f.text_field :login, :class=>'form-control' %>
+				</div>
+			</div>
+		<% end %>
+		
+		<div class="form-group">
+			<%= f.label :email, "Email", :class => "col-sm-2 control-label" %>
+			<div class="col-sm-10">
+				<%= f.text_field :email, :class=>'form-control' %>
+			</div>
 		</div>
 		
+		<div class="form-group">
+			<%= f.label :password, "Password", :class => "col-sm-2 control-label" %>
+			<div class="col-sm-10">
+				<%= f.password_field :password, :class => 'form-control' %>
+				<p class="help-block">Password must be at least 8 characters</p>
+			</div>
+		</div>
+
+		<div class="form-group">
+			<%= f.label :password_confirmation, "Confirm", :class => "col-sm-2 control-label" %>
+			<div class="col-sm-10">
+				<%= f.password_field :password_confirmation, :class => 'form-control' %>
+				<p class="help-block">Retype your password here.</p>
+			</div>
+		</div>
+
+		<div class="form-group">
+	  	<div class="col-sm-offset-2 col-sm-10">
+				<%= submit_tag "Create Admin Account", :class => "btn btn-primary"%>
+			</div>
+		</div>
+
 	<% end %>
 <% end %>