This commit is contained in:
Gradido2 2020-07-14 11:51:05 +00:00
parent 1e6d4bb8b3
commit bcb8aafae2
3 changed files with 52 additions and 87 deletions

View File

@ -65,24 +65,6 @@ enum PageState
} }
} }
%><%@ include file="header.cpsp" %> %><%@ include file="header.cpsp" %>
<div class="authentication-theme auth-style_1">
<div class="row">
<div class="col-12 logo-section">
<a href="<%= ServerConfig::g_php_serverPath %>" class="logo">
<picture>
<source srcset="<%= ServerConfig::g_php_serverPath %>img/logo_schrift.webp" type="image/webp">
<source srcset="<%= ServerConfig::g_php_serverPath %>img/logo_schrift.png" type="image/png">
<img src="<%= ServerConfig::g_php_serverPath %>img/logo_schrift.png" alt="logo" />
</picture>
</a>
</div>
</div>
<div class="row">
<div class="col-lg-5 col-md-7 col-sm-9 col-11 mx-auto">
<div class="grid">
<div class="center-ul-container">
<%= getErrorsHtml() %>
</div>
<div class="grid-body"> <div class="grid-body">
<form action="<%= ServerConfig::g_php_serverPath %>account/checkEmail" method="GET"> <form action="<%= ServerConfig::g_php_serverPath %>account/checkEmail" method="GET">
<div class="row pull-right-row"> <div class="row pull-right-row">
@ -129,8 +111,4 @@ enum PageState
</div> </div>
</div> </div>
</div> </div>
<div class="auth_footer">
<p class="text-muted text-center">© Gradido 2019</p>
</div>
</div>
<%@ include file="footer.cpsp" %> <%@ include file="footer.cpsp" %>

View File

@ -1,20 +1,12 @@
<div class="center-form-selectors">
<form method="GET" action=""> <form method="GET" action="">
<div class="row pull-right-row"> <button id="flag-england" name="lang" value="en" title="English" type="submit" <% if(lang != LANG_EN) { %>class="flag-btn"<% }
<div class="equel-grid pull-right"> else { %>class="flag-btn" disabled<% } %>>
<div class="grid-body-small text-center"> <span class="flag flag-england"></span>
<button id="flag-england" name="lang" value="en" title="English" type="submit" <% if(lang != LANG_EN) { %>class="btn btn-outline-secondary flag-btn"<% } </button>
else { %>class="btn btn-secondary disabled flag-btn" disabled<% } %>> <button id="flag-germany" name="lang" value="de" title="Deutsch" type="submit" <% if(lang != LANG_DE) { %>class="flag-btn"<% }
<span class="flag-england"></span> else { %>class="flag-btn" disabled<% } %>>
</button> <span class="flag flag-germany"></span>
</div> </button>
</div>
<div class="equel-grid pull-right">
<div class="grid-body-small text-center">
<button id="flag-germany" name="lang" value="de" title="Deutsch" type="submit" <% if(lang != LANG_DE) { %>class="btn btn-outline-secondary flag-btn"<% }
else { %>class="btn btn-secondary disabled flag-btn" disabled<% } %>>
<span class="flag-germany"></span>
</button>
</div>
</div>
</div>
</form> </form>
</div>

View File

@ -16,10 +16,8 @@ enum PageState {
PAGE_WAIT_EMAIL, PAGE_WAIT_EMAIL,
PAGE_WAIT_ADMIN, PAGE_WAIT_ADMIN,
PAGE_EMAIL_ALREADY_SEND PAGE_EMAIL_ALREADY_SEND
}; };
%><%% %><%%
PageState state = PAGE_EMAIL_ASK; PageState state = PAGE_EMAIL_ASK;
auto lm = LanguageManager::getInstance(); auto lm = LanguageManager::getInstance();
auto sm = SessionManager::getInstance(); auto sm = SessionManager::getInstance();
@ -102,46 +100,46 @@ enum PageState {
%><%@ include file="header.cpsp" %> %><%@ include file="header.cpsp" %>
<% if(state == PAGE_EMAIL_ASK) { %>
<div class="center-form-container"> <div class="center-form-container">
<div class="center-form-title"> <div class="center-form-title">
<h1>Passwort zurücksetzen</h1> <h1>Passwort zurücksetzen</h1>
</div> </div>
<div class="center-form-form"> <% if(state == PAGE_EMAIL_ASK) { %>
<div class="center-form-form">
<form action="<%= ServerConfig::g_serverPath %>/resetPassword"> <form action="<%= ServerConfig::g_serverPath %>/resetPassword">
<div class="item-wrapper"> <div class="item-wrapper">
<div class="form-group"> <div class="form-group">
<label for="email"><%= langCatalog->gettext("Gib bitte hier deine E-Mail Adresse an:") %></label> <label class="form-label" for="email"><%= langCatalog->gettext("Gib bitte hier deine E-Mail Adresse an:") %></label>
<input type="text" class="<%= emailInputClass %>" name="email" id="email" placeholder="E-Mail" value="<%= email %>"> <input class="form-control" type="text" class="<%= emailInputClass %>" name="email" id="email" placeholder="E-Mail" value="<%= email %>">
</div> </div>
<button type="submit" class="btn btn-sm btn-primary" ><%= langCatalog->gettext("Bestätigen") %></button> <button type="submit" class="center-form-submit form-button" ><%= langCatalog->gettext("Bestätigen") %></button>
</div>
</form>
</div>
<% } else if(state == PAGE_ASK) { %>
<div class="center-form-form">
<%@ include file="flags.cpsp" %>
<form action="<%= ServerConfig::g_serverPath %>/resetPassword">
<label class="form-label" for="email"><%= langCatalog->gettext("Gib bitte hier deine E-Mail Adresse an:") %></label>
<input class="form-control" type="text" class="<%= emailInputClass %>" name="email" id="email" placeholder="E-Mail" value="<%= email %>">
<label><%= langCatalog->gettext("Hast du dir deine Passphrase notiert oder gemerkt?") %></label>
<input class="form-control" type="hidden" name="ask_passphrase" value="true">
<div class="<%= passphraseRadioClass %>">
<div class="radio">
<label class="form-label" class="radio-label mr-4">
<input class="form-control" name="passphrase_memorized" onclick="removeGroupInvalidClass()" type="radio" value="true"><%= langCatalog->gettext("Ja") %> <i class="input-frame"></i>
</label>
</div>
<div class="radio">
<label class="form-label" class="radio-label">
<input class="form-control" name="passphrase_memorized" onclick="removeGroupInvalidClass()" type="radio" value="false"><%= langCatalog->gettext("Nein") %> <i class="input-frame"></i>
</label>
</div>
</div>
<button type="submit" class="center-form-submit form-button" name="ask" ><%= langCatalog->gettext("Absenden") %></button>
</div> </div>
</form> </form>
<% } else if(state == PAGE_ASK) { %>
<%@ include file="flags.cpsp" %>
<form action="<%= ServerConfig::g_serverPath %>/resetPassword">
<div class="item-wrapper">
<div class="form-group">
<label for="email"><%= langCatalog->gettext("Gib bitte hier deine E-Mail Adresse an:") %></label>
<input type="text" class="<%= emailInputClass %>" name="email" id="email" placeholder="E-Mail" value="<%= email %>">
<label><%= langCatalog->gettext("Hast du dir deine Passphrase notiert oder gemerkt?") %></label>
<input type="hidden" name="ask_passphrase" value="true">
<div class="<%= passphraseRadioClass %>">
<div class="radio">
<label class="radio-label mr-4">
<input name="passphrase_memorized" onclick="removeGroupInvalidClass()" type="radio" value="true"><%= langCatalog->gettext("Ja") %> <i class="input-frame"></i>
</label>
</div>
<div class="radio">
<label class="radio-label">
<input name="passphrase_memorized" onclick="removeGroupInvalidClass()" type="radio" value="false"><%= langCatalog->gettext("Nein") %> <i class="input-frame"></i>
</label>
</div>
</div>
</div>
<button type="submit" class="btn btn-sm btn-primary" name="ask" ><%= langCatalog->gettext("Absenden") %></button>
</div> </div>
</form>
<% } else if(state == PAGE_WAIT_EMAIL) { %> <% } else if(state == PAGE_WAIT_EMAIL) { %>
<%= langCatalog->gettext("Dir wird eine E-Mail zugeschickt um dein Passwort zur&uuml;ckzusetzen.") %> <%= langCatalog->gettext("Dir wird eine E-Mail zugeschickt um dein Passwort zur&uuml;ckzusetzen.") %>
<% } else if(state == PAGE_WAIT_ADMIN) { %> <% } else if(state == PAGE_WAIT_ADMIN) { %>
@ -155,9 +153,6 @@ enum PageState {
</div> </div>
</div> </div>
</div> </div>
<div class="auth_footer">
<p class="text-muted text-center">© Gradido 2020</p>
</div>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
function removeGroupInvalidClass() { function removeGroupInvalidClass() {