You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2015/12/04 04:22:58 UTC

svn commit: r1717890 - in /openmeetings: branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/ branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/ branches/3.1.x/openmeetings-install/src/main/java/...

Author: solomax
Date: Fri Dec  4 03:22:58 2015
New Revision: 1717890

URL: http://svn.apache.org/viewvc?rev=1717890&view=rev
Log:
[OPENMEETINGS-1278] openlaszlo dialogs are replaced with html5 dialogs; code clean-up

Removed:
    openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/languages/timezones.xml
    openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/languages/timezones.xsd
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/timezones.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/timezones.xsd
Modified:
    openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/TimezoneUtil.java
    openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx
    openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
    openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
    openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js
    openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/languages/languages.xml
    openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/TimezoneUtil.java
    openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
    openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/languages.xml

Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/TimezoneUtil.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/TimezoneUtil.java?rev=1717890&r1=1717889&r2=1717890&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/TimezoneUtil.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/TimezoneUtil.java Fri Dec  4 03:22:58 2015
@@ -18,53 +18,21 @@
  */
 package org.apache.openmeetings.db.util;
 
-import static org.apache.openmeetings.util.OmFileHelper.getLanguagesDir;
-import static org.apache.openmeetings.util.OmFileHelper.nameOfTimeZoneFile;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
 
-import java.io.File;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
 import java.util.TimeZone;
 
 import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
 import org.apache.openmeetings.db.entity.user.User;
 import org.apache.openmeetings.util.CalendarPatterns;
-import org.dom4j.Document;
-import org.dom4j.DocumentException;
-import org.dom4j.Element;
-import org.dom4j.io.SAXReader;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 
 public class TimezoneUtil {
 	private static final Logger log = Red5LoggerFactory.getLogger(TimezoneUtil.class, webAppRootKey);
-	private static final Map<String, String> ICAL_TZ_MAP = new Hashtable<String, String>();
-
-	private static void initTimeZones() {
-		SAXReader reader = new SAXReader();
-		Document document;
-		try {
-			ICAL_TZ_MAP.clear();
-			document = reader.read(new File(getLanguagesDir(), nameOfTimeZoneFile));
-
-			Element root = document.getRootElement();
-
-			for (@SuppressWarnings("rawtypes")
-			Iterator it = root.elementIterator("timezone"); it.hasNext();) {
-				Element item = (Element) it.next();
-				String timeZoneName = item.attributeValue("name");
-				String iCal = item.attributeValue("iCal");
-				ICAL_TZ_MAP.put(timeZoneName, iCal);
-			}
-		} catch (DocumentException e) {
-			log.error("Unexpected error while reading old time zone list", e);
-		}
-	}
 
 	@Autowired
 	private ConfigurationDao configurationDao;
@@ -134,33 +102,6 @@ public class TimezoneUtil {
 		// if user has not time zone get one from the server configuration
 		return getDefaultTimeZone();
 	}
-
-	/**
-	 * Return the timezone based on our internal jName
-	 * 
-	 * @param jName
-	 * @return
-	 */
-	public TimeZone getTimezoneByInternalJName(String jName) {
-		if (ICAL_TZ_MAP.isEmpty()) {
-			initTimeZones();
-		}
-		String omTimeZone = ICAL_TZ_MAP.get(jName);
-
-		if (omTimeZone == null) {
-			String err = String.format("There is not omTimeZone for this jName: '%s'", jName);
-			log.error(err);
-			throw new RuntimeException(err);
-		}
-		
-		TimeZone timeZone = TimeZone.getTimeZone(omTimeZone);
-
-		if (timeZone != null) {
-			return timeZone;
-		}
-		// if user has not time zone get one from the server configuration
-		return getDefaultTimeZone();
-	}
 
 	/**
 	 * We ignore the fact that a Date Object is always in UTC internally and treat it as if it contains only dd.mm.yyyy

Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx?rev=1717890&r1=1717889&r2=1717890&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/chat/chatTabItemEmoticons.lzx Fri Dec  4 03:22:58 2015
@@ -8,8 +8,8 @@
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
   
-      http://www.apache.org/licenses/LICENSE-2.0
-    	  
+	  http://www.apache.org/licenses/LICENSE-2.0
+		  
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -25,6 +25,7 @@
 	<switch>
 		<when property="$as3">
 			<passthrough>
+				import flash.external.ExternalInterface;
 				import flash.text.*;
 				import fl.text.*;
 			</passthrough>
@@ -90,36 +91,31 @@
 	]]>
 	</handler>
 	
-	<view name="bg" width="179" height="$once{ parent.height-1 }" bgcolor="0xFFFFFF" 
-		opacity="0.1">
-	</view>
+	<view name="bg" width="179" height="$once{ parent.height-1 }" bgcolor="0xFFFFFF" opacity="0.1"/>
 	
 	<omImage name="_userpic" stretches="both" x="1" y="1">
 		<handler name="onload">
-            <![CDATA[
-                if (this.height > 38) {
-                    //If bigger then containter then scale it
-                    var width = this.width/(this.height/38);
-                    this.setAttribute('height',38);
-                    this.setAttribute('width',width);
-                }
-                if (this.width > 38) {
-                	var height = this.height/(this.width/38);
-                	this.setAttribute('height',height);
-                    this.setAttribute('width',38);
-                }
-            ]]>
-        </handler>
+		<![CDATA[
+			if (this.height > 38) {
+				//If bigger then containter then scale it
+				var width = this.width/(this.height/38);
+				this.setAttribute('height',38);
+				this.setAttribute('width',width);
+			}
+			if (this.width > 38) {
+				var height = this.height/(this.width/38);
+				this.setAttribute('height',height);
+				this.setAttribute('width',38);
+			}
+		]]>
+		</handler>
 	</omImage>
 	
 	<text text="$once{ parent.username }" x="40" resize="false" fontsize="11" multiline="true"
-		  width="140" height="$once{ parent.height }"
-		  name="header_user">
-	</text>
+		  width="140" height="$once{ parent.height }" name="header_user"/>
 	
 	<state applied="$once{ parent.rawMessage[9] }">
-		<miniIcons resource="allow_ok_icon_rsc" width="16" height="16"
-			y="2" x="$once{ parent.width - 140 }" showhandcursor="true" >
+		<miniIcons resource="allow_ok_icon_rsc" width="16" height="16" y="2" x="$once{ parent.width - 140 }" showhandcursor="true" >
 			<handler name="onclick">
 				this.setAttribute('visible', false);
 				parent.setAttribute('visible', false);
@@ -131,58 +127,54 @@
 			<labelTooltip labelid="1514" />
 		</miniIcons> 
 	</state>
-	
-	<state applied="$once{ !parent.isDirectLink }">
-	
-	    <miniIconsImage name="add" src="$once{ canvas.getThemeImage('edit_add_rsc') }" width="16" height="16" 
-	                   y="2" x="$once{ parent.width - 122 }" showhandcursor="true">
-	        <handler name="onclick">
-	            if ($debug) Debug.write("Add tpo contacts");
-	        </handler>
-	        <labelTooltip labelid="1186" />
-	    </miniIconsImage>
-    
-    </state>
-    
+
 	<!-- space between each line of text -->
 	<attribute name="leading" value="5" type="number" />
 	
-	<view name="bg_main" x="180" width="$once{ parent.width - 180 }" height="$once{ parent.height-1 }"  
-		opacity="0.3" bgcolor="0xFFFFFF">
-	</view>
+	<view name="bg_main" x="180" width="$once{ parent.width - 180 }" height="$once{ parent.height-1 }" opacity="0.3" bgcolor="0xFFFFFF"/>
 	
+	<method name="callJsFunction" args="func">
+		ExternalInterface.call(func, this.userId);
+	</method>
+		
 	<state applied="$once{ !parent.isDirectLink }">
-	
-	    <miniIcons name="private_message_add" resource="private_message_add_rsc" width="16" height="16" 
-	                   y="0" x="$once{ parent.width - 104 }" showhandcursor="true">
-	        <handler name="onclick">
-	            if ($debug) Debug.write("New Private message");
-	        </handler>
-	        <labelTooltip labelid="1253" />
-	    </miniIcons>
-	    
-	    <miniIcons resource="user_profile_rsc" width="16" height="16" 
-	               y="0" x="$once{ parent.width - 84 }" showhandcursor="true">
-	        <handler name="onclick">
-	            if ($debug) Debug.write("Start Conference");
-	        </handler>
-	        <labelTooltip labelid="1236" />
-	    </miniIcons>    		  
+		<miniIconsImage name="add" src="$once{ canvas.getThemeImage('edit_add_rsc') }" width="16" height="16" 
+					   y="2" x="$once{ parent.width - 122 }" showhandcursor="true" visible="${ canvas.userId != parent.userId }">
+			<handler name="onclick">
+				if ($debug) Debug.write("Add to contacts");
+				parent.callJsFunction("addContact");
+			</handler>
+			<labelTooltip labelid="1186" />
+		</miniIconsImage>
+		
+		<miniIcons name="private_message_add" resource="private_message_add_rsc" width="16" height="16" 
+					   y="0" x="$once{ parent.width - 104 }" showhandcursor="true" visible="${ canvas.userId != parent.userId }">
+			<handler name="onclick">
+				if ($debug) Debug.write("New Private message");
+				parent.callJsFunction("privateMessage");
+			</handler>
+			<labelTooltip labelid="1253" />
+		</miniIcons>
+		
+		<miniIcons resource="user_profile_rsc" width="16" height="16" y="0" x="$once{ parent.width - 84 }" showhandcursor="true">
+			<handler name="onclick">
+				if ($debug) Debug.write("Show info");
+				parent.callJsFunction("showUserInfo");
+			</handler>
+			<labelTooltip labelid="1236" />
+		</miniIcons>			  
 			  
-	    <miniIcons y="0" x="$once{ parent.width - 64 }"
-	    		   resource="start_conference2_rsc" width="16" height="16" 
-	               showhandcursor="true">
-	        <handler name="onclick">
-	            if ($debug) Debug.write("Start Conference");
-	        </handler>
-	        <labelTooltip labelid="1131" />
-	    </miniIcons>  
-    
-    </state>
-    		  
-	<text text="$once{ parent.usertime+'   ' }" align="right" fgcolor="0xAAAAAA"
-		  fontsize="10" name="header_time" />
+		<miniIcons y="0" x="$once{ parent.width - 64 }" resource="start_conference2_rsc" width="16" height="16" 
+				   showhandcursor="true" visible="${ canvas.userId != parent.userId }">
+			<handler name="onclick">
+				if ($debug) Debug.write("Invite user");
+				parent.callJsFunction("inviteUser");
+			</handler>
+			<labelTooltip labelid="1131" />
+		</miniIcons>  
+	</state>
 
+	<text text="$once{ parent.usertime+'   ' }" align="right" fgcolor="0xAAAAAA" fontsize="10" name="header_time" />
 </class>						
 
 <class name="chatInnerTextBox" extends="text" resize="true" bgcolor="red" />

Modified: openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java?rev=1717890&r1=1717889&r2=1717890&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java Fri Dec  4 03:22:58 2015
@@ -974,7 +974,7 @@ public class BackupImport {
 				do {
 					if (u.getTimeZoneId() == null && "omTimeZone".equals(item2.getName())) {
 						String jName = item2.getValue();
-						u.setTimeZoneId(jName == null ? null : tzUtil.getTimezoneByInternalJName(jName).getID());
+						u.setTimeZoneId(jName == null ? null : tzUtil.getTimeZone(jName).getID());
 					}
 					if ("level_id".equals(item2.getName())) {
 						levelId = item2.getValue();

Modified: openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java?rev=1717890&r1=1717889&r2=1717890&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java (original)
+++ openmeetings/branches/3.1.x/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java Fri Dec  4 03:22:58 2015
@@ -63,7 +63,6 @@ public class OmFileHelper {
 	public static final String profilesPrefix = "profile_";
 	public static final String nameOfLanguageFile = "languages.xml";
 	public static final String nameOfCountriesFile = "countries.xml";
-	public static final String nameOfTimeZoneFile = "timezones.xml";
 	public static final String nameOfErrorFile = "errorvalues.xml";
 	public static final String libraryFileName = "library.xml";
 	public static final String defaultProfileImageName = "profile_pic.jpg";

Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js?rev=1717890&r1=1717889&r2=1717890&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js Fri Dec  4 03:22:58 2015
@@ -99,8 +99,8 @@ function addChatMessage(m) {
 					.replace(/#\{msg\}/g, cm.message));
 			var date = msg.children('.date');
 			date.after(infoTemplate.replace(/#\{userId\}/g, cm.from.id));
-			date.after(addTemplate.replace(/#\{userId\}/g, cm.from.id));
 			if ("full" == cm.actions) {
+				date.after(addTemplate.replace(/#\{userId\}/g, cm.from.id));
 				date.after(messageTemplate.replace(/#\{userId\}/g, cm.from.id));
 				date.after(inviteTemplate.replace(/#\{userId\}/g, cm.from.id));
 			}

Modified: openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/languages/languages.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/languages/languages.xml?rev=1717890&r1=1717889&r2=1717890&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/languages/languages.xml (original)
+++ openmeetings/branches/3.1.x/openmeetings-web/src/main/webapp/languages/languages.xml Fri Dec  4 03:22:58 2015
@@ -18,7 +18,7 @@
   under the License.
   
 -->
-<language xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="languages.xsd">
+<language xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<lang id="1" code="en">english</lang>
 	<lang id="2" code="de">deutsch</lang>
 	<lang id="3" code="de-StudIP">deutsch (studIP)</lang>

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/TimezoneUtil.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/TimezoneUtil.java?rev=1717890&r1=1717889&r2=1717890&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/TimezoneUtil.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/TimezoneUtil.java Fri Dec  4 03:22:58 2015
@@ -18,53 +18,21 @@
  */
 package org.apache.openmeetings.db.util;
 
-import static org.apache.openmeetings.util.OmFileHelper.getLanguagesDir;
-import static org.apache.openmeetings.util.OmFileHelper.nameOfTimeZoneFile;
 import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
 
-import java.io.File;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
 import java.util.TimeZone;
 
 import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
 import org.apache.openmeetings.db.entity.user.User;
 import org.apache.openmeetings.util.CalendarPatterns;
-import org.dom4j.Document;
-import org.dom4j.DocumentException;
-import org.dom4j.Element;
-import org.dom4j.io.SAXReader;
 import org.red5.logging.Red5LoggerFactory;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 
 public class TimezoneUtil {
 	private static final Logger log = Red5LoggerFactory.getLogger(TimezoneUtil.class, webAppRootKey);
-	private static final Map<String, String> ICAL_TZ_MAP = new Hashtable<String, String>();
-
-	private static void initTimeZones() {
-		SAXReader reader = new SAXReader();
-		Document document;
-		try {
-			ICAL_TZ_MAP.clear();
-			document = reader.read(new File(getLanguagesDir(), nameOfTimeZoneFile));
-
-			Element root = document.getRootElement();
-
-			for (@SuppressWarnings("rawtypes")
-			Iterator it = root.elementIterator("timezone"); it.hasNext();) {
-				Element item = (Element) it.next();
-				String timeZoneName = item.attributeValue("name");
-				String iCal = item.attributeValue("iCal");
-				ICAL_TZ_MAP.put(timeZoneName, iCal);
-			}
-		} catch (DocumentException e) {
-			log.error("Unexpected error while reading old time zone list", e);
-		}
-	}
 
 	@Autowired
 	private ConfigurationDao configurationDao;
@@ -134,33 +102,6 @@ public class TimezoneUtil {
 		// if user has not time zone get one from the server configuration
 		return getDefaultTimeZone();
 	}
-
-	/**
-	 * Return the timezone based on our internal jName
-	 * 
-	 * @param jName
-	 * @return
-	 */
-	public TimeZone getTimezoneByInternalJName(String jName) {
-		if (ICAL_TZ_MAP.isEmpty()) {
-			initTimeZones();
-		}
-		String omTimeZone = ICAL_TZ_MAP.get(jName);
-
-		if (omTimeZone == null) {
-			String err = String.format("There is not omTimeZone for this jName: '%s'", jName);
-			log.error(err);
-			throw new RuntimeException(err);
-		}
-		
-		TimeZone timeZone = TimeZone.getTimeZone(omTimeZone);
-
-		if (timeZone != null) {
-			return timeZone;
-		}
-		// if user has not time zone get one from the server configuration
-		return getDefaultTimeZone();
-	}
 
 	/**
 	 * We ignore the fact that a Date Object is always in UTC internally and treat it as if it contains only dd.mm.yyyy

Modified: openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java?rev=1717890&r1=1717889&r2=1717890&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java Fri Dec  4 03:22:58 2015
@@ -974,7 +974,7 @@ public class BackupImport {
 				do {
 					if (u.getTimeZoneId() == null && "omTimeZone".equals(item2.getName())) {
 						String jName = item2.getValue();
-						u.setTimeZoneId(jName == null ? null : tzUtil.getTimezoneByInternalJName(jName).getID());
+						u.setTimeZoneId(jName == null ? null : tzUtil.getTimeZone(jName).getID());
 					}
 					if ("level_id".equals(item2.getName())) {
 						levelId = item2.getValue();

Modified: openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java?rev=1717890&r1=1717889&r2=1717890&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java Fri Dec  4 03:22:58 2015
@@ -63,7 +63,6 @@ public class OmFileHelper {
 	public static final String profilesPrefix = "profile_";
 	public static final String nameOfLanguageFile = "languages.xml";
 	public static final String nameOfCountriesFile = "countries.xml";
-	public static final String nameOfTimeZoneFile = "timezones.xml";
 	public static final String nameOfErrorFile = "errorvalues.xml";
 	public static final String libraryFileName = "library.xml";
 	public static final String defaultProfileImageName = "profile_pic.jpg";

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js?rev=1717890&r1=1717889&r2=1717890&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat.js Fri Dec  4 03:22:58 2015
@@ -99,8 +99,8 @@ function addChatMessage(m) {
 					.replace(/#\{msg\}/g, cm.message));
 			var date = msg.children('.date');
 			date.after(infoTemplate.replace(/#\{userId\}/g, cm.from.id));
-			date.after(addTemplate.replace(/#\{userId\}/g, cm.from.id));
 			if ("full" == cm.actions) {
+				date.after(addTemplate.replace(/#\{userId\}/g, cm.from.id));
 				date.after(messageTemplate.replace(/#\{userId\}/g, cm.from.id));
 				date.after(inviteTemplate.replace(/#\{userId\}/g, cm.from.id));
 			}

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/languages.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/languages.xml?rev=1717890&r1=1717889&r2=1717890&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/languages.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/languages/languages.xml Fri Dec  4 03:22:58 2015
@@ -18,7 +18,7 @@
   under the License.
   
 -->
-<language xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="languages.xsd">
+<language xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<lang id="1" code="en">english</lang>
 	<lang id="2" code="de">deutsch</lang>
 	<lang id="3" code="de-StudIP">deutsch (studIP)</lang>