From e0c6d419854f736305d9054f003891c715439a37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20=C5=81ojewski?= <marcin.lojewski@mlojewski.me>
Date: Sat, 29 Sep 2018 18:09:15 +0200
Subject: Leftover lines break the admin page

---
 templates/admin.php | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'templates')

diff --git a/templates/admin.php b/templates/admin.php
index 7d2725f..8f05648 100644
--- a/templates/admin.php
+++ b/templates/admin.php
@@ -71,16 +71,6 @@ function print_select_options(
         echo "</option>";
     }
 
-
-#54: Merge develop-14 into develop Conflicts
-Resolved all conflicts
-2 conflicting files
-CHANGELOG.md
-CHANGELOG.md
-admin.php
-templates/admin.php
-templates/admin.php
-Resolved
     echo "</select>";
     echo "</label></div>";
 }
-- 
cgit v1.2.3


From 63cd9d330ebb4735cab16750e3be6edf3911cbca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20=C5=81ojewski?= <marcin.lojewski@mlojewski.me>
Date: Sun, 23 Dec 2018 23:13:20 +0100
Subject: div for crypto params

---
 templates/admin.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'templates')

diff --git a/templates/admin.php b/templates/admin.php
index 0a5f042..2bac565 100644
--- a/templates/admin.php
+++ b/templates/admin.php
@@ -131,7 +131,9 @@ function print_select_options(
                     }
                 }
 
-                print_select_options($l, "opt-crypto_class", "Hash algorithm", $hashes, $_["opt.crypto_class"]);
+                print_select_options($l, "opt-crypto_class", "Hash algorithm", $hashes, $_["opt.crypto_class"]); ?>
+                <div id="opt-crypto_params"></div>
+                <?php
                 print_select_options($l, "opt-email_sync", "Email sync", ["" => "None", "initial" => "Synchronise only once", "force_nc"=>"Nextcloud always wins", "force_sql"=>"SQL always wins"], $_["opt.email_sync"]);
                 print_select_options($l, "opt-quota_sync", "Quota sync", ["" => "None", "initial" => "Synchronise only once", "force_nc"=>"Nextcloud always wins", "force_sql"=>"SQL always wins"], $_["opt.quota_sync"]);
                 print_select_options($l, "opt-home_mode", "Home mode", ["" => "Default", "query" => "Query", "static" => "Static"], $_["opt.home_mode"]);
-- 
cgit v1.2.3


From ac3e386915c8f9a9f36e600dcd26abe193a4a2ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20=C5=81ojewski?= <marcin.lojewski@mlojewski.me>
Date: Mon, 24 Dec 2018 21:30:44 +0100
Subject: JS + CSS

---
 templates/admin.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'templates')

diff --git a/templates/admin.php b/templates/admin.php
index 2bac565..f5fcce8 100644
--- a/templates/admin.php
+++ b/templates/admin.php
@@ -132,7 +132,10 @@ function print_select_options(
                 }
 
                 print_select_options($l, "opt-crypto_class", "Hash algorithm", $hashes, $_["opt.crypto_class"]); ?>
-                <div id="opt-crypto_params"></div>
+                <div id="opt-crypto_params_loading" style="display: none">
+                    <span class="icon loading"></span>
+                </div>
+                <fieldset id="opt-crypto_params_content" class="inner-fieldset" style="display: none"></fieldset>
                 <?php
                 print_select_options($l, "opt-email_sync", "Email sync", ["" => "None", "initial" => "Synchronise only once", "force_nc"=>"Nextcloud always wins", "force_sql"=>"SQL always wins"], $_["opt.email_sync"]);
                 print_select_options($l, "opt-quota_sync", "Quota sync", ["" => "None", "initial" => "Synchronise only once", "force_nc"=>"Nextcloud always wins", "force_sql"=>"SQL always wins"], $_["opt.quota_sync"]);
-- 
cgit v1.2.3


From 04e06bf3b53ff47a736bf6c23e6ffd622f5bc812 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20=C5=81ojewski?= <marcin.lojewski@mlojewski.me>
Date: Mon, 24 Dec 2018 21:43:55 +0100
Subject: No legend

---
 templates/admin.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'templates')

diff --git a/templates/admin.php b/templates/admin.php
index f5fcce8..b2dab49 100644
--- a/templates/admin.php
+++ b/templates/admin.php
@@ -158,9 +158,12 @@ function print_select_options(
                 print_text_input($l, "db-table-user-column-name", "Display name", $_["db.table.user.column.name"]);
                 print_text_input($l, "db-table-user-column-active", "Active", $_["db.table.user.column.active"]);
                 print_text_input($l, "db-table-user-column-avatar", "Provide avatar", $_["db.table.user.column.avatar"]);
-                print_text_input($l, "db-table-user-column-salt", "Salt", $_["db.table.user.column.salt"]);
-                print_checkbox_input($l, "opt-append_salt", "Append salt", $_["opt.append_salt"]);
-                print_checkbox_input($l, "opt-prepend_salt", "Prepend salt", $_["opt.prepend_salt"]); ?>
+                print_text_input($l, "db-table-user-column-salt", "Salt", $_["db.table.user.column.salt"]); ?>
+                <div class="inner-fieldset">
+                    <?php
+                    print_checkbox_input($l, "opt-append_salt", "Append salt", $_["opt.append_salt"]);
+                    print_checkbox_input($l, "opt-prepend_salt", "Prepend salt", $_["opt.prepend_salt"]); ?>
+                </div>
             </fieldset>
         </div>
         <div class="section">
-- 
cgit v1.2.3