From 40f1e3a30cff1713e794cc97fe87bf245063606b Mon Sep 17 00:00:00 2001 From: Evan Travers Date: Mon, 7 Aug 2017 20:37:42 -0500 Subject: [PATCH 1/3] Add helper to simplify titles I'm headed towards simplifying the layout... and I think that the header system is the first piece that could be DRY'd up. To that end, I'm borrowing a great method for cleaning up the page titles from the blog in references, and implementing it in one place to show y'all what it could do. References: - https://coderwall.com/p/a1pj7w/rails-page-titles-with-the-right-amount-of-magic --- app/helpers/application_helper.rb | 11 +++++++++++ app/views/organizations/index.html.erb | 2 +- config/locales/en.yml | 4 +++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index abfd29a..f47b90d 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -13,4 +13,15 @@ def sortable(column, title=nil) direction = (column == sort_column or join_column == sort_column) && sort_direction == "asc" ? "desc" : "asc" link_to title, params.permit!.merge({:sort => column, :direction => direction}), {:class => css_class} end + + def title + if content_for?(:title) + # allows the title to be set in the view by using t(".title") + content_for :title + else + # look up translation key based on controller path, action name and .title + # this works identical to the built-in lazy lookup + t("#{ controller_path.tr('/', '.') }.#{ action_name }.title", default: :site_name) + end + end end diff --git a/app/views/organizations/index.html.erb b/app/views/organizations/index.html.erb index 31512e3..bf54054 100644 --- a/app/views/organizations/index.html.erb +++ b/app/views/organizations/index.html.erb @@ -3,7 +3,7 @@ New Organization <% end %> -

Listing organizations

+

<%= title %>

diff --git a/config/locales/en.yml b/config/locales/en.yml index 0653957..4364905 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -20,4 +20,6 @@ # available at http://guides.rubyonrails.org/i18n.html. en: - hello: "Hello world" + organizations: + index: + title: "Listing Organization" From 4048d228306e67adebee64760f3781ae7fb556cf Mon Sep 17 00:00:00 2001 From: Evan Travers Date: Mon, 7 Aug 2017 20:47:22 -0500 Subject: [PATCH 2/3] Implement new title and content_for Trying to DRY up the views --- app/views/layouts/application.html.erb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 5ffd154..396c16d 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -71,6 +71,12 @@
+ <% if content_for? :page_header %> +
+ <%= yield :page_header %> +

<%= title %>

+
+ <% end %> <%= yield %>
From 11b90f3496bfededa9d771204d08a69948adfa93 Mon Sep 17 00:00:00 2001 From: Evan Travers Date: Tue, 8 Aug 2017 21:04:54 -0500 Subject: [PATCH 3/3] Move the titles to a helper By moving the titles to a i18n file, we increase the ease of translatability and renaming later if we really need it. --- app/views/check_ins/index.html.erb | 5 +- app/views/check_ins/new.html.erb | 5 +- app/views/cohorts/edit.html.erb | 5 +- app/views/cohorts/index.html.erb | 5 +- app/views/cohorts/new.html.erb | 5 +- app/views/cohorts/show.html.erb | 5 +- app/views/common_tasks/edit.html.erb | 5 +- app/views/common_tasks/index.html.erb | 5 +- app/views/common_tasks/new.html.erb | 5 +- app/views/common_tasks/show.html.erb | 5 +- app/views/communications/edit.html.erb | 5 +- app/views/communications/index.html.erb | 5 +- app/views/communications/new.html.erb | 7 +- app/views/communications/show.html.erb | 5 +- .../extracurricular_activities/edit.html.erb | 5 +- .../extracurricular_activities/index.html.erb | 5 +- .../extracurricular_activities/new.html.erb | 5 +- .../extracurricular_activities/show.html.erb | 5 +- app/views/graduating_classes/edit.html.erb | 5 +- app/views/graduating_classes/index.html.erb | 5 +- app/views/graduating_classes/show.html.erb | 5 +- app/views/identities/edit.html.erb | 5 +- app/views/identities/index.html.erb | 5 +- app/views/identities/new.html.erb | 5 +- app/views/identities/show.html.erb | 5 +- app/views/locations/edit.html.erb | 5 +- app/views/locations/index.html.erb | 5 +- app/views/locations/new.html.erb | 5 +- app/views/locations/show.html.erb | 5 +- app/views/members/edit.html.erb | 5 +- app/views/members/index.html.erb | 5 +- app/views/members/new.html.erb | 5 +- app/views/members/show.html.erb | 7 +- app/views/neighborhoods/edit.html.erb | 5 +- app/views/neighborhoods/index.html.erb | 5 +- app/views/neighborhoods/new.html.erb | 5 +- app/views/neighborhoods/show.html.erb | 5 +- app/views/network_actions/edit.html.erb | 5 +- app/views/network_actions/index.html.erb | 5 +- app/views/network_actions/new.html.erb | 5 +- app/views/network_actions/show.html.erb | 5 +- app/views/network_event_tasks/index.html.erb | 185 ++++++------ app/views/network_event_tasks/update.html.erb | 3 - app/views/network_events/edit.html.erb | 5 +- app/views/network_events/index.html.erb | 269 +++++++++--------- app/views/network_events/new.html.erb | 14 +- app/views/network_events/show.html.erb | 5 +- app/views/organizations/edit.html.erb | 5 +- app/views/organizations/index.html.erb | 5 +- app/views/organizations/new.html.erb | 5 +- app/views/organizations/show.html.erb | 5 +- app/views/programs/edit.html.erb | 5 +- app/views/programs/index.html.erb | 5 +- app/views/programs/new.html.erb | 5 +- app/views/programs/show.html.erb | 5 +- app/views/schools/edit.html.erb | 5 +- app/views/schools/index.html.erb | 5 +- app/views/schools/new.html.erb | 5 +- app/views/schools/show.html.erb | 5 +- app/views/sign_ups/index.html.erb | 7 +- app/views/sign_ups/new.html.erb | 8 +- app/views/talents/edit.html.erb | 5 +- app/views/talents/index.html.erb | 5 +- app/views/talents/new.html.erb | 5 +- app/views/talents/show.html.erb | 5 +- app/views/users/edit.html.erb | 7 +- app/views/users/index.html.erb | 4 - app/views/users/show.html.erb | 5 +- config/locales/en.yml | 150 ++++++++++ 69 files changed, 515 insertions(+), 436 deletions(-) diff --git a/app/views/check_ins/index.html.erb b/app/views/check_ins/index.html.erb index 1153df9..47b06ff 100644 --- a/app/views/check_ins/index.html.erb +++ b/app/views/check_ins/index.html.erb @@ -1,10 +1,9 @@ -
+<% content_for :page_header do %> <%= link_to new_network_event_path, class: 'btn btn-primary' do %> New Event <% end %> -

Listing events

-
+<% end %>
diff --git a/app/views/check_ins/new.html.erb b/app/views/check_ins/new.html.erb index 7323e57..7452d30 100644 --- a/app/views/check_ins/new.html.erb +++ b/app/views/check_ins/new.html.erb @@ -1,9 +1,8 @@ -
-

Member Check In

+<% content_for :page_header do %> <%= hidden_field_tag "network_event_id", @network_event_id %> <%= hidden_field_tag "level", @level %> <%= hidden_field_tag "participation_type", 'checked_in' %> -
+<% end %>
diff --git a/app/views/cohorts/edit.html.erb b/app/views/cohorts/edit.html.erb index a49d17a..39000f7 100644 --- a/app/views/cohorts/edit.html.erb +++ b/app/views/cohorts/edit.html.erb @@ -1,4 +1,4 @@ -
+<% content_for :page_header do %> <%= link_to cohorts_path, class: 'btn btn-default' do %> Back @@ -7,7 +7,6 @@ Show <% end %> -

Editing cohort

-
+<% end %> <%= render 'form' %> diff --git a/app/views/cohorts/index.html.erb b/app/views/cohorts/index.html.erb index f16d88b..9911a4f 100644 --- a/app/views/cohorts/index.html.erb +++ b/app/views/cohorts/index.html.erb @@ -1,10 +1,9 @@ -
+<% content_for :page_header do %> <%= link_to new_cohort_path, class: 'btn btn-primary' do %> New Cohort <% end %> -

Listing cohorts

-
+<% end %>
diff --git a/app/views/cohorts/new.html.erb b/app/views/cohorts/new.html.erb index ec3f74c..1136a09 100644 --- a/app/views/cohorts/new.html.erb +++ b/app/views/cohorts/new.html.erb @@ -1,9 +1,8 @@ -
+<% content_for :page_header do %> <%= link_to cohorts_path, class: 'btn btn-default' do %> Back <% end %> -

New cohort

-
+<% end %> <%= render 'form' %> diff --git a/app/views/cohorts/show.html.erb b/app/views/cohorts/show.html.erb index 07b289b..a835419 100644 --- a/app/views/cohorts/show.html.erb +++ b/app/views/cohorts/show.html.erb @@ -1,4 +1,4 @@ -
+<% content_for :page_header do %> <%= link_to cohorts_path, class: 'btn btn-default' do %> Back @@ -7,8 +7,7 @@ Edit <% end %> -

Show cohort

-
+<% end %>
Name:
diff --git a/app/views/common_tasks/edit.html.erb b/app/views/common_tasks/edit.html.erb index a749fa2..0f74698 100644 --- a/app/views/common_tasks/edit.html.erb +++ b/app/views/common_tasks/edit.html.erb @@ -1,4 +1,4 @@ -
+<% content_for :page_header do %> <%= link_to common_tasks_path, class: 'btn btn-default' do %> Back @@ -7,7 +7,6 @@ Show <% end %> -

Editing common task

-
+<% end %> <%= render 'form' %> diff --git a/app/views/common_tasks/index.html.erb b/app/views/common_tasks/index.html.erb index 4068e4f..ccb2bdc 100644 --- a/app/views/common_tasks/index.html.erb +++ b/app/views/common_tasks/index.html.erb @@ -1,10 +1,9 @@ -
+<% content_for :page_header do %> <%= link_to new_common_task_path, class: 'btn btn-primary' do %> New Common task <% end %> -

Listing common tasks

-
+<% end %>
diff --git a/app/views/common_tasks/new.html.erb b/app/views/common_tasks/new.html.erb index bb2368a..fc82c1e 100644 --- a/app/views/common_tasks/new.html.erb +++ b/app/views/common_tasks/new.html.erb @@ -1,9 +1,8 @@ -
+<% content_for :page_header do %> <%= link_to common_tasks_path, class: 'btn btn-default' do %> Back <% end %> -

New common task

-
+<% end %> <%= render 'form' %> diff --git a/app/views/common_tasks/show.html.erb b/app/views/common_tasks/show.html.erb index faa68a9..249557b 100644 --- a/app/views/common_tasks/show.html.erb +++ b/app/views/common_tasks/show.html.erb @@ -1,4 +1,4 @@ -
+<% content_for :page_header do %> <%= link_to common_tasks_path, class: 'btn btn-default' do %> Back @@ -7,8 +7,7 @@ Edit <% end %> -

Show common tasks

-
+<% end %>
Name:
diff --git a/app/views/communications/edit.html.erb b/app/views/communications/edit.html.erb index 45b1a7e..a35b7d9 100644 --- a/app/views/communications/edit.html.erb +++ b/app/views/communications/edit.html.erb @@ -1,4 +1,4 @@ -
+<% content_for :page_header do %> <%= link_to members_path, class: 'btn btn-default' do %> Back @@ -7,7 +7,6 @@ Show <% end %> -

Editing communication

-
+<% end %> <%= render 'form' %> diff --git a/app/views/communications/index.html.erb b/app/views/communications/index.html.erb index 3d5d46b..48ed052 100644 --- a/app/views/communications/index.html.erb +++ b/app/views/communications/index.html.erb @@ -1,10 +1,9 @@ -
+<% content_for :page_header do %> <%= link_to new_member_communication_path, class: 'btn btn-primary' do %> New Communication <% end %> -

Listing communications

-
+<% end %>
diff --git a/app/views/communications/new.html.erb b/app/views/communications/new.html.erb index 17d8d9b..bc0ea38 100644 --- a/app/views/communications/new.html.erb +++ b/app/views/communications/new.html.erb @@ -1,10 +1,9 @@ -
+<% content_for :page_header do %> <%= link_to member_path(@member), class: 'btn btn-default' do %> Back <% end %> -

<%= @member.name %>

-

New communication

-
+ <%= content_for :title, t(".title", name: @member.name) %> +<% end %> <%= render 'form' %> diff --git a/app/views/communications/show.html.erb b/app/views/communications/show.html.erb index ed133fc..429c88c 100644 --- a/app/views/communications/show.html.erb +++ b/app/views/communications/show.html.erb @@ -1,4 +1,4 @@ -
+<% content_for :page_header do %> <%= link_to member_path(@member), class: 'btn btn-default' do %> Back @@ -7,8 +7,7 @@ Edit <% end %> -

Show communication

-
+<% end %>
Date:
diff --git a/app/views/extracurricular_activities/edit.html.erb b/app/views/extracurricular_activities/edit.html.erb index 15108a2..d971669 100644 --- a/app/views/extracurricular_activities/edit.html.erb +++ b/app/views/extracurricular_activities/edit.html.erb @@ -1,4 +1,4 @@ -
+<% content_for :page_header do %> <%= link_to extracurricular_activities_path, class: 'btn btn-default' do %> Back @@ -7,7 +7,6 @@ Show <% end %> -

Editing extracurricular activity

-
+<% end %> <%= render 'form' %> diff --git a/app/views/extracurricular_activities/index.html.erb b/app/views/extracurricular_activities/index.html.erb index c307c6d..b7dc722 100644 --- a/app/views/extracurricular_activities/index.html.erb +++ b/app/views/extracurricular_activities/index.html.erb @@ -1,10 +1,9 @@ -
+<% content_for :page_header do %> <%= link_to new_extracurricular_activity_path, class: 'btn btn-primary' do %> New Extracurricular activity <% end %> -

Listing extracurricular activities

-
+<% end %>
diff --git a/app/views/extracurricular_activities/new.html.erb b/app/views/extracurricular_activities/new.html.erb index 311f481..cf867d5 100644 --- a/app/views/extracurricular_activities/new.html.erb +++ b/app/views/extracurricular_activities/new.html.erb @@ -1,9 +1,8 @@ -
+<% content_for :page_header do %> <%= link_to extracurricular_activities_path, class: 'btn btn-default' do %> Back <% end %> -

New extracurricular activity

-
+<% end %> <%= render 'form' %> diff --git a/app/views/extracurricular_activities/show.html.erb b/app/views/extracurricular_activities/show.html.erb index 7c4183f..e527ba1 100644 --- a/app/views/extracurricular_activities/show.html.erb +++ b/app/views/extracurricular_activities/show.html.erb @@ -1,4 +1,4 @@ -
+<% content_for :page_header do %> <%= link_to extracurricular_activities_path, class: 'btn btn-default' do %> Back @@ -7,8 +7,7 @@ Edit <% end %> -

Show extracurricular activity

-
+<% end %>
Name:
diff --git a/app/views/graduating_classes/edit.html.erb b/app/views/graduating_classes/edit.html.erb index 83c39d0..74a47f2 100644 --- a/app/views/graduating_classes/edit.html.erb +++ b/app/views/graduating_classes/edit.html.erb @@ -1,4 +1,4 @@ -
+<% content_for :page_header do %> <%= link_to graduating_classes_path, class: 'btn btn-default' do %> Back @@ -7,7 +7,6 @@ Show <% end %> -

Editing graduating class

-
+<% end %> <%= render 'form' %> diff --git a/app/views/graduating_classes/index.html.erb b/app/views/graduating_classes/index.html.erb index ad5aeee..2457dd9 100644 --- a/app/views/graduating_classes/index.html.erb +++ b/app/views/graduating_classes/index.html.erb @@ -1,10 +1,9 @@ -
+<% content_for :page_header do %> <%= link_to new_graduating_class_path, class: 'btn btn-primary' do %> New Graduating Class <% end %> -

Listing graduating classes

-
+<% end %>
diff --git a/app/views/graduating_classes/show.html.erb b/app/views/graduating_classes/show.html.erb index e2719c5..9cc17fb 100644 --- a/app/views/graduating_classes/show.html.erb +++ b/app/views/graduating_classes/show.html.erb @@ -1,4 +1,4 @@ -
+<% content_for :page_header do %> <%= link_to graduating_classes_path, class: 'btn btn-default' do %> Back @@ -7,8 +7,7 @@ Edit <% end %> -

Show graduating class

-
+<% end %>
Year:
diff --git a/app/views/identities/edit.html.erb b/app/views/identities/edit.html.erb index 35a0977..6d22e00 100644 --- a/app/views/identities/edit.html.erb +++ b/app/views/identities/edit.html.erb @@ -1,4 +1,4 @@ -
+<% content_for :page_header do %> <%= link_to identities_path, class: 'btn btn-default' do %> Back @@ -7,7 +7,6 @@ Show <% end %> -

Editing identity

-
+<% end %> <%= render 'form' %> diff --git a/app/views/identities/index.html.erb b/app/views/identities/index.html.erb index 70bc9a7..1fa265b 100644 --- a/app/views/identities/index.html.erb +++ b/app/views/identities/index.html.erb @@ -1,10 +1,9 @@ -
+<% content_for :page_header do %> <%= link_to new_identity_path, class: 'btn btn-primary' do %> New Identity <% end %> -

Listing identities

-
+<% end %>
diff --git a/app/views/identities/new.html.erb b/app/views/identities/new.html.erb index 60a345f..353c206 100644 --- a/app/views/identities/new.html.erb +++ b/app/views/identities/new.html.erb @@ -1,9 +1,8 @@ -
+<% content_for :page_header do %> <%= link_to identities_path, class: 'btn btn-default' do %> Back <% end %> -

New identity

-
+<% end %> <%= render 'form' %> diff --git a/app/views/identities/show.html.erb b/app/views/identities/show.html.erb index 4383470..c3494ff 100644 --- a/app/views/identities/show.html.erb +++ b/app/views/identities/show.html.erb @@ -1,4 +1,4 @@ -
+<% content_for :page_header do %> <%= link_to identities_path, class: 'btn btn-default' do %> Back @@ -7,8 +7,7 @@ Edit <% end %> -

Show identity

-
+<% end %>
Name:
diff --git a/app/views/locations/edit.html.erb b/app/views/locations/edit.html.erb index 55fcdfb..9239bd6 100644 --- a/app/views/locations/edit.html.erb +++ b/app/views/locations/edit.html.erb @@ -1,4 +1,4 @@ -
+<% content_for :page_header do %> <%= link_to locations_path, class: 'btn btn-default' do %> Back @@ -7,7 +7,6 @@ Show <% end %> -

Editing location

-
+<% end %> <%= render 'form' %> diff --git a/app/views/locations/index.html.erb b/app/views/locations/index.html.erb index e170487..25efcf6 100644 --- a/app/views/locations/index.html.erb +++ b/app/views/locations/index.html.erb @@ -1,10 +1,9 @@ -
+<% content_for :page_header do %> <%= link_to new_location_path, class: 'btn btn-primary' do %> New Location <% end %> -

Listing locations

-
+<% end %>
diff --git a/app/views/locations/new.html.erb b/app/views/locations/new.html.erb index 633268a..b0ac01b 100644 --- a/app/views/locations/new.html.erb +++ b/app/views/locations/new.html.erb @@ -1,9 +1,8 @@ -
+<% content_for :page_header do %> <%= link_to locations_path, class: 'btn btn-default' do %> Back <% end %> -

New location

-
+<% end %> <%= render 'form' %> diff --git a/app/views/locations/show.html.erb b/app/views/locations/show.html.erb index 205d41a..119e24b 100644 --- a/app/views/locations/show.html.erb +++ b/app/views/locations/show.html.erb @@ -1,4 +1,4 @@ -
+<% content_for :page_header do %> <%= link_to locations_path, class: 'btn btn-default' do %> Back @@ -7,8 +7,7 @@ Edit <% end %> -

Show location

-
+<% end %>
Name:
diff --git a/app/views/members/edit.html.erb b/app/views/members/edit.html.erb index 9a06b9d..d7ea70a 100644 --- a/app/views/members/edit.html.erb +++ b/app/views/members/edit.html.erb @@ -1,4 +1,4 @@ -
+<% content_for :page_header do %> <%= link_to members_path, class: 'btn btn-default' do %> Back @@ -7,8 +7,7 @@ Show <% end %> -

Editing member

-
+<% end %> <%= render 'form' %> diff --git a/app/views/members/index.html.erb b/app/views/members/index.html.erb index 6762948..244e8d3 100644 --- a/app/views/members/index.html.erb +++ b/app/views/members/index.html.erb @@ -1,10 +1,9 @@ -
+<% content_for :page_header do %> <%= link_to new_member_path, class: 'btn btn-primary' do %> New Member <% end %> -

Listing members

<%= form_tag members_path, :method => :get, class: "form-horizontal" do %>
@@ -119,7 +118,7 @@
<% end %> -
+<% end %>
diff --git a/app/views/members/new.html.erb b/app/views/members/new.html.erb index 37ea253..76f2cf9 100644 --- a/app/views/members/new.html.erb +++ b/app/views/members/new.html.erb @@ -1,9 +1,8 @@ -
+<% content_for :page_header do %> <%= link_to members_path, class: 'btn btn-default' do %> Back <% end %> -

New member

-
+<% end %> <%= render 'form' %> diff --git a/app/views/members/show.html.erb b/app/views/members/show.html.erb index 7a9d1c4..6d460d6 100644 --- a/app/views/members/show.html.erb +++ b/app/views/members/show.html.erb @@ -1,4 +1,4 @@ -
+<% content_for :page_header do %> <%= link_to members_path, class: 'btn btn-default' do %> Back @@ -7,8 +7,7 @@ Edit <% end %> -

Show member

-
+<% end %>
First name:
@@ -182,4 +181,4 @@ <% else %> No events attended yet. -<% end %> \ No newline at end of file +<% end %> diff --git a/app/views/neighborhoods/edit.html.erb b/app/views/neighborhoods/edit.html.erb index 32797e3..f7f97e2 100644 --- a/app/views/neighborhoods/edit.html.erb +++ b/app/views/neighborhoods/edit.html.erb @@ -1,4 +1,4 @@ -
+<% content_for :page_header do %> <%= link_to neighborhoods_path, class: 'btn btn-default' do %> Back @@ -7,7 +7,6 @@ Show <% end %> -

Editing neighborhood

-
+<% end %> <%= render 'form' %> diff --git a/app/views/neighborhoods/index.html.erb b/app/views/neighborhoods/index.html.erb index 82c9fb3..3cac09d 100644 --- a/app/views/neighborhoods/index.html.erb +++ b/app/views/neighborhoods/index.html.erb @@ -1,10 +1,9 @@ -
+<% content_for :page_header do %> <%= link_to new_neighborhood_path, class: 'btn btn-primary' do %> New Neighborhood <% end %> -

Listing neighborhoods

-
+<% end %>
diff --git a/app/views/neighborhoods/new.html.erb b/app/views/neighborhoods/new.html.erb index 2fab0a5..776d43b 100644 --- a/app/views/neighborhoods/new.html.erb +++ b/app/views/neighborhoods/new.html.erb @@ -1,9 +1,8 @@ -
+<% content_for :page_header do %> <%= link_to neighborhoods_path, class: 'btn btn-default' do %> Back <% end %> -

New neighborhood

-
+<% end %> <%= render 'form' %> diff --git a/app/views/neighborhoods/show.html.erb b/app/views/neighborhoods/show.html.erb index 5d2e084..45beb51 100644 --- a/app/views/neighborhoods/show.html.erb +++ b/app/views/neighborhoods/show.html.erb @@ -1,4 +1,4 @@ -
+<% content_for :page_header do %> <%= link_to neighborhoods_path, class: 'btn btn-default' do %> Back @@ -7,8 +7,7 @@ Edit <% end %> -

Show neighborhood

-
+<% end %>
Name:
diff --git a/app/views/network_actions/edit.html.erb b/app/views/network_actions/edit.html.erb index c175862..f0a8224 100644 --- a/app/views/network_actions/edit.html.erb +++ b/app/views/network_actions/edit.html.erb @@ -1,4 +1,4 @@ -
+<% content_for :page_header do %> <%= link_to network_actions_path, class: 'btn btn-default' do %> Back @@ -7,7 +7,6 @@ Show <% end %> -

Editing action

-
+<% end %> <%= render 'form' %> diff --git a/app/views/network_actions/index.html.erb b/app/views/network_actions/index.html.erb index 0aec3eb..950d9d1 100644 --- a/app/views/network_actions/index.html.erb +++ b/app/views/network_actions/index.html.erb @@ -1,10 +1,9 @@ -
+<% content_for :page_header do %> <%= link_to new_network_action_path, class: 'btn btn-primary' do %> New Action <% end %> -

Listing actions

-
+<% end %>
diff --git a/app/views/network_actions/new.html.erb b/app/views/network_actions/new.html.erb index b1d1bf4..ec4e135 100644 --- a/app/views/network_actions/new.html.erb +++ b/app/views/network_actions/new.html.erb @@ -1,9 +1,8 @@ -
+<% content_for :page_header do %> <%= link_to network_actions_path, class: 'btn btn-default' do %> Back <% end %> -

New action

-
+<% end %> <%= render 'form' %> diff --git a/app/views/network_actions/show.html.erb b/app/views/network_actions/show.html.erb index 433435b..1f27076 100644 --- a/app/views/network_actions/show.html.erb +++ b/app/views/network_actions/show.html.erb @@ -1,4 +1,4 @@ -
+<% content_for :page_header do %> <%= link_to network_actions_path, class: 'btn btn-default' do %> Back @@ -7,8 +7,7 @@ Edit <% end %> -

Show action

-
+<% end %>
Event:
diff --git a/app/views/network_event_tasks/index.html.erb b/app/views/network_event_tasks/index.html.erb index 70a4d30..3d75b3f 100644 --- a/app/views/network_event_tasks/index.html.erb +++ b/app/views/network_event_tasks/index.html.erb @@ -1,104 +1,103 @@ -
-

Listing event tasks

+<% content_for :page_header do %> -<%= form_tag network_event_tasks_path, :method => :get, class: "form-horizontal" do %> -
-
- - - - <%= text_field_tag 'q', - params[:q], - class: 'form-control', - placeholder: 'Search for...', - autofocus: true %> -
-

- -
-
- <%= label_tag :status_filter_show_all, "Show all" %> - <%= radio_button_tag :status_filter, :show_all, !@status_filter.present? || @status_filter.eql?('show_all') %> - <%= label_tag :status_filter_uncompleted_only, "Uncompleted only" %> - <%= radio_button_tag :status_filter, :uncompleted_only, @status_filter.eql?('uncompleted_only') %> - <%= label_tag :status_filter_completed_only, "Completed only" %> - <%= radio_button_tag :status_filter, :completed_only, @status_filter.eql?('completed_only') %> + <%= form_tag network_event_tasks_path, :method => :get, class: "form-horizontal" do %> +
+
+ + + + <%= text_field_tag 'q', + params[:q], + class: 'form-control', + placeholder: 'Search for...', + autofocus: true %>
-
-
-
-
- <%= text_field_tag :start_date, @start_date, class: "form-control" %> - - - -
+

+ +
+
+ <%= label_tag :status_filter_show_all, "Show all" %> + <%= radio_button_tag :status_filter, :show_all, !@status_filter.present? || @status_filter.eql?('show_all') %> + <%= label_tag :status_filter_uncompleted_only, "Uncompleted only" %> + <%= radio_button_tag :status_filter, :uncompleted_only, @status_filter.eql?('uncompleted_only') %> + <%= label_tag :status_filter_completed_only, "Completed only" %> + <%= radio_button_tag :status_filter, :completed_only, @status_filter.eql?('completed_only') %>
-
-
- Through -
-
-
-
- <%= text_field_tag :end_date, @end_date, class: "form-control" %> - - - -
+
+
+
+
+ <%= text_field_tag :start_date, @start_date, class: "form-control" %> + + + +
+
+
+
+ Through +
+
+
+
+ <%= text_field_tag :end_date, @end_date, class: "form-control" %> + + + +
+
+
+
+
+ <%= select_tag :network_event_ids, + options_from_collection_for_select( + NetworkEvent.order(:name).all, + :id, + :name_with_date, + params[:network_event_ids] + ), + class: "select2 form-control", + multiple: true, + data: { placeholder: 'Filter by event' } %>
-
-
-
- <%= select_tag :network_event_ids, - options_from_collection_for_select( - NetworkEvent.order(:name).all, - :id, - :name_with_date, - params[:network_event_ids] - ), - class: "select2 form-control", - multiple: true, - data: { placeholder: 'Filter by event' } %>
-
-
-
- <%= select_tag :owner_ids, - options_from_collection_for_select( - User.order(:email).all, - :id, - :email, - params[:owner_ids] - ), - class: "select2 form-control", - multiple: true, - data: { placeholder: 'Filter by task owner' } %> +
+
+ <%= select_tag :owner_ids, + options_from_collection_for_select( + User.order(:email).all, + :id, + :email, + params[:owner_ids] + ), + class: "select2 form-control", + multiple: true, + data: { placeholder: 'Filter by task owner' } %> +
-
-
-
- <%= select_tag :common_task_ids, - options_from_collection_for_select( - CommonTask.order(:name).all, - :id, - :name, - params[:common_task_ids] - ), - class: "select2 form-control", - multiple: true, - data: { placeholder: 'Filter by common task' } %> +
+
+ <%= select_tag :common_task_ids, + options_from_collection_for_select( + CommonTask.order(:name).all, + :id, + :name, + params[:common_task_ids] + ), + class: "select2 form-control", + multiple: true, + data: { placeholder: 'Filter by common task' } %> +
+
+
+
+ <%= submit_tag "Filter tasks", class: "btn btn-secondary"%> +
-
-
- <%= submit_tag "Filter tasks", class: "btn btn-secondary"%> - -
-<% end %> + <% end %> -
+<% end %>
@@ -153,4 +152,4 @@
<%= paginate @network_event_tasks %> -
\ No newline at end of file +
diff --git a/app/views/network_event_tasks/update.html.erb b/app/views/network_event_tasks/update.html.erb index 84e8af9..deaebcc 100644 --- a/app/views/network_event_tasks/update.html.erb +++ b/app/views/network_event_tasks/update.html.erb @@ -1,4 +1 @@ -
-

NetworkEventTasks#update

-

Find me in app/views/network_event_tasks/update.html.erb

diff --git a/app/views/network_events/edit.html.erb b/app/views/network_events/edit.html.erb index e2b8942..96b0ee0 100644 --- a/app/views/network_events/edit.html.erb +++ b/app/views/network_events/edit.html.erb @@ -1,4 +1,4 @@ -
+<% content_for :page_header do %> <%= link_to network_events_path, class: 'btn btn-default' do %> Back @@ -7,7 +7,6 @@ Show <% end %> -

Editing event

-
+<% end %> <%= render 'form' %> diff --git a/app/views/network_events/index.html.erb b/app/views/network_events/index.html.erb index 2d32be5..6c047fb 100644 --- a/app/views/network_events/index.html.erb +++ b/app/views/network_events/index.html.erb @@ -1,154 +1,153 @@ -
+<% content_for :page_header do %> <%= link_to new_network_event_path, class: 'btn btn-primary' do %> New Event <% end %> -

Listing events

-<%= form_tag network_events_path, :method => :get, class: "form-horizontal" do %> -
-
-
- <%= check_box_tag "unscheduled_events_only",nil,@unscheduled_only %> - <%= label_tag "Unscheduled Events Only" %> -
-
-
-
-
- - - - -
+ <%= form_tag network_events_path, :method => :get, class: "form-horizontal" do %> +
+
+
+ <%= check_box_tag "unscheduled_events_only",nil,@unscheduled_only %> + <%= label_tag "Unscheduled Events Only" %>
-
-
- Through -
-
-
-
- - - - -
+
+
+
+
+ + + + +
+
+
+
+ Through +
+
+
+
+ + + + +
+
+
+
+
+ <%= select_tag :common_task_ids, + options_from_collection_for_select( + CommonTask.order(:name).all, + :id, + :name, + params[:common_task_ids] + ), + class: "select2 form-control", + multiple: true, + data: { placeholder: 'Filter by uncompleted tasks' } %>
-
-
-
- <%= select_tag :common_task_ids, - options_from_collection_for_select( - CommonTask.order(:name).all, - :id, - :name, - params[:common_task_ids] - ), - class: "select2 form-control", - multiple: true, - data: { placeholder: 'Filter by uncompleted tasks' } %>
-
-
-
- <%= select_tag :program_ids, - options_from_collection_for_select( - Program.order(:name).all, - :id, - :name, - params[:program_ids] - ), - class: "select2 form-control", - multiple: true, - data: { placeholder: 'Filter by program' } %> +
+
+ <%= select_tag :program_ids, + options_from_collection_for_select( + Program.order(:name).all, + :id, + :name, + params[:program_ids] + ), + class: "select2 form-control", + multiple: true, + data: { placeholder: 'Filter by program' } %> +
-
-
-
- <%= select_tag :school_ids, - options_from_collection_for_select( - School.order(:name).all, - :id, - :name, - params[:school_ids] - ), - class: "select2 form-control", - multiple: true, - data: { placeholder: 'Filter by school' } %> +
+
+ <%= select_tag :school_ids, + options_from_collection_for_select( + School.order(:name).all, + :id, + :name, + params[:school_ids] + ), + class: "select2 form-control", + multiple: true, + data: { placeholder: 'Filter by school' } %> +
-
-
-
- <%= select_tag :organization_ids, - options_from_collection_for_select( - Organization.order(:name).all, - :id, - :name, - params[:organization_ids] - ), - class: "select2 form-control", - multiple: true, - data: { placeholder: 'Filter by organization' } %> +
+
+ <%= select_tag :organization_ids, + options_from_collection_for_select( + Organization.order(:name).all, + :id, + :name, + params[:organization_ids] + ), + class: "select2 form-control", + multiple: true, + data: { placeholder: 'Filter by organization' } %> +
-
-
-
- <%= select_tag :cohort_ids, - options_from_collection_for_select( - Cohort.order(:name).all, - :id, - :name, - params[:cohort_ids] - ), - class: "select2 form-control", - multiple: true, - data: { placeholder: 'Filter by cohort' } %> +
+
+ <%= select_tag :cohort_ids, + options_from_collection_for_select( + Cohort.order(:name).all, + :id, + :name, + params[:cohort_ids] + ), + class: "select2 form-control", + multiple: true, + data: { placeholder: 'Filter by cohort' } %> +
-
-
-
- <%= select_tag :graduating_class_ids, - options_from_collection_for_select( - GraduatingClass.order(:year).all, - :id, - :name, - params[:graduating_class_ids] - ), - class: "select2 form-control", - multiple: true, - data: { placeholder: 'Filter by graduating class' } %> +
+
+ <%= select_tag :graduating_class_ids, + options_from_collection_for_select( + GraduatingClass.order(:year).all, + :id, + :name, + params[:graduating_class_ids] + ), + class: "select2 form-control", + multiple: true, + data: { placeholder: 'Filter by graduating class' } %> +
-
-
-
- <%= submit_tag "Filter events", class: "btn btn-secondary"%> +
+
+ <%= submit_tag "Filter events", class: "btn btn-secondary"%> +
-
- + + <% end %> <% end %> -
<%= form_tag(new_network_event_path, method: "get") do %>
@@ -196,4 +195,4 @@ Download <% end %> - <% end %> \ No newline at end of file + <% end %> diff --git a/app/views/network_events/new.html.erb b/app/views/network_events/new.html.erb index 07f1c73..874e34f 100644 --- a/app/views/network_events/new.html.erb +++ b/app/views/network_events/new.html.erb @@ -1,14 +1,14 @@ -
+<% content_for :page_header do %> <%= link_to network_events_path, class: 'btn btn-default' do %> Back <% end %> - <% if copy_network_events? %> -

Copy event(s)

- <% else %> -

New event

- <% end %> -
+ <% if copy_network_events? + content_for :title, "Copy Event(s)" + else + content_for :title, "New Event" + end %> +<% end %> <% if flash[:alert] %>
diff --git a/app/views/organizations/new.html.erb b/app/views/organizations/new.html.erb index 183e242..242b6d6 100644 --- a/app/views/organizations/new.html.erb +++ b/app/views/organizations/new.html.erb @@ -1,9 +1,8 @@ -
+<% content_for :page_header do %> <%= link_to organizations_path, class: 'btn btn-default' do %> Back <% end %> -

New organization

-
+<% end %> <%= render 'form' %> diff --git a/app/views/organizations/show.html.erb b/app/views/organizations/show.html.erb index af39e98..61d58d2 100644 --- a/app/views/organizations/show.html.erb +++ b/app/views/organizations/show.html.erb @@ -1,4 +1,4 @@ -
+<% content_for :page_header do %> <%= link_to organizations_path, class: 'btn btn-default' do %> Back @@ -7,8 +7,7 @@ Edit <% end %> -

Show organization

-
+<% end %>
Name:
diff --git a/app/views/programs/edit.html.erb b/app/views/programs/edit.html.erb index 8ec7372..dbb43f2 100644 --- a/app/views/programs/edit.html.erb +++ b/app/views/programs/edit.html.erb @@ -1,4 +1,4 @@ -
+<% content_for :page_header do %> <%= link_to programs_path, class: 'btn btn-default' do %> Back @@ -7,7 +7,6 @@ Show <% end %> -

Editing program

-
+<% end %> <%= render 'form' %> diff --git a/app/views/programs/index.html.erb b/app/views/programs/index.html.erb index 718b7a3..6f9a8a3 100644 --- a/app/views/programs/index.html.erb +++ b/app/views/programs/index.html.erb @@ -1,10 +1,9 @@ -
+<% content_for :page_header do %> <%= link_to new_program_path, class: 'btn btn-primary' do %> New Program <% end %> -

Listing programs

-
+<% end %>
diff --git a/app/views/programs/new.html.erb b/app/views/programs/new.html.erb index 90f1578..e9368eb 100644 --- a/app/views/programs/new.html.erb +++ b/app/views/programs/new.html.erb @@ -1,9 +1,8 @@ -
+<% content_for :page_header do %> <%= link_to programs_path, class: 'btn btn-default' do %> Back <% end %> -

New program

-
+<% end %> <%= render 'form' %> diff --git a/app/views/programs/show.html.erb b/app/views/programs/show.html.erb index 8466754..b8d1ef8 100644 --- a/app/views/programs/show.html.erb +++ b/app/views/programs/show.html.erb @@ -1,4 +1,4 @@ -
+<% content_for :page_header do %> <%= link_to programs_path, class: 'btn btn-default' do %> Back @@ -7,8 +7,7 @@ Edit <% end %> -

Show program

-
+<% end %>
Name:
diff --git a/app/views/schools/edit.html.erb b/app/views/schools/edit.html.erb index 9bf2582..51d8278 100644 --- a/app/views/schools/edit.html.erb +++ b/app/views/schools/edit.html.erb @@ -1,4 +1,4 @@ -
+<% content_for :page_header do %> <%= link_to schools_path, class: 'btn btn-default' do %> Back @@ -7,7 +7,6 @@ Show <% end %> -

Editing school

-
+<% end %> <%= render 'form' %> diff --git a/app/views/schools/index.html.erb b/app/views/schools/index.html.erb index feac34d..1b9f70f 100644 --- a/app/views/schools/index.html.erb +++ b/app/views/schools/index.html.erb @@ -1,10 +1,9 @@ -
+<% content_for :page_header do %> <%= link_to new_school_path, class: 'btn btn-primary' do %> New School <% end %> -

Listing schools

-
+<% end %>
diff --git a/app/views/schools/new.html.erb b/app/views/schools/new.html.erb index 4cc11da..45f4b41 100644 --- a/app/views/schools/new.html.erb +++ b/app/views/schools/new.html.erb @@ -1,9 +1,8 @@ -
+<% content_for :page_header do %> <%= link_to schools_path, class: 'btn btn-default' do %> Back <% end %> -

New school

-
+<% end %> <%= render 'form' %> diff --git a/app/views/schools/show.html.erb b/app/views/schools/show.html.erb index 46add71..34438ea 100644 --- a/app/views/schools/show.html.erb +++ b/app/views/schools/show.html.erb @@ -1,4 +1,4 @@ -
+<% content_for :page_header do %> <%= link_to schools_path, class: 'btn btn-default' do %> Back @@ -7,8 +7,7 @@ Edit <% end %> -

Show school

-
+<% end %>
Name:
diff --git a/app/views/sign_ups/index.html.erb b/app/views/sign_ups/index.html.erb index 775daac..98e36c9 100644 --- a/app/views/sign_ups/index.html.erb +++ b/app/views/sign_ups/index.html.erb @@ -1,10 +1,9 @@ -
+<% content_for :page_header do %> <%= link_to new_network_event_path, class: 'btn btn-primary' do %> New Event <% end %> -

Listing events

-
+<% end %>
@@ -33,4 +32,4 @@ <% end %>
-
\ No newline at end of file +
diff --git a/app/views/sign_ups/new.html.erb b/app/views/sign_ups/new.html.erb index 75e7a30..ac04a3d 100644 --- a/app/views/sign_ups/new.html.erb +++ b/app/views/sign_ups/new.html.erb @@ -1,6 +1,4 @@ -
-

Member Sign Up

-

<%= @network_event.name %>

+<% content_for :page_header do %>
<%= select_tag :member_ids, options_from_collection_for_select([], :id, :text), @@ -8,7 +6,9 @@ multiple: false, data: { ajax: { url: members_path }, placeholder: 'Find Member' } %>
-
+ <%= content_for :title, t(".title", name: @network_event.name) %> +<% end %> +
<%= render 'create' %>
diff --git a/app/views/talents/edit.html.erb b/app/views/talents/edit.html.erb index 0e2f8ed..38a5ac8 100644 --- a/app/views/talents/edit.html.erb +++ b/app/views/talents/edit.html.erb @@ -1,4 +1,4 @@ -
+<% content_for :page_header do %> <%= link_to talents_path, class: 'btn btn-default' do %> Back @@ -7,7 +7,6 @@ Show <% end %> -

Editing talent

-
+<% end %> <%= render 'form' %> diff --git a/app/views/talents/index.html.erb b/app/views/talents/index.html.erb index f9e0469..7e00d65 100644 --- a/app/views/talents/index.html.erb +++ b/app/views/talents/index.html.erb @@ -1,10 +1,9 @@ -
+<% content_for :page_header do %> <%= link_to new_talent_path, class: 'btn btn-primary' do %> New Talent <% end %> -

Listing talents

-
+<% end %>
diff --git a/app/views/talents/new.html.erb b/app/views/talents/new.html.erb index 60026e1..fb142a6 100644 --- a/app/views/talents/new.html.erb +++ b/app/views/talents/new.html.erb @@ -1,9 +1,8 @@ -
+<% content_for :page_header do %> <%= link_to talents_path, class: 'btn btn-default' do %> Back <% end %> -

New talent

-
+<% end %> <%= render 'form' %> diff --git a/app/views/talents/show.html.erb b/app/views/talents/show.html.erb index 4158d5c..f817f9f 100644 --- a/app/views/talents/show.html.erb +++ b/app/views/talents/show.html.erb @@ -1,4 +1,4 @@ -
+<% content_for :page_header do %> <%= link_to talents_path, class: 'btn btn-default' do %> Back @@ -7,8 +7,7 @@ Edit <% end %> -

Show talent

-
+<% end %>
Name:
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index 0bb09a5..80a2b2a 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -1,4 +1,4 @@ -
+<% content_for :page_header do %> <%= link_to users_path, class: 'btn btn-default' do %> Back @@ -7,7 +7,6 @@ Show <% end %> -

Editing user

-
+<% end %> -<%= render 'form' %> \ No newline at end of file +<%= render 'form' %> diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 61ba079..9ed7408 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -1,7 +1,3 @@ -
-

Listing users

-
-
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 2c7949d..7c030f2 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,10 +1,9 @@ -
+<% content_for :page_header do %> <%= link_to users_path, class: 'btn btn-default' do %> Back <% end %> -

Show user

-
+<% end %>
Email:
diff --git a/config/locales/en.yml b/config/locales/en.yml index 4364905..aabe03e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -23,3 +23,153 @@ en: organizations: index: title: "Listing Organization" + edit: + title: "Editing Organization" + new: + title: "New Organization" + show: + title: "Show Organization" + check_ins: + index: + title: "Listing Events" + new: + title: "Member Check In" + cohorts: + edit: + title: "Editing Cohort" + index: + title: "Listing Cohorts" + new: + title: "New Cohort" + show: + title: "Show Cohort" + communications: + edit: + title: "Editing Communication" + index: + title: "Listing Communications" + new: + title: "New Communication with %{name}" + show: + title: "Show Communication" + extracurricular_activities: + edit: + title: "Editing Extracurricular Activity" + index: + title: "Listing Extracurricular Activities" + new: + title: "New Extracurricular Activity" + show: + title: "Show Extracurricular Activity" + graduating_classes: + edit: + title: "Editing Graduating Class" + index: + title: "Listing Graduating Classes" + show: + title: "Show Graduating Class" + identities: + edit: + title: "Editing Identity" + index: + title: "Listing Identities" + new: + title: "New Identity" + show: + title: "Show Identity" + locations: + edit: + title: "Editing Location" + index: + title: "Listing Locations" + edit: + title: "Editing Member" + new: + title: "New Location" + show: + title: "Show location" + common_tasks: + edit: + title: "Editing Common Task" + index: + title: "Listing Common Tasks" + new: + title: "New Common Task" + show: + title: "Show Common Tasks" + members: + index: + title: "Listing Members" + new: + title: "New member" + show: + title: "Show Member" + neighborhoods: + edit: + title: "Editing Neighborhood" + index: + title: "Listing Neighborhoods" + new: + title: "New Neighborhood" + show: + title: "Show Neighborhood" + network_actions: + edit: + title: "Editing Action" + index: + title: "Listing Actions" + new: + title: "New Action" + show: + title: "Show Action" + network_events: + edit: + title: "Editing Event" + index: + title: "Listing Events" + show: + title: "Show Event" + programs: + edit: + title: "Editing Program" + index: + title: "Listing Programs" + new: + title: "New Program" + show: + title: "Show Program" + schools: + edit: + title: "Editing School" + index: + title: "Listing Schools" + new: + title: "New School" + show: + title: "Show School" + network_event_tasks: + index: + title: "Listing Event Tasks" + update: + title: "NetworkEventTasks#update" + users: + edit: + title: "Editing User" + index: + title: "Listing Users" + show: + title: "Show User" + sign_ups: + index: + title: "Listing Events" + new: + title: "%{name}: Member Sign Up" + talents: + edit: + title: "Editing Talent" + index: + title: "Listing Talents" + new: + title: "New Talent" + show: + title: "Show Talent"