Skip to content

Commit

Permalink
final touches on the colloquium presentation
Browse files Browse the repository at this point in the history
  • Loading branch information
janmonschke committed May 9, 2011
1 parent 6bf5fd3 commit 6a932b9
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 11 deletions.
Binary file added kolloquium/assets/images/Portrait.png.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added kolloquium/assets/images/bsp_upload/ray1.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added kolloquium/assets/images/bsp_upload/ray2.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added kolloquium/assets/images/bsp_upload/ray3.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added kolloquium/assets/images/bsp_upload/ray4.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 13 additions & 11 deletions kolloquium/index.html
Expand Up @@ -130,19 +130,21 @@ <h3>I. The Platform: Pages</h3>
<p class="centered"><img class="screenshot" src="assets/images/page_overview.png" /></p>
</section>

<section>
<h3>I. The Platform: Pages</h3>
<!-- <section>
<h3>I. The Platform: Pages</h3>
<p class="centered"><img class="screenshot" src="assets/images/page_overview_admin.png" /></p>
</section>
</section> -->

<section>
<h3>I. The Platform: Pages</h3>
<!-- <section>
<h3>I. The Platform: Pages</h3>
<p class="centered"><img class="screenshot" src="assets/images/upload_images.png" /></p>
</section>
</section> -->

<section>
<h3>I. The Platform: Pages</h3>
<ul>
<li>To upload images a, user simply has to drag images from his filesystem into the browser</li>
<li>Additional elements are shown when the page owner is on the page</li>
<li>Users can hide pages -> don't appear in overview but are reachable via the URL</li>
<li>Users can show other users previews of their unfinished work</li>
<!-- <li>Pages aggregate work of users</li> -->
Expand Down Expand Up @@ -173,7 +175,7 @@ <h3>I. The Platform: Images</h3>
</section>

<section>
<h3>I. The Platform: Images</h3>
<h3>I. The Platform: Forms</h3>
<p class="centered"><img class="screenshot" src="assets/images/image_admin.png" /></p>
</section>

Expand Down Expand Up @@ -299,7 +301,7 @@ <h3>II. Benefits: Media</h3>
<h3>II. Benefits</h3>
<br />
<p class="centered">These slides are a Single Page Web App as well:</p>
<p class="centered tiny"><a href="#/31">A normal link</a></p>
<p class="centered tiny"><a href="#/29">A normal link</a></p>
<br />
<h4 id="start_sound">Start</h4>
<h4 id="stop_sound">Stop</h4>
Expand Down Expand Up @@ -384,10 +386,10 @@ <h3>III. Appendix : Technology</h3>
<h3>III. Appendix : Acknowledgements</h3>
<ul>
<li>My proofreaders: Dominik, Isabel, Thomas, Eray, Sebastian</li>
<li>Jeremy Ashkenas for Backbone.js and CoffeeScript</li>
<li>The brunch-team for brunch ;)</li>
<li><a href="https://github.com/jashkenas">Jeremy Ashkenas</a> for Backbone.js and CoffeeScript</li>
<li>The brunch-team for <a href="https://github.com/brunch/brunch">brunch</a> ;)</li>
<li>Everyone that supported me while working on this thesis</li>
<li>The author of this slide system: Hakim El Hattab</li>
<li><a href="http://www.jamendo.com/en/artist/bradsucks">Brad Sucks</a> (the background music), <a href="http://hakim.se">Hakim El Hattab</a> (author of this slide system)</li>
</ul>
</section>

Expand Down

0 comments on commit 6a932b9

Please sign in to comment.