Author: solomax
Date: Mon Jul 13 04:20:16 2015
New Revision: 1690566
URL: http://svn.apache.org/r1690566
Log:
[OPENMEETINGS-1231] label is added to the chat panel
Modified:
openmeetings/branches/3.0.x/src/main/webapp/css/theme.css
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/ChatPanel.html
Modified: openmeetings/branches/3.0.x/src/main/webapp/css/theme.css
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/css/theme.css?rev=1690566&r1=1690565&r2=1690566&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/css/theme.css (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/css/theme.css Mon Jul 13
04:20:16 2015
@@ -84,12 +84,10 @@ html, body {
width: 600px;
}
#chatPanel #chat {
- height: 10px;
+ height: 20px;
}
#chatPanel #chat #controlBlock #control {
text-align: center;
- margin-left: 50%;
- margin-right: 50%;
}
#chatPanel #chat #messageArea .date {
margin-right: 5px;
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/ChatPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/ChatPanel.html?rev=1690566&r1=1690565&r2=1690566&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/ChatPanel.html
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/ChatPanel.html
Mon Jul 13 04:20:16 2015
@@ -24,9 +24,9 @@
function toggleChat() {
var chat = $('#chat');
$('#chat #controlBlock #control')
- .removeClass('ui-icon-carat-1-' +
(chat.height() < 20 ? 'n' : 's'))
- .addClass('ui-icon-carat-1-' +
(chat.height() < 20 ? 's' : 'n'));
- chat.animate({ height: chat.height() < 20 ?
"320px" : "16px" }, 1000);
+ .removeClass('ui-icon-carat-1-' +
(chat.height() < 24 ? 'n' : 's'))
+ .addClass('ui-icon-carat-1-' +
(chat.height() < 24 ? 's' : 'n'));
+ chat.animate({ height: chat.height() < 24 ?
"320px" : "20px" }, 1000);
}
function addChatMessageInternal(m) {
if (m && m.type == "chat") {
@@ -49,7 +49,7 @@
</wicket:head>
<wicket:panel>
<div id="chat" class="ui-state-default">
- <div id="controlBlock" onclick="toggleChat();"
class="ui-state-active clickable"><div id="control" class="ui-icon
ui-icon-carat-1-n sort-icon"></div></div>
+ <div id="controlBlock" onclick="toggleChat();"
class="ui-state-active clickable"><span id="control" class="ui-icon
ui-icon-carat-1-n sort-icon"></span><span><wicket:message
key="244"/></span></div>
<div wicket:id="messages"></div>
<form wicket:id="sendForm">
<div wicket:id="toolbarContainer"></div>
