Skip to content

Headline structure improvement #3830

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.

Sign up for GitHub

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

Merged
Alkarex merged 34 commits into from
Sep 11, 2021
Merged

Headline structure improvement #3830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
91515d7
header: h1 deleted - full logo included
math-GH Aug 21, 2021
97c869c
template: config - display
math-GH Aug 21, 2021
bc5c456
WIP
math-GH Aug 22, 2021
c82ad9d
shortcut configs. added fieldset. do not display the border by default
math-GH Aug 22, 2021
49f6b27
system.phtml
math-GH Aug 23, 2021
6dc6d81
subscription: add feed or category
math-GH Aug 23, 2021
de15c2c
Merge branch 'edge' into 3673-headline-structure-imrovement
math-GH Aug 31, 2021
eabb912
wip
math-GH Aug 31, 2021
0085fcb
wip
math-GH Aug 31, 2021
a6baf5e
Update bookmarklet.phtml
math-GH Sep 1, 2021
afd7c12
Update archiving.phtml
math-GH Sep 1, 2021
3de69a6
Merge branch 'edge' into 3673-headline-structure-imrovement
math-GH Sep 3, 2021
122b029
Update queries.phtml
math-GH Sep 6, 2021
8b55dbb
Update profile.phtml
math-GH Sep 6, 2021
5ae0b21
Update manage.phtml
math-GH Sep 6, 2021
0931463
auth+update
math-GH Sep 6, 2021
1caf5b9
Update template.rtl.css
math-GH Sep 7, 2021
7f21a9c
Merge branch 'edge' into 3673-headline-structure-imrovement
math-GH Sep 7, 2021
75dce6d
Merge branch 'edge' into 3673-headline-structure-imrovement
math-GH Sep 8, 2021
62e8248
fixed FreshRSS logo (Theme: Mapco)
math-GH Sep 8, 2021
3bf1d6b
Update mapco.rtl.css
math-GH Sep 9, 2021
8a29a45
Update _layout.scss
math-GH Sep 9, 2021
37a49eb
fixed FreshRSS logo (theme: Dark)
math-GH Sep 9, 2021
429babd
Merge branch 'edge' into 3673-headline-structure-imrovement
math-GH Sep 9, 2021
21b291b
fix: FreshRSS logo (Theme: BlueLagoon)
math-GH Sep 9, 2021
5aff348
Merge branch '3673-headline-structure-imrovement' of https://github.c…
math-GH Sep 9, 2021
e3fa733
fix: FreshRSS logo (Theme: Ansum)
math-GH Sep 9, 2021
ff4f5c9
fixed: FreshRSS logo (Theme: Alternative Dark)
math-GH Sep 10, 2021
65b72b8
fix: FreshRSS logo (Theme: Pafat)
math-GH Sep 10, 2021
a648b35
fix: FreshRSS logo (Theme: Screwdriver)
math-GH Sep 10, 2021
63c96d9
fix: FreshRSS logo (theme: Swage)
math-GH Sep 10, 2021
3d68f7f
Minor lint
Alkarex Sep 11, 2021
575106b
little fix: FreshRSS logo (Theme: Origine)
math-GH Sep 11, 2021
86cc3d5
Fix: FreshRSS logo (Theme: Origine Compact)
math-GH Sep 11, 2021
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
1 change: 1 addition & 0 deletions app/Models/Themes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ public static function alt($name) {
'configure' => '⚙',
'down' => '▽',
'favorite' => '★',
'FreshRSS-logo' => '⊚',
'help' => 'ⓘ',
'icon' => '⊚',
'import' => '⤓',
Expand Down
9 changes: 3 additions & 6 deletions app/layout/header.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,9 @@ if (FreshRSS_Auth::accessNeedsAction()) {

<header class="header">
<div class="item title">
<h1>
<a href="<?= _url('index', 'index') ?>">
<img class="logo" src="<?= _i('icon', true) ?>" alt="" />
<?= FreshRSS_Context::$system_conf->title ?>
</a>
</h1>
<a href="<?= _url('index', 'index') ?>">
<img class="logo" src="<?= _i('FreshRSS-logo', true) ?>" alt="" />
</a>
Copy link
Copy Markdown
Member

@marienfressinaud marienfressinaud Apr 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm (finally) doing the update of my instance, and I realize this change breaks the possibility to change the name of the instance. I don't remember seeing someone complaining about that and I can manage this case differently, but I wonder why it was needed?

Also, if we keep this solution, the alt attribute should be set to "FreshRSS" to give a label to the screen readers.

Copy link
Copy Markdown
Member

@Frenzie Frenzie Apr 14, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I simply overlooked it. But yes, setting aside the h1 thing I have to say I'm confused about the additional change.

Copy link
Copy Markdown
Member

@Alkarex Alkarex May 16, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggestion of fix, a bit more powerful #4369

</div>

<div class="item search">
Expand Down
2 changes: 1 addition & 1 deletion app/views/auth/index.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a>
</div>

<h1><?= _t('gen.menu.authentication') ?></h1>
<form method="post" action="<?= _url('auth', 'index') ?>">
<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
<legend><?= _t('admin.auth.type') ?></legend>

<div class="form-group">
<label class="group-name" for="auth_type"><?= _t('admin.auth.type') ?></label>
Expand Down
7 changes: 4 additions & 3 deletions app/views/configure/archiving.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
<div class="link-back-wrapper">
<a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a>
</div>

<h1><?= _t('conf.archiving') ?></h1>
<p class="help"><?= _i('help') ?> <?= _t('conf.archiving.help') ?></p>

<form method="post" action="<?= _url('configure', 'archiving') ?>">
<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
<legend><?= _t('conf.archiving') ?></legend>
<p class="help"><?= _i('help') ?> <?= _t('conf.archiving.help') ?></p>

<div class="form-group">
<label class="group-name" for="ttl_default"><?= _t('conf.archiving.ttl') ?></label>
Expand Down Expand Up @@ -124,7 +125,7 @@
</div>
</form>

<legend><?= _t('conf.archiving.maintenance') ?></legend>
<h2><?= _t('conf.archiving.maintenance') ?></h2>
<form method="post" action="<?= _url('entry', 'purge') ?>">
<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />

Expand Down
3 changes: 2 additions & 1 deletion app/views/configure/display.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
<div class="link-back-wrapper">
<a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a>
</div>

<h1><?= _t('conf.display') ?></h1>

<form method="post" action="<?= _url('configure', 'display') ?>">
<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
<legend><?= _t('conf.display') ?></legend>

<div class="form-group">
<label class="group-name" for="language"><?= _t('conf.display.language') ?></label>
Expand Down
4 changes: 3 additions & 1 deletion app/views/configure/integration.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
<a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a>
</div>

<h1><?= _t('conf.sharing') ?></h1>

<form method="post" action="<?= _url('configure', 'integration') ?>"
data-simple='<div class="form-group" id="group-share-##key##"><label class="group-name">##label##</label><div class="group-controls"><div class="stick">
<input type="text" id="share_##key##_name" name="share[##key##][name]" class="extend" value="##label##" placeholder="<?= _t('conf.sharing.share_name') ?>" size="64" />
Expand All @@ -22,7 +24,7 @@
<a target="_blank" rel="noreferrer" class="btn" title="<?= _t('conf.sharing.more_information') ?>" href="##help##"><?= _i('help') ?></a>
</div></div>' class="draggableList">
<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
<legend><?= _t('conf.sharing') ?></legend>

<?php
foreach (FreshRSS_Context::$user_conf->sharing as $key => $share_options) {
$share = FreshRSS_Share::get($share_options['type']);
Expand Down
2 changes: 1 addition & 1 deletion app/views/configure/queries.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<form method="post" action="<?= _url('configure', 'queries') ?>" class="draggableList">
<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
<legend><?= _t('conf.query') ?></legend>
<h1><?= _t('conf.query') ?></h1>

<?php foreach ($this->queries as $key => $query) { ?>
<div class="form-group" id="query-group-<?= $key ?>" draggable="true">
Expand Down
5 changes: 3 additions & 2 deletions app/views/configure/reading.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@
<div class="link-back-wrapper">
<a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a>
</div>

<h1><?= _t('conf.reading') ?></h1>

<form method="post" action="<?= _url('configure', 'reading') ?>">
<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
<legend><?= _t('conf.reading') ?></legend>


<div class="form-group">
<label class="group-name" for="posts_per_page"><?= _t('conf.reading.articles_per_page') ?></label>
<div class="group-controls">
Expand Down
Loading