conform to the new app setting policy

8 files changed, 28 insertions, 68 deletions

diff --git a/appinfo/app.php b/appinfo/app.php
index eb1b54455..ad529db9a 100644
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -24,7 +24,6 @@ OC::$CLASSPATH['OC_News_Utils'] = 'apps/news/lib/utils.php';
 
 $l = new OC_l10n('news');
 
-OCP\App::registerPersonal('news', 'settings');
 
 OCP\App::register( array( 
   'order' => 70, 
diff --git a/css/news.css b/css/news.css
index 9bc7f04c4..15b431141 100644
--- a/css/news.css
+++ b/css/news.css
@@ -55,7 +55,7 @@ ul#feedfoldermenu { position:fixed; margin-left: 0; bottom: 2.8em; border-left:1
 li { padding: 0px !important; }
 li.menuItem { margin-left:0.7em; margin-right:0.7em; float: none !important; text-align: left; }
 li.feeds_list { margin-left: 16px !important; text-align: right; border-radius: 5px; padding-left: 5px !important; }
-li.feeds_list a { padding: 0 0 0 20px !important; overflow: hidden; text-overflow: ellipsis; text-align: left; width: 70%; }
+li.feeds_list a { padding: 0 0 0 20px !important; overflow: hidden; text-overflow: ellipsis; text-align: left; width: 65%; }
 div.collapsable_container { padding-left: 5px !important; border-radius: 5px; }
 
 ul.folders { margin-left: 16px !important; }
@@ -68,3 +68,4 @@ div.add_parentfolder { position: relative; }
 
 div.dialog { overflow: visible; }
 
+
diff --git a/js/news.js b/js/news.js
index e0945661d..5766bfa7f 100644
--- a/js/news.js
+++ b/js/news.js
@@ -40,6 +40,18 @@ News={
 				});
 			}
 			return false;
+		},
+		cloudFileSelected:function(path){
+			$.getJSON(OC.filePath('contacts', 'ajax', 'oc_photo.php'),{'path':path,'id':Contacts.UI.Card.id},function(jsondata){
+				if(jsondata.status == 'success'){
+					//alert(jsondata.data.page);
+					Contacts.UI.Card.editPhoto(jsondata.data.id, jsondata.data.tmp)
+					$('#edit_photo_dialog_img').html(jsondata.data.page);
+				}
+				else{
+					OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+				}
+			});
 		}
 	},
 	Folder: {
@@ -222,9 +234,13 @@ $(document).ready(function(){
 		News.UI.overview('#import_dialog', 'importdialog.php');
 	});
 	
+	$('#cloudbtn').click(function() {
+		OC.dialogs.filepicker(t('news', 'Select file'), News.UI.cloudFileSelected, false, '', true);
+	});
+	
 	setupFeedList();
 
-	var updateInterval = 10000; //how often the feeds should update (in msec)
+	var updateInterval = 500000; //how often the feeds should update (in msec)
 	setInterval('News.Feed.updateAll()', updateInterval);
 
 });
diff --git a/js/settings.js b/js/settings.js
deleted file mode 100644
index 9e0d3fe66..000000000
--- a/js/settings.js
+++ /dev/null
@@ -1,46 +0,0 @@
-NewsSettings={
-	UI: {
-		overview:function(dialogtype, dialogfile){
-			if($(dialogtype).dialog('isOpen') == true){
-				$(dialogtype).dialog('moveToTop');
-			}else{
-				$('#dialog_holder').load(OC.filePath('news', 'ajax', dialogfile), function(jsondata){
-					if(jsondata.status != 'error'){
-						$(dialogtype).dialog({
-							dialogClass:'dialog',
-							minWidth: 600,
-							close: function(event, ui) {
-								$(this).dialog('destroy').remove();
-							}
-						}).css('overflow','visible');
-					} else {
-						alert(jsondata.data.message);
-					}
-				});
-			}
-			return false;
-		},
-		cloudFileSelected:function(path){
-// 			$.getJSON(OC.filePath('contacts', 'ajax', 'oc_photo.php'),{'path':path,'id':Contacts.UI.Card.id},function(jsondata){
-// 				if(jsondata.status == 'success'){
-// 					//alert(jsondata.data.page);
-// 					Contacts.UI.Card.editPhoto(jsondata.data.id, jsondata.data.tmp)
-// 					$('#edit_photo_dialog_img').html(jsondata.data.page);
-// 				}
-// 				else{
-// 					OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-// 				}
-// 			});
-		}
-	},
-}
-$(document).ready(function(){
-  
-	$('#settings').click(function() {
-		NewsSettings.UI.overview('#import_dialog', 'importdialog.php');
-	});
-	
-	//OC.dialogs.filepicker(t('news', 'Select file'), NewsSettings.cloudFileSelected, false, '', true);
-});
-
-
diff --git a/settings.php b/settings.php
deleted file mode 100644
index 55ce4ff6f..000000000
--- a/settings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-OCP\Util::addScript( 'news', 'settings');
-
-$tmpl = new OCP\Template( 'news', 'settings');
-
-return $tmpl->fetchPage();
-
diff --git a/templates/main.php b/templates/main.php
index 76c9adb13..a3bac4921 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -15,7 +15,9 @@
 			<button class="svg" id="addfeedfolder" title="<?php echo $l->t('Add Feed/Folder'); ?>" onclick="News.DropDownMenu.fade('ul#feedfoldermenu')"><img class="svg" src="<?php echo OCP\Util::linkTo('news', 'img/add.svg'); ?>" alt="<?php echo $l->t('Add Feed/Folder'); ?>"   /></button>
 		</li>
 		<li><button class="svg" title="<?php echo $l->t('Change View'); ?>">Eye</button></li>
-		<li><button class="svg" id="settingsbtn" title="<?php echo $l->t('Settings'); ?>">Settings</button></li>
+		<li>
+			<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>
+		</li>
 	<ul>
 </div>
 
diff --git a/templates/part.importdialog.php b/templates/part.importdialog.php
index 399bbf578..0d3d88854 100644
--- a/templates/part.importdialog.php
+++ b/templates/part.importdialog.php
@@ -1,7 +1,10 @@
 <div id="import_dialog" title="<?php echo $l->t("Settings"); ?>">
 <dl>
-	<dt>Import</dt>
-	<dd>Upload opml file <input type="text" name="opml_file" id="opml_file" placeholder="<?php echo $l->t('.opml file');?>" /><input type="submit" value="<?php echo $l->t('Import feeds');?>" /></dd>
-	<dt>Export</dt>
+	<dt><?php echo $l->t('Import'); ?></dt>
+	<dd><button class="svg" title="<?php echo $l->t('Upload file from desktop'); ?>" onclick="News.DropDownMenu.fade('ul#feedfoldermenu')"><img class="svg" src="<?php echo OCP\Util::imagePath('core','actions/upload.svg'); ?>" alt="<?php echo $l->t('Upload'); ?>"   /></button>
+	    <button class="svg" id="cloudbtn" title="<?php echo $l->t('Select file from ownCloud'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('core','actions/upload.svg'); ?>" alt="<?php echo $l->t('Select'); ?>"   /></button>
+	    <input type="text" name="opml_file" id="opml_file" placeholder="<?php echo $l->t('.opml file');?>" />
+	    <input type="submit" value="<?php echo $l->t('Import feeds');?>" /></dd>
+	<dt><?php echo $l->t('Export'); ?></dt>
 	<dd></dd>
 </dl> 
\ No newline at end of file
diff --git a/templates/settings.php b/templates/settings.php
deleted file mode 100644
index 6103c1f87..000000000
--- a/templates/settings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<form id="news">
-	<fieldset class="personalblock">
-		<strong>News</strong><br />
-		<input type="submit" id="settings" value="<?php echo $l->t('Import feeds');?>" />
-	</fieldset>
-	<div id="dialog_holder"></div>
-</form>