-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Mainly for the double-quoting.
- Loading branch information
Showing
53 changed files
with
446 additions
and
431 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,3 +14,6 @@ Style/StringLiterals: | |
|
||
Style/FrozenStringLiteralComment: | ||
Enabled: true | ||
|
||
require: | ||
- rubocop-slim |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
app/views/active_admin/basket_contents/_duplicate_all_from.html.slim
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
- deliveries = BasketContent.filled_deliveries | ||
= form_with url: duplicate_all_basket_contents_path, method: :post, class: 'sidebar_form' do |f| | ||
= form_with url: duplicate_all_basket_contents_path, method: :post, class: "sidebar_form" do |f| | ||
= f.hidden_field :to_delivery_id, value: to_delivery.id | ||
p = t('.text') | ||
p = t(".text") | ||
div class="mt-3" | ||
= f.select :from_delivery_id, deliveries.map { |d| [I18n.l(d.date, format: :medium), d.id] }, {}, { class: "h-7 text-sm py-0 px-2" } | ||
= f.select :from_delivery_id, deliveries.map { |d| [ I18n.l(d.date, format: :medium), d.id ] }, {}, { class: "h-7 text-sm py-0 px-2" } | ||
div class="flex justify-end mt-2" | ||
= f.submit t('.button'), class: "action-item-button secondary small" | ||
= f.submit t(".button"), class: "action-item-button secondary small" |
8 changes: 4 additions & 4 deletions
8
app/views/active_admin/basket_contents/_duplicate_all_to.html.slim
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
- deliveries = BasketContent.coming_unfilled_deliveries(after_date: from_delivery.date) | ||
= form_with url: duplicate_all_basket_contents_path, method: :post, class: 'sidebar_form' do |f| | ||
= form_with url: duplicate_all_basket_contents_path, method: :post, class: "sidebar_form" do |f| | ||
= f.hidden_field :from_delivery_id, value: from_delivery.id | ||
p = t('.text', from: I18n.l(from_delivery.date, format: :long)) | ||
p = t(".text", from: I18n.l(from_delivery.date, format: :long)) | ||
div class="mt-3" | ||
= f.select :to_delivery_id, deliveries.map { |d| [I18n.l(d.date, format: :medium), d.id] }, {}, { class: "h-7 text-sm py-0 px-2" } | ||
= f.select :to_delivery_id, deliveries.map { |d| [ I18n.l(d.date, format: :medium), d.id ] }, {}, { class: "h-7 text-sm py-0 px-2" } | ||
div class="flex justify-end mt-2" | ||
= f.submit t('.button'), class: "action-item-button secondary small" | ||
= f.submit t(".button"), class: "action-item-button secondary small" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,10 @@ | ||
= form_tag import_payments_path, multipart: true, class: 'sidebar_form' do | ||
= form_tag import_payments_path, multipart: true, class: "sidebar_form" do | ||
- case Current.org.country_code | ||
- when 'DE' | ||
= label_tag :file, t('.file_label_de') | ||
= file_field_tag :file, accept: 'text/xml, .mta', required: true, class: "mt-1" | ||
- when "DE" | ||
= label_tag :file, t(".file_label_de") | ||
= file_field_tag :file, accept: "text/xml, .mta", required: true, class: "mt-1" | ||
- else | ||
= label_tag :file, t('.file_label') | ||
= file_field_tag :file, accept: 'text/xml', required: true, class: "mt-1" | ||
= label_tag :file, t(".file_label") | ||
= file_field_tag :file, accept: "text/xml", required: true, class: "mt-1" | ||
div class="flex justify-end mt-1 py-1" | ||
= submit_tag t('.submit'), class: 'action-item-button secondary small' | ||
= submit_tag t(".submit"), class: "action-item-button secondary small" |
6 changes: 3 additions & 3 deletions
6
app/views/active_admin/resource/_index_table_actions_default.html.slim
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
- if destroy_action_authorized?(resource) && !resource.class.in?([ Member, Membership ]) | ||
= link_to resource_path(resource), method: :delete, data: { confirm: delete_confirmation_text }, title: delete_label do | ||
= icon 'trash', class: 'w-5 h-5' | ||
= icon "trash", class: "w-5 h-5" | ||
|
||
- if edit_action_authorized?(resource) | ||
= link_to edit_resource_path(resource), title: edit_label do | ||
= icon 'pencil-square', class: 'w-5 h-5' | ||
= icon "pencil-square", class: "w-5 h-5" | ||
|
||
- if show_action_authorized?(resource) | ||
= link_to resource_path(resource), title: view_label do | ||
= icon 'eye', class: 'w-5 h-5' | ||
= icon "eye", class: "w-5 h-5" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
doctype html | ||
html lang=I18n.locale | ||
head | ||
title = [Current.org.name, t('.title')].join(' – ') | ||
title = [ Current.org.name, t(".title") ].join(" – ") | ||
script async=true src="https://ga.jspm.io/npm:[email protected]/dist/es-module-shims.js" data-turbo-track="reload" | ||
= javascript_importmap_tags 'members' | ||
= stylesheet_link_tag 'https://npmcdn.com/flatpickr/dist/themes/confetti.css' | ||
= stylesheet_link_tag "tailwind", "inter-font", data: { turbo_track: 'reload' } | ||
= javascript_importmap_tags "members" | ||
= stylesheet_link_tag "https://npmcdn.com/flatpickr/dist/themes/confetti.css" | ||
= stylesheet_link_tag "tailwind", "inter-font", data: { turbo_track: "reload" } | ||
= csrf_meta_tags | ||
meta charset="UTF-8" | ||
meta name="viewport" content="width=device-width, initial-scale=1.0" | ||
|
@@ -16,13 +16,13 @@ html lang=I18n.locale | |
div class="flex flex-col md:flex-row md:mx-auto md:max-w-4xl" | ||
div class="flex flex-col md:w-80" | ||
div | ||
= render 'layouts/members/header' | ||
= render "layouts/members/header" | ||
div class="md:mx-8 hidden md:block flex" data-menu-target='menu' | ||
= render 'layouts/members/footer' | ||
= render "layouts/members/footer" | ||
main class="mt-4 md:mt-48 mb-24 mx-auto px-4 md:pl-0 w-full md:max-w-xl" data-menu-target='body' | ||
section class="relative w-full" | ||
div class='md:absolute md:-mt-24 w-full md:pr-4' | ||
= render 'layouts/members/flashes' | ||
= render "layouts/members/flashes" | ||
div class='' | ||
= yield | ||
|
||
|
@@ -33,10 +33,10 @@ html lang=I18n.locale | |
header class='flex' | ||
div class='mx-auto my-8 md:my-16 print:!my-6' | ||
= link_to Current.org.url do | ||
= image_tag(org_logo_url, alt: "#{Current.org.name} Logo", class: 'h-32 w-32 md:h-60 md:w-60 print:!h-16 print:!w-16') | ||
= image_tag(org_logo_url, alt: "#{Current.org.name} Logo", class: "h-32 w-32 md:h-60 md:w-60 print:!h-16 print:!w-16") | ||
main class="w-full" data-menu-target='body' | ||
section class="w-full" | ||
= render 'layouts/members/flashes' | ||
= render "layouts/members/flashes" | ||
= yield | ||
div class='mt-48 flex-none flex print:hidden' | ||
= render 'layouts/members/footer' | ||
= render "layouts/members/footer" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,12 @@ | ||
- flash.each do |type, msg| | ||
- case type | ||
- when 'alert' | ||
- when "alert" | ||
div class="flash mb-8 bg-red-100 dark:bg-red-900 border border-red-400 dark:border-red-600 text-red-700 dark:text-red-300 p-2 rounded flex items-center" | ||
= icon "exclamation-triangle", class: 'w-5 h-5' | ||
= icon "exclamation-triangle", class: "w-5 h-5" | ||
span class='ml-2' | ||
= msg | ||
- when 'notice' | ||
- when "notice" | ||
div class="flash mb-8 bg-green-100 dark:bg-green-900 border border-green-400 dark:border-green-600 text-green-700 dark:text-green-300 p-2 rounded flex items-center" | ||
= icon "information-circle", class: 'w-5 h-5' | ||
= icon "information-circle", class: "w-5 h-5" | ||
span class='ml-2' | ||
= msg |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,34 +1,34 @@ | ||
footer class="w-full flex flex-col text-base text-gray-400 mt-16 dark:text-gray-600" | ||
div class="mx-auto #{'md:mx-0' if current_member}" | ||
ul class="flex flex-row flex-wrap #{'flex-col' if current_member} " | ||
div class="mx-auto #{"md:mx-0" if current_member}" | ||
ul class="flex flex-row flex-wrap #{"flex-col" if current_member} " | ||
- if current_member && Current.org.member_information_text? | ||
li class="mx-auto px-4 md:mx-0 md:px-0" | ||
= link_to members_info_path, class: 'flex items-center hover:text-green-500 py-1 px-4 md:px-0' do | ||
= icon 'newspaper', class: 'h-6 w-6' | ||
= link_to members_info_path, class: "flex items-center hover:text-green-500 py-1 px-4 md:px-0" do | ||
= icon "newspaper", class: "h-6 w-6" | ||
span class='ml-2' = member_information_title | ||
- if current_member | ||
li class="mx-auto px-4 md:mx-0 md:px-0 mb-4" | ||
= link_to calendar_webcal_url, class: 'flex items-center hover:text-green-500 py-1 px-4 md:px-0', title: t(".calendar_feed") do | ||
= icon 'calendar-days', class: 'h-6 w-6' | ||
span class='ml-2' = t('.calendar') | ||
= link_to calendar_webcal_url, class: "flex items-center hover:text-green-500 py-1 px-4 md:px-0", title: t(".calendar_feed") do | ||
= icon "calendar-days", class: "h-6 w-6" | ||
span class='ml-2' = t(".calendar") | ||
- if Current.org.phone? | ||
li class="mx-auto px-4 #{'md:mx-0 md:px-0' if current_member}" | ||
= link_to "tel:#{Current.org.phone.phony_formatted(spaces: '', format: :international)}", class: 'flex items-center hover:text-green-500 py-1 px-4 md:px-0' do | ||
= icon 'phone', class: 'h-6 w-6' | ||
li class="mx-auto px-4 #{"md:mx-0 md:px-0" if current_member}" | ||
= link_to "tel:#{Current.org.phone.phony_formatted(spaces: '', format: :international)}", class: "flex items-center hover:text-green-500 py-1 px-4 md:px-0" do | ||
= icon "phone", class: "h-6 w-6" | ||
span class='ml-2' | ||
= Current.org.phone | ||
li class="mx-auto px-4 #{'md:mx-0 md:px-0' if current_member}" | ||
= mail_to Current.org.email, class: 'flex items-center hover:text-green-500 py-1 px-4 md:px-0' do | ||
= icon 'envelope', class: 'h-6 w-6' | ||
li class="mx-auto px-4 #{"md:mx-0 md:px-0" if current_member}" | ||
= mail_to Current.org.email, class: "flex items-center hover:text-green-500 py-1 px-4 md:px-0" do | ||
= icon "envelope", class: "h-6 w-6" | ||
span class='ml-2' | ||
= t('.contact') | ||
= t(".contact") | ||
- if Current.org.languages.many? && !current_member | ||
div class="mx-auto p-4 " | ||
ul class="divide-x divide-gray-200 dark:divide-gray-800 border border-gray-200 dark:border-gray-800 rounded text-center flex flex-row" | ||
- Current.org.languages.each do |locale| | ||
li class='hover:bg-gray-100 dark:hover:bg-gray-900' | ||
= link_to locale, url_for(locale: locale), title: t("languages.#{locale}"), data: { turbolinks: false }, class: 'block w-12 leading-8 hover:text-green-500 uppercase' | ||
div class="mx-auto #{'md:mx-0.5' if current_member} mb-4 mt-12 text-gray-300 dark:text-gray-700" | ||
= link_to csa_admin_website_url, class: 'flex items-center hover:text-green-500' do | ||
= link_to locale, url_for(locale: locale), title: t("languages.#{locale}"), data: { turbolinks: false }, class: "block w-12 leading-8 hover:text-green-500 uppercase" | ||
div class="mx-auto #{"md:mx-0.5" if current_member} mb-4 mt-12 text-gray-300 dark:text-gray-700" | ||
= link_to csa_admin_website_url, class: "flex items-center hover:text-green-500" do | ||
= icon "logo", class: "w-5 h-5 me-2 md:me-2.5 fill-current", library: "own" | ||
= 'CSA Admin' | ||
= "CSA Admin" |
Oops, something went wrong.