Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Maják
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TO
Maják
Commits
bda5590f
Commit
bda5590f
authored
2 years ago
by
Tomáš Valenta
Browse files
Options
Downloads
Patches
Plain Diff
handle missing author name
parent
37626797
No related branches found
No related tags found
2 merge requests
!694
Release
,
!693
Handle missing author name in article template, fix README default postgres port, fix donations page richtext <i>
Pipeline
#11042
passed
2 years ago
Stage: build
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
README.md
+1
-1
1 addition, 1 deletion
README.md
main/templates/main/main_article_page.html
+19
-17
19 additions, 17 deletions
main/templates/main/main_article_page.html
with
20 additions
and
18 deletions
README.md
+
1
−
1
View file @
bda5590f
...
@@ -134,7 +134,7 @@ Je třeba nastavit environment proměnné:
...
@@ -134,7 +134,7 @@ Je třeba nastavit environment proměnné:
| proměnná | default | popis |
| proměnná | default | popis |
| --- | --- | --- |
| --- | --- | --- |
|
`DATABASE_URL`
| | DSN k databázi (např.
`postgres://user:pass@localhost:5
3
42/majak`
) |
|
`DATABASE_URL`
| | DSN k databázi (např.
`postgres://user:pass@localhost:54
3
2/majak`
) |
|
`OIDC_RP_REALM_URL`
| | OpenID server realm URL (např.
`http://localhost:8080/auth/realms/master/`
) |
|
`OIDC_RP_REALM_URL`
| | OpenID server realm URL (např.
`http://localhost:8080/auth/realms/master/`
) |
|
`OIDC_RP_CLIENT_ID`
| | OpenID Client ID |
|
`OIDC_RP_CLIENT_ID`
| | OpenID Client ID |
|
`OIDC_RP_CLIENT_SECRET`
| | OpenID Client Secret |
|
`OIDC_RP_CLIENT_SECRET`
| | OpenID Client Secret |
...
...
This diff is collapsed.
Click to expand it.
main/templates/main/main_article_page.html
+
19
−
17
View file @
bda5590f
...
@@ -9,29 +9,31 @@
...
@@ -9,29 +9,31 @@
{# {% routablepageurl page.root_page.articles_page "tags" as articles_tag_page_url %}#}
{# {% routablepageurl page.root_page.articles_page "tags" as articles_tag_page_url %}#}
<main
role=
"main"
class=
"mb-10 xl:mb-32"
>
<main
role=
"main"
class=
"mb-10 xl:mb-32"
>
<div
class=
"grid-container mb-2 lg:mb-12 relative"
>
<div
class=
"grid-container mb-2 lg:mb-12 relative"
>
<div
class=
"grid-left-side h-full bg-grey-150 left-tab"
>
{% if page.author_page.title or page.author %}
<div
class=
"p-6 flex flex-wrap flex-row items-center justify-between xl:items-start xl:flex-col"
>
<div
class=
"grid-left-side h-full bg-grey-150 left-tab"
>
{% if page.author_page.title or page.author %}
<div
class=
"p-6 flex flex-wrap flex-row items-center justify-between xl:items-start xl:flex-col"
>
<span
class=
"3xl:text-xl"
>
<span
class=
"3xl:text-xl"
>
<div
class=
"font-bold"
>
AUTOR ČLÁNKU:
</div>
<div
class=
"font-bold"
>
AUTOR ČLÁNKU:
</div>
<span
class=
"font-light"
>
{% firstof page.author.upper page.author_page.title.upper %}
</span>
<span
class=
"font-light"
>
{% firstof page.author.upper page.author_page.title.upper %}
</span>
</span>
</span>
{% endif %}
<div
class=
"flex flex-row static bottom-0 xl:absolute sm:bottom-5"
>
<div
class=
"flex flex-row static bottom-0 xl:absolute sm:bottom-5"
>
{% for social in page.author_page.social_links %}
{% for social in page.author_page.social_links %}
<a
href=
"{{ social.value.link }}"
class=
"flex hover:no-underline"
>
<a
href=
"{{ social.value.link }}"
class=
"flex hover:no-underline"
>
<i
class=
"{{ social.value.icon }} mx-1"
></i>
<i
class=
"{{ social.value.icon }} mx-1"
></i>
</a>
</a>
{% endfor %}
{% endfor %}
</div>
</div>
</div>
</div>
</div>
{% endif %}
</div>
<div
class=
"grid-content leading-6"
>
<div
class=
"grid-content leading-6"
>
<p
class=
"font-condensed text-xl leading-7 mb-5"
>
<p
class=
"font-condensed text-xl leading-7 mb-5"
>
{{ page.perex }}
{{ page.perex }}
</p>
</p>
</div>
</div>
<div
class=
"hidden grid-right-side h-full bg-grey-150 right-tab xl:block"
></div>
{% if page.author_page.title or page.author %}
<div
class=
"hidden grid-right-side h-full bg-grey-150 right-tab xl:block"
></div>
{% endif %}
</div>
</div>
{% for block in page.content %}
{% for block in page.content %}
{% include_block block %}
{% include_block block %}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment