summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-09-12 00:59:39 +0200
committerBernhard Posselt <nukeawhale@gmail.com>2013-09-12 01:00:32 +0200
commit2391e6bf62e0a3624685a2a7c72bdb7de499bef2 (patch)
treebd8bbc00f9894a082f5628efd3ad79916da16e4d /templates
parent00c6e040deec9c3998ab679dcb84fc46ae72d2ac (diff)
fix #342
Diffstat (limited to 'templates')
-rw-r--r--templates/part.settings.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/templates/part.settings.php b/templates/part.settings.php
index 0e622b778..479d8cebd 100644
--- a/templates/part.settings.php
+++ b/templates/part.settings.php
@@ -8,7 +8,7 @@
}"></button>
</div>
-<div id="app-settings-content">
+<div id="app-settings-content" style="display:block">
<fieldset class="personalblock">
<legend><strong><?php p($l->t('Subscriptions')); ?></strong></legend>
@@ -44,9 +44,11 @@
<legend><strong><?php p($l->t('Unread/Starred Articles')); ?></strong></legend>
<input type="file" id="google-upload" name="importgoogle"
accept="application/json"
- oc-read-file="importGoogleReader($fileContent)"/>
+ oc-read-file="importArticles($fileContent)"/>
<button title="<?php p($l->t('Import')); ?>"
class="upload-icon svg"
+ ng-class="{loading: importing}"
+ ng-disabled="importing"
oc-forward-click="{selector:'#google-upload'}">
<?php p($l->t('Import')); ?>
</button>