IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

more CSS

Browse Source
This commit is contained in:
Gradido2 2020-07-14 11:51:05 +00:00 committed by Dario
parent 18da186cea
commit b07902b807
3 changed files with 52 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/cpsp/checkEmail.cpsp
View File

@ -8,7 +8,7 @@
#include "../SingletonManager/SessionManager.h"
#include "../SingletonManager/LanguageManager.h"
#include "../SingletonManager/EmailManager.h"
enum PageState
enum PageState
{
MAIL_NOT_SEND,
ASK_VERIFICATION_CODE,
@ -20,20 +20,20 @@ enum PageState
const char* pageName = "Email Verification";
auto lm = LanguageManager::getInstance();
auto em = EmailManager::getInstance();
auto lang = chooseLanguage(request);
auto langCatalog = lm->getFreeCatalog(lang);
unsigned long long verificationCode = 0;
PageState state = ASK_VERIFICATION_CODE;
if(mSession && model::table::EMAIL_OPT_IN_REGISTER_DIRECT == mSession->getEmailVerificationType())
if(mSession && model::table::EMAIL_OPT_IN_REGISTER_DIRECT == mSession->getEmailVerificationType())
{
state = EMAIL_ACTIVATED;
}
}
else
{
if(!form.empty()) {
auto langBtn = form.get("lang-btn", "");
auto verficationCodeStr = form.get("email-verification-code", "0");
@ -48,11 +48,11 @@ enum PageState
langCatalog = lm->getFreeCatalog(lang);
}
}
// remove old cookies if exist
auto sm = SessionManager::getInstance();
sm->deleteLoginCookies(request, response, mSession);
if(mSession) {
getErrors(mSession);
if(mSession->getSessionState() < SESSION_STATE_EMAIL_VERIFICATION_SEND) {
@ -65,30 +65,12 @@ enum PageState
}
}
%><%@ 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">
<form action="<%= ServerConfig::g_php_serverPath %>account/checkEmail" method="GET">
<div class="row pull-right-row">
<div class="equel-grid pull-right">
<div class="grid-body-small text-center">
<button id="flag-england" name="lang-btn" value="en" title="English" type="submit" <% if(lang != LANG_EN) { %>class="btn btn-outline-secondary flag-btn"<% }
<button id="flag-england" name="lang-btn" value="en" title="English" type="submit" <% if(lang != LANG_EN) { %>class="btn btn-outline-secondary flag-btn"<% }
else { %>class="btn btn-secondary disabled flag-btn" disabled<% } %>>
<span class="flag-england"></span>
</button>
@ -96,7 +78,7 @@ enum PageState
</div>
<div class="equel-grid pull-right">
<div class="grid-body-small text-center">
<button id="flag-germany" name="lang-btn" value="de" title="Deutsch" type="submit" <% if(lang != LANG_DE) { %>class="btn btn-outline-secondary flag-btn"<% }
<button id="flag-germany" name="lang-btn" 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>
@ -116,7 +98,7 @@ enum PageState
</div>
</form>
<!--<p class="margin-top-10">
<%= langCatalog->gettext("Du hast bisher keinen Code erhalten?")%><br>
<%= langCatalog->gettext("Du hast bisher keinen Code erhalten?")%><br>
<%= langCatalog->gettext("E-Mail erneut zuschicken (in Arbeit)")%>
</p>-->
<p class="margin-top-10">
@ -129,8 +111,4 @@ enum PageState
</div>
</div>
</div>
<div class="auth_footer">
<p class="text-muted text-center">© Gradido 2019</p>
</div>
</div>
<%@ include file="footer.cpsp" %>

30
src/cpsp/flags.cpsp
View File

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

63
src/cpsp/resetPassword.cpsp
View File

@ -16,10 +16,8 @@ enum PageState {
PAGE_WAIT_EMAIL,
PAGE_WAIT_ADMIN,
PAGE_EMAIL_ALREADY_SEND
};
%><%%
PageState state = PAGE_EMAIL_ASK;
auto lm = LanguageManager::getInstance();
auto sm = SessionManager::getInstance();
@ -102,46 +100,46 @@ enum PageState {
%><%@ include file="header.cpsp" %>
<% if(state == PAGE_EMAIL_ASK) { %>
<div class="center-form-container">
<div class="center-form-title">
<h1>Passwort zurücksetzen</h1>
</div>
<div class="center-form-form">
<% if(state == PAGE_EMAIL_ASK) { %>
<div class="center-form-form">
<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 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 %>">
</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>
</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>
</form>
<% } else if(state == PAGE_WAIT_EMAIL) { %>
<%= langCatalog->gettext("Dir wird eine E-Mail zugeschickt um dein Passwort zur&uuml;ckzusetzen.") %>
<% } else if(state == PAGE_WAIT_ADMIN) { %>
@ -155,9 +153,6 @@ enum PageState {
</div>
</div>
</div>
<div class="auth_footer">
<p class="text-muted text-center">© Gradido 2020</p>
</div>
</div>
<script type="text/javascript">
function removeGroupInvalidClass() {