app/helpers/timepiece_helper.rb in timepiece-0.2.4 vs app/helpers/timepiece_helper.rb in timepiece-0.2.5
- old
+ new
@@ -48,15 +48,21 @@
if hours.to_i >= 6 && hours.to_i < 18
time_of_day_class = 'timepiece-analog-day'
else
time_of_day_class = 'timepiece-analog-night'
end
+ if hours.to_i >= 12
+ var = 'pm'
+ elsif hours.to_i < 12
+ var = 'am'
+ end
hours_angle = (hours.to_i * 30) + (minutes.to_i / 2)
minutes_angle = minutes.to_i * 6
seconds_angle = seconds.to_i * 6
time = "<div class='timepiece-hours-container' style='-ms-transform:rotateZ(#{hours_angle}deg);-webkit-transform:rotateZ(#{hours_angle}deg);transform:rotateZ(#{hours_angle}deg);'><div class='timepiece-analog-hours'></div></div>"\
"<div class='timepiece-minutes-container' style='-ms-transform:rotateZ(#{minutes_angle}deg);-webkit-transform:rotateZ(#{minutes_angle}deg);transform:rotateZ(#{minutes_angle}deg);'><div class='timepiece-analog-minutes'></div></div>"\
- "<div class='timepiece-seconds-container' style='-ms-transform:rotateZ(#{seconds_angle}deg);-webkit-transform:rotateZ(#{seconds_angle}deg);transform:rotateZ(#{seconds_angle}deg);'><div class='timepiece-analog-seconds'></div></div>"
+ "<div class='timepiece-seconds-container' style='-ms-transform:rotateZ(#{seconds_angle}deg);-webkit-transform:rotateZ(#{seconds_angle}deg);transform:rotateZ(#{seconds_angle}deg);'><div class='timepiece-analog-seconds'></div></div>"\
+ "<div class='timepiece-analog-abbr'>" + var + "</div>"
content_tag(:div, time.html_safe, class: 'timepiece-analog ' + time_of_day_class, 'data-timezone' => location, 'id' => (id unless id.blank?), 'style' => 'width:' + size + ';padding-bottom:' + size + ';')
end
def timer(time_since = Time.now, id: '')
seconds_diff = (Time.now - time_since).to_i
\ No newline at end of file