From 9a23149b8c0d0ce8f1834961f481a47b913f159e Mon Sep 17 00:00:00 2001
From: Daniel Seifert <git@daniel-seifert.com>
Date: Sun, 4 Aug 2019 00:01:06 +0200
Subject: [PATCH] make available for flow and wave theme

---
 .../010_Systemanforderungen.md                |  7 +-
 .../blocks/page/account/inc/account_menu.tpl  |  2 +-
 src/Application/views/tpl/d3_account_totp.tpl | 68 ++++++++++++-------
 src/Application/views/tpl/d3totplogin.tpl     | 13 +++-
 4 files changed, 60 insertions(+), 30 deletions(-)

diff --git a/docs/daux/installation/010_Anforderungen/010_Systemanforderungen.md b/docs/daux/installation/010_Anforderungen/010_Systemanforderungen.md
index dc1ba38..12cb1c7 100644
--- a/docs/daux/installation/010_Anforderungen/010_Systemanforderungen.md
+++ b/docs/daux/installation/010_Anforderungen/010_Systemanforderungen.md
@@ -8,9 +8,12 @@ title: Systemanforderungen
     * installierter ionCube Loader
 * Shopversionen / -editionen
     * OXID eShop Community Edition (CE), Professional Edition (PE) oder Enterprise Edition (EE) in Compilation Version 
-        * 6.0.x
+        * 6.0.2 und höher
         * 6.1.x
 * Installation via [Composer](https://getcomposer.org)
+* Themes
+    * flow
+    * wave
 
 Beachten Sie, dass die Ihnen vorliegende Modulversion entsprechend für **PHP 5.6**, **PHP 7.0**, **PHP 7.1** oder **PHP 7.2** kompatibel ist. Im Zweifelsfall kontaktieren Sie uns und nennen den für Ihren Shop genutzten Decoder und die PHP-Version.
 
@@ -19,4 +22,4 @@ Kontrollieren Sie bitte auch, ob diese Modulversion für die von Ihnen eingesetz
 ### optional:
 * D3 Modul-Connector ([kostenfrei bei D3 erhältlich](https://www.oxidmodule.com/connector/)) ab Version 5.1.1.4 
 
-Ist der D3 Modul-Connector installiert, können Datenbankänderungen über die automatische Installation eingerichtet und überwacht werden.
\ No newline at end of file
+Ist der D3 Modul-Connector installiert, können Datenbankänderungen über die automatische Installation eingerichtet und überwacht werden.
diff --git a/src/Application/views/blocks/page/account/inc/account_menu.tpl b/src/Application/views/blocks/page/account/inc/account_menu.tpl
index a7c2723..deaa83b 100644
--- a/src/Application/views/blocks/page/account/inc/account_menu.tpl
+++ b/src/Application/views/blocks/page/account/inc/account_menu.tpl
@@ -1,4 +1,4 @@
 [{$smarty.block.parent}]
 <li class="list-group-item[{if $active_link == "d3totp"}] active[{/if}]">
-    <a href="[{oxgetseourl ident=$oViewConf->getSelfLink()|cat:"cl=d3_account_totp"}]" title="[{oxmultilang ident="D3_TOTP_ACCOUNT"}]">[{oxmultilang ident="D3_TOTP_ACCOUNT"}]</a>
+    <a class="[{* wave *}] list-group-link" href="[{oxgetseourl ident=$oViewConf->getSelfLink()|cat:"cl=d3_account_totp"}]" title="[{oxmultilang ident="D3_TOTP_ACCOUNT"}]">[{oxmultilang ident="D3_TOTP_ACCOUNT"}]</a>
 </li>
\ No newline at end of file
diff --git a/src/Application/views/tpl/d3_account_totp.tpl b/src/Application/views/tpl/d3_account_totp.tpl
index a945883..614e3ce 100644
--- a/src/Application/views/tpl/d3_account_totp.tpl
+++ b/src/Application/views/tpl/d3_account_totp.tpl
@@ -8,6 +8,17 @@
         .registerNew {
             display: none;
         }
+        dt, dd {
+            width: 50%;
+            float: left;
+            margin-bottom: 10px;
+        }
+        dd textarea {
+            max-width: 98%;
+        }
+        dt label {
+            font-weight: bold;
+        }
         [{if false == $totp->getId()}]
             .submitBtn {
                 display: none;
@@ -30,38 +41,47 @@
             </p>
 
             [{if false == $totp->getId()}]
-                <div class="registerNew panel panel-default">
-                    <div class="panel-heading">
+                <div class="registerNew [{* flow *}] panel panel-default [{* wave *}] card">
+                    <div class="[{* flow *}] panel-heading [{* wave *}] card-header">
                         [{oxmultilang ident="D3_TOTP_REGISTERNEW"}]
                     </div>
-                    <div class="panel-body">
-                        <p>
-                            [{oxmultilang ident="D3_TOTP_QRCODE"}]&nbsp;
-
-                            [{$totp->getQrCodeElement()}]
-                        </p>
+                    <div class="[{* flow *}] panel-body [{* wave *}] card-body">
+                        <dl>
+                            <dt>
+                                [{oxmultilang ident="D3_TOTP_QRCODE"}]&nbsp;
+                            </dt>
+                            <dd>
+                                [{$totp->getQrCodeElement()}]
+                            </dd>
+                        </dl>
                         <p>
                             [{oxmultilang ident="D3_TOTP_QRCODE_HELP"}]
                         </p>
 
                         <hr>
 
-                        <p>
-                            <label for="secret">[{oxmultilang ident="D3_TOTP_SECRET"}]</label>
-
-                            <textarea rows="3" cols="50" id="secret" name="secret" class="editinput" readonly="readonly">[{$totp->getSecret()}]</textarea>
-                        </p>
+                        <dl>
+                            <dt>
+                                <label for="secret">[{oxmultilang ident="D3_TOTP_SECRET"}]</label>
+                            </dt>
+                            <dd>
+                                <textarea rows="3" cols="50" id="secret" name="secret" class="editinput" readonly="readonly">[{$totp->getSecret()}]</textarea>
+                            </dd>
+                        </dl>
                         <p>
                             [{oxmultilang ident="D3_TOTP_SECRET_HELP"}]
                         </p>
 
                         <hr>
 
-                        <p>
-                            <label for="otp">[{oxmultilang ident="D3_TOTP_CURROTP"}]</label>
-
-                            <input type="text" class="editinput" size="6" maxlength="6" id="otp" name="otp" value="" [{$readonly}]>
-                        </p>
+                        <dl>
+                            <dt>
+                                <label for="otp">[{oxmultilang ident="D3_TOTP_CURROTP"}]</label>
+                            </dt>
+                            <dd>
+                                <input type="text" class="editinput" size="6" maxlength="6" id="otp" name="otp" value="" [{$readonly}]>
+                            </dd>
+                        </dl>
                         <p>
                             [{oxmultilang ident="D3_TOTP_CURROTP_HELP"}]
                         </p>
@@ -71,22 +91,22 @@
 
             [{if $totp->getId()}]
                 [{block name="d3_account_totp_deletenotes"}]
-                    <div class="panel panel-default">
-                        <div class="panel-heading">
+                    <div class="[{* flow *}] panel panel-default [{* wave *}] card">
+                        <div class="[{* flow *}] panel-heading [{* wave *}] card-header">
                             [{oxmultilang ident="D3_TOTP_REGISTEREXIST"}]
                         </div>
-                        <div class="panel-body">
+                        <div class="[{* flow *}] panel-body [{* wave *}] card-body">
                             [{oxmultilang ident="D3_TOTP_REGISTERDELETE_DESC"}]
                         </div>
                     </div>
                 [{/block}]
 
                 [{block name="d3_account_totp_backupcodes"}]
-                    <div class="panel panel-default">
-                        <div class="panel-heading">
+                    <div class="[{* flow *}] panel panel-default [{* wave *}] card">
+                        <div class="[{* flow *}] panel-heading [{* wave *}] card-header">
                             [{oxmultilang ident="D3_TOTP_BACKUPCODES"}]
                         </div>
-                        <div class="panel-body">
+                        <div class="[{* flow *}] panel-body [{* wave *}] card-body">
                             [{if $oView->getBackupCodes()}]
                                 [{block name="d3_account_totp_backupcodes_list"}]
                                     <label for="backupcodes">[{oxmultilang ident="D3_TOTP_BACKUPCODES_DESC"}]</label>
diff --git a/src/Application/views/tpl/d3totplogin.tpl b/src/Application/views/tpl/d3totplogin.tpl
index 08e67c7..c2facdb 100644
--- a/src/Application/views/tpl/d3totplogin.tpl
+++ b/src/Application/views/tpl/d3totplogin.tpl
@@ -7,7 +7,7 @@
     [{/if}]
 
     <div class="row">
-        <div class="col-xs-12 col-sm-10 col-md-6 col-sm-offset-1 col-md-offset-3 mainforms">
+        <div class="col-xs-12 col-sm-10 col-md-6 [{* flow *}] col-sm-offset-1 col-md-offset-3 [{* wave *}] offset-sm-1 offset-md-3 mainforms">
             <form action="[{$oViewConf->getSelfActionLink()}]" method="post" name="login" id="login">
                 [{$oViewConf->getHiddenSid()}]
 
@@ -26,7 +26,10 @@
 
                 [{oxmultilang ident="D3_TOTP_INPUT_HELP"}]
 
-                <input type="submit" value="[{oxmultilang ident="D3_TOTP_SUBMIT_LOGIN"}]" class="btn btn-primary"><br>
+                <button type="submit" class="btn btn-primary">
+                    [{oxmultilang ident="D3_TOTP_SUBMIT_LOGIN"}]
+                </button><br>
+
             </form>
             <form action="[{$oViewConf->getSelfActionLink()}]" method="post" name="login" id="login">
                 [{$oViewConf->getHiddenSid()}]
@@ -34,7 +37,11 @@
                 <input type="hidden" name="fnc" value="cancelTotplogin">
                 <input type="hidden" name="cl" value="[{$oView->getPreviousClass()}]">
                 [{$navFormParams}]
-                <input class="btn btn_cancel" value="[{oxmultilang ident="D3_TOTP_CANCEL_LOGIN"}]" type="submit">
+
+                <button class="btn btn_cancel" type="submit">
+                    [{oxmultilang ident="D3_TOTP_CANCEL_LOGIN"}]
+                </button>
+
             </form>
         </div>
     </div>