From 2f80f3d7710f7d37d48a3d2ab1ed646bbdce2e57 Mon Sep 17 00:00:00 2001 From: Astro Date: Sat, 29 Oct 2011 03:36:22 +0200 Subject: [PATCH] c3d2-web video-resources just like for datenspuren --- content/static/script/play-resources.js | 2 +- content/static/style/default.css | 31 +++++++ xsl/common.xsl | 102 ++++++++++++++++++++++-- xsl/datenspuren/xhtml5.xsl | 12 +-- 4 files changed, 132 insertions(+), 15 deletions(-) diff --git a/content/static/script/play-resources.js b/content/static/script/play-resources.js index c53f67141..1dbf87cad 100644 --- a/content/static/script/play-resources.js +++ b/content/static/script/play-resources.js @@ -120,7 +120,7 @@ $(document).ready(function() { if (res.map(function(r) { return r.type; }).some(canPlay)) { - var liEl = $('
  • '); + var liEl = $('
  • '); $(this).before(liEl); var player = addButton(liEl, res); } diff --git a/content/static/style/default.css b/content/static/style/default.css index 7618c3bbd..323eaa763 100644 --- a/content/static/style/default.css +++ b/content/static/style/default.css @@ -641,6 +641,37 @@ li audio, li video, li .poster { font-weight: bold; } +.video-resource { + vertical-align: top; + width: 48%; + margin: 1em auto; + display: inline-block; + text-align: center; +} +.video-resource h4 { + line-height: 1em; + height: 2em; + vertical-align: bottom; +} +.video-resource img { + max-width: 95%; +} +.video-resource ul { + padding: 0; +} +.video-resource ul li.play-resource { + display: block; +} +.video-resource ul li { + display: inline-block; + margin: 0 0.8em; +} +.video-resource .size { + margin-left: 0.4em; + font-size: 85%; + color: #333; +} + p.blockquote { padding: .5em .5em .5em 2em; border-left: 20px solid #eee; diff --git a/xsl/common.xsl b/xsl/common.xsl index 22155c36a..4f8c09dce 100644 --- a/xsl/common.xsl +++ b/xsl/common.xsl @@ -312,11 +312,19 @@ - + + + +
      + + +
    +
    + + + + +
    @@ -368,6 +376,76 @@ + +
    +

    + + + + + + + + + + +

    + +
    +
    + + + + + + + + + + + + + + + + + + + +
  • + + + + + + + + + + + + + + + + + + + + + + + + +
  • +
    @@ -429,6 +507,20 @@ + + + + + MP4 + WebM + Ogg + AVI + FLV + BitTorrent + + + + diff --git a/xsl/datenspuren/xhtml5.xsl b/xsl/datenspuren/xhtml5.xsl index a7b584d3a..66ce8e306 100644 --- a/xsl/datenspuren/xhtml5.xsl +++ b/xsl/datenspuren/xhtml5.xsl @@ -343,15 +343,9 @@ - - MP4 - WebM - Ogg - AVI - FLV - BitTorrent - - + + +