rsence-pre 3.0.0.8 → 3.0.0.9

data/client/js/datetime/calendar/themes/default/calendar.css

@@ -1,40 +1,49 @@
-.calendar_control {
+.default > .calendar,
+.default > .calendar_bg,
+.default > .calendar > .head,
+.default > .calendar > .head > .prev_month,
+.default > .calendar > .head > .next_month,
+.default > .calendar > .head > .month_year,
+.default > .calendar > .weekdays,
+.default > .calendar > .weekdays > div,
+.default > .calendar > .weeks,
+.default > .calendar > .weeks > .week_row,
+.default > .calendar > .weeks > .week_row > .col_inactive,
+.default > .calendar > .weeks > .week_row > .col_selected,
+.default > .calendar > .weeks > .week_row > .col_wk,
+.default > .calendar > .weeks > .week_row > .col_active,
+.default > .calendar > .weeks > .week_row > .col_today {
   position: absolute;
-  left: 0px; top: 0px; right: 0px; bottom: 0px;
+  left: 0; top: 0; right: 0; bottom: 0;
 }
-.calendar_head {
-  position: absolute;
-  left: 0px; top: 0px; right: 0px; height: 20px;
-}
-.calendar_head_prev_month,
-.calendar_head_next_month {
-  position: absolute;
-  top: 2px; width: 16px; height: 16px;
-  font-size: 0; line-height: 0;
-  cursor: pointer;
-  background-image: #{this.getCssFilePath('calendar_arrows.png')};
-}
-.calendar_head_prev_month {
-  background-position: 0px 0px;
-  left: 2px;
-}
-.calendar_head_next_month {
-  background-position: -16px 0px;
-  right: 2px;
-}
-.calendar_head_prev_month:hover {
-  background-position: 0px -16px;
-}
-.calendar_head_next_month:hover {
-  background-position: -16px -16px;
-}
-.calendar_head_prev_month:active,
-.calendar_head_next_month:active {
-  background-color: #fff;
+
+.default > .calendar > .head { height: 20px; bottom: auto; }
+
+.default > .calendar > .head > .prev_month,
+.default > .calendar > .head > .next_month {
+  top: 4px; width: 18px; height: 18px; bottom: auto;
+  font-size: 18px; line-height: 18px;
+  vertical-align: middle; text-align: center;
+  cursor: pointer; color: #999;
+}
+.default > .calendar > .head > .prev_month { left: 2px; }
+
+.default > .calendar > .head > .prev_month > .flipped {
+  transform: scale(-1,1);
+  -moz-transform: scale(-1,1);
+  -webkit-transform: scale(-1,1);
+  display: inline-block;
 }
-.calender_head_month_year {
-  position: absolute;
-  top: 0px; left: 20px; right: 20px; height: 20px;
+.default > .calendar > .head > .next_month { right: 2px; left: auto; }
+
+.default > .calendar > .head > .prev_month:hover,
+.default > .calendar > .head > .next_month:hover { color: #000; }
+
+.default > .calendar > .head > .prev_month:hover,
+.default > .calendar > .head > .next_month:hover { background-color: white; }
+
+.default > .calendar > .head > .month_year {
+  left: 20px; right: 20px; height: 20px; bottom: auto;
   color: #000;
   font-family: Helvetica, Arial, sans-serif;
   font-weight: normal;
@@ -43,13 +52,10 @@
   vertical-align: middle;
   text-align: center;
 }
-.calendar_weekdays {
-  position: absolute;
-  top: 20px; left: 0px; right: 0px; height: 15px;
-}
-.calendar_weekdays div {
-  position: absolute;
-  top: 0px; height: 15px; width: 25px;
+.default > .calendar > .weekdays { top: 20px; height: 15px; right: auto; }
+
+.default > .calendar > .weekdays > div {
+  height: 15px; width: 25px;
   color: #000;
   font-family: Helvetica, Arial, sans-serif;
   font-size: 11px;
@@ -57,141 +63,57 @@
   vertical-align: middle;
   text-align: center;
 }
-.calendar_weeks {
-  position: absolute;
+.default > .calendar > .weeks {
   top: 34px; left: 0px; right: 2px; bottom: 2px;
 }
-.calendar_weeks_week_row {
-  position: absolute;
-  left: 0px; right: 0px;
-}
-.calendar_weeks_week_col_no,
-.calendar_weeks_week_col_sel,
-.calendar_weeks_week_col_wk,
-.calendar_weeks_week_col_yes,
-.calendar_weeks_week_col_today {
-  position: absolute;
+.default > .calendar > .weeks > .week_row { left: 0px; right: 0px; }
+
+.default > .calendar > .weeks > .week_row > .col_inactive,
+.default > .calendar > .weeks > .week_row > .col_selected,
+.default > .calendar > .weeks > .week_row > .col_wk,
+.default > .calendar > .weeks > .week_row > .col_active,
+.default > .calendar > .weeks > .week_row > .col_today {
   text-decoration: none;
-  top: 0px;
   font-family: Helvetica, Arial, sans-serif;
   font-size: 15px;
   vertical-align: middle;
   text-align: center;
   cursor: pointer;
 }
-.calendar_weeks_week_col_wk {
-  color: #000;
-  cursor: default;
-}
-.calendar_weeks_week_col_no {
-  color: #666;
-}
-.enabled > .calendar_control > .calendar_weeks > .calendar_weeks_week_row > .calendar_weeks_week_col_no:hover {
-  color: #000;
-}
-.calendar_weeks_week_col_yes,
-.calendar_weeks_week_col_sel {
+.default > .calendar > .weeks > .week_row > .col_wk { color: #000; cursor: default; }
+
+.default > .calendar > .weeks > .week_row > .col_inactive { color: #666; }
+
+.default.enabled > .calendar > .weeks > .week_row > .col_inactive:hover { color: #000; }
+
+.default > .calendar > .weeks > .week_row > .col_active,
+.default > .calendar > .weeks > .week_row > .col_selected {
   color: #000;
   background-color: #ddd;
   font-weight: normal;
   border: 1px solid #666;
 }
-.calendar_weeks_week_col_sel {
-  background-color: #fff;
-}
-.calendar_weeks_week_col_today {
-  font-weight: bold;
-  color: #F00;
-}
-.enabled > .calendar_control > .calendar_weeks > .calendar_weeks_week_row > .calendar_weeks_week_col_yes:hover {
+.default > .calendar > .weeks > .week_row > .col_selected { background-color: #fff; }
+
+.default > .calendar > .weeks > .week_row > .col_today { font-weight: bold; color: #f00; }
+
+.default.enabled > .calendar > .weeks > .week_row > .col_active:hover {
   border: 2px solid black; margin: -1px; z-index: 100; border-radius: 3px;
 }
-.calendar_bg {
-  position: absolute;
+.default > .calendar_bg {
   left: -1px; right: -1px;
-  top: -1px; bottom: -2px;
-}
-.calendar_bg * {
-  position: absolute;
-  font-size: 0; line-height: 0; /* ie bug work-arounds */
-}
-.disabled > .calendar_bg *,
-.disabled > .calendar_control * {
-  opacity: 0.8;
-}
-.calendar_bg .calendar_nw,
-.calendar_bg .calendar_n,
-.calendar_bg .calendar_ne,
-.calendar_bg .calendar_sw,
-.calendar_bg .calendar_s,
-.calendar_bg .calendar_se {
-  height: 12px;
-  background-image: #{this.getCssFilePath('calendar_parts1.png')};
-}
-.calendar_bg .calendar_c {
-  left: 12px; right: 12px; top: 12px; bottom: 12px;
-  background-color: #fbfafb;
-/*  background-image: #{this.getCssFilePath('calendar_bg.png')};*/
-}
-.calendar_bg .calendar_w,
-.calendar_bg .calendar_e {
-  top: 12px; bottom: 12px;
-  width: 12px;
-  background-image: #{this.getCssFilePath('calendar_parts2.png')};
+  top: -1px; bottom: -1px;
+  border: 1px solid #e0e0e0;
+  border-radius: 3px;
+  border-top: 0; border-left: 0;
+  box-shadow: 0 0 3px #333;
+  #{this.gradientCSS('#fcfcfc',[45,'#ffffff'],[55,'#fdfdfd'],[75,'#f3f3f3'],'#f0f0f0')}
 }
-.calendar_bg .calendar_n,
-.calendar_bg .calendar_s {
-  left: 12px; right: 12px;
+.default.disabled > .calendar_bg *, {
+  border-color: #ddd;
+  box-shadow: 0 0 3px #666;
+  #{this.gradientCSS('#d6d6d6',[66,'#d0d0d0'],[71,'#d3d3d3'],'#cccccc')}
 }
-.calendar_bg .calendar_nw,
-.calendar_bg .calendar_ne,
-.calendar_bg .calendar_sw,
-.calendar_bg .calendar_se {
-  width: 12px;
+.default.disabled > .calendar * {
+  opacity: 0.9;
 }
-.calendar_bg .calendar_nw,
-.calendar_bg .calendar_n,
-.calendar_bg .calendar_ne {
-  top: 0px;
-}
-.calendar_bg .calendar_sw,
-.calendar_bg .calendar_s,
-.calendar_bg .calendar_se {
-  bottom: 0px;
-}
-.calendar_bg .calendar_nw,
-.calendar_bg .calendar_w,
-.calendar_bg .calendar_sw {
-  left: 0px;
-}
-.calendar_bg .calendar_ne,
-.calendar_bg .calendar_e,
-.calendar_bg .calendar_se {
-  right: 0px;
-}
-.calendar_bg .calendar_nw {
-  background-position: 0px 0px;
-}
-.calendar_bg .calendar_n {
-  background-position: 0px -24px;
-}
-.calendar_bg .calendar_ne {
-  background-position: -12px 0px;
-}
-.calendar_bg .calendar_sw {
-  background-position: 0px -12px;
-}
-.calendar_bg .calendar_s {
-  background-position: 0px -36px;
-}
-.calendar_bg .calendar_se {
-  background-position: -12px -12px;
-}
-.calendar_bg .calendar_w {
-  background-position: 0px 0px;
-}
-.calendar_bg .calendar_e {
-  background-position: -12px 0px;
-}
-
-

data/client/js/datetime/calendar/themes/default/calendar.html

@@ -1,20 +1,11 @@
-<div class="calendar_bg">
-  <div class="calendar_nw"></div>
-  <div class="calendar_n"></div>
-  <div class="calendar_ne"></div>
-  <div class="calendar_w"></div>
-  <div class="calendar_c"></div>
-  <div class="calendar_e"></div>
-  <div class="calendar_sw"></div>
-  <div class="calendar_s"></div>
-  <div class="calendar_se"></div>
-</div>
-<div class="calendar_control" id="control]I[">
-  <div class="calendar_head">
-    <div class="calendar_head_prev_month" id="prevMonth]I["></div>
-    <div class="calender_head_month_year" id="state]I["></div>
-    <div class="calendar_head_next_month" id="nextMonth]I["></div>
+<div class="calendar_bg" id="bg]I["></div>
+<div class="calendar" id="control]I[">
+  <div class="head">
+    <div class="month_year" id="state]I["></div>
+    <div class="next_month" id="nextMonth]I[">&#9654;</div>
+    <div class="prev_month" id="prevMonth]I["><span class="flipped">&#9654;</span></div>
   </div>
-  <div class="calendar_weekdays" id="label]I["></div>
-  <div class="calendar_weeks" id="value]I["></div>
+  <div class="weekdays" id="label]I["></div>
+  <div class="weeks"    id="value]I["></div>
 </div>
+${ELEM.setStyle(this.elemId,'overflow','visible')}

data/client/js/datetime/datepicker/datepicker.coffee

@@ -1,14 +1,28 @@
 HDatePicker = HTextControl.extend
+  defaultEvents: UtilMethods.prototype.cloneObject( HNumberField.prototype.defaultEvents )
   controlDefaults: HTextControl.prototype.controlDefaults.extend
-    fieldFormat: 'YYYY-MM-DD'
     refreshAfter: 3
+    useUTC: null
+    fieldFormat: null
     preserveTime: true
     preserveDate: false
     calendarPicker: false
     calendarHorizontalAlign: 'right'
     calendarVerticalAlign: 'top'
+    scrollUnit: 'days'
+  customOptions: (_options)->
+    _options.useUTC = HLocale.dateTime.defaultOptions.useUTC if _options.useUTC == null
+    _options.fieldFormat = HLocale.dateTime.strings.dateFormat if _options.fieldFormat == null
+  mouseWheel: (_delta)->
+    _date = @moment(@value*1000)
+    if _delta > 0
+      _date.add(1,@options.scrollUnit)
+    else if _delta < 0
+      _date.subtract(1,@options.scrollUnit)
+    @setValue(_date.unix())
+    true
   valueToField: (_value)->
-    _date = moment.unix(_value).utc()
+    _date = @moment(_value*1000)
     @_datePreserve = [ _date.year(), _date.month(), _date.date() ] if @options.preserveDate
     if @options.preserveTime and @_timePreserve? and @calendar? and not @calendar.menuItemView.isHidden
       @_dateRestore(_date)
@@ -35,7 +49,7 @@ HDatePicker = HTextControl.extend
       _date.minutes( _minutes )
       _date.seconds( _seconds )
   fieldToValue: (_value)->
-    _date = moment.utc(_value,@options.fieldFormat)
+    _date = @moment(_value,@options.fieldFormat)
     return @value unless _date.isValid()
     @_dateRestore(_date)
     _date.unix()
@@ -54,6 +68,7 @@ HDatePicker = HTextControl.extend
       ).new( [null,0,24,24,1,null], @,
         value: @value
         valueObj: @valueObj
+        useUTC: @options.useUTC
         todayStart: @options.todayStart
         calendarHorizontalAlign: @options.calendarHorizontalAlign
         calendarVerticalAlign: @options.calendarVerticalAlign

data/client/js/datetime/datetimepicker/datetimepicker.coffee

@@ -1,7 +1,12 @@
 HDateTimePicker = HDatePicker.extend
   controlDefaults: HDatePicker.prototype.controlDefaults.extend
-    fieldFormat: 'YYYY-MM-DD HH:mm:ss'
+    fieldFormat: null
     refreshAfter: 3
     preserveTime: false
     preserveDate: false
     calendarPicker: false
+    scrollUnit: 'minutes'
+  customOptions: (_options)->
+    _options.fieldFormat = HLocale.dateTime.strings.dateTimeFormat if _options.fieldFormat == null
+    @base(_options)
+

data/client/js/datetime/datetimevalue/datetimevalue.coffee

@@ -0,0 +1,194 @@
+HDateTime = UtilMethods.extend
+
+  # constants:
+  msWeek: 604800000
+  msDay: 86400000
+  msHour: 3600000
+  msMinute: 60000
+
+  locale: HLocale.dateTime
+  localeStrings: HLocale.dateTime.strings
+
+  _dateSel: (_date)->
+    if _date and _date._d instanceof Date # moment.js
+      _zone = _date.zone()
+      _date = @moment(_date.unix()*1000).zone(_zone)
+      _date = _date.toDate()
+    return @date() if @typeChr( _date ) != 'd'
+    _date
+
+  dateInRange: (_date, _min, _max)-> ( _date >= _min and _date < _max )
+
+  ### = Description
+  # Returns month name of the given date.
+  #
+  # = Parameters
+  # +_date+:: Date to return month name from.
+  #
+  # = Returns
+  # Month name
+  #
+  ###
+  monthName: (_date)-> @localeStrings.monthsLong[ @_dateSel(_date).getMonth() ]
+
+  ### = Description
+  # Returns week number for date given as input.
+  #
+  # = Parameters
+  # +_date+:: Date to return week number from.
+  #
+  # = Returns
+  # Number of the week.
+  #
+  ###
+  week: (_date)-> @moment(@_dateSel(_date)).week()
+
+  ### = Description
+  # Returns day of the month for the date given as input.
+  #
+  # = Parameters
+  # +_date+:: Date to return day of the month.
+  #
+  # = Returns
+  # Day of the month
+  #
+  ###
+  mday: (_date)-> @moment( @_dateSel(_date) ).date()
+  setMday: (_mday)-> @moment( @date() ).date( _mday ).unix()
+
+  ### = Description
+  # Returns month number for the date given as input.
+  # Note that months are numbered from 0 to 11.
+  #
+  # = Parameters
+  # +_date+:: Date to return month number from.
+  #
+  # = Returns
+  # Number of the month 0 (January) to 11 (December).
+  #
+  ###
+  month: (_date)-> @moment( @_dateSel(_date) ).month()
+  setMonth: ( _month )-> @moment( @date() ).month( _month ).unix()
+
+
+  ### = Description
+  # Returns year for given date.
+  #
+  # = Parameters
+  # +_date+:: Date to return year from.
+  #
+  # = Returns
+  # Year
+  #
+  ###
+  year: (_date)-> @moment( @_dateSel(_date) ).year()
+  setYear: ( _year )-> @moment( @date() ).year( _year ).unix()
+
+  ### = Description
+  # Returns the timezone offset in milliseconds.
+  #
+  # = Parameters
+  # +_date+:: The date to get timezone offset from.
+  #
+  # = Returns
+  # Timezone offset in milliseconds.
+  #
+  ###
+  tzMs: (_date)->
+    if @typeChr(_date) == 'n'
+      _dateDiv = @msNow()/_date
+      if _dateDiv > 1000
+        _date = @moment(_date)
+      else
+        _date = @moment(_date*1000)
+    _date.zone()*@msMinute
+
+
+  ### = Description
+  # Returns a Date instance for epoch given in seconds.
+  #
+  # = Parameters
+  # +_epochSecs+:: Point of time given in seconds
+  #                   since 1 January 1970 00:00:00 UTC.
+  #
+  # = Returns
+  # Date object
+  #
+  ###
+  date: (_epochSecs)->
+    if @typeChr(_epochSecs) != 'n'
+      _epochSecs = @value
+    @moment(_epochSecs*1000).toDate()
+
+  ### = Description
+  # Returns a Date object with first millisecond of the year.
+  #
+  # = Parameters
+  # +_date+:: The date to get the first millisecond of the same year.
+  #
+  # = Returns
+  # The Date object for the first millisecond of the year
+  #
+  ###
+  firstDateOfYear: (_date)-> @moment(@_dateSel(_date)).startOf('year').toDate()
+
+  ### = Description
+  # Get last millisecond of the input given date's year as a Date object.
+  #
+  # = Parameters
+  # +_date+:: The last millisecond of the year on the date given.
+  #
+  # = Returns
+  # Last millisecond of the year as a Date object.
+  #
+  ###
+  lastDateOfYear: (_date)-> @moment(@_dateSel(_date)).endOf('year').toDate()
+
+  ### = Description
+  # Returns the first millisecond of the input given date's month.
+  #
+  # = Parameters
+  # +_date+:: The date to get the first millisecond of the month
+  #
+  # = Returns
+  # The first millisecond on the given date's month as a Date object.
+  #
+  ###
+  firstDateOfMonth: (_date)-> @moment(@_dateSel(_date)).startOf('month').toDate()
+
+  ### = Description
+  # Returns the last millisecond of the input given date's month.
+  #
+  # = Parameters
+  # +_date+:: The date to get the last millisecond of the month.
+  #
+  # = Returns
+  # The last millisecond of the given date's month as a Date object.
+  #
+  ###
+  lastDateOfMonth: (_date)-> @moment(@_dateSel(_date)).endOf('month').toDate()
+
+  ### = Description
+  # Returns the first millisecond when the week starts for date given as input.
+  #
+  # = Parameters
+  # +_date+:: The date to get the first millisecond.
+  #
+  # = Returns
+  # Date for the first millisecond of the week.
+  #
+  ###
+  firstDateOfWeek: (_date)-> @moment(@_dateSel(_date)).startOf('week').toDate()
+
+  ### = Description
+  # Returns the last millisecond of the week for the given date.
+  #
+  # = Parameters
+  # +_date+:: The date to get the last millisecond
+  #
+  # = Returns
+  # The last millisecond of the week as a Date object.
+  #
+  ###
+  lastDateOfWeek: (_date)-> @moment(@_dateSel(_date)).endOf('week').toDate()
+