frontend: header size for shared organisation #771
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jma
approved these changes
Feb 21, 2022
| @app.route('/<org_code:view>') | ||
| def index(view): | ||
| """Homepage.""" | ||
| return render_template('sonar/frontpage.html') |
There was a problem hiding this comment.
Do you need to put a default view?
| @@ -18,7 +18,8 @@ | |||
| <nav class="navbar navbar-expand-lg bg-{{ 'header' if page == 'home' else 'organisation' }}"> | |||
| <div class="container"> | |||
| {% if page != 'home' %} | |||
| <a class="navbar-brand" href="{{ url_for('index', view=view_code) }}"> | |||
| {% set url = url_for('index') if (not view or view == config.SONAR_APP_DEFAULT_ORGANISATION) else url_for('index', view=view_code) %} | |||
There was a problem hiding this comment.
the default org code can be set in the python code.
| @@ -29,11 +30,10 @@ | |||
| {% endif %} | |||
| {% else %} | |||
| <img src="{{ url_for('static', filename='images/global-logo.svg') }}" | |||
| height="{{ '30' if g.get('organisation') else '50' }}" | |||
| class="d-inline-block align-top {{ '' if g.get('organisation') else 'my-2' }}" alt="{{ _('SONAR logo') }}"> | |||
| height="{{ '30' if g.get('organisation') and page == 'home' else '50' }}" | |||
There was a problem hiding this comment.
It would be better with a css class.
|
* Closes rero#641. Co-Authored-by: Bertrand Zuchuat <bertrand.zuchuat@rero.ch>
Garfield-fr
force-pushed
the
zub-shared-header
branch
from
f7282b3 to
6dbc82e
Compare
pronguen
approved these changes
Mar 3, 2022
mmo
approved these changes
Mar 7, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Co-Authored-by: Bertrand Zuchuat bertrand.zuchuat@rero.ch
Why are you opening this PR?
How to test?
Code review check list