aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2014-10-23 09:32:02 +0200
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2014-10-23 09:32:02 +0200
commit8769931a68d0dddb134674c86a43dec75b39bf83 (patch)
treeacb6907fb5a9eddeaecbb10667ba5035ce0c0913 /app
parent8c1789ae060000638c563e05ee42eb9b5b1c4fe0 (diff)
Rename aside_flux in aside_feed.
Diffstat (limited to 'app')
-rw-r--r--app/layout/aside_feed.phtml (renamed from app/layout/aside_flux.phtml)2
-rw-r--r--app/layout/nav_menu.phtml2
-rw-r--r--app/views/index/normal.phtml2
3 files changed, 3 insertions, 3 deletions
diff --git a/app/layout/aside_flux.phtml b/app/layout/aside_feed.phtml
index 30f362348..66b7b51af 100644
--- a/app/layout/aside_flux.phtml
+++ b/app/layout/aside_feed.phtml
@@ -7,7 +7,7 @@
}
?>
-<div class="aside aside_flux<?php echo $class; ?>" id="aside_flux">
+<div class="aside aside_feed<?php echo $class; ?>" id="aside_feed">
<a class="toggle_aside" href="#close"><?php echo _i('close'); ?></a>
<?php if (FreshRSS_Auth::hasAccess()) { ?>
diff --git a/app/layout/nav_menu.phtml b/app/layout/nav_menu.phtml
index 2c9f8724d..6f555c3d0 100644
--- a/app/layout/nav_menu.phtml
+++ b/app/layout/nav_menu.phtml
@@ -2,7 +2,7 @@
<div class="nav_menu">
<?php if ($actual_view === 'normal') { ?>
- <a class="btn toggle_aside" href="#aside_flux"><?php echo _i('category'); ?></a>
+ <a class="btn toggle_aside" href="#aside_feed"><?php echo _i('category'); ?></a>
<?php } ?>
<?php if (FreshRSS_Auth::hasAccess()) { ?>
diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml
index 36adef2f2..02d621bd0 100644
--- a/app/views/index/normal.phtml
+++ b/app/views/index/normal.phtml
@@ -1,6 +1,6 @@
<?php
-$this->partial('aside_flux');
+$this->partial('aside_feed');
$this->partial('nav_menu');
if (!empty($this->entries)) {