mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-06-19 12:59:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use buttons instead of links for "mark as read"

Browse Source 
See https://github.com/marienfressinaud/FreshRSS/issues/599
This commit is contained in:
Marien Fressinaud
2014-09-16 14:12:44 +02:00
parent 5d9479a4ac
commit c6dbe9def8
7 changed files with 57 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/layout/nav_menu.phtml
View File

@@ -184,9 +184,15 @@
Minz_Session::_param('markReadUrl', $markReadUrl);
?>
<form id="mark-read" method="post" style="display: none"></form>
<div class="stick" id="nav_menu_read_all">
<?php $confirm = $this->conf->reading_confirm ? ' confirm' : ''; ?>
<a class="read_all btn<?php echo $confirm; ?>" href="<?php echo $markReadUrl; ?>"><?php echo _t('mark_read'); ?></a>
<?php $confirm = $this->conf->reading_confirm ? 'confirm' : ''; ?>
<button class="read_all btn <?php echo $confirm; ?>"
form="mark-read"
formaction="<?php echo $markReadUrl; ?>"
type="submit"><?php echo _t('mark_read'); ?></button>
<div class="dropdown">
<div id="dropdown-read" class="dropdown-target"></div>
@@ -194,14 +200,29 @@
<ul class="dropdown-menu">
<li class="dropdown-close"><a href="#close">❌</a></li>
<li class="item"><a class="<?php echo $confirm; ?>" href="<?php echo $markReadUrl; ?>"><?php echo $string_mark; ?></a></li>
<li class="item">
<button class="as-link <?php echo $confirm; ?>"
form="mark-read"
formaction="<?php echo $markReadUrl; ?>"
type="submit"><?php echo $string_mark; ?></button>
</li>
<li class="separator"></li>
<?php
$today = $this->today;
$one_week = $today - 604800;
?>
<li class="item"><a class="<?php echo $confirm; ?>" href="<?php echo _url('entry', 'read', 'is_read', 1, 'get', $get, 'idMax', $today . '000000'); ?>"><?php echo _t('before_one_day'); ?></a></li>
<li class="item"><a class="<?php echo $confirm; ?>" href="<?php echo _url('entry', 'read', 'is_read', 1, 'get', $get, 'idMax', $one_week . '000000'); ?>"><?php echo _t('before_one_week'); ?></a></li>
<li class="item">
<button class="as-link <?php echo $confirm; ?>"
form="mark-read"
formaction="<?php echo _url('entry', 'read', 'is_read', 1, 'get', $get, 'idMax', $today . '000000'); ?>"
type="submit"><?php echo _t('before_one_day'); ?></button>
</li>
<li class="item">
<button class="as-link <?php echo $confirm; ?>"
form="mark-read"
formaction="<?php echo _url('entry', 'read', 'is_read', 1, 'get', $get, 'idMax', $one_week . '000000'); ?>"
type="submit"><?php echo _t('before_one_week'); ?></button>
</li>
</ul>
</div>
</div>

7
p/themes/Dark/dark.css
View File

@@ -16,9 +16,9 @@ html, body {
}
/*=== Links */
a {
outline: none;
a, button.as-link {
color: #6986B2;
outline: none;
}
/*=== Images */
@@ -338,7 +338,8 @@ a.btn {
padding: 0 25px;
line-height: 2.5em;
}
.dropdown-menu > .item > span {
.dropdown-menu > .item > span,
.dropdown-menu > .item > .as-link {
padding: 0 25px;
line-height: 2em;
}

10
p/themes/Flat/flat.css
View File

@@ -15,7 +15,7 @@ html, body {
}
/*=== Links */
a {
a, button.as-link {
color: #2980b9;
outline: none;
}
@@ -338,17 +338,21 @@ a.btn {
padding: 0 25px;
line-height: 2.5em;
}
.dropdown-menu > .item > span {
.dropdown-menu > .item > span,
.dropdown-menu > .item > .as-link {
padding: 0 25px;
line-height: 2em;
}
.dropdown-menu > .item:hover {
background: #2980b9;
color: #fff;
}
.dropdown-menu > .item[aria-checked="true"] > a:before {
font-weight: bold;
margin: 0 0 0 -14px;
}
.dropdown-menu > .item:hover > a {
text-decoration: none;
background: #2980b9;
color: #fff;
}
.dropdown-menu .input select,

5
p/themes/Origine/origine.css
View File

@@ -15,7 +15,7 @@ html, body {
}
/*=== Links */
a {
a, button.as-link {
color: #0062be;
outline: none;
}
@@ -364,7 +364,8 @@ a.btn {
padding: 0 25px;
line-height: 2.5em;
}
.dropdown-menu > .item > span {
.dropdown-menu > .item > span,
.dropdown-menu > .item > .as-link {
padding: 0 25px;
line-height: 2em;
}

8
p/themes/Screwdriver/screwdriver.css
View File

@@ -16,7 +16,7 @@ html, body {
}
/*=== Links */
a {
a, button.as-link {
color: #D18114;
outline: none;
}
@@ -390,11 +390,13 @@ a.btn {
.dropdown-menu > .item > a {
padding: 0 25px;
line-height: 2.5em;
color:#ccc;
color: #ccc;
}
.dropdown-menu > .item > span {
.dropdown-menu > .item > span,
.dropdown-menu > .item > .as-link {
padding: 0 25px;
line-height: 2em;
color: #ccc;
}
.dropdown-menu > .item:hover {
background: #171717;

5
p/themes/base-theme/base.css
View File

@@ -14,7 +14,7 @@ html, body {
}
/*=== Links */
a {
a, button.as-link {
outline: none;
}
@@ -255,7 +255,8 @@ a.btn {
padding: 0 25px;
line-height: 2.5em;
}
.dropdown-menu > .item > span {
.dropdown-menu > .item > span,
.dropdown-menu > .item > .as-link {
padding: 0 25px;
line-height: 2em;
}

9
p/themes/base-theme/template.css
View File

@@ -88,6 +88,15 @@ input[type="checkbox"] {
input.extend:focus {
width: 300px;
}
button.as-link,
button.as-link:hover,
button.as-link:active {
background: transparent;
border: none;
color: inherit;
cursor: pointer;
font-size: 1.1em;
}
/*=== COMPONENTS */
/*===============*/