Skip to content

new_background #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lis413 wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

new_background #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad19935
new_background
lis413 Nov 17, 2018
49962e3
new_background_2
lis413 Nov 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 28 additions & 31 deletions web/index.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,36 +9,33 @@
<html>
<head>
<meta charset="UTF-8">
<title>Pocket Messenger Web</title>
<!-- BEGIN Подключение файла style.css -->
<link rel="stylesheet" type="text/css" href="views/styles/style.css">
<!-- END Подключение файла style.css -->
<title>PM_web_login</title>
<link rel="stylesheet" href="views/styles/style.css">
</head>
<body>

<header>
<div align="center">
<h2>Welcome to Pocket Messenger</h2>
</div>
</header>

<div class="login_380_600">
<div class="restangle_2_1"></div>
<div class="ellipse_big"></div>
<div class="pocket_messenger">Pocket Messenger</div>
<div class="for_geeks_by_geeks">For geeks by geeks</div>
<div class="ellipse_small"></div>
<!--BEGIN OF FORM-->
<form action="index" method="post">
<input id="mail" type="text" placeholder="E-mail" name="name" required>
<input id="pass" type="password" placeholder="Пароль" name = "pass" required>
<input id="log_in"type="submit" value="Войти">
<div class="forgot_pass"><a href="">Забыли пароль?</a></div> <!-- форма восстановления пароля -->
</form>
<!--END OF FORM-->
<!--BEGIN OF REGISTRATION-->
<div class="registration">Нет аккаунта?&nbsp;<a href="/add">Регистрация</a></div>
<!--END OF REGISTRATION-->
</div>
</body>
<body>
<header class="header"></header>
<main>
<content class="content">
<div class="restangle_2_1"></div>
<div class="restangle_2_2"></div>
<div class="restangle_2_3">
<form action = "index" method="post">
<input id="mail" type="text" placeholder="Имя пользователя" name="name" required>
<input id="pass" type="password" placeholder="Пароль" name = "pass" required>
<input id="log_in" type="submit" value="Войти">
<div class="error_msg"><%if (request.getAttribute("error_msg") != null) {
out.println("<p>" + request.getAttribute("error_msg") + "</p>");
}%></div>
<div class="forgot_pass"><a href="">Забыли пароль?</a></div>
</form>
<div class="registration">Нет аккаунта?&nbsp;&nbsp;&nbsp;<a href="/add">Регистрация</a></div>
</div>
<div class="ellipse_big"></div>
<div class="pocket_messenger"><h1>Pocket Messenger</h1></div>
<div class="for_geeks_by_geeks"><h2>For geeks by geeks</h2></div>
<div class="ellipse_small"></div>
</content>
</main>
<footer class="footer"></footer>
</body>
</html>
56 changes: 28 additions & 28 deletions web/views/add.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,43 +12,43 @@
</head>
<body>

<div>
<%
if(request.getAttribute("userName") != null){
out.println("<p> User " + request.getAttribute("userName") + " added!</p>");
}
%>
</div>
<div align="center">
<div>
<%
if(request.getAttribute("userName") != null){
out.println("<p> User " + request.getAttribute("userName") + " added!</p>");
}
%>
<h2>ADD USER</h2>
</div>
<div align="center">
<div>
<h2>ADD USER</h2>
</div>

<form method="post">
<label> Name:
<input type="text" name="name"><br />
</label>
<form method="post">
<label> Name:
<input type="text" name="name"><br />
</label>

<label> Password:
<input type="password" name="pass"><br />
</label>
<label> Password:
<input type="password" name="pass"><br />
</label>

<label> Password confirmation:
<input type="password" name="pass"><br />
</label>
<label> Password confirmation:
<input type="password" name="pass"><br />
</label>

<label> e-mail:
<input type="text" name="email"><br />
</label>
<label> e-mail:
<input type="text" name="email"><br />
</label>

<button type="submit">Submit</button>
</form>
<button type="submit">Submit</button>
</form>

</div>
</div>

<div align="center">
<button onclick="location.href='/'">Cancel</button>
</div>
<div align="center">
<button onclick="location.href='/'">Cancel</button>
</div>

</body>
</html>
Binary file modified web/views/styles/images/Ellipse_big.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added web/views/styles/images/background.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading