aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-03-18 23:00:43 +0100
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-03-18 23:00:43 +0100
commit4b5c458a00f234736402a745dfeca008a9086e59 (patch)
tree5ec97b9661aaf5a9beb65e24b71eed64965228c0 /app
parent88a36ec231ba717b05b3c817d484bb682871eadc (diff)
Curseur en forme de pointeur au dessus de titre et date de flux_header + ajout de liens de retour à l'accueil au niveau de la conf (fix temporaire du bug #36)
Diffstat (limited to 'app')
-rwxr-xr-xapp/controllers/entryController.php2
-rw-r--r--app/views/configure/categorize.phtml2
-rw-r--r--app/views/configure/display.phtml2
-rw-r--r--app/views/configure/feed.phtml2
-rw-r--r--app/views/configure/importExport.phtml2
-rw-r--r--app/views/configure/shortcut.phtml2
-rw-r--r--app/views/entry/note.phtml2
-rw-r--r--app/views/index/about.phtml2
8 files changed, 16 insertions, 0 deletions
diff --git a/app/controllers/entryController.php b/app/controllers/entryController.php
index d812587cf..a2fec5b3a 100755
--- a/app/controllers/entryController.php
+++ b/app/controllers/entryController.php
@@ -98,6 +98,8 @@ class entryController extends ActionController {
}
public function noteAction () {
+ View::appendScript (Url::display (array ('c' => 'javascript', 'a' => 'main')));
+
$not_found = false;
$entryDAO = new EntryDAO ();
$catDAO = new CategoryDAO ();
diff --git a/app/views/configure/categorize.phtml b/app/views/configure/categorize.phtml
index 502bd86e5..943dd489e 100644
--- a/app/views/configure/categorize.phtml
+++ b/app/views/configure/categorize.phtml
@@ -1,6 +1,8 @@
<?php $this->partial ('aside_configure'); ?>
<div class="post">
+ <a href="<?php echo _url ('index', 'index'); ?>">← Retour à vos flux RSS</a>
+
<form method="post" action="<?php echo _url ('configure', 'categorize'); ?>">
<legend>Gestion des catégories - <a href="<?php echo _url ('configure', 'feed'); ?>">gestion des flux</a></legend>
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index 12292c137..240428493 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -1,6 +1,8 @@
<?php $this->partial ('aside_configure'); ?>
<div class="post">
+ <a href="<?php echo _url ('index', 'index'); ?>">← Retour à vos flux RSS</a>
+
<form method="post" action="<?php echo _url ('configure', 'display'); ?>">
<legend>Configuration générale</legend>
diff --git a/app/views/configure/feed.phtml b/app/views/configure/feed.phtml
index 8b8b8ed7c..de0d5c83b 100644
--- a/app/views/configure/feed.phtml
+++ b/app/views/configure/feed.phtml
@@ -2,6 +2,8 @@
<?php if ($this->flux) { ?>
<div class="post">
+ <a href="<?php echo _url ('index', 'index'); ?>">← Retour à vos flux RSS</a>
+
<h1><?php echo $this->flux->name (); ?></h1>
<?php echo $this->flux->description (); ?>
diff --git a/app/views/configure/importExport.phtml b/app/views/configure/importExport.phtml
index c39b85a5c..cd677c1eb 100644
--- a/app/views/configure/importExport.phtml
+++ b/app/views/configure/importExport.phtml
@@ -14,6 +14,8 @@
<?php $this->partial ('aside_feed'); ?>
<div class="post ">
+ <a href="<?php echo _url ('index', 'index'); ?>">← Retour à vos flux RSS</a>
+
<form method="post" action="<?php echo Url::display (array ('c' => 'configure', 'a' => 'importExport', 'params' => array ('q' => 'import'))); ?>" enctype="multipart/form-data">
<legend>Import / export au format OPML</legend>
<div class="form-group">
diff --git a/app/views/configure/shortcut.phtml b/app/views/configure/shortcut.phtml
index efc637141..86682465a 100644
--- a/app/views/configure/shortcut.phtml
+++ b/app/views/configure/shortcut.phtml
@@ -1,6 +1,8 @@
<?php $this->partial ('aside_configure'); ?>
<div class="post">
+ <a href="<?php echo _url ('index', 'index'); ?>">← Retour à vos flux RSS</a>
+
<datalist id="keys">
<?php foreach ($this->list_keys as $key) { ?>
<option value="<?php echo $key; ?>">
diff --git a/app/views/entry/note.phtml b/app/views/entry/note.phtml
index fe330f9b4..912d4846d 100644
--- a/app/views/entry/note.phtml
+++ b/app/views/entry/note.phtml
@@ -1,6 +1,8 @@
<?php $this->partial ('aside_flux'); ?>
<div class="post">
+ <a href="<?php echo _url ('index', 'index'); ?>">← Retour à vos flux RSS</a>
+
<form method="post" action="<?php echo _url ('entry', 'note', 'id', $this->entry->id ()); ?>">
<legend>Note</legend>
diff --git a/app/views/index/about.phtml b/app/views/index/about.phtml
index e958807d2..2f65c9cda 100644
--- a/app/views/index/about.phtml
+++ b/app/views/index/about.phtml
@@ -1,4 +1,6 @@
<div class="post content">
+ <a href="<?php echo _url ('index', 'index'); ?>">← Retour à vos flux RSS</a>
+
<h1>À propos de FreshRSS</h1>
<dl class="infos">