From b60e0b958beb0c13ab5706ac0b75480bf4a2fb4e Mon Sep 17 00:00:00 2001
From: azkahi <azkaimtiyaz@gmail.com>
Date: Tue, 29 Nov 2016 23:47:53 +0800
Subject: [PATCH] Added chat input for chat window
---
KAA-JSP/build/web/catalog.jsp | 5 ++++-
KAA-JSP/build/web/css/style.css | 9 +++++++--
KAA-JSP/web/catalog.jsp | 5 ++++-
KAA-JSP/web/css/style.css | 9 +++++++--
4 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/KAA-JSP/build/web/catalog.jsp b/KAA-JSP/build/web/catalog.jsp
index 25bcdf5..fe89253 100644
--- a/KAA-JSP/build/web/catalog.jsp
+++ b/KAA-JSP/build/web/catalog.jsp
@@ -398,7 +398,6 @@
%>
<br>
-
<div class="popup-box chat-popup" id="1" ng-show="isReceiverSet()" style="right: 0px; display: block;">
<div class="popup-head">
<div class="popup-head-left">{{receiver}}</div>
@@ -406,6 +405,10 @@
<div style="clear: both"></div>
</div>
<div class="popup-messages">Tes</div>
+ <div class="popup-input">
+ <input type="text" style="height: 100%" name="chat" class="auto-style1" hidefocus="hidefocus" />
+ </div>
+
</div>
<!-- <div ng-app="chatApp" ng-controller="chatController">
diff --git a/KAA-JSP/build/web/css/style.css b/KAA-JSP/build/web/css/style.css
index 0dc33db..b9ac050 100644
--- a/KAA-JSP/build/web/css/style.css
+++ b/KAA-JSP/build/web/css/style.css
@@ -47,10 +47,15 @@
.popup-box .popup-messages
{
- height: 100%;
+ height: 78%;
overflow-y: scroll;
}
-
+
+.popup-box .popup-input
+{
+ bottom: 0px;
+}
+
body {
align: center;
}
diff --git a/KAA-JSP/web/catalog.jsp b/KAA-JSP/web/catalog.jsp
index 25bcdf5..fe89253 100644
--- a/KAA-JSP/web/catalog.jsp
+++ b/KAA-JSP/web/catalog.jsp
@@ -398,7 +398,6 @@
%>
<br>
-
<div class="popup-box chat-popup" id="1" ng-show="isReceiverSet()" style="right: 0px; display: block;">
<div class="popup-head">
<div class="popup-head-left">{{receiver}}</div>
@@ -406,6 +405,10 @@
<div style="clear: both"></div>
</div>
<div class="popup-messages">Tes</div>
+ <div class="popup-input">
+ <input type="text" style="height: 100%" name="chat" class="auto-style1" hidefocus="hidefocus" />
+ </div>
+
</div>
<!-- <div ng-app="chatApp" ng-controller="chatController">
diff --git a/KAA-JSP/web/css/style.css b/KAA-JSP/web/css/style.css
index 0dc33db..b9ac050 100644
--- a/KAA-JSP/web/css/style.css
+++ b/KAA-JSP/web/css/style.css
@@ -47,10 +47,15 @@
.popup-box .popup-messages
{
- height: 100%;
+ height: 78%;
overflow-y: scroll;
}
-
+
+.popup-box .popup-input
+{
+ bottom: 0px;
+}
+
body {
align: center;
}
--
GitLab