calagator 1.0.0.rc2 → 1.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51e56f9e5f7e949478406277f1653226bb3ddc69
-  data.tar.gz: 6af78672399683341f0db6908deea8ff2706231b
+  metadata.gz: 6f3f0278ca21fc965a8679add8e55f9bffba7b57
+  data.tar.gz: e4756333028508a39a6d57743d4d2bbfb52e72a2
 SHA512:
-  metadata.gz: 6f2b32f25058561e83e9e554d4a7ccca8078cd8de454e475b4a1b549e3242ef7ec457c6cd57960bd60071a70c16d710d7a6e96ca6ce942c8aab30f0a86b1d6e0
-  data.tar.gz: 44127ec4b4315990c73f313dce236945faf7ab5f704f191ab14cbf32e1c1d8e1c46b098dccd60d07fd73f4b76decf71658c6f44006c8b1471816d2f895aff813
+  metadata.gz: e3f905a957c9a9cada911c1f7533628b297c9e0b56312019eef9b707937fda364c37c4adb720a30bc3875ec3874db62b9eae01681bcf3c0dab9537103ef0fe7f
+  data.tar.gz: c5b688b9fe7e9babb2e99324ef5e088a3338962c3f277f618e32550aa5da9a03d1e229f0ae3bee2b201ee23505fae9679dd0c9a2e454511f623af383e1ce0b71

data/app/assets/javascripts/calagator.js

@@ -1,19 +1,19 @@
 //= require jquery
 //= require jquery_ujs
+//= require jquery-ui/effect
 //= require calagator/forms
+//= require calagator/mapping
 //= require leaflet.awesome-markers
 //= require mustache
 
-$(document).ready(function(){
-  // Shows hidden section when a link is clicked, and hides the link.
-  //
-  // The link must have a DOM id that corresponds to the section to display,
-  // e.g. a "foo_toggle" link relates to the "foo" section.
-  $(".expander_toggle").click(function(event) {
-    var id_to_hide = event.target.id;
-    var id_to_show = id_to_hide.replace(/_toggle$/, "");
-    $("#"+id_to_hide).hide(200);
-    $("#"+id_to_show).show(200);
-    $e = event;
-  });
+// Shows hidden section when a link is clicked, and hides the link.
+//
+// The link must have a DOM id that corresponds to the section to display,
+// e.g. a "foo_toggle" link relates to the "foo" section.
+$(document).on('click','.expander_toggle', function(event) {
+  var id_to_hide = event.target.id;
+  var id_to_show = id_to_hide.replace(/_toggle$/, "");
+  $("#"+id_to_hide).hide(200);
+  $("#"+id_to_show).show(200);
+  $e = event;
 });

data/app/assets/javascripts/calagator/forms.js

@@ -1,7 +1,8 @@
-//= require jquery-ui
+//= require jquery-ui/datepicker
+//= require jquery-ui/autocomplete
 //= require jquery.timepicker
 
-$(document).ready(function(){
+$(document).on('page:load ready',function(){
   // Initialize autocompletion for venues
   $("input.autocomplete").each(function() {
     $(this).attr('autocomplete', 'off').autocomplete({
@@ -30,31 +31,33 @@ $(document).ready(function(){
   // Initialize date and time pickers
   $('.date_picker').datepicker({ dateFormat: 'yy-mm-dd' });
   $('.time_picker').timepicker({ 'timeFormat': 'g:i A' });
-
-  // Update "time_end" to maintain the same offset from "time_start" if "time_start" changes, and display a highlight to alert the user.
-  var oldTime = $("#time_start").timepicker('getTime');
-  $("#time_start").change(function() {
-    if ($("#time_end").val()) { // Only update when second input has a value.
-      var duration = ($("#time_end").timepicker('getTime') - oldTime);
-      var newTime = $("#time_start").timepicker('getTime');
-      // Calculate and update the time in the second input.
-      $("#time_end").timepicker('setTime', new Date(newTime.getTime() + duration));
-      $('#time_end').effect('highlight', {}, 3000);
-      oldTime = newTime;
-    }
+  $('.time_picker_filter').timepicker({
+    'step': 60,
   });
 
-  // Update "date_end" so that it is the same as "date_start" if "date_start" is changed to after "date_end", and displays a highlight to alert the user.
-  $("#date_start").change(function() {
-    // Only update when end value is defined.
-    if ($("#date_end").val()) {
-      // Only update when end value is before start value.
-      var startDate = $.datepicker.parseDate('yy-mm-dd', $('#date_start').val());
-      var endDate = $.datepicker.parseDate('yy-mm-dd', $('#date_end').val());
-      if (endDate < startDate) {
-        $('#date_end').val($('#date_start').val());
-        $('#date_end').effect('highlight', {}, 3000);
-      }
-    }
-  });
+  // Set oldTime to allow time offset functionality
+  oldTime = $("#time_start").timepicker('getTime');
+});
+
+// Update "time_end" to maintain the same offset from "time_start" if "time_start" changes, and display a highlight to alert the user.
+$(document).on('change', '#time_start', function() {
+  var duration = ($("#time_end").timepicker('getTime') - oldTime);
+  // if the duration is less than 30 minutes, use default duration of an hour
+  if (duration < 1800000) duration = 3600000;
+  var newTime = $("#time_start").timepicker('getTime');
+  // Calculate and update the time in the second input.
+  $("#time_end").timepicker('setTime', new Date(newTime.getTime() + duration));
+  $('#time_end').effect('highlight', {}, 3000);
+  oldTime = newTime;
+});
+
+// Update "date_end" so that it is the same as "date_start" if "date_start" is changed to after "date_end", and displays a highlight to alert the user.
+$(document).on('change', '#date_start, #date_end',function() {
+  // Only update when end value is before start value.
+  var startDate = $.datepicker.parseDate('yy-mm-dd', $('#date_start').val());
+  var endDate = $.datepicker.parseDate('yy-mm-dd', $('#date_end').val());
+  if (endDate < startDate) {
+    $('#date_end').val($('#date_start').val());
+    $('#date_end').effect('highlight', {}, 3000);
+  }
 });

data/app/assets/javascripts/calagator/mapping.js

@@ -0,0 +1,33 @@
+//= require leaflet.awesome-markers
+
+var map = function(layer_constructor, map_tiles, div_id, center, zoom, marker_color, rawMarkers, should_fit_bounds) {
+  klass = eval(layer_constructor)
+  var layer = new klass(map_tiles);
+  var map = new L.Map(div_id, {
+      center: new L.LatLng(center[0], center[1]),
+      zoom: zoom,
+      attributionControl: false
+  });
+  L.control.attribution ({
+    position: 'bottomright',
+    prefix: false
+  }).addTo(map);
+
+  map.addLayer(layer);
+
+  var venueIcon = L.AwesomeMarkers.icon({
+    icon: 'star',
+    prefix: 'fa',
+    markerColor: marker_color
+  })
+
+  var markers = rawMarkers.map(function(m) {
+    return L.marker([m.latitude, m.longitude], { title: m.title, icon: venueIcon}).bindPopup(m.popup);
+  });
+  var markerGroup = L.featureGroup(markers);
+  markerGroup.addTo(map);
+
+  if(should_fit_bounds) {
+    map.fitBounds(markerGroup.getBounds());
+  }
+};

data/app/assets/stylesheets/calagator/changes.scss

@@ -1,45 +1,68 @@
+$changes-header-background: #becdd3;
+$change-odd-row-color: #ddd;
+$change-even-row-color: #eee;
+$change-row-separator-color: #ccc;
+
+$change-event-text-color: #fff;
+
+$change-create-color: #5aa351;
+$change-destroy-color: #a35164;
+$change-update-color: #5174a3;
+$change-rollback-color: #999;
+
 .changes_feed a {
   margin-bottom: 2em;
 }
 
-.changes_table {}
-  .changes_table .changes_header {
-    background-color: #BECDD3; }
-  .changes_table .change_row { }
-    .changes_table .change_row td {
-      margin-bottom: 2em;
-      border-bottom: 2px solid #CCC;
-      text-align: left;
-      vertical-align: text-top; }
-    .changes_table .change_row .change_time {
-      width: 10%; }
-    .changes_table .change_row .change_detail_key {
-      width: 15%;
-      padding: .25em; }
-    .changes_table .change_row .change_detail_value {
-      width: 40%;
-      padding: .25em; }
-    .changes_table .change_row .change_detail_separator {
-      width: 5%; }
-    .changes_table .change_row .odd {
-      background-color: #ddd; }
-    .changes_table .change_row .even {
-      background-color: #eee; }
-    .changes_table .change_row .change_details .event,
-    .changes_table .change_row .change_details .rollback {
+.changes_table {
+  .changes_header {
+    background-color: $changes-header-background;
+  }
+
+  td {
+    border-bottom: 2px solid $change-row-separator-color;
+    margin-bottom: 2em;
+    text-align: left;
+    vertical-align: text-top;
+  }
+
+  .odd { background-color: $change-odd-row-color; }
+  .even { background-color: $change-even-row-color; }
+
+  .change_time { width: 10%; }
+
+  .change_detail_key {
+    padding: .25em;
+    width: 15%;
+  }
+
+  .change_detail_value {
+    padding: .25em;
+    width: 40%;
+  }
+
+  .change_detail_separator { width: 5%; }
+
+  .change_details {
+    .event,
+    .rollback {
+      color: $change-event-text-color;
       display: inline-block;
+      font-weight: bold;
       padding: 0 4px;
-      color: #fff;
-      font-weight: bold; }
-    .changes_table .change_row .change_details .event {
-      text-transform: uppercase; }
-    .changes_table .change_row .change_details .rollback {
+    }
+
+    .event { text-transform: uppercase; }
+
+    .rollback {
+      background: $change-rollback-color;
       float: right;
-      background: #999;
     }
-    .changes_table .change_row.create .event {
-      background: #5AA351; }
-    .changes_table .change_row.destroy .event {
-      background: #A35164; }
-    .changes_table .change_row.update .event {
-      background: #5174A3; }
+  }
+
+
+  &.create .event { background: $change-create-color; }
+  &.destroy .event { background: $change-destroy-color; }
+  &.update .event { background: $change-update-color; }
+
+}

data/app/assets/stylesheets/calagator/forms.scss

@@ -1,144 +1,140 @@
-/* ##############################################################
-
-   forms.css
-   * Sets up some default styling for forms
-   * Gives you classes to enhance your forms
-
-   Usage:
-   * For text fields, use class .title or .text
-
-   Originally based on blueprint-css v0.7.1
-
-############################################################## */
-
-/*
- *= require jquery-ui/datepicker
- */
-
-fieldset .trap { display: none }
-
-form.formtastic {
+// ##############################################################
+//
+//   forms.css
+//   * Sets up some default styling for forms
+//   * Gives you classes to enhance your forms
+//
+//   Usage:
+//   * For text fields, use class .title or .text
+//
+//   Originally based on blueprint-css v0.7.1
+//
+// ##############################################################
+
+fieldset .trap { display: none; }
+
+.formtastic {
   width: 900px;
-}
 
-.formtastic .inputs {
-  padding-top: .5em;
-}
+  .inputs { padding-top: .5em; }
+  .actions { padding-bottom: 3em; }
+
+  .stringish input,
+  .text textarea,
+  .event-times input {
+    font-family: inherit;
+    font-size: inherit;
+    padding: 6px;
+  }
+
+  .input .label {
+    font-weight: bold;
+    margin-left: -1em;
+    padding-right: 1em;
+    text-align: right;
+    width: 15%;
+  }
+
+  .input .inline-hints,
+  .errors,
+  .inline-errors {
+    margin-left: 15%;
+    width: 74%;
+  }
+
+  .actions,
+  .boolean label {
+    padding-left: 15%;
+  }
+}
+
+
+// Autocomplete
+// --------------------------------------------------------------
+
+.ui-autocomplete {
+  background-color: #fff;
+  border: 1px solid #aaa;
+  color: #333;
+  list-style: none;
+  margin: 0;
+  overflow: hidden;
+  padding: 0;
+  position: absolute;
 
-.formtastic .actions {
-  padding-bottom: 3em;
+  li {
+    display: block;
+    overflow: hidden;
+    padding: .3em .5em .3em .3em;
+    width: 100%;
+  }
 }
 
-.formtastic .stringish input,
-.formtastic .text textarea,
-.formtastic #event_times input {
-  font-family: inherit;
-  font-size: inherit;
-  padding: 6px;
-}
 
-.formtastic .input .label {
-  font-weight: bold;
-  text-align: right;
-  padding-right: 1em;
-  margin-left: -1em;
-  width: 15%;
+.jq-ui-autocomplete .active {
+  background-color: saturate(lighten($green, 20%), 25%);
+  color: $dk-green;
 }
 
-.formtastic .input .inline-hints,
-.formtastic .errors,
-.formtastic .inline-errors {
-  margin-left: 15%;
-  width: 74%;
-}
 
-.formtastic .actions,
-.formtastic .boolean label {
-  padding-left: 15%;
-}
+// Form fields
+// --------------------------------------------------------------
 
-/* @group Autocomplete
--------------------------------------------------------------- */
-ul.jq-ui-autocomplete {
-    position: absolute;
-    overflow: hidden;
-    background-color: #fff;
-    border: 1px solid #aaa;
-    margin: 0px;
-    padding: 0;
-    list-style: none;
-    color: #333;
-}
-ul.jq-ui-autocomplete li {
-  display: block;
-  padding: .3em .5em .3em .3em;
-  overflow: hidden;
-  width: 100%;
-}
-
-ul.jq-ui-autocomplete li.active {
-  background-color: saturate(lighten($green, 20%), 25%);;
-  color: $dk_green;
+.event-times input,
+.event-times span {
+  float: left;
+  margin-right: 1em;
 }
 
-/* @end */
-
-/* @group Form fields
--------------------------------------------------------------- */
+.standard-form {
+  width: 100%;
 
+  input[type="text"],
+  input[type="url"],
+  input[type="number"],
+  input[type="email"],
+  input[type="tel"],
+  textarea,
+  .text textarea {
+    width: 370px;
+  }
 
-#event_times input, #event_times span {
-  margin-right: 1em;
-  float: left;
+  input.date_picker { width: 7em; }
+  input.time_picker { width: 5em; }
 }
 
-form.standard_form {
-  width: 100%;
-}
+div.time-picker li { white-space: nowrap; }
 
-.standard_form input[type="text"],
-.standard_form input[type="url"],
-.standard_form input[type="number"],
-.standard_form input[type="email"],
-.standard_form input[type="tel"],
-.standard_form textarea,
-.standard_form .text textarea
-{
-  width: 370px;
-}
 
-.standard_form input.date_picker
-{
-  width: 7em;
-}
+// Success, notice and error boxes
+// --------------------------------------------------------------
 
-.standard_form input.time_picker
-{
-  width: 5em;
+.flash { 
+  padding: .8em;
+  margin: 1em 250px 1em 0;
 }
 
-div.time-picker li {
-  white-space: nowrap;
+.error, .failure { 
+  background: #ffc5a3;
+  border: #c00;
+  color: #c00;
 }
 
-/* @end */
+.notice { background: #bcf794; }
 
-/* @group Success, notice and error boxes
--------------------------------------------------------------- */
-
-.flash      { padding: .8em; margin: 1em 250px 1em 0 ;  }
+.success { 
+  background: #98f0f7;
+  color: $dk-green; 
+}
 
-.error, .failure      { background: #FFC5A3; color: #C00; border: #C00}
-.notice     { background: #bcf794; }
-.success    { background: #98f0f7; color: $dk_green;  }
-.error a    { color:  #FF640A; }
-.notice a   { color: #514721; }
-.success a  { color: #264409; }
+.error a { color: #ff640a; }
+.notice a { color: #514721; }
+.success a { color: #264409; }
 
 .flash.flash_failure, .errorExplanation {
-  color: #C00;
-  border: 2px solid  #C00;
-  background: #F5DBD7;
+  color: #c00;
+  border: 2px solid  #c00;
+  background: #f5dbD7;
   padding: 1em;
 }
 
@@ -147,4 +143,3 @@ ul.errors {
   padding-top: .5em;
 }
 
-/* @end */