diff options
author | Alessandro Cosentino <cosenal@gmail.com> | 2012-07-24 11:21:07 -0400 |
---|---|---|
committer | Alessandro Cosentino <cosenal@gmail.com> | 2012-07-24 11:21:07 -0400 |
commit | 8eab75caa8505b26c0612c204b349c25c1ee3075 (patch) | |
tree | 007ba6d634268ed83384668786b38097c75ec8b3 | |
parent | 27df8ca4628457e2fca13a64125152469dab33bb (diff) |
moving settings dialog to app
-rw-r--r-- | js/news.js | 4 | ||||
-rw-r--r-- | js/settings.js | 2 | ||||
-rw-r--r-- | templates/main.php | 2 | ||||
-rw-r--r-- | templates/part.importdialog.php | 13 | ||||
-rw-r--r-- | templates/settings.php | 7 |
5 files changed, 14 insertions, 14 deletions
diff --git a/js/news.js b/js/news.js index 8dbc09659..e0945661d 100644 --- a/js/news.js +++ b/js/news.js @@ -218,6 +218,10 @@ $(document).ready(function(){ event.stopPropagation(); }); + $('#settingsbtn').click(function() { + News.UI.overview('#import_dialog', 'importdialog.php'); + }); + setupFeedList(); var updateInterval = 10000; //how often the feeds should update (in msec) diff --git a/js/settings.js b/js/settings.js index 28a61dfc3..9e0d3fe66 100644 --- a/js/settings.js +++ b/js/settings.js @@ -36,7 +36,7 @@ NewsSettings={ } $(document).ready(function(){ - $('#opml_file').click(function() { + $('#settings').click(function() { NewsSettings.UI.overview('#import_dialog', 'importdialog.php'); }); 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> |