diff --git a/app/components/products/product_component.html.slim b/app/components/products/product_component.html.slim index 0be41bbc264..2dd51a30313 100644 --- a/app/components/products/product_component.html.slim +++ b/app/components/products/product_component.html.slim @@ -33,26 +33,26 @@ | 提出物作成中 - elsif @product.published_at .card-list-item-meta__item - time.a-meta + time.a-meta datetime=@product.published_at.iso8601 span.a-meta__label | 提出 = l(@product.published_at) - else .card-list-item-meta__item - time.a-meta + time.a-meta datetime=@product.created_at.iso8601 span.a-meta__label | 提出 = l(@product.created_at) .card-list-item-meta__item - if @product.updated_at - time.a-meta + time.a-meta datetime=@product.updated_at.iso8601 span.a-meta__label | 更新 = l(@product.updated_at) - if @display_until_next_elapsed_days && elapsed_days < @reply_deadline_days - time.a-meta + .a-meta span.a-meta__label | 次の経過日数まで - if until_next_elapsed_days < 1 @@ -73,15 +73,17 @@ = link_to user, class: 'card-list-item__user-icons-icon' do = image_tag user.avatar_url, class: "a-user-icon #{role_class_for_user(user)}", title: user.icon_title, alt: user.icon_title .card-list-item-meta__item - time.a-meta - = "〜 #{l @product.comments.last.created_at, format: :date_and_time}" + .a-meta + | 〜 + time datetime=@product.comments.last.created_at.iso8601 + = l @product.comments.last.created_at, format: :date_and_time - if (@is_mentor || @is_admin) && @product.user.primary_role == 'trainee' .card-list-item__row .card-list-item-meta__items .card-list-item-meta__item - if @product.user.training_ends_on - time.a-meta dateTime=@product.user.training_ends_on + time.a-meta datetime=@product.user.training_ends_on.in_time_zone.iso8601 span.a-meta__label | 研修終了日 span.a-meta__value diff --git a/app/components/searchable_component.html.slim b/app/components/searchable_component.html.slim index f77fd187f05..d84ded21934 100644 --- a/app/components/searchable_component.html.slim +++ b/app/components/searchable_component.html.slim @@ -44,7 +44,7 @@ = image_tag resource_user.avatar_url, class: 'card-list-item-meta__icon a-user-icon' = link_to resource_user.login_name, resource_user, class: 'a-user-name' .card-list-item-meta__item - time.a-meta datetime=resource.updated_at.iso8601 pubdate='pubdate' + time.a-meta datetime=resource.updated_at.iso8601 = l(resource.updated_at) .card-list-item-meta__item .a-meta diff --git a/app/components/users/users_answer_component.html.slim b/app/components/users/users_answer_component.html.slim index 5c51d10969c..9c43b807576 100644 --- a/app/components/users/users_answer_component.html.slim +++ b/app/components/users/users_answer_component.html.slim @@ -32,7 +32,7 @@ user_path(answer.question.user), class: 'a-user-name' .card-list-item-meta__item - time.a-meta datetime=answer.updated_at pubdate="pubdate" + time.a-meta datetime=answer.updated_at.iso8601 = formatted_updated_at - if best_answer? .answer-badge diff --git a/app/components/works/work_component.html.slim b/app/components/works/work_component.html.slim index 9dfa40f3e32..5bd5a0caec4 100644 --- a/app/components/works/work_component.html.slim +++ b/app/components/works/work_component.html.slim @@ -20,5 +20,5 @@ = link_to work.user.name, user_path(work.user), class: 'a-user-name' .thumbnail-card__metas .thumbnail-card__meta - .thumbnail-card__date + time.thumbnail-card__date datetime=work.created_at.iso8601 = l(work.created_at) diff --git a/app/views/announcements/_announcement.html.slim b/app/views/announcements/_announcement.html.slim index 4540ec0ef52..59fb1122e7b 100644 --- a/app/views/announcements/_announcement.html.slim +++ b/app/views/announcements/_announcement.html.slim @@ -25,7 +25,7 @@ .a-meta | お知らせ作成中 - else - time.a-meta(datetime='announcement.published_at_date_time') + time.a-meta datetime=announcement.published_at.iso8601 span.a-meta__label | 公開 span.a-meta__value diff --git a/app/views/announcements/show.html.slim b/app/views/announcements/show.html.slim index 0c40d1be1d6..301abc7f6fb 100644 --- a/app/views/announcements/show.html.slim +++ b/app/views/announcements/show.html.slim @@ -30,7 +30,7 @@ hr.a-border .page-content-header__end .page-content-header__row .page-content-header__before-title - time.a-meta(datetime="#{@announcement.created_at.to_datetime}" pubdate='pubdate') + time.a-meta datetime=@announcement.updated_at.iso8601 = l @announcement.updated_at h1.page-content-header__title(class="#{@announcement.wip? ? 'is-wip' : ''}") - if @announcement.wip? diff --git a/app/views/api/products/_product.json.jbuilder b/app/views/api/products/_product.json.jbuilder index 8f2ab0717ad..c11f83effb4 100644 --- a/app/views/api/products/_product.json.jbuilder +++ b/app/views/api/products/_product.json.jbuilder @@ -31,6 +31,7 @@ json.user do json.partial! "api/users/user", user: product.user if product.user.training_ends_on json.training_ends_on l(product.user.training_ends_on) + json.training_ends_on_date_time product.user.training_ends_on.in_time_zone.iso8601 json.training_remaining_days product.user.training_remaining_days end end diff --git a/app/views/coding_tests/coding_test_submissions/_coding_test_submission.html.slim b/app/views/coding_tests/coding_test_submissions/_coding_test_submission.html.slim index 507950dd509..40679bf7ac9 100644 --- a/app/views/coding_tests/coding_test_submissions/_coding_test_submission.html.slim +++ b/app/views/coding_tests/coding_test_submissions/_coding_test_submission.html.slim @@ -16,7 +16,7 @@ = link_to cts.user, class: 'a-user-name' do = cts.user.long_name .card-list-item-meta__item - time.a-meta(datetime="#{cts.updated_at}") + time.a-meta datetime=cts.updated_at.iso8601 = l cts.updated_at .card-list-item__row .a-long-text diff --git a/app/views/coding_tests/coding_test_submissions/show.html.slim b/app/views/coding_tests/coding_test_submissions/show.html.slim index 9b34c2a54c6..e46a8501c0e 100644 --- a/app/views/coding_tests/coding_test_submissions/show.html.slim +++ b/app/views/coding_tests/coding_test_submissions/show.html.slim @@ -54,7 +54,7 @@ ruby: .page-content-header-metas__meta .a-meta .a-meta__label 提出日 - time.a-meta__value(datetime="#{cts.created_at}" pubdate='pubdate') + time.a-meta__value datetime=cts.created_at.iso8601 = l cts.created_at .a-card diff --git a/app/views/companies/products/_product.html.slim b/app/views/companies/products/_product.html.slim index 5c2e80fd27c..0914b5f9546 100644 --- a/app/views/companies/products/_product.html.slim +++ b/app/views/companies/products/_product.html.slim @@ -24,17 +24,17 @@ .a-meta 提出物作成中 - elsif product.published_at .card-list-item-meta__item - time.a-meta + time.a-meta datetime=product.published_at.iso8601 span.a-meta__label 提出 | #{l product.published_at} - else .card-list-item-meta__item - time.a-meta + time.a-meta datetime=product.created_at.iso8601 span.a-meta__label 提出 | #{l product.created_at} .card-list-item-meta__item - if product.updated_at - time.a-meta + time.a-meta datetime=product.updated_at.iso8601 span.a-meta__label 更新 | #{l product.updated_at} - if !product.comments.empty? @@ -58,23 +58,35 @@ - if product.self_last_commented_at && product.mentor_last_commented_at .card-list-item-meta__item - if product.self_last_commented_at > product.mentor_last_commented_at - time.a-meta - | 〜 #{l product.self_last_commented_at}（ + .a-meta + | 〜 + time.a-meta datetime=product.self_last_commented_at.iso8601 + = l product.self_last_commented_at + |（ strong 提出者 | ） - elsif product.self_last_commented_at < product.mentor_last_commented_at - time.a-meta - | 〜 #{l product.mentor_last_commented_at}（メンター） + .a-meta + | ～ + time.a-meta datetime=product.mentor_last_commented_at.iso8601 + = l product.mentor_last_commented_at + |（メンター） - elsif product.self_last_commented_at || product.mentor_last_commented_at .card-list-item-meta__item - if product.self_last_commented_at - time.a-meta - | 〜 #{l product.self_last_commented_at}（ + .a-meta + | 〜 + time.a-meta datetime=product.self_last_commented_at + = l product.self_last_commented_at + |（ strong 提出者 | ） - elsif product.mentor_last_commented_at - time.a-meta - | 〜 #{l product.mentor_last_commented_at}（メンター） + .a-meta + | ～ + time.a-meta datetime=product.mentor_last_commented_at + = l product.mentor_last_commented_at + |（メンター） - if current_user.mentor? && product.checks.empty? .card-list-item__row.is-only-mentor .card-list-item__assignee diff --git a/app/views/current_user/bookmarks/_list.html.slim b/app/views/current_user/bookmarks/_list.html.slim index 2a4412f2a84..7d0f0eab9b0 100644 --- a/app/views/current_user/bookmarks/_list.html.slim +++ b/app/views/current_user/bookmarks/_list.html.slim @@ -47,8 +47,8 @@ hr.a-border = link_to bookmark.bookmarkable.user.url, class: 'a-user-name' do = "#{bookmark.bookmarkable.user.login_name}(#{bookmark.bookmarkable.user.name_kana})" .card-list-item-meta__item - - date = bookmark.bookmarkable_type == 'Report' ? bookmark.bookmarkable.reported_on.to_time : bookmark.bookmarkable.created_at - time.a-meta datetime=date + - date = bookmark.bookmarkable_type == 'Report' ? bookmark.bookmarkable.reported_on.in_time_zone : bookmark.bookmarkable.created_at + time.a-meta datetime=date.iso8601 = l(date, format: :default) .card-list-item__option diff --git a/app/views/events/_event.html.slim b/app/views/events/_event.html.slim index e12f9c72e99..bc5fa385e6e 100644 --- a/app/views/events/_event.html.slim +++ b/app/views/events/_event.html.slim @@ -22,7 +22,7 @@ = event.user.long_name .page-content-header-metas__meta .a-meta - time.a-meta__value(datetime="#{event.created_at.to_datetime}" pubdate='pubdate') + time.a-meta__value datetime=event.updated_at.iso8601 = l event.updated_at .page-content-header-metas__end .page-content-header-metas__meta diff --git a/app/views/events/_events.html.slim b/app/views/events/_events.html.slim index 3327ef9a11c..e6a10ffdc69 100644 --- a/app/views/events/_events.html.slim +++ b/app/views/events/_events.html.slim @@ -26,7 +26,7 @@ ul.card-list.a-card .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta(datetime=event.start_at) + time.a-meta datetime=event.start_at.iso8601 span.a-meta__label 開催日時 span.a-meta__value = l event.start_at .card-list-item-meta__item diff --git a/app/views/events/_upcoming_event.html.slim b/app/views/events/_upcoming_event.html.slim index d06bab47b44..7e3e2de0a60 100644 --- a/app/views/events/_upcoming_event.html.slim +++ b/app/views/events/_upcoming_event.html.slim @@ -26,10 +26,10 @@ .card-list-item-meta__items .card-list-item-meta__item - if event.held_on_scheduled_date? - time.a-meta + .a-meta span.a-meta__label | 開催日時 - span.a-meta__value + time.a-meta__value datetime=event.scheduled_date_with_start_time.iso8601 = I18n.localize(event.scheduled_date_with_start_time) - else .a-meta.is-important diff --git a/app/views/external_entries/_external_entry.html.slim b/app/views/external_entries/_external_entry.html.slim index 83a7f637b47..3671d616cf6 100644 --- a/app/views/external_entries/_external_entry.html.slim +++ b/app/views/external_entries/_external_entry.html.slim @@ -15,7 +15,7 @@ .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta + time.a-meta datetime=external_entry.published_at.iso8601 = l(external_entry.published_at) .card-list-item__thumbnail = link_to external_entry.url, class: 'card-list-item__thumbnail-inner', target: '_blank', rel: 'noopener' do diff --git a/app/views/home/_announcement.html.slim b/app/views/home/_announcement.html.slim index c9fc8c1bcc6..3ec3f9f4795 100644 --- a/app/views/home/_announcement.html.slim +++ b/app/views/home/_announcement.html.slim @@ -17,5 +17,5 @@ // TODOエラー回避のためにつけたので不要になったら削除 - if announcement.published_at? .card-list-item-meta__item - time.a-meta(datetime="#{announcement.published_at.to_datetime}" pubdate='pubdate') + time.a-meta datetime=announcement.published_at.iso8601 = l announcement.published_at diff --git a/app/views/home/_colleague_trainee_recent_report.html.slim b/app/views/home/_colleague_trainee_recent_report.html.slim index c79c28cbc0f..eaf7f1623ad 100644 --- a/app/views/home/_colleague_trainee_recent_report.html.slim +++ b/app/views/home/_colleague_trainee_recent_report.html.slim @@ -16,6 +16,6 @@ = link_to user_path(report.user), class: 'a-user-name' do = report.user.long_name .card-list-item-meta__item - time.a-meta(datetime="#{report.reported_on.to_datetime}") + time.a-meta datetime=report.reported_on.in_time_zone.iso8601 = l report.reported_on | の日報 diff --git a/app/views/home/_recent_report.html.slim b/app/views/home/_recent_report.html.slim index 380ee2201d8..53f1c7ab33a 100644 --- a/app/views/home/_recent_report.html.slim +++ b/app/views/home/_recent_report.html.slim @@ -16,5 +16,5 @@ = link_to report.user, class: 'a-user-name' do = report.user.long_name .card-list-item-meta__item - time.a-meta + time.a-meta datetime=report.reported_on.in_time_zone.iso8601 = "#{l report.reported_on}の日報" diff --git a/app/views/movies/_movie_header.html.slim b/app/views/movies/_movie_header.html.slim index 99548df8111..b2656eef695 100644 --- a/app/views/movies/_movie_header.html.slim +++ b/app/views/movies/_movie_header.html.slim @@ -37,7 +37,7 @@ header.page-content-header span.a-meta__label | 公開 .a-meta__value - time(datetime="#{movie.published_at.to_datetime}") + time(datetime="#{movie.published_at.iso8601}") | #{l movie.published_at} - if movie.user = render 'users/icon', diff --git a/app/views/notifications/_notification.html.slim b/app/views/notifications/_notification.html.slim index 35b2062e900..0303e059519 100644 --- a/app/views/notifications/_notification.html.slim +++ b/app/views/notifications/_notification.html.slim @@ -26,5 +26,5 @@ .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta dateTime=notification.created_at + time.a-meta datetime=notification.created_at.iso8601 = l(notification.created_at, format: :long) diff --git a/app/views/pages/_doc_header.html.slim b/app/views/pages/_doc_header.html.slim index 355b3aa989e..645a4a54869 100644 --- a/app/views/pages/_doc_header.html.slim +++ b/app/views/pages/_doc_header.html.slim @@ -32,7 +32,7 @@ header.page-content-header span.a-meta__label | 公開 .a-meta__value - time(datetime="#{page.published_at.to_datetime}") + time(datetime="#{page.published_at.iso8601}") | #{l page.published_at} = render 'users/icon', user: page.user, @@ -47,7 +47,7 @@ header.page-content-header span.a-meta__label | 更新 span.a-meta__value - time(datetime="#{page.updated_at.to_datetime}") + time(datetime="#{page.updated_at.iso8601}") | #{l page.updated_at} = render 'users/icon', user: page.last_updated_user, diff --git a/app/views/pair_works/_pair_work.html.slim b/app/views/pair_works/_pair_work.html.slim index efcb857aa6c..d019380dc03 100644 --- a/app/views/pair_works/_pair_work.html.slim +++ b/app/views/pair_works/_pair_work.html.slim @@ -35,10 +35,10 @@ span.a-meta__label | 投稿日時 - if pair_work.wip? - span.a-meta__value + time.a-meta__value datetime=pair_work.created_at.iso8601 = l pair_work.created_at - else - span.a-meta__value + time.a-meta__value datetime=pair_work.published_at.iso8601 = l pair_work.published_at .card-list-item-meta__item .a-meta(class="#{pair_work.important? ? 'is-important' : ''}") diff --git a/app/views/products/_product.html.slim b/app/views/products/_product.html.slim index 65faf7a1cce..edccd33cc86 100644 --- a/app/views/products/_product.html.slim +++ b/app/views/products/_product.html.slim @@ -24,13 +24,13 @@ .a-meta | 提出物作成中 - elsif product.published_at.present? - time.a-meta(datetime="#{product.published_at.to_datetime}") + time.a-meta datetime=product.published_at.iso8601 span.a-meta__label | 提出 span.a-meta__value = l product.published_at - else - time.a-meta(datetime="#{product.created_at.to_datetime}") + time.a-meta datetime=product.created_at.iso8601 span.a-meta__label | 提出 span.a-meta__value @@ -38,7 +38,7 @@ - if product.updated_at.present? .card-list-item-meta__item - time.a-meta(datetime="#{product.updated_at.to_datetime}") + time.a-meta datetime=product.updated_at.iso8601 span.a-meta__label | 更新 span.a-meta__value @@ -59,8 +59,10 @@ as: :user, cached: true .card-list-item-meta__item - time.a-meta(datetime="#{product.commented_users.last.created_at.to_datetime}") - | 〜 #{l product.comments.last.created_at, format: :date_and_time} + .a-meta + | 〜 + time.a-meta datetime=product.comments.last.created_at.iso8601 + = l product.comments.last.created_at, format: :date_and_time - if !current_user.adviser? && product.practice.open_product? .card-list-item__row .card-list-item-meta diff --git a/app/views/products/_product_header.html.slim b/app/views/products/_product_header.html.slim index 3e00668c539..513dd931412 100644 --- a/app/views/products/_product_header.html.slim +++ b/app/views/products/_product_header.html.slim @@ -53,12 +53,12 @@ header.page-content-header.is-product - elsif product.published_at.present? span.a-meta__label | 提出 - time.a-meta__value(datetime="#{product.published_at.to_datetime}") + time.a-meta__value datetime=product.published_at.iso8601 = l product.published_at - else span.a-meta__label | 提出 - time.a-meta__value(datetime="#{product.created_at.to_datetime}") + time.a-meta__value datetime=product.created_at.iso8601 = l product.created_at - if product.updated_at.present? @@ -66,7 +66,7 @@ header.page-content-header.is-product .a-meta span.a-meta__label | 更新 - time.a-meta__value(datetime="#{product.updated_at.to_datetime}") + time.a-meta__value datetime=product.updated_at.iso8601 = l product.updated_at .page-content-header-metas__end diff --git a/app/views/products/_product_list_item.html.slim b/app/views/products/_product_list_item.html.slim index 1a5a39965f2..f4400beb7ef 100644 --- a/app/views/products/_product_list_item.html.slim +++ b/app/views/products/_product_list_item.html.slim @@ -37,11 +37,11 @@ ruby: .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta(datetime="#{product.created_at.to_datetime}") + time.a-meta datetime=product.created_at.to_datetime span.a-meta__label 提出 span.a-meta__value = l product.created_at .card-list-item-meta__item - time.a-meta(datetime="#{product.updated_at.to_datetime}") + time.a-meta datetime=product.updated_at.to_datetime span.a-meta__label 更新 span.a-meta__value = l product.updated_at - if (elapsed_days != product_deadline_day + 3 && is_unassigned_page) || is_dashboard_page @@ -67,7 +67,7 @@ ruby: .card-list-item-meta__items .card-list-item-meta__item - if product.user.training_ends_on.present? - time.a-meta(datetime="#{product.user.training_ends_on}") + time.a-meta datetime=product.user.training_ends_on span.a-meta__label 研修終了日 span.a-meta__value = l(product.user.training_ends_on) - remaining_days = (product.user.training_ends_on.to_date - Date.current).to_i diff --git a/app/views/questions/_nav_questions.html.slim b/app/views/questions/_nav_questions.html.slim index 09c26a39134..4a8d941b62b 100644 --- a/app/views/questions/_nav_questions.html.slim +++ b/app/views/questions/_nav_questions.html.slim @@ -11,6 +11,8 @@ ul.a-side-nav__items = question.title .a-side-nav-metas .a-side-nav-metas__item - = "公開:#{l question.published_at}" + | 公開: + time datetime=question.published_at.iso8601 + = l question.published_at .a-side-nav-metas__item = "回答・コメント(#{question.answers.count})" diff --git a/app/views/questions/_question.html.slim b/app/views/questions/_question.html.slim index d7e9df49475..8141a5d7e5d 100644 --- a/app/views/questions/_question.html.slim +++ b/app/views/questions/_question.html.slim @@ -36,13 +36,13 @@ .card-list-item-meta__items - if !question.wip? .card-list-item-meta__item - time.a-meta + time.a-meta datetime=question.published_at.iso8601 span.a-meta__label | 公開 span.a-meta__value = l question.published_at, format: :default .card-list-item-meta__item - time.a-meta + time.a-meta datetime= question.updated_at.iso8601 span.a-meta__label | 更新 span.a-meta__value diff --git a/app/views/questions/_question_header.html.slim b/app/views/questions/_question_header.html.slim index 8070735d4ac..263462c02ec 100644 --- a/app/views/questions/_question_header.html.slim +++ b/app/views/questions/_question_header.html.slim @@ -42,19 +42,17 @@ header.page-content-header = link_to question.user.long_name, user_path(question.user), class: 'a-user-name' - if !question.wip? .page-content-header-metas__meta - time.a-meta + .a-meta span.a-meta__label | 公開 - span.a-meta__value - time(datetime="#{question.published_at.to_datetime}") - | #{l question.published_at} + time.a-meta__value datetime=question.published_at.iso8601 + = l question.published_at .page-content-header-metas__meta .a-meta span.a-meta__label | 更新 - time.a-meta__value - time(datetime="#{question.updated_at.to_datetime}") - | #{l question.updated_at} + time.a-meta__value datetime=question.updated_at.iso8601 + = l question.updated_at .page-content-header__row .page-content-header-actions diff --git a/app/views/regular_events/_regular_event.html.slim b/app/views/regular_events/_regular_event.html.slim index de7ac8858cb..cd7166e6152 100644 --- a/app/views/regular_events/_regular_event.html.slim +++ b/app/views/regular_events/_regular_event.html.slim @@ -20,7 +20,7 @@ = regular_event.user.long_name .page-content-header-metas__meta .a-meta - time.a-meta__value(datetime="#{regular_event.created_at.to_datetime}" pubdate='pubdate') + time.a-meta__value datetime=regular_event.updated_at.iso8601 = l regular_event.updated_at .page-content-header-metas__end .page-content-header-metas__meta diff --git a/app/views/regular_events/_regular_events.html.slim b/app/views/regular_events/_regular_events.html.slim index c539a13fc86..9d213631e36 100644 --- a/app/views/regular_events/_regular_events.html.slim +++ b/app/views/regular_events/_regular_events.html.slim @@ -44,7 +44,7 @@ ul.card-list.a-card image_class: 'card-list-item__user-icon a-user-icon' .card-list-item-meta__item - time.a-meta(datetime=event.start_at.iso8601) + time.a-meta datetime=event.start_at.iso8601 span.a-meta__label 開催日時 span.a-meta__value = "#{event.holding_cycles} #{l event.start_at, format: :time_only} ~ #{l event.end_at, format: :time_only}" .card-list-item-meta__item diff --git a/app/views/reports/_product.html.slim b/app/views/reports/_product.html.slim index 7fd36684499..d41e2526b07 100644 --- a/app/views/reports/_product.html.slim +++ b/app/views/reports/_product.html.slim @@ -18,11 +18,11 @@ .card-list-item-meta__items .card-list-item-meta__item - if product.published_at.nil? - time.a-meta(datetime="#{product.created_at.to_datetime}") + time.a-meta datetime=product.created_at.iso8601 - else - time.a-meta(datetime="#{product.published_at.to_datetime}") + time.a-meta datetime=product.published_at.iso8601 = l product.published_at - = 'の提出物' + | の提出物 - if product.comments.any? hr.card-list-item__row-separator .card-list-item__row @@ -35,8 +35,10 @@ .card-list-item__user-icons = render partial: 'comments/user_icons', collection: product.comments.commented_users, as: :user .card-list-item-meta__item - time.a-meta(datetime="#{product.comments.last.updated_at.to_datetime}" pubdate='pubdate') - | 〜 #{l product.comments.last.updated_at, format: :date_and_time} + .a-meta + | 〜 + time.a-meta datetime=product.comments.last.updated_at.iso8601 + = l product.comments.last.updated_at, format: :date_and_time - if product.checks.any? .stamp.stamp-approve diff --git a/app/views/reports/_report.html.slim b/app/views/reports/_report.html.slim index 09aa68f8c4e..c6757f8ae85 100644 --- a/app/views/reports/_report.html.slim +++ b/app/views/reports/_report.html.slim @@ -37,7 +37,7 @@ = link_to report.user, class: 'a-user-name' do = report.user.long_name .card-list-item-meta__item - time.a-meta(datetime="#{report.reported_on.to_datetime}") + time.a-meta datetime=report.reported_on.in_time_zone.iso8601 = l report.reported_on | の日報 - if report.comments.any? @@ -52,8 +52,10 @@ .card-list-item__user-icons = render partial: 'comments/user_icons', collection: report.comments.commented_users, as: :user .card-list-item-meta__item - time.a-meta(datetime="#{report.comments.last.updated_at.to_datetime}" pubdate='pubdate') - | 〜 #{l report.comments.last.updated_at, format: :date_and_time} + .a-meta + | 〜 + time.a-meta datetime=report.comments.last.updated_at.iso8601 + = l report.comments.last.updated_at, format: :date_and_time - if report.checks.any? .stamp.stamp-approve diff --git a/app/views/users/_inactive_users.html.slim b/app/views/users/_inactive_users.html.slim index 06cb62299ab..98ac38fe97b 100644 --- a/app/views/users/_inactive_users.html.slim +++ b/app/views/users/_inactive_users.html.slim @@ -18,11 +18,11 @@ | #{user.login_name} （#{user.name}） .card-list-item__row .card-list-item-meta - time.a-meta + .a-meta span.a-meta__label = User.human_attribute_name :last_activity_at - span.a-meta__value - - if user.last_activity_at? + - if user.last_activity_at? + time.a-meta__value datetime=user.last_activity_at.iso8601 = l user.last_activity_at hr.a-border-tint footer.card-footer diff --git a/app/views/users/_metas.html.slim b/app/views/users/_metas.html.slim index d66938b5fe4..4aa2eb6be3c 100644 --- a/app/views/users/_metas.html.slim +++ b/app/views/users/_metas.html.slim @@ -6,7 +6,10 @@ .user-metas__item-label = User.human_attribute_name :created_at .user-metas__item-value - | #{l user.created_at.to_date}（#{user.enrollment_period}） + time datetime=user.created_at.iso8601 + = l user.created_at.to_date + span + |（#{user.enrollment_period}） .user-metas__item .user-metas__item-label | お住まい diff --git a/app/views/users/_product.html.slim b/app/views/users/_product.html.slim index 8bac8cdc832..62f0bcc7b01 100644 --- a/app/views/users/_product.html.slim +++ b/app/views/users/_product.html.slim @@ -1,7 +1,7 @@ .user-reports-item = link_to [product.practice, product], itemprop: 'url', class: 'user-reports-item__link' do h3.user-reports-item__title(itemprop='name') = product.title - time.user-reports-item__updated-at(datetime="#{product.updated_at.to_datetime}" pubdate='pubdate') + time.user-reports-item__updated-at(datetime="#{product.updated_at.iso8601}") = l product.updated_at - if product.comments.any? .user-reports-item__comment-count diff --git a/app/views/users/_reports.html.slim b/app/views/users/_reports.html.slim index 8b42fc44d90..ecc96fe6512 100644 --- a/app/views/users/_reports.html.slim +++ b/app/views/users/_reports.html.slim @@ -4,7 +4,7 @@ .user-reports-item = link_to report, itemprop: 'url', class: 'user-reports-item__link' do h3.user-reports-item__title(itemprop='name') = report.title - time.user-reports-item__updated-at(datetime="#{report.updated_at.to_datetime}" pubdate='pubdate') + time.user-reports-item__updated-at(datetime="#{report.updated_at.iso8601}") = l report.updated_at - if report.comments.any? .user-reports-item__comment-count diff --git a/app/views/users/announcements/_wip_announcements.html.slim b/app/views/users/announcements/_wip_announcements.html.slim index 15544d95a89..4de69fac908 100644 --- a/app/views/users/announcements/_wip_announcements.html.slim +++ b/app/views/users/announcements/_wip_announcements.html.slim @@ -14,5 +14,5 @@ .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta(datetime="#{announcement.updated_at}") + time.a-meta datetime=announcement.updated_at.iso8601 = l announcement.updated_at diff --git a/app/views/users/comments/_comment.html.slim b/app/views/users/comments/_comment.html.slim index ea7bb9d3d44..ccf58b0d33a 100644 --- a/app/views/users/comments/_comment.html.slim +++ b/app/views/users/comments/_comment.html.slim @@ -29,7 +29,7 @@ .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta(datetime="#{commentable.created_at.to_datetime}" pubdate='pubdate') + time.a-meta datetime=comment.updated_at.iso8601 = l comment.updated_at .card-list-item__row .card-list-item__summary diff --git a/app/views/users/events/_wip_events.html.slim b/app/views/users/events/_wip_events.html.slim index 10d0b392726..9378757a383 100644 --- a/app/views/users/events/_wip_events.html.slim +++ b/app/views/users/events/_wip_events.html.slim @@ -14,5 +14,5 @@ .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta(datetime="#{event.updated_at}") + time.a-meta datetime=event.updated_at.iso8601 = l event.updated_at diff --git a/app/views/users/events/index.html.slim b/app/views/users/events/index.html.slim index deb9c99791a..b78ee8b2393 100644 --- a/app/views/users/events/index.html.slim +++ b/app/views/users/events/index.html.slim @@ -43,7 +43,7 @@ .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta(datetime="#{event.start_at}") + time.a-meta datetime=event.start_at.iso8601 | 開催日時:#{l event.start_at} .card-list-item-meta__item .a-meta diff --git a/app/views/users/pages/_wip_pages.html.slim b/app/views/users/pages/_wip_pages.html.slim index ee4c07447b7..02772337be6 100644 --- a/app/views/users/pages/_wip_pages.html.slim +++ b/app/views/users/pages/_wip_pages.html.slim @@ -13,5 +13,5 @@ .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta(datetime="#{page.updated_at}") + time.a-meta datetime=page.updated_at.iso8601 = l page.updated_at diff --git a/app/views/users/products/_wip_products.html.slim b/app/views/users/products/_wip_products.html.slim index 5210c36ef15..6bcaed7f793 100644 --- a/app/views/users/products/_wip_products.html.slim +++ b/app/views/users/products/_wip_products.html.slim @@ -13,5 +13,5 @@ .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta(datetime="#{product.updated_at}") + time.a-meta datetime=product.updated_at.iso8601 = l product.updated_at diff --git a/app/views/users/questions/_wip_questions.html.slim b/app/views/users/questions/_wip_questions.html.slim index d7bd4549e18..3840e4345d2 100644 --- a/app/views/users/questions/_wip_questions.html.slim +++ b/app/views/users/questions/_wip_questions.html.slim @@ -13,5 +13,5 @@ .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta(datetime="#{question.updated_at}") + time.a-meta datetime=question.updated_at.iso8601 = l question.updated_at diff --git a/app/views/users/reports/_wip_reports.html.slim b/app/views/users/reports/_wip_reports.html.slim index 9554ef1b0a7..e9a94a5ada9 100644 --- a/app/views/users/reports/_wip_reports.html.slim +++ b/app/views/users/reports/_wip_reports.html.slim @@ -13,5 +13,5 @@ .card-list-item-meta .card-list-item-meta__items .card-list-item-meta__item - time.a-meta(datetime="#{report.updated_at}") + time.a-meta datetime=report.updated_at.iso8601 = l report.updated_at diff --git a/app/views/watches/_watch.html.slim b/app/views/watches/_watch.html.slim index 4147e0ef97a..7aa2c68c44f 100644 --- a/app/views/watches/_watch.html.slim +++ b/app/views/watches/_watch.html.slim @@ -38,7 +38,7 @@ = link_to watchable.user, class: 'a-user-name' do = watchable.user.login_name .card-list-item-meta__item - time.a-meta(datetime="#{watchable.created_at}") + time.a-meta datetime=watchable.created_at.iso8601 = l watchable.created_at .card-list-item__option.hidden .a-watch-button.a-button.is-sm.is-block.is-main data-watch_id="#{watch.id}" diff --git a/app/views/works/show.html.slim b/app/views/works/show.html.slim index 380f67e67b2..4005e5c96b5 100644 --- a/app/views/works/show.html.slim +++ b/app/views/works/show.html.slim @@ -41,7 +41,7 @@ hr.a-border .a-meta .a-meta__label | 登録日 - time.a-meta__value(datetime="#{@work.created_at.to_datetime}" pubdate='pubdate') + time.a-meta__value datetime=@work.created_at.iso8601 = l @work.created_at .a-card