X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=blobdiff_plain;f=application%2Fviews%2Farticle%2Fenglish%2Fabout.php;h=9a9af2e2e55c71e42da0a24bf8bfb18f9dcd51a7;hb=2ff18f0a16aea8ab3c62dbb9bd755dc401e062ae;hp=204d9c45212f8d31648e4283c55860a00062daea;hpb=ad7daf2de4288cff974e97ec9290533ba732df3b;p=living-lab-site.git

diff --git a/application/views/article/english/about.php b/application/views/article/english/about.php
index 204d9c4..9a9af2e 100644
--- a/application/views/article/english/about.php
+++ b/application/views/article/english/about.php
@@ -1 +1,67 @@
-About <strong>us</strong>!
\ No newline at end of file
+<h1>P2P-Next</h1>
+<p><a title="P2P-Next" href="http://www.p2p-next.org/">P2P-Next</a> is an integrated FP7 EU project involving more than 20 partners, including <a title="University Politehnica of Bucharest" href="http://www.upb.ro" ref="nofollow">University Politehnica of Bucharest</a> (UPB).</p>
+<p>P2P-Next aims to build the next generation Peer-to-Peer (P2P) content delivery platform.</p>
+<p>This site provides information on UPB's contribution to the P2P-Next project activities. We are currently part of WP4 (Work Package 4 - IPvNext Networking Fabric) and WP8 (Work Package 8 - Living Lab Trials).</p>
+
+<h1>NextShare Video Plugins</h1>
+<dl>
+	<dt><a href="http://www.tribler.org/trac/wiki/BrowserPlugin" target="_blank">NextSharePC</a></dt>
+	<dd>a media-player browser plugin which uses <a href="http://www.videolan.org/vlc/" target="_blank" ref="nofollow">VLC</a> libraries for video rendering and incorporates P2P technology for VideoOnDemand (VoD) and LiveStreaming content delivery. The plugin is currently working with Internet Explorer and Firefox on Windows.</dd>
+</dl>
+<dl>
+	<dt><a href="http://www.tribler.org/trac/wiki/SwarmPlayer" target="_blank">SwarmPlayer</a></dt>
+	<dd>a browser plugin which uses the new HTML5 rendering and incorporates P2P technology for VideoOnDemand (VoD) and LiveStreaming content delivery</dd>
+</dl>
+
+<table>
+	<tr>
+		<th></th>
+		<th>Video Rendering</th>
+		<th>Operating Systems</th>
+		<th>Web Browsers</th>
+	</tr>
+	<tr>
+		<th>
+			<a href="http://www.tribler.org/trac/wiki/BrowserPlugin" target="_blank">NextSharePC</a>
+		</th>
+		<td>
+			<a href="http://www.videolan.org/vlc/" target="_blank" ref="nofollow"><img src="<?php echo site_url('img/vlc-icon.png') ?>" alt="win" /> VLC</a>
+		</td>
+		<td>
+			<p><img src="<?php echo site_url('img/windows-icon.png') ?>" alt="win" /> Windows</p>
+			<p><img src="<?php echo site_url('img/macosx-icon.png') ?>" alt="win" /> Mac OS X</p>
+		</td>
+		<td>
+			<p><img src="<?php echo site_url('img/firefox-icon.png') ?>" alt="win" /> <a href="http://www.mozilla.com/" target="_blank" ref="nofollow">Mozilla Firefox</a> 3.5 or greater</p>
+			<p><img src="<?php echo site_url('img/ie-icon.png') ?>" alt="win" /> <a href="http://windows.microsoft.com/en-US/internet-explorer/products/ie/home" target="_blank" ref="nofollow">Internet Explorer</a> 7.0 or greater</p>
+		</td>
+	</tr>
+	<tr>
+		<th>
+			<a href="http://www.tribler.org/trac/wiki/SwarmPlayer" target="_blank">SwarmPlayer</a>
+		</th>
+		<td>
+			<a href="http://www.w3.org/TR/html5/" target="_blank" ref="nofollow"><img src="<?php echo site_url('img/html5-icon.png') ?>" alt="win" /> HTML5</a>
+		</td>
+		<td>
+			<p><img src="<?php echo site_url('img/windows-icon.png') ?>" alt="win" /> Windows</p>
+			<p><img src="<?php echo site_url('img/linux-icon.png') ?>" alt="win" /> Linux</p>
+			<p><img src="<?php echo site_url('img/macosx-icon.png') ?>" alt="win" /> Mac OS X</p>
+		</td>
+		<td>
+			<p><img src="<?php echo site_url('img/firefox-icon.png') ?>" alt="win" /> <a href="http://www.mozilla.com/" target="_blank" ref="nofollow">Mozilla Firefox</a> 3.5 or greater</p>
+			<p><img src="<?php echo site_url('img/ie-icon.png') ?>" alt="win" /> <a href="http://windows.microsoft.com/en-US/internet-explorer/products/ie/home" target="_blank" ref="nofollow">Internet Explorer</a> 7.0 or greater</p>
+		</td>
+	</tr>
+</table>
+
+<h1>Video Assets</h1>
+<p>To take a look at the NextShare plugins in action, all you have to do is <a href="<?php echo site_url('install-plugins'); ?>">install them</a> and then watch any video asset from this site.</p>
+<p>Through the use of P2P technology, you will be able to stream movies from various categories:</p>
+<ul>
+	<li>from <a href="<?php site_url('catalog/category/1') ?>">feature films</a></li>
+	<li>from <a href="<?php echo site_url('catalog/category/2') ?>"><em>TechTalks</em> technical presentations</a></li>
+	<li>or from <a href="<?php site_url('catalog/category/3') ?>">various events</a> from our faculty</li>
+	<li>from <a href="<?php site_url('catalog/category/4') ?>">karaoke parties</a> in <a href="http://acs.pub.ro/" target="_blank" ref="nofollow">Automatic Control and Computers Faculty</a></li>
+</ul>
+<p>All available movies are currently seeded by 5 peers with high bandwidth (1Gbit) kindly provided by the<a title="NCIT-Cluster" href="http://cluster.ncit.pub.ro/" target="_blank" ref="nofollow"> NCIT-Cluster</a>. Anyone that watches a movie will take part in the swarm and ensure greater availability to provided content.</p>
\ No newline at end of file