Adding arrival/departure time to the registration form

app/assets/javascripts/application.js

@@ -14,6 +14,7 @@
 //= require jquery_ujs
 //= require jquery-ui
 //= require jquery-fileupload
+//= require jquery-ui-timepicker-addon
 //= require cocoon
 //= require bootstrap.min
 //= require osem

app/assets/javascripts/osem.js

@@ -27,15 +27,20 @@ $(function() {
         }
     });
 
-    $("#conference-reg-start-datepicker").datepicker({
+    $("#conference-reg-start-datepicker").datetimepicker({
-        dateFormat: 'yy/mm/dd',
+        dateFormat: "yy-mm-dd",
+        timeFormat: "HH:mm",
+        showSecond: false,
         numberOfMonths: 2,
         onSelect: function(selected) {
             $("#conference-reg-end-datepicker").datepicker("option","minDate", selected)
         }
     });
-    $("#conference-reg-end-datepicker").datepicker({
+
-        dateFormat: 'yy/mm/dd',
+    $("#conference-reg-end-datepicker").datetimepicker({
+        dateFormat: "yy-mm-dd",
+        timeFormat: "HH:mm",
+        showSecond: false,
         numberOfMonths: 2,
         onSelect: function(selected) {
             $("#conference-reg-start-datepicker").datepicker("option","maxDate", selected)

app/assets/stylesheets/application.css

@@ -4,4 +4,5 @@
  *= require osem
  *= require jquery-ui-1.9.2.custom
  *= require jquery.fileupload-ui
+ *= require jquery-ui-timepicker-addon
 */

app/assets/stylesheets/jquery-ui-1.9.2.custom.css

@@ -1,8 +1,8 @@
-/*! jQuery UI - v1.9.2 - 2012-12-28
+/*! jQuery UI - v1.9.2 - 2013-01-20
 * http://jqueryui.com
-* Includes: jquery.ui.core.css, jquery.ui.datepicker.css
+* Includes: jquery.ui.core.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css, jquery.ui.slider.css, jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css
-* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Lucida%20Grande%2CLucida%20Sans%2CArial%2Csans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=5px&bgColorHeader=5c9ccc&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=55&borderColorHeader=4297d7&fcHeader=ffffff&iconColorHeader=d8e7f3&bgColorContent=fcfdfd&bgTextureContent=06_inset_hard.png&bgImgOpacityContent=100&borderColorContent=a6c9e2&fcContent=222222&iconColorContent=469bdd&bgColorDefault=dfeffc&bgTextureDefault=02_glass.png&bgImgOpacityDefault=85&borderColorDefault=c5dbec&fcDefault=2e6e9e&iconColorDefault=6da8d5&bgColorHover=d0e5f5&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=79b7e7&fcHover=1d5987&iconColorHover=217bc0&bgColorActive=f5f8f9&bgTextureActive=06_inset_hard.png&bgImgOpacityActive=100&borderColorActive=79b7e7&fcActive=e17009&iconColorActive=f9bd01&bgColorHighlight=fbec88&bgTextureHighlight=01_flat.png&bgImgOpacityHighlight=55&borderColorHighlight=fad42e&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
+* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=segoe%20ui%2CArial%2Csans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=6px&bgColorHeader=ece8da&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=100&borderColorHeader=d4ccb0&fcHeader=433f38&iconColorHeader=847e71&bgColorContent=f5f3e5&bgTextureContent=04_highlight_hard.png&bgImgOpacityContent=100&borderColorContent=dfd9c3&fcContent=312e25&iconColorContent=808080&bgColorDefault=459e00&bgTextureDefault=04_highlight_hard.png&bgImgOpacityDefault=15&borderColorDefault=327E04&fcDefault=ffffff&iconColorDefault=eeeeee&bgColorHover=67b021&bgTextureHover=03_highlight_soft.png&bgImgOpacityHover=25&borderColorHover=327E04&fcHover=ffffff&iconColorHover=ffffff&bgColorActive=fafaf4&bgTextureActive=04_highlight_hard.png&bgImgOpacityActive=100&borderColorActive=d4ccb0&fcActive=459e00&iconColorActive=8DC262&bgColorHighlight=fcf0ba&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=e8e1b5&fcHighlight=363636&iconColorHighlight=8DC262&bgColorError=ffedad&bgTextureError=03_highlight_soft.png&bgImgOpacityError=95&borderColorError=e3a345&fcError=cd5c0a&iconColorError=cd0a0a&bgColorOverlay=2b2922&bgTextureOverlay=05_inset_soft.png&bgImgOpacityOverlay=15&opacityOverlay=90&bgColorShadow=cccccc&bgTextureShadow=04_highlight_hard.png&bgImgOpacityShadow=95&opacityShadow=20&thicknessShadow=12px&offsetTopShadow=-12px&offsetLeftShadow=-12px&cornerRadiusShadow=10px
-* Copyright (c) 2012 jQuery Foundation and other contributors Licensed MIT */
+* Copyright (c) 2013 jQuery Foundation and other contributors Licensed MIT */
 
 /* Layout helpers
 ----------------------------------*/
@@ -32,6 +32,62 @@
 
 /* Overlays */
 .ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+.ui-resizable { position: relative;}
+.ui-resizable-handle { position: absolute;font-size: 0.1px; display: block; }
+.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
+.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
+.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
+.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
+.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
+.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
+.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
+.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
+.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
+.ui-accordion .ui-accordion-header { display: block; cursor: pointer; position: relative; margin-top: 2px; padding: .5em .5em .5em .7em; zoom: 1; }
+.ui-accordion .ui-accordion-icons { padding-left: 2.2em; }
+.ui-accordion .ui-accordion-noicons { padding-left: .7em; }
+.ui-accordion .ui-accordion-icons .ui-accordion-icons { padding-left: 2.2em; }
+.ui-accordion .ui-accordion-header .ui-accordion-header-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
+.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; overflow: auto; zoom: 1; }
+.ui-autocomplete {
+	position: absolute;
+	top: 0;
+	left: 0;
+	cursor: default;
+}
+
+/* workarounds */
+* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
+.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
+.ui-button, .ui-button:link, .ui-button:visited, .ui-button:hover, .ui-button:active { text-decoration: none; }
+.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
+button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
+.ui-button-icons-only { width: 3.4em; } 
+button.ui-button-icons-only { width: 3.7em; } 
+
+/*button text element */
+.ui-button .ui-button-text { display: block; line-height: 1.4;  }
+.ui-button-text-only .ui-button-text { padding: .4em 1em; }
+.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
+.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
+.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
+.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
+/* no icon support for input elements, provide padding by default */
+input.ui-button { padding: .4em 1em; }
+
+/*button icon element(s) */
+.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
+.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
+.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
+.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
+
+/*button sets*/
+.ui-buttonset { margin-right: 7px; }
+.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
+
+/* workarounds */
+button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
 .ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
 .ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
 .ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
@@ -88,33 +144,114 @@
     left: -4px; /*must have*/
     width: 200px; /*must have*/
     height: 200px; /*must have*/
+}.ui-dialog { position: absolute; top: 0; left: 0; padding: .2em; width: 300px; overflow: hidden; }
+.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
+.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; }
+.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
+.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
+.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
+.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
+.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
+.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
+.ui-draggable .ui-dialog-titlebar { cursor: move; }
+.ui-menu { list-style:none; padding: 2px; margin: 0; display:block; outline: none; }
+.ui-menu .ui-menu { margin-top: -3px; position: absolute; }
+.ui-menu .ui-menu-item { margin: 0; padding: 0; zoom: 1; width: 100%; }
+.ui-menu .ui-menu-divider { margin: 5px -2px 5px -2px; height: 0; font-size: 0; line-height: 0; border-width: 1px 0 0 0; }
+.ui-menu .ui-menu-item a { text-decoration: none; display: block; padding: 2px .4em; line-height: 1.5; zoom: 1; font-weight: normal; }
+.ui-menu .ui-menu-item a.ui-state-focus,
+.ui-menu .ui-menu-item a.ui-state-active { font-weight: normal; margin: -1px; }
+
+.ui-menu .ui-state-disabled { font-weight: normal; margin: .4em 0 .2em; line-height: 1.5; }
+.ui-menu .ui-state-disabled a { cursor: default; }
+
+/* icon support */
+.ui-menu-icons { position: relative; }
+.ui-menu-icons .ui-menu-item a { position: relative; padding-left: 2em; }
+
+/* left-aligned */
+.ui-menu .ui-icon { position: absolute; top: .2em; left: .2em; }
+
+/* right-aligned */
+.ui-menu .ui-menu-icon { position: static; float: right; }
+.ui-progressbar { height:2em; text-align: left; overflow: hidden; }
+.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }.ui-slider { position: relative; text-align: left; }
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }.ui-spinner { position:relative; display: inline-block; overflow: hidden; padding: 0; vertical-align: middle; }
+.ui-spinner-input { border: none; background: none; padding: 0; margin: .2em 0; vertical-align: middle; margin-left: .4em; margin-right: 22px; }
+.ui-spinner-button { width: 16px; height: 50%; font-size: .5em; padding: 0; margin: 0; text-align: center; position: absolute; cursor: default; display: block; overflow: hidden; right: 0; }
+.ui-spinner a.ui-spinner-button { border-top: none; border-bottom: none; border-right: none; } /* more specificity required here to overide default borders */
+.ui-spinner .ui-icon { position: absolute; margin-top: -8px; top: 50%; left: 0; } /* vertical centre icon */
+.ui-spinner-up { top: 0; }
+.ui-spinner-down { bottom: 0; }
+
+/* TR overrides */
+.ui-spinner .ui-icon-triangle-1-s {
+	/* need to fix icons sprite */
+	background-position:-65px -16px;
 }
+.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
+.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
+.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 0; margin: 1px .2em 0 0; border-bottom: 0; padding: 0; white-space: nowrap; }
+.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-active { margin-bottom: -1px; padding-bottom: 1px; }
+.ui-tabs .ui-tabs-nav li.ui-tabs-active a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-tabs-loading a { cursor: text; }
+.ui-tabs .ui-tabs-nav li a, .ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
+.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
+.ui-tooltip {
+	padding: 8px;
+	position: absolute;
+	z-index: 9999;
+	max-width: 300px;
+	-webkit-box-shadow: 0 0 5px #aaa;
+	box-shadow: 0 0 5px #aaa;
+}
+/* Fades and background-images don't work well together in IE6, drop the image */
+* html .ui-tooltip {
+	background-image: none;
+}
+body .ui-tooltip { border-width: 2px; }
+
 /* Component containers
 ----------------------------------*/
-.ui-widget { font-family: Lucida Grande,Lucida Sans,Arial,sans-serif; font-size: 1.1em; }
+.ui-widget { font-family: segoe ui,Arial,sans-serif; font-size: 1.1em; }
 .ui-widget .ui-widget { font-size: 1em; }
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Lucida Grande,Lucida Sans,Arial,sans-serif; font-size: 1em; }
+.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: segoe ui,Arial,sans-serif; font-size: 1em; }
-.ui-widget-content { border: 1px solid #a6c9e2; background: #fcfdfd url(images/ui-bg_inset-hard_100_fcfdfd_1x100.png) 50% bottom repeat-x; color: #222222; }
+.ui-widget-content { border: 1px solid #dfd9c3; background: #f5f3e5 url(images/ui-bg_highlight-hard_100_f5f3e5_1x100.png) 50% top repeat-x; color: #312e25; }
-.ui-widget-content a { color: #222222; }
+.ui-widget-content a { color: #312e25; }
-.ui-widget-header { border: 1px solid #4297d7; background: #5c9ccc url(images/ui-bg_gloss-wave_55_5c9ccc_500x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
+.ui-widget-header { border: 1px solid #d4ccb0; background: #ece8da url(images/ui-bg_gloss-wave_100_ece8da_500x100.png) 50% 50% repeat-x; color: #433f38; font-weight: bold; }
-.ui-widget-header a { color: #ffffff; }
+.ui-widget-header a { color: #433f38; }
 
 /* Interaction states
 ----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #c5dbec; background: #dfeffc url(images/ui-bg_glass_85_dfeffc_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #2e6e9e; }
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #327E04; background: #459e00 url(images/ui-bg_highlight-hard_15_459e00_1x100.png) 50% 50% repeat-x; font-weight: bold; color: #ffffff; }
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #2e6e9e; text-decoration: none; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #ffffff; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #79b7e7; background: #d0e5f5 url(images/ui-bg_glass_75_d0e5f5_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #1d5987; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #327E04; background: #67b021 url(images/ui-bg_highlight-soft_25_67b021_1x100.png) 50% 50% repeat-x; font-weight: bold; color: #ffffff; }
-.ui-state-hover a, .ui-state-hover a:hover, .ui-state-hover a:link, .ui-state-hover a:visited { color: #1d5987; text-decoration: none; }
+.ui-state-hover a, .ui-state-hover a:hover, .ui-state-hover a:link, .ui-state-hover a:visited { color: #ffffff; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #79b7e7; background: #f5f8f9 url(images/ui-bg_inset-hard_100_f5f8f9_1x100.png) 50% 50% repeat-x; font-weight: bold; color: #e17009; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #d4ccb0; background: #fafaf4 url(images/ui-bg_highlight-hard_100_fafaf4_1x100.png) 50% 50% repeat-x; font-weight: bold; color: #459e00; }
-.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #e17009; text-decoration: none; }
+.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #459e00; text-decoration: none; }
 
 /* Interaction Cues
 ----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fad42e; background: #fbec88 url(images/ui-bg_flat_55_fbec88_40x100.png) 50% 50% repeat-x; color: #363636; }
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #e8e1b5; background: #fcf0ba url(images/ui-bg_glass_55_fcf0ba_1x400.png) 50% 50% repeat-x; color: #363636; }
 .ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
-.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #e3a345; background: #ffedad url(images/ui-bg_highlight-soft_95_ffedad_1x100.png) 50% top repeat-x; color: #cd5c0a; }
-.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; }
+.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd5c0a; }
-.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd5c0a; }
 .ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
 .ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
 .ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
@@ -124,13 +261,13 @@
 ----------------------------------*/
 
 /* states and images */
-.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_469bdd_256x240.png); }
+.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_808080_256x240.png); }
-.ui-widget-content .ui-icon {background-image: url(images/ui-icons_469bdd_256x240.png); }
+.ui-widget-content .ui-icon {background-image: url(images/ui-icons_808080_256x240.png); }
-.ui-widget-header .ui-icon {background-image: url(images/ui-icons_d8e7f3_256x240.png); }
+.ui-widget-header .ui-icon {background-image: url(images/ui-icons_847e71_256x240.png); }
-.ui-state-default .ui-icon { background-image: url(images/ui-icons_6da8d5_256x240.png); }
+.ui-state-default .ui-icon { background-image: url(images/ui-icons_eeeeee_256x240.png); }
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_217bc0_256x240.png); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_ffffff_256x240.png); }
-.ui-state-active .ui-icon {background-image: url(images/ui-icons_f9bd01_256x240.png); }
+.ui-state-active .ui-icon {background-image: url(images/ui-icons_8DC262_256x240.png); }
-.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_2e83ff_256x240.png); }
+.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_8DC262_256x240.png); }
 .ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_cd0a0a_256x240.png); }
 
 /* positioning */
@@ -315,11 +452,11 @@
 ----------------------------------*/
 
 /* Corner radius */
-.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; -khtml-border-top-left-radius: 5px; border-top-left-radius: 5px; }
+.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 6px; -webkit-border-top-left-radius: 6px; -khtml-border-top-left-radius: 6px; border-top-left-radius: 6px; }
-.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; -khtml-border-top-right-radius: 5px; border-top-right-radius: 5px; }
+.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 6px; -webkit-border-top-right-radius: 6px; -khtml-border-top-right-radius: 6px; border-top-right-radius: 6px; }
-.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; -khtml-border-bottom-left-radius: 5px; border-bottom-left-radius: 5px; }
+.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 6px; -webkit-border-bottom-left-radius: 6px; -khtml-border-bottom-left-radius: 6px; border-bottom-left-radius: 6px; }
-.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; -khtml-border-bottom-right-radius: 5px; border-bottom-right-radius: 5px; }
+.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 6px; -webkit-border-bottom-right-radius: 6px; -khtml-border-bottom-right-radius: 6px; border-bottom-right-radius: 6px; }
 
 /* Overlays */
-.ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .3;filter:Alpha(Opacity=30); }
+.ui-widget-overlay { background: #2b2922 url(images/ui-bg_inset-soft_15_2b2922_1x100.png) 50% bottom repeat-x; opacity: .9;filter:Alpha(Opacity=90); }
-.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .3;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -khtml-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }
+.ui-widget-shadow { margin: -12px 0 0 -12px; padding: 12px; background: #cccccc url(images/ui-bg_highlight-hard_95_cccccc_1x100.png) 50% top repeat-x; opacity: .2;filter:Alpha(Opacity=20); -moz-border-radius: 10px; -khtml-border-radius: 10px; -webkit-border-radius: 10px; border-radius: 10px; }

app/assets/stylesheets/jquery-ui-timepicker-addon.css

@@ -0,0 +1,10 @@
+.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }
+.ui-timepicker-div dl { text-align: left; }
+.ui-timepicker-div dl dt { height: 25px; margin-bottom: -25px; }
+.ui-timepicker-div dl dd { margin: 0 10px 10px 65px; }
+.ui-timepicker-div td { font-size: 90%; }
+.ui-tpicker-grid-label { background: none; border: none; margin: 0; padding: 0; }
+
+.ui-timepicker-rtl{ direction: rtl; }
+.ui-timepicker-rtl dl { text-align: right; }
+.ui-timepicker-rtl dl dd { margin: 0 65px 10px 10px; }

app/views/conference_registration/register.html.haml

@@ -17,8 +17,8 @@
         = f.input :attending_social_events, :label => false
         = f.input :attending_social_events_with_partner, :label => false
         = f.input :using_affiliated_lodging, :label => false
-        = f.input :arrival, :as => :string, :input_html => { :id => "conference-start-datepicker", :readonly => "readonly"  }
+        = f.input :arrival, :as => :string,  :input_html => {:value => f.object.arrival.to_formatted_s(:db_without_seconds), :id => "conference-reg-start-datepicker", :readonly => "readonly"  }
-        = f.input :departure, :as => :string, :input_html => { :id => "conference-end-datepicker", :readonly => "readonly"  }
+        = f.input :departure, :as => :string, :input_html => {:value => f.object.departure.to_formatted_s(:db_without_seconds), :id => "conference-reg-end-datepicker", :readonly => "readonly"  }
         - if @registered
           = f.action :submit, :button_html => { :value => "Update Registration", :class => "btn btn-primary" }
           = link_to "Unregister", register_conference_path(@conference.short_title),:method => :delete, :class => "btn btn-danger",

config/initializers/time_formats.rb

@@ -0,0 +1 @@
+Time::DATE_FORMATS[:db_without_seconds] = "%Y-%m-%d %H:%M"

db/migrate/20130120104029_change_arrival_registrations_date_to_datetime.rb

@@ -0,0 +1,11 @@
+class ChangeArrivalRegistrationsDateToDatetime < ActiveRecord::Migration
+  def up
+    change_column :registrations, :arrival, :datetime
+    change_column :registrations, :departure, :datetime
+  end
+
+  def down
+    change_column :registrations, :arrival, :date
+    change_column :registrations, :departure, :date
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130117130949) do
+ActiveRecord::Schema.define(:version => 20130120104029) do
 
   create_table "call_for_papers", :force => true do |t|
     t.date     "start_date",    :null => false
@@ -157,8 +157,8 @@ ActiveRecord::Schema.define(:version => 20130117130949) do
     t.boolean  "attending_social_events",              :default => true
     t.boolean  "attending_social_events_with_partner", :default => false
     t.boolean  "using_affiliated_lodging",             :default => true
-    t.date     "arrival"
+    t.datetime "arrival"
-    t.date     "departure"
+    t.datetime "departure"
     t.text     "additional_speakers"
     t.datetime "created_at",                                              :null => false
     t.datetime "updated_at",                                              :null => false

public/assets/manifest.yml

@@ -1,34 +1,34 @@
 ---
-images/ui-bg_flat_0_aaaaaa_40x100.png: images/ui-bg_flat_0_aaaaaa_40x100-7d1197a52442bc56fcad60d0390f4b32.png
+images/ui-bg_glass_55_fcf0ba_1x400.png: images/ui-bg_glass_55_fcf0ba_1x400-a4f67bf469297b24eec88f4d112ae41b.png
-images/ui-bg_flat_0_aaaaaa_40x100/index.png: images/ui-bg_flat_0_aaaaaa_40x100-7d1197a52442bc56fcad60d0390f4b32.png
+images/ui-bg_glass_55_fcf0ba_1x400/index.png: images/ui-bg_glass_55_fcf0ba_1x400-a4f67bf469297b24eec88f4d112ae41b.png
-images/ui-bg_flat_55_fbec88_40x100.png: images/ui-bg_flat_55_fbec88_40x100-6bd1905222cab173dc4996f12b7a07cb.png
+images/ui-bg_gloss-wave_100_ece8da_500x100.png: images/ui-bg_gloss-wave_100_ece8da_500x100-a8e979ed48b8dca11987e53ab2ea4af3.png
-images/ui-bg_flat_55_fbec88_40x100/index.png: images/ui-bg_flat_55_fbec88_40x100-6bd1905222cab173dc4996f12b7a07cb.png
+images/ui-bg_gloss-wave_100_ece8da_500x100/index.png: images/ui-bg_gloss-wave_100_ece8da_500x100-a8e979ed48b8dca11987e53ab2ea4af3.png
-images/ui-bg_glass_75_d0e5f5_1x400.png: images/ui-bg_glass_75_d0e5f5_1x400-d4e12d9ce6e2b20ae0aadf27c8dcd12c.png
+images/ui-bg_highlight-hard_100_f5f3e5_1x100.png: images/ui-bg_highlight-hard_100_f5f3e5_1x100-a78c00206328c2918bc4afc14127c2ca.png
-images/ui-bg_glass_75_d0e5f5_1x400/index.png: images/ui-bg_glass_75_d0e5f5_1x400-d4e12d9ce6e2b20ae0aadf27c8dcd12c.png
+images/ui-bg_highlight-hard_100_f5f3e5_1x100/index.png: images/ui-bg_highlight-hard_100_f5f3e5_1x100-a78c00206328c2918bc4afc14127c2ca.png
-images/ui-bg_glass_85_dfeffc_1x400.png: images/ui-bg_glass_85_dfeffc_1x400-d1dabcb9501a4ed8c9bfc1b19c966022.png
+images/ui-bg_highlight-hard_100_fafaf4_1x100.png: images/ui-bg_highlight-hard_100_fafaf4_1x100-d0247d04766a6885cbd5d9c362d9c2b5.png
-images/ui-bg_glass_85_dfeffc_1x400/index.png: images/ui-bg_glass_85_dfeffc_1x400-d1dabcb9501a4ed8c9bfc1b19c966022.png
+images/ui-bg_highlight-hard_100_fafaf4_1x100/index.png: images/ui-bg_highlight-hard_100_fafaf4_1x100-d0247d04766a6885cbd5d9c362d9c2b5.png
-images/ui-bg_glass_95_fef1ec_1x400.png: images/ui-bg_glass_95_fef1ec_1x400-ab58fbcd66af992f067fcbc7c6488996.png
+images/ui-bg_highlight-hard_15_459e00_1x100.png: images/ui-bg_highlight-hard_15_459e00_1x100-6af1e83eb2203de895da80d83a25da44.png
-images/ui-bg_glass_95_fef1ec_1x400/index.png: images/ui-bg_glass_95_fef1ec_1x400-ab58fbcd66af992f067fcbc7c6488996.png
+images/ui-bg_highlight-hard_15_459e00_1x100/index.png: images/ui-bg_highlight-hard_15_459e00_1x100-6af1e83eb2203de895da80d83a25da44.png
-images/ui-bg_gloss-wave_55_5c9ccc_500x100.png: images/ui-bg_gloss-wave_55_5c9ccc_500x100-b9ac529234515ff4971dee7e7281c14b.png
+images/ui-bg_highlight-hard_95_cccccc_1x100.png: images/ui-bg_highlight-hard_95_cccccc_1x100-a4b85b21d7efa7357a9ffd2ed5793daf.png
-images/ui-bg_gloss-wave_55_5c9ccc_500x100/index.png: images/ui-bg_gloss-wave_55_5c9ccc_500x100-b9ac529234515ff4971dee7e7281c14b.png
+images/ui-bg_highlight-hard_95_cccccc_1x100/index.png: images/ui-bg_highlight-hard_95_cccccc_1x100-a4b85b21d7efa7357a9ffd2ed5793daf.png
-images/ui-bg_inset-hard_100_f5f8f9_1x100.png: images/ui-bg_inset-hard_100_f5f8f9_1x100-ad5cffb7206618b1667599d7c6c24e00.png
+images/ui-bg_highlight-soft_25_67b021_1x100.png: images/ui-bg_highlight-soft_25_67b021_1x100-222d123a086ded5714ea1ea6fc90336b.png
-images/ui-bg_inset-hard_100_f5f8f9_1x100/index.png: images/ui-bg_inset-hard_100_f5f8f9_1x100-ad5cffb7206618b1667599d7c6c24e00.png
+images/ui-bg_highlight-soft_25_67b021_1x100/index.png: images/ui-bg_highlight-soft_25_67b021_1x100-222d123a086ded5714ea1ea6fc90336b.png
-images/ui-bg_inset-hard_100_fcfdfd_1x100.png: images/ui-bg_inset-hard_100_fcfdfd_1x100-9f0c2e70b06a9eaec77d569b25b04d7e.png
+images/ui-bg_highlight-soft_95_ffedad_1x100.png: images/ui-bg_highlight-soft_95_ffedad_1x100-b48df7a6ef4088b45e47d8a0d41d95be.png
-images/ui-bg_inset-hard_100_fcfdfd_1x100/index.png: images/ui-bg_inset-hard_100_fcfdfd_1x100-9f0c2e70b06a9eaec77d569b25b04d7e.png
+images/ui-bg_highlight-soft_95_ffedad_1x100/index.png: images/ui-bg_highlight-soft_95_ffedad_1x100-b48df7a6ef4088b45e47d8a0d41d95be.png
-images/ui-icons_217bc0_256x240.png: images/ui-icons_217bc0_256x240-2f9a30594e6475d5f34e3e43d6447b41.png
+images/ui-bg_inset-soft_15_2b2922_1x100.png: images/ui-bg_inset-soft_15_2b2922_1x100-9f5631700dd0bd99fb6287498f8d23c6.png
-images/ui-icons_217bc0_256x240/index.png: images/ui-icons_217bc0_256x240-2f9a30594e6475d5f34e3e43d6447b41.png
+images/ui-bg_inset-soft_15_2b2922_1x100/index.png: images/ui-bg_inset-soft_15_2b2922_1x100-9f5631700dd0bd99fb6287498f8d23c6.png
-images/ui-icons_2e83ff_256x240.png: images/ui-icons_2e83ff_256x240-2ea4c160a75c1992daa2eeac86255b99.png
+images/ui-icons_808080_256x240.png: images/ui-icons_808080_256x240-a0c69c1f1e3ce6948ad11fa321acf048.png
-images/ui-icons_2e83ff_256x240/index.png: images/ui-icons_2e83ff_256x240-2ea4c160a75c1992daa2eeac86255b99.png
+images/ui-icons_808080_256x240/index.png: images/ui-icons_808080_256x240-a0c69c1f1e3ce6948ad11fa321acf048.png
-images/ui-icons_469bdd_256x240.png: images/ui-icons_469bdd_256x240-232cd1e8416c1a5e7bbc316084708d2c.png
+images/ui-icons_847e71_256x240.png: images/ui-icons_847e71_256x240-a22671b3eb8d881817d5cbfa1bab5063.png
-images/ui-icons_469bdd_256x240/index.png: images/ui-icons_469bdd_256x240-232cd1e8416c1a5e7bbc316084708d2c.png
+images/ui-icons_847e71_256x240/index.png: images/ui-icons_847e71_256x240-a22671b3eb8d881817d5cbfa1bab5063.png
-images/ui-icons_6da8d5_256x240.png: images/ui-icons_6da8d5_256x240-d155be4d851213e810cb13fc5e009fbf.png
+images/ui-icons_8DC262_256x240.png: images/ui-icons_8DC262_256x240-8bee7c40b9bae4ba7ce3fd71ba09f887.png
-images/ui-icons_6da8d5_256x240/index.png: images/ui-icons_6da8d5_256x240-d155be4d851213e810cb13fc5e009fbf.png
+images/ui-icons_8DC262_256x240/index.png: images/ui-icons_8DC262_256x240-8bee7c40b9bae4ba7ce3fd71ba09f887.png
 images/ui-icons_cd0a0a_256x240.png: images/ui-icons_cd0a0a_256x240-c0c1ec6a8bcf48fec40303e975a4dfa6.png
 images/ui-icons_cd0a0a_256x240/index.png: images/ui-icons_cd0a0a_256x240-c0c1ec6a8bcf48fec40303e975a4dfa6.png
-images/ui-icons_d8e7f3_256x240.png: images/ui-icons_d8e7f3_256x240-e5dd5fb46ca349d167fbabdcb57e8f7c.png
+images/ui-icons_eeeeee_256x240.png: images/ui-icons_eeeeee_256x240-c2379642443800302cea31bed13d686b.png
-images/ui-icons_d8e7f3_256x240/index.png: images/ui-icons_d8e7f3_256x240-e5dd5fb46ca349d167fbabdcb57e8f7c.png
+images/ui-icons_eeeeee_256x240/index.png: images/ui-icons_eeeeee_256x240-c2379642443800302cea31bed13d686b.png
-images/ui-icons_f9bd01_256x240.png: images/ui-icons_f9bd01_256x240-08305efda447dd00f0eaf5e34994bc92.png
+images/ui-icons_ffffff_256x240.png: images/ui-icons_ffffff_256x240-72e106fbaa40ef9c0f5f4376620a2a14.png
-images/ui-icons_f9bd01_256x240/index.png: images/ui-icons_f9bd01_256x240-08305efda447dd00f0eaf5e34994bc92.png
+images/ui-icons_ffffff_256x240/index.png: images/ui-icons_ffffff_256x240-72e106fbaa40ef9c0f5f4376620a2a14.png
 img/glyphicons-halflings-white.png: img/glyphicons-halflings-white-6cccd17a7aed91dbc0157d343c68c0d9.png
 img/glyphicons-halflings-white/index.png: img/glyphicons-halflings-white-6cccd17a7aed91dbc0157d343c68c0d9.png
 img/glyphicons-halflings.png: img/glyphicons-halflings-2851b489e8c39f8fad44fc10efb99c3e.png
@@ -41,10 +41,10 @@ person_tiny.png: person_tiny-eb905998ae5686c9eeb2693a7bc0f898.png
 person_tiny/index.png: person_tiny-eb905998ae5686c9eeb2693a7bc0f898.png
 rails.png: rails-a3386665c05a2d82f711a4aaa72d247c.png
 rails/index.png: rails-a3386665c05a2d82f711a4aaa72d247c.png
-application.js: application-29159c13c2c5ef2fb3368b9d8e2f08a4.js
+application.js: application-986409c25606174904024db627737590.js
-application/index.js: application-29159c13c2c5ef2fb3368b9d8e2f08a4.js
+application/index.js: application-986409c25606174904024db627737590.js
-application.css: application-a27f5b2eb07c9d527e71e7faa1f98399.css
+application.css: application-bcc3d2bf9bcd0688a30ee4cc370479fc.css
-application/index.css: application-a27f5b2eb07c9d527e71e7faa1f98399.css
+application/index.css: application-bcc3d2bf9bcd0688a30ee4cc370479fc.css
 loading.gif: loading-b7ff30d20adcf2b850f420d17048930c.gif
 loading/index.gif: loading-b7ff30d20adcf2b850f420d17048930c.gif
 progressbar.gif: progressbar-bc538af0ba6ff3d792217a96651cd58a.gif