summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDemoscenePassivist <[email protected]>2010-08-28 17:09:24 +0200
committerDemoscenePassivist <[email protected]>2010-08-28 17:09:24 +0200
commit2f1c70e5572a383fed413332d0a120b0a068fb75 (patch)
treeb5a18e0fc5ec99459f004dc14ef449b26e0bbe55
parentb039b299f66518ec91e91dbb07cf5c35728fa6ae (diff)
Small redesign effort for the streams website
-rw-r--r--index.html326
-rw-r--r--planet2/config/stream-config.xml11
-rw-r--r--planet2/config/stream-template.html15
3 files changed, 179 insertions, 173 deletions
diff --git a/index.html b/index.html
index 616feb1..59d0b11 100644
--- a/index.html
+++ b/index.html
@@ -1,163 +1,163 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <meta content="java, jogl, jocl, joal, opengl, opencl, openal, libraries" name="keywords"/>
- <meta name="google-site-verification" content="TBm-1bOphAWp2QP205lF0UZCp86gIjQyQOi4Jg7Sb2U" />
- <title>JogAmp.org - java graphics, audio, media and processing libraries</title>
- <link href="style.css" rel="stylesheet" type="text/css"/>
- <link href="http://jogamp.org/SocialCoding/logo_symbol_finals/website_final_blue_favicon_symbol_16x16pel.ico" rel="shortcut icon"/>
- </head>
-
- <body>
- <div id="container">
- <!-- header -->
- <div id="header">
- <div id="slogan"><img src="images/jogamp_symbols/website_final_sideslogan_jogamp_404x20pel.png" alt="graphics, audio, media and processing libraries"/></div>
- <div id="logo"><img src="images/jogamp_symbols/website_final_blue_jogamp_346x70pel.png" alt="JogAmp symbol"/></div>
- </div>
-
- <div id="menu">
- <ul>
- <li><a href="http://jogamp.org/">Home</a></li>
- <li><a href="gluegen/www/">Gluegen</a></li>
- <li><a href="joal/www/">JOAL</a></li>
- <li><a href="jocl/www/">JOCL</a></li>
- <li><a href="jogl/www/">JOGL</a></li>
- <!-- <li><a href="demos/www/">Demos</a></li>-->
- <li><a href="wiki/">Wiki</a></li>
- <li><a href="blog/">Blogs</a></li>
- <li><a href="forum.html">Forums</a></li>
- </ul>
- </div>
- <!--end header -->
- <!-- main -->
- <div id="main">
-
- <div id="sidebar">
- <h3>Sponsors</h3>
- <ul>
- <li>
- <a href="http://c3d.com/">
- <img src="images/CCT-logo.png" border="0" vspace="8" width="160" align="left" alt="CCC/CCT"/>
- </a>
- </li>
- <li>
- <a href="http://www.fh-landshut.de/">
- <img src="images/fh-landshut.png" border="0" vspace="8" width="160" align="left" alt="University of Applied Sciences Landshut"/>
- </a>
- </li>
- </ul>
- <h3>Community</h3>
- <ul>
- <li><a href="forum.html">Forum / Mailing Lists</a></li>
- <li><a href="http://blog.michael-bien.com">Michael's Blog</a></li>
- <li><a href="http://blog.jausoft.com/category/computer-stuff/3d-opengl/jogl/">Sven's JOGL Blog</a></li>
- </ul>
- <h3>Featured</h3>
- <ul>
- <li>
- <a href="http://volumeviewer.kenai.com/">
- <img src="http://volumeviewer.kenai.com/thumbnail.png" width="160" height="120" align="left" alt=""/>
- </a>
- </li>
- <li>
- <a href="http://chronotext.org/">
- <img src="http://download.java.net/media/jogl/www/chronotext.jpg" width="160" height="120" align="left" alt="chronotext"/>
- </a>
- </li>
- <li>
- <a href="http://bytonic.de/html/jake2.html">
- <img src="http://download.java.net/media/jogl/www/jake2.jpg" width="160" height="120" align="left" alt="jake2"/>
- </a>
- </li>
- </ul>
- </div>
-
- <div id="text">
- <h1>Welcome</h1>
- JogAmp is the home of high performance Java libraries for 3D Graphics, Multimedia and Processing.<br/>
- The projects JOGL, JOCL and JOAL provide cross platform language bindings to the OpenGL, OpenCL, OpenAL and OpenMAX APIs.
- <h2>Documentation</h2>
- <ul>
- <li> <a href="wiki/">Wiki Page</a></li>
- <li> <a href="jogl/doc/bouml/html-svg/">OpenGL Profile Model (UML)</a></li>
- <li> <a href="jogl/doc/HowToBuild.html">How To Build JOGL</a></li>
- <li> <a href="jocl/doc/HowToBuild.html">How To Build JOCL</a></li>
- <li> <a href="jogl/doc/userguide/">Userguide</a> <i>(outdated)</i></li>
- <li>
- API Docs
- <ul>
- <li> <a href="deployment/gluegen-next/javadoc/">Gluegen API Doc (next)</a></li>
- <li> <a href="deployment/jogl-next/javadoc_public/">JOGL API Doc (next)</a></li>
- <li> <a href="http://jogamp.org/chuck/job/jocl_onmaster/label=linux64-null-centos54-jogamp-x64-chuck-001/javadoc/">JOCL API Doc (next)</a></li>
- </ul>
- </li>
- <li>
- Misc Docs
- <ul>
- <li>
- Siggraph 2010 - JogAmp BOF
- <ul>
- <li> <a href="doc/siggraph2010/jogamp-siggraph2010.pdf">PDF</a></li>
- <li> <a href="doc/siggraph2010/jogamp-siggraph2010.odp">Open Office Format</a></li>
- </ul>
- </li>
- </ul>
- </li>
-
- </ul>
-
- <h2>SW Management</h2>
- <ul>
- <li><a href="wiki/index.php/SW_Tracking">SW Tracking (wiki)</a></li>
- <li><a href="bugzilla/">Bugzilla</a></li>
- <li><a href="chuck/">Build Server</a></li>
- </ul>
-
- <h2>Builds</h2>
- <ul>
- <li><a href="deployment/webstart/">Webstart Codebase - Last Release</a></li>
- <li><a href="deployment/webstart-next/">Webstart Codebase - Test Release</a></li>
- <li><a href="deployment/archive/">Archived Builds may incl. archived signed webstart bundles</a></li>
- <li><a href="deployment/autobuilds/">Automated Builds</a></li>
- </ul>
-
- <h2>Repositories</h2>
- <ul>
- <li><a href="git">Local</a></li>
- <li>
- <a href="http://github.com/sgothel">Sven Gothel</a>
- <ul>
- <li><a href="http://github.com/sgothel/gluegen">gluegen</a></li>
- <li><a href="http://github.com/sgothel/jogl">jogl</a></li>
- <li><a href="http://github.com/sgothel/jogl-demos">jogl-demos</a></li>
- <li><a href="http://github.com/sgothel/jogl-utils">jogl-utils</a></li>
- </ul>
- </li>
- <li>
- <a href="http://github.com/mbien">Michael Bien</a>
- <ul>
- <li><a href="http://github.com/mbien/gluegen">gluegen</a></li>
- <li><a href="http://github.com/mbien/jocl">jocl</a></li>
- <li><a href="http://github.com/mbien/jocl-demos">jocl-demos</a></li>
- <li><a href="http://github.com/mbien/jogl">jogl</a></li>
- <li><a href="http://github.com/mbien/joal">joal</a></li>
- </ul>
- </li>
- </ul>
-
- </div>
-
- </div>
- <!-- end main -->
- <div id="footer">
- <div id="footer_left">
- <span>JogAmp.org</span>
- by <a href="http://jogamp.org">http://jogamp.org</a> is licensed under a <br/>
- <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 License</a>.
- </div>
- </div>
- </div>
- </body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <meta content="java, jogl, jocl, joal, opengl, opencl, openal, libraries" name="keywords"/>
+ <meta name="google-site-verification" content="TBm-1bOphAWp2QP205lF0UZCp86gIjQyQOi4Jg7Sb2U" />
+ <title>JogAmp.org - java graphics, audio, media and processing libraries</title>
+ <link href="style.css" rel="stylesheet" type="text/css"/>
+ <link href="http://jogamp.org/SocialCoding/logo_symbol_finals/website_final_blue_favicon_symbol_16x16pel.ico" rel="shortcut icon"/>
+ </head>
+
+ <body>
+ <div id="container">
+ <!-- header -->
+ <div id="header">
+ <div id="slogan"><img src="images/jogamp_symbols/website_final_sideslogan_jogamp_404x20pel.png" alt="graphics, audio, media and processing libraries"/></div>
+ <div id="logo"><img src="images/jogamp_symbols/website_final_blue_jogamp_346x70pel.png" alt="JogAmp symbol"/></div>
+ </div>
+
+ <div id="menu">
+ <ul>
+ <li><a href="http://jogamp.org/">Home</a></li>
+ <li><a href="gluegen/www/">Gluegen</a></li>
+ <li><a href="joal/www/">JOAL</a></li>
+ <li><a href="jocl/www/">JOCL</a></li>
+ <li><a href="jogl/www/">JOGL</a></li>
+ <!-- <li><a href="demos/www/">Demos</a></li>-->
+ <li><a href="wiki/">Wiki</a></li>
+ <li><a href="blog/">Blogs</a></li>
+ <li><a href="forum.html">Forums</a></li>
+ </ul>
+ </div>
+ <!--end header -->
+ <!-- main -->
+ <div id="main">
+
+ <div id="sidebar">
+ <h3>Sponsors</h3>
+ <ul>
+ <li>
+ <a href="http://c3d.com/">
+ <img src="images/CCT-logo.png" border="0" vspace="8" width="160" align="left" alt="CCC/CCT"/>
+ </a>
+ </li>
+ <li>
+ <a href="http://www.fh-landshut.de/">
+ <img src="images/fh-landshut.png" border="0" vspace="8" width="160" align="left" alt="University of Applied Sciences Landshut"/>
+ </a>
+ </li>
+ </ul>
+ <h3>Community</h3>
+ <ul>
+ <li><a href="forum.html">Forum / Mailing Lists</a></li>
+ <li><a href="http://blog.michael-bien.com">Michael's Blog</a></li>
+ <li><a href="http://blog.jausoft.com/category/computer-stuff/3d-opengl/jogl/">Sven's JOGL Blog</a></li>
+ </ul>
+ <h3>Featured</h3>
+ <ul>
+ <li>
+ <a href="http://volumeviewer.kenai.com/">
+ <img src="http://volumeviewer.kenai.com/thumbnail.png" width="160" height="120" align="left" alt=""/>
+ </a>
+ </li>
+ <li>
+ <a href="http://chronotext.org/">
+ <img src="http://download.java.net/media/jogl/www/chronotext.jpg" width="160" height="120" align="left" alt="chronotext"/>
+ </a>
+ </li>
+ <li>
+ <a href="http://bytonic.de/html/jake2.html">
+ <img src="http://download.java.net/media/jogl/www/jake2.jpg" width="160" height="120" align="left" alt="jake2"/>
+ </a>
+ </li>
+ </ul>
+ </div>
+
+ <div id="text">
+ <h1>Welcome</h1>
+ JogAmp is the home of high performance Java libraries for 3D Graphics, Multimedia and Processing.<br/>
+ The projects JOGL, JOCL and JOAL provide cross platform language bindings to the OpenGL, OpenCL, OpenAL and OpenMAX APIs.
+ <h2>Documentation</h2>
+ <ul>
+ <li> <a href="wiki/">Wiki Page</a></li>
+ <li> <a href="jogl/doc/bouml/html-svg/">OpenGL Profile Model (UML)</a></li>
+ <li> <a href="jogl/doc/HowToBuild.html">How To Build JOGL</a></li>
+ <li> <a href="jocl/doc/HowToBuild.html">How To Build JOCL</a></li>
+ <li> <a href="jogl/doc/userguide/">Userguide</a> <i>(outdated)</i></li>
+ <li>
+ API Docs
+ <ul>
+ <li> <a href="deployment/gluegen-next/javadoc/">Gluegen API Doc (next)</a></li>
+ <li> <a href="deployment/jogl-next/javadoc_public/">JOGL API Doc (next)</a></li>
+ <li> <a href="http://jogamp.org/chuck/job/jocl_onmaster/label=linux64-null-centos54-jogamp-x64-chuck-001/javadoc/">JOCL API Doc (next)</a></li>
+ </ul>
+ </li>
+ <li>
+ Misc Docs
+ <ul>
+ <li>
+ Siggraph 2010 - JogAmp BOF
+ <ul>
+ <li> <a href="doc/siggraph2010/jogamp-siggraph2010.pdf">PDF</a></li>
+ <li> <a href="doc/siggraph2010/jogamp-siggraph2010.odp">Open Office Format</a></li>
+ </ul>
+ </li>
+ </ul>
+ </li>
+
+ </ul>
+
+ <h2>SW Management</h2>
+ <ul>
+ <li><a href="wiki/index.php/SW_Tracking">SW Tracking (wiki)</a></li>
+ <li><a href="bugzilla/">Bugzilla</a></li>
+ <li><a href="chuck/">Build Server</a></li>
+ </ul>
+
+ <h2>Builds</h2>
+ <ul>
+ <li><a href="deployment/webstart/">Webstart Codebase - Last Release</a></li>
+ <li><a href="deployment/webstart-next/">Webstart Codebase - Test Release</a></li>
+ <li><a href="deployment/archive/">Archived Builds may incl. archived signed webstart bundles</a></li>
+ <li><a href="deployment/autobuilds/">Automated Builds</a></li>
+ </ul>
+
+ <h2>Repositories</h2>
+ <ul>
+ <li><a href="git">Local</a></li>
+ <li>
+ <a href="http://github.com/sgothel">Sven Gothel</a>
+ <ul>
+ <li><a href="http://github.com/sgothel/gluegen">gluegen</a></li>
+ <li><a href="http://github.com/sgothel/jogl">jogl</a></li>
+ <li><a href="http://github.com/sgothel/jogl-demos">jogl-demos</a></li>
+ <li><a href="http://github.com/sgothel/jogl-utils">jogl-utils</a></li>
+ </ul>
+ </li>
+ <li>
+ <a href="http://github.com/mbien">Michael Bien</a>
+ <ul>
+ <li><a href="http://github.com/mbien/gluegen">gluegen</a></li>
+ <li><a href="http://github.com/mbien/jocl">jocl</a></li>
+ <li><a href="http://github.com/mbien/jocl-demos">jocl-demos</a></li>
+ <li><a href="http://github.com/mbien/jogl">jogl</a></li>
+ <li><a href="http://github.com/mbien/joal">joal</a></li>
+ </ul>
+ </li>
+ </ul>
+
+ </div>
+
+ </div>
+ <!-- end main -->
+ <div id="footer">
+ <div id="footer_left">
+ <span>JogAmp.org</span>
+ by <a href="http://jogamp.org">http://jogamp.org</a> is licensed under a <br/>
+ <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0 License</a>.
+ </div>
+ </div>
+ </div>
+ </body>
+</html>
diff --git a/planet2/config/stream-config.xml b/planet2/config/stream-config.xml
index df358aa..4307451 100644
--- a/planet2/config/stream-config.xml
+++ b/planet2/config/stream-config.xml
@@ -30,14 +30,9 @@
</template>
<template keyword="youtube" idpattern="http://www.youtube.com/watch\?v=([^&amp;]+)" descriptionfilter="&lt;span&gt;(.*)&lt;/span&gt;">
<![CDATA[
- <object width="480" height="385">
- <param name="movie" value="http://www.youtube.com/v/#id#&hl=en_US&fs=1&rel=0&color1=0x2b405b&color2=0x6b8ab6&hd=1"/>
- <param name="allowFullScreen" value="true"/>
- <param name="allowscriptaccess" value="always"/>
- <embed src="http://www.youtube.com/v/#id#&hl=en_US&fs=1&rel=0&color1=0x2b405b&color2=0x6b8ab6&hd=1"
- type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="480" height="385">
- </embed>
- </object>
+ <a href="http://www.youtube.com/watch?v=#id#"><img src="http://img.youtube.com/vi/#id#/1.jpg" alt="Youtube Video Thumbnail 1"/></a>
+ <a href="http://www.youtube.com/watch?v=#id#"><img src="http://img.youtube.com/vi/#id#/2.jpg" alt="Youtube Video Thumbnail 2"/></a>
+ <a href="http://www.youtube.com/watch?v=#id#"><img src="http://img.youtube.com/vi/#id#/3.jpg" alt="Youtube Video Thumbnail 3"/></a>
]]>
</template>
diff --git a/planet2/config/stream-template.html b/planet2/config/stream-template.html
index 6b08ae8..b273f81 100644
--- a/planet2/config/stream-template.html
+++ b/planet2/config/stream-template.html
@@ -39,8 +39,19 @@
</div>
<div id="text">
<#list entries as entry>
-${entry.player}<br/>
-<!--${entry.description}-->
+<div>
+ <table>
+ <tr>
+ <td width=400>
+ ${entry.player}
+ </td>
+ <td align="left" valign="center">
+ <b>${entry.title}</b><br>
+ ${entry.description}
+ </td>
+ </tr>
+ </table>
+</div>
</#list>
</div>
</div>