diff --git a/app/views/community_news/index.html.erb b/app/views/community_news/index.html.erb index 25689bce5..44f29a7f2 100644 --- a/app/views/community_news/index.html.erb +++ b/app/views/community_news/index.html.erb @@ -1,15 +1,17 @@ <%= render "shared/public_welcome_banner" %> <% content_for(:page_bg_class, "public") %> -
-
-
-
-

News

-

Find recent newsletters and other community postings

+
+ +
+
+
+ + + + News
- -
+
<% if allowed_to?(:new?, CommunityNews) %> <%= link_to "New community news", new_community_news_path, @@ -17,6 +19,9 @@ <% end %>
+
+
+

Find recent newsletters and other community postings

<%= render "search_boxes" %> diff --git a/app/views/community_news/show.html.erb b/app/views/community_news/show.html.erb index 0b27557ca..36398d514 100644 --- a/app/views/community_news/show.html.erb +++ b/app/views/community_news/show.html.erb @@ -1,11 +1,19 @@ <% content_for(:page_bg_class, "admin-or-public-or-authpublished") %> <% community_news_url = community_news_url(@community_news) %> <% community_news_title = ERB::Util.url_encode(@community_news.title) %> -
- -
+
+ +
+
+
+ + + + Community News +
+
<%= link_to "Home", root_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> - <%= link_to "Community news", community_news_index_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> + <%= link_to "News", community_news_index_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> <% if allowed_to?(:edit?, @community_news) %> <%= link_to "Edit", edit_community_news_path(@community_news), class: "admin-only bg-blue-100 text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> @@ -15,7 +23,9 @@ <%= print_button(@community_news, printable_type: "CommunityNews", button_text: "Print page") %>
- +
+
+
@@ -80,4 +90,5 @@
+
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb index fd3048346..c5448d39e 100644 --- a/app/views/events/index.html.erb +++ b/app/views/events/index.html.erb @@ -1,18 +1,17 @@ <%= render "shared/public_welcome_banner" %> <% content_for(:page_bg_class, "public") %> -
- -
-
-
-

Events

- -

- Join us for our virtual events including art workshops, facilitator trainings and other opportunities to create, connect and be in community -

+
+ +
+
+
+ + + + Events
-
+
<% if allowed_to?(:new?, Event) %>
<%= link_to "New event", @@ -22,10 +21,11 @@ <% end %>
- -
-
-
+
+
+

+ Join us for our virtual events including art workshops, facilitator trainings and other opportunities to create, connect and be in community +

<% if @events.any? %>
diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb index d4e32f402..8def3761e 100644 --- a/app/views/events/show.html.erb +++ b/app/views/events/show.html.erb @@ -6,22 +6,29 @@
<% else %> - -
- <%= link_to "← Back to Events", events_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> -
- <%= link_to "Home", root_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> - <%= link_to "Events", events_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> - <% if allowed_to?(:manage?, @event) && @event.object.event_forms.registration.exists? %> - <%= link_to "Register (as visitor)", new_event_public_registration_path(@event), class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1 admin-only bg-blue-100" %> - <% end %> - <% if allowed_to?(:edit?, @event) %> - <%= link_to "Edit", edit_event_path(@event), class: "admin-only bg-blue-100 text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> - <% end %> - <% if allowed_to?(:manage?, @event) %> - <%= link_to "Manage registrants", manage_event_path(@event), class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1 admin-only bg-blue-100" %> - <% end %> - <%= render "bookmarks/editable_bookmark_button", resource: @event.object %> + +
+
+
+ + + + Event +
+
+ <%= link_to "Home", root_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> + <%= link_to "Events", events_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> + <% if allowed_to?(:manage?, @event) && @event.object.event_forms.registration.exists? %> + <%= link_to "Register (as visitor)", new_event_public_registration_path(@event), class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1 admin-only bg-blue-100" %> + <% end %> + <% if allowed_to?(:edit?, @event) %> + <%= link_to "Edit", edit_event_path(@event), class: "admin-only bg-blue-100 text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> + <% end %> + <% if allowed_to?(:manage?, @event) %> + <%= link_to "Manage registrants", manage_event_path(@event), class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1 admin-only bg-blue-100" %> + <% end %> + <%= render "bookmarks/editable_bookmark_button", resource: @event.object %> +
<% end %> diff --git a/app/views/faqs/index.html.erb b/app/views/faqs/index.html.erb index d43b40ebe..ec33b5f7f 100644 --- a/app/views/faqs/index.html.erb +++ b/app/views/faqs/index.html.erb @@ -1,16 +1,17 @@ <% content_for(:page_bg_class, "public") %> <%= render "shared/public_welcome_banner" %> -
- -
-
-
-

FAQs

-

Find answers to common questions here. If you don't see what you need, please reach out to us at <%= mail_to ENV.fetch("REPLY_TO_EMAIL", "programs@awbw.org"), class: "text-blue-600 hover:text-blue-800" %>.

+
+ +
+
+
+ + + + FAQs
- -
+
<% if allowed_to?(:new?, Faq) %> <%= link_to "New FAQ", new_faq_path, @@ -18,12 +19,15 @@ <% end %>
+
+
+

Find answers to common questions here. If you don't see what you need, please reach out to us at <%= mail_to ENV.fetch("REPLY_TO_EMAIL", "programs@awbw.org"), class: "text-blue-600 hover:text-blue-800" %>.

-
<%= render "search_boxes" %>
+ <%= render "search_boxes" %> -
+
-
-
+
+ +
+
+
+ + + + FAQ +
+
<%= link_to "Home", root_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> <%= link_to "FAQs", faqs_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> <% if allowed_to?(:edit?, @faq) %> <%= link_to "Edit", edit_faq_path(@faq), class: "admin-only bg-blue-100 text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> <% end %>
+
+
+

<%= @faq.class.model_name.human %> Details @@ -16,4 +28,5 @@ <%= render @faq, hide_options: true %>

+
diff --git a/app/views/organizations/index.html.erb b/app/views/organizations/index.html.erb index 7993d29ab..0ac35b39d 100644 --- a/app/views/organizations/index.html.erb +++ b/app/views/organizations/index.html.erb @@ -1,17 +1,24 @@ <% content_for(:page_bg_class, "admin-or-auth") %> -
- -
-
-

Organizations

-
+
+ +
+
+
+ + + + Organizations +
+
<% if allowed_to?(:new?, Organization) %> <%= link_to "New Organization", new_organization_path, class: "admin-only bg-blue-100 btn btn-primary-outline" %> <% end %>
- +
+
+
<%= render "search_boxes" %> @@ -53,4 +60,5 @@
<% end %> +
diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb index ebae77baa..62d807287 100644 --- a/app/views/organizations/show.html.erb +++ b/app/views/organizations/show.html.erb @@ -2,26 +2,27 @@
-
- - - - Organization Profile +
+
+ + + + Organization Profile +
+
+ <%= link_to "Home", root_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> + <%= link_to "Organizations", organizations_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> + <% if allowed_to?(:edit?, @organization) %> + <%= link_to "Edit", edit_organization_path(@organization), + class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> + <% end %> + + <%= render "bookmarks/editable_bookmark_button", resource: @organization %> + +
- -
- <%= link_to "Home", root_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> - <%= link_to "Organizations", organizations_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> - <% if allowed_to?(:edit?, @organization) %> - <%= link_to "Edit", edit_organization_path(@organization), - class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> - <% end %> - - <%= render "bookmarks/editable_bookmark_button", resource: @organization %> - -
diff --git a/app/views/people/index.html.erb b/app/views/people/index.html.erb index 30120897f..8b107e34b 100644 --- a/app/views/people/index.html.erb +++ b/app/views/people/index.html.erb @@ -1,11 +1,15 @@ <% content_for(:page_bg_class, "admin-or-auth") %> -
-
-
-
-

People

+
+ +
+
+
+ + + + People
-
+
<% if allowed_to?(:new?, Person) %> <%= link_to "New Person", new_person_path, @@ -13,6 +17,8 @@ <% end %>
+
+
<%= render "search_boxes" %> <% result_src = people_path + "?" + request.query_string %> diff --git a/app/views/people/show.html.erb b/app/views/people/show.html.erb index 048793e04..63ac2dc13 100644 --- a/app/views/people/show.html.erb +++ b/app/views/people/show.html.erb @@ -2,36 +2,37 @@
+
Individual Profile
+
+ <% unless @person.user %> +
+ No user! + <%= link_to "Create user", + new_user_path(person_id: @person.id), + class: "btn btn-warning px-2 py-1" %> +
+ <% end %> + <%= link_to "Home", root_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> + <% if allowed_to?(:index?, Person) %> + <%= link_to "People", people_path, class: "admin-only bg-blue-100 text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> + <% end %> + <% if allowed_to?(:edit?, @person) %> + <%= link_to "Edit", edit_person_path(@person), + class: "admin-only bg-blue-100 text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> + <% end %> + + <%= render "bookmarks/editable_bookmark_button", resource: @person.object %> + +
-
- -
- <% unless @person.user %> -
- No user! - <%= link_to "Create user", - new_user_path(person_id: @person.id), - class: "btn btn-warning px-2 py-1" %> -
- <% end %> - <%= link_to "Home", root_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> - <% if allowed_to?(:index?, Person) %> - <%= link_to "People", people_path, class: "admin-only bg-blue-100 text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> - <% end %> - <% if allowed_to?(:edit?, @person) %> - <%= link_to "Edit", edit_person_path(@person), - class: "admin-only bg-blue-100 text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> - <% end %> - - <%= render "bookmarks/editable_bookmark_button", resource: @person.object %> -
+
diff --git a/app/views/resources/index.html.erb b/app/views/resources/index.html.erb index fcfd4dccc..4651f8d5e 100644 --- a/app/views/resources/index.html.erb +++ b/app/views/resources/index.html.erb @@ -1,16 +1,17 @@ <%= render "shared/public_welcome_banner" %> <% content_for(:page_bg_class, "public") %> -
- -
-
-
-

Resources

-

Search for handouts, templates and toolkits to support your work

+
+ +
+
+
+ + + + Resources
- -
+
<% if allowed_to?(:new?, Resource) %> <%= link_to "New Resource", new_resource_path, @@ -18,13 +19,13 @@ <% end %>
+
+
+

Search for handouts, templates and toolkits to support your work

<%= render "search_boxes" %>
- -
- <% result_src = resources_path + "?" + request.query_string %> diff --git a/app/views/resources/show.html.erb b/app/views/resources/show.html.erb index 21f85a663..1f983e988 100644 --- a/app/views/resources/show.html.erb +++ b/app/views/resources/show.html.erb @@ -1,7 +1,15 @@ <% content_for(:page_bg_class, "admin-or-public-or-authpublished") %> -
- -
+
+ +
+
+
+ + + + Resource +
+
<%= link_to "Home", root_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> <%= link_to "Resources", resources_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> <% if allowed_to?(:edit?, @resource) %> @@ -17,6 +25,9 @@ class: "btn btn-utility", download: true if @resource.downloadable_asset&.file&.attached? %>
+
+
+
@@ -52,4 +63,5 @@
<%= render "show_mentions" %> +
diff --git a/app/views/shared/_navbar_menu_mobile.html.erb b/app/views/shared/_navbar_menu_mobile.html.erb index c6f0fecfa..80b99de52 100644 --- a/app/views/shared/_navbar_menu_mobile.html.erb +++ b/app/views/shared/_navbar_menu_mobile.html.erb @@ -136,7 +136,7 @@ <%= link_to new_workshop_variation_idea_path, class: "flex items-center px-4 py-2 text-sm text-white hover:text-gray-700 hover:bg-gray-100 w-full space-x-2" do %> - + New workshop variation idea <% end %> @@ -154,14 +154,14 @@ <%= link_to new_workshop_log_path, class: "flex items-center px-4 py-2 text-sm text-white hover:text-gray-700 hover:bg-gray-100 w-full space-x-2" do %> - + New workshop log <% end %> <%= link_to new_story_idea_path, class: "flex items-center px-4 py-2 text-sm text-white hover:text-gray-700 hover:bg-gray-100 w-full space-x-2" do %> - + New story idea <% end %> diff --git a/app/views/shared/_navbar_new_button.html.erb b/app/views/shared/_navbar_new_button.html.erb index 4bd685da6..81a5cc4fd 100644 --- a/app/views/shared/_navbar_new_button.html.erb +++ b/app/views/shared/_navbar_new_button.html.erb @@ -21,7 +21,7 @@ data-dropdown-target="content"> <%= link_to new_workshop_variation_idea_path, class: "flex items-center px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 w-full space-x-2" do %> - + New workshop variation idea <% end %> @@ -37,13 +37,13 @@ <%= link_to new_workshop_log_path, class: "flex items-center px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 w-full space-x-2" do %> - + New workshop log <% end %> <%= link_to new_story_idea_path, class: "flex items-center px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 w-full space-x-2" do %> - + New story idea <% end %> diff --git a/app/views/stories/index.html.erb b/app/views/stories/index.html.erb index 6c17afc97..58a80c820 100644 --- a/app/views/stories/index.html.erb +++ b/app/views/stories/index.html.erb @@ -1,15 +1,17 @@ <%= render "shared/public_welcome_banner" %> <% content_for(:page_bg_class, "public") %> -
-
-
-
-

Stories

-

Check out stories from Windows Facilitators around the world and the healing they make possible through art

+
+ +
+
+
+ + + + Stories
- -
+
<% if allowed_to?(:new?, Story) %> <%= link_to "New Story", new_story_path, @@ -17,6 +19,9 @@ <% end %>
+
+
+

Check out stories from Windows Facilitators around the world and the healing they make possible through art

<%= render "search_boxes" %> diff --git a/app/views/stories/show.html.erb b/app/views/stories/show.html.erb index a0ba0c17b..361a3df13 100644 --- a/app/views/stories/show.html.erb +++ b/app/views/stories/show.html.erb @@ -2,9 +2,17 @@ <% story_title = ERB::Util.url_encode(@story.title) %> <% content_for(:page_bg_class, "admin-or-public-or-authpublished") %> -
- -
+
+ +
+
+
+ + + + Story +
+
<%= link_to "Home", root_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> <%= link_to "Stories", stories_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> <% if allowed_to?(:edit?, @story) %> @@ -16,7 +24,9 @@ <%= print_button(@story, printable_type: "Story", button_text: "Print page") %>
- +
+
+
@@ -104,4 +114,5 @@ <%= render "shared/organization_footer" %>
+
diff --git a/app/views/story_ideas/edit.html.erb b/app/views/story_ideas/edit.html.erb index 78bd50a44..1293fd430 100644 --- a/app/views/story_ideas/edit.html.erb +++ b/app/views/story_ideas/edit.html.erb @@ -1,6 +1,15 @@ <% content_for(:page_bg_class, "admin-only bg-blue-100") %> -
-
+
+ +
+
+
+ + + + Edit Story Idea +
+
<%= link_to "Home", root_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> <%= link_to "Story Ideas", story_ideas_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> <% if @story_idea.stories.any? %> @@ -10,12 +19,12 @@ <% end %> <%= link_to "View", story_idea_path(@story_idea), class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %>
-

Edit <%= @story_idea.class.model_name.human.downcase %>

+
+
+
-
-
- <%= render "form", story_idea: @story_idea %> - <%= render "shared/audit_info", resource: @story_idea %> -
-
+ <%= render "form", story_idea: @story_idea %> + <%= render "shared/audit_info", resource: @story_idea %> + +
diff --git a/app/views/story_ideas/index.html.erb b/app/views/story_ideas/index.html.erb index 47112e8a6..f5879bb00 100644 --- a/app/views/story_ideas/index.html.erb +++ b/app/views/story_ideas/index.html.erb @@ -1,88 +1,91 @@ <% content_for(:page_bg_class, "admin-only bg-blue-100") %> -
-
- -
-

- <%= StoryIdea.model_name.human.pluralize %> (<%= @story_ideas_count %>) -

-
- <%= link_to("New #{ StoryIdea.model_name.human.downcase }", - new_story_idea_path, - class: "btn btn-primary-outline") %> -
-
- - <%= render "search_boxes" %> - -
- - - - - - - - - - - - - - - - <% @story_ideas.each do |story_idea| %> - - - - - - - - - - - - <% end %> - -
ImageAuthorNameWindows TypeWorkshopOrganizationUpdated AtPromoted to StoryActions
-
- <%= render "assets/display_image", - resource: story_idea, - width: 18, height: 14, - variant: :index, - link_to_object: true, - file: story_idea.display_image %> -
- 		<%= story_idea.created_by.name %> - <%= link_to story_idea.name, story_idea_path(story_idea), - class: "font-bold hover:text-indigo-800 hover:underline" %> - <%= story_idea.windows_type&.short_name %><%= story_idea.workshop_title %><%= story_idea.organization&.name %> - <%= story_idea.updated_at.strftime("%b %d, %Y") %> - - <% if story_idea.stories.any? %> - <%= link_to "Story", story_path(story_idea.stories.last), - class: "btn btn-secondary-outline" %> - <% end %> - - <%= link_to "Edit", edit_story_idea_path(story_idea), class: "btn btn-secondary-outline" %> -
-
-
+
+ +
+
+
+ + + + Story Ideas (<%= @story_ideas_count %>) +
+
+ <%= link_to("New #{StoryIdea.model_name.human.downcase}", + new_story_idea_path, + class: "btn btn-primary-outline") %> +
+
+
+
+ <%= render "search_boxes" %> - - <% unless @story_ideas.any? %> -

- No <%= StoryIdea.model_name.human.pluralize.downcase %> found. -

+
+ + + + + + + + + + + + + + + + <% @story_ideas.each do |story_idea| %> + + + + + + + + + + + <% end %> + +
ImageAuthorNameWindows TypeWorkshopOrganizationUpdated AtPromoted to StoryActions
+
+ <%= render "assets/display_image", + resource: story_idea, + width: 18, height: 14, + variant: :index, + link_to_object: true, + file: story_idea.display_image %> +
+ 		<%= story_idea.created_by.name %> + <%= link_to story_idea.name, story_idea_path(story_idea), + class: "font-bold hover:text-indigo-800 hover:underline" %> + <%= story_idea.windows_type&.short_name %><%= story_idea.workshop_title %><%= story_idea.organization&.name %> + <%= story_idea.updated_at.strftime("%b %d, %Y") %> + + <% if story_idea.stories.any? %> + <%= link_to "Story", story_path(story_idea.stories.last), + class: "btn btn-secondary-outline" %> + <% end %> + + <%= link_to "Edit", edit_story_idea_path(story_idea), class: "btn btn-secondary-outline" %> +
+
+ + + <% unless @story_ideas.any? %> +

+ No <%= StoryIdea.model_name.human.pluralize.downcase %> found. +

+ <% end %> - -
- -
+ +
+ +
diff --git a/app/views/story_ideas/new.html.erb b/app/views/story_ideas/new.html.erb index 48dc91531..236d0e953 100644 --- a/app/views/story_ideas/new.html.erb +++ b/app/views/story_ideas/new.html.erb @@ -1,30 +1,35 @@ <% content_for(:page_bg_class, "admin-or-auth") %> -
-
-

New <%= @story_idea.class.model_name.human.downcase %>

-
- -
- At A Window Between Worlds, we value every story you share. Your voice helps paint a picture of the positive impact - of art on people and communities, inspiring others to use art in similarly powerful and far reaching ways. -

- Thank you for considering submitting to our - <%= link_to "Story Share", "https://www.awbw.org/stories", - target: "_blank", class: "text-blue-600 hover:text-blue-800" %>. - Stories are typically short (200-400 words) and describe an art workshop you did and the impact it had on someone. - You can write about art workshops you've done with clients, family, friends, colleagues, community members, - volunteers, and yourself. To help your stories make the greatest impact, check out these - <%= link_to "tips for stories", resource_path(1011), class: "text-blue-600 hover:text-blue-800" %> -

- - Please note: edits may be made, and not all stories - will be published to the site, but may still be used in other places. - +
+ +
+
+ + + + New Story Idea +
+
-
-
- <%= render "form", story_idea: @story_idea %> +
+ At A Window Between Worlds, we value every story you share. Your voice helps paint a picture of the positive impact + of art on people and communities, inspiring others to use art in similarly powerful and far reaching ways. +

+ Thank you for considering submitting to our + <%= link_to "Story Share", "https://www.awbw.org/stories", + target: "_blank", class: "text-blue-600 hover:text-blue-800" %>. + Stories are typically short (200-400 words) and describe an art workshop you did and the impact it had on someone. + You can write about art workshops you've done with clients, family, friends, colleagues, community members, + volunteers, and yourself. To help your stories make the greatest impact, check out these + <%= link_to "tips for stories", resource_path(1011), class: "text-blue-600 hover:text-blue-800" %> +

+ + Please note: edits may be made to your story idea, and not all stories + will be published to the site, but may still be used in other places. +
+ + <%= render "form", story_idea: @story_idea %> +
diff --git a/app/views/story_ideas/show.html.erb b/app/views/story_ideas/show.html.erb index 42bf37367..b57af63c8 100644 --- a/app/views/story_ideas/show.html.erb +++ b/app/views/story_ideas/show.html.erb @@ -1,14 +1,26 @@ <% content_for(:page_bg_class, "admin-or-owner") %> -
-
- <%= link_to "Home", root_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> - <% if allowed_to?(:index?, StoryIdea) %> - <%= link_to "Story Ideas", story_ideas_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> - <% end %> - <% if allowed_to?(:edit?, @story_idea) %> - <%= link_to "Edit", edit_story_idea_path(@story_idea), class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> - <% end %> +
+ +
+
+
+ + + + Story Idea +
+
+ <%= link_to "Home", root_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> + <% if allowed_to?(:index?, StoryIdea) %> + <%= link_to "Story Ideas", story_ideas_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> + <% end %> + <% if allowed_to?(:edit?, @story_idea) %> + <%= link_to "Edit", edit_story_idea_path(@story_idea), class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> + <% end %> +
+
+
@@ -122,4 +134,6 @@ <%= @story_idea.rhino_body %>
+ +
diff --git a/app/views/tutorials/index.html.erb b/app/views/tutorials/index.html.erb index 184871bcb..a8f81cbb7 100644 --- a/app/views/tutorials/index.html.erb +++ b/app/views/tutorials/index.html.erb @@ -1,24 +1,17 @@ <% content_for(:page_bg_class, "public") %> <%= render "shared/public_welcome_banner" %> -
-
-
-
-

- <%= Tutorial.model_name.human(count: 2) %> -

- -

- <% if user_signed_in? %> - Our library of step-by-step tutorials and informational videos designed to support your journey - <% else %> - A library of videos designed to introduce you to our work and the real-world impact shared by the community we serve - <% end %> -

+
+ +
+
+
+ + + + Tutorials
- -
+
<% if allowed_to?(:new?, Tutorial) %> <%= link_to "New #{Tutorial.model_name.human.downcase}", new_tutorial_path, @@ -26,6 +19,15 @@ <% end %>
+
+
+

+ <% if user_signed_in? %> + Our library of step-by-step tutorials and informational videos designed to support your journey + <% else %> + A library of videos designed to introduce you to our work and the real-world impact shared by the community we serve + <% end %> +

<%= render "search_boxes" %> diff --git a/app/views/tutorials/show.html.erb b/app/views/tutorials/show.html.erb index 0be5fc965..cec13bc63 100644 --- a/app/views/tutorials/show.html.erb +++ b/app/views/tutorials/show.html.erb @@ -1,7 +1,15 @@ <% content_for(:page_bg_class, "admin-or-public-or-authpublished") %> -
- -
+
+ +
+
+
+ + + + Tutorial +
+
<%= link_to "Home", root_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> <%= link_to Tutorial.model_name.human(count: 2), tutorials_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> <% if allowed_to?(:edit?, @tutorial) %> @@ -12,7 +20,9 @@ <%= render "bookmarks/editable_bookmark_button", resource: @tutorial.object %>
- +
+
+
@@ -45,4 +55,5 @@
+
diff --git a/app/views/workshop_ideas/edit.html.erb b/app/views/workshop_ideas/edit.html.erb index 216f16382..73aab2433 100644 --- a/app/views/workshop_ideas/edit.html.erb +++ b/app/views/workshop_ideas/edit.html.erb @@ -1,16 +1,25 @@ <% content_for(:page_bg_class, "admin-only bg-blue-100") %> -
-
+
+ +
+
+
+ + + + Edit Workshop Idea +
+
<%= link_to "Home", root_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> <%= link_to "Workshop Ideas", workshop_ideas_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> <%= link_to "View", workshop_idea_path(@workshop_idea), class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %>
-

Edit <%= @workshop_idea.class.model_name.human.downcase %>

+
+
+
-
-
- <%= render "form", workshop_idea: @workshop_idea %> - <%= render "shared/audit_info", resource: @workshop_idea %> -
-
+ <%= render "form", workshop_idea: @workshop_idea %> + <%= render "shared/audit_info", resource: @workshop_idea %> + +
diff --git a/app/views/workshop_ideas/index.html.erb b/app/views/workshop_ideas/index.html.erb index e18232435..13d38b6f5 100644 --- a/app/views/workshop_ideas/index.html.erb +++ b/app/views/workshop_ideas/index.html.erb @@ -1,82 +1,87 @@ <% content_for(:page_bg_class, "admin-only bg-blue-100") %> -
-
- -
-

- <%= WorkshopIdea.model_name.human.pluralize %> (<%= @workshop_ideas_count %>) -

-
- <%= link_to "New #{WorkshopIdea.model_name.human.downcase}", - new_workshop_idea_path, - class: "btn btn-primary-outline" %> -
-
+
+ +
+
+
+ + + + <%= WorkshopIdea.model_name.human.pluralize %> (<%= @workshop_ideas_count %>) +
+
+ <%= link_to "New #{WorkshopIdea.model_name.human.downcase}", + new_workshop_idea_path, + class: "btn btn-primary-outline" %> +
+
+
+
- - <%= render "search_boxes" %> + + <%= render "search_boxes" %> -
-
- - - - - - - - - - - +
+
+
Main ImageTitleTimeframeAuthorPromoted?Actions
+ + + + + + + + + + - - <% @workshop_ideas.each do |workshop_idea| %> - - - - - - + + <% @workshop_ideas.each do |workshop_idea| %> + + + + + + - - - - <% end %> - -
Main ImageTitleTimeframeAuthorPromoted?Actions
-
- <%= render "assets/display_image", - resource: workshop_idea, - width: 18, height: 14, - variant: :index, - link_to_object: true, - file: workshop_idea.display_image %> -
- 		<%= workshop_idea.title %><%= workshop_idea.time_frame_total %><%= workshop_idea.created_by.name %> - <% if workshop_idea.workshops.any? %> - - <% else %> - -- - <% end %> -
+
+ <%= render "assets/display_image", + resource: workshop_idea, + width: 18, height: 14, + variant: :index, + link_to_object: true, + file: workshop_idea.display_image %> +
+ 		<%= workshop_idea.title %><%= workshop_idea.time_frame_total %><%= workshop_idea.created_by.name %> + <% if workshop_idea.workshops.any? %> + + <% else %> + -- + <% end %> + - <%= link_to 'Edit', edit_workshop_idea_path(workshop_idea), class: "btn btn-secondary-outline" %> -
-
-
+ + + <%= link_to 'Edit', edit_workshop_idea_path(workshop_idea), class: "btn btn-secondary-outline" %> + + + <% end %> + + +
+
- - <% unless @workshop_ideas.any? %> -

- No <%= WorkshopIdea.model_name.human.pluralize.downcase %> found. -

- <% end %> + + <% unless @workshop_ideas.any? %> +

+ No <%= WorkshopIdea.model_name.human.pluralize.downcase %> found. +

+ <% end %> - -
- -
+ +
+ +
diff --git a/app/views/workshop_ideas/new.html.erb b/app/views/workshop_ideas/new.html.erb index 7c7613525..1770c7247 100644 --- a/app/views/workshop_ideas/new.html.erb +++ b/app/views/workshop_ideas/new.html.erb @@ -1,18 +1,27 @@ <% content_for(:page_bg_class, "admin-or-auth") %> -
-
-

- New Workshop Idea -

-

We encourage you to create your own workshop or a - <%= link_to "variation of an existing workshop", - new_workshop_variation_idea_path, - class: "text-blue-500 hover:underline" %>. -
Please enter the details of your creation below. Most fields are optional.

-
-
-
- <%= render "form" %> -
-
+
+ +
+
+ + + + New Workshop Idea +
+
+
+ +

+ We encourage you to create your own workshop or a + <%= link_to "variation of an existing workshop", + new_workshop_variation_idea_path, + class: "text-blue-500 hover:underline" %>. + Please enter the details of your creation below. Most fields are optional. +

+ +
+ <%= render "form" %> +
+ +
diff --git a/app/views/workshop_ideas/show.html.erb b/app/views/workshop_ideas/show.html.erb index 9884eb55b..5be4cde4f 100644 --- a/app/views/workshop_ideas/show.html.erb +++ b/app/views/workshop_ideas/show.html.erb @@ -1,14 +1,26 @@ <% content_for(:page_bg_class, "admin-or-owner") %> -
-
- <%= link_to "Home", root_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> - <% if allowed_to?(:index?, WorkshopIdea) %> - <%= link_to "Workshop Ideas", workshop_ideas_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> - <% end %> - <% if allowed_to?(:edit?, @workshop_idea) %> - <%= link_to "Edit", edit_workshop_idea_path(@workshop_idea), class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> - <% end %> +
+ +
+
+
+ + + + Workshop Idea +
+
+ <%= link_to "Home", root_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> + <% if allowed_to?(:index?, WorkshopIdea) %> + <%= link_to "Workshop Ideas", workshop_ideas_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> + <% end %> + <% if allowed_to?(:edit?, @workshop_idea) %> + <%= link_to "Edit", edit_workshop_idea_path(@workshop_idea), class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> + <% end %> +
+
+
@@ -95,4 +107,6 @@ <% end %> <% end %>
+ +
diff --git a/app/views/workshop_logs/_form.html.erb b/app/views/workshop_logs/_form.html.erb index da3673365..b10863dc9 100644 --- a/app/views/workshop_logs/_form.html.erb +++ b/app/views/workshop_logs/_form.html.erb @@ -23,7 +23,7 @@ }, prompt: "Search by title", label: "Workshop", - label_html: { class: "block text-sm font-medium text-gray-700 mb-1" } %> + label_html: { class: "block font-medium text-gray-700 mb-1" } %> <%= f.input :external_workshop_title, as: :text, @@ -32,7 +32,7 @@ rows: 1, class: "block w-full rounded-md border-gray-300 shadow-sm focus:ring-blue-500 focus:border-blue-500" }, - label_html: { class: "block text-sm font-medium text-gray-700 mb-1" } %> + label_html: { class: "block font-medium text-gray-700 mb-1" } %>
@@ -49,7 +49,7 @@ selected: (params[:organization_id].presence || (f.object.organization_id || (@organizations.count == 1 ? @organizations.first.id : nil))), input_html: { value: params[:organization_id].presence || f.object.organization_id || @organization_id, class: "block w-full rounded-md border-gray-300 shadow-sm focus:ring-blue-500 focus:border-blue-500" }, - label_html: { class: "block text-sm font-medium text-gray-700 mb-1" } %> + label_html: { class: "block font-medium text-gray-700 mb-1" } %> <% else current_user.person&.affiliations&.count == 1 %> <%= f.hidden_field :organization_id, value: f.object.organization_id || current_user.person.primary_organization&.id %> @@ -63,7 +63,7 @@ required: true, input_html: { type: 'date', value: f.object.date&.strftime('%Y-%m-%d'), class: "block w-full rounded-md border-gray-300 shadow-sm focus:ring-blue-500 focus:border-blue-500" }, - label_html: { class: "block text-sm font-medium text-gray-700 mb-1" } %> + label_html: { class: "block font-medium text-gray-700 mb-1" } %>
@@ -74,7 +74,7 @@
- +
<%= f.input :children_ongoing, as: :integer, label: "Children (0–12)", @@ -96,7 +96,7 @@
- +
<%= f.input :children_first_time, as: :integer, label: "Children (0–12)", input_html: { min: 0, class: "block w-full rounded-md border-gray-300 shadow-sm focus:ring-blue-500 focus:border-blue-500" } %> diff --git a/app/views/workshop_logs/_index.html.erb b/app/views/workshop_logs/_index.html.erb index e314103df..fae275d93 100644 --- a/app/views/workshop_logs/_index.html.erb +++ b/app/views/workshop_logs/_index.html.erb @@ -11,19 +11,21 @@ ) || [0, 0, 0, 0, 0, 0] %>
- -
-

- <%= WorkshopLog.model_name.human.pluralize %> (<%= number_with_delimiter(workshop_logs_count) %>) -

-
- <%= link_to "New #{WorkshopLog.model_name.human.downcase}", - new_workshop_log_path(organization_id: params[:organization_id], - workshop_id: params[:workshop_id], - created_by_id: current_user.id), - class: "btn btn-primary" %> + <% unless local_assigns[:hide_header] %> + +
+

+ <%= WorkshopLog.model_name.human.pluralize %> (<%= number_with_delimiter(workshop_logs_count) %>) +

+
+ <%= link_to "New #{WorkshopLog.model_name.human.downcase}", + new_workshop_log_path(organization_id: params[:organization_id], + workshop_id: params[:workshop_id], + created_by_id: current_user.id), + class: "btn btn-primary" %> +
-
+ <% end %> <%= render "workshop_logs/search_boxes" %> diff --git a/app/views/workshop_logs/edit.html.erb b/app/views/workshop_logs/edit.html.erb index 442ac887c..1fdeb9f21 100644 --- a/app/views/workshop_logs/edit.html.erb +++ b/app/views/workshop_logs/edit.html.erb @@ -1,16 +1,25 @@ <% content_for(:page_bg_class, "admin-or-owner") %> -
-
+
+ +
+
+
+ + + + Edit Workshop Log +
+
<%= link_to "Home", root_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> <%= link_to "Workshop Logs", workshop_logs_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> <%= link_to "View", workshop_log_path(@workshop_log), class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %>
-

Edit <%= @workshop_log.class.model_name.human.downcase %>

+
+
+
-
-
- <%= render "form", workshop_log: @workshop_log %> - <%= render "shared/audit_info", resource: @workshop_log %> -
-
+ <%= render "form", workshop_log: @workshop_log %> + <%= render "shared/audit_info", resource: @workshop_log %> + +
diff --git a/app/views/workshop_logs/index.html.erb b/app/views/workshop_logs/index.html.erb index 4ead53e45..2822fdc8b 100644 --- a/app/views/workshop_logs/index.html.erb +++ b/app/views/workshop_logs/index.html.erb @@ -1,6 +1,26 @@ <% content_for(:page_bg_class, "admin-or-auth") %> -
-
- <%= render "index" %> +
+ +
+
+
+ + + + Workshop Logs +
+
+ <%= link_to "New workshop log", + new_workshop_log_path(organization_id: params[:organization_id], + workshop_id: params[:workshop_id], + created_by_id: current_user.id), + class: "btn btn-primary" %> +
+
-
\ No newline at end of file +
+
+ <%= render "index", hide_header: true %> +
+
+
diff --git a/app/views/workshop_logs/new.html.erb b/app/views/workshop_logs/new.html.erb index fa664f1c5..df6d69638 100644 --- a/app/views/workshop_logs/new.html.erb +++ b/app/views/workshop_logs/new.html.erb @@ -1,38 +1,41 @@ <% content_for(:page_bg_class, "admin-or-auth") %> -
+
+ +
+
+ + + + New Workshop Log +
+
+
- -
- - + + - -

- New <%= @workshop_log.class.model_name.human.downcase %> -

+ +

+ An optional tool to track data from your art workshops. +
+ If you don't see the workshop you facilitated listed in the dropdown menu, you can type in a new title in the field below. +

- -

- An optional tool to track data from your art workshops. If you don't see the workshop you facilitated listed in the dropdown menu, you can type in a new title in the field below. -

-
- -
-
- <%= render "form" %> -
-
+
+ <%= render "form" %> +
+
diff --git a/app/views/workshop_logs/show.html.erb b/app/views/workshop_logs/show.html.erb index 3318e59fb..715ae3899 100644 --- a/app/views/workshop_logs/show.html.erb +++ b/app/views/workshop_logs/show.html.erb @@ -1,14 +1,26 @@ <% content_for(:page_bg_class, "admin-or-owner-or-member") %> -
-
- <%= link_to "Home", root_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> - <% if allowed_to?(:index?, WorkshopLog) %> - <%= link_to "My Workshop Logs", workshop_logs_path(created_by_id: current_user.id), class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> - <% end %> - <% if allowed_to?(:edit?, @workshop_log) %> - <%= link_to "Edit", edit_workshop_log_path(@workshop_log), class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> - <% end %> +
+ +
+
+
+ + + + Workshop Log +
+
+ <%= link_to "Home", root_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> + <% if allowed_to?(:index?, WorkshopLog) %> + <%= link_to "My Workshop Logs", workshop_logs_path(created_by_id: current_user.id), class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> + <% end %> + <% if allowed_to?(:edit?, @workshop_log) %> + <%= link_to "Edit", edit_workshop_log_path(@workshop_log), class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> + <% end %> +
+
+
@@ -185,4 +197,6 @@
<% end %>
+ +
diff --git a/app/views/workshop_variation_ideas/_form.html.erb b/app/views/workshop_variation_ideas/_form.html.erb index 5379ad976..32ea76ea6 100644 --- a/app/views/workshop_variation_ideas/_form.html.erb +++ b/app/views/workshop_variation_ideas/_form.html.erb @@ -46,7 +46,7 @@ }, prompt: "Search by title", label: "Workshop", - label_html: { class: "block text-sm font-medium text-gray-700 mb-1 #{ 'readonly' if promoted_to_variation}" } %> + label_html: { class: "block font-medium text-gray-700 mb-1 #{ 'readonly' if promoted_to_variation}" } %>
<%= f.input :windows_type_id, @@ -75,7 +75,7 @@ selected: (params[:organization_id].presence || (f.object.organization_id || (@organizations.count == 1 ? @organizations.first.id : nil))), input_html: { value: params[:organization_id].presence || f.object.organization_id || @organization_id, class: "#{ "readonly" if promoted_to_variation } block w-full rounded-md border-gray-300 shadow-sm focus:ring-blue-500 focus:border-blue-500" }, - label_html: { class: "block text-sm font-medium text-gray-700 mb-1" } %> + label_html: { class: "block font-medium text-gray-700 mb-1" } %> <% else %> <%= f.hidden_field :organization_id, value: f.object.organization_id || current_user.person.primary_organization&.id %> diff --git a/app/views/workshop_variation_ideas/edit.html.erb b/app/views/workshop_variation_ideas/edit.html.erb index f76f0bc78..dea090727 100644 --- a/app/views/workshop_variation_ideas/edit.html.erb +++ b/app/views/workshop_variation_ideas/edit.html.erb @@ -1,6 +1,15 @@ <% content_for(:page_bg_class, "admin-only bg-blue-100") %> -
-
+
+ +
+
+
+ + + + Edit Workshop Variation Idea +
+
<%= link_to "Home", root_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> <% if @workshop_variation_idea.workshop_variations.any? %> <% @workshop_variation_idea.workshop_variations.each do |workshop_variation| %> @@ -17,12 +26,12 @@ <%= link_to "View", workshop_variation_idea_path(@workshop_variation_idea), class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %>
-

Edit workshop variation idea

+
+
+
-
-
- <%= render "form", workshop_variation_idea: @workshop_variation_idea %> - <%= render "shared/audit_info", resource: @workshop_variation_idea %> -
-
+ <%= render "form", workshop_variation_idea: @workshop_variation_idea %> + <%= render "shared/audit_info", resource: @workshop_variation_idea %> + +
diff --git a/app/views/workshop_variation_ideas/index.html.erb b/app/views/workshop_variation_ideas/index.html.erb index e41042bdb..437c7e297 100644 --- a/app/views/workshop_variation_ideas/index.html.erb +++ b/app/views/workshop_variation_ideas/index.html.erb @@ -1,81 +1,86 @@ <% content_for(:page_bg_class, "admin-only bg-blue-100") %> -
-
- -
-

- Workshop Variation Ideas (<%= @workshop_variation_ideas_count %>) -

-
- <%= link_to "New workshop variation idea", - new_workshop_variation_idea_path, - class: "btn btn-primary-outline" %> -
-
+
+ +
+
+
+ + + + Workshop Variation Ideas (<%= @workshop_variation_ideas_count %>) +
+
+ <%= link_to "New workshop variation idea", + new_workshop_variation_idea_path, + class: "btn btn-primary-outline" %> +
+
+
+
- <%= render "search_boxes" %> + <%= render "search_boxes" %> -
-
- - - - - - - - - - - +
+
+
Main ImageNameWorkshopAuthorPromoted?Actions
+ + + + + + + + + + - - <% @workshop_variation_ideas.each do |workshop_variation_idea| %> - - - - - - + + <% @workshop_variation_ideas.each do |workshop_variation_idea| %> + + + + + + - - - - <% end %> - -
Main ImageNameWorkshopAuthorPromoted?Actions
-
- <%= render "assets/display_image", - resource: workshop_variation_idea, - width: 18, height: 14, - variant: :index, - link_to_object: true, - file: workshop_variation_idea.display_image %> -
- 		<%= workshop_variation_idea.name %><%= workshop_variation_idea.workshop.title %><%= workshop_variation_idea.created_by.name %> - <% if workshop_variation_idea.workshop_variations.any? %> - - <% else %> - -- - <% end %> -
+
+ <%= render "assets/display_image", + resource: workshop_variation_idea, + width: 18, height: 14, + variant: :index, + link_to_object: true, + file: workshop_variation_idea.display_image %> +
+ 		<%= workshop_variation_idea.name %><%= workshop_variation_idea.workshop.title %><%= workshop_variation_idea.created_by.name %> + <% if workshop_variation_idea.workshop_variations.any? %> + + <% else %> + -- + <% end %> + - <%= link_to 'Edit', edit_workshop_variation_idea_path(workshop_variation_idea), class: "btn btn-secondary-outline" %> -
-
-
+ + + <%= link_to 'Edit', edit_workshop_variation_idea_path(workshop_variation_idea), class: "btn btn-secondary-outline" %> + + + <% end %> + + +
+
- - <% unless @workshop_variation_ideas.any? %> -

- No workshop variation ideas found. -

- <% end %> + + <% unless @workshop_variation_ideas.any? %> +

+ No workshop variation ideas found. +

+ <% end %> - -
- -
+ +
+ +
diff --git a/app/views/workshop_variation_ideas/new.html.erb b/app/views/workshop_variation_ideas/new.html.erb index 745ee2b26..6b78c700b 100644 --- a/app/views/workshop_variation_ideas/new.html.erb +++ b/app/views/workshop_variation_ideas/new.html.erb @@ -1,17 +1,23 @@ <% content_for(:page_bg_class, "admin-or-auth") %> -
-
-

New workshop variation idea

-
+
+ +
+
+ + + + New Workshop Variation Idea +
+
+
-

- Sharing your unique workshop variations strengthens our curriculum for our entire community. - We deeply value your innovations and welcome your feedback anytime. -

+

+ Sharing your unique workshop variations strengthens our curriculum for our entire community. +
+ We deeply value your innovations and welcome your feedback anytime. +

-
-
- <%= render "form", workshop_variation_idea: @workshop_variation_idea %> -
-
+ <%= render "form", workshop_variation_idea: @workshop_variation_idea %> + +
diff --git a/app/views/workshop_variation_ideas/show.html.erb b/app/views/workshop_variation_ideas/show.html.erb index 1bc1797c4..606ccde3e 100644 --- a/app/views/workshop_variation_ideas/show.html.erb +++ b/app/views/workshop_variation_ideas/show.html.erb @@ -1,15 +1,27 @@ <% content_for(:page_bg_class, "admin-or-owner") %> -
-
- <%= link_to "Home", root_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> - <% if allowed_to?(:index?, WorkshopVariationIdea) %> - <%= link_to "Workshop Variation Ideas", workshop_variation_ideas_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> - <% end %> - <% if allowed_to?(:edit?, @workshop_variation_idea) %> - <%= link_to "Edit", edit_workshop_variation_idea_path(@workshop_variation_idea), - class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> - <% end %> +
+ +
+
+
+ + + + Workshop Variation Idea +
+
+ <%= link_to "Home", root_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> + <% if allowed_to?(:index?, WorkshopVariationIdea) %> + <%= link_to "Workshop Variation Ideas", workshop_variation_ideas_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> + <% end %> + <% if allowed_to?(:edit?, @workshop_variation_idea) %> + <%= link_to "Edit", edit_workshop_variation_idea_path(@workshop_variation_idea), + class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> + <% end %> +
+
+
@@ -104,4 +116,6 @@ <%= @workshop_variation_idea.rhino_body %>
+ +
diff --git a/app/views/workshop_variations/index.html.erb b/app/views/workshop_variations/index.html.erb index 4f17fbd8c..c9bc946e1 100644 --- a/app/views/workshop_variations/index.html.erb +++ b/app/views/workshop_variations/index.html.erb @@ -1,18 +1,22 @@ <% content_for(:page_bg_class, "public") %> -
-
- -
-

- <%= WorkshopVariation.model_name.human.pluralize %> (<%= @workshop_variations_count %>) -

-
+
+ +
+
+
+ + + + Workshop Variations (<%= @workshop_variations_count %>) +
+
<%= link_to "New #{WorkshopVariation.model_name.human.downcase}", new_workshop_variation_path, class: "btn btn-primary-outline" %>
- +
+
<%= render "search_boxes" %>
@@ -86,4 +90,3 @@ <% end %>
- diff --git a/app/views/workshop_variations/show.html.erb b/app/views/workshop_variations/show.html.erb index b4568decf..ab63276f5 100644 --- a/app/views/workshop_variations/show.html.erb +++ b/app/views/workshop_variations/show.html.erb @@ -1,17 +1,26 @@ <% content_for(:page_bg_class, "admin-or-public-or-authpublished") %> -
- -
- <%= link_to "Home", root_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> - <%= link_to "Workshop", workshop_path(@workshop_variation.workshop, anchor: "workshop-variations"), - class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> - <% if allowed_to?(:edit?, @workshop_variation) %> - <%= link_to "Edit", edit_workshop_variation_path(@workshop_variation), - class: "#{ "admin-only bg-blue-100 " if allowed_to?(:manage?, WorkshopVariation) }text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> - <% end %> +
+ +
+
+
+ + + + Workshop Variation +
+
+ <%= link_to "Home", root_path, class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> + <%= link_to "Workshop", workshop_path(@workshop_variation.workshop, anchor: "workshop-variations"), + class: "text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> + <% if allowed_to?(:edit?, @workshop_variation) %> + <%= link_to "Edit", edit_workshop_variation_path(@workshop_variation), + class: "#{ "admin-only bg-blue-100 " if allowed_to?(:manage?, WorkshopVariation) }text-sm text-gray-500 hover:text-gray-700 px-2 py-1" %> + <% end %> +
- - +
+
@@ -67,4 +76,5 @@ <%= @workshop_variation.rhino_body %>
+
diff --git a/app/views/workshops/index.html.erb b/app/views/workshops/index.html.erb index b33d59c61..290039a33 100644 --- a/app/views/workshops/index.html.erb +++ b/app/views/workshops/index.html.erb @@ -1,33 +1,34 @@ <%= render "shared/public_welcome_banner" %> <% content_for(:page_bg_class, "public") %> -
- -
-
-
-

Workshops

- -

- Search by emotional theme, materials needed, ease of set-up, and more. -
- We encourage Windows Facilitator creativity and innovation. If you adapt and improve workshops, please <%= link_to "share your ideas with us", new_workshop_variation_idea_path, class: "text-blue-500" %>! -

+
+ +
+
+
+ + + + Workshops +
+
+ <% if allowed_to?(:new?, Workshop) %> + <%= link_to "New workshop", + new_workshop_path, + class: "admin-only bg-blue-100 btn btn-primary-outline" %> + <% end %>
- - <% if allowed_to?(:new?, Workshop) %> - <%= link_to "New workshop", - new_workshop_path, - class: "admin-only bg-blue-100 btn btn-primary-outline" %> - <% end %>
- - -
- - -
+
+

+ Search by emotional theme, materials needed, ease of set-up, and more. +
+ We encourage Windows Facilitator creativity and innovation. If you adapt and improve workshops, please <%= link_to "share your ideas with us", new_workshop_variation_idea_path, class: "text-blue-500" %>! +

+ + +
<%= form_tag(workshops_path, method: :get, data: {turbo_stream: true, turbo_frame: "workshop_results", controller: "collection share-url"}, autocomplete: "off", class: "space-y-6") do %> @@ -113,5 +114,6 @@
<% end %> +
diff --git a/app/views/workshops/show.html.erb b/app/views/workshops/show.html.erb index 81e753c41..a93d1d565 100644 --- a/app/views/workshops/show.html.erb +++ b/app/views/workshops/show.html.erb @@ -1,5 +1,17 @@ <% content_for(:page_bg_class, "admin-or-public-or-authpublished") %> -
+
+ +
+
+
+ + + + Workshop +
+
+
+
@@ -20,4 +32,5 @@
+