diff --git a/templates/app_files/app/views/hq/audits/show.html.haml b/templates/app_files/app/views/hq/audits/show.html.haml index cfa5984..13bbd80 100644 --- a/templates/app_files/app/views/hq/audits/show.html.haml +++ b/templates/app_files/app/views/hq/audits/show.html.haml @@ -1,8 +1,22 @@ .card + .card-header + %i.fas.fa-microchip + = t('activerecord.models.audits') .card-body - - @audit.audited_changes.each_key do |key| - %p - %strong - - if @audit.try(:auditable_type).present? - = t("activerecord.attributes.#{@audit.try(:auditable_type).try(:underscore)}.#{key}") - = @audit.audited_changes[key] + %table.table.table-striped.table-bordered + %thead + %tr + %th{scope: 'col'}= t('activerecord.attributes.audit.action') + %th{scope: 'col'}= t('view.previous_value') + %th{scope: 'col'}= t('view.current_value') + %tbody + - @audit.audited_changes.each_key do |key| + %tr + - if @audit.try(:auditable_type).present? + %th{scope: 'row'}= t("activerecord.attributes.#{@audit.try(:auditable_type).try(:underscore)}.#{key}") + - if @audit.audited_changes[key].is_a?(Array) + %td= @audit.audited_changes[key][0] + %td= @audit.audited_changes[key][1] + - else + %td= @audit.audited_changes[key] + %td= @audit.audited_changes[key] \ No newline at end of file diff --git a/templates/app_files/app/views/layouts/application.html.haml.erb b/templates/app_files/app/views/layouts/application.html.haml.erb index d3fd2e3..b29b1eb 100644 --- a/templates/app_files/app/views/layouts/application.html.haml.erb +++ b/templates/app_files/app/views/layouts/application.html.haml.erb @@ -12,7 +12,7 @@ %meta{ name: 'author', content: '<%= app_name.capitalize %>' } %link{ rel: 'shortcut icon', href: '/images/favicon.png' } - = stylesheet_link_tag 'https://use.fontawesome.com/releases/v5.0.8/css/all.css', + = stylesheet_link_tag 'https://use.fontawesome.com/releases/v5.7.0/css/all.css', 'application', media: 'all', 'data-turbolinks-track': 'reload' = javascript_include_tag 'application', 'data-turbolinks-track': 'reload' diff --git a/templates/app_files/app/views/layouts/hq/application.html.haml.erb b/templates/app_files/app/views/layouts/hq/application.html.haml.erb index 61b5813..0afc20b 100644 --- a/templates/app_files/app/views/layouts/hq/application.html.haml.erb +++ b/templates/app_files/app/views/layouts/hq/application.html.haml.erb @@ -5,10 +5,7 @@ %html.no-js{ lang: I18n.locale } %head %title - - if content_for?(:title) - = "#{yield(:title)} - <%= app_name.capitalize %>" - - else - = '<%= app_name.capitalize %>' + = content_for?(:title) ? "#{yield(:title)} - <%= app_name.capitalize %>" : '<%= app_name.capitalize %>' %meta{ 'http-equiv': 'content-type', content: 'text/html', charset: 'utf-8' } %meta{ 'http-equiv': 'x-ua-compatible', content: 'ie=edge,chrome=1' } %meta{ name: 'description', content: '<%= app_name.capitalize %>' } @@ -25,7 +22,7 @@ = csrf_meta_tags / Stylesheets (Don't change include order) - = stylesheet_link_tag 'https://use.fontawesome.com/releases/v5.0.8/css/all.css', + = stylesheet_link_tag 'https://use.fontawesome.com/releases/v5.7.0/css/all.css', 'hq/application', media: 'all', 'data-turbolinks-track': 'reload' / Javascripts diff --git a/templates/config/locales/en.yml b/templates/config/locales/en.yml deleted file mode 100644 index 9a06e7b..0000000 --- a/templates/config/locales/en.yml +++ /dev/null @@ -1,34 +0,0 @@ ---- -en: - phone: - formats: - long: '+99 (999) 999-9999' - date: - formats: - excel: - rails: '%d/%m/%Y' - datepicker: - rails: '%d/%m/%Y' - js: 'd/m/Y' - default: "%d/%m/%Y" - year_month: "%Y-%B" - date: '%d %B %Y' - time: - formats: - certificate_completed_at_english: '%m/%d/%Y' - certificate_completed_at: '%d/%m/%Y' - datetimepicker_rails: '%d/%m/%Y %H:%M' - datetimepicker: - rails: '%d/%m/%Y %H:%M' - js: 'd/m/Y H:i' - default: "%d/%m/%Y %H:%M" - year_month: "%Y-%B" - date: '%d %B %Y' - due_at: - rails: '%d/%m/%Y %H:%M' - js: 'd/m/Y H:i' - number: - currency: - format: - format: "%u %n" - unit: "₺" diff --git a/templates/config/locales/show_for.tr.yml b/templates/config/locales/show_for.tr.yml index fba2f40..a175ad0 100644 --- a/templates/config/locales/show_for.tr.yml +++ b/templates/config/locales/show_for.tr.yml @@ -1,4 +1,3 @@ ---- tr: show_for: blank: "Belirtilmemiş" diff --git a/templates/config/locales/simple_form.tr.yml b/templates/config/locales/simple_form.tr.yml index c1e1f12..f77f7c4 100644 --- a/templates/config/locales/simple_form.tr.yml +++ b/templates/config/locales/simple_form.tr.yml @@ -1,4 +1,3 @@ ---- tr: simple_form: "yes": 'Evet' diff --git a/templates/config/locales/tr.yml b/templates/config/locales/tr.yml deleted file mode 100644 index a135f80..0000000 --- a/templates/config/locales/tr.yml +++ /dev/null @@ -1,34 +0,0 @@ ---- -tr: - phone: - formats: - long: '+99 (999) 999-9999' - date: - formats: - excel: - rails: '%d/%m/%Y' - datepicker: - rails: '%d/%m/%Y' - js: 'd/m/Y' - default: "%d/%m/%Y" - year_month: "%Y-%B" - date: '%d %B %Y' - time: - formats: - certificate_completed_at_english: '%m/%d/%Y' - certificate_completed_at: '%d/%m/%Y' - datetimepicker_rails: '%d/%m/%Y %H:%M' - datetimepicker: - rails: '%d/%m/%Y %H:%M' - js: 'd/m/Y H:i' - default: "%d/%m/%Y %H:%M" - year_month: "%Y-%B" - date: '%d %B %Y' - due_at: - rails: '%d/%m/%Y %H:%M' - js: 'd/m/Y H:i' - number: - currency: - format: - format: "%u %n" - unit: "₺" \ No newline at end of file diff --git a/templates/config/locales/view.en.yml b/templates/config/locales/view.en.yml index 4594dc4..0e0b96d 100644 --- a/templates/config/locales/view.en.yml +++ b/templates/config/locales/view.en.yml @@ -17,6 +17,8 @@ en: reset: Reset quick_search: Search... reload: Reload + current_value: Current Value + previous_value: Previous Value hello: "Hello %{user}" there_is_no_data: "There is no %{resource}." create_resource_mail_info: "When you add a new %{resource}, login information will be sent to your e-mail address." diff --git a/templates/config/locales/view.tr.yml b/templates/config/locales/view.tr.yml index b066e96..9f51915 100644 --- a/templates/config/locales/view.tr.yml +++ b/templates/config/locales/view.tr.yml @@ -17,6 +17,8 @@ tr: reset: Temizle quick_search: Arama yap.. reload: Yeniden yükle + current_value: Şuanki Değeri + previous_value: Önceki Değeri hello: "Merhaba %{user}" there_is_no_data: "Hiç %{resource} eklenmemiş." create_resource_mail_info: "Yeni bir %{resource} eklediğinizde e-posta adresine giriş bilgileri gönderilecektir."