tb_core 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71aea9ddb3c9316dc739b01f90a9d4fc691de43f
-  data.tar.gz: 2c6513d8c1deca712ffee16191abc4a60d1d0ace
+  metadata.gz: cf2f47767b015951d5eca3a7af3055b5c20101d6
+  data.tar.gz: 3869ef7c61f21fbef83d92303d81bbd819081abc
 SHA512:
-  metadata.gz: eab1674d55e9a78198f6b740e1e3ba26bb62805e0dde9382c68f110794b81db84bc70865d26c4a3e18a1ca98d4761aa9d71759552ceb6d04e0e43a1747428147
-  data.tar.gz: cd40971446fe52fdeafedfa2e653701ced4d23843b0592902c2e2d1f56a771585db6b413f5b08e7fc66bc363710b4caefbcfe8720f18f83eb2e774d5d3273687
+  metadata.gz: d4e8a3d18f3768dd7bdc4c4c58bed5ce6d412203cda91e86b324e7a36af44e672a1ee7722e9ded0b869590a975210ad5d9789d1ec5a5230e7a2c5d1e71528619
+  data.tar.gz: c084bff092e94de06d53b90d8253e041be1d4e338dce48d83c95d00563579bc7f326b90648c8e70defbd2f50f5f1110117afd171e2f7bd721a422c51aabaf616

data/README.md

@@ -163,6 +163,16 @@ You can specificy the `:builder` attribute in a `form_for`, or you can just use
 
 See `form_builder.rb` for the full details.
 
+### User Select
+
+A common case is to have a model in your app that `belongs_to :spud_user`. The `tb_user_select` form helper method makes it easy to assign or create new users from within another form.
+
+    <%= tb_form_for @widget do |f| %>
+      <%= f.tb_user_select %>
+      <%= f.tb_text_field :name %>
+      <%= f.tb_save_buttons('Widget', widgets_path) %>
+    <% end %>
+
 Remote Forms
 --------------
 

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

@@ -1,8 +1,9 @@
 //= require jquery
 //= require jquery_ujs
+//= require jquery-ui
 //= require tinymce-jquery
 //= require bootstrap-sprockets
-//= require jquery-ui/jquery-ui
+
 //= require ../../tb_core
 //= require_self
 //= require_tree .

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

@@ -4,12 +4,28 @@ spud.admin.modal = {
 
   displayWithOptions: function(options){
     var modal = $('#modal_window');
-    if(options.title){
+    if (options.title){
       modal.find('.modal-title').text(options.title);
     }
-    if(options.html){
+    if (options.html){
       modal.find('.modal-body').html(options.html);
     }
+    if (options.size) {
+      var sizeClass = '';
+      switch (options.size) {
+        case "lg": //because some people like brevity
+        case "large": //some like accuracy
+        case "modal-lg": // some like bootstrap
+          sizeClass = "modal-lg";
+          break;
+        case "sm":
+        case "small":
+        case "modal-sm":
+          sizeClass = "modal-sm";
+          break;
+      }
+      modal.find('.modal-dialog').addClass(sizeClass);
+    }
     var defaultFooter = modal.find('.modal-footer-default');
     if(options.buttons){
       var newFooter = defaultFooter.clone();
@@ -20,12 +36,26 @@ spud.admin.modal = {
       }
       defaultFooter.hide();
       newFooter.insertAfter(defaultFooter);
-    }
-    else{
+    } else {
       $('modal-footer-additional').remove();
-      defaultFooter.show();
+      if(options.hideFooter){
+        defaultFooter.hide();
+      } else{
+        defaultFooter.show();  
+      }
     }
-    modal.modal('show');
+
+    // modalArgs are passed straight to the modal and can contain bootstrap default properties.
+    var modalArgs = 'show';
+    if (options.disableClose) {
+      // This modal cannot be closed by pressing escape or clicking the background page.
+      modalArgs = {
+        backdrop: 'static',
+        keyboard: false
+      };
+    }
+
+    modal.modal(modalArgs);
   },
 
   hide: function(){

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

@@ -1,11 +1,130 @@
 (function(){
 
-var splitPane;
+var $picker;
 
 spud.admin.users = {
-  index: function(){
+  init: function(){
+    var $body = $('body');
+    $body.on('click', '.btn-generate-password', clickedGeneratePassword);
+    $body.on('change', '#spud_user_password', changedUserPassword);
 
+    $picker = $('.tb-user-select');
+    if($picker.length > 0){
+      $picker.on('change', changedUserSelect).trigger('change');
+      $body.on('click', '.tb-user-select-edit', clickedPickerEdit);
+      $body.on('click', '.tb-user-select-add', clickedPickerAdd);
+      $('.modal-body').on('ajax:success', '.user-form', savedModalUser);  
+    }
   }
 };
 
+/*
+* Set a randomly generated password
+*/
+var clickedGeneratePassword = function(e){
+  e.preventDefault();
+  var randomPassword = generatePassword(12);
+  $('#spud_user_password').val(randomPassword).trigger('change');
+  $('#spud_user_password_confirmation').val(randomPassword);
+  $('.generated-password').text("Generated: " + randomPassword);
+  $('#spud_user_requires_password_change').prop('checked', true);
+  $('#send_email').prop('checked', true);
+};
+
+var generatePassword = function(length){
+  var charset = "abcdefghijklnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+  var password = '';
+  for(var i=0, n=charset.length; i<length; i++){
+    password += charset.charAt(Math.floor(Math.random() * n));
+  }
+  return password;
+};
+
+/*
+* If a password is set, display the Send Email option. Otherwise, hide it.
+*/
+var changedUserPassword = function(e){
+  var value = $(this).val();
+  if(value === ''){
+    $('.user-send-email-group').hide().prop('checked', false);
+  }
+  else{
+    $('.user-send-email-group').show();
+  }
+};
+
+/*
+* If a user is selected, enable the Edit button. Otherwise disable it.
+*/
+var changedUserSelect = function(e){
+  var id = $(this).val();
+  var $edit = $('.tb-user-select-edit');
+  if(id){
+    $('.tb-user-select-edit').attr('disabled', false);
+  }
+  else{
+    $('.tb-user-select-edit').attr('disabled', true);
+  }
+};
+
+/*
+* Bring up the edit form when the Edit button is clicked
+*/
+var clickedPickerEdit = function(e){
+  e.preventDefault();
+  var id = $('.tb-user-select').val();
+  if(id){
+    var href = $(this).attr('href').replace(':id', id);
+    $.ajax(href, {
+      dataType: 'html',
+      success: function(html){
+        spud.admin.modal.displayWithOptions({
+          title: 'Edit User',
+          html: html,
+          hideFooter: true
+        });
+      }
+    });
+  }
+};
+
+/*
+* Bring up the new user form when the Add button is clicked
+*/
+var clickedPickerAdd = function(e){
+  e.preventDefault();
+  $.ajax($(this).attr('href'), {
+    dataType: 'html',
+    success: function(html){
+      spud.admin.modal.displayWithOptions({
+        title: 'New User',
+        html: html,
+        hideFooter: true
+      });
+    }
+  });
+};
+
+/*
+* When a user is saved, close the modal and update the picker
+*/
+var savedModalUser = function(event, json, textStatus, jqXHR){
+  var $option = $('<option/>', {
+    value: json.id,
+    text: json.first_name + ' ' + json.last_name + ' (' + json.email + ')'
+  });
+  var $existingOption = $('.tb-user-select option[value=' + json.id + ']');
+  if($existingOption.length > 0){
+    $existingOption.replaceWith($option);
+  }
+  else{
+    $picker.append($option);
+  }
+  $picker.val(json.id);
+  spud.admin.modal.hide();
+  return false;
+};
+
+$(document).ready(spud.admin.users.init);
+
 })();

data/app/assets/javascripts/tb_core/configuration.js.erb

@@ -2,7 +2,7 @@
 
 tb.config = {
   env: '<%= Rails.env %>',
-  siteName: '<%= Spud::Core.config.site_name %>',
+  siteName: '<%= Spud::Core.config.site_name.gsub("'"){"\\'"} %>',
   subUri: '<%= Rails.configuration.relative_url_root %>'
 };
 

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

@@ -106,9 +106,9 @@ var displayErrorsInline = function($form, errors){
 
       if (keyArr.length === 2) {
         keyArr[0] += '_attributes';
-        $input = $("[name$='[" + keyArr.join('][') + "]']");
+        $input = $form.find("[name$='[" + keyArr.join('][') + "]']");
       } else {
-        $input = $("[name$='[" + key + "]']");
+        $input = $form.find("[name$='[" + key + "]']");
       }
 
       if($input.length > 0){
@@ -117,14 +117,17 @@ var displayErrorsInline = function($form, errors){
       }
       else{
         console.warn('Missing input field for key:', key);
+        $form.prepend('<p class="form-error form-error-base">'+key+' '+errors[key][0]+'</p>');
       }
     }
   }
-  var $firstError = $form.find('.form-error-inline, .form-error-base').first().parent('div');
+  var $firstError = $form.find('.form-error-inline, .form-error-base').first().parent();
   if($firstError.length > 0){
-    $('body, html').animate({
-      scrollTop: $firstError.offset().top
-    });
+    if(!tb.util.elementIsInView($firstError)){
+      $('body, html').animate({
+        scrollTop: $firstError.offset().top
+      });  
+    }
   }
 };
 

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

@@ -30,6 +30,17 @@ tb.util = {
 
   getCsrfToken: function(){
     return $('meta[name=csrf-token]').attr('content');
+  },
+
+  /*
+  * Use top/bottom offsets to determine if the given jQuery element is within the current scroll view
+  */
+  elementIsInView: function($element){
+    var docViewTop = document.body.scrollTop;
+    var docViewBottom = docViewTop + $(window).height();
+    var container = $('.stat-front-desk');
+    var elemTop = $element.offset().top;
+    return docViewBottom >= elemTop && docViewTop <= elemTop;
   }
 };
 

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

@@ -1,107 +1,108 @@
-//= require jquery-ui/jquery-ui
 //= require_self
 //= require_directory
 
+//= require jquery-ui
+
 @import "bootstrap-sprockets";
 @import "bootstrap";
 
 body {
-	background:#eee;
-	background-color:#eee;
-	margin: 0 0;
+  background:#eee;
+  background-color:#eee;
+  margin: 0 0;
 }
 
 // Header
 #header {
-	padding: 5px 15px;
-	background: #333;
-	color: #fff;
-	font-size: 14px;
-	h1{
-		font: normal 18px/18px sans-serif;
-		color: #fff;
-		display: inline;
-	}
-	a{
-		color: white;
-	}
+  padding: 5px 15px;
+  background: #333;
+  color: #fff;
+  font-size: 14px;
+  h1{
+    font: normal 18px/18px sans-serif;
+    color: #fff;
+    display: inline;
+  }
+  a{
+    color: white;
+  }
 }
 
 // Admin Apps
 .admin-application {
-	width:150px;
-	background:#fff;
-	float:left;
-	text-align:center;
-	border:1px solid transparent;
-	border-radius:10px;
-	margin: 0 20px 20px 0;
-	position: relative;
-	user-select: none;
-	&:hover{
-		background:#fff;
-		border:1px solid #ccc;
-	}
-	a, a:visited{
-		display:block;
-		color:#000;
-		padding:10px 10px;
-		text-decoration:none;	
-	}
-	img {
-		width: 125px;
-		border: none;
-		height: 125px;
-	}
-	.dash-icon-badge{
-		display: none;
-		position: absolute;
-		right: -15px;
-		top: -15px;
-		width: 36px;
-		height: 36px;
-		background: #e55137;
-		border-radius: 18px;
-		color: white;
-		line-height: 36px;
-		font-size: 15px;
-	}
-	.application-name{
-		white-space: nowrap;
-	}
+  width:150px;
+  background:#fff;
+  float:left;
+  text-align:center;
+  border:1px solid transparent;
+  border-radius:10px;
+  margin: 0 20px 20px 0;
+  position: relative;
+  user-select: none;
+  &:hover{
+    background:#fff;
+    border:1px solid #ccc;
+  }
+  a, a:visited{
+    display:block;
+    color:#000;
+    padding:10px 10px;
+    text-decoration:none;  
+  }
+  img {
+    width: 125px;
+    border: none;
+    height: 125px;
+  }
+  .dash-icon-badge{
+    display: none;
+    position: absolute;
+    right: -15px;
+    top: -15px;
+    width: 36px;
+    height: 36px;
+    background: #e55137;
+    border-radius: 18px;
+    color: white;
+    line-height: 36px;
+    font-size: 15px;
+  }
+  .application-name{
+    white-space: nowrap;
+  }
 }
 
 // Detail
 .nav-tabs{
-	margin-bottom: 20px;
+  margin-bottom: 20px;
 }
 .admin-search-form{
-	display: inline;
+  display: inline;
 }
 .detail-wrapper {
-	background:#fff;
-	min-height:300px;
-	border-radius:10px;
-	margin: 0 auto 20px;
-	padding: 15px;
-	.detail-title{
-		margin: 0 0 15px;
-	}
-	.app-thumbnail{
-		width: 40px;
-		height: 40px;
-		display: inline-block;
-		margin: 0;
-	}
-	.data-controls{
-		float: right;
-	}
-	.pagination{
-		margin-bottom: 0;
-	}
-	.details{
+  background:#fff;
+  min-height:300px;
+  border-radius:10px;
+  margin: 0 auto 20px;
+  padding: 15px;
+  .detail-title{
+    margin: 0 0 15px;
+  }
+  .app-thumbnail{
+    width: 40px;
+    height: 40px;
+    display: inline-block;
+    margin: 0;
+  }
+  .data-controls{
+    float: right;
+  }
+  .pagination{
+    margin-bottom: 0;
+  }
+  .details{
 
-	}
+  }
 }
 
 // Forms
@@ -111,61 +112,61 @@ div.field_with_errors {
   display: inline;
 }
 div.field_with_errors label, .form-field-error, .form-errors {
-	color: crimson;
+  color: crimson;
 }
 
 // New (Remote) Errors
 p.form-error{
-	color: crimson;
-	font-size: 12px;
-	font-style: italic;
-	line-height: normal;
-	margin: 4px 0 0;
+  color: crimson;
+  font-size: 12px;
+  font-style: italic;
+  line-height: normal;
+  margin: 4px 0 0;
 }
 p.form-error-base{
-	margin: 0 0 10px;
+  margin: 0 0 10px;
 }
 @media (min-width: $screen-sm){
-	.form-horizontal .form-error-base{
-		margin-left: 17.3%;
-	}
+  .form-horizontal .form-error-base{
+    margin-left: 17.3%;
+  }
 }
 .date-select{
-	&.form-control{
-		display: inline-block;	
-	}
-	&.year{
-		width: 20%
-	}
-	&.month{
-		width: 35%
-	}
-	&.day{
-		width: 20%
-	}
+  &.form-control{
+    display: inline-block;  
+  }
+  &.year{
+    width: 20%
+  }
+  &.month{
+    width: 35%
+  }
+  &.day{
+    width: 20%
+  }
 }
 .datetime-select{
-	&.form-control{
-		display: inline-block;
-	}
-	&.year{
-		width: 20%;
-	}
-	&.month{
-		width: 22.3%;
-	}
-	&.day, &.hour, &.minute{
-		width: 15%;
-	}
+  &.form-control{
+    display: inline-block;
+  }
+  &.year{
+    width: 20%;
+  }
+  &.month{
+    width: 22.3%;
+  }
+  &.day, &.hour, &.minute{
+    width: 15%;
+  }
 }
 
 // Tables
 td.no-wrap{
-	white-space: nowrap;
+  white-space: nowrap;
 }
 td.table-actions{
-	white-space: nowrap;
-	text-align: right;
+  white-space: nowrap;
+  text-align: right;
 }
 .table .nesting-spacer{
   display: inline-block;

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

@@ -1,4 +1,4 @@
-.login-form {
+.login-container{
   margin-top: 75px;
   padding: 0px;
   color:#000;
@@ -7,17 +7,18 @@
   box-shadow: 2px 2px 10px #777;
   overflow-x: hidden;
   overflow-y: hidden;
-}
-.login-form h1 {
-  font-size: 28px;
-  margin: 0 0 20px;
-  padding: 10px 20px;
-  background-color:#333;
-  color: #fff;
-}
-.login-form .alert{
-  margin: 0 10px;
-}
-.login-form form {
-  margin: 20px;
+
+  h1{
+    font-size: 28px;
+    margin: 0 0 20px;
+    padding: 10px 20px;
+    background-color:#333;
+    color: #fff;
+  }
+  .alert{
+    margin: 0 10px;
+  }
+  form {
+    margin: 20px;
+  }
 }

data/app/assets/stylesheets/admin/core/users.scss

@@ -0,0 +1,14 @@
+// User Picker
+.tb-user-select{
+  width: calc(100% - 184px);
+  display: inline-block;
+}
+.tb-user-select-btn{
+  width: 90px;
+  margin-left: 2px;
+}
+
+// Send Email
+.user-send-email-group{
+  display: none;
+}

data/app/controllers/admin/application_controller.rb

@@ -8,22 +8,12 @@ class Admin::ApplicationController < Spud::ApplicationController
 
 private
 
-  def handle_request_error(error)
-    error.template = '/layouts/admin/error_page'
-    super(error)
+  def template_for_request_error
+    return '/layouts/admin/error_page'
   end
 
-  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(:return_to => request.path)
-      return false
-    elsif !current_user.has_admin_rights?
-      raise Spud::AccessDeniedError.new(:item => 'module', :template => '/layouts/admin/error_page')
-      return false
-    else
-      return true
-    end
+  def login_path_for_require_user
+    admin_login_path(:return_to => request.path)
   end
 
 end

data/app/controllers/admin/password_resets_controller.rb

@@ -12,7 +12,7 @@ class Admin::PasswordResetsController < Admin::ApplicationController
     @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_later
+      TbCoreMailer.forgot_password_notification(@user, admin_password_reset_url(@user.perishable_token)).deliver_later
       flash[:notice] = "Instructions to reset your password have been emailed to you. " +
       "Please check your email."
       redirect_to admin_login_path