diff options
Diffstat (limited to 'templates/part.settings.php')
-rw-r--r-- | templates/part.settings.php | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/templates/part.settings.php b/templates/part.settings.php index 2223fff95..8f9473ad0 100644 --- a/templates/part.settings.php +++ b/templates/part.settings.php @@ -9,30 +9,29 @@ <p ng-click="Settings.toggleSetting('compact')"> <label for="compact"> - <input type="checkbox" ng-checked="Settings.getSetting('compact')" name="compact"> - <?php p($l->t('Compact view')); ?> + <input type="checkbox" ng-checked="Settings.getSetting('compact')" name="compact"> + <?php p($l->t('Compact view')); ?> </label> </p> <p ng-click="Settings.toggleSetting('showAll')"> - <label for="showAll"> - <input type="checkbox" ng-checked="Settings.getSetting('showAll')" name="showAll"> - <?php p($l->t('Show unread articles')); ?> + <input type="checkbox" ng-checked="Settings.getSetting('showAll')" name="showAll"> + <?php p($l->t('Show unread articles')); ?> </label> </p> <p ng-click="Settings.toggleSetting('oldestFirst')"> <label for="oldestFirst"> - <input type="checkbox" ng-checked="Settings.getSetting('oldestFirst')" name="oldestFirst"> - <?php p($l->t('Order by oldest first')); ?> + <input type="checkbox" ng-checked="Settings.getSetting('oldestFirst')" name="oldestFirst"> + <?php p($l->t('Order by oldest first')); ?> </label> </p> <p ng-click="Settings.toggleSetting('preventReadOnScroll')"> <label for="preventReadOnScroll"> - <input type="checkbox" ng-checked="Settings.getSetting('preventReadOnScroll')" name="preventReadOnScroll"> - <?php p($l->t('Disable mark read during scrolling')); ?> + <input type="checkbox" ng-checked="Settings.getSetting('preventReadOnScroll')" name="preventReadOnScroll"> + <?php p($l->t('Disable mark read during scrolling')); ?> </label> </p> @@ -41,15 +40,15 @@ <h3><?php p($l->t('Subscriptions (OPML)')); ?></h3> <input type="file" - id="opml-upload" - name="import" - accept="text/x-opml, text/xml" - news-read-file="Settings.importOpml($fileContent)"/> + id="opml-upload" + name="import" + news-read-file="Settings.importOPML($fileContent)"/> <button title="<?php p($l->t('Import')); ?>" - class="icon-upload svg button-icon-label" - news-trigger-click="#opml-upload" - ng-disabled="Settings.isImporting()"> + class="icon-upload svg button-icon-label" + news-trigger-click="#opml-upload" + ng-class="{'entry-loading': Settings.isOPMLImporting}" + ng-disabled="Settings.isOPMLImporting || Settings.isArticlesImporting"> <?php p($l->t('Import')); ?> </button> @@ -80,13 +79,12 @@ type="file" id="article-upload" name="importarticle" - accept="application/json" news-read-file="Settings.importArticles($fileContent)"/> <button title="<?php p($l->t('Import')); ?>" class="icon-upload svg button-icon-label" - ng-class="{'icon-loading-small': Settings.importing}" - ng-disabled="Settings.isImporting()" + ng-class="{'entry-loading': Settings.isArticlesImporting}" + ng-disabled="Settings.isOPMLImporting || Settings.isArticlesImporting" news-trigger-click="#article-upload"> <?php p($l->t('Import')); ?> </button> |