Skip to content
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

Ajuste de responsividade da página inicial até a página do artigo. #32

Merged
merged 2 commits into from
Aug 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion opac/webapp/static/css/bootstrap.css

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion opac/webapp/templates/article/includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
{% import 'macros/collection.html' as coll_macro %}

<style>
body{

/*
Vale apenas para o article
*/
body{
padding-top: 74px;
}
header{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@

{% if session.lang %}

<h5 class="card-title">
<strong class="card-title">
{{ article.get_title_by_lang(session.lang[:2])|default(_('Documento sem título'), true)|striptags|truncate(80)|capitalize }}
</h5>
</strong>

{% endif %}

<a href="{{ url_for('.article_detail_v3', url_seg=article.journal.url_segment, article_pid_v3=article.aid) }}" class="btn btn-secondary">{% trans%}Continue lendo{% endtrans %}</a>
<a href="{{ url_for('.article_detail_v3', url_seg=article.journal.url_segment, article_pid_v3=article.aid) }}" class="btn btn-secondary d-block mb-0">{% trans%}Continue lendo{% endtrans %}</a>
</div>

</div>
4 changes: 3 additions & 1 deletion opac/webapp/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ <h4 class="modal-title">Mensagem</h4>
<script src="{{ url_for('static', filename='js/jquery.min.js') }}"></script>
<script src="{{ url_for('static', filename='js/bootstrap.bundle.js') }}"></script>
<script src="{{ url_for('static', filename='js/scielo-ds-min.js') }}"></script>



<!--
Carregando o slick
Expand Down Expand Up @@ -243,7 +245,7 @@ <h4 class="modal-title">Mensagem</h4>
// add rows article search
let addRowBtn = $('.addRowBtn');
let placeRow = $('.scielo__dinamic-row');
let newFormRow = '<div class="row"><div class="col-12"><hr></div><div class="col-2 col-lg-1 text-end"><button type="button" class="btn btn-danger scielo__btn-with-icon--only"><i class="material-icons-outlined">clear</i></button></div><div class="col-10 col-lg-11"><div class="input-group"><div class="input-group-preppend"><select class="form-select"><option selected value="and">AND</option><option value="or">OR</option><option value="and not">AND NOT</option></select></div><textarea class="form-control" aria-label="With textarea" placeholder="Entre uma ou mais palavras"></textarea><div class="input-group-append"><select class="form-select"><option selected value="todos">Todos os índices</option><option value="ano">Ano</option><option value="autor">Autor</option><option value="financiador">Financiador</option><option value="periodico">Periódico</option><option value="resumo">Resumo</option><option value="titulo">Título</option></select></div></div></div></div>';
let newFormRow = '<div class="row"><div class="col-12"><hr></div><div class="col-2 col-lg-1 text-end"><button type="button" class="btn btn-danger scielo__btn-with-icon--only"><i class="material-icons-outlined">clear</i></button></div><div class="col-10 col-lg-11"><div class="input-group"><div class="input-group-preppend"><select class="form-select"><option selected value="and">AND</option><option value="or">OR</option><option value="and not">AND NOT</option></select></div><textarea name="q[]" class="form-control" aria-label="With textarea" placeholder="Entre uma ou mais palavras"></textarea><div class="input-group-append"><select class="form-select"><option selected value="todos">Todos os índices</option><option value="ano">Ano</option><option value="autor">Autor</option><option value="financiador">Financiador</option><option value="periodico">Periódico</option><option value="resumo">Resumo</option><option value="titulo">Título</option></select></div></div></div></div>';

let btnRemoveRow = $('.btn-danger');

Expand Down
35 changes: 21 additions & 14 deletions opac/webapp/templates/collection/base.html
Original file line number Diff line number Diff line change
@@ -1,33 +1,40 @@
{% extends "base.html" %}
{% block body_class %}portal collection{% endblock %}
{% block content %}
<div class="alert-warning" style="padding: 0 5px; text-align: center">

{% with html_lang=session.get('lang', config.get('BABEL_DEFAULT_LOCALE')) %}
{% if config.get('ALERT_MSG') %}
<span>

<div class="alert alert-warning alert-dismissible text-center">

{% if html_lang == 'pt_BR' %}
{{ config.get('ALERT_MSG_PT') }}
{% elif html_lang == 'es' %}
{{ config.get('ALERT_MSG_ES') }}
{% else %}
{{ config.get('ALERT_MSG_EN') }}
{% endif %}
</span>
{% endif %}

{% if config.get('PREVIOUS_WEBSITE_URI') %}
{% if '://' in config.get('PREVIOUS_WEBSITE_URI') %}
<a href="{{ config.get('PREVIOUS_WEBSITE_URI') }}">
{{ config.get('PREVIOUS_WEBSITE_URI') }}
</a>
{% else %}
<a href="https://{{ config.get('PREVIOUS_WEBSITE_URI') }}">
{{ config.get('PREVIOUS_WEBSITE_URI') }}
</a>
{% if config.get('PREVIOUS_WEBSITE_URI') %}
{% if '://' in config.get('PREVIOUS_WEBSITE_URI') %}
<a href="{{ config.get('PREVIOUS_WEBSITE_URI') }}">
{{ config.get('PREVIOUS_WEBSITE_URI') }}
</a>
{% else %}
<a href="https://{{ config.get('PREVIOUS_WEBSITE_URI') }}">
{{ config.get('PREVIOUS_WEBSITE_URI') }}
</a>
{% endif %}
{% endif %}

<button type="button" class="close" data-dismiss="alert" aria-label="Close" onclick="this.parentElement.style.display = 'none';"></button>
</div>

{% endif %}


{% endwith %}
</div>

{% include "collection/includes/header.html" %}
{% block level_menu %}{% endblock %}

Expand Down
13 changes: 11 additions & 2 deletions opac/webapp/templates/collection/includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,16 @@
<div class="col-2 col-sm-1">
{% include "collection/includes/nav.html" %}
</div>

<div class="col">


</div>
<div class="col-3">
<div class="d-none d-lg-block mt-4 text-end">
<a href="{{ url_for('.about_collection') }}" class="onlineSubmission d-none d-lg-block">
<span class="material-icons-outlined">info</span>
{% trans %}Sobre o{% endtrans %} SciELO {{ coll_macro.get_collection_name() }}
</a>
</div>
</div>
<div class="col-2">
<div class="language mt-3">
Expand All @@ -81,9 +88,11 @@
</div>
<div class="row">
<div class="col text-center">
<a href="/">
<div class="scielo__logo-scielo-caption mt-1">
<small>Brasil</small>
</div>
</a>
</div>
</div>

Expand Down
53 changes: 24 additions & 29 deletions opac/webapp/templates/collection/includes/levelMenu_search.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{% import 'macros/collection.html' as coll_macro %}

<!--
<section class="levelMenu d-none">
<div class="container">
<a href="{{ url_for('.about_collection') }}" class="onlineSubmission d-none d-lg-block">
Expand Down Expand Up @@ -88,40 +89,36 @@
</form>
</div>
</section>
-->

<section class="d-none">
<div class="container">
<div class="row">
<div class="col-12 text-end">
<a href="#">
<span class="material-icons-outlined">info</span>
Sobre o SciELO Brasil
</a>
</div>
</div>
</div>
</section>
<section class="scielo__search-articles mb-5">
<div class="container">

<form method="get" action="{{ config.URL_SEARCH }}" id="searchForm" name="searchForm">
<input type="hidden" name="q" id="q" value="">
<input type="hidden" name="lang" id="lang" value="{% if session.lang %}{{ session.lang[:2] }}{% endif %}">
<input type="hidden" name="filter[in][]" value="{{ config.OPAC_COLLECTION }}">
</form>
<form name="searchFormBuilder" action="{{ config.URL_SEARCH }}" method="get" class="searchForm searchFormBuilder">
<div class="row">
<div class="col-12 col-md-8 col-lg-10">

<div class="row">
<div class="col">

<div class="input-group">
<textarea class="form-control" aria-label="With textarea" placeholder="Entre uma ou mais palavras"></textarea>
<textarea name="q[]" placeholder="{% trans %}Entre uma ou mais palavras{% endtrans %}" rows="1" class="form-control"></textarea>
<a href="javascript:;" class="clearIptText showTooltip" title="Limpar expressão" style="display: none;"></a>

<div class="input-group-append">
<select class="form-select">
<option selected value="todos">Todos os índices</option>
<option value="ano">Ano</option>
<option value="autor">Autor</option>
<option value="financiador">Financiador</option>
<option value="periodico">Periódico</option>
<option value="resumo">Resumo</option>
<option value="titulo">Título</option>
</select>
<select name="index[]" class="form-select">
<option value="">{% trans %}Todos os índices{% endtrans %}</option>
<option value="year_cluster">{% trans %}Ano{% endtrans %}</option>
<option value="au">{% trans %}Autor{% endtrans %}</option>
<option value="sponsor">{% trans %}Financiador{% endtrans %}</option>
<option value="ta">{% trans %}Periódico{% endtrans %}</option>
<option value="ab">{% trans %}Resumo{% endtrans %}</option>
<option value="ti">{% trans %}Título{% endtrans %}</option>
</select>
</div>
</div>

Expand All @@ -137,8 +134,8 @@
<div class="row">
<div class="col-12 text-end">

<a href="#" class="addRowBtn mt-3 d-block d-md-inline-block btn btn-link ps-0 pe-0">
Adicionar outro campo
<a href="#" class="addRowBtn d-block d-md-inline-block btn btn-link ps-0 pe-0 my-0">
{% trans %}Adicionar outro campo{% endtrans %}
</a>

</div>
Expand All @@ -152,12 +149,10 @@

</div>
<div class="col-12 col-md-4 col-lg-2 d-grid gap-2">
<button type="button" class="btn btn-primary">
Buscar
</button>
<input type="submit" value="{% trans %}Buscar{% endtrans %}" class="btn btn-primary">
</div>
</div>
</form>
</div>
</section>

Expand Down
4 changes: 2 additions & 2 deletions opac/webapp/templates/collection/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@


{% block main_content %}
<section class="collection">
<section class="collection mb-5">
<div class="container">

{% if config.USE_HOME_METRICS %}
Expand Down Expand Up @@ -62,7 +62,7 @@ <h2>{{ coll_macro.get_collection_name() }} <span >{% trans %}em números | Métr

<h2 class="h4 text-center text-md-start">{% trans %}Lista de periódicos{% endtrans %}</h2>

<div class="scielo__levelMenu mb-5">
<div class="scielo__levelMenu">
<div class="container">
<div class="row align-items-center">
<div class="col-6 col-sm-3 col-md-2">
Expand Down
18 changes: 9 additions & 9 deletions opac/webapp/templates/includes/footer.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<footer>
<section class="address-scielo">
<section class="address-scielo pt-4 pb-4">
<div class="container">
<div class="row">
<div class="col col-12 col-sm-2 text-center">
Expand All @@ -17,13 +17,13 @@
<div class="container">

<div class="row">
<div class="col partners text-center">
<a href="http://www.fapesp.br/" target="_blank"><img src="{{ url_for('static', filename='img/logo-footer-fapesp.svg', _external=True) }}" alt="FAPESP"></a>
<a href="http://www.capes.gov.br/" target="_blank"><img src="{{ url_for('static', filename='img/logo-footer-capes.svg', _external=True) }}" height="27" alt="CAPES"></a>
<a href="http://www.cnpq.br/" target="_blank"><img src="{{ url_for('static', filename='img/logo-footer-cnpq.svg', _external=True) }}" alt="CNPq"></a>
<a href="http://bvsalud.org/" target="_blank"><img src="{{ url_for('static', filename='img/logo-footer-bvs.svg', _external=True) }}" alt="BVS"></a>
<a href="http://regional.bvsalud.org/bvs/bireme/homepage.htm" target="_blank"><img src="{{ url_for('static', filename='img/logo-footer-bireme.svg', _external=True) }}" alt="BIREME"></a>
<a href="https://www.fapunifesp.edu.br/" target="_blank"><img src="{{ url_for('static', filename='img/logo-footer-fap.svg', _external=True) }}" alt="FAP-UNIFESP"></a>
<div class="col --partners text-center mt-4 mb-4">
<a class="mx-4 my-2 d-inline-block" href="http://www.fapesp.br/" target="_blank"><img src="{{ url_for('static', filename='img/logo-footer-fapesp.svg', _external=True) }}" alt="FAPESP"></a>
<a class="mx-4 my-2 d-inline-block" href="http://www.capes.gov.br/" target="_blank"><img src="{{ url_for('static', filename='img/logo-footer-capes.svg', _external=True) }}" height="27" alt="CAPES"></a>
<a class="mx-4 my-2 d-inline-block" href="http://www.cnpq.br/" target="_blank"><img src="{{ url_for('static', filename='img/logo-footer-cnpq.svg', _external=True) }}" alt="CNPq"></a>
<a class="mx-4 my-2 d-inline-block" href="http://bvsalud.org/" target="_blank"><img src="{{ url_for('static', filename='img/logo-footer-bvs.svg', _external=True) }}" alt="BVS"></a>
<a class="mx-4 my-2 d-inline-block" href="http://regional.bvsalud.org/bvs/bireme/homepage.htm" target="_blank"><img src="{{ url_for('static', filename='img/logo-footer-bireme.svg', _external=True) }}" alt="BIREME"></a>
<a class="mx-4 my-2 d-inline-block" href="https://www.fapunifesp.edu.br/" target="_blank"><img src="{{ url_for('static', filename='img/logo-footer-fap.svg', _external=True) }}" alt="FAP-UNIFESP"></a>
</div>
</div>
</div>
Expand All @@ -33,7 +33,7 @@
<div class="row">
<div class="col">
<p class="text-center"><a href="{{ url_for('.about_collection') }}"><img src="{{ url_for('static', filename='img/logo-open-access.svg', _external=True) }}" alt="{% trans %}Open Access{% endtrans %}" class="logo-open-access"></a> <a href="{{ url_for('.about_collection') }}">{% trans %}Leia{% endtrans %}</a> {% trans %}a Declaração de Acesso Aberto{% endtrans %}</p>
</div>
</div>
</div>
</div>
</section>
Expand Down
2 changes: 2 additions & 0 deletions opac/webapp/templates/issue/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
{% block content %}

{% include "journal/includes/header.html" %}

{% include "journal/includes/journal_info.html" %}
<!-- alterar o levelmenu -->
{% include "journal/includes/levelMenu.html" %}

Expand Down
Loading