-
Notifications
You must be signed in to change notification settings - Fork 5
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feature: Update nav bar design #238
Conversation
e4a9b5c
to
17c589c
Compare
f40d149
to
600a05d
Compare
…nto feature/update-nav-bar-design
app/views/layouts/_topnav.html.haml
Outdated
%li.nav-item.dropdown | ||
= link_to("#", id: "supportMenuDropdownLink", class: "nav-link dropdown-toggle", role: "button", data: {toggle: "dropdown"}, aria: {haspopup: "true", expanded: "false"}) do | ||
%select.nav-language | ||
%option{:value => "EN"} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thinks of a way to get the portal languages, and not put static ones
app/views/layouts/_topnav.html.haml
Outdated
@@ -59,3 +33,17 @@ | |||
= link_to(t(:_help), "#{$WIKI_HELP_PAGE}", target: "_blank", class: "dropdown-item") | |||
= link_to(t(:_release_notes), "#{$RELEASE_NOTES}", target: "_blank", class: "dropdown-item") | |||
= link_to(t(:_publications), $PUBLICATIONS_URL, target: "_blank", class: "dropdown-item") | |||
:javascript |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
instead of using this js code, use directly bootstrap if possible or a stimulus controller (or add it to an existent old js file )
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's not possible to use bootstrap with the existing code,
It's better to keep the existing js lines like this, cause It uses querySelectorAll with 8 classes, adding it as targets in stimulus will just complicate things.
Conflicts: app/assets/stylesheets/nav_bar.scss app/helpers/application_helper.rb app/views/layouts/_topnav.html.haml
…nto feature/update-nav-bar-design
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note for me: this PR needs changes in our configuration files and locales
The new $HOME_PAGE_LOGOS configuration :
$HOME_PAGE_LOGOS = {
supported_by: [
{
img_src: 'logos/supports/numev.png',
url: 'http://www.lirmm.fr/numev',
target: '_blank',
},
{
img_src: 'logos/supports/anr.png',
url: 'https://anr.fr/en',
target: '_blank',
},
{
img_src: 'logos/supports/eu.png',
url: 'https://commission.europa.eu/research-and-innovation_en',
target: '_blank',
}
],
with_the_collaboration_of: [
{
img_src: 'logos/collaboration/d2kab.png',
url: 'http://d2kab.mystrikingly.com',
target: '_blank',
},
{
img_src: 'logos/collaboration/lirmm.png',
url: 'http://www.lirmm.fr',
target: '_blank',
},
{
img_src: 'logos/collaboration/inrae.png',
url: 'https://www.inrae.fr/enm',
target: '_blank',
},
{
img_src: 'logos/collaboration/stanford.png',
url: 'https://www.stanford.edu',
target: '_blank',
},
]
}
The new locales
index:
tagline: The home of vocabularies and ontologies in agronomy and related fields.
welcome: Welcome to %{site},
Some modifications that I did:
|
…design Feature: Update nav bar design
… previews in the lookbook (#336) * Merge pull request #234 from ontoportal-lirmm/feature/update-footer-design Feature: Update footer design * Merge pull request #249 from ontoportal-lirmm/feature/update-account-page-submited-onto Feature: Update account page submitted ontologies * Merge pull request #236 from ontoportal-lirmm/feature/lookbook Feature: Add Lookbook to preview components * Merge pull request #242 from ontoportal-lirmm/feature/lookbook Feature: Add Lookbook to preview view components - fix the new version release * Merge pull request #262 from ontoportal-lirmm/feature/add-rounded-button-component-to-lookbook Feature: Add rounded button to lookbook * Merge pull request #248 from ontoportal-lirmm/feature/add-notification-message-component Feature: Add notification message component * Merge pull request #268 from ontoportal-lirmm/feature/add-submission-fields-components Feature: Add submission fields components * Merge pull request #288 from ontoportal-lirmm/feature/add-upload-ontology-components-to-lookbook Feature: Add form inputs components to lookbook * Merge pull request #284 from ontoportal-lirmm/feature/update-nested-from-input-component-design Feature: Update nested form input component design * Merge pull request #282 from ontoportal-lirmm/feature/extract-search-input-component Feature: Extract search input component * Merge pull request #296 from ontoportal-lirmm/feature/re-organize-lookbook Feature: Re organize lookbook previews * Merge pull request #305 from ontoportal-lirmm/feature/add-table-component Feature: Add table component & Migrate the views to use it * Merge pull request #312 from ontoportal-lirmm/feature/extract-search-input-component Feature: Extract search input component - follow up * Merge pull request #313 from ontoportal-lirmm/fix/nested-from-component-empty-state Fix: Nested form component empty state * Merge pull request #301 from ontoportal-lirmm/feature/add-switch-input-preview Feature: Add switch input preview * Merge pull request #304 from ontoportal-lirmm/feature/add-link-text-components Feature: Add link text components * Merge pull request #310 from ontoportal-lirmm/feature/update-select-component Feature: update select component * Merge pull request #300 from ontoportal-lirmm/feature/add-modal-link-component Feature: Add modal component preview and helpers * Merge pull request #303 from ontoportal-lirmm/feature/add-pill-button Feature: Add pill button * Merge pull request #297 from ontoportal-lirmm/feature/add-tabs-component Feature: Add tabs component * Merge pull request #306 from ontoportal-lirmm/feature/add-circle-progress-bar-component Feature: Add circle progress bar component (style, JS, code and preview) * Merge pull request #247 from ontoportal-lirmm/feature/update-agroportal-primary-color Feature: Update AgroPortal primary color * Merge pull request #319 from ontoportal-lirmm/feature/extract-form-input-components Feature: Extract form input components * Merge pull request #324 from ontoportal-lirmm/feature/add-summary-page-components Feature: Extract summary page components * Merge pull request #314 from ontoportal-lirmm/add-buttons-components-to-lookbook Feature: Add buttons components to lookbook * Feature: Add progress pages component (#328) * add progress pages component * put again the type argument for button component * fix progress pages item not center if test is long * make progress pages container take full width by default * Fix progress item position (first & last one) to be aligned with the content * fix progress item checked state to show the icon and the good background * make the progress page component preview width bigger --------- Co-authored-by: Bilel Kihal <[email protected]> * Merge pull request #259 from ontoportal-lirmm/feature/add-other-states-to-card-message-component Feature: Add warning state to card message component * Merge pull request #238 from ontoportal-lirmm/feature/update-nav-bar-design Feature: Update nav bar design * Merge pull request #331 from ontoportal-lirmm/feature/update-404-error-design Feature: Update 404 error design * Merge pull request #263 from ontoportal-lirmm/feature/update-nav-bar-design Fix: replace nav_bar css nav-link to top-nav-nav-link to prevent conflicts --------- Co-authored-by: Bilel Kihal <[email protected]>
… previews in the lookbook (#336) * Merge pull request #234 from ontoportal-lirmm/feature/update-footer-design Feature: Update footer design * Merge pull request #249 from ontoportal-lirmm/feature/update-account-page-submited-onto Feature: Update account page submitted ontologies * Merge pull request #236 from ontoportal-lirmm/feature/lookbook Feature: Add Lookbook to preview components * Merge pull request #242 from ontoportal-lirmm/feature/lookbook Feature: Add Lookbook to preview view components - fix the new version release * Merge pull request #262 from ontoportal-lirmm/feature/add-rounded-button-component-to-lookbook Feature: Add rounded button to lookbook * Merge pull request #248 from ontoportal-lirmm/feature/add-notification-message-component Feature: Add notification message component * Merge pull request #268 from ontoportal-lirmm/feature/add-submission-fields-components Feature: Add submission fields components * Merge pull request #288 from ontoportal-lirmm/feature/add-upload-ontology-components-to-lookbook Feature: Add form inputs components to lookbook * Merge pull request #284 from ontoportal-lirmm/feature/update-nested-from-input-component-design Feature: Update nested form input component design * Merge pull request #282 from ontoportal-lirmm/feature/extract-search-input-component Feature: Extract search input component * Merge pull request #296 from ontoportal-lirmm/feature/re-organize-lookbook Feature: Re organize lookbook previews * Merge pull request #305 from ontoportal-lirmm/feature/add-table-component Feature: Add table component & Migrate the views to use it * Merge pull request #312 from ontoportal-lirmm/feature/extract-search-input-component Feature: Extract search input component - follow up * Merge pull request #313 from ontoportal-lirmm/fix/nested-from-component-empty-state Fix: Nested form component empty state * Merge pull request #301 from ontoportal-lirmm/feature/add-switch-input-preview Feature: Add switch input preview * Merge pull request #304 from ontoportal-lirmm/feature/add-link-text-components Feature: Add link text components * Merge pull request #310 from ontoportal-lirmm/feature/update-select-component Feature: update select component * Merge pull request #300 from ontoportal-lirmm/feature/add-modal-link-component Feature: Add modal component preview and helpers * Merge pull request #303 from ontoportal-lirmm/feature/add-pill-button Feature: Add pill button * Merge pull request #297 from ontoportal-lirmm/feature/add-tabs-component Feature: Add tabs component * Merge pull request #306 from ontoportal-lirmm/feature/add-circle-progress-bar-component Feature: Add circle progress bar component (style, JS, code and preview) * Merge pull request #247 from ontoportal-lirmm/feature/update-agroportal-primary-color Feature: Update AgroPortal primary color * Merge pull request #319 from ontoportal-lirmm/feature/extract-form-input-components Feature: Extract form input components * Merge pull request #324 from ontoportal-lirmm/feature/add-summary-page-components Feature: Extract summary page components * Merge pull request #314 from ontoportal-lirmm/add-buttons-components-to-lookbook Feature: Add buttons components to lookbook * Feature: Add progress pages component (#328) * add progress pages component * put again the type argument for button component * fix progress pages item not center if test is long * make progress pages container take full width by default * Fix progress item position (first & last one) to be aligned with the content * fix progress item checked state to show the icon and the good background * make the progress page component preview width bigger --------- Co-authored-by: Bilel Kihal <[email protected]> * Merge pull request #259 from ontoportal-lirmm/feature/add-other-states-to-card-message-component Feature: Add warning state to card message component * Merge pull request #238 from ontoportal-lirmm/feature/update-nav-bar-design Feature: Update nav bar design * Merge pull request #331 from ontoportal-lirmm/feature/update-404-error-design Feature: Update 404 error design * Merge pull request #263 from ontoportal-lirmm/feature/update-nav-bar-design Fix: replace nav_bar css nav-link to top-nav-nav-link to prevent conflicts --------- Co-authored-by: Bilel Kihal <[email protected]>
Problems
Solution
todo
Screenshots
before

After
