diff --git a/public/index.html b/public/index.html index 851d5781..86d8a5aa 100644 --- a/public/index.html +++ b/public/index.html @@ -75,7 +75,8 @@ id: 10, name: 'Connor', email: 'co@co.com', - admin: false + admin: false, + image: 'https://metamaps-live.s3.amazonaws.com/users/images/555/629/996/sixtyfour/11835c3.png?1417298429' } } } diff --git a/views/doorkeeper/applications/_delete_form.html.erb b/views/doorkeeper/applications/_delete_form.html.erb index 69912ec3..adcd5df6 100644 --- a/views/doorkeeper/applications/_delete_form.html.erb +++ b/views/doorkeeper/applications/_delete_form.html.erb @@ -1,5 +1,5 @@ -<%- submit_btn_css ||= 'button red-button' %> -<%= form_tag oauth_application_path(application) do %> +{- submit_btn_css ||= 'button red-button' } +{ form_tag oauth_application_path(application) do } - <%= submit_tag t('doorkeeper.applications.buttons.destroy'), onclick: "return confirm('#{ t('doorkeeper.applications.confirmations.destroy') }')", class: submit_btn_css %> -<% end %> + { submit_tag t('doorkeeper.applications.buttons.destroy'), onclick: "return confirm('#{ t('doorkeeper.applications.confirmations.destroy') }')", class: submit_btn_css } +{ end } diff --git a/views/doorkeeper/applications/_form.html.erb b/views/doorkeeper/applications/_form.html.erb index 7810805d..7a6654bd 100644 --- a/views/doorkeeper/applications/_form.html.erb +++ b/views/doorkeeper/applications/_form.html.erb @@ -1,36 +1,36 @@ -<%= form_for application, url: doorkeeper_submit_path(application), html: {class: 'form-horizontal', role: 'form'} do |f| %> - <% if application.errors.any? %> -

<%= t('doorkeeper.applications.form.error') %>

- <% end %> +{ form_for application, url: doorkeeper_submit_path(application), html: {class: 'form-horizontal', role: 'form'} do |f| } + { if application.errors.any? } +

{ t('doorkeeper.applications.form.error') }

+ { end } - <%= content_tag :div, class: "form-group#{' has-error' if application.errors[:name].present?}" do %> - <%= f.label :name, class: 'col-sm-2 control-label' %> + { content_tag :div, class: "form-group#{' has-error' if application.errors[:name].present?}" do } + { f.label :name, class: 'col-sm-2 control-label' }
- <%= f.text_field :name, class: 'form-control' %> - <%= doorkeeper_errors_for application, :name %> + { f.text_field :name, class: 'form-control' } + { doorkeeper_errors_for application, :name }
- <% end %> + { end } - <%= content_tag :div, class: "form-group#{' has-error' if application.errors[:redirect_uri].present?}" do %> - <%= f.label :redirect_uri, class: 'col-sm-2 control-label' %> + { content_tag :div, class: "form-group#{' has-error' if application.errors[:redirect_uri].present?}" do } + { f.label :redirect_uri, class: 'col-sm-2 control-label' }
- <%= f.text_area :redirect_uri, class: 'form-control' %> - <%= doorkeeper_errors_for application, :redirect_uri %> + { f.text_area :redirect_uri, class: 'form-control' } + { doorkeeper_errors_for application, :redirect_uri } - <%= t('doorkeeper.applications.help.redirect_uri') %>. + { t('doorkeeper.applications.help.redirect_uri') }. - <% if Doorkeeper.configuration.native_redirect_uri %> + { if Doorkeeper.configuration.native_redirect_uri } - <%= raw t('doorkeeper.applications.help.native_redirect_uri', native_redirect_uri: "#{ Doorkeeper.configuration.native_redirect_uri }") %> + { raw t('doorkeeper.applications.help.native_redirect_uri', native_redirect_uri: "#{ Doorkeeper.configuration.native_redirect_uri }") } - <% end %> + { end }
- <% end %> + { end }
- <%= f.submit t('doorkeeper.applications.buttons.submit'), class: "btn btn-primary" %> - <%= link_to t('doorkeeper.applications.buttons.cancel'), oauth_applications_path, :class => "button link-button red-button" %> + { f.submit t('doorkeeper.applications.buttons.submit'), class: "btn btn-primary" } + { link_to t('doorkeeper.applications.buttons.cancel'), oauth_applications_path, :class => "button link-button red-button" }
-<% end %> +{ end } diff --git a/views/doorkeeper/applications/edit.html.erb b/views/doorkeeper/applications/edit.html.erb index 8f92c3a3..0830d612 100644 --- a/views/doorkeeper/applications/edit.html.erb +++ b/views/doorkeeper/applications/edit.html.erb @@ -1,10 +1,10 @@
-

<%= t('.title') %>

+

{ t('.title') }

- <%= render 'form', application: @application %> + { render 'form', application: @application }
-<%= render 'script' %> +{ render 'script' } diff --git a/views/doorkeeper/applications/index.html.erb b/views/doorkeeper/applications/index.html.erb index 25a94572..33e96aee 100644 --- a/views/doorkeeper/applications/index.html.erb +++ b/views/doorkeeper/applications/index.html.erb @@ -1,28 +1,28 @@
-

<%= t('.title') %>

+

{ t('.title') }

- - + + - <% @applications.each do |application| %> - - - - + { @applications.each do |application| } + + + + - <% end %> + { end }
<%= t('.name') %><%= t('.callback_url') %>{ t('.name') }{ t('.callback_url') }
<%= link_to application.name, oauth_application_path(application) %><%= application.redirect_uri %><%= render 'delete_form', application: application %>
{ link_to application.name, oauth_application_path(application) }{ application.redirect_uri }{ render 'delete_form', application: application }
-<%= link_to t('.new'), new_oauth_application_path, class: 'button link-button' %> +{ link_to t('.new'), new_oauth_application_path, class: 'button link-button' }
-<%= render 'script' %> +{ render 'script' } diff --git a/views/doorkeeper/applications/new.html.erb b/views/doorkeeper/applications/new.html.erb index 698dc25e..75c6f983 100644 --- a/views/doorkeeper/applications/new.html.erb +++ b/views/doorkeeper/applications/new.html.erb @@ -1,11 +1,11 @@
-<%= link_to t('doorkeeper.applications.buttons.back'), oauth_applications_path(), class: 'button link-button button-margin' %> +{ link_to t('doorkeeper.applications.buttons.back'), oauth_applications_path(), class: 'button link-button button-margin' }
-

<%= t('.title') %>

+

{ t('.title') }

-<%= render 'form', application: @application %> +{ render 'form', application: @application }
-<%= render 'script' %> +{ render 'script' } diff --git a/views/doorkeeper/applications/show.html.erb b/views/doorkeeper/applications/show.html.erb index 3030960c..1ffc98c9 100644 --- a/views/doorkeeper/applications/show.html.erb +++ b/views/doorkeeper/applications/show.html.erb @@ -1,37 +1,37 @@
- <%= link_to t('doorkeeper.applications.buttons.back'), oauth_applications_path(), class: 'button link-button button-margin' %> + { link_to t('doorkeeper.applications.buttons.back'), oauth_applications_path(), class: 'button link-button button-margin' }
-

<%= t('.title', name: @application.name) %>

+

{ t('.title', name: @application.name) }

-

<%= t('.application_id') %>:

-

<%= @application.uid %>

+

{ t('.application_id') }:

+

{ @application.uid }

-

<%= t('.secret') %>:

-

<%= @application.secret %>

+

{ t('.secret') }:

+

{ @application.secret }

-

<%= t('.callback_urls') %>:

+

{ t('.callback_urls') }:

- <% @application.redirect_uri.split.each do |uri| %> + { @application.redirect_uri.split.each do |uri| } - <% end %> + { end }
- <%= uri %> + { uri } - <%= link_to t('doorkeeper.applications.buttons.authorize'), oauth_authorization_path(client_id: @application.uid, redirect_uri: uri, response_type: 'code'), class: 'button link-button', target: '_blank' %> + { link_to t('doorkeeper.applications.buttons.authorize'), oauth_authorization_path(client_id: @application.uid, redirect_uri: uri, response_type: 'code'), class: 'button link-button', target: '_blank' }
-
<%= link_to t('doorkeeper.applications.buttons.edit'), edit_oauth_application_path(@application), class: 'button link-button' %>
+
{ link_to t('doorkeeper.applications.buttons.edit'), edit_oauth_application_path(@application), class: 'button link-button' }
-
<%= render 'delete_form', application: @application, submit_btn_css: 'button red-button' %>
+
{ render 'delete_form', application: @application, submit_btn_css: 'button red-button' }
-<%= render 'script' %> +{ render 'script' } diff --git a/views/doorkeeper/authorizations/error.html.erb b/views/doorkeeper/authorizations/error.html.erb index 4d778e29..d43e63f7 100644 --- a/views/doorkeeper/authorizations/error.html.erb +++ b/views/doorkeeper/authorizations/error.html.erb @@ -1,11 +1,11 @@
-

<%= t('doorkeeper.authorizations.error.title') %>

+

{ t('doorkeeper.authorizations.error.title') }

-
<%= @pre_auth.error_response.body[:error_description] %>
+
{ @pre_auth.error_response.body[:error_description] }
diff --git a/views/doorkeeper/authorizations/new.html.erb b/views/doorkeeper/authorizations/new.html.erb index 52b2f6a4..974ee08a 100644 --- a/views/doorkeeper/authorizations/new.html.erb +++ b/views/doorkeeper/authorizations/new.html.erb @@ -1,46 +1,46 @@

- <%= raw t('.prompt', client_name: "#{ @pre_auth.client.name }") %> + { raw t('.prompt', client_name: "#{ @pre_auth.client.name }") }

- <% if @pre_auth.scopes.count > 0 %> + { if @pre_auth.scopes.count > 0 }
-

<%= t('.able_to') %>:

+

{ t('.able_to') }:

    - <% @pre_auth.scopes.each do |scope| %> -
  • <%= t scope, scope: [:doorkeeper, :scopes] %>
    • - <% end %> + { @pre_auth.scopes.each do |scope| } +
  • { t scope, scope: [:doorkeeper, :scopes] }
    • + { end }
- <% end %> + { end }
- <%= form_tag oauth_authorization_path, method: :post do %> - <%= hidden_field_tag :client_id, @pre_auth.client.uid %> - <%= hidden_field_tag :redirect_uri, @pre_auth.redirect_uri %> - <%= hidden_field_tag :state, @pre_auth.state %> - <%= hidden_field_tag :response_type, @pre_auth.response_type %> - <%= hidden_field_tag :scope, @pre_auth.scope %> - <%= submit_tag t('doorkeeper.authorizations.buttons.authorize'), class: "button" %> - <% end %> + { form_tag oauth_authorization_path, method: :post do } + { hidden_field_tag :client_id, @pre_auth.client.uid } + { hidden_field_tag :redirect_uri, @pre_auth.redirect_uri } + { hidden_field_tag :state, @pre_auth.state } + { hidden_field_tag :response_type, @pre_auth.response_type } + { hidden_field_tag :scope, @pre_auth.scope } + { submit_tag t('doorkeeper.authorizations.buttons.authorize'), class: "button" } + { end }
- <%= form_tag oauth_authorization_path, method: :delete do %> - <%= hidden_field_tag :client_id, @pre_auth.client.uid %> - <%= hidden_field_tag :redirect_uri, @pre_auth.redirect_uri %> - <%= hidden_field_tag :state, @pre_auth.state %> - <%= hidden_field_tag :response_type, @pre_auth.response_type %> - <%= hidden_field_tag :scope, @pre_auth.scope %> - <%= submit_tag t('doorkeeper.authorizations.buttons.deny'), class: "button red-button" %> - <% end %> + { form_tag oauth_authorization_path, method: :delete do } + { hidden_field_tag :client_id, @pre_auth.client.uid } + { hidden_field_tag :redirect_uri, @pre_auth.redirect_uri } + { hidden_field_tag :state, @pre_auth.state } + { hidden_field_tag :response_type, @pre_auth.response_type } + { hidden_field_tag :scope, @pre_auth.scope } + { submit_tag t('doorkeeper.authorizations.buttons.deny'), class: "button red-button" } + { end }
diff --git a/views/doorkeeper/authorizations/show.html.erb b/views/doorkeeper/authorizations/show.html.erb index 4079ed56..4c4799ba 100644 --- a/views/doorkeeper/authorizations/show.html.erb +++ b/views/doorkeeper/authorizations/show.html.erb @@ -1,11 +1,11 @@
-

<%= t('.title') %>

+

{ t('.title') }

- <%= params[:code] %> + { params[:code] }
diff --git a/views/doorkeeper/authorized_applications/_delete_form.html.erb b/views/doorkeeper/authorized_applications/_delete_form.html.erb index 27ea3d73..a184ad99 100644 --- a/views/doorkeeper/authorized_applications/_delete_form.html.erb +++ b/views/doorkeeper/authorized_applications/_delete_form.html.erb @@ -1,5 +1,5 @@ -<%- submit_btn_css ||= 'button red-button' %> -<%= form_tag oauth_authorized_application_path(application) do %> +{- submit_btn_css ||= 'button red-button' } +{ form_tag oauth_authorized_application_path(application) do } - <%= submit_tag t('doorkeeper.authorized_applications.buttons.revoke'), onclick: "return confirm('#{ t('doorkeeper.authorized_applications.confirmations.revoke') }')", class: submit_btn_css %> -<% end %> + { submit_tag t('doorkeeper.authorized_applications.buttons.revoke'), onclick: "return confirm('#{ t('doorkeeper.authorized_applications.confirmations.revoke') }')", class: submit_btn_css } +{ end } diff --git a/views/doorkeeper/authorized_applications/index.html.erb b/views/doorkeeper/authorized_applications/index.html.erb index 42c3127d..8f46be21 100644 --- a/views/doorkeeper/authorized_applications/index.html.erb +++ b/views/doorkeeper/authorized_applications/index.html.erb @@ -1,7 +1,7 @@
-

<%= t('doorkeeper.authorized_applications.index.title') %>

+

{ t('doorkeeper.authorized_applications.index.title') }

@@ -10,28 +10,28 @@ There are a number of apps being worked on for Metamaps currently, including the playful Metamapper Slack Bot. Check back here for updates.
If you're a developer interested in building an app for Metamaps, check out the API docs.

- <% if @applications.count > 0 %> + { if @applications.count > 0 } - - + + - <% @applications.each do |application| %> + { @applications.each do |application| } - - - + + + - <% end %> + { end }
<%= t('doorkeeper.authorized_applications.index.application') %><%= t('doorkeeper.authorized_applications.index.created_at') %>{ t('doorkeeper.authorized_applications.index.application') }{ t('doorkeeper.authorized_applications.index.created_at') }
<%= application.name %><%= application.created_at.strftime(t('doorkeeper.authorized_applications.index.date_format')) %><%= render 'delete_form', application: application %>{ application.name }{ application.created_at.strftime(t('doorkeeper.authorized_applications.index.date_format')) }{ render 'delete_form', application: application }
- <% end %> + { end }
-<%= render 'script' %> +{ render 'script' } diff --git a/views/explore/active.html.erb b/views/explore/active.html.erb index e6e2a3a6..843b1c40 100644 --- a/views/explore/active.html.erb +++ b/views/explore/active.html.erb @@ -1,15 +1,15 @@ -<% # +{ # # @file # Shows a list of recently active maps # GET /explore/active(.:format) - # %> + # } diff --git a/views/explore/featured.html.erb b/views/explore/featured.html.erb index 9396ebdc..34c8cf93 100644 --- a/views/explore/featured.html.erb +++ b/views/explore/featured.html.erb @@ -1,15 +1,15 @@ -<% # +{ # # @file # Shows a list of featured maps # GET /explore/featured(.:format) - # %> + # } diff --git a/views/explore/mapper.html.erb b/views/explore/mapper.html.erb index 9a24bda0..3f792e20 100644 --- a/views/explore/mapper.html.erb +++ b/views/explore/mapper.html.erb @@ -1,18 +1,18 @@ -<% # +{ # # @file # Shows a list of a user's maps # GET /explore/mapper/:id(.:format) - # %> + # } diff --git a/views/explore/mine.html.erb b/views/explore/mine.html.erb index 21295d4f..f38bb518 100644 --- a/views/explore/mine.html.erb +++ b/views/explore/mine.html.erb @@ -1,15 +1,15 @@ -<% # +{ # # @file # Shows a list of current user's maps # GET /explore/mine(.:format) - # %> + # } diff --git a/views/explore/shared.html.erb b/views/explore/shared.html.erb index f40e9fdf..1eb2fdec 100644 --- a/views/explore/shared.html.erb +++ b/views/explore/shared.html.erb @@ -1,15 +1,15 @@ -<% # +{ # # @file # Shows a list of current user's maps # GET /explore/mine(.:format) - # %> + # } diff --git a/views/explore/starred.html.erb b/views/explore/starred.html.erb index 125c3e76..c2e8ac47 100644 --- a/views/explore/starred.html.erb +++ b/views/explore/starred.html.erb @@ -1,15 +1,15 @@ -<% # +{ # # @file # Shows a list of current user's starred maps # GET /explore/starred(.:format) - # %> + # } diff --git a/views/layouts/_foot.html.erb b/views/layouts/_foot.html.erb index bc3d4223..696f1460 100644 --- a/views/layouts/_foot.html.erb +++ b/views/layouts/_foot.html.erb @@ -1,21 +1,21 @@
-<%= render :partial => 'layouts/lightboxes' %> -<%= render :partial => 'layouts/templates' %> -<%= render :partial => 'shared/metacodeCssColors' %> -<%= render :partial => 'layouts/googleanalytics' if ENV["GA_TRACKING_CODE"].present? %> +{ render :partial => 'layouts/lightboxes' } +{ render :partial => 'layouts/templates' } +{ render :partial => 'shared/metacodeCssColors' } +{ render :partial => 'layouts/googleanalytics' if ENV["GA_TRACKING_CODE"].present? } diff --git a/views/layouts/_googleanalytics.html.erb b/views/layouts/_googleanalytics.html.erb index 493e6288..bd98400f 100644 --- a/views/layouts/_googleanalytics.html.erb +++ b/views/layouts/_googleanalytics.html.erb @@ -1,7 +1,7 @@ -<%# +{# # @file # Google analytics, rendered on every page - #%> + #} diff --git a/views/layouts/_head.html.erb b/views/layouts/_head.html.erb index f2fd8ef7..0aa30d36 100644 --- a/views/layouts/_head.html.erb +++ b/views/layouts/_head.html.erb @@ -12,31 +12,31 @@ - <%= yield(:title) %> - <%= csrf_meta_tags %> + { yield(:title) } + { csrf_meta_tags } - <% if controller.class.name == 'MapsController' && @map %> - + { if controller.class.name == 'MapsController' && @map } + - - - + + + - - - - - <% end %> + + + + + { end } - <% if controller_name == 'maps' && action_name == "conversation" %> - <%= stylesheet_link_tag "application", :media => "all" %> - <%= stylesheet_link_tag "application-secret", :media => "all" %> - <%= javascript_include_tag "application-secret" %> - <% else %> - <%= stylesheet_link_tag "application", :media => "all" %> - <%= javascript_include_tag "application" %> - <% end %> + { if controller_name == 'maps' && action_name == "conversation" } + { stylesheet_link_tag "application", :media => "all" } + { stylesheet_link_tag "application-secret", :media => "all" } + { javascript_include_tag "application-secret" } + { else } + { stylesheet_link_tag "application", :media => "all" } + { javascript_include_tag "application" } + { end } diff --git a/views/layouts/_lightboxes.html.erb b/views/layouts/_lightboxes.html.erb index 2b4f51cf..8d01b03d 100644 --- a/views/layouts/_lightboxes.html.erb +++ b/views/layouts/_lightboxes.html.erb @@ -1,7 +1,7 @@ -<%# +{# # @file # The inner HTML of the account box that comes up in the bottom left - #%> + #}
- <%= render :partial => 'shared/cheatsheet' %> + { render :partial => 'shared/cheatsheet' }
- <% if current_user %> + { if current_user }

SHARE INVITE

@@ -95,20 +95,20 @@

As a valued beta tester, you have the ability to invite your peers, colleagues and collaborators onto the platform.

Below is a personal invite link containing your unique access code, which can be used multiple times.

-

<%= invite_link() %> - +

{ invite_link() } +

- <%= render :partial => 'shared/forkmap' %> + { render :partial => 'shared/forkmap' }
- <%= render :partial => 'shared/switchmetacodes' %> + { render :partial => 'shared/switchmetacodes' }
- <% end %> + { end }
diff --git a/views/layouts/_templates.html.erb b/views/layouts/_templates.html.erb index dd0b8c7c..22f306e4 100644 --- a/views/layouts/_templates.html.erb +++ b/views/layouts/_templates.html.erb @@ -1,7 +1,7 @@ -<%# +{# # @file # templates for the upper right autocomplete results - #%> + #}
-<% end %> +{ end } diff --git a/views/maps/show.html.erb b/views/maps/show.html.erb index 51d68a7a..b6b909c5 100644 --- a/views/maps/show.html.erb +++ b/views/maps/show.html.erb @@ -1,23 +1,23 @@ -<%# +{# # @file # Code to display a map # /maps/:id -#%> +#} -<% content_for :title, @map.name + " | Metamaps" %> -<% content_for :mobile_title, @map.name %> +{ content_for :title, @map.name + " | Metamaps" } +{ content_for :mobile_title, @map.name } diff --git a/views/metacode_sets/_form.html.erb b/views/metacode_sets/_form.html.erb index f209eece..bd3f75db 100644 --- a/views/metacode_sets/_form.html.erb +++ b/views/metacode_sets/_form.html.erb @@ -1,24 +1,24 @@ -<%= form_for(@metacode_set) do |f| %> - <% if @metacode_set.errors.any? %> +{ form_for(@metacode_set) do |f| } + { if @metacode_set.errors.any? }
-

<%= pluralize(@metacode_set.errors.count, "error") %> prohibited this metacode set from being saved:

+

{ pluralize(@metacode_set.errors.count, "error") } prohibited this metacode set from being saved:

- <% end %> + { end }
- <%= f.label :name %> - <%= f.text_field :name %> + { f.label :name } + { f.text_field :name }
- <%= f.label :desc, "Description" %> - <%= f.text_area :desc, :cols => "40", :rows => "4" %> + { f.label :desc, "Description" } + { f.text_area :desc, :cols => "40", :rows => "4" }
@@ -32,58 +32,58 @@
- <%= hidden_field(:metacodes, :value, {:value => 0}) %> + { hidden_field(:metacodes, :value, {:value => 0}) }
- <%= link_to 'Cancel', metacode_sets_path, - { :class => 'button' } %> - <%= f.submit :class => 'add', :onclick => "return Metamaps.Admin.validate();" %> + { link_to 'Cancel', metacode_sets_path, + { :class => 'button' } } + { f.submit :class => 'add', :onclick => "return Metamaps.Admin.validate();" }
-<% end %> +{ end } diff --git a/views/metacode_sets/edit.html.erb b/views/metacode_sets/edit.html.erb index 017ab607..27a08bcb 100644 --- a/views/metacode_sets/edit.html.erb +++ b/views/metacode_sets/edit.html.erb @@ -1,14 +1,14 @@
- <%= render 'form' %> + { render 'form' }
diff --git a/views/metacode_sets/index.html.erb b/views/metacode_sets/index.html.erb index 68986895..b1185f94 100644 --- a/views/metacode_sets/index.html.erb +++ b/views/metacode_sets/index.html.erb @@ -8,29 +8,29 @@ Metacodes - <% @metacode_sets.each do |metacode_set| %> + { @metacode_sets.each do |metacode_set| } - <%= metacode_set.name %>
- <%= link_to 'Edit', - edit_metacode_set_path(metacode_set) %> + { metacode_set.name }
+ { link_to 'Edit', + edit_metacode_set_path(metacode_set) }
- <%= link_to 'Delete', + { link_to 'Delete', metacode_set, method: :delete, - data: { confirm: 'Are you sure?' } %> + data: { confirm: 'Are you sure?' } } - <%= metacode_set.desc %> + { metacode_set.desc } - <% metacode_set.metacodes.each_with_index do |metacode, index| %> - - <% if (index+1)%4 == 0 %> + { metacode_set.metacodes.each_with_index do |metacode, index| } + + { if (index+1)%4 == 0 }
- <% end %> - <% end %> + { end } + { end }
- <% end %> + { end }
diff --git a/views/metacode_sets/new.html.erb b/views/metacode_sets/new.html.erb index 017ab607..27a08bcb 100644 --- a/views/metacode_sets/new.html.erb +++ b/views/metacode_sets/new.html.erb @@ -1,14 +1,14 @@
- <%= render 'form' %> + { render 'form' }
diff --git a/views/metacodes/_form.html.erb b/views/metacodes/_form.html.erb index 18236d85..6fcc0188 100644 --- a/views/metacodes/_form.html.erb +++ b/views/metacodes/_form.html.erb @@ -1,43 +1,43 @@ -<%= form_for(@metacode) do |f| %> - <% if @metacode.errors.any? %> +{ form_for(@metacode) do |f| } + { if @metacode.errors.any? }
-

<%= pluralize(@metacode.errors.count, "error") %> prohibited this metacode from being saved:

+

{ pluralize(@metacode.errors.count, "error") } prohibited this metacode from being saved:

- <% end %> + { end }
- <%= f.label :name %> - <%= f.text_field :name %> + { f.label :name } + { f.text_field :name }
- <% unless @metacode.new_record? %> + { unless @metacode.new_record? }
- <%= f.label 'Current Icon' %> - <%= image_tag @metacode.icon, width: 96 %> + { f.label 'Current Icon' } + { image_tag @metacode.icon, width: 96 }
- <% end %> + { end }
- <% if @metacode.new_record? %> - <%= f.label 'Icon' %> - <% else %> - <%= f.label 'Replace Icon: ' %> - <% end %> - <%= f.hidden_field :manual_icon, value: nil %> - <%= f.file_field :aws_icon %> + { if @metacode.new_record? } + { f.label 'Icon' } + { else } + { f.label 'Replace Icon: ' } + { end } + { f.hidden_field :manual_icon, value: nil } + { f.file_field :aws_icon }
- <%= f.label :color, "Color (hex with # sign)" %> - <%= f.text_field :color %> + { f.label :color, "Color (hex with # sign)" } + { f.text_field :color }
- <%= link_to 'Cancel', metacodes_path, { :class => 'button' } %> - <%= f.submit :class => 'add' %> + { link_to 'Cancel', metacodes_path, { :class => 'button' } } + { f.submit :class => 'add' }
-<% end %> +{ end } diff --git a/views/metacodes/edit.html.erb b/views/metacodes/edit.html.erb index 4eb40656..7c3e4f1e 100644 --- a/views/metacodes/edit.html.erb +++ b/views/metacodes/edit.html.erb @@ -1,5 +1,5 @@
- <%= render 'form' %> + { render 'form' }
diff --git a/views/metacodes/index.html.erb b/views/metacodes/index.html.erb index f7f86e53..134da850 100644 --- a/views/metacodes/index.html.erb +++ b/views/metacodes/index.html.erb @@ -10,21 +10,21 @@ - <% @metacodes.each do |metacode| %> + { @metacodes.each do |metacode| } - <%= metacode.name %> - <%= metacode.icon %> - <% if metacode.color %> - - <%= metacode.color %> + { metacode.name } + { metacode.icon } + { if metacode.color } + + { metacode.color } - <% else %> + { else } - <% end %> - <%= image_tag metacode.icon, width: 40 %> - <%= link_to 'Edit', edit_metacode_path(metacode) %> + { end } + { image_tag metacode.icon, width: 40 } + { link_to 'Edit', edit_metacode_path(metacode) } - <% end %> + { end } diff --git a/views/metacodes/new.html.erb b/views/metacodes/new.html.erb index 81819734..24bfbd2f 100644 --- a/views/metacodes/new.html.erb +++ b/views/metacodes/new.html.erb @@ -1,5 +1,5 @@
- <%= render 'form' %> + { render 'form' }
diff --git a/views/notifications/index.html.erb b/views/notifications/index.html.erb index 4b0a69d2..9f15ae1b 100644 --- a/views/notifications/index.html.erb +++ b/views/notifications/index.html.erb @@ -1,5 +1,5 @@ -<% content_for :title, 'Notifications | Metamaps' %> -<% content_for :mobile_title, 'Notifications' %> +{ content_for :title, 'Notifications | Metamaps' } +{ content_for :mobile_title, 'Notifications' }
@@ -7,72 +7,72 @@

Notifications

- <% if @notifications.total_pages > 1 %> + { if @notifications.total_pages > 1 } - <% end %> + { end }
diff --git a/views/notifications/mark_read.js.erb b/views/notifications/mark_read.js.erb index 17e418b8..fdd11b8a 100644 --- a/views/notifications/mark_read.js.erb +++ b/views/notifications/mark_read.js.erb @@ -1,7 +1,7 @@ -$('#notification-<%= @notification.id %> .notification-read-unread > a') +$('#notification-{ @notification.id } .notification-read-unread > a') .text('mark as unread') - .attr('href', '<%= mark_unread_notification_path(@notification.id) %>') -$('#notification-<%= @notification.id %>') + .attr('href', '{ mark_unread_notification_path(@notification.id) }') +$('#notification-{ @notification.id }') .removeClass('unread') .addClass('read') Metamaps.GlobalUI.Notifications.decrementUnread(Metamaps.GlobalUI.ReactApp.render) diff --git a/views/notifications/mark_unread.js.erb b/views/notifications/mark_unread.js.erb index 873e7af8..ba128688 100644 --- a/views/notifications/mark_unread.js.erb +++ b/views/notifications/mark_unread.js.erb @@ -1,7 +1,7 @@ -$('#notification-<%= @notification.id %> .notification-read-unread > a') +$('#notification-{ @notification.id } .notification-read-unread > a') .text('mark as read') - .attr('href', '<%= mark_read_notification_path(@notification.id) %>') -$('#notification-<%= @notification.id %>') + .attr('href', '{ mark_read_notification_path(@notification.id) }') +$('#notification-{ @notification.id }') .removeClass('read') .addClass('unread') Metamaps.GlobalUI.Notifications.incrementUnread(Metamaps.GlobalUI.ReactApp.render) diff --git a/views/notifications/show.html.erb b/views/notifications/show.html.erb index e2cb2bd2..445b9771 100644 --- a/views/notifications/show.html.erb +++ b/views/notifications/show.html.erb @@ -1,52 +1,52 @@ -<% content_for :title, 'Notifications | Metamaps' %> -<% content_for :mobile_title, 'Notifications' %> +{ content_for :title, 'Notifications | Metamaps' } +{ content_for :mobile_title, 'Notifications' }
- <%= link_to 'Back to notifications', notifications_path %> + { link_to 'Back to notifications', notifications_path }

- <% case @notification.notification_code + { case @notification.notification_code when MAP_ACCESS_REQUEST request = @notification.notified_object - map = request.map %> - <%= image_tag @notification.sender.image(:thirtytwo), class: 'thirty-two-avatar' %> <%= request.user.name %> wants to collaborate on map <%= map.name %> - <% else %> - <%= @notification.subject %> - <% end %> + map = request.map } + { image_tag @notification.sender.image(:thirtytwo), class: 'thirty-two-avatar' } { request.user.name } wants to collaborate on map { map.name } + { else } + { @notification.subject } + { end }

- <% case @notification.notification_code - when MAP_ACCESS_REQUEST %> + { case @notification.notification_code + when MAP_ACCESS_REQUEST }

- <% if false && request.answered %> - <% if request.approved %> + { if false && request.answered } + { if request.approved } You already responded to this access request, and allowed access. - <% elsif !request.approved %> + { elsif !request.approved } You already responded to this access request, and declined access. If you changed your mind, you can still grant them access by going to the map and adding them as a collaborator. - <% end %> - <% else %> - <%= image_tag asset_path('ellipsis.gif'), class: 'hidden' %> - <%= link_to 'Allow', approve_access_post_map_path(id: map.id, request_id: request.id), remote: true, method: :post, class: 'button allow' %> - <%= link_to 'Decline', deny_access_post_map_path(id: map.id, request_id: request.id), remote: true, method: :post, class: 'button decline' %> + { end } + { else } + { image_tag asset_path('ellipsis.gif'), class: 'hidden' } + { link_to 'Allow', approve_access_post_map_path(id: map.id, request_id: request.id), remote: true, method: :post, class: 'button allow' } + { link_to 'Decline', deny_access_post_map_path(id: map.id, request_id: request.id), remote: true, method: :post, class: 'button decline' } - <% end %> + { end }

- <%= link_to 'Go to map', map_url(map) %> -   <%= link_to 'View mapper profile', explore_path(id: request.user.id) %> + { link_to 'Go to map', map_url(map) } +   { link_to 'View mapper profile', explore_path(id: request.user.id) }
- <% else %> + { else }
- <%= raw @notification.body %> + { raw @notification.body }
- <% end %> + { end }
diff --git a/views/shared/_cheatsheet.html.erb b/views/shared/_cheatsheet.html.erb index 1ceca774..4bbe850f 100644 --- a/views/shared/_cheatsheet.html.erb +++ b/views/shared/_cheatsheet.html.erb @@ -1,7 +1,7 @@ -<%# +{# # @file # The inner HTML of the cheatsheet - #%> + #}

HELP

@@ -26,7 +26,7 @@
-
Enter Topic (radial) View: Click on a Topic result from Search, or click the synapse icon inside open Topic Card on map
+
Enter Topic (radial) View: Click on a Topic result from Search, or click the synapse icon inside open Topic Card on map
Recenter Topics around chosen Topic: Alt + click on the topic OR Alt + E
Reveal the siblings for a Topic: Right-click and choose 'Reveal siblings' OR Alt + R
Center topic and reveal siblings: Alt + T
@@ -64,7 +64,7 @@ Change Topic permission: Click on 'Permission' icon (only for topic creator)
- Open Topic view: Click on icon within topic card bar + Open Topic view: Click on icon within topic card bar
Close Topic card: Click on canvas diff --git a/views/shared/_forkmap.html.erb b/views/shared/_forkmap.html.erb index 1a262d74..5ba94ba0 100644 --- a/views/shared/_forkmap.html.erb +++ b/views/shared/_forkmap.html.erb @@ -1,21 +1,21 @@ -<%# +{# # @file # Partial view, renders a form that creates a new map. - #%> + #}
-<%= form_for Map.new, url: maps_url, remote: true, html: { class: "new_map", id: "fork_map" } do |form|%> +{ form_for Map.new, url: maps_url, remote: true, html: { class: "new_map", id: "fork_map" } do |form|}

Save To New Map

- <%= form.text_field :name, :maxlength => 140 %> + { form.text_field :name, :maxlength => 140 }
- <%= form.text_area :desc, class: "description", :rows => 5, :cols => 43 %> + { form.text_area :desc, class: "description", :rows => 5, :cols => 43 }
@@ -58,5 +58,5 @@
-<% end %> +{ end }
diff --git a/views/shared/_mailer_unsubscribe_link.html.erb b/views/shared/_mailer_unsubscribe_link.html.erb index 5aab4689..5a203456 100644 --- a/views/shared/_mailer_unsubscribe_link.html.erb +++ b/views/shared/_mailer_unsubscribe_link.html.erb @@ -1,3 +1,3 @@
- <%= link_to 'Unsubscribe from all Metamaps emails', unsubscribe_notifications_url(protocol: Rails.env.production? ? :https : :http) %> + { link_to 'Unsubscribe from all Metamaps emails', unsubscribe_notifications_url(protocol: Rails.env.production? ? :https : :http) }
diff --git a/views/shared/_mailer_unsubscribe_link.text.erb b/views/shared/_mailer_unsubscribe_link.text.erb index ff851865..0cf52737 100644 --- a/views/shared/_mailer_unsubscribe_link.text.erb +++ b/views/shared/_mailer_unsubscribe_link.text.erb @@ -2,4 +2,4 @@ You can unsubscribe from all Metamaps emails by visiting the following link: -<%= unsubscribe_notifications_url(protocol: Rails.env.production? ? :https : :http) %> +{ unsubscribe_notifications_url(protocol: Rails.env.production? ? :https : :http) } diff --git a/views/shared/_metacodeCssColors.html.erb b/views/shared/_metacodeCssColors.html.erb index 5ef6119e..a6485264 100644 --- a/views/shared/_metacodeCssColors.html.erb +++ b/views/shared/_metacodeCssColors.html.erb @@ -1,10 +1,10 @@ diff --git a/views/shared/_metacodeoptions.html.erb b/views/shared/_metacodeoptions.html.erb index 3cf9604e..e111c915 100644 --- a/views/shared/_metacodeoptions.html.erb +++ b/views/shared/_metacodeoptions.html.erb @@ -1,9 +1,9 @@ -<%# +{# # @file # this code generates the list of icons that will drop down in the metacode select list on the topic card - #%> + #} diff --git a/views/shared/_switchmetacodes.html.erb b/views/shared/_switchmetacodes.html.erb index 9dbdabb6..05bed40d 100644 --- a/views/shared/_switchmetacodes.html.erb +++ b/views/shared/_switchmetacodes.html.erb @@ -1,12 +1,12 @@ -<%# +{# # @file # The inner HTML for switching your metacode set - #%> + #} -<% metacodes = current_user.settings.metacodes %> -<% selectedSet = metacodes[0].include?("metacodeset") ? metacodes[0].sub("metacodeset-","") : "custom" %> -<% allMetacodeSets = MetacodeSet.order("name").all.to_a %> -<% if selectedSet == "custom" +{ metacodes = current_user.settings.metacodes } +{ selectedSet = metacodes[0].include?("metacodeset") ? metacodes[0].sub("metacodeset-","") : "custom" } +{ allMetacodeSets = MetacodeSet.order("name").all.to_a } +{ if selectedSet == "custom" index = allMetacodeSets.length + 2 elsif selectedSet == 'Recent' index = 0 @@ -15,7 +15,7 @@ else set = MetacodeSet.find(selectedSet.to_i) index = allMetacodeSets.index(set) + 2 - end %> + end }

Switch Metacode Set

Use metacode sets to enter different modes of mapping.

@@ -24,23 +24,23 @@ - <% recent = user_recent_metacodes() %> + { recent = user_recent_metacodes() }
- <% @list = '' %> - <% recent.each_with_index do |m, index| %> - <% @list += '
  • ' + m.name + '

    ' + m.name.downcase + '

    • ' %> - <% end %> + data-metacodes="{ recent.map(&:id).join(',') }"> + { @list = '' } + { recent.each_with_index do |m, index| } + { @list += '
  • ' + m.name + '

    ' + m.name.downcase + '

    • ' } + { end }

    The 5 Metacodes you've used most recently.

      - <%= @list.html_safe %> + { @list.html_safe }
    @@ -49,18 +49,18 @@ Switch Set
    - <% most_used = user_most_used_metacodes() %> + { most_used = user_most_used_metacodes() }
    - <% @list = '' %> - <% most_used.each_with_index do |m, index| %> - <% @list += '
  • ' + m.name + '

    ' + m.name.downcase + '

    • ' %> - <% end %> + data-metacodes="{ most_used.map(&:id).join(',') }"> + { @list = '' } + { most_used.each_with_index do |m, index| } + { @list += '
  • ' + m.name + '

    ' + m.name.downcase + '

    • ' } + { end }

    The 5 Metacodes you've used the most.

      - <%= @list.html_safe %> + { @list.html_safe }
    @@ -69,45 +69,45 @@ Switch Set
    - <% allMetacodeSets.each_with_index do |m, localindex| %> -
    - <% @list = '' %> - <% m.metacodes.sort{|x,y| x.name <=> y.name }.each_with_index do |m, index| %> - <% @list += '
  • ' + m.name + '

    ' + m.name.downcase + '

    • ' %> - <% end %> + { allMetacodeSets.each_with_index do |m, localindex| } +
    + { @list = '' } + { m.metacodes.sort{|x,y| x.name <=> y.name }.each_with_index do |m, index| } + { @list += '
  • ' + m.name + '

    ' + m.name.downcase + '

    • ' } + { end }
    -

    <%= m.desc %>

    +

    { m.desc }

      - <%= @list.html_safe %> + { @list.html_safe }
    -
    - <% end %> + { end }
    Choose Your Metacodes
    NONE
    ALL
    - <% @list = '' %> - <% metacodesInUse = user_metacodes() %> - <% Metacode.order("name").all.each_with_index do |m, index| %> - <% mClass = metacodesInUse.index(m) == nil ? "toggledOff" : "" %> - <% @list += '
  • ' + m.name + '

    ' + m.name.downcase + '

    • ' %> - <% end %> + { @list = '' } + { metacodesInUse = user_metacodes() } + { Metacode.order("name").all.each_with_index do |m, index| } + { mClass = metacodesInUse.index(m) == nil ? "toggledOff" : "" } + { @list += '
  • ' + m.name + '

    ' + m.name.downcase + '

    • ' } + { end }
      - <%= @list.html_safe %> + { @list.html_safe }
    -
    @@ -116,6 +116,6 @@
    diff --git a/views/tokens/new.html.erb b/views/tokens/new.html.erb index e655010d..1598b7b2 100644 --- a/views/tokens/new.html.erb +++ b/views/tokens/new.html.erb @@ -1,5 +1,5 @@ -<%= form_for @token, url: '/api/v2/tokens', method: :post do |form| %> +{ form_for @token, url: '/api/v2/tokens', method: :post do |form| }

    Request new API Token

    - <%= form.text_field :description, placeholder: "Token description..." %> - <%= form.submit %> -<% end %> + { form.text_field :description, placeholder: "Token description..." } + { form.submit } +{ end } diff --git a/views/topics/show.html.erb b/views/topics/show.html.erb index 119f2f40..4b77dce2 100644 --- a/views/topics/show.html.erb +++ b/views/topics/show.html.erb @@ -1,20 +1,20 @@ -<%# +{# # # @file # This shows a topic and its siblings. # URL: /topics/ # -%> +} -<% content_for :title, @topic.name + " | Metamaps" %> -<% content_for :mobile_title, @topic.name %> +{ content_for :title, @topic.name + " | Metamaps" } +{ content_for :mobile_title, @topic.name } diff --git a/views/users/confirmations/new.html.erb b/views/users/confirmations/new.html.erb index 9c27eb72..f3cb359e 100644 --- a/views/users/confirmations/new.html.erb +++ b/views/users/confirmations/new.html.erb @@ -1,12 +1,12 @@

    Resend confirmation instructions

    -<%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %> - <%= devise_error_messages! %> +{ form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| } + { devise_error_messages! } -
    <%= f.label :email %>
    - <%= f.email_field :email, :autofocus => true %>
    +
    { f.label :email }
    + { f.email_field :email, :autofocus => true }
    -
    <%= f.submit "Resend confirmation instructions" %>
    -<% end %> +
    { f.submit "Resend confirmation instructions" }
    +{ end } -<%= render "devise/shared/links" %> +{ render "devise/shared/links" } diff --git a/views/users/edit.html.erb b/views/users/edit.html.erb index 1ee406e7..f22445bf 100644 --- a/views/users/edit.html.erb +++ b/views/users/edit.html.erb @@ -1,17 +1,17 @@ -<%# +{# # @file # /users/:id/edit # User edit form - #%> + #} -<% content_for :title, @user.name + "'s Settings | Metamaps" %> -<% content_for :mobile_title, "Account Settings" %> +{ content_for :title, @user.name + "'s Settings | Metamaps" } +{ content_for :mobile_title, "Account Settings" }
    -<%= form_for @user, url: user_url, :html =>{ :multipart => true, :class => "edit_user centerGreyForm"} do |form| %> +{ form_for @user, url: user_url, :html =>{ :multipart => true, :class => "edit_user centerGreyForm"} do |form| }

    Edit Settings

    - <%= image_tag @user.image.url(:ninetysix), :size => "84x84" %> + { image_tag @user.image.url(:ninetysix), :size => "84x84" }
    @@ -19,9 +19,9 @@
    • Upload Photo - <%= hidden_field_tag "remove_image", "0" %> - <%= form.file_field :image %> - <%= form.label :image %> + { hidden_field_tag "remove_image", "0" } + { form.file_field :image } + { form.label :image }
    • Remove
    • Cancel
      • @@ -30,58 +30,58 @@
    -
    <%= @user.name %>
    +
    { @user.name }
    - <%= form.label :name, "Name:", class: 'firstFieldText' %> - <%= form.text_field :name %> + { form.label :name, "Name:", class: 'firstFieldText' } + { form.text_field :name }
    - <%= form.label :email, "Email:", class: 'firstFieldText' %> - <%= form.email_field :email %> + { form.label :email, "Email:", class: 'firstFieldText' } + { form.email_field :email }
    - <%= form.label :emails_allowed, class: 'firstFieldText' do %> - <%= form.check_box :emails_allowed, class: 'inline' %> + { form.label :emails_allowed, class: 'firstFieldText' do } + { form.check_box :emails_allowed, class: 'inline' } Send Metamaps notifications to my email. - <% end %> - <%= fields_for :settings, @user.settings do |settings| %> - <%= settings.label :follow_topic_on_created, class: 'firstFieldText' do %> - <%= settings.check_box :follow_topic_on_created, class: 'inline' %> + { end } + { fields_for :settings, @user.settings do |settings| } + { settings.label :follow_topic_on_created, class: 'firstFieldText' do } + { settings.check_box :follow_topic_on_created, class: 'inline' } Auto-follow topics you create. - <% end %> - <%= settings.label :follow_topic_on_contributed, class: 'firstFieldText' do %> - <%= settings.check_box :follow_topic_on_contributed, class: 'inline' %> + { end } + { settings.label :follow_topic_on_contributed, class: 'firstFieldText' do } + { settings.check_box :follow_topic_on_contributed, class: 'inline' } Auto-follow topics you edit. - <% end %> - <%= settings.label :follow_map_on_created, class: 'firstFieldText' do %> - <%= settings.check_box :follow_map_on_created, class: 'inline' %> + { end } + { settings.label :follow_map_on_created, class: 'firstFieldText' do } + { settings.check_box :follow_map_on_created, class: 'inline' } Auto-follow maps you create. - <% end %> - <%= settings.label :follow_map_on_contributed, class: 'firstFieldText' do %> - <%= settings.check_box :follow_map_on_contributed, class: 'inline' %> + { end } + { settings.label :follow_map_on_contributed, class: 'firstFieldText' do } + { settings.check_box :follow_map_on_contributed, class: 'inline' } Auto-follow maps you edit. - <% end %> - <% end %> + { end } + { end }
    Change Password
    - <%= form.label :current_password, "Current Password:", :class => "firstFieldText" %> - <%= password_field_tag :current_password, params[:current_password] %> + { form.label :current_password, "Current Password:", :class => "firstFieldText" } + { password_field_tag :current_password, params[:current_password] }
    - <%= form.label :password, "New Password:", :class => "firstFieldText" %> - <%= form.password_field :password, :autocomplete => :off%> + { form.label :password, "New Password:", :class => "firstFieldText" } + { form.password_field :password, :autocomplete => :off}
    - <%= form.label :password_confirmation, "Confirm New Password:", :class => "firstFieldText" %> - <%= form.password_field :password_confirmation, :autocomplete => :off%> + { form.label :password_confirmation, "Confirm New Password:", :class => "firstFieldText" } + { form.password_field :password_confirmation, :autocomplete => :off}
    Oops, don't change password
    - <%= form.submit "Update", class: "update", onclick: "Metamaps.Account.showLoading()" %> + { form.submit "Update", class: "update", onclick: "Metamaps.Account.showLoading()" }
    -<% end %> +{ end }
    diff --git a/views/users/mailer/confirmation_instructions.html.erb b/views/users/mailer/confirmation_instructions.html.erb index 5b04a725..0d4ad774 100644 --- a/views/users/mailer/confirmation_instructions.html.erb +++ b/views/users/mailer/confirmation_instructions.html.erb @@ -1,5 +1,5 @@ -

    Welcome <%= @email %>!

    +

    Welcome { @email }!

    You can confirm your account email through the link below:

    -

    <%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %>

    +

    { link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) }

    diff --git a/views/users/mailer/reset_password_instructions.html.erb b/views/users/mailer/reset_password_instructions.html.erb index bb938968..104a0456 100644 --- a/views/users/mailer/reset_password_instructions.html.erb +++ b/views/users/mailer/reset_password_instructions.html.erb @@ -1,4 +1,4 @@ -

    Hey there Metamapper with email <%= @resource.email %>!

    +

    Hey there Metamapper with email { @resource.email }!

    Please create a new password. Your password needs to contain a capital letter, a number, an emoji, 7 elements from the Periodic Table, and a plot containing a protagonist with some character development and a surprise twist ending.

    @@ -6,6 +6,6 @@

    Change your password using the link below.

    -

    <%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @token) %>

    +

    { link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @token) }

    If you didn't request this, click your heels three times and pretend nothing ever happened.

    diff --git a/views/users/mailer/unlock_instructions.html.erb b/views/users/mailer/unlock_instructions.html.erb index a4152e13..56767d97 100644 --- a/views/users/mailer/unlock_instructions.html.erb +++ b/views/users/mailer/unlock_instructions.html.erb @@ -1,7 +1,7 @@ -

    Hello <%= @resource.email %>!

    +

    Hello { @resource.email }!

    Your account has been locked due to an excessive number of unsuccessful sign in attempts.

    Click the link below to unlock your account:

    -

    <%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @resource.unlock_token) %>

    +

    { link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @resource.unlock_token) }

    diff --git a/views/users/passwords/edit.html.erb b/views/users/passwords/edit.html.erb index 76e4c20d..6dee35e2 100644 --- a/views/users/passwords/edit.html.erb +++ b/views/users/passwords/edit.html.erb @@ -1,20 +1,20 @@ -<% content_for :title, "Change Password | Metamaps" %> -<% content_for :mobile_title, "Change Password" %> +{ content_for :title, "Change Password | Metamaps" } +{ content_for :mobile_title, "Change Password" }
    -<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put, :class => "forgotPassword centerGreyForm forgotPasswordReset" }) do |f| %> - <%= f.hidden_field :reset_password_token %> +{ form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put, :class => "forgotPassword centerGreyForm forgotPasswordReset" }) do |f| } + { f.hidden_field :reset_password_token }

    Change password

    -
    <%= f.label :password, "New password", :class => "firstFieldText" %> - <%= f.password_field :password, :autofocus => true %>
    +
    { f.label :password, "New password", :class => "firstFieldText" } + { f.password_field :password, :autofocus => true }
    -
    <%= f.label :password_confirmation, "Confirm new password", :class => "firstFieldText" %> - <%= f.password_field :password_confirmation %>
    +
    { f.label :password_confirmation, "Confirm new password", :class => "firstFieldText" } + { f.password_field :password_confirmation }
    -
    <%= f.submit "Change my password" %>
    +
    { f.submit "Change my password" }
    -<% end %> +{ end }
    diff --git a/views/users/passwords/new.html.erb b/views/users/passwords/new.html.erb index 5b8fb902..9ff29c8e 100644 --- a/views/users/passwords/new.html.erb +++ b/views/users/passwords/new.html.erb @@ -1,17 +1,17 @@ -<% content_for :title, "Password Reset | Metamaps" %> -<% content_for :mobile_title, "Password Reset" %> +{ content_for :title, "Password Reset | Metamaps" } +{ content_for :mobile_title, "Password Reset" }
    -<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post, :class => "forgotPassword centerGreyForm" }) do |f| %> +{ form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post, :class => "forgotPassword centerGreyForm" }) do |f| }

    FORGOT PASSWORD?

    -
    <%= f.label :email, "Enter your email:", :class => "firstFieldText" %> - <%= f.email_field :email, :autofocus => true %>
    +
    { f.label :email, "Enter your email:", :class => "firstFieldText" } + { f.email_field :email, :autofocus => true }
    -
    <%= f.submit "Send Password Reset Instructions" %>
    +
    { f.submit "Send Password Reset Instructions" }
    -<% end %> +{ end }
    diff --git a/views/users/registrations/edit.html.erb b/views/users/registrations/edit.html.erb index 9bb26462..d1258b49 100644 --- a/views/users/registrations/edit.html.erb +++ b/views/users/registrations/edit.html.erb @@ -1,29 +1,29 @@ -

    Edit <%= resource_name.to_s.humanize %>

    +

    Edit { resource_name.to_s.humanize }

    -<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %> - <%= devise_error_messages! %> +{ form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| } + { devise_error_messages! } -
    <%= f.label :email %>
    - <%= f.email_field :email, :autofocus => true %>
    +
    { f.label :email }
    + { f.email_field :email, :autofocus => true }
    - <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %> -
    Currently waiting confirmation for: <%= resource.unconfirmed_email %>
    - <% end %> + { if devise_mapping.confirmable? && resource.pending_reconfirmation? } +
    Currently waiting confirmation for: { resource.unconfirmed_email }
    + { end } -
    <%= f.label :password %> (leave blank if you don't want to change it)
    - <%= f.password_field :password, :autocomplete => "off" %>
    +
    { f.label :password } (leave blank if you don't want to change it)
    + { f.password_field :password, :autocomplete => "off" }
    -
    <%= f.label :password_confirmation %>
    - <%= f.password_field :password_confirmation %>
    +
    { f.label :password_confirmation }
    + { f.password_field :password_confirmation }
    -
    <%= f.label :current_password %> (we need your current password to confirm your changes)
    - <%= f.password_field :current_password %>
    +
    { f.label :current_password } (we need your current password to confirm your changes)
    + { f.password_field :current_password }
    -
    <%= f.submit "Update" %>
    -<% end %> +
    { f.submit "Update" }
    +{ end }

    Cancel my account

    -

    Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), :data => { :confirm => "Are you sure?" }, :method => :delete %>.

    +

    Unhappy? { button_to "Cancel my account", registration_path(resource_name), :data => { :confirm => "Are you sure?" }, :method => :delete }.

    -<%= link_to "Back", :back %> +{ link_to "Back", :back } diff --git a/views/users/registrations/new.html.erb b/views/users/registrations/new.html.erb index 17409d07..e4ca8f42 100644 --- a/views/users/registrations/new.html.erb +++ b/views/users/registrations/new.html.erb @@ -1,29 +1,29 @@ -<% content_for :title, "Sign Up | Metamaps" %> -<% content_for :mobile_title, "Join" %> +{ content_for :title, "Sign Up | Metamaps" } +{ content_for :mobile_title, "Join" }
    -<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :post, :class => "new_user centerGreyForm" }) do |f| %> +{ form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :post, :class => "new_user centerGreyForm" }) do |f| }

    Sign Up

    -
    <%= f.label :name, "Name:", :class => "firstFieldText" %> - <%= f.text_field :name, :autofocus => true %>
    +
    { f.label :name, "Name:", :class => "firstFieldText" } + { f.text_field :name, :autofocus => true }
    -
    <%= f.label :email, "Email:", :class => "fieldText" %> - <%= f.email_field :email %>
    +
    { f.label :email, "Email:", :class => "fieldText" } + { f.email_field :email }
    -
    <%= f.label :password, "Password:", :class => "fieldText" %> - <%= f.password_field :password %>
    +
    { f.label :password, "Password:", :class => "fieldText" } + { f.password_field :password }
    -
    <%= f.label :password_confirmation, "Password Confirmation:", :class => "fieldText" %> - <%= f.password_field :password_confirmation %>
    +
    { f.label :password_confirmation, "Password Confirmation:", :class => "fieldText" } + { f.password_field :password_confirmation }
    -
    <%= f.label "Access Code:", :class => "fieldText" %> - <%= f.text_field :joinedwithcode, :value => params[:code] %>
    +
    { f.label "Access Code:", :class => "fieldText" } + { f.text_field :joinedwithcode, :value => params[:code] }
    -
    <%= f.submit "Sign up!" %>
    +
    { f.submit "Sign up!" }

    Don't have an access code?
    Request an Invite
    -<% end %> +{ end }
    diff --git a/views/users/sessions/new.html.erb b/views/users/sessions/new.html.erb index 129f905e..6d55bf2e 100644 --- a/views/users/sessions/new.html.erb +++ b/views/users/sessions/new.html.erb @@ -1,32 +1,32 @@ -<% content_for :title, "Sign In | Metamaps" %> -<% content_for :mobile_title, "Login" %> +{ content_for :title, "Sign In | Metamaps" } +{ content_for :mobile_title, "Login" }
    -<%= form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => { :method => :post, :class => "centerGreyForm login" }) do |f| %> +{ form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => { :method => :post, :class => "centerGreyForm login" }) do |f| }

    SIGN IN

    - <%= f.email_field :email, :autofocus => true, :placeholder => "Email" %>
    + { f.email_field :email, :autofocus => true, :placeholder => "Email" }
    - <%= f.password_field :password, :placeholder => "Password" %>
    + { f.password_field :password, :placeholder => "Password" }
    -
    <%= f.submit "Sign in" %>
    +
    { f.submit "Sign in" }
    - <% if devise_mapping.rememberable? -%> + { if devise_mapping.rememberable? -}
    - <%= f.label :remember_me, "Stay signed in" %> - <%= f.check_box :remember_me %> + { f.label :remember_me, "Stay signed in" } + { f.check_box :remember_me }
    - <% end -%> + { end -}
    - <%- if devise_mapping.recoverable? && controller_name != 'passwords' %> - <%= link_to "Forgot password?", new_password_path(resource_name) %> - <% end -%> + {- if devise_mapping.recoverable? && controller_name != 'passwords' } + { link_to "Forgot password?", new_password_path(resource_name) } + { end -}
    -<% end %> +{ end }
    diff --git a/views/users/shared/_links.erb b/views/users/shared/_links.erb index f687d7ee..bd1c6377 100644 --- a/views/users/shared/_links.erb +++ b/views/users/shared/_links.erb @@ -1,25 +1,25 @@ -<%- if controller_name != 'sessions' %> - <%= link_to "Sign in", new_session_path(resource_name) %>
    -<% end -%> +{- if controller_name != 'sessions' } + { link_to "Sign in", new_session_path(resource_name) }
    +{ end -} -<%- if devise_mapping.registerable? && controller_name != 'registrations' %> - <%= link_to "Sign up", new_user_path(resource_name) %>
    -<% end -%> +{- if devise_mapping.registerable? && controller_name != 'registrations' } + { link_to "Sign up", new_user_path(resource_name) }
    +{ end -} -<%- if devise_mapping.recoverable? && controller_name != 'passwords' %> - <%= link_to "Forgot your password?", new_password_path(resource_name) %>
    -<% end -%> +{- if devise_mapping.recoverable? && controller_name != 'passwords' } + { link_to "Forgot your password?", new_password_path(resource_name) }
    +{ end -} -<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> - <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
    -<% end -%> +{- if devise_mapping.confirmable? && controller_name != 'confirmations' } + { link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) }
    +{ end -} -<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> - <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
    -<% end -%> +{- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' } + { link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) }
    +{ end -} -<%- if devise_mapping.omniauthable? %> - <%- resource_class.omniauth_providers.each do |provider| %> - <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %>
    - <% end -%> -<% end -%> \ No newline at end of file +{- if devise_mapping.omniauthable? } + {- resource_class.omniauth_providers.each do |provider| } + { link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) }
    + { end -} +{ end -} \ No newline at end of file diff --git a/views/users/unlocks/new.html.erb b/views/users/unlocks/new.html.erb index 020787f8..5f5e2e4d 100644 --- a/views/users/unlocks/new.html.erb +++ b/views/users/unlocks/new.html.erb @@ -1,12 +1,12 @@

    Resend unlock instructions

    -<%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %> - <%= devise_error_messages! %> +{ form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| } + { devise_error_messages! } -
    <%= f.label :email %>
    - <%= f.email_field :email, :autofocus => true %>
    +
    { f.label :email }
    + { f.email_field :email, :autofocus => true }
    -
    <%= f.submit "Resend unlock instructions" %>
    -<% end %> +
    { f.submit "Resend unlock instructions" }
    +{ end } -<%= render "devise/shared/links" %> +{ render "devise/shared/links" }