Dodati tooltip-ovi na web aplikaciji.

author: cirakg <ciraboxkg@gmail.com> 2023-01-07 23:00:20 +0100
committer: cirakg <ciraboxkg@gmail.com> 2023-01-07 23:00:20 +0100
commit: 60770759488e8c784648983040521e7d8430925f (patch)
tree: 611a9057cc4c6cfe2b3b35a15e81f7d63e2d1d52
parent: e94e9a85d819f5a5cffbdaf62981066ef287f1f9 (diff)
7 files changed, 193 insertions, 14 deletions
diff --git a/.project b/.project
index 770ab72..d9ccd89 100644
--- a/.project
+++ b/.project
@@ -28,4 +28,15 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1672952112779</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp
index d182b7e..ba31c01 100644
--- a/src/main/webapp/index.jsp
+++ b/src/main/webapp/index.jsp
@@ -13,8 +13,37 @@
 <meta charset="ISO-8859-1">
 <title>Login</title>
 </head>
+<style>
+.tooltip {
+  position: relative;
+  display: inline-block;
+  border-bottom: 1px dotted black;
+}
+.tooltip .tooltiptext {
+  visibility: hidden;
+  width: 300px;
+  background-color: black;
+  color: #fff;
+  text-align: center;
+  border-radius: 6px;
+  padding: 5px 0;
+  position: absolute;
+  z-index: 1;
+}
+.tooltip:hover .tooltiptext {
+  visibility: visible;
+}
+h1{
+display:inline
+}
+</style>
 <body>
-<h1>Login</h1>
+<h1>Login</h1><div class="tooltip">(?)
+  <span class="tooltiptext">Stranica za prijavu. U zavistinosti da li je korisnik koji se prijavljuje admin ili obican korisnik bice preusmeran na svoju stranicu.
+  ukoliko su unesu pogresne informacije za prijavu korisnik ce biti obavesten o tome.
+  </span>
+</div>
+<br>
 
 <form method="post" action="pages/login.jsp">
 	<input type="text" name="username" required> Korisnicko ime 
@@ -40,6 +69,8 @@
 <a href="pages/registerPage.jsp">
 	<button>Registracija</button>
 </a>
+<br><br>
+
 
 
 
diff --git a/src/main/webapp/pages/addNewPokemon.jsp b/src/main/webapp/pages/addNewPokemon.jsp
index 095ac40..dd7d24c 100644
--- a/src/main/webapp/pages/addNewPokemon.jsp
+++ b/src/main/webapp/pages/addNewPokemon.jsp
@@ -6,6 +6,27 @@
 <meta charset="ISO-8859-1">
 <title>Insert title here</title>
 </head>
+<style>
+.tooltip {
+  position: relative;
+  display: inline-block;
+  border-bottom: 1px dotted black;
+}
+.tooltip .tooltiptext {
+  visibility: hidden;
+  width: 300px;
+  background-color: black;
+  color: #fff;
+  text-align: center;
+  border-radius: 6px;
+  padding: 5px 0;
+  position: absolute;
+  z-index: 1;
+}
+.tooltip:hover .tooltiptext {
+  visibility: visible;
+}
+</style>
 <body>
 <%
 boolean isAdmin=(Boolean)session.getAttribute("admin");
@@ -14,12 +35,17 @@ if(!isAdmin){
 }
 %>
 
-
+<br>
+<div class="tooltip">(?)
+  <span class="tooltiptext">Stranica za dodavanje novog pokemona.
+  Sva polja su required. Za polje hp unos mora biti tipa int, polje snaga mora biti tipa float , sva ostala polja su tipa string. Polje ImageString64 je polje sa sliku encodiranu pomocu base64 encodera maxlenght je 15000.
+  Redirekcija na uspesnom dodavanju.</span>
+</div>
 <form method="post" action="addNewPokemonHelper.jsp">
 <input type="text" name="name" required> Ime <br>
 <input type="text" name="description" required> Opis <br>
 <input type="number" step="1" name="hp" required> Hp <br>
-<input type="text" name="base64Image" required> ImageString64 <br>
+<input type="text" name="base64Image" maxlength="15000" required> ImageString64 <br>
 
 <h2>Abilities</h2>
 <h3>ATTACK</h3>
diff --git a/src/main/webapp/pages/adminIndex.jsp b/src/main/webapp/pages/adminIndex.jsp
index be5381f..ab7ecd1 100644
--- a/src/main/webapp/pages/adminIndex.jsp
+++ b/src/main/webapp/pages/adminIndex.jsp
@@ -18,6 +18,28 @@
 	  border-collapse: collapse;
 	  padding:2px;
 	}
+	.tooltip {
+  position: relative;
+  display: inline-block;
+  border-bottom: 1px dotted black;
+}
+.tooltip .tooltiptext {
+  visibility: hidden;
+  width: 300px;
+  background-color: black;
+  color: #fff;
+  text-align: center;
+  border-radius: 6px;
+  padding: 5px 0;
+  position: absolute;
+  z-index: 1;
+}
+.tooltip:hover .tooltiptext {
+  visibility: visible;
+}
+h1{
+	display:inline
+}
 </style>
 </head>
 <body>
@@ -33,8 +55,12 @@ if(!isAdmin){
 <a href="addNewPokemon.jsp">
 	<button>DodajNovogPokemona</button>
 </a>
+<br>
 
-<h1>Lista korisnika</h1>
+<h1>Lista korisnika</h1><div class="tooltip" style="display:inline">(?)
+  <span class="tooltiptext">Lista korisnika u bazi. Admin moze da izbrise korisnike koji nisu admin-i.
+  </span>
+</div>
 <%
 IService service=(IService)Naming.lookup(CONSTS.rmiUrl);
 ArrayList<User>users=service.getAllUsers();
@@ -42,8 +68,6 @@ request.setAttribute("users", users);
 ArrayList<Monster> monsters=service.getMonsters();
 request.setAttribute("monsters", monsters);
 %>
-
-
 <table>
 <tr>
 <th>Id</th>
@@ -79,11 +103,16 @@ request.setAttribute("monsters", monsters);
 </c:forEach>
 
 </table>
+<br>
+
 
 
 
 <br><br>
-<h1>Registracija novog admina</h1>
+<h1>Registracija novog admina</h1><div class="tooltip">(?)
+  <span class="tooltiptext">Korisnicko ime i sifra moraju da budu alfanumericki string i polja ne smeju biti prazna. Dobija poruku da li je registracija uspesna.
+  </span>
+</div>
 <form method="post" action="registerAdmin.jsp">
 	<input type="text" name="username" pattern="^[A-Za-z0-9]{1,}$" required> Korisnicko ime 
 	<br>
@@ -107,11 +136,17 @@ request.setAttribute("monsters", monsters);
 	</p>
 	<button type="submit">Registruj admina</button>
 </form>
+<br>
+
 <h1>
 </h1>
 
 
-<h1>Svi pokemoni</h1>
+<h1>Svi pokemoni</h1><div class="tooltip">(?)
+  <span class="tooltiptext">Svi pokemoni registrovani u bazi. Ima mogucnost da ih obrise.
+  </span>
+</div>
+<br>
 <table>
 <tr>
 <th>Ime</th>
@@ -143,6 +178,8 @@ request.setAttribute("monsters", monsters);
 </c:forEach>
 
 </table>
+<br>
+
 
 
 
diff --git a/src/main/webapp/pages/history.jsp b/src/main/webapp/pages/history.jsp
index 7e36faf..34bf05c 100644
--- a/src/main/webapp/pages/history.jsp
+++ b/src/main/webapp/pages/history.jsp
@@ -21,12 +21,22 @@
 
 %>
 <table>
+<tr>
+	<th>Ime
+	</th>
+	<th>Slika
+	</th>
+	<th>Datun
+	</th>
+	<th>Rezultat
+	</th>
+</tr>
 <c:forEach items="${history}" var="item">
 			<tr bgcolor="${item.result  eq 1 ? 'LawnGreen': 'IndianRed'}">
 				<td><c:out value="${item.pokemon.name}"/></td>
 				<td><img style="height: 50px" src="data:image/*;base64, ${item.pokemon.base64Image}" /></td>
 				<td><c:out value="${item.time}"/></td>
-				<td><c:out value="${item.result  eq 1 ? 'Victory': 'Defeat'}"/></td>
+				<td><c:out value="${item.result  eq 1 ? 'Pobeda': 'Poraz'}"/></td>
 			</tr>
 			</c:forEach>
 </table>
diff --git a/src/main/webapp/pages/registerPage.jsp b/src/main/webapp/pages/registerPage.jsp
index c4118a0..a0ad82f 100644
--- a/src/main/webapp/pages/registerPage.jsp
+++ b/src/main/webapp/pages/registerPage.jsp
@@ -6,7 +6,36 @@
 <meta charset="ISO-8859-1">
 <title>Insert title here</title>
 </head>
+<style>
+.tooltip {
+  position: relative;
+  display: inline-block;
+  border-bottom: 1px dotted black;
+}
+.tooltip .tooltiptext {
+  visibility: hidden;
+  width: 300px;
+  background-color: black;
+  color: #fff;
+  text-align: center;
+  border-radius: 6px;
+  padding: 5px 0;
+  position: absolute;
+  z-index: 1;
+}
+.tooltip:hover .tooltiptext {
+  visibility: visible;
+}
+h1{
+	display:inline;
+}
+</style>
 <body>
+<h1>Register</h1><div class="tooltip">(?)
+  <span class="tooltiptext">Klasicna stranica za registraciju. Korisnicko ime i sifra moraju da budu alfanumericki string i polja ne smeju biti prazna. Ukoliko je registracija uspensa korisnik se redirektuje na login stranicu ,a ukoliko je neuspesna korisnik biva obavesten o tome.
+  </span>
+</div>
+<br>
 <form method="post" action="register.jsp">
 	<input type="text" name="username" pattern="^[A-Za-z0-9]{1,}$" required> Korisnicko ime 
 	<br>
@@ -24,5 +53,7 @@
 	</p>
 	<button type="submit">Registracija</button>
 </form>
+<br><br>
+
 </body>
 </html>
 \ No newline at end of file
diff --git a/src/main/webapp/pages/userIndex.jsp b/src/main/webapp/pages/userIndex.jsp
index 57e4a16..402b1ce 100644
--- a/src/main/webapp/pages/userIndex.jsp
+++ b/src/main/webapp/pages/userIndex.jsp
@@ -18,6 +18,28 @@
 	  border-collapse: collapse;
 	  padding:2px;
 	}
+	.tooltip {
+  position: relative;
+  display: inline-block;
+  border-bottom: 1px dotted black;
+}
+.tooltip .tooltiptext {
+  visibility: hidden;
+  width: 300px;
+  background-color: black;
+  color: #fff;
+  text-align: center;
+  border-radius: 6px;
+  padding: 5px 0;
+  position: absolute;
+  z-index: 1;
+}
+.tooltip:hover .tooltiptext {
+  visibility: visible;
+}
+h1{
+	display:inline;
+}
 </style>
 </head>
 <body>
@@ -30,7 +52,11 @@ if(isAdmin){
 <a href="logout.jsp">
 	<button>Log out</button>
 </a>
-<h1>Izaberi pokemona</h1>
+<br>
+<h1>Izaberi pokemona</h1><div class="tooltip">(?)
+  <span class="tooltiptext">Korisnik da bi se uopste ulogovan i koristio desktop aplikaciju mora da ima izabranog pokemona!!!
+  Prikazan izabran poken sa svim podacima o njemu</span>
+</div>
 <br>
 <%
 	IService service=(IService)Naming.lookup(CONSTS.rmiUrl);
@@ -56,8 +82,11 @@ Trenutno izabran pokemon:
 		<% 
 	}
 %>
-<br><br><br>
-<h1>Svi pokemoni</h1>
+<br><br>
+<h1>Svi pokemoni</h1><div class="tooltip">(?)
+  <span class="tooltiptext">Lista svih dostupnih pokemona odakle korisnik moze da izabere pokemona koga ce koristiti.</span>
+</div>
+<br>
 <table>
 <tr>
 <th>Ime</th>
@@ -89,8 +118,12 @@ Trenutno izabran pokemon:
 </c:forEach>
 
 </table>
-<br><br><br>
-<h1>Istorija</h1>
+<br><br>
+<h1>Istorija</h1><div class="tooltip">(?)
+  <span class="tooltiptext">Pregled istorije meceva korisnika. Prikaz imena i slike koriscenog pokemona, datum i rezultat meca.</span>
+</div>
+<br>
+<br>
 <jsp:include page="history.jsp"/>
author	cirakg <ciraboxkg@gmail.com>	2023-01-07 23:00:20 +0100
committer	cirakg <ciraboxkg@gmail.com>	2023-01-07 23:00:20 +0100
commit	60770759488e8c784648983040521e7d8430925f (patch)
tree	611a9057cc4c6cfe2b3b35a15e81f7d63e2d1d52
parent	e94e9a85d819f5a5cffbdaf62981066ef287f1f9 (diff)