diff options
| -rw-r--r-- | css/settings.css | 2 | ||||
| -rw-r--r-- | index.php | 1 | ||||
| -rw-r--r-- | js/news.js | 6 | ||||
| -rw-r--r-- | js/settings.js | 4 | ||||
| -rw-r--r-- | templates/settings.php | 4 |
5 files changed, 13 insertions, 4 deletions
diff --git a/css/settings.css b/css/settings.css index 3141a584e..e1fc6982c 100644 --- a/css/settings.css +++ b/css/settings.css @@ -1 +1 @@ -#cloudlink { color: red !important; }
\ No newline at end of file +a.settings { color: green !important; text-decoration:underline; }
\ No newline at end of file @@ -19,6 +19,7 @@ OCP\App::setActiveNavigationEntry('news'); OCP\Util::addScript('news','news'); OCP\Util::addStyle('news','news'); +OCP\Util::addStyle('news','settings'); $l = OC_L10N::get('news'); diff --git a/js/news.js b/js/news.js index 19adacb89..3bd51a375 100644 --- a/js/news.js +++ b/js/news.js @@ -247,7 +247,11 @@ $(document).ready(function(){ }); $('#settingsbtn').on('click keydown', function() { - OC.appSettings({appid:'news', loadJS:true}); + try { + OC.appSettings({appid:'news', loadJS:true}); + } catch(e) { + alert(e); + } }); setupFeedList(); diff --git a/js/settings.js b/js/settings.js index b1f81410e..910eefdaa 100644 --- a/js/settings.js +++ b/js/settings.js @@ -47,6 +47,7 @@ News={ } $('#browsebtn, #cloudbtn, #importbtn').hide(); + $('#cloudbtn, #cloudlink').click(function() { /* * it needs to be filtered by MIME type, but there are too many MIME types corresponding to opml @@ -54,12 +55,15 @@ $('#cloudbtn, #cloudlink').click(function() { */ OC.dialogs.filepicker(t('news', 'Select file'), News.Settings.cloudFileSelected, false, '', true); }); + $('#browsebtn, #browselink').click(function() { $('#file_upload_start').trigger('click'); }); + $('#file_upload_start').change(function() { News.Settings.browseFile(this.files); }); + $('#importbtn').click(function() { News.Settings.import(this); }); diff --git a/templates/settings.php b/templates/settings.php index a4d6ec80d..94b8fc2f6 100644 --- a/templates/settings.php +++ b/templates/settings.php @@ -3,8 +3,8 @@ <dd><button class="svg" id="browsebtn" 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> <span id="opml_file"> - <?php echo $l->t('No file selected. Select file from '); ?><a href='#' id="browselink"><?php echo $l->t('local filesystem');?></a> - <?php echo $l->t(' or '); ?><a href='#' id="cloudlink"><?php echo $l->t('cloud');?></a>. + <?php echo $l->t('No file selected. Select file from '); ?><a href='#' class="settings" id="browselink"><?php echo $l->t('local filesystem');?></a> + <?php echo $l->t(' or '); ?><a href='#' class="settings" id="cloudlink"><?php echo $l->t('cloud');?></a>. </span> <input type="file" id="file_upload_start" name="files[]" /> <input style="float: right" id="importbtn" type="submit" value="<?php echo $l->t('Import');?>" /></dd> |