aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexis Degrugillier <github@ainw.org> 2013-11-17 19:01:38 -0500
committerGravatar Alexis Degrugillier <github@ainw.org> 2013-11-17 19:01:38 -0500
commitceeef41a96c3c21170501d582125dfc6602b4a69 (patch)
treec54324bb1afa83c4cebf5679ba9a270618a425e0
parentd0a7c1e0235106609ac754c5c6e6cb481a32a9a8 (diff)
Support de la modification des informations d'un flux.
Ajout de la modification de la description, de l'URL du site et de l'URL du RSS https://github.com/marienfressinaud/FreshRSS/issues/178
-rwxr-xr-xapp/controllers/configureController.php6
-rw-r--r--app/i18n/en.php1
-rw-r--r--app/i18n/fr.php1
-rw-r--r--app/views/configure/feed.phtml18
4 files changed, 18 insertions, 8 deletions
diff --git a/app/controllers/configureController.php b/app/controllers/configureController.php
index 2856bb89f..8877c04a4 100755
--- a/app/controllers/configureController.php
+++ b/app/controllers/configureController.php
@@ -94,6 +94,9 @@ class configureController extends ActionController {
} else {
if (Request::isPost () && $this->view->flux) {
$name = Request::param ('name', '');
+ $description = Request::param('description', '');
+ $website = Request::param('website', '');
+ $url = Request::param('url', '');
$hist = Request::param ('keep_history', 'no');
$cat = Request::param ('category', 0);
$path = Request::param ('path_entries', '');
@@ -113,6 +116,9 @@ class configureController extends ActionController {
$values = array (
'name' => $name,
+ 'description' => $description,
+ 'website' => $website,
+ 'url' => $url,
'category' => $cat,
'pathEntries' => $path,
'priority' => $priority,
diff --git a/app/i18n/en.php b/app/i18n/en.php
index e5aec3bc1..0a16ed204 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -127,6 +127,7 @@ return array (
'informations' => 'Information',
'feed_in_error' => 'This feed has encountered a problem. Please verify that it is always reachable then actualize it.',
+ 'feed_description' => 'Description',
'website_url' => 'Website URL',
'feed_url' => 'Feed URL',
'number_articles' => 'Number of articles',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 8bffd5287..62350b45d 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -127,6 +127,7 @@ return array (
'informations' => 'Informations',
'feed_in_error' => 'Ce flux a rencontré un problème. Veuillez vérifier qu’il est toujours accessible puis actualisez-le.',
+ 'feed_description' => 'Description',
'website_url' => 'URL du site',
'feed_url' => 'URL du flux',
'number_articles' => 'Nombre d’articles',
diff --git a/app/views/configure/feed.phtml b/app/views/configure/feed.phtml
index b61de6dcb..0860f5a4a 100644
--- a/app/views/configure/feed.phtml
+++ b/app/views/configure/feed.phtml
@@ -20,21 +20,23 @@
</div>
</div>
<div class="form-group">
+ <label class="group-name"><?php echo Translate::t ('feed_description'); ?></label>
+ <div class="group-controls">
+ <textarea name="description" id="description"><?php echo $this->flux->description (); ?></textarea>
+ </div>
+ </div>
+ <div class="form-group">
<label class="group-name"><?php echo Translate::t ('website_url'); ?></label>
<div class="group-controls">
- <span class="control">
- <?php echo $this->flux->website (); ?>
- <a target="_blank" href="<?php echo $this->flux->website (); ?>"><i class="icon i_link"></i></a>
- </span>
+ <input type="text" name="website" id="website" value="<?php echo $this->flux->website (); ?>" />
+ <a target="_blank" href="<?php echo $this->flux->website (); ?>"><i class="icon i_link"></i></a>
</div>
</div>
<div class="form-group">
<label class="group-name"><?php echo Translate::t ('feed_url'); ?></label>
<div class="group-controls">
- <span class="control">
- <?php echo $this->flux->url (); ?>
- <a target="_blank" href="<?php echo $this->flux->url (); ?>"><i class="icon i_link"></i></a>
- </span>
+ <input type="text" name="url" id="url" value="<?php echo $this->flux->url (); ?>" />
+ <a target="_blank" href="<?php echo $this->flux->url (); ?>"><i class="icon i_link"></i></a>
</div>
</div>
<div class="form-group">