Skip to content

Commit 01cbc8a

Browse files
robertatakenakarobertatakenaka
authored
Corrige local do menu superior esquerdo (#1074)
* feat(htmlgenerator): add article-section-header reusable template * refactor(htmlgenerator): update article layout grid and responsivity * refactor(htmlgenerator): use section-header template in references * refactor(htmlgenerator): use section-header template in data availability * refactor(htmlgenerator): use section-header template in history section * refactor(htmlgenerator): use section-header template in publication dates * refactor(htmlgenerator): use section-header template in abstracts * Atualiza css obtido do opac_5 * feat(ui): add scrollbar-gutter stable to modal-dialog-scrollable * fix(ref): remove redundant div wrapper in article-text-ref * refactor(abstract): use article-section-header template for consistency
1 parent 7f294eb commit 01cbc8a

9 files changed

Lines changed: 71 additions & 56 deletions

File tree

‎packtools/catalogs/htmlgenerator/v3.0/article-meta-abstract.xsl‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,9 @@
6565
</xsl:with-param>
6666
</xsl:apply-templates>
6767
</xsl:variable>
68-
69-
<div class="articleSection" data-anchor="{$title}">
70-
<h2 class="h5"><xsl:value-of select="$title"/></h2>
71-
</div>
68+
<xsl:call-template name="article-section-header">
69+
<xsl:with-param name="title" select="$title"/>
70+
</xsl:call-template>
7271
</xsl:if>
7372
</xsl:template>
7473

@@ -81,19 +80,13 @@
8180
<xsl:if test="not($gs_abstract_lang)">
8281
<!-- âncora -->
8382
<!-- manter pareado class="articleSection" e data-anchor="nome da seção no menu esquerdo" -->
84-
<xsl:variable name="title"><xsl:apply-templates select="." mode="title"/></xsl:variable>
85-
<xsl:attribute name="class">articleSection articleSection--<xsl:value-of select="translate($title,'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz')"/></xsl:attribute>
86-
<xsl:attribute name="data-anchor"><xsl:apply-templates select="." mode="title"/></xsl:attribute>
83+
<xsl:call-template name="article-section-header">
84+
<xsl:with-param name="title"><xsl:apply-templates select="." mode="title"/></xsl:with-param>
85+
</xsl:call-template>
8786
<xsl:if test="@xml:lang='ar'">
8887
<xsl:attribute name="dir">rtl</xsl:attribute>
8988
</xsl:if>
9089
</xsl:if>
91-
92-
<!-- título -->
93-
<h2>
94-
<xsl:attribute name="class">h5</xsl:attribute>
95-
<xsl:apply-templates select="." mode="title"></xsl:apply-templates>
96-
</h2>
9790
</xsl:template>
9891

9992
<xsl:template match="*[contains(name(),'abstract')]" mode="index">

‎packtools/catalogs/htmlgenerator/v3.0/article-text-ref.xsl‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,11 @@
1515
<xsl:apply-templates select="*"/>
1616
</xsl:when>
1717
<xsl:otherwise>
18+
<!-- manter pareado class="articleSection" e data-anchor="nome da seção no menu esquerdo" -->
1819
<div>
19-
<!-- manter pareado class="articleSection" e data-anchor="nome da seção no menu esquerdo" -->
20-
<xsl:attribute name="class">articleSection</xsl:attribute>
21-
<xsl:attribute name="data-anchor"><xsl:apply-templates select="." mode="title"/></xsl:attribute>
22-
<h2>
23-
<xsl:attribute name="class">h5</xsl:attribute>
24-
<xsl:apply-templates select="." mode="title"/>
25-
</h2>
20+
<xsl:call-template name="article-section-header">
21+
<xsl:with-param name="title"><xsl:apply-templates select="." mode="title"/></xsl:with-param>
22+
</xsl:call-template>
2623
<div class="row">
2724
<div class="col ref-list">
2825
<ul class="refList articleFootnotes">

‎packtools/catalogs/htmlgenerator/v3.0/article-text-section-data-availability.xsl‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,10 @@
4545
</xsl:apply-templates>
4646
</xsl:variable>
4747
<!-- manter pareado class="articleSection" e data-anchor="nome da seção no menu esquerdo" -->
48-
<div class="articleSection">
49-
<xsl:attribute name="data-anchor"><xsl:value-of select="$title"/></xsl:attribute>
50-
<h2 class="h5"><xsl:value-of select="$title"/></h2>
48+
<div>
49+
<xsl:call-template name="article-section-header">
50+
<xsl:with-param name="title" select="$title"/>
51+
</xsl:call-template>
5152
</div>
5253
</xsl:template>
5354

‎packtools/catalogs/htmlgenerator/v3.0/article.xsl‎

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,12 @@
133133
<link rel="stylesheet" href="https://ds.scielo.org/css/article.css"/-->
134134
<link rel="stylesheet" href="{$CSS_PATH}/bootstrap.css"/>
135135
<link rel="stylesheet" href="{$CSS_PATH}/article.css"/>
136+
<style>
137+
.modal-dialog-scrollable .modal-body {
138+
overflow-y:auto;
139+
scrollbar-gutter:stable;
140+
}
141+
</style>
136142
</xsl:template>
137143

138144
<xsl:template match="/" mode="js">
@@ -186,24 +192,29 @@
186192
<xsl:with-param name="text">article_navigation</xsl:with-param>
187193
</xsl:apply-templates>
188194
</xsl:variable>
189-
<nav role="navigation" aria-label="{$navigation_text}">
190-
<ul class="-articleMenu list-group mt-4">
191-
<!-- item do menu lateral esquerdo -->
192-
</ul>
193-
</nav>
194-
<xsl:choose>
195-
<xsl:when test="$gs_abstract_lang">
196-
<xsl:apply-templates select="." mode="div-abstract"/>
197-
</xsl:when>
198-
<xsl:otherwise>
199-
<xsl:apply-templates select="." mode="div-article"/>
200-
</xsl:otherwise>
201-
</xsl:choose>
195+
<div class="row">
196+
<div class="col-12 col-md-4 col-lg-3">
197+
<nav role="navigation" aria-label="{$navigation_text}">
198+
<ul class="-articleMenu list-group mt-4">
199+
<!-- item do menu lateral esquerdo -->
200+
</ul>
201+
</nav>
202+
</div>
203+
<div class="col-sm-12 col-md-8 col-lg-9">
204+
<xsl:choose>
205+
<xsl:when test="$gs_abstract_lang">
206+
<xsl:apply-templates select="." mode="div-abstract"/>
207+
</xsl:when>
208+
<xsl:otherwise>
209+
<xsl:apply-templates select="." mode="div-article"/>
210+
</xsl:otherwise>
211+
</xsl:choose>
212+
</div>
213+
</div>
202214
</xsl:template>
203215

204216
<xsl:template match="article" mode="div-article">
205-
<article id="articleText"
206-
class="col-sm-12 col-lg-10 offset-lg-2">
217+
<article id="articleText">
207218
<xsl:apply-templates select="." mode="article-meta-product"/>
208219
<xsl:apply-templates select="." mode="article-meta-abstract"/>
209220
<xsl:apply-templates select="." mode="article-meta-no-abstract-keywords"/>
@@ -229,8 +240,7 @@
229240
</xsl:template>
230241

231242
<xsl:template match="article" mode="div-abstract">
232-
<article id="articleText"
233-
class="col-md-10 col-md-offset-2 col-sm-12 col-sm-offset-0">
243+
<article id="articleText">
234244
<xsl:apply-templates select="." mode="article-meta-abstract-gs"/>
235245
</article>
236246
</xsl:template>

‎packtools/catalogs/htmlgenerator/v3.0/generic-history.xsl‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@
77

88
<xsl:template match="history" mode="history-section">
99
<!-- manter pareado class="articleSection" e data-anchor="nome da seção no menu esquerdo" -->
10-
<div class="articleSection">
11-
<xsl:attribute name="data-anchor"><xsl:apply-templates select="." mode="text-labels">
10+
<xsl:variable name="title">
11+
<xsl:apply-templates select="." mode="text-labels">
1212
<xsl:with-param name="text">History</xsl:with-param>
13-
</xsl:apply-templates></xsl:attribute>
14-
<h2 class="h5"><xsl:apply-templates select="." mode="text-labels">
15-
<xsl:with-param name="text">History</xsl:with-param>
16-
</xsl:apply-templates></h2>
13+
</xsl:apply-templates>
14+
</xsl:variable>
15+
<div>
16+
<xsl:call-template name="article-section-header">
17+
<xsl:with-param name="title" select="$title"/>
18+
</xsl:call-template>
1719
<div class="row">
1820
<div class="col-md-12 col-sm-12">
1921
<ul class="articleTimeline">

‎packtools/catalogs/htmlgenerator/v3.0/generic-pub-date.xsl‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@
88
<xsl:template match="article-meta | sub-article | response" mode="generic-pub-date">
99
<xsl:if test=".//pub-date">
1010
<!-- manter pareado class="articleSection" e data-anchor="nome da seção no menu esquerdo" -->
11-
<div class="articleSection">
12-
<xsl:attribute name="data-anchor"><xsl:apply-templates select="." mode="text-labels">
13-
<xsl:with-param name="text">Publication Dates</xsl:with-param>
14-
</xsl:apply-templates></xsl:attribute>
15-
<h2 class="h5"><xsl:apply-templates select="." mode="text-labels">
16-
<xsl:with-param name="text">Publication Dates</xsl:with-param>
17-
</xsl:apply-templates></h2>
11+
<xsl:variable name="title">
12+
<xsl:apply-templates select="." mode="text-labels">
13+
<xsl:with-param name="text">publication dates</xsl:with-param>
14+
</xsl:apply-templates>
15+
</xsl:variable>
16+
<div>
17+
<xsl:call-template name="article-section-header">
18+
<xsl:with-param name="title" select="$title"/>
19+
</xsl:call-template>
1820
<div class="row">
1921
<div class="col-md-12 col-sm-12">
2022
<ul class="articleTimeline">

‎packtools/catalogs/htmlgenerator/v3.0/generic.xsl‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,14 @@
5757
</xsl:otherwise>
5858
</xsl:choose>
5959
</xsl:template>
60+
61+
<xsl:template name="article-section-header">
62+
<xsl:param name="title"/>
63+
<xsl:param name="anchor-id">articleSection0</xsl:param>
64+
<xsl:variable name="title_lowercase" select="translate($title,'ABCDEFGHIJKLMNOPQRSTUVWXYZ ', 'abcdefghijklmnopqrstuvwxyz-')"/>
65+
<xsl:attribute name="class">articleSection articleSection--<xsl:value-of select="$title_lowercase"/></xsl:attribute>
66+
<xsl:attribute name="data-anchor"><xsl:value-of select="$title"/></xsl:attribute>
67+
<a name="{$anchor-id}"></a>
68+
<h2 class="h5"><xsl:value-of select="$title"/></h2>
69+
</xsl:template>
6070
</xsl:stylesheet>

‎packtools/catalogs/htmlgenerator/v3.0/static/css/article.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packtools/catalogs/htmlgenerator/v3.0/static/css/bootstrap.css‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)