From 2391e6bf62e0a3624685a2a7c72bdb7de499bef2 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <nukeawhale@gmail.com>
Date: Thu, 12 Sep 2013 00:59:39 +0200
Subject: fix #342

---
 templates/part.settings.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'templates')

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>
-- 
cgit v1.2.3