From 8eab75caa8505b26c0612c204b349c25c1ee3075 Mon Sep 17 00:00:00 2001
From: Alessandro Cosentino <cosenal@gmail.com>
Date: Tue, 24 Jul 2012 11:21:07 -0400
Subject: moving settings dialog to app

---
 templates/main.php              |  2 +-
 templates/part.importdialog.php | 13 +++++++------
 templates/settings.php          |  7 +------
 3 files changed, 9 insertions(+), 13 deletions(-)

(limited to 'templates')

diff --git a/templates/main.php b/templates/main.php
index 6ab1bc64e..76c9adb13 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -15,7 +15,7 @@
 			<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" title="<?php echo $l->t('Settings'); ?>">Settings</button></li>
+		<li><button class="svg" id="settingsbtn" title="<?php echo $l->t('Settings'); ?>">Settings</button></li>
 	<ul>
 </div>
 
diff --git a/templates/part.importdialog.php b/templates/part.importdialog.php
index 921f21aaf..399bbf578 100644
--- a/templates/part.importdialog.php
+++ b/templates/part.importdialog.php
@@ -1,6 +1,7 @@
-<div id="import_dialog" title="<?php echo $l->t("Import feeds from OPML file"); ?>">
-<table width="100%" style="border: 0;">
-<tr>
-dialog
-</tr>
-</table>
\ No newline at end of file
+<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>
+	<dd></dd>
+</dl> 
\ No newline at end of file
diff --git a/templates/settings.php b/templates/settings.php
index 29cd6f42c..6103c1f87 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -1,12 +1,7 @@
 <form id="news">
 	<fieldset class="personalblock">
 		<strong>News</strong><br />
-		<dl>
-		<dt>Import</dt>
-		<dd><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>
-		<dd></dd>
-		</dl> 
+		<input type="submit" id="settings" value="<?php echo $l->t('Import feeds');?>" />
 	</fieldset>
 	<div id="dialog_holder"></div>
 </form>
-- 
cgit v1.2.3