diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/main.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/responsive/_utils.scss (renamed from app/assets/stylesheets/responsive/_utils.css) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/responsive/all.scss (renamed from app/assets/stylesheets/responsive/all.css) | 0 | ||||
| -rw-r--r-- | app/assets/stylesheets/responsive/custom.scss (renamed from app/assets/stylesheets/responsive/custom.css) | 0 | ||||
| -rw-r--r-- | app/helpers/track_helper.rb | 48 | ||||
| -rw-r--r-- | app/views/general/_locale_switcher.html.erb | 4 |
6 files changed, 30 insertions, 26 deletions
diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss index 3118eab3d..8aa8010ae 100644 --- a/app/assets/stylesheets/main.scss +++ b/app/assets/stylesheets/main.scss @@ -134,6 +134,10 @@ overflow:visible; margin:0; } +#wrapper_google_embed iframe { +min-height: 800px; +} + #content { position:relative; width:875px; diff --git a/app/assets/stylesheets/responsive/_utils.css b/app/assets/stylesheets/responsive/_utils.scss index 68884fa7a..68884fa7a 100644 --- a/app/assets/stylesheets/responsive/_utils.css +++ b/app/assets/stylesheets/responsive/_utils.scss diff --git a/app/assets/stylesheets/responsive/all.css b/app/assets/stylesheets/responsive/all.scss index 4c935bed3..4c935bed3 100644 --- a/app/assets/stylesheets/responsive/all.css +++ b/app/assets/stylesheets/responsive/all.scss diff --git a/app/assets/stylesheets/responsive/custom.css b/app/assets/stylesheets/responsive/custom.scss index e69de29bb..e69de29bb 100644 --- a/app/assets/stylesheets/responsive/custom.css +++ b/app/assets/stylesheets/responsive/custom.scss diff --git a/app/helpers/track_helper.rb b/app/helpers/track_helper.rb index 7bd0fa55d..ca698926c 100644 --- a/app/helpers/track_helper.rb +++ b/app/helpers/track_helper.rb @@ -3,22 +3,22 @@ module TrackHelper def already_subscribed_notice(track_thing) case track_thing.track_type when 'request_updates' - _("You are already subscribed to '{{link_to_request}}', a request", + _("You are already subscribed to '{{link_to_request}}', a request.", :link_to_request => request_link(track_thing.info_request)) when 'all_new_requests' - _('You are already subscribed to any <a href="{{new_requests_url}}">new requests</a>', + _('You are already subscribed to any <a href="{{new_requests_url}}">new requests</a>.', :new_requests_url => request_list_path) when 'all_successful_requests' - _('You are already subscribed to any <a href="{{successful_requests_url}}">successful requests</a>', + _('You are already subscribed to any <a href="{{successful_requests_url}}">successful requests</a>.', :successful_requests_url => request_list_successful_path ) when 'public_body_updates' - _("You are already subscribed to '{{link_to_authority}}', a public authority", + _("You are already subscribed to '{{link_to_authority}}', a public authority.", :link_to_authority => public_body_link(track_thing.public_body)) when 'user_updates' - _("You are already subscribed to '{{link_to_user}}', a person", + _("You are already subscribed to '{{link_to_user}}', a person.", :link_to_user => user_link(track_thing.tracked_user)) when 'search_query' - _('You are already subscribed to <a href="{{search_url}}">this search</a>', + _('You are already subscribed to <a href="{{search_url}}">this search</a>.', :search_url => search_path([track_thing.track_query, 'newest', 'advanced'])) end end @@ -26,22 +26,22 @@ module TrackHelper def subscribe_email_notice(track_thing) case track_thing.track_type when 'request_updates' - _("You will now be emailed updates about '{{link_to_request}}', a request", + _("You will now be emailed updates about '{{link_to_request}}', a request.", :link_to_request => request_link(track_thing.info_request)) when 'all_new_requests' - _('You will now be emailed updates about any <a href="{{new_requests_url}}">new requests</a>', + _('You will now be emailed updates about any <a href="{{new_requests_url}}">new requests</a>.', :new_requests_url => request_list_path) when 'all_successful_requests' - _('You will now be emailed updates about <a href="{{successful_requests_url}}">successful requests</a>', + _('You will now be emailed updates about <a href="{{successful_requests_url}}">successful requests</a>.', :successful_requests_url => request_list_successful_path ) when 'public_body_updates' - _("You will now be emailed updates about '{{link_to_authority}}', a public authority", + _("You will now be emailed updates about '{{link_to_authority}}', a public authority.", :link_to_authority => public_body_link(track_thing.public_body)) when 'user_updates' - _("You will now be emailed updates about '{{link_to_user}}', a person", + _("You will now be emailed updates about '{{link_to_user}}', a person.", :link_to_user => user_link(track_thing.tracked_user)) when 'search_query' - _("You will now be emailed updates about <a href=\"{{search_url}}\">this search</a>", + _("You will now be emailed updates about <a href=\"{{search_url}}\">this search</a>.", :search_url => search_path([track_thing.track_query, 'newest', 'advanced'])) end end @@ -50,27 +50,27 @@ module TrackHelper wall_url_user = show_user_wall_path(:url_name => track_thing.tracking_user.url_name) case track_thing.track_type when 'request_updates' - _('You are now <a href="{{wall_url_user}}">following</a> updates about \'{{link_to_request}}\', a request', + _('You are now <a href="{{wall_url_user}}">following</a> updates about \'{{link_to_request}}\', a request.', :link_to_request => request_link(track_thing.info_request), :wall_url_user => wall_url_user) when 'all_new_requests' - _('You are now <a href="{{wall_url_user}}">following</a> updates about <a href="{{new_requests_url}}">new requests</a>', + _('You are now <a href="{{wall_url_user}}">following</a> updates about <a href="{{new_requests_url}}">new requests</a>.', :new_requests_url => request_list_path, :wall_url_user => wall_url_user) when 'all_successful_requests' - _('You are now <a href="{{wall_url_user}}">following</a> updates about <a href="{{successful_requests_url}}">successful requests</a>', + _('You are now <a href="{{wall_url_user}}">following</a> updates about <a href="{{successful_requests_url}}">successful requests</a>.', :successful_requests_url => request_list_successful_path, :wall_url_user => wall_url_user) when 'public_body_updates' - _('You are now <a href="{{wall_url_user}}">following</a> updates about \'{{link_to_authority}}\', a public authority', + _('You are now <a href="{{wall_url_user}}">following</a> updates about \'{{link_to_authority}}\', a public authority.', :wall_url_user => wall_url_user, :link_to_authority => public_body_link(track_thing.public_body)) when 'user_updates' - _('You are now <a href="{{wall_url_user}}">following</a> updates about \'{{link_to_user}}\', a person', + _('You are now <a href="{{wall_url_user}}">following</a> updates about \'{{link_to_user}}\', a person.', :wall_url_user => wall_url_user, :link_to_user => user_link(track_thing.tracked_user)) when 'search_query' - _('You are now <a href="{{wall_url_user}}">following</a> updates about <a href="{{search_url}}">this search</a>', + _('You are now <a href="{{wall_url_user}}">following</a> updates about <a href="{{search_url}}">this search</a>.', :wall_url_user => wall_url_user, :search_url => search_path([track_thing.track_query, 'newest', 'advanced'])) end @@ -79,22 +79,22 @@ module TrackHelper def unsubscribe_notice(track_thing) case track_thing.track_type when 'request_updates' - _("You are no longer following '{{link_to_request}}', a request", + _("You are no longer following '{{link_to_request}}', a request.", :link_to_request => request_link(track_thing.info_request)) when 'all_new_requests' - _('You are no longer following <a href="{{new_requests_url}}">new requests</a>', + _('You are no longer following <a href="{{new_requests_url}}">new requests</a>.', :new_requests_url => request_list_path) when 'all_successful_requests' - _('You are no longer following <a href="{{successful_requests_url}}">successful requests</a>', + _('You are no longer following <a href="{{successful_requests_url}}">successful requests</a>.', :successful_requests_url => request_list_successful_path ) when 'public_body_updates' - _("You are no longer following '{{link_to_authority}}', a public authority", + _("You are no longer following '{{link_to_authority}}', a public authority.", :link_to_authority => public_body_link(track_thing.public_body)) when 'user_updates' - _("You are no longer following '{{link_to_user}}', a person", + _("You are no longer following '{{link_to_user}}', a person.", :link_to_user => user_link(track_thing.tracked_user)) when 'search_query' - _('You are no longer following <a href="{{search_url}}">this search</a>', + _('You are no longer following <a href="{{search_url}}">this search</a>.', :search_url => search_path([track_thing.track_query, 'newest', 'advanced'])) end end diff --git a/app/views/general/_locale_switcher.html.erb b/app/views/general/_locale_switcher.html.erb index a318f61f3..7d64c9069 100644 --- a/app/views/general/_locale_switcher.html.erb +++ b/app/views/general/_locale_switcher.html.erb @@ -1,7 +1,7 @@ - <% if FastGettext.default_available_locales.length > 1 && !params.empty? %> + <% if FastGettext.default_available_locales.any? && !params.empty? %> <div id="user_locale_switcher"> <div class="btn-group"> - <% for possible_locale in FastGettext.default_available_locales %> + <% FastGettext.default_available_locales.each do |possible_locale| %> <% if possible_locale == FastGettext.locale %> <a href="#" class="btn disabled"><%= locale_name(possible_locale) %></a> <% else %> |