UI: Make BasicAuth Credentials less important in subscribtion form

2 files changed, 14 insertions, 15 deletions

diff --git a/css/navigation.css b/css/navigation.css
index f61b05fc3..55068fa6b 100644
--- a/css/navigation.css
+++ b/css/navigation.css
@@ -67,7 +67,6 @@
 }
 
 #app-navigation .add-new-popup .add-new-folder-primary {
-    float: right;
     border-bottom-left-radius: 0;
     border-top-left-radius: 0;
     width: 36px;
@@ -76,17 +75,13 @@
     margin-right: 0;
 }
 
-#app-navigation .add-new-popup .add-feed-advanced {
-    width: 100%;
-}
-
-#app-navigation .add-new-popup .add-feed-advanced-area {
-    padding: 10px 0;
+#app-navigation .add-new-popup .add-new-basicauth-toggle {
+    padding: 5px 0;
 }
 
-#app-navigation .add-new-popup .add-feed-advanced-area h2 {
-    font-size: 11pt;
-    font-weight: bold;
+#app-navigation .add-new-popup .add-feed-basicauth {
+    width: 100%;
+    padding: 0 0 10px;
 }
 
 #app-navigation .add-new-popup .error {
diff --git a/templates/part.navigation.addfeed.php b/templates/part.navigation.addfeed.php
index c74ecb43c..595b1a1b4 100644
--- a/templates/part.navigation.addfeed.php
+++ b/templates/part.navigation.addfeed.php
@@ -76,11 +76,15 @@
                 </p>
 
                 <!-- basic auth -->
-                <button type="button" class="add-feed-advanced" ng-click="Navigation.showAddFeedAdvanced=!Navigation.showAddFeedAdvanced">
-                    <?php p($l->t('Advanced settings')); ?>
-                </button>
-                <div ng-if="Navigation.showAddFeedAdvanced" class="add-feed-advanced-area">
-                    <h2><?php p($l->t('Credentials')); ?></h2>
+                <div class="add-new-basicauth-toggle">
+                    <input type="checkbox"
+                           class="checkbox"
+                           ng-model="Navigation.addFeedBasicauth"
+                           id="add-feed-basicauth">
+                    <label for="add-feed-basicauth"><?php p($l->t('Credentials')); ?></label>
+                </div>
+
+                <div ng-show="Navigation.addFeedBasicauth" class="add-feed-basicauth">
                     <p class="warning"><?php p($l->t('HTTP Basic Auth credentials must be stored unencrypted! Everyone with access to the server or database will be able to access them!')); ?></p>
                     <input type="text"
                         ng-model="Navigation.feed.user"