artfully_ose 1.2.0 → 1.3.0.pre1

data/app/assets/javascripts/store/sliding-wizard.js

@@ -57,8 +57,8 @@
           $ol.css('margin-left', methods.calculateMarginFor(pos));
         },
         addNavigation: function(){
-          $next = $(document.createElement('input')).addClass('next').addClass('btn').attr({'type':'button','value':'Next \u2192'}).appendTo($wizard);
-          $back = $(document.createElement('input')).addClass('back').addClass('btn').attr({'type':'button','value':'\u2190 Back'}).appendTo($wizard);
+          $next = $(document.createElement('input')).addClass('next').addClass('btn').addClass('btn-success').addClass('btn-large').attr({'type':'button','value':'Next \u2192'}).appendTo($wizard);
+          $back = $(document.createElement('input')).addClass('back').addClass('btn').addClass('btn-large').attr({'type':'button','value':'\u2190 Back'}).appendTo($wizard);
           $back.attr('disabled','disabled');
 
           $wizard.bind("onLastSlideIn", function(){ methods.hideButton($next); });

data/app/assets/javascripts/store/store.js

@@ -9,7 +9,8 @@ $(document).ready(function(){
 
   $(document).locationSelector({
     'countryField' : '#payment_customer_address_country', 
-    'regionField'  : '#payment_customer_address_state'
+    'regionField'  : '#payment_customer_address_state',
+    'regionClass'  : 'required'
   });
 
   $(document).locationSelector({
@@ -82,13 +83,18 @@ $(document).ready(function(){
   $('label.required').append('&nbsp;<strong>*</strong>&nbsp;');
 
   $('.required').change(function(e) {
-    validateElement($(this))
+    if (isExpirationField(e.target)) {
+      validateExpiration();
+    } else {
+      validateElement($(this))
+    }
   });
 
   $('#shopping-cart-form').submit(function(e) {
     valid = validateForm();
     if (!valid) {
       e.preventDefault();
+      e.validateExpiration();
     } else {
       $('#complete-purchase').attr('disabled', 'true')
     }
@@ -108,8 +114,17 @@ function updateRequiredFields() {
   });
 }
 
+function isExpirationField(el) {
+  var $el = $(el);
+  if ($el.attr('id') == 'credit_card_month' || $el.attr('id') == 'credit_card_year') {
+    return true;
+  }
+  return false;
+}
+
 function validateElement(el) {
   return $('#shopping-cart-form').validate({
+        onfocusout: false,
         errorElement: "span",
         errorClass:'help-inline',
         highlight: function(element, errorClass) {
@@ -121,13 +136,43 @@ function validateElement(el) {
       }).element(el);
 }
 
+function validateExpiration() {
+  var month = false;
+  var year = false;
+  var valid = false;
+  var $group = $('#credit_card_month').parents('.control-group');
+  var $error = $('.expiration-error');
+  var current_date = new Date();
+  var current_month = current_date.getMonth();
+  var current_year = current_date.getFullYear();
+  var selected_year = parseInt($('#credit_card_year').val());
+  var selected_month =  parseInt($('#credit_card_month').val());
+
+  if ($('#credit_card_month').val() != '') { month = true }
+  if ((selected_year > current_year) || ((selected_month > current_month) && (selected_year = current_year))) {valid = true}
+  if ($('#credit_card_year').val() != '' ) { year  = true }
+  
+  if (month && year && valid) {
+    $group.removeClass('error');
+    $error.addClass('hidden');
+    return true;
+  } else {
+    $group.addClass('error');
+    $error.removeClass('hidden');
+    return false;
+  }
+}
+
 function validateForm() {
   var everythingValid = true;
-  $('input.required').each(function() {
-    v = validateElement("#" + $(this).attr('id'));
+  $('input.required,select.required').each(function() {
+    if (isExpirationField(this)) {
+      v = validateExpiration();
+    } else {
+      v = validateElement("#" + $(this).attr('id'));
+    }
     if (!(v)) {everythingValid = false;}
-  });
-
+  }); 
 
   $('.required-checkbox').each(function() {
     if ($(this).prop('checked') == false) {

data/app/assets/javascripts/tags.js

@@ -0,0 +1,44 @@
+(function($) {
+  
+  var options = { show: false };
+  var $modal  = $('#tag-modal');
+
+  // Initialize the modal
+  $modal.modal(options);
+
+  $modal.on('hidden', function() {
+    resetTagModal();
+  });
+
+  $(document).on('click', '.edit-tag', function(click) {
+    updateTagModalWith(readTagData($(this)));
+    openTagModal();
+    return false;
+  });
+
+  function readTagData($button) {
+    return {
+      tag_name: $button.data('tag-name'),
+      tag_id:  $button.data('tag-id')
+    };
+  }
+
+  function updateTagModalWith(data) {
+    $modal.find('.tag_name').val(data.tag_name);
+    $modal.find('#tag_id').val(data.tag_id);
+  }
+
+  function resetTagModal() {
+    $modal.find('.tag_name').val('');
+    $modal.find('#tag_id').val('');
+  }
+
+  function openTagModal() {
+    $modal.modal('show');
+  }
+  
+  $('.submit').click(function(){
+    $('#edit_tag').submit();
+  });
+  
+})(jQuery);

data/app/assets/stylesheets/application.sass

@@ -3,7 +3,9 @@
 @import "./sass/event_list"
 @import "./sass/tags"
 @import "./sass/box-office"
+@import "./sass/campaigns"
 @import "font-awesome"
+@import "./sass/fa-color"
 
 #preload_assets
   display: none
@@ -29,7 +31,8 @@ h3
   font-size: 1.6em
 
 h4.event-link
-  margin: 0px 0px 2px 0px
+  height: 36px
+  margin: 0px
 
 a
   font-weight: bold
@@ -41,16 +44,50 @@ a.weak
   margin-top: 50px
 
 #kit-table
-  td.status
-    width: 60px
-    text-align: center
-    padding-bottom: 1.4em
-    p
-      line-height: 4em
-  td.type
-    vertical-align: top
   .kit-type
     font-weight: bold
+    font-size: 14px
+  .kit-container
+    border-radius: 5px
+    height: 120px
+    padding: 5px
+    background-color: white
+    border: 1px solid #ededed
+    margin-bottom: 5px
+
+  .kit-container:nth-child(3n+1)
+    margin-left: 0px
+
+#user-list
+  .user-container
+    border-radius: 10px
+    border: 1px solid #ececec
+    overflow: hidden
+    height: 60px
+    margin-bottom: 14px
+    width: 99%
+    .user-image
+      padding: 5px
+      text-align: center
+      border-right: 1px solid #ececec
+    .user-email
+      padding-top: 12px
+      text-align: center
+      border-right: 1px solid #ececec
+      height: 60px
+      .email
+        font-weight: bold
+      .other
+        color: #999
+        font-size: 12px
+    .user-role
+      padding-top: 20px
+      text-align: center
+      border-right: 1px solid #ececec
+      height: 60px
+    .user-actions
+      padding-top: 10px
+      text-align: center
 
 ul#memberships
   li
@@ -81,6 +118,9 @@ ul#memberships
   width: 48px
   padding: 2px
 
+.circle-grav
+  border-radius: 30px
+
 .large-grav
   height: 130px
   width: 130px
@@ -131,7 +171,7 @@ ul#memberships
   height: 150px
   #text
     padding-top: 50px
-    
+
 #day-date
   width: 95%
   height: 120px
@@ -336,13 +376,56 @@ input.datepicker, input.datetimepicker
 .form-vertical > .control > input
   margin-bottom: 0
 
-.advanced-search input[type="date"]
-  width: 125px
+#advanced_search_master_list, #advanced_search_list
+  li
+    padding: 15px 0 8px 0
+    border-bottom: 1px dotted #d9d9d9
+  select
+    margin-right: 10px
+    width: 180px
+    &.short
+      width: 150px
+  input
+    width: 100px
+    margin-right: 10px
+    &.short
+      width: 70px
+  .input-prepend
+    vertical-align: top
+    .add-on
+      margin-right: -1px
+      margin-left: 0
+  .search-filter-text-block
+    margin-right: 10px
+  .remove-search-filter
+    color: #959595
+    font-size: 20px
+    margin-right: 10px
+    &:hover
+      color: #484848
+
+#advanced-search-add-condition
+  color: #08c
+  font-size: 16px
+  margin-bottom: 25px
+  #advanced-search-add-condition-button:hover
+    text-decoration: none
+  i
+    font-size: 20px
+    margin-right: 5px
 
-.advanced-search .range-separator
-  width: 20px
-  display: inline-block
-  text-align: center
+#advanced_search_conjunction_filter
+  font-size: 22px
+  margin-bottom: 20px
+  select
+    width: 75px
+    margin: 0 10px
+
+#advanced_search_master_list
+  display: none
+
+.clear-search-link
+  margin-left: 15px
 
 input[type=number]::-webkit-inner-spin-button,
 input[type=number]::-webkit-outer-spin-button
@@ -456,13 +539,6 @@ table.docs
 a.artfully-tooltip, a.artfully-tooltip:hover
   text-decoration: none
 
-body[data-controller=people][data-action=show],
-body[data-controller=households][data-action=show],
-body[data-controller=memberships][data-action=index],
-body[data-controller=passes][data-action=index]
-  padding-top: 10px
-
-
 .table.search-results
   td.controls
     width: 10px
@@ -473,7 +549,6 @@ body[data-controller=passes][data-action=index]
 
 .person-header,
 .household-header
-  overflow: hidden
   background: #eee
   border-bottom: 1px solid #ccc
   padding: 20px
@@ -500,9 +575,15 @@ body[data-controller=passes][data-action=index]
 .household-values-and-tags
   float: right
 
+.household-values-and-tags
+  width: 300px
+
 .company-and-title
   margin-bottom: 20px
 
+.person-and-nickname
+  margin-bottom: 20px
+
 .person-values,
 .household-values
   margin-bottom: 20px
@@ -589,6 +670,8 @@ tr.action td
   cursor: default // temp until the filter button works
   &.hear-icon
     background-image: image_url('actions/hear.png')
+  &.open-icon
+    background-image: image_url('actions/open.png')
   &.say-icon
     background-image: image_url('actions/say.png')
   &.go-icon
@@ -599,6 +682,8 @@ tr.action td
     background-image: image_url('actions/get.png')
   &.give-icon
     background-image: image_url('actions/give.png')
+  &.pledge-icon
+    background-image: image_url('actions/pledge.png')
   &.join-icon
     background-image: image_url('actions/join.png')
 
@@ -612,7 +697,7 @@ tr.action td
 
 #edit-person,
 #edit-household
-  width: 740px
+  width: 760px
   margin-left: -360px
   form
     margin-bottom: 0
@@ -757,6 +842,21 @@ p.alternate_form_link
       margin-bottom: 5px
       padding-top: 5px
 
+.modal-body.contribution
+  max-height: 510px
+
+.btn.find-donor
+  margin-bottom: 10px
+  margin-left: 5px
+
+.round_tag
+  background-color: green
+  color: white
+  padding: 4px
+  font-weight: bold
+  font-size: 12px
+  border-radius: 20px
+
 .btn-add-preset-amount
   margin-top: -10px
   margin-left: 9px
@@ -778,31 +878,230 @@ p.alternate_form_link
 .console-button-smalltext
   padding: 30px 28px
   font-size: 18px
- 
+
 /* Portrait tablet to landscape and desktop */
 @media (min-width: 980px) and (max-width: 1200px)
-  .console-button  
+  .console-button
     font-size: 18px
   .console-button-smalltext
     padding: 28px 20px
     font-size: 18px
- 
+
 /* Landscape phone to portrait tablet */
 @media (max-width: 979px)
-  .console-button  
+  .console-button
     font-size: 16px
     padding: 38px 10px
   .console-button-smalltext
     padding: 16px 16px
     font-size: 16px
- 
+
 @media (max-width: 767px)
-  .console-button 
+  .console-button
     padding: 36px 10px
     font-size: 24px
   .console-button-smalltext
     padding: 34px 16px
     font-size: 22px
-      
+
 #birth_year
   padding: 0px
+
+.mailchimp-list
+  .list > label.checkbox
+    display: inline-block
+
+  .show-all
+    font-size: 20px
+    padding-left: 20px
+
+  .groupings
+    margin-left: 20px
+
+    li
+      .name
+        padding-bottom: 5px
+        padding-top: 5px
+
+    .inactive
+      display: none
+
+.baseball-card
+  position: relative
+  margin-bottom: 27px
+  a.dropdown-toggle
+    color: #333
+    b
+      color: #999
+    &:hover, &:focus
+      text-decoration: none
+      color: $fa-blue
+  .dropdown.time
+    height: 17px // align people viz baseline
+    .dropdown-menu
+      width: 230px
+      .custom-time
+        padding-left: 20px
+        span
+          margin-top: -3px
+        input
+          width: 74px
+
+  .card-background
+    position: absolute
+    background: white
+    width: 400px
+    height: 50px
+    top: -6px
+    left: 5px
+    z-index: 0
+    border-top-left-radius: 69px
+    border-bottom-left-radius: 69px
+  .circle
+    position: absolute
+    top: -15px
+    left: 0px
+    z-index: 1
+    width: 64px
+    height: 64px
+    border-radius: 69px
+    background: #eee
+
+  svg
+    position: absolute
+    top: -15px
+    left: 0px
+    z-index: 3
+    width: 69px
+    height: 69px
+
+  .number
+    z-index: 2
+    float: left
+    width: 23%
+    position: relative
+    text-align: center
+
+  .filter
+    position: relative
+    z-index: 99
+    width: 32%
+    float: right
+    // background: white
+    li.active a, li a span
+      background: none
+      color: $fa-blue
+
+  .viz
+    position: relative
+    z-index: 99
+    width: 51%
+    float: right
+    text-align: center
+    margin-right: -20px
+    .description
+      position: absolute
+      top: 2px
+      left: -6px
+      background: rgba(255,255,255,0.75)
+      width: 110%
+      line-height: 15px
+  .people-viz
+    padding-top: 10px
+    .people
+      color: darken(#c0d2d7, 10)
+      &.active
+        color: darken($fa-blue, 25)
+        opacity: 1
+
+.baseball-card.loading
+  cursor: wait
+  background: none
+  opacity: 0.75
+  svg
+    background: image-url('loading_gray.gif') center center no-repeat
+  a.dropdown-toggle
+    opacity: 0.5
+    &:hover
+      color: #333
+      cursor: wait
+
+.baseball-card.invalid
+  .dropdown.time a.dropdown-toggle, .dropdown.time a.dropdown-toggle b.caret, .number
+    color: $fa-red
+
+.people-menu .person-link
+  margin-bottom: 10px
+
+.people-menu .person-link:hover
+  color: black
+  cursor: pointer
+
+.tag-row
+  padding-bottom: 3px
+
+@-moz-document url-prefix()
+  select
+    optgroup
+      padding-bottom: 5px
+      text-indent: 5px
+      font-style: normal
+
+.super-search-results
+  .search-actions-container
+    margin-top: 19px
+    margin-right: 20px
+    float: right
+
+  .people-list
+    border-bottom: 1px solid #ccc
+    padding: 5px 0px 5px 0px
+
+  .people-count-container
+    padding: 5px 20px
+
+  .people-counter-wrapper
+    background: #eeeeee
+    border: 1px solid #cccccc
+    margin: 20px 0
+    border-radius: 8px
+
+a.tag-link
+  color: white
+  font-weight: normal
+
+a.tag-link:hover
+  color: white
+  font-weight: normal
+
+.events-publish
+  border-color: transparent
+  background-color: transparent
+  display: block
+  width: 100% !important
+  padding: 3px 20px
+  clear: both
+  font-weight: 400
+  line-height: 18px
+  color: #333
+  white-space: nowrap
+  text-align: left
+  &:hover
+    background-color: #0081c2
+    text-decoration: none
+    color: #fff
+
+.devise-content
+  margin-top: 50px
+
+.container-main
+  min-height: 800px
+
+table
+  .empty
+    padding: 20px
+    border-radius: 10px
+    border: 2px dashed #999999
+    background-color: #ddd
+    text-align: center
+    color: #666