Author: solomax
Date: Thu May 14 16:28:08 2015
New Revision: 1679398
URL: http://svn.apache.org/r1679398
Log:
Customization issues are fixed
Modified:
openmeetings/branches/3.0.x/WebContent/swf10/base/functions.lzx
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
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.html
Modified: openmeetings/branches/3.0.x/WebContent/swf10/base/functions.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/swf10/base/functions.lzx?rev=1679398&r1=1679397&r2=1679398&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/swf10/base/functions.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/swf10/base/functions.lzx Thu May 14
16:28:08 2015
@@ -48,9 +48,7 @@ function setLabelObjectByHundred(no, obj
function getLabelTag(labelid){
var l = labels["id" + labelid];
- if (l != undefined) {
- if ($debug) l += " [" + labelid + "]";
- } else {
+ if (l == undefined) {
l = "Error Missing [" + labelid + "]";
}
return l;
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=1679398&r1=1679397&r2=1679398&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 Thu May 14
16:28:08 2015
@@ -85,13 +85,6 @@ html, body {
}
#chatPanel #chat {
height: 10px;
- background-color: #F2FAFF;
-}
-#chatPanel #chat #controlBlock {
- background-color: #5294BB;
-}
-#chatPanel #chat #controlBlock:hover {
- background-color: #2779aa;
}
#chatPanel #chat #controlBlock #control {
text-align: center;
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=1679398&r1=1679397&r2=1679398&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
Thu May 14 16:28:08 2015
@@ -48,8 +48,8 @@
</script>
</wicket:head>
<wicket:panel>
- <div id="chat">
- <div id="controlBlock" onclick="toggleChat();"><div
id="control" class="ui-icon ui-icon-carat-1-n sort-icon"></div></div>
+ <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 wicket:id="messages"></div>
<form wicket:id="sendForm">
<div wicket:id="toolbarContainer"></div>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.html?rev=1679398&r1=1679397&r2=1679398&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.html
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/ChatPanel.html
Thu May 14 16:28:08 2015
@@ -20,8 +20,8 @@
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
- <div id="chat" class="ui-widget-header">
- <div onclick="toggleChat();" class=" control block clickable
ui-widget-header ui-state-active"><div class="ui-icon ui-icon-carat-1-n
sort-icon"></div><div class="label"><wicket:message key="244"/></div></div>
+ <div id="chat" class="ui-state-default">
+ <div onclick="toggleChat();" class="control block clickable
ui-widget-header ui-state-active"><div class="ui-icon ui-icon-carat-1-n
sort-icon"></div><div class="label"><wicket:message key="244"/></div></div>
<div id="chatTabs">
<ul>
<li><a href="#chatTab-all"><wicket:message
key="1494"/></a></li>