From 367ae55f09cc656a00c3cabae32cd6b47386b8fc Mon Sep 17 00:00:00 2001 From: srijit10 Date: Mon, 3 Apr 2017 20:55:58 +0530 Subject: [PATCH 1/5] Button changed --- web/chat.jsp | 145 +++++++++++++++++++++++++++++++++++++++++----- web/css/style.css | 4 +- web/index.jsp | 6 +- web/questions.jsp | 92 ++++++++++++++++++++++++++++- 4 files changed, 227 insertions(+), 20 deletions(-) diff --git a/web/chat.jsp b/web/chat.jsp index b7d46f3..f1cc594 100644 --- a/web/chat.jsp +++ b/web/chat.jsp @@ -8,9 +8,23 @@ + Chat | DiFo + + <% String name=(String)session.getAttribute("user_name"); + String text; + if(name==null) + text="Login"; + else + text="Logout"; %> + - - Home   - Questions   - Profile   -
+ +
@@ -91,7 +141,74 @@ -
- + + + + + + + + diff --git a/web/css/style.css b/web/css/style.css index 162a929..28f3224 100644 --- a/web/css/style.css +++ b/web/css/style.css @@ -161,10 +161,10 @@ header[role=banner]::after { .main-nav a.cd-signin, .main-nav a.cd-signup { padding: .6em 1em; border: 1px solid rgba(255, 255, 255, 0.6); - border-radius: 50em; + border-radius: 0em; } .main-nav a.cd-signup { - background: #2f889a; + background: lightcoral; border: none; } } diff --git a/web/index.jsp b/web/index.jsp index ce780e3..77fea59 100644 --- a/web/index.jsp +++ b/web/index.jsp @@ -32,7 +32,11 @@
  • Users
  • Profile
  • About Us
    • +<<<<<<< Updated upstream
    • +======= +
    • +>>>>>>> Stashed changes
    @@ -90,7 +94,7 @@ Show Error message here! - Type Password +

    diff --git a/web/questions.jsp b/web/questions.jsp index 4b28c3a..44d5069 100644 --- a/web/questions.jsp +++ b/web/questions.jsp @@ -18,6 +18,7 @@ + Questions | DiFo @@ -28,9 +29,30 @@ <%@include file="style.css" %> <%@include file="css/style.css" %> <%@include file="css/reset.css" %> - <%@include file="font-awesome.min.css" %> - + <%@include file="font-awesome.min.css" %> + .modal { + display: none; /* Hidden by default */ + position: fixed; /* Stay in place */ + z-index: 1; /* Sit on top */ + left: 0; + top: 0; + width: 100%; /* Full width */ + height: 100%; /* Full height */ + overflow: auto; /* Enable scroll if needed */ + background-color: rgb(0,0,0); /* Fallback color */ + background-color: rgba(0,0,0,0.4); /* Black w/ opacity */ + padding-top: 60px; + } + + <% + String name=(String)session.getAttribute("user_name"); + String text; + if(name==null) + text="Login"; + else + text="Logout"; + %> @@ -55,10 +77,59 @@

  • Users
  • Profile
  • About Us
    • -
    • +
    • + + <% List questions = null; try { @@ -99,4 +170,19 @@ + From 195f49adf30c1240bdebde5a8cb034c90ece3e4a Mon Sep 17 00:00:00 2001 From: srijit10 Date: Mon, 3 Apr 2017 21:21:53 +0530 Subject: [PATCH 2/5] Button depicts state of user --- web/showprofile.jsp | 73 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 69 insertions(+), 4 deletions(-) diff --git a/web/showprofile.jsp b/web/showprofile.jsp index 3c8efd4..9eedd5c 100644 --- a/web/showprofile.jsp +++ b/web/showprofile.jsp @@ -50,6 +50,11 @@ String mname=(String)session.getAttribute("m_name"); String lname=(String)session.getAttribute("l_name"); String status=(String)session.getAttribute("user_status"); + String text; + if(name==null) + text="Login"; + else + text="Logout"; %> @@ -60,10 +65,59 @@
  • Home
  • Questions
  • Chat
    • -
    • +
    • + +

    Username:<%out.println(name);%>


    First Name:<%out.println(fname);%>


    Middle Name:<%out.println(mname);%>


    @@ -72,9 +126,20 @@

    Status:<%out.println(status);%>


    - + From 608dfd0c2a5034eafc9f1f2605a5d3caa17b0a65 Mon Sep 17 00:00:00 2001 From: srijit10 Date: Mon, 3 Apr 2017 21:23:05 +0530 Subject: [PATCH 3/5] New button added for login/register --- web/index.jsp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/web/index.jsp b/web/index.jsp index 77fea59..e39ce79 100644 --- a/web/index.jsp +++ b/web/index.jsp @@ -32,11 +32,7 @@
  • Users
  • Profile
  • About Us
    • -<<<<<<< Updated upstream -
    • -=======
    • ->>>>>>> Stashed changes From 6ea0547292e7846d0beaaf7b1a1405f3e571182f Mon Sep 17 00:00:00 2001 From: srijit10 Date: Mon, 3 Apr 2017 21:24:15 +0530 Subject: [PATCH 4/5] Button depicts state of user --- web/questions.jsp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/questions.jsp b/web/questions.jsp index 44d5069..446b7cc 100644 --- a/web/questions.jsp +++ b/web/questions.jsp @@ -179,10 +179,11 @@ } var modal = document.getElementById('id01'); window.onclick = function(event) { - if (event.target == modal) { + if (event.target === modal) { modal.style.display = "none"; } } + From 5c29381cf9550b92f98111f99086b4cb3a868ed1 Mon Sep 17 00:00:00 2001 From: srijit10 Date: Mon, 3 Apr 2017 21:25:07 +0530 Subject: [PATCH 5/5] Added navigation bar and modified button state --- web/chat.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/chat.jsp b/web/chat.jsp index f1cc594..33dc493 100644 --- a/web/chat.jsp +++ b/web/chat.jsp @@ -204,7 +204,7 @@ } var modal = document.getElementById('id01'); window.onclick = function(event) { - if (event.target == modal) { + if (event.target === modal) { modal.style.display = "none"; } }