mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-16 20:34:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix links for feed management

Browse Source 
See https://github.com/marienfressinaud/FreshRSS/issues/646
This commit is contained in:
Marien Fressinaud
2014-10-01 12:18:32 +02:00
parent 89c407d7d7
commit a7bf7ced36
8 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Controllers/categoryController.php
View File

@@ -31,7 +31,7 @@ class FreshRSS_category_Controller extends Minz_ActionController {
*/
public function createAction() {
$catDAO = new FreshRSS_CategoryDAO();
$url_redirect = array('c' => 'configure', 'a' => 'categorize');
$url_redirect = array('c' => 'subscription', 'a' => 'index');
if (Minz_Request::isPost()) {
invalidateHttpCache();
@@ -71,7 +71,7 @@ class FreshRSS_category_Controller extends Minz_ActionController {
*/
public function updateAction() {
$catDAO = new FreshRSS_CategoryDAO();
$url_redirect = array('c' => 'configure', 'a' => 'categorize');
$url_redirect = array('c' => 'subscription', 'a' => 'index');
if (Minz_Request::isPost()) {
invalidateHttpCache();
@@ -113,7 +113,7 @@ class FreshRSS_category_Controller extends Minz_ActionController {
$feedDAO = FreshRSS_Factory::createFeedDao();
$catDAO = new FreshRSS_CategoryDAO();
$default_category = $catDAO->getDefault();
$url_redirect = array('c' => 'configure', 'a' => 'categorize');
$url_redirect = array('c' => 'subscription', 'a' => 'index');
if (Minz_Request::isPost()) {
invalidateHttpCache();
@@ -150,7 +150,7 @@ class FreshRSS_category_Controller extends Minz_ActionController {
*/
public function emptyAction() {
$feedDAO = FreshRSS_Factory::createFeedDao();
$url_redirect = array('c' => 'configure', 'a' => 'categorize');
$url_redirect = array('c' => 'subscription', 'a' => 'index');
if (Minz_Request::isPost()) {
invalidateHttpCache();

16
app/Controllers/feedController.php
View File

@@ -26,8 +26,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
if ($url === false) {
Minz_Request::forward(array(
'c' => 'configure',
'a' => 'feed'
'c' => 'subscription',
'a' => 'index'
), true);
}
@@ -166,7 +166,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
$feedDAO->rollBack ();
}
Minz_Request::forward (array ('c' => 'configure', 'a' => 'feed', 'params' => $params), true);
Minz_Request::forward (array ('c' => 'subscription', 'a' => 'index', 'params' => $params), true);
} else {
// GET request so we must ask confirmation to user
@@ -193,8 +193,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
Minz_Session::_param('notification', $notif);
Minz_Request::forward(array(
'c' => 'configure',
'a' => 'feed',
'c' => 'subscription',
'a' => 'index',
'params' => array(
'id' => $feed->id()
)
@@ -214,7 +214,9 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
);
Minz_Session::_param ('notification', $notif);
invalidateHttpCache();
Minz_Request::forward (array ('c' => 'configure', 'a' => 'feed', 'params' => array('id' => $id)), true);
Minz_Request::forward (array ('c' => 'subscription',
'a' => 'index',
'params' => array('id' => $id)), true);
}
}
@@ -405,7 +407,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
if ($redirect_url) {
Minz_Request::forward($redirect_url);
} else {
Minz_Request::forward(array('c' => 'configure', 'a' => 'feed'), true);
Minz_Request::forward(array('c' => 'subscription', 'a' => 'index'), true);
}
}
}

2
app/layout/aside_flux.phtml
View File

@@ -89,7 +89,7 @@
<li class="item"><a target="_blank" href="http://example.net/"><?php echo _t('see_website'); ?></a></li>
<?php if ($this->loginOk) { ?>
<li class="separator"></li>
<li class="item"><a href="<?php echo _url('configure', 'feed', 'id', '!!!!!!'); ?>"><?php echo _t('administration'); ?></a></li>
<li class="item"><a href="<?php echo _url('subscription', 'index', 'id', '!!!!!!'); ?>"><?php echo _t('administration'); ?></a></li>
<li class="item"><a href="<?php echo _url('feed', 'actualize', 'id', '!!!!!!'); ?>"><?php echo _t('actualize'); ?></a></li>
<li class="item">
<?php $confirm = $this->conf->reading_confirm ? 'confirm' : ''; ?>

2
app/views/helpers/view/global_view.phtml
View File

@@ -48,6 +48,6 @@
<?php } else { ?>
<div id="stream" class="prompt alert alert-warn global">
<h2><?php echo _t('no_feed_to_display'); ?></h2>
<a href="<?php echo _url('configure', 'feed'); ?>"><?php echo _t('think_to_add'); ?></a><br /><br />
<a href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('think_to_add'); ?></a><br /><br />
</div>
<?php } ?>

2
app/views/helpers/view/normal_view.phtml
View File

@@ -186,6 +186,6 @@ if (!empty($this->entries)) {
<?php } else { ?>
<div id="stream" class="prompt alert alert-warn normal">
<h2><?php echo _t('no_feed_to_display'); ?></h2>
<a href="<?php echo _url('configure', 'feed'); ?>"><?php echo _t('think_to_add'); ?></a><br /><br />
<a href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('think_to_add'); ?></a><br /><br />
</div>
<?php } ?>

2
app/views/helpers/view/reader_view.phtml
View File

@@ -39,6 +39,6 @@ if (!empty($this->entries)) {
<?php } else { ?>
<div id="stream" class="prompt alert alert-warn reader">
<h2><?php echo _t('no_feed_to_display'); ?></h2>
<a href="<?php echo _url('configure', 'feed'); ?>"><?php echo _t('think_to_add'); ?></a><br /><br />
<a href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('think_to_add'); ?></a><br /><br />
</div>
<?php } ?>

2
app/views/stats/idle.phtml
View File

@@ -25,7 +25,7 @@
<li class="item">
<div class="stick">
<a class="btn" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed['id']); ?>"><?php echo _i('link'); ?> <?php echo _t('filter'); ?></a>
<a class="btn" href="<?php echo _url('configure', 'feed', 'id', $feed['id']); ?>"><?php echo _i('configure'); ?> <?php echo _t('administration'); ?></a>
<a class="btn" href="<?php echo _url('subscription', 'index', 'id', $feed['id']); ?>"><?php echo _i('configure'); ?> <?php echo _t('administration'); ?></a>
<button class="btn btn-attention confirm" form="form-delete" formaction="<?php echo _url('feed', 'delete', 'id', $feed['id'], 'r', $current_url); ?>"><?php echo _t('delete'); ?></button>
</div>
</li>

2
app/views/stats/repartition.phtml
View File

@@ -24,7 +24,7 @@
</select>
<?php if ($this->feed) {?>
<a class="btn" href="<?php echo _url('configure', 'feed', 'id', $this->feed->id()); ?>">
<a class="btn" href="<?php echo _url('subscription', 'index', 'id', $this->feed->id()); ?>">
<?php echo _i('configure'); ?> <?php echo _t('administration'); ?>
</a>
<?php }?>