tb_core 1.1.1 → 1.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmI2M2I2MjdmZTFkMmFlYWIzMTcwM2U3ZmUxYzVjYWU5ZjkwNTIzMA==
+    NmRmYjc1MWEzZWMyZTAzZmVkNTc2ZGFjZDczOTIyN2VhMDU0OTVhNQ==
   data.tar.gz: !binary |-
-    Nzg5ODk5Y2YyOTk0ZDAyMjgxNWE3NzFiOWY1Nzg0MzY3ODI1ZTgzZg==
+    YTBhYjFhOTIxNzA5ZjNmZTY2M2YzZjBkNTQwYjEwMWM5MTU0NmM3Ng==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OGE0MTBlMzJhNGYxY2I0OWUwYmZkNmYxNjg5NjQ5YmI1M2JjNTJiZTM2NmY1
-    ODgzNTllZjI1ODJkYTZmZGEzOGU5Njc3YjYwYmY2MDc1NzRkMGQ5ZWE0YjNk
-    YTk2YjQxMjBlYjUyMzY5MGQ1ZDY0Nzk3NzI5OWEyNGE1MmE1ODM=
+    ZTAyNDhiNzNjNWY3NGI0ZGM5N2I4ZTYyZTNkODMxZTI2MTU0NDg1OTgxOTEz
+    NDcxOGZkMGYxMDVlMTE1ZjcwMmYzZmI5MjZlZjk1Yjc0ZWM1YmMyZTljYjE4
+    MDM4ZTI2ZDJiOTRlYmUyNGI1MDAyOTVkZTE0ZjFkODU5ODEyZTQ=
   data.tar.gz: !binary |-
-    MTFhOTEyMTFkZjA2NDAzYTczMDQ1NmQ3NzAyNWE0MDgxNmNhZTlmNzZjZTRk
-    ZDM0ZmQwM2M1YjQ0OTNhZWJiMDRiNDc1ZTZiNjdkODZjMTdiYThiNjk2NDdh
-    OWE2NDQzYzQxYTU0MTNkNWM2MGRjZjBkNzY0ZjA4YTQ2YTY0Y2I=
+    MjEwNjUyZmNkYTQ5OTMxYjg1ZjE4NDBjODUzZDRmYTA1ZmZjYzFkOGFjYzc5
+    ZDg3MjVjNzMyZDFkNjIzNjU5YzdiMDhiNmYyODBiM2RlMWI4ZDQwMzQzOWVl
+    ODM2YWUzMjM5ODI5NWQ1MDY0YWExNTU1NzJiMWM3M2FmODdjYTA=

data/app/controllers/admin/application_controller.rb

@@ -1,6 +1,6 @@
 class Admin::ApplicationController < Spud::ApplicationController
 
-  before_filter :require_user
+  before_filter :require_admin_user
   before_filter :verify_site_mode
   add_breadcrumb "Dashboard", :admin_root_path
   layout 'admin/detail'
@@ -21,7 +21,7 @@ class Admin::ApplicationController < Spud::ApplicationController
 
 private
 
-  def require_user
+  def require_admin_user
     if current_user.blank?
       flash[:notice] = "You must be logged in to access the requested page"
       redirect_to admin_login_path

data/app/controllers/admin/password_resets_controller.rb

@@ -1,7 +1,7 @@
 class Admin::PasswordResetsController < Admin::ApplicationController
 
   before_filter :load_user_using_perishable_token, :only => [:show, :update]
-  skip_before_filter :require_user
+  skip_before_filter :require_user, :require_admin_user
   layout 'admin/login'
 
   def index
@@ -11,6 +11,7 @@ class Admin::PasswordResetsController < Admin::ApplicationController
   def create
     @user = SpudUser.find_by_email(params[:email])
     if @user
+      @user.reset_perishable_token!
       CoreMailer.forgot_password_notification(@user, admin_password_reset_url(@user.perishable_token)).deliver
       flash[:notice] = "Instructions to reset your password have been emailed to you. " +
       "Please check your email."

data/app/controllers/admin/settings_controller.rb

@@ -1,7 +1,13 @@
 class Admin::SettingsController < Admin::ApplicationController
 
-  add_breadcrumb "Dashboard", :admin_root_path
-  add_breadcrumb "Settings", :admin_settings_path
+  before_filter :require_user
+  skip_before_filter :require_admin_user
+
+  before_filter do |c|
+    if current_user && current_user.has_admin_rights?
+      add_breadcrumb "Settings", :admin_settings_path
+    end
+  end
 
   def edit
     
@@ -10,10 +16,8 @@ class Admin::SettingsController < Admin::ApplicationController
   def update
     if @current_user.update_attributes(params[:spud_user].slice :login,:first_name,:last_name,:email,:password,:password_confirmation,:time_zone)
       flash[:notice] = "User settings saved successfully."
-      redirect_to admin_root_path
-    else
-      render 'edit'
     end
+    render 'edit'
   end
 
 end

data/app/controllers/admin/setup_controller.rb

@@ -1,6 +1,6 @@
 class Admin::SetupController < Admin::ApplicationController
 
-  skip_before_filter :require_user
+  skip_before_filter :require_user, :require_admin_user
 
   def new
     if SpudUser.count != 0

data/app/controllers/admin/user_sessions_controller.rb

@@ -1,6 +1,6 @@
 class Admin::UserSessionsController < Admin::ApplicationController
 
-  skip_before_filter :require_user
+  skip_before_filter :require_admin_user
   layout 'admin/login'
 
   def new

data/app/controllers/password_resets_controller.rb

@@ -11,6 +11,7 @@ class PasswordResetsController < ApplicationController
   def create
     @user = SpudUser.find_by_email(params[:email])
     if @user
+      @user.reset_perishable_token!
       CoreMailer.forgot_password_notification(@user, password_reset_url(@user.perishable_token)).deliver
       flash[:notice] = "Password reset instructions have been sent to your email"
       redirect_to login_path

data/app/helpers/twice_baked/application_helper.rb

@@ -0,0 +1,14 @@
+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(raw "<ul>")
+        concat(raw record.errors.full_messages.collect{ |msg| "<li>#{msg}</li>" }.join())
+        concat(raw "</ul>")
+      end
+    end
+  end
+
+end

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">
-		  <%= label_tag :email %>
-		  <%= text_field_tag :email %>
-	  </div>
-	  <div class="login-form-row">
-	  	<%= submit_tag "Send Reset Instructions", :class => 'btn' %> or <%= link_to 'Cancel', admin_login_path %>
-	  </div>
-	<% end %>
+<%= form_tag admin_password_resets_path do  %>
+  <div class="login-form-row">
+	  <%= label_tag :email %>
+	  <%= text_field_tag :email %>
+  </div>
+  <div class="login-form-row">
+  	<%= submit_tag "Send Reset Instructions", :class => 'btn' %> or <%= link_to 'Cancel', admin_login_path %>
+  </div>
+<% end %>

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

@@ -8,6 +8,7 @@
 <%= form_for @current_user, :url => admin_settings_path, :method => :put, :html => {:class => "form-horizontal"} do |f| %>
   <%= render :partial => "form", :locals => {:f => f} %>
   <div class="form-actions">
-  	<%= f.submit "Save Settings", :class=>"btn btn-primary"%> or <%=link_to "cancel",request.referer,:class => "btn" %>
+  	<%= f.submit "Save Settings", :class=>"btn btn-primary"%> or 
+    <%=link_to "cancel", (@current_user.has_admin_rights? ? admin_root_path : root_path), :class => "btn" %>
   </div>
 <% end %>

data/app/views/layouts/admin/application.html.erb

@@ -9,8 +9,8 @@
 </head>
 <body>
 <div id="header" style="<%=header_style%>">
-	<%= link_to admin_root_path do %>
-    <h1><%= Spud::Core.config.site_name %> Admin</h1>
+	<%= link_to root_path do %>
+    <h1><%= Spud::Core.config.site_name %></h1>
   <% end %>
   <% if current_user %>
   	<div id="user_meta">

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

@@ -1,11 +1,11 @@
 <h1>Password Reset</h1>
 
-<%= form_tag password_resets_path, :class => 'spud-login-form' do  %>
-  <div class="spud-login-form-row">
+<%= form_tag password_resets_path, :class => 'password-reset-form' do  %>
+  <div class="form-row">
     <%= label_tag :email %>
-    <%= text_field_tag :email %>
+    <%= text_field_tag :email, params[:email], :placeholder => 'email' %>
   </div>
-  <div class="spud-login-form-row spud-login-form-row-actions">
+  <div class="form-row form-row-actions">
     <%= submit_tag 'Submit', :class => 'btn btn-primary' %> or <%= link_to 'Cancel', login_path %>
   </div>
 <% end %>

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

@@ -1,26 +1,17 @@
 <div class="login-form">
 	<h1>Password Reset</h1>
-	<%= form_for @user, url: password_reset_path(:id => @user.perishable_token) do |f| %>
-	  <% if @user.errors.any? %>
-    <div class="form-errors">
-      <h2>Please correct the following <%= pluralize(@user.errors.size, 'error') %>:</h2>
-      <ul>
-        <% @user.errors.full_messages.each do |msg| %>
-          <li><%= msg %></li>
-        <% end %>
-      </ul>
-    </div>
-  <% end %>
-	  <div class="field-group">
+	<%= form_for @user, :url => password_reset_path(:id => @user.perishable_token), :html => {:class => 'password-reset-form'} do |f| %>
+    <%= tb_form_errors(@user) %>
+	  <div class="form-row">
 	  	<%= f.label :password %>
-	  	<%= f.password_field :password %>
+	  	<%= f.password_field :password, :placeholder => 'password' %>
 	  </div>
-	  <div class="field-group">
-	  	<%= f.label :password_confirmation %>
-	  	<%= f.password_field :password_confirmation %>
+	  <div class="form-row">
+	  	<%= f.label :password_confirmation, 'Confirm password' %>
+	  	<%= f.password_field :password_confirmation, 'placeholder' => 'confirm password' %>
 	  </div>
-	  <div class="field-group">
-	  	<%= f.submit "Reset Password" %>
+	  <div class="form-row form-row-actions">
+	  	<%= f.submit "Reset Password", :class => 'btn btn-primary' %>
 	  </div>
 	<% end %>
 </div>

data/app/views/user_sessions/new.html.erb

@@ -1,25 +1,16 @@
-<h1>Login</h1>
+<h1><%= Spud::Core.config.site_name %> Login</h1>
 
-<%= form_for @user_session, :url => login_path, :html => {:class => 'spud-login-form'} do |f| %>
-  <% if @user_session.errors.any? %>
-    <div class="form-errors">
-      <h2>Please correct the following <%= pluralize(@user_session.errors.size, 'error') %>:</h2>
-      <ul>
-        <% @user_session.errors.full_messages.each do |msg| %>
-          <li><%= msg %></li>
-        <% end %>
-      </ul>
-    </div>
-  <% end %>
+<%= form_for @user_session, :url => login_path, :html => {:class => 'login-form'} do |f| %>
+  <%= tb_form_errors(@user_session) %>
   <div class="form-row">
     <%= f.label :login %>
-    <%= f.text_field :login %>
+    <%= f.text_field :login, :placeholder => 'username' %>
   </div>
   <div class="form-row">
     <%= f.label :password %>
-    <%= f.password_field :password %>
+    <%= f.password_field :password, :placeholder => 'password' %>
   </div>
   <div class="form-row">
-    <%= f.submit "Login", :class => 'btn btn-primary' %> or <%=link_to "Forgot Password?", password_resets_path %>
+    <%= f.submit "Login", :class => 'btn btn-primary' %> <span>or</span> <%=link_to "Forgot Password?", password_resets_path %>
   </div>
 <% end %>

data/lib/spud_core/version.rb

@@ -1,5 +1,5 @@
 module Spud
   module Core
-    VERSION = "1.1.1"
+    VERSION = "1.1.2"
   end
 end

data/spec/controllers/admin/settings_controller_spec.rb

@@ -18,7 +18,7 @@ describe Admin::SettingsController do
   describe :update do
     it "should redirect to the admin root with a successful update" do
       put :update, :spud_user => {:first_name => "Mike"}
-      response.should redirect_to(admin_root_path)
+      response.should render_template('edit')
     end
     
     it "should put a message in the flash notice" do