Unterschiede

Hier werden die Unterschiede zwischen zwei Versionen der Seite angezeigt.

--- wiki:syntax [23.11.2012 23:50] – Externe Bearbeitung 127.0.0.1
+++ wiki:syntax [15.11.2014 11:19] (aktuell) – Externe Bearbeitung 127.0.0.1
@@ Zeile 84: / Zeile 84: @@
   * For security reasons direct browsing of windows shares only works in Microsoft Internet Explorer per default (and only in the "local zone").
-  * For Mozilla and Firefox it can be enabled through different workaround mentioned in the [[http://kb.mozillazine.org/Links_to_local_pages_do_not_work|Mozilla Knowledge Base]]. However, there will still be a JavaScript warning about trying to open a Windows Share. To remove this warning (for all users), put the following line in ''conf/local.protected.php'':
+  * For Mozilla and Firefox it can be enabled through different workaround mentioned in the [[http://kb.mozillazine.org/Links_to_local_pages_do_not_work|Mozilla Knowledge Base]]. However, there will still be a JavaScript warning about trying to open a Windows Share. To remove this warning (for all users), put the following line in ''conf/userscript.js'':
-  $lang['js']['nosmblinks'] = '';
+  LANG.nosmblinks = '';
 ==== Image Links ====
@@ Zeile 122: / Zeile 122: @@
 ----
-===== Images and Other Files =====
+===== Media Files =====
-You can include external and internal [[doku>images]] with curly brackets. Optionally you can specify the size of them.
+You can include external and internal [[doku>images|images, videos and audio files]] with curly brackets. Optionally you can specify the size of them.
 Real size:                        {{wiki:dokuwiki-128.png}}
@@ Zeile 157: / Zeile 157: @@
   {{ wiki:dokuwiki-128.png |This is the caption}}
-If you specify a filename (external or internal) that is not an image (''gif, jpeg, png''), then it will be displayed as a link instead.
 For linking an image to another page see [[#Image Links]] above.
+==== Supported Media Formats ====
+DokuWiki can embed the following media formats directly.
+| Image | ''gif'', ''jpg'', ''png''  |
+| Video | ''webm'', ''ogv'', ''mp4'' |
+| Audio | ''ogg'', ''mp3'', ''wav''  |
+| Flash | ''swf''                    |
+If you specify a filename that is not a supported media format, then it will be displayed as a link instead.
+==== Fallback Formats ====
+Unfortunately not all browsers understand all video and audio formats. To mitigate the problem, you can upload your file in different formats for maximum browser compatibility.
+For example consider this embedded mp4 video:
+  {{video.mp4|A funny video}}
+When you upload a ''video.webm'' and ''video.ogv'' next to the referenced ''video.mp4'', DokuWiki will automatically add them as alternatives so that one of the three files is understood by your browser.
+Additionally DokuWiki supports a "poster" image which will be shown before the video has started. That image needs to have the same filename as the video and be either a jpg or png file. In the example above a ''video.jpg'' file would work.
 ===== Lists =====
@@ Zeile 428: / Zeile 449: @@
 <code>
 <php>
-echo 'A logo generated by PHP:';
+echo 'The PHP version: ';
-echo '<img src="' . $_SERVER['PHP_SELF'] . '?=' . php_logo_guid() . '" alt="PHP Logo !" />';
+echo phpversion();
-echo '(generated inline HTML)';
+echo ' (generated inline HTML)';
 </php>
 <PHP>
 echo '<table class="inline"><tr><td>The same, but inside a block level element:</td>';
-echo '<td><img src="' . $_SERVER['PHP_SELF'] . '?=' . php_logo_guid() . '" alt="PHP Logo !" /></td>';
+echo '<td>'.phpversion().'</td>';
 echo '</tr></table>';
 </PHP>
@@ Zeile 440: / Zeile 461: @@
 <php>
-echo 'A logo generated by PHP:';
+echo 'The PHP version: ';
-echo '<img src="' . $_SERVER['PHP_SELF'] . '?=' . php_logo_guid() . '" alt="PHP Logo !" />';
+echo phpversion();
-echo '(inline HTML)';
+echo ' (inline HTML)';
 </php>
 <PHP>
 echo '<table class="inline"><tr><td>The same, but inside a block level element:</td>';
-echo '<td><img src="' . $_SERVER['PHP_SELF'] . '?=' . php_logo_guid() . '" alt="PHP Logo !" /></td>';
+echo '<td>'.phpversion().'</td>';
 echo '</tr></table>';
 </PHP>

Die hier im BuFaTa ET Wiki dargestellten Arbeitsdokumente sind Einzelbeiträge der jeweiligen Autoren und i.d.R. nicht repräsentativ für die BuFaTa ET als Organisation. Veröffentlichte Beschlüsse und Stellungnahmen der BuFaTa ET befinden sich ausschließlich auf der offiziellen Homepage.