summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--css/news.css3
-rw-r--r--index.php20
-rw-r--r--js/news.js68
-rw-r--r--templates/main.php2
-rw-r--r--templates/part.nofeeds.php28
-rw-r--r--templates/settings.php2
6 files changed, 36 insertions, 87 deletions
diff --git a/css/news.css b/css/news.css
index a671b5786..e31b6ff37 100644
--- a/css/news.css
+++ b/css/news.css
@@ -54,7 +54,6 @@ div.add_parentfolder {
clear: both;
}
-
#addfeedbtn {
background-image: url('%appswebroot%/news/img/rss.svg');
background-position: .5em center;
@@ -133,7 +132,7 @@ div.add_parentfolder {
}
#feeds .subscriptions, #feeds .subscriptions:hover {
- background-image: url('%appswebroot%/news/img/icon.svg');
+ background-image: url('%appswebroot%/news/img/rss.svg');
background-repeat: no-repeat;
background-size: 16px 16px;
background-position: .8em center;
diff --git a/index.php b/index.php
index af7cc9a3f..71dc0e14f 100644
--- a/index.php
+++ b/index.php
@@ -35,16 +35,16 @@ $folderforest = $foldermapper->childrenOf(0); //retrieve all the folders
if ($allfeeds) {
$feedid = isset( $_GET['feedid'] ) ? $_GET['feedid'] : null;
if ($feedid == null) {
- $feedmapper = new OCA\News\FeedMapper(OCP\USER::getUser($userid));
- if(OCP\Config::getUserValue(OCP\USER::getUser(), 'news', 'lastViewedFeed') == null){
- $feedid = $feedmapper->mostRecent();
- } else {
- $feedid = OCP\Config::getUserValue(OCP\USER::getUser(), 'news', 'lastViewedFeed');
- // check if feed exists in table
- if($feedmapper->findById($feedid) === null){
- $feedid = $feedmapper->mostRecent();
- }
- }
+ $feedmapper = new OCA\News\FeedMapper(OCP\USER::getUser($userid));
+ if(OCP\Config::getUserValue(OCP\USER::getUser(), 'news', 'lastViewedFeed') == null){
+ $feedid = $feedmapper->mostRecent();
+ } else {
+ $feedid = OCP\Config::getUserValue(OCP\USER::getUser(), 'news', 'lastViewedFeed');
+ // check if feed exists in table
+ if($feedmapper->findById($feedid) === null){
+ $feedid = $feedmapper->mostRecent();
+ }
+ }
}
}
else {
diff --git a/js/news.js b/js/news.js
index 1ae753fa2..ff722dbaf 100644
--- a/js/news.js
+++ b/js/news.js
@@ -1,3 +1,17 @@
+/**
+* ownCloud - News app
+*
+* @author Alessandro Cosentino
+* Copyright (c) 2012 - Alessandro Cosentino <cosenal@gmail.com>
+*
+* @author Bernhard Posselt
+* Copyright (c) 2012 - Bernhard Posselt <nukeawhale@gmail.com>
+*
+* This file is licensed under the Affero General Public License version 3 or later.
+* See the COPYING-README file
+*
+*/
+
News={
DropDownMenu: {
fade:function(menu){
@@ -115,8 +129,11 @@ News={
$(button).attr("disabled", true);
$(button).prop('value', t('news', 'Adding...'));
-
- var folderid = $('#inputfolderid:input[name="folderid"]').val();
+
+ var folderid = 0;
+ if($('#firstrun').length == 0){
+ folderid = $('#inputfolderid:input[name="folderid"]').val();
+ }
$.ajax({
type: "POST",
@@ -161,51 +178,6 @@ News={
}
});
},
- submitFirstRun:function(button){
-
- var feedurl = $("#feed_add_url").val().trim();
-
- if(feedurl.length == 0) {
- OC.dialogs.alert(t('news', 'URL cannot be empty.'), t('news', 'Error'));
- return false;
- }
-
- $(button).attr("disabled", true);
- $(button).prop('value', t('news', 'Adding...'));
-
- $.ajax({
- type: "POST",
- url: OC.filePath('news', 'ajax', 'createfeed.php'),
- data: { 'feedurl': feedurl, 'folderid': folderid },
- dataType: "json",
- success: function(jsondata){
- if(jsondata.status == 'success'){
- $('.collapsable_container[data-id="' + folderid + '"] > ul').append(jsondata.data.listfeed);
- setupFeedList();
- News.Feed.load(jsondata.data.feedid);
- window.reload();
-
- OC.dialogs.confirm(t('news', 'Do you want to add another feed?'), t('news', 'Feed added!'), function(answer) {
- if(!answer) {
- $('#addfeed_dialog').dialog('destroy').remove();
- $('ul.accordion').before(jsondata.data.part_newfeed);
- }
- });
- } else {
- OC.dialogs.alert(jsondata.data.message, t('news', 'Error'));
- }
- $("#feed_add_url").val('');
- $(button).attr("disabled", false);
- $(button).prop('value', t('news', 'Add feed'));
- },
- error: function(xhr) {
- OC.dialogs.alert(t('news', 'Error while parsing the feed'), t('news', 'Fatal Error'));
- $("#feed_add_url").val('');
- $(button).attr("disabled", false);
- $(button).prop('value', t('news', 'Add feed'));
- }
- });
- },
'delete':function(feedid) {
$('.feeds_delete').tipsy('hide');
OC.dialogs.confirm(t('news', 'Are you sure you want to delete this feed?'), t('news', 'Warning'), function(answer) {
@@ -721,7 +693,7 @@ $(document).ready(function(){
$('#addfeedfolder').click(function(event) {
News.DropDownMenu.fade($(this).children('ul'));
- event.stopPropagation();
+ event.stopPropagation();
});
$('#settingsbtn').on('click keydown', function() {
diff --git a/templates/main.php b/templates/main.php
index 96e419eeb..4b0f1ad23 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -40,7 +40,7 @@ if($showAll){
<button class="svg"></button>
</li>
<li style="float: right">
- <button class="svg" id="settingsbtn" title="<?php echo $l->t('Settings'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('core','actions/settings.png'); ?>" alt="<?php echo $l->t('Settings'); ?>" /></button>
+ <button id="settingsbtn" title="<?php echo $l->t('Settings'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('core','actions/settings.png'); ?>" alt="<?php echo $l->t('Settings'); ?>" /></button>
</li>
</ul>
</div>
diff --git a/templates/part.nofeeds.php b/templates/part.nofeeds.php
index 5afc5d281..b3748fbe7 100644
--- a/templates/part.nofeeds.php
+++ b/templates/part.nofeeds.php
@@ -1,28 +1,10 @@
<div id="appsettings" class="popup bottomleft hidden"></div>
<div id="firstrun">
- <h1><?php echo $l->t('You have no feeds in your reader.') ?></h1>
+ <h1><?php echo $l->t("You don't have any feed in your reader.") ?></h1>
<div id="selections">
<div id="addfeed_dialog_firstrun">
- <table width="200px" style="border: 2px;">
- <tr>
- <td>Add new feed</td>
- <td>
- <div class="add_parentfolder">
- <button id="dropdownBtn" onclick="News.DropDownMenu.dropdown(this)">
- <?php echo $l->t('Choose folder'); ?>
- </button>
- <input id="inputfolderid" type="hidden" name="folderid" value="0" />
- <ul class="menu" id="dropdownmenu">
- <?php echo $this->inc("part.folderlist"); ?>
- </ul>
- </div>
- </td>
- </tr>
- <tr>
- <td><input type="text" id="feed_add_url" placeholder="<?php echo $l->t('Address'); ?>" class="news_input" /></td>
- <td><input type="submit" value="<?php echo $l->t('Add'); ?>" onclick="News.Feed.submit(this)" id="feed_add_submit" /></td>
- </tr>
- </table>
+ <input type="text" id="feed_add_url" placeholder="<?php echo $l->t('Address'); ?>" />
+ <input type="submit" value="<?php echo $l->t('Add feed'); ?>" onclick="News.Feed.submit(this)" id="feed_add_submit" />
</div>
<input type="button" id="addfeedbtn" value="<?php echo $l->t('Add feed') ?>" /><br />
<input type="button" id="importopmlbtn" value="<?php echo $l->t('Import OPML') ?>" />
@@ -32,8 +14,6 @@
require_once(OC_App::getAppPath('news') .'/templates/subscribelet.php');
echo '<h1>' . $l->t('Or...') . '</h1>';
?>
- <div>
<?php createSubscribelet(); ?>
</div>
- </div>
-</div> \ No newline at end of file
+</div>
diff --git a/templates/settings.php b/templates/settings.php
index 3dea8fd9d..434eed331 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -19,7 +19,5 @@
require_once(OC_App::getAppPath('news') .'/templates/subscribelet.php');
createSubscribelet();
?>
- <div>
- <?php ?>
</dd>
</dl> \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 23:40:10 +0000