From dcc619c7d9705aec3e23ae8741b555fb82c1cff9 Mon Sep 17 00:00:00 2001 From: Jeffrey Warren Date: Wed, 20 Nov 2019 22:13:22 -0500 Subject: [PATCH] new navbar (#6508) * new navbar but should mostly be in a feature * Changed the hyperlink text in Login/Signup Model (#6364) * Changed the hyperlink text in Login/Signup Model Issue Number #6360 * Updated Hyperlink Text * Updated Text in HyperLink * Update _nodes.html.erb * Functional Tests for Ordering aphabetically (#6371) * test ordering of tags * test that wikis are ordered alphabetically based on title * Fix failing test on wiki test * Change 'Read More' blog link to button (#6537) * OpenGraph for Twitter * Update _new_question.html.erb * Add questions and comments to profile cards (#6472) * add # notes, questions, comments to user profile * fix codeclimate errors * display correct node type at top of tag/author page * fix /profile/comments/ to show by username * add route for comments by tagname, link added in profile * add styling to profile page cards * refactored Node.find_by_tag_and_author to use Node.questions * change display of note/question/comment links * add unit test for Comment.find_by_tag_and_author * add unit test for Node.find_by_tag_and_author * add assert for questions type in test find by name and user id * remove light grey footer background * Removed style-breaking classes from table (#6374) * Update 503.html - replace http with https (#6562) * Update 502.html - replace http with https (#6561) * Update 500.html - replace http with https (#6560) * Update 422.html - replace http with https (#6559) * Update 404.html - replace http with https (#6558) * Update index.html - replace http with https (#6557) * change the function named t(...) to translation(...) (#6580) * Flow: Button to post marker + Popup working for multiple maps (#6591) * init * LEL pointed to different branch * popups working * removed forked leaflet * button working great * CSS changes of button * CSS changed to orignal bootstrap button * Updated the user.rb file to bootstrap italic (#6535) * Update README.md file (#6510) Added link to first-timers-only issue template. * Fix comment spelling error (#6521) * Fix icon color on btn-outline-secondary buttons #6518 (#6520) * Bump chart.js from 2.8.0 to 2.9.1 (#6567) Bumps [chart.js](https://github.com/chartjs/Chart.js) from 2.8.0 to 2.9.1. - [Release notes](https://github.com/chartjs/Chart.js/releases) - [Commits](https://github.com/chartjs/Chart.js/compare/v2.8.0...v2.9.1) Signed-off-by: dependabot-preview[bot] * Changed from function t to translation (#6609) Issue resolved: Change function t to translation in dashboard/_node_comment #6600 * Update _edit.html.erb (#6583) * Update _comments.html.erb (#6585) I changed the function named t(....) to be named as translations(...). * Update user.rb (#6587) * Change function t to translation in dashboard/_node_wiki (#6607) * Update_function t to translation in comments/_form (#6608) * wiki/methods: Change t to translation in (#6564) Changes the function name from t to translation in wiki/methods Fixes https://github.com/publiclab/plots2/issues/6540 * t(....) named as translations(...) on lines 25, 30, 35 and 38 (#6552) * t(....) named as translations(...) on lines 25, 30, 35 and 38 * fix type translations to translation * Change function t to translations in comments/_edit * Revert "Change function t to translations in comments/_edit" This reverts commit e858b7568ce6f66bee128ec255c9994153df1ed6. * changed t function name (#6546) * changed t function name * name fix * change funcion t to translations in users/spamaway (#6545) * change funcion t to translations in users/spamaway * fix typo * Change function t to translations in comments/comments #6538 (#6543) * Change function t to translations Change function t to translations in comments/comments * Change translations to translation * Update _node_meta.html.erb (#6606) Changing method "t" to "translation" * Fix follow button bug on tags (#6576) * Fix bug on issue #6570 * Persist data * Add co-authored posts to profile.html.erb (#6418) * Add co-authored posts to profile.html.erb * Update profile.html.erb * Adjustments to tag graph labeling * Update stats.html.erb * Change function to to translation #6603 (#6659) Change function t to translation in dashboard/_node_question #6603 https://github.com/publiclab/plots2/issues/6603# * Refresh button (#6507) * added tooltip for refresh button * changes * new changes1 * #6539 Updated t to translations. (#6544) * Updated t to translations. * Updated translations to translation. Error in issue description. * Changed t to translation in _node_moderate (#6695) * some translations adjustments * Add more tests for Node (for note and wiki page titles) (#6366) * Add more tests for Node * Prevent titles that are empty, blank or too short * Update functional tests * Add Redis installation to readme (#6398) * Fix recent questions on shadow page (#6342) * Add package.json, package-lock and test.sqlite-journal to gitingore #6384 (#6385) * Make "choose one" link in comment forms appear underlined (#6401) * Underline "choose one" link Make "choose one" link in comment forms appear underlined #6399 * Add a CSS class to underline text * Add !important to underline CSS class * Fix rubocop errors in app/api & app/channels (#6425) * Fix rubocop errors in app/api & app/channels * Fix rubocop guardclause offenses * Add tag link to show question (#6430) * simple fix for link * not sure what that file was * removed redundant comment count being showed in blog section (#6746) * Update t() function to translation() (#6729) #6728 * Add redis installations for linux (#6751) * Bump rake from 12.3.3 to 13.0.1 (#6764) Bumps [rake](https://github.com/ruby/rake) from 12.3.3 to 13.0.1. - [Release notes](https://github.com/ruby/rake/releases) - [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc) - [Commits](https://github.com/ruby/rake/compare/v12.3.3...v13.0.1) Signed-off-by: dependabot-preview[bot] * Update _comments.html.erb (#6766) * Update _comments.html.erb Changed the t() to translation() in line 4, 18 and 21. * Update _comments.html.erb Changed the two translation() back to t() on line 18. * Full screen button added in inline maps, Multiple maps in Wiki page works now. (#6699) * full screen added * working on wiki page * code refactoring * console logs removed * inline map layers are ON by default now * version bump of LEL to add new Layers * api changed tagslocation init * api taglocations changed * popup content changed * PL.editor shows map if lat,lon passed in URL. (#6788) * pl-editor shows map * indentation * yarn.lock added for PL.editor * safe traverse syntax used * map API using common global variable. (#6802) * done * removed console logs * [Security] Bump https-proxy-agent from 2.2.1 to 2.2.4 (#6803) Bumps [https-proxy-agent](https://github.com/TooTallNate/node-https-proxy-agent) from 2.2.1 to 2.2.4. **This update includes security fixes.** - [Release notes](https://github.com/TooTallNate/node-https-proxy-agent/releases) - [Commits](https://github.com/TooTallNate/node-https-proxy-agent/compare/2.2.1...2.2.4) Signed-off-by: dependabot-preview[bot] * Update _thumbnail.html.erb to make it consistent with new card display (#6581) * Update _thumbnail.html.erb * Update style.css * Update node_shared_test.rb * Update _thumbnail.html.erb * Update _notes.html.erb * Update _notes.html.erb * Update _notes.html.erb * added ApplicationController.helpers.logged_in_as * Update _notes.html.erb * self.current_user in application_helper.rb * Update application_helper.rb * switch to "@current_user && ['admin','moderator'].includes?(@current_user.role)" * PL.editor shows map if lat,lon passed in URL. (#6788) * pl-editor shows map * indentation * yarn.lock added for PL.editor * safe traverse syntax used * handle nils * Update _notes.html.erb * new navbar but should mostly be in a feature * some translations adjustments * final navbar * fixes for collapse menu * fixes for collapse menu 2 * rest of menus --- .../application/i18n/translations.js | 3 - app/views/features/new.html.erb | 5 +- app/views/layouts/_header.html.erb | 95 ++++++++++--------- config/i18n-js.yml | 1 - config/locales/en.yml | 2 +- 5 files changed, 56 insertions(+), 50 deletions(-) delete mode 100644 app/assets/javascripts/application/i18n/translations.js diff --git a/app/assets/javascripts/application/i18n/translations.js b/app/assets/javascripts/application/i18n/translations.js deleted file mode 100644 index 203d59a497..0000000000 --- a/app/assets/javascripts/application/i18n/translations.js +++ /dev/null @@ -1,3 +0,0 @@ -I18n.translations || (I18n.translations = {}); -I18n.translations["en"] = I18n.extend((I18n.translations["en"] || {}), {"js":{"dashboard":{"all_updates":"All updates","none":"None","selected_updates":"Selected updates"}}}); -I18n.translations["de"] = I18n.extend((I18n.translations["de"] || {}), {"js":{"dashboard":{"all_updates":"Alle updates","none":"Keiner","selected_updates":"Ausgewählte Updates"}}}); diff --git a/app/views/features/new.html.erb b/app/views/features/new.html.erb index a4a05df2cb..7d6c2169e2 100644 --- a/app/views/features/new.html.erb +++ b/app/views/features/new.html.erb @@ -1,8 +1,11 @@

New Feature

+ + +
<% url = { :controller => "features", :action => "create", :id => params[:id] } %> -<%= form_for :revision, :as => :revision, :url => url, :html => {:class => "form card bg-light card-body"} do |f| %> +<%= form_for :revision, :as => :revision, :url => url, :html => {:class => "form"} do |f| %> <% if f.error_messages != "" %>
<%= f.error_messages :header_message => "Your note couldn't be saved." %>
<% end %> diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 48b2826a7a..3a92f1a574 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -1,4 +1,4 @@ - <% cache('feature_anniversary-banner', skip_digest: true) do %> +<% cache('feature_anniversary-banner', skip_digest: true) do %> <%= feature('anniversary-banner') %> <% end %> @@ -25,23 +25,40 @@
+ +
+ <%= t('layout._header.store') %> + <%= t('layout._header.donate') %> + + <% if current_user %> + Dashboard + <% else %> + <%= t('layout._header.join') %> + <% end %> +
diff --git a/config/i18n-js.yml b/config/i18n-js.yml index 9b0ddae384..17c8f9a910 100644 --- a/config/i18n-js.yml +++ b/config/i18n-js.yml @@ -1,3 +1,2 @@ translations: - file: "app/assets/javascripts/application/i18n/translations.js" - only: '*.js.*' \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index 298f39870b..d3ae87f76f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -561,7 +561,7 @@ en: board: "Non-profit board" fund: "How we're funded" press_and_media: "Press and Media" - contact: "Contact the staff" + contact: "Contact" get_involved: get_involved_title: "Get Involved" getting_started: "Getting started"