tb_core 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f90c1e3395d45e3a5e48b296d5176c88dd3701ab
-  data.tar.gz: 6425455e234a5ccadc3fcc38f668578de9ba90c3
+  metadata.gz: bf20305470b452af36fca1e23124a676b61cdc50
+  data.tar.gz: 44b05c92f01040378720ba77e614a650f60d18d5
 SHA512:
-  metadata.gz: ce5ec2edd76b476e08e23d2b2129bdae35b285a448ca372c490dc09efdc7043b5779f5f94054775079f0c0b93fd23ab96777ae2938cdb8f97b7e39ebf9b60f8b
-  data.tar.gz: 77e0e1dd611e1d6d9e44fadb0b234d86787dba522c993a390f81e0d03319a9d042fd7d78ad3a1fbeb8d1fb923cc7f8cf6f43bd34b7ce085f4102eb16f087fc32
+  metadata.gz: 35dd3f7a88ac1603d596f57b60aeadb1d3e7a0a7e9e04bca110dba34d0fa48f742c87242ce6dba1a9877aca5a12adfa0c97b88ca40a844e6ca1fb530d3038219
+  data.tar.gz: 45f61b833bb35b052c952d0a612fd0019f3b113a434b01110b4428dcf6768e06bae391fb7949e6e27be9b847dee51cbf6eec371cb05dcfffa82f604f29399953

data/app/assets/javascripts/admin/core/split_pane.js

@@ -115,13 +115,21 @@ spud.admin.SplitPane = (function(){
     return this.contentArea.html();
   };
 
+  SplitPane.prototype.getPreviousItem = function(){
+    var activeItem = this.getActiveItem();
+    var prev = activeItem.prev(".split-pane-item")[0] || activeItem.siblings(".split-pane-item").last()[0];
+    return prev;
+  };
+
+  SplitPane.prototype.getNextItem = function(){
+    var activeItem = this.getActiveItem();
+    return activeItem.next(".split-pane-item")[0];
+  };
+
   SplitPane.prototype.removeCurrentlySelectedItem = function(){
+    var sibling = this.getNextItem() || this.getPreviousItem();
     var activeItem = this.getActiveItem();
-    var sibling = activeItem.next();
-    if(!sibling){
-      sibling = activeItem.prev();
-    }
-    this.getActiveItem().remove();
+    activeItem.remove();
     if(sibling){
       sibling.click();
     }

data/app/assets/javascripts/tb_core/utility.js

@@ -26,6 +26,10 @@ tb.util = {
       parts.push(tb.config.subUri);
     }
     return parts.concat(args).join('/');
+  },
+
+  getCsrfToken: function(){
+    return $('meta[name=csrf-token]').attr('content');
   }
 };
 

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

@@ -218,6 +218,9 @@ div.field_with_errors label {
 
 
 /*Table Layout*/
+td.no-wrap{
+	white-space: nowrap;
+}
 .admin-table {
 	width:100%;
 	border:1px solid #eee;

data/app/controllers/spud/application_controller.rb

@@ -1,5 +1,7 @@
 class Spud::ApplicationController < ActionController::Base
 
+  ActiveSupport.run_load_hooks(:spud_application_controller, self)
+
   protect_from_forgery
   helper_method :current_user_session, :current_user, :current_user_id
   around_filter :set_time_zone

data/app/helpers/admin/application_helper.rb

@@ -46,4 +46,41 @@ module Admin::ApplicationHelper
     end
   end
 
+  # Build a Bootstrap nav-tabs element
+  #
+  # * url_helper: A symbol representing the url helper method. ie: admin_widgets_path
+  # * tabs: An array of tab hashes with :title and :value keys
+  #
+  # Example:
+  #
+  #  <%= tb_core_tabbed_navigation(:admin_vehicles_path, [
+  #    {:title => 'All'},
+  #    {:title => 'New', :value => 'new'},
+  #    {:title => 'Used', :value => 'used'}
+  #  ]) %>
+  #
+  # This would generate:
+  #
+  # <ul class="nav nav-tabs">
+  #   <li class="active"><a href="/admin/vehicles">All</a></li>
+  #   <li class=""><a href="/admin/vehicles?tab=new">New</a></li>
+  #   <li class=""><a href="/admin/vehicles?tab=used">Used</a></li>
+  # </ul>
+  #
+  def tb_core_tabbed_navigation(url_helper, tabs)
+    key = :tab
+    content_tag :ul, :class => 'nav nav-tabs' do
+      tabs.each do |tab|
+        cls = params[key] == tab[:value] ? 'active' : ''
+        url = tab.delete(:url)
+        if url.blank?
+          id_params = params.select{ |k,v| k == :id || k.to_s =~ /_id$/ }
+          link_args = id_params.merge(key => tab[:value])
+          url = self.send(url_helper, link_args)
+        end
+        concat(content_tag(:li, :class => cls){ link_to tab[:title], url })
+      end
+    end
+  end
+
 end

data/app/models/spud/spud_user_model.rb

@@ -4,6 +4,7 @@ class Spud::SpudUserModel < ActiveRecord::Base
   acts_as_authentic do |c|
     c.transition_from_crypto_providers = Authlogic::CryptoProviders::Sha512,
     c.crypto_provider = Authlogic::CryptoProviders::SCrypt
+    c.logged_in_timeout = 24.hours
   end
 
   belongs_to :role, :class_name => 'SpudRole', :foreign_key => 'spud_role_id'

data/app/models/spud_user_session.rb

@@ -1,4 +1,13 @@
 class SpudUserSession < Authlogic::Session::Base
   generalize_credentials_error_messages true
-  self.last_request_at_threshold = 1.minutes
+
+  # Dont update last_request_at timestamp on every page request
+  last_request_at_threshold 1.minutes
+
+  # Lock a user out after 10 failed login attempts, for 1 hour
+  consecutive_failed_logins_limit 10
+  failed_login_ban_for 1.hours
+
+  # Log a user out after :logged_in_timeout has elapsed - see SpudUserModel for configuration
+  logout_on_timeout true
 end

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

@@ -3,9 +3,9 @@
   <legend>User Details</legend>
 
 <div class="control-group">
-	<%=f.label :login, :required=>true,:class=>"control-label"%>
+	<%= f.label :login, :required => true, :class => "control-label" %>
 	<div class="controls">
-		<%=f.text_field :login,:title => "",:size=>25%>
+		<%= f.text_field :login, :size => 25, :autocomplete => 'username' %>
 	</div>
   
 </div>
@@ -41,17 +41,17 @@
   <legend>Credentials</legend>
 
 <div class="control-group">
-	<%=f.label :password,:class=>"control-label"%>
+	<%= f.label :password,:class=>"control-label" %>
 	<div class="controls">
-		<%=f.password_field :password, :title => "",:size => 25%>
+		<%= f.password_field :password, :size => 25, :autocomplete => 'new-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"%>
+	<%= f.label :password_confirmation,"Confirm",:class=>"control-label" %>
 	<div class="controls">
-		<%=f.password_field :password_confirmation, :title => "",:size => 25%>
+		<%= f.password_field :password_confirmation, :size => 25, :autocomplete => 'new-password' %>
 		<p class="help-block">Retype your password here.</p>
 	</div>
   

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

@@ -4,11 +4,11 @@
 
   <div class="login-form-row">
 	  <%= f.label :login %>
-	  <%= f.text_field :login, :autofocus => 'autofocus' %>
+	  <%= f.text_field :login, :autofocus => 'autofocus', :autocomplete => 'username' %>
   </div>
   <div class="login-form-row">
   	<%= f.label :password %>
-  	<%= f.password_field :password %>
+  	<%= f.password_field :password, :autocomplete => 'current-password' %>
   </div>
   <div class="login-form-row">
   	<%= f.submit "Login", :class => 'btn' %> or <%=link_to "Forgot Password?", admin_password_resets_path %>

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

@@ -1,6 +1,6 @@
 <%= content_for :data_controls do %>
 	<%= link_to raw('<i class="icon-refresh"></i>'), '#', :class => 'btn split-pane-refresh-btn' %>
-	<%= link_to 'Roles', admin_roles_path, :class => 'btn' %>
+	<%= link_to 'Roles', admin_roles_path, :class => 'btn admin-role-btn' %>
 	<%= link_to "New User", new_admin_user_path, :class => "btn btn-primary admin-user-add-btn", :title => "New User" %>
 <% end %>
 

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

@@ -6,11 +6,11 @@
   <%= tb_form_errors(@user_session) %>
   <div class="form-row">
     <%= f.label :login %>
-    <%= f.text_field :login, :placeholder => 'username', :autofocus => 'autofocus' %>
+    <%= f.text_field :login, :placeholder => 'username', :autofocus => 'autofocus', :autocomplete => 'username' %>
   </div>
   <div class="form-row">
     <%= f.label :password %>
-    <%= f.password_field :password, :placeholder => 'password' %>
+    <%= f.password_field :password, :placeholder => 'password', :autocomplete => 'current-password' %>
   </div>
   <div class="form-row">
     <%= f.submit "Login", :class => 'btn btn-primary' %> <span>or</span> <%=link_to "Forgot Password?", password_resets_path %>

data/lib/generators/spud/templates/views/frontend/index.html.erb

@@ -8,14 +8,18 @@
     </tr>
   </thead>
   <tbody>
-    <%% @<%=module_name_formatted%>.each do |<%=module_name_formatted.singularize%>| %>
-      <tr>
-        <%-attributes.each do |attribute|-%>
-        <%-attribute_args = attribute.split(":")-%>
-        <td><%%= <%=module_name_formatted.singularize%>.<%=attribute_args[0]%> %></td>
-        <%-end-%>
-        <td><%%= link_to 'Details', <%=module_name_formatted.singularize%>_path(<%=module_name_formatted.singularize%>) %></td>
-      </tr>
+    <%% cache(cache_key_for_spud_collection(@<%=module_name_formatted%>)) do %>
+      <%% @<%=module_name_formatted%>.each do |<%=module_name_formatted.singularize%>| %>
+        <%% cache(<%=module_name_formatted.singularize%>) do %>
+          <tr>
+            <%-attributes.each do |attribute|-%>
+            <%-attribute_args = attribute.split(":")-%>
+            <td><%%= <%=module_name_formatted.singularize%>.<%=attribute_args[0]%> %></td>
+            <%-end-%>
+            <td><%%= link_to 'Details', <%=module_name_formatted.singularize%>_path(<%=module_name_formatted.singularize%>) %></td>
+          </tr>
+        <%% end %>
+      <%% end %>
     <%% end %>
   </tbody>
 </table>

data/lib/generators/spud/templates/views/layouts/application.html.erb

@@ -1,6 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <%%= tb_page_title() %>
   <%%= stylesheet_link_tag "application", :media => "all" %>
   <%%= javascript_include_tag "application" %>

data/lib/spud_core/version.rb

@@ -1,5 +1,5 @@
 module Spud
   module Core
-    VERSION = "1.2.3"
+    VERSION = "1.2.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tb_core
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Greg Woods
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails