Revert 397a2d17 and cf6c78e7: Reverts showing the password login form

templates/jwinf/base.hbs

@@ -60,16 +60,18 @@
             </div>
             {{/if}}
           {{else}}
+            <!-- form action="/login" method="post">
+              <div class="columns blogin">
+                <div class="column is-three-fifths"><input class="input is-small" type="text" name="username" autofocus placeholder="Benutzername" style="width:50%"><input class="input is-small" type="password" name="password" placeholder="Passwort" style="width:50%"></div>
+                <div class="column"><input class="button is-small is-success" type="submit" value="↪ &nbsp; Login" onclick="login();"></div>
+              </div>
+            </form -->
             <form action="/clogin" method="post" autocomplete="off" class="columns blogin">
               <!-- <div class=> -->
                 <div class="column is-three-fifths"><input class="input is-small" type="text" name="code" placeholder="Gruppencode oder Logincode" autofocus></div>
                 <div class="column"><input class="button is-small is-success" type="submit" value="↪ &nbsp; Login" style="font-weight:bold;"></div>
               <!-- </div> -->
             </form>
-            <form action="/login" method="post" class="columns blogin">
-               <div class="column is-three-fifths"><input class="input is-small" type="text" name="username" autofocus placeholder="Benutzername" style="width:50%"><input class="input is-small" type="password" name="password" placeholder="Passwort" style="width:50%"></div>
-               <div class="column"><input class="button is-small is-success" type="submit" value="↪ &nbsp; Login" style="font-weight:bold;" onclick="login();"></div>
-            </form>
             {{#if self_url}}
               {{#each oauth_links}}
                 <div class="columns blogin">

templates/jwinf/login.hbs

@@ -11,6 +11,23 @@
 </div>
 
 
+<!-- - <div class="columns">
+   <div class="column"> 
+      <h2 class="title is-4">Login mit Benutzername und Passwort (nicht PMS-Account)</h2>
+   </div>
+</div>
+<form action="/login" method="post" class="columns" style="margin-bottom:50px;">
+      <div class="column is-one-fifth">
+         <input class="input" type="text" name="username" autofocus placeholder="Benutzername">
+      </div>  
+      <div class="column is-one-fifth">
+         <input class="input" type="password" name="password" placeholder="Passwort">
+      </div>
+      <div class="column">
+         <input class="button is-success" type="submit" value="↪ &nbsp; Login" onclick="login();">
+      </div>
+
+</form>  -->
 
 
    <div class="columns">
@@ -29,25 +46,6 @@
       </form>
 
 
-      <div class="columns">
-         <div class="column">
-            <h2 class="title is-4">Login mit Benutzername und Passwort (nicht PMS-Account)</h2>
-         </div>
-      </div>
-      <form action="/login" method="post" class="columns" style="margin-bottom:50px;">
-         <div class="column is-one-fifth">
-            <input class="input" type="text" name="username" autofocus placeholder="Benutzername">
-         </div>
-         <div class="column is-one-fifth">
-            <input class="input" type="password" name="password" placeholder="Passwort">
-         </div>
-         <div class="column">
-            <input class="button is-success" type="submit" value="↪ &nbsp; Login" onclick="login();">
-         </div>
-
-      </form>
-
-
 {{#if self_url}}
          <div class="columns">
             <div class="column">