From 6d0ce2ea05ee7eaabad45a005dbc629b89425d5a Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <dev@bernhard-posselt.com>
Date: Tue, 23 Sep 2014 21:51:53 +0200
Subject: changelog

---
 CHANGELOG.md                |  4 ++++
 css/settings.css            | 10 ++++------
 templates/part.settings.php |  6 ------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f8de2f86c..a17304f12 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+owncloud-news (3.105)
+* **Bugfix**: Various wording fixes
+* **Bugfix**: Do not use Import/Export caption for settings buttons to avoid UX bugs in translated versions
+
 owncloud-news (3.104)
 * **Bugfix**: Backport ownCloud CSS z-index fix to ownCloud 7 for settings popup that made it difficult to access the administration tab
 
diff --git a/css/settings.css b/css/settings.css
index 01438b2d9..a8bbe9cd3 100644
--- a/css/settings.css
+++ b/css/settings.css
@@ -8,10 +8,8 @@
  * @copyright Bernhard Posselt 2014
  */
 #app-settings input[type=file] {
-    opacity:0;
-    z-index:1001;
-    width:0;
-    height:0;
+    position: absolute;
+    left: -30000px;
 }
 
 #app-settings .opened:hover {
@@ -44,13 +42,13 @@
 
 #app-settings .import-export button,
 #app-settings .import-export a {
-    width: 110px;
+    width: 113px;
     height: 30px;
     margin: 0;
     vertical-align: middle;
+    background-position: center;
 }
 
 #app-settings .import-export a {
     display: inline-block;
-    padding-left: 38px;
 }
\ No newline at end of file
diff --git a/templates/part.settings.php b/templates/part.settings.php
index bb57520cd..842ab1a64 100644
--- a/templates/part.settings.php
+++ b/templates/part.settings.php
@@ -49,7 +49,6 @@
             news-trigger-click="#opml-upload"
             ng-class="{'entry-loading': Settings.isOPMLImporting}"
             ng-disabled="Settings.isOPMLImporting || Settings.isArticlesImporting">
-            <?php p($l->t('Import')); ?>
         </button>
 
         <a title="<?php p($l->t('Export')); ?>"
@@ -57,7 +56,6 @@
             href="<?php p(\OCP\Util::linkToRoute('news.export.opml')); ?>"
             target="_blank"
             ng-hide="App.isFirstRun()">
-            <?php p($l->t('Export')); ?>
         </a>
 
         <button
@@ -65,7 +63,6 @@
             title="<?php p($l->t('Export')); ?>"
             ng-show="App.isFirstRun()"
             disabled>
-            <?php p($l->t('Export')); ?>
         </button>
 
         <p class="error" ng-show="Settings.opmlImportError">
@@ -86,21 +83,18 @@
             ng-class="{'entry-loading': Settings.isArticlesImporting}"
             ng-disabled="Settings.isOPMLImporting || Settings.isArticlesImporting"
             news-trigger-click="#article-upload">
-            <?php p($l->t('Import')); ?>
         </button>
 
         <a title="<?php p($l->t('Export')); ?>" class="button icon-download svg button-icon-label"
             href="<?php p(\OCP\Util::linkToRoute('news.export.articles')); ?>"
             target="_blank"
             ng-hide="App.isFirstRun()">
-            <?php p($l->t('Export')); ?>
         </a>
         <button
             class="icon-download svg button-icon-label"
             title="<?php p($l->t('Export')); ?>"
             ng-show="App.isFirstRun()"
             disabled>
-            <?php p($l->t('Export')); ?>
         </button>
 
         <p class="error" ng-show="Settings.articleImportError">
-- 
cgit v1.2.3