From 3dc625e34f21dc1eb9b004bb6fe2f3d22e4c1b60 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Wed, 24 Jun 2015 01:38:12 +0800 Subject: [PATCH] modified dob for member profile --- app/assets/stylesheets/basic/global.css | 9 +++++++++ app/helpers/orbit_backend_helper.rb | 4 ++++ app/helpers/orbit_form_helper.rb | 13 +++++++++++++ app/models/member_profile.rb | 2 +- app/views/admin/members/_member_basic.html.erb | 2 +- 5 files changed, 28 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/basic/global.css b/app/assets/stylesheets/basic/global.css index 0ef6f12..9af000d 100644 --- a/app/assets/stylesheets/basic/global.css +++ b/app/assets/stylesheets/basic/global.css @@ -791,6 +791,15 @@ legend { display: block; } +.simple-date-picker input:first-child { + margin-right: 3px; +} + +.simple-date-picker select { + margin-right: 3px; +} + + /* IE go die */ :root #sidebar .sub-nav-block:before { display: block\9; diff --git a/app/helpers/orbit_backend_helper.rb b/app/helpers/orbit_backend_helper.rb index f666f00..5e2df6b 100644 --- a/app/helpers/orbit_backend_helper.rb +++ b/app/helpers/orbit_backend_helper.rb @@ -41,6 +41,10 @@ module OrbitBackendHelper concat hidden_field(object_name, method, :value => options[:value]) concat separated_picker(object_name, method, options) end + when 'simple' + content_tag :div, :id => options[:id], :class => options[:class] do + simple_picker(object_name, method, options) + end else content_tag :div, :id => options[:id], :class => options[:class] do default_picker(object_name, method, options) diff --git a/app/helpers/orbit_form_helper.rb b/app/helpers/orbit_form_helper.rb index eaad8e2..cd827de 100644 --- a/app/helpers/orbit_form_helper.rb +++ b/app/helpers/orbit_form_helper.rb @@ -32,6 +32,19 @@ module OrbitFormHelper end end + def simple_picker(object_name, method, options) + html = "
+ + " + html = html + hidden_field(object_name, method, :value => options[:value] || "1901-01-01") + html = html + "
" + html.html_safe + end + def date_picker(object_name, method, options) custom = {} custom[:format] = options[:format] || 'yyyy/MM' diff --git a/app/models/member_profile.rb b/app/models/member_profile.rb index a5310d5..c64c08d 100644 --- a/app/models/member_profile.rb +++ b/app/models/member_profile.rb @@ -13,7 +13,7 @@ class MemberProfile field :sex field :sid field :office_tel - field :birthday, type: DateTime + field :birthday, type: Date field :address, type: String, localize: true field :personal_website field :autobiography, type: String, localize: true diff --git a/app/views/admin/members/_member_basic.html.erb b/app/views/admin/members/_member_basic.html.erb index e50d4dc..70328a9 100644 --- a/app/views/admin/members/_member_basic.html.erb +++ b/app/views/admin/members/_member_basic.html.erb @@ -116,7 +116,7 @@
- <%= f.datetime_picker :birthday, :no_label => true, :format=>"yyyy/MM/dd" %> + <%= f.datetime_picker :birthday, :no_label => true, :format=>"yyyy/MM/dd", :picker_type => "simple" %>