mirror/FreshRSS
0
0 Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-10-23 11:38:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Begin to fix global view

Browse Source
This commit is contained in:
Marien Fressinaud committed 2014-10-24 13:50:08 +02:00
1 parent 0d6993fe08
commit fa0c7d75e6
9 files changed
+44 -69
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/layout/aside_feed.phtml
+3 -3
View File
@@ -42,7 +42,7 @@
$c_show = $c_active && (!FreshRSS_Context::$conf->display_categories ||
FreshRSS_Context::$current_get['feed']);
?>
<li class="tree-folder<?php echo $c_active ? ' active' : ''; ?>" data-unread="<?php echo $cat->nbNotRead(); ?>">
<li class="tree-folder category<?php echo $c_active ? ' active' : ''; ?>" data-unread="<?php echo $cat->nbNotRead(); ?>">
<div class="tree-folder-title">
<a class="dropdown-toggle" href="#"><?php echo _i($c_show ? 'up' : 'down'); ?></a>
<a class="title" data-unread="<?php echo format_number($cat->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'c_' . $cat->id()); ?>"><?php echo $cat->name(); ?></a>
@@ -53,13 +53,13 @@
foreach ($feeds as $feed) {
$f_active = FreshRSS_Context::isCurrentGet('f_' . $feed->id());
?>
<li id="f_<?php echo $feed->id(); ?>" class="item<?php echo $f_active ? ' active' : ''; ?><?php echo $feed->inError() ? ' error' : ''; ?><?php echo $feed->nbEntries() <= 0 ? ' empty' : ''; ?>" data-unread="<?php echo $feed->nbNotRead(); ?>" data-priority="<?php echo $feed->priority(); ?>">
<li id="f_<?php echo $feed->id(); ?>" class="item feed<?php echo $f_active ? ' active' : ''; ?><?php echo $feed->inError() ? ' error' : ''; ?><?php echo $feed->nbEntries() <= 0 ? ' empty' : ''; ?>" data-unread="<?php echo $feed->nbNotRead(); ?>" data-priority="<?php echo $feed->priority(); ?>">
<div class="dropdown no-mobile">
<div class="dropdown-target"></div>
<a class="dropdown-toggle" data-fweb="<?php echo $feed->website(); ?>"><?php echo _i('configure'); ?></a>
<?php /* feed_config_template */ ?>
</div>
<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <a data-unread="<?php echo format_number($feed->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed->id()); ?>"><?php echo $feed->name(); ?></a>
<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <a class="item-title" data-unread="<?php echo format_number($feed->nbNotRead()); ?>" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed->id()); ?>"><?php echo $feed->name(); ?></a>
</li>
<?php } ?>
</ul>
app/views/index/global.phtml
+18 -9
View File
@@ -1,11 +1,20 @@
<?php //$this->partial('nav_menu'); ?>
<?php
$this->partial('nav_menu');
<div id="stream" class="global categories">
$class = '';
if (FreshRSS_Context::$conf->hide_read_feeds &&
FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_NOT_READ) &&
!FreshRSS_Context::isStateEnabled(FreshRSS_Entry::STATE_READ)) {
$class = ' state_unread';
}
?>
<div id="stream" class="global<?php echo $class; ?>">
<?php
$url_base = array(
'c' => 'index',
'a' => 'index',
'params' => array()
'params' => Minz_Request::params()
);
foreach ($this->categories as $cat) {
@@ -14,20 +23,20 @@
if (!empty($feeds)) {
?>
<div class="box">
<div class="box-title"><a data-unread="<?php echo format_number($cat->nbNotRead()); ?>" href="<?php echo Minz_Url::display($url_base); ?>"><?php echo $cat->name(); ?></a></div>
<div class="box category" data-unread="<?php echo $cat->nbNotRead(); ?>">
<div class="box-title"><a class="title" data-unread="<?php echo format_number($cat->nbNotRead()); ?>" href="<?php echo Minz_Url::display($url_base); ?>"><?php echo $cat->name(); ?></a></div>
<ul class="box-content">
<?php
foreach ($feeds as $feed) {
$nb_not_read = $feed->nbNotRead();
$error = $feed->inError() ? 'error ' : '';
$empty = $feed->nbEntries() === 0 ? 'empty ' : '';
$error = $feed->inError() ? ' error' : '';
$empty = $feed->nbEntries() === 0 ? ' empty' : '';
$url_base['params']['get'] = 'f_' . $feed->id();
?>
<li class="item feed<?php echo $error, $empty; ?>">
<li class="item feed<?php echo $error, $empty; ?>" data-unread="<?php echo $feed->nbNotRead(); ?>">
<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" />
<a data-unread="<?php echo format_number($feed->nbNotRead()); ?>" data-priority="<?php echo $feed->priority(); ?>" href="<?php echo Minz_Url::display($url_base); ?>"><?php echo $feed->name(); ?></a>
<a class="item-title" data-unread="<?php echo format_number($feed->nbNotRead()); ?>" data-priority="<?php echo $feed->priority(); ?>" href="<?php echo Minz_Url::display($url_base); ?>"><?php echo $feed->name(); ?></a>
</li>
<?php } ?>
</ul>
p/scripts/global_view.js
+1 -1
View File
@@ -9,7 +9,7 @@ function load_panel(link) {
panel_loading = true;
$.get(link, function (data) {
$("#panel").append($(".nav_menu, #stream .day, #stream .flux, #stream .pagination", data));
$("#panel").append($(".nav_menu, #stream .day, #stream .flux, #stream .pagination, #stream.prompt", data));
$("#panel .nav_menu").children().not("#nav_menu_read_all").remove();
p/themes/Dark/dark.css
-3
View File
@@ -852,9 +852,6 @@ a.btn {
border-radius: 5px;
text-align: left;
}
#stream.global .category {
margin: 0;
}
#stream.global .btn {
width: auto;
height: 2em;
p/themes/Origine/origine.css
+4 -7
View File
@@ -593,7 +593,7 @@ a.btn {
}
/*=== Aside main page (categories) */
.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
.aside_feed .category .title:not([data-unread="0"]):after {
position: absolute;
right: 0;
margin: 10px 0;
@@ -603,6 +603,9 @@ a.btn {
background: inherit;
border-left: 1px solid #aaa;
}
.feed .item-title:not([data-unread="0"]) {
font-weight: bold;
}
/*=== Aside main page (feeds) */
.aside_feed .tree-folder-items > .item.empty.active {
@@ -621,9 +624,6 @@ a.btn {
.aside_feed .tree-folder-items > .item.error.active > a {
color: #fff;
}
.aside_feed .tree-folder-items > .item:not([data-unread="0"]) {
font-weight: bold;
}
.aside_feed .tree-folder-items .dropdown-menu:after {
left: 2px;
}
@@ -903,9 +903,6 @@ a.btn {
text-align: left;
box-shadow: 0 0 3px #bbb;
}
#stream.global .category {
margin: 0;
}
#stream.global .btn {
width: auto;
height: 2em;
p/themes/Pafat/pafat.css
-4
View File
@@ -914,10 +914,6 @@ a.btn {
text-align: left;
}
#stream.global .category {
margin: 0;
}
#stream.global .category:first-child {
margin: 0;
}
p/themes/Screwdriver/screwdriver.css
-3
View File
@@ -969,9 +969,6 @@ opacity: 1;
box-shadow: 0 0 4px #171717;
overflow:hidden;
}
#stream.global .category {
margin: 0;
}
#stream.global .btn {
width: auto;
height: 2em;
p/themes/base-theme/base.css
-3
View File
@@ -668,9 +668,6 @@ a.btn {
#stream.global .box-category {
text-align: left;
}
#stream.global .category {
margin: 0;
}
#stream.global .btn {
width: auto;
height: 2em;
p/themes/base-theme/template.css
+18 -36
View File
@@ -289,6 +289,7 @@ a.btn {
vertical-align: top;
}
.box .box-title {
position: relative;
font-size: 1.2rem;
font-weight: bold;
text-align: center;
@@ -400,22 +401,10 @@ a.btn {
vertical-align: top;
}
/*=== Aside main page (categories) */
.aside_feed.state_unread .tree-folder:not(.active)[data-unread="0"],
.aside_feed.state_unread .tree-folder-items > .item:not(.active)[data-unread="0"] {
display: none;
}
.aside_feed .tree-folder-title > .title:not([data-unread="0"]):after {
content: attr(data-unread);
}
/*=== Aside main page (feeds) */
.aside_feed .tree-folder-items:not(.active) {
display: none;
}
.aside_feed .tree-folder-items > .item > a:not([data-unread="0"]):before {
content: "(" attr(data-unread) ") ";
}
.aside_feed .tree-folder-items .dropdown-menu {
left: 0;
}
@@ -612,32 +601,13 @@ br + br + br {
/*=== GLOBAL VIEW */
/*================*/
/*=== Category boxes */
#stream.global {
text-align: center;
}
/* TODO <delete> */
#stream.global .box-category {
display: inline-block;
width: 19em;
max-width: 95%;
margin: 20px 10px;
border: 1px solid #ccc;
vertical-align: top;
#stream.global .box {
text-align: left;
}
#stream.global .category {
width: 100%;
}
#stream.global .btn {
display: block;
}
#stream.global .box-category .feeds {
display: block;
overflow: auto;
}
#stream.global .box-category .feed {
width: 19em;
max-width: 90%;
}
/* TODO </delete */
/*=== Panel */
#overlay {
@@ -694,6 +664,18 @@ br + br + br {
/*=== DIVERS */
/*===========*/
.category .title:not([data-unread="0"]):after {
content: attr(data-unread);
}
.feed .item-title:not([data-unread="0"]):before {
content: "(" attr(data-unread) ") ";
}
.state_unread .category:not(.active)[data-unread="0"],
.state_unread .feed:not(.active)[data-unread="0"] {
display: none;
}
.nav-login,
.nav_menu .search,
.aside .toggle_aside,