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 2014/05/19 14:17:14 UTC

svn commit: r1595860 - in /openmeetings/trunk/singlewebapp: ./ openmeetings-core/ openmeetings-db/ openmeetings-flash/ openmeetings-install/ openmeetings-screenshare/ openmeetings-server/ openmeetings-service/ openmeetings-util/ openmeetings-web/ openm...

Author: solomax
Date: Mon May 19 12:17:14 2014
New Revision: 1595860

URL: http://svn.apache.org/r1595860
Log:
[OPENMEETINGS-940] accordeon and carusel were added to the site

Added:
    openmeetings/trunk/singlewebapp/src/site/resources/css/
    openmeetings/trunk/singlewebapp/src/site/resources/css/openmeetings.css
      - copied, changed from r1595743, openmeetings/trunk/singlewebapp/src/site/xdoc/css/openmeetings.css
    openmeetings/trunk/singlewebapp/src/site/resources/js/
    openmeetings/trunk/singlewebapp/src/site/resources/js/site.js
Removed:
    openmeetings/trunk/singlewebapp/src/site/xdoc/css/
    openmeetings/trunk/singlewebapp/src/site/xdoc/stylesheets/site.vsl
Modified:
    openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml
    openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml
    openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml
    openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml
    openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml
    openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml
    openmeetings/trunk/singlewebapp/openmeetings-service/pom.xml
    openmeetings/trunk/singlewebapp/openmeetings-util/pom.xml
    openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
    openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml
    openmeetings/trunk/singlewebapp/pom.xml
    openmeetings/trunk/singlewebapp/src/site/site.xml
    openmeetings/trunk/singlewebapp/src/site/xdoc/index.xml

Modified: openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml?rev=1595860&r1=1595859&r2=1595860&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-core/pom.xml Mon May 19 12:17:14 2014
@@ -45,6 +45,13 @@
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
 				<executions>
 					<execution>

Modified: openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml?rev=1595860&r1=1595859&r2=1595860&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml Mon May 19 12:17:14 2014
@@ -94,6 +94,13 @@
 	<build>
 		<plugins>
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+			<plugin>
 				<groupId>org.apache.openjpa</groupId>
 				<artifactId>openjpa-maven-plugin</artifactId>
 				<version>${openjpa.version}</version>

Modified: openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml?rev=1595860&r1=1595859&r2=1595860&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-flash/pom.xml Mon May 19 12:17:14 2014
@@ -38,6 +38,13 @@
 	<build>
 		<plugins>
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+			<plugin>
 				<artifactId>maven-antrun-plugin</artifactId>
 				<executions>
 					<execution>

Modified: openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml?rev=1595860&r1=1595859&r2=1595860&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-install/pom.xml Mon May 19 12:17:14 2014
@@ -33,6 +33,17 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<commons-cli.version>1.2</commons-cli.version>
 	</properties>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework</groupId>

Modified: openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml?rev=1595860&r1=1595859&r2=1595860&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-screenshare/pom.xml Mon May 19 12:17:14 2014
@@ -65,6 +65,13 @@
 	<build>
 		<plugins>
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+			<plugin>
 				<groupId>com.google.code.maven-replacer-plugin</groupId>
 				<artifactId>replacer</artifactId>
 				<executions>

Modified: openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml?rev=1595860&r1=1595859&r2=1595860&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-server/pom.xml Mon May 19 12:17:14 2014
@@ -74,6 +74,13 @@
 	<build>
 		<plugins>
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>wagon-maven-plugin</artifactId>
 				<executions>

Modified: openmeetings/trunk/singlewebapp/openmeetings-service/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/pom.xml?rev=1595860&r1=1595859&r2=1595860&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-service/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-service/pom.xml Mon May 19 12:17:14 2014
@@ -32,6 +32,17 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.openmeetings</groupId>

Modified: openmeetings/trunk/singlewebapp/openmeetings-util/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-util/pom.xml?rev=1595860&r1=1595859&r2=1595860&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-util/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-util/pom.xml Mon May 19 12:17:14 2014
@@ -36,6 +36,17 @@
 		<commons-codec.version>1.8</commons-codec.version>
 		<servlet-api.version>2.5</servlet-api.version>
 	</properties>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 	<dependencies>
 		<dependency>
 			<groupId>org.red5</groupId>

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml?rev=1595860&r1=1595859&r2=1595860&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml Mon May 19 12:17:14 2014
@@ -73,6 +73,13 @@
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
 				<configuration>
 					<archiveClasses>true</archiveClasses>

Modified: openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml?rev=1595860&r1=1595859&r2=1595860&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-webservice/pom.xml Mon May 19 12:17:14 2014
@@ -33,6 +33,17 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<jettison.version>1.3.5</jettison.version>
 	</properties>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-site-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.openmeetings</groupId>

Modified: openmeetings/trunk/singlewebapp/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1595860&r1=1595859&r2=1595860&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/pom.xml Mon May 19 12:17:14 2014
@@ -476,6 +476,9 @@
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-site-plugin</artifactId>
 					<version>3.3</version>
+					<configuration>
+						<generatedSiteDirectory>${project.build.directory}/generated-site</generatedSiteDirectory>
+					</configuration>
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>

Copied: openmeetings/trunk/singlewebapp/src/site/resources/css/openmeetings.css (from r1595743, openmeetings/trunk/singlewebapp/src/site/xdoc/css/openmeetings.css)
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/site/resources/css/openmeetings.css?p2=openmeetings/trunk/singlewebapp/src/site/resources/css/openmeetings.css&p1=openmeetings/trunk/singlewebapp/src/site/xdoc/css/openmeetings.css&r1=1595743&r2=1595860&rev=1595860&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/site/xdoc/css/openmeetings.css (original)
+++ openmeetings/trunk/singlewebapp/src/site/resources/css/openmeetings.css Mon May 19 12:17:14 2014
@@ -14,71 +14,15 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-body {
-	color: #000000;
-	margin: 0;
-	background: #fafafa;
-	font: 10pt Verdana, Arial, Helvetica, sans-serif;
-	  
-}
-.active {
-	font-style: italic;
-}
-
-.mainbody {
-	margin-left: 40px;
-	margin-right: 40px;
-	-moz-box-shadow: 4px 0px 5px #666666;
-	-webkit-box-shadow: 4px 0px 5px #666666;
-	box-shadow: 4px 0px 5px #666666;
-}
-.superbody {
-	background: #FFFFFF;
-	-moz-box-shadow: -4px 0px 5px #666666;
-	-webkit-box-shadow: -4px 0px 5px #666666;
-	box-shadow: -4px 0px 5px #666666;
-}
-
-/* Box CSS  */
-div {
-	margin: 0;
-}
-
-
-.ro {
-	background: url(2b.png) top right no-repeat;
-}
-
-.lo {
-	background: url(1b.png) top left no-repeat;
-}
-
-.ru {
-	background: url(3b.png) bottom right no-repeat;
-}
-
-.lu {
-	background: url(4b.png) bottom left no-repeat;
-}
-
-ul {
-	margin-top: 0em;
-	padding-left: 1.5em;
-}
-
-.inhalt {
-	margin: 0;
-	padding: 0.5em 2.0em 1.5em 1.0em;
+.carousel-caption .title, .carousel-caption .desc {
+	color: white;
+	display: block;
+	text-align: center;
+	text-shadow: rgba(0, 0, 0, 0.6) 0px 1px 2px;
+	margin-bottom: 10px;
 }
-
-.inhalt p {
-	margin: 0;
-	padding: 0;
+.carousel-caption .title {
+	font-size: 24px;
+	font-weight: 500;
+	margin-top: 20px;
 }
-.xmlcode {
-	margin-left: 20px;
-	background-color: #eeeeee;
-	color: #0000ff;
-	margin-top: 10px;
-	margin-bottom: 10px;
-}
\ No newline at end of file

Added: openmeetings/trunk/singlewebapp/src/site/resources/js/site.js
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/site/resources/js/site.js?rev=1595860&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/site/resources/js/site.js (added)
+++ openmeetings/trunk/singlewebapp/src/site/resources/js/site.js Mon May 19 12:17:14 2014
@@ -0,0 +1,60 @@
+/*
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "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
+    	  
+  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
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+  
+*/
+function getMenu(a) {
+	return a.parent().children('ul:first');
+}
+
+$(document).ready(function() {
+	$('ul.nav.nav-list > li a').each(function() {
+		var a = $(this);
+		var m = getMenu(a);
+		if (m.length) {
+			a.addClass('nav-header')
+			a.attr('data-toggle', 'collapse');
+			a.click(function(){
+				var a = $(this);
+				var v = getMenu(a).height() != 0;
+				a.children('i').removeClass(v ? 'icon-chevron-down' : 'icon-chevron-right').addClass(v ? 'icon-chevron-right' : 'icon-chevron-down');
+			})
+			m.attr('id', a.attr('href').substr(1)).addClass('collapse in');
+			if (!m.find('li.active').length) {
+				m.collapse();
+			}
+		}
+	});
+	var c = $('#slider');
+	if (c.length) {
+		/* FIXME uncomment later
+		var items = $('.carousel-inner .item', c);
+		var ol = $('<ol>').addClass('carousel-indicators');
+		for (var i = 0; i < items.length; ++i) {
+			var li = $('<li>').attr('data-target', '#slider').attr('data-slide-to', i);
+			if ($(items[i]).hasClass('active')) {
+				li.addClass('active');
+			}
+			ol.append(li);
+		}
+		c.prepend(ol);
+		*/
+		$('.carousel-control.left', c).attr('data-slide', 'prev');
+		$('.carousel-control.right', c).attr('data-slide', 'next');
+		c.attr('data-ride', 'carousel').addClass('carousel slide');
+	}
+})

Modified: openmeetings/trunk/singlewebapp/src/site/site.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/site/site.xml?rev=1595860&r1=1595859&r2=1595860&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/site/site.xml (original)
+++ openmeetings/trunk/singlewebapp/src/site/site.xml Mon May 19 12:17:14 2014
@@ -29,109 +29,110 @@
 	</skin>
 	
 	<body>
-		<menu name="General">
-			<item name="Home" href="/index.html" />
-			<item name="License" href="/license.html" />
-			<item name="ASF" href="http://www.apache.org/" />
-			<item name="Downloads" href="/downloads.html" />
-			<item name="Commercial Support" href="/commercial-support.html" />
-		</menu>
-
-		<menu name="Installation and Upgrade">
-			<item name="Installation" href="/installation.html" />
-			<item name="Upgrade" href="/Upgrade.html" />
-			<item name="Tutorials" href="https://cwiki.apache.org/confluence/display/OPENMEETINGS/Tutorials+for+installing+OpenMeetings+and+Tools" />
-			<item name="Command Line Admin" href="/CommandLineAdmin.html" />
-		</menu>
-
-		<menu name="Community">
-			<item name="Get Involved" href="/get-involved.html" />
-			<item name="Committers" href="/team-list.html" />
-			<item name="Mailing Lists" href="/mail-lists.html" />
-			<item name="Wiki" href="http://cwiki.apache.org/confluence/display/OPENMEETINGS/" />
-		</menu>
-
-		<menu name="Development">
-			<item name="Source Code" href="/svn.html" />
-			<item name="Bugs / Issues (JIRA)" href="http://issues.apache.org/jira/browse/OPENMEETINGS" />
-			<item name="Dependencies" href="/dependencies.html" />
-			<item name="Build Instructions" href="/BuildInstructions.html" />
-			<item name="JUnit Testing" href="/JUnitTesting.html" />
-			<item name="Manual Testing" href="/ManualTesting.html" />
-			<item name="Release Guide" href="/ReleaseGuide.html" />
-			<item name="Website Guide" href="/WebsiteGuide.html" />
-		</menu>
-
-		<menu name="Integration">
-			<item name="SOAP/REST API" href="/SoapRestAPI.html" />
-			<item name="REST API Sample" href="/RestAPISample.html" />
-			<item name="Ldap and ADS" href="/LdapAndADS.html" />
-			<item name="OAuth2" href="/oauth2.html" />
-			<item name="VoIP and SIP" href="/voip-sip-integration.html" />
-			<item name="Errors table" href="/ErrorsTable.html" />
-		</menu>
-
-		<menu name="Plugins">
-			<item name="Moodle Plugin" href="/MoodlePlugin.html" />
-			<item name="Sakai Plugin" href="/SakaiPlugin.html" />
-			<item name="Jira Plugin" href="/JiraPlugin.html" />
-			<item name="Joomla Plugin" href="/JoomlaPlugin.html" />
-			<item name="Drupal Plugin" href="/DrupalPlugin.html" />
-			<item name="Bitrix Plugin" href="/BitrixPlugin.html" />
-			<item name="Confluence Plugin" href="/ConfluencePlugin.html" />
-			<item name="SugarCRM Plugin" href="/SugarCRMPlugin.html" />
-			<item name="Redmine Plugin" href="/RedminePlugin.html" />
-		</menu>
-
-		<menu name="Configuration">
-			<item name="DB Sample Configurations" href="/ApacheDerbyConfig.html">
-				<item name="Apache Derby" href="/ApacheDerbyConfig.html" />
-				<item name="IBM DB2" href="/IBMDB2Config.html" />
-				<item name="Oracle" href="/OracleConfig.html" />
-				<item name="MySQL" href="/MySQLConfig.html" />
-				<item name="Postgres" href="/PostgresConfig.html" />
-				<item name="MSSQL" href="/MSSQLConfig.html" />
-			</item>
-			<item name="Localization and languages" href="/Internationalisation.html">
-				<item name="Internationalisation" href="/Internationalisation.html" />
-				<item name="LanguageEditor" href="/LanguageEditor.html" />
-				<item name="TimeZoneHandling" href="/TimeZoneHandling.html" />
-				<item name="EditTemplates" href="/EditTemplates.html" />
-			</item>
-			<item name="NAT Port Settings" href="/PortSettings.html">
-				<item name="Port settings" href="/PortSettings.html" />
-			</item>
-			<item name="Performance" href="/JVMPerformanceTuning.html">
-				<item name="JVM performance tuning" href="/JVMPerformanceTuning.html" />
-			</item>
-			<item name="User Interface" href="/themes-and-branding.html">
-				<item name="Themes" href="/themes-and-branding.html" />
-				<item name="Dashboard" href="/Dashboard.html" />
-				<item name="Webcam resolutions" href="/WebcamResolutions.html" />
-				<item name="Room layout options" href="/ConferenceRoomLayoutOptions.html" />
-				<item name="Hot Keys" href="/HotKeys.html" />
-			</item>
-			<item name="Customization" href="/WebappNamePath.html">
-				<item name="Webapp name/path" href="/WebappNamePath.html" />
-				<item name="Navigation" href="/Navigation.html" />
-				<item name="Calendar and timezone" href="/CalendarAndTimezone.html" />
-				<item name="Custom room type" href="/CustomRoomTypeHowTo.html" />
-				<item name="Custom ctypt mechanism" href="/CustomCryptMechanism.html" />
-				<item name="General Configuration" href="/GeneralConfiguration.html" />
-			</item>
-			<item name="Security" href="/RestrictedAccess.html">
-				<item name="Restricted Access" href="/RestrictedAccess.html" />
-				<item name="RTMPS and HTTPS" href="/RTMPSAndHTTPS.html" />
-			</item>
-			<item name="Converters" href="/OpenOfficeConverter.html">
-				<item name="OpenOffice Converter" href="/OpenOfficeConverter.html" />
-				<item name="FFMPEG Version Switch" href="/FFMPEGVersionSwitch.html" />
-			</item>
-			<item name="Clustering" href="/Clustering.html">
-				<item name="Clustering" href="/Clustering.html" />
-			</item>
-			<item name="Misc" href="/GetVersionInfo.html">
-				<item name="Get version info" href="/GetVersionInfo.html" />
+		<head>
+			<link rel="stylesheet" href="./css/openmeetings.css"/>
+			<script type="text/javascript" src="./js/site.js"></script>
+		</head>
+		
+		<menu>
+			<item name="General" href="#general">
+				<item name="Home" href="/index.html"/>
+				<item name="License" href="/license.html"/>
+				<item name="ASF" href="http://www.apache.org/"/>
+				<item name="Downloads" href="/downloads.html"/>
+				<item name="Commercial Support" href="/commercial-support.html"/>
+			</item>
+			<item name="Installation and Upgrade" href="#installation">
+				<item name="Installation" href="/installation.html" />
+				<item name="Upgrade" href="/Upgrade.html" />
+				<item name="Tutorials" href="https://cwiki.apache.org/confluence/display/OPENMEETINGS/Tutorials+for+installing+OpenMeetings+and+Tools" />
+				<item name="Command Line Admin" href="/CommandLineAdmin.html" />
+			</item>
+			<item name="Community" href="#community">
+				<item name="Get Involved" href="/get-involved.html" />
+				<item name="Committers" href="/team-list.html" />
+				<item name="Mailing Lists" href="/mail-lists.html" />
+				<item name="Wiki" href="http://cwiki.apache.org/confluence/display/OPENMEETINGS/" />
+			</item>
+			<item name="Development" href="#dev">
+				<item name="Source Code" href="/svn.html" />
+				<item name="Bugs / Issues (JIRA)" href="http://issues.apache.org/jira/browse/OPENMEETINGS" />
+				<item name="Dependencies" href="/dependencies.html" />
+				<item name="Build Instructions" href="/BuildInstructions.html" />
+				<item name="JUnit Testing" href="/JUnitTesting.html" />
+				<item name="Manual Testing" href="/ManualTesting.html" />
+				<item name="Release Guide" href="/ReleaseGuide.html" />
+				<item name="Website Guide" href="/WebsiteGuide.html" />
+			</item>
+			<item name="Integration" href="#integration">
+				<item name="SOAP/REST API" href="/SoapRestAPI.html" />
+				<item name="REST API Sample" href="/RestAPISample.html" />
+				<item name="Ldap and ADS" href="/LdapAndADS.html" />
+				<item name="OAuth2" href="/oauth2.html" />
+				<item name="VoIP and SIP" href="/voip-sip-integration.html" />
+				<item name="Errors table" href="/ErrorsTable.html" />
+			</item>
+			<item name="Plugins" href="#plugins">
+				<item name="Moodle Plugin" href="/MoodlePlugin.html" />
+				<item name="Sakai Plugin" href="/SakaiPlugin.html" />
+				<item name="Jira Plugin" href="/JiraPlugin.html" />
+				<item name="Joomla Plugin" href="/JoomlaPlugin.html" />
+				<item name="Drupal Plugin" href="/DrupalPlugin.html" />
+				<item name="Bitrix Plugin" href="/BitrixPlugin.html" />
+				<item name="Confluence Plugin" href="/ConfluencePlugin.html" />
+				<item name="SugarCRM Plugin" href="/SugarCRMPlugin.html" />
+				<item name="Redmine Plugin" href="/RedminePlugin.html" />
+			</item>
+			<item name="Configuration" href="#config">
+				<item name="DB Sample Configurations" href="#db">
+					<item name="Apache Derby" href="/ApacheDerbyConfig.html" />
+					<item name="IBM DB2" href="/IBMDB2Config.html" />
+					<item name="Oracle" href="/OracleConfig.html" />
+					<item name="MySQL" href="/MySQLConfig.html" />
+					<item name="Postgres" href="/PostgresConfig.html" />
+					<item name="MSSQL" href="/MSSQLConfig.html" />
+				</item>
+				<item name="Localization and languages" href="#localization">
+					<item name="Internationalisation" href="/Internationalisation.html" />
+					<item name="LanguageEditor" href="/LanguageEditor.html" />
+					<item name="TimeZoneHandling" href="/TimeZoneHandling.html" />
+					<item name="EditTemplates" href="/EditTemplates.html" />
+				</item>
+				<item name="NAT Port Settings" href="#port">
+					<item name="Port settings" href="/PortSettings.html" />
+				</item>
+				<item name="Performance" href="#performance">
+					<item name="JVM performance tuning" href="/JVMPerformanceTuning.html" />
+				</item>
+				<item name="User Interface" href="#interface">
+					<item name="Themes" href="/themes-and-branding.html" />
+					<item name="Dashboard" href="/Dashboard.html" />
+					<item name="Webcam resolutions" href="/WebcamResolutions.html" />
+					<item name="Room layout options" href="/ConferenceRoomLayoutOptions.html" />
+					<item name="Hot Keys" href="/HotKeys.html" />
+				</item>
+				<item name="Customization" href="#customize">
+					<item name="Webapp name/path" href="/WebappNamePath.html" />
+					<item name="Navigation" href="/Navigation.html" />
+					<item name="Calendar and timezone" href="/CalendarAndTimezone.html" />
+					<item name="Custom room type" href="/CustomRoomTypeHowTo.html" />
+					<item name="Custom ctypt mechanism" href="/CustomCryptMechanism.html" />
+					<item name="General Configuration" href="/GeneralConfiguration.html" />
+				</item>
+				<item name="Security" href="#security">
+					<item name="Restricted Access" href="/RestrictedAccess.html" />
+					<item name="RTMPS and HTTPS" href="/RTMPSAndHTTPS.html" />
+				</item>
+				<item name="Converters" href="#convert">
+					<item name="OpenOffice Converter" href="/OpenOfficeConverter.html" />
+					<item name="FFMPEG Version Switch" href="/FFMPEGVersionSwitch.html" />
+				</item>
+				<item name="Clustering" href="#cluster">
+					<item name="Clustering" href="/Clustering.html" />
+				</item>
+				<item name="Misc" href="#misc">
+					<item name="Get version info" href="/GetVersionInfo.html" />
+				</item>
 			</item>
 		</menu>
 	</body>

Modified: openmeetings/trunk/singlewebapp/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/site/xdoc/index.xml?rev=1595860&r1=1595859&r2=1595860&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/site/xdoc/index.xml (original)
+++ openmeetings/trunk/singlewebapp/src/site/xdoc/index.xml Mon May 19 12:17:14 2014
@@ -25,76 +25,65 @@
 	<body>
 
 		<section name="Apache OpenMeetings - Features and overview">
-
-			<div id="coin-slider">
-				<a href="#">
-					<img src="images/cut_conference_room.png" alt="Conference Room" />
-					<span>
-						<b>Audio/Video Conferencing</b>
-						<br />
-						OpenMeetings enables you to make Audio/Video conferencing.
-					</span>
-				</a>
-
-				<a href="#">
-					<img src="images/cut_integrated_calendar.png" alt="Calendar" />
-					<span>
-						<b>Calendar</b>
-						<br />
-						You can create meetings with the integrated calendar, conference rooms and invitations are automatically send to everybody
-					</span>
-				</a>
-
-				<a href="#">
-					<img src="images/cut_file_explorer.png" alt="File Explorer" />
-					<span>
-						<b>File Explorer</b>
-						<br />
-						Each room has its own File-Explorer. Each user has his own private drive and additionally there is a public drive to share files with other participants
-					</span>
-				</a>
-
-				<a href="#">
-					<img src="images/cut_integration_api.png" alt="Integration API" />
-					<span>
-						<b>Integration API</b>
-						<br />
-						There is a SOAP/REST API to integrate into your website or intranet, as well
-						as LDAP/ADS connectors and VoIP/Asterisk integration modules
-					</span>
-				</a>
-
-				<a href="#">
-					<img src="images/cut_private_messages.png" alt="Private messages" />
-					<span>
-						<b>Private messages and contacts</b>
-						<br />
-						From the private message center you can send invitations by email
-						and attach meeting invitations to every email
-					</span>
-				</a>
-
-				<a href="#">
-					<img src="images/cut_administration_configuration.png" alt="Administration" />
-					<span>
-						<b>Administration and Configuration</b>
-						<br />
-						You can configure users, rooms, usergroups, config settings or
-						edit labels with a Web-Frontend integrated in the application
-					</span>
-				</a>
-
-				<a href="#">
-					<img src="images/cut_recordings_playback.png" alt="Share and Record" />
-					<span>
-						<b>Screen sharing and Recording</b>
-						<br />
-						You can do screen sharing as well as recording of whole sessions
-						including audio/video. Recordings can be downloaded as AVI/FLV or
-						watched online in the integrated player.
-					</span>
-				</a>
-
+			<div id="slider">
+				<div class="carousel-inner">
+					<div class="item active">
+						<img src="images/cut_conference_room.png" alt="Conference Room"/>
+						<span class="carousel-caption">
+							<span class="title">Audio/Video Conferencing</span>
+							<span class="desc">OpenMeetings enables you to make Audio/Video conferencing.</span>
+						</span>
+					</div>
+					<div class="item">
+						<img src="images/cut_integrated_calendar.png" alt="Calendar" />
+						<span class="carousel-caption">
+							<span class="title">Calendar</span>
+							<span class="desc">You can create meetings with the integrated calendar, conference rooms and invitations are automatically send to everybody</span>
+						</span>
+					</div>
+					<div class="item">
+						<img src="images/cut_file_explorer.png" alt="File Explorer" />
+						<span class="carousel-caption">
+							<span class="title">File Explorer</span>
+							<span class="desc">Each room has its own File-Explorer. Each user has his own private drive and additionally there is a public drive to share files with other participants</span>
+						</span>
+					</div>
+					<div class="item">
+						<img src="images/cut_integration_api.png" alt="Integration API" />
+						<span class="carousel-caption">
+							<span class="title">Integration API</span>
+							<span class="desc">There is a SOAP/REST API to integrate into your website or intranet, as well
+								as LDAP/ADS connectors and VoIP/Asterisk integration modules</span>
+						</span>
+					</div>
+					<div class="item">
+						<img src="images/cut_private_messages.png" alt="Private messages" />
+						<span class="carousel-caption">
+							<span class="title">Private messages and contacts</span>
+							<span class="desc">From the private message center you can send invitations by email
+								and attach meeting invitations to every email</span>
+						</span>
+					</div>
+					<div class="item">
+						<img src="images/cut_administration_configuration.png" alt="Administration" />
+						<span class="carousel-caption">
+							<span class="title">Administration and Configuration</span>
+							<span class="desc">You can configure users, rooms, usergroups, config settings or
+								edit labels with a Web-Frontend integrated in the application</span>
+						</span>
+					</div>
+					<div class="item">
+						<img src="images/cut_recordings_playback.png" alt="Share and Record" />
+						<span class="carousel-caption">
+							<span class="title">Screen sharing and Recording</span>
+							<span class="desc">You can do screen sharing as well as recording of whole sessions
+								including audio/video. Recordings can be downloaded as AVI/FLV or
+								watched online in the integrated player.</span>
+						</span>
+					</div>
+				</div>
+				<a class="carousel-control left" href="#slider">&lsaquo;</a>
+				<a class="carousel-control right" href="#slider">&rsaquo;</a>
 			</div>
 
 
@@ -107,7 +96,7 @@
 			<p>
 				OpenMeetings is a project of the Apache, the old project
 				website at
-				<a href="http://code.google.com/p/openmeetings/" target="_BLANK">GoogleCode
+				<a href="http://code.google.com/p/openmeetings/" target="_blank">GoogleCode
 				</a>
 				will receive no updates anymore. The website at Apache is the only
 				place that receives updates.
@@ -134,7 +123,7 @@
                 </strong>
                 <br />
 			    <strong>
-                    Version 2.1.1 released! See <a href="https://blogs.apache.org/openmeetings/entry/apache_openmeetings_2_1_11" target="_BLANK">Project Blog</a> or <a href="downloads.html">Downloads page</a>. 
+                    Version 2.1.1 released! See <a href="https://blogs.apache.org/openmeetings/entry/apache_openmeetings_2_1_11" target="_blank">Project Blog</a> or <a href="downloads.html">Downloads page</a>. 
                     (2013-07-06)
                 </strong>
                 <br />
@@ -151,31 +140,31 @@
 				<br />
 			    <strong>
 					OpenMeetings on the road to graduate from the Incubator
-					<a href="https://blogs.apache.org/openmeetings/entry/openmeetings_on_the_road_to" target="_BLANK" rel="nofollow">at our blog</a>
+					<a href="https://blogs.apache.org/openmeetings/entry/openmeetings_on_the_road_to" target="_blank" rel="nofollow">at our blog</a>
 					(2012-12-07)
 				</strong>
 				<br />
 				<strong>
 					Some slides from our Fast Feather Track at the ApacheCon Europe 2012 
-					<a href="https://blogs.apache.org/openmeetings/entry/openmeetings_apachecon_presentation_slide" target="_BLANK" rel="nofollow">at our blog</a>
+					<a href="https://blogs.apache.org/openmeetings/entry/openmeetings_apachecon_presentation_slide" target="_blank" rel="nofollow">at our blog</a>
 					(2012-11-18)
 				</strong>
 				<br />
 				<strong>
 					Update: Builds are available at
-					<a href="https://builds.apache.org/view/M-R/view/OpenMeetings/" target="_BLANK" rel="nofollow">builds.apache.org</a>
+					<a href="https://builds.apache.org/view/M-R/view/OpenMeetings/" target="_blank" rel="nofollow">builds.apache.org</a>
 					(2012-08-03)
 				</strong>
 				<br />
 				<strong>
-					<a href="https://blogs.apache.org/openmeetings/entry/apache_openmeetings_2_0_incubating" target="_BLANK" rel="nofollow">Version 2.0 released</a>
+					<a href="https://blogs.apache.org/openmeetings/entry/apache_openmeetings_2_0_incubating" target="_blank" rel="nofollow">Version 2.0 released</a>
 					(2012-07-26)
 				</strong>
 				<br />
 				<strong>New committer: Timur Tleukenov (2012-03-06)</strong>
 				<br />
 				<strong>
-					<a href="http://demo.openmeetings.de" target="_BLANK" rel="nofollow">Demo
+					<a href="http://demo.openmeetings.de" target="_blank" rel="nofollow">Demo
 						server</a>
 					updated to r1236172 (2012-01-26)
 				</strong>