diff options
| author | Alessandro Cosentino <cosenal@gmail.com> | 2012-07-28 00:38:28 -0400 |
|---|---|---|
| committer | Alessandro Cosentino <cosenal@gmail.com> | 2012-07-28 00:38:28 -0400 |
| commit | 42458fad2ff26b95b09342981579e11ae783eaf8 (patch) | |
| tree | c8962040dca9b347a4a3fe3492bcb034f1439c40 | |
| parent | 96a44ed8e8cf7c5610a07de4e450eea7ad1f8949 (diff) | |
browse local files dialog
| -rw-r--r-- | css/news.css | 2 | ||||
| -rw-r--r-- | js/news.js | 14 | ||||
| -rw-r--r-- | templates/part.importdialog.php | 3 |
3 files changed, 18 insertions, 1 deletions
diff --git a/css/news.css b/css/news.css index 81141252a..887e0c232 100644 --- a/css/news.css +++ b/css/news.css @@ -70,4 +70,6 @@ div.collapsable_container:hover { background-color: rgb(221, 221, 221); } div.add_parentfolder { position: relative; } div.dialog { overflow: visible; } +#file_upload_start { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; z-index:1001; width:0; height:0;} + diff --git a/js/news.js b/js/news.js index 16dae8e57..92bd62749 100644 --- a/js/news.js +++ b/js/news.js @@ -35,6 +35,12 @@ News={ */ OC.dialogs.filepicker(t('news', 'Select file'), News.UI.cloudFileSelected, false, '', true); }); + $('#browsebtn,#opml_file').click(function() { + $('#file_upload_start').trigger('click'); + }); + $('#file_upload_start').change(function() { + News.UI.browseFile(this.files); + }); } $(dialogtype).dialog({ dialogClass:'dialog', @@ -60,6 +66,14 @@ News={ OC.dialogs.alert(jsondata.data.message, t('news', 'Error')); } }); + }, + browseFile:function(filelist){ + if(!filelist) { + OC.dialogs.alert(t('news','No files selected.'), t('news', 'Error')); + return; + } + var file = filelist[0]; + $("#opml_file").prop('value', file.name); } }, Folder: { diff --git a/templates/part.importdialog.php b/templates/part.importdialog.php index 0d3d88854..99c07d362 100644 --- a/templates/part.importdialog.php +++ b/templates/part.importdialog.php @@ -1,9 +1,10 @@ <div id="import_dialog" title="<?php echo $l->t("Settings"); ?>"> <dl> <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> + <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> <input type="text" name="opml_file" id="opml_file" placeholder="<?php echo $l->t('.opml file');?>" /> + <input type="file" id="file_upload_start" name="files[]" /> <input type="submit" value="<?php echo $l->t('Import feeds');?>" /></dd> <dt><?php echo $l->t('Export'); ?></dt> <dd></dd> |