summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2014-02-03 21:01:25 +0100
committerSven Gothel <[email protected]>2014-02-03 21:01:25 +0100
commit00bc3c0e63d0ee35e14483228d1cb511c3f79d1e (patch)
tree5189c4e831eefea20d88299c159e0bd12ce5b7fc
parent57e0a28103f704fd72e4ffaa700c4bd2a710b39c (diff)
Fosdem2014: Add index and link on main page
-rw-r--r--doc/fosdem2014/index.html59
-rw-r--r--index.html3
2 files changed, 61 insertions, 1 deletions
diff --git a/doc/fosdem2014/index.html b/doc/fosdem2014/index.html
new file mode 100644
index 0000000..66c72ad
--- /dev/null
+++ b/doc/fosdem2014/index.html
@@ -0,0 +1,59 @@
+<!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="Ji Gong, Talk, FOSDEM, 2014, java, high availability, JVM technology" name="keywords"/>
+ <link href="../../../style.css" rel="stylesheet" type="text/css"/>
+ <link href="SocialCoding/logo_symbol_finals/website_final_blue_favicon_symbol_16x16pel.ico" rel="shortcut icon"/>
+ <title>Ji Gong Talk @ FOSDEM 2014</title>
+ </head>
+ <body>
+ <div id="container">
+ <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>
+ </ul>
+ </div>
+ <div id="main">
+ <div id="text" class="fill">
+ <h2>Ji Gong Talk @ FOSDEM 2014, February 1st, 2014, Universite Libre de Bruxelles</h2>
+ <h3><a href="https://fosdem.org/2014/schedule/event/ji_gong_high_availability_jvm/">Ji Gong: Proposal for High Availability JVM Technology on All Platforms</a></h3>
+ <br/>
+ <div class="column">
+ Media:
+ <ul>
+ <li>Slides (<a href="jogamp-Fosdem2014.pdf">pdf</a>)</li>
+ <!--
+ <li>Videos
+ <ul>
+ <li>Teaser (<a href="http://youtu.be/SQUvzr3HVuc">YouTube</a>,
+ <a href="https://vimeo.com/58993701">vimeo</a>)</li>
+ <li>Full Session (<a href="http://youtu.be/dL6wQ6wk6aU">YouTube</a>)</li>
+ </ul>
+ </li> -->
+ </ul>
+ <br/>
+ Participants (alphabetical order):
+ <ul>
+ <li><a href="../../wiki/index.php/Maintainer_and_Contacts#Sven_Gothel">Sven Gothel</a></li>
+ <li><a href="../../wiki/index.php/Maintainer_and_Contacts#Julien_Gouesse">Julien Gouesse</a></li>
+ <li><a href="../../wiki/index.php/Maintainer_and_Contacts#Xerxes_R.C3.A5nby">Xerxes Ranby</a></li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ <div id="footer">
+ <div id="footer_left">
+ <span>JogAmp.org</span>
+ by <a href="../../">http://jogamp.org</a>
+ is licensed under a <br/>
+ <a href="http://creativecommons.org/licenses/by/3.0/us/">Creative Commons Attribution 3.0 License</a>.
+ </div>
+ </div>
+ </div>
+ </body>
+</html>
diff --git a/index.html b/index.html
index 540c9fd..8359dcb 100644
--- a/index.html
+++ b/index.html
@@ -125,7 +125,8 @@
<ul>
<li> <a href="jogl/doc/Overview-OpenGL-Evolution-And-JOGL.html">OpenGL Evolution &amp; JOGL</a>
(<a href="jogl/doc/uml/html/fig128069.png">UML</a>)</li>
- <li> FOSDEM - Talk [<a href="doc/fosdem2013/">2013</a>]</li>
+ <li> FOSDEM - Talk [<a href="doc/fosdem2013/">2013</a>,
+ <a href="doc/fosdem2013/">2014</a>]</li>
<li> SIGGRAPH - BOF [<a href="doc/siggraph2013/">2013</a>,
<a href="doc/siggraph2012/">2012</a>,
<a href="doc/siggraph2011/jogamp-siggraph2011.pdf">2011</a>,