intermeadiary xforms upload commit, also added *stuff*

git-svn-id: http://yolanda.mister-muffin.de/svn@340 7eef14d0-6ed0-489d-bf55-20463b2d70db
This commit is contained in:
erlehmann 2008-05-02 07:38:43 +00:00
parent e6ec120e8a
commit 86aea64126
15 changed files with 361 additions and 824 deletions

View file

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.9 KiB

View file

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

View file

@ -1,5 +1,9 @@
<?xml version="1.0" encoding="iso-8859-1"?> <?xml version="1.0" encoding="iso-8859-1"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> <xsl:stylesheet version="1.0"
xmlns=""
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xhtml="http://www.w3.org/1999/xhtml"
>
<strings> <strings>
@ -8,14 +12,14 @@
<!-- header --> <!-- header -->
<string id="header_login-to-upload">to upload videos, log in first.</string> <string id="header_login-to-upload">to upload videos, log in first.</string>
<string id="register">register</string> <string id="register">Register</string>
<string id="login">login</string> <string id="login">Login</string>
<string id="header_upload-video">upload video</string> <string id="header_upload-video">Upload video</string>
<string id="settings_details">settings details</string> <string id="settings_details">Settings</string>
<string id="logged_in_as">logged in as&#160;</string> <string id="logged_in_as">logged in as&#160;</string>
<string id="logout">logout</string> <string id="logout">Logout</string>
<!-- footer --> <!-- footer -->
<string id="footer_copyright">&#169; 2007 - 2008 Yolanda Team</string> <string id="footer_copyright">&#169; 2007 - 2008 Yolanda Team</string>
@ -120,10 +124,10 @@
<string id="timestamp">timestamp</string> <string id="timestamp">timestamp</string>
<!-- search bar--> <!-- search bar-->
<string id="search">search</string> <string id="search">Search</string>
<!-- login / register page --> <!-- login / register page -->
<string id="username">username</string> <string id="username">Username</string>
<string id="username_or_openid">Username or OpenID</string> <string id="username_or_openid">Username or OpenID</string>
<string id="password">Password</string> <string id="password">Password</string>
<string id="password_repeat">repeat password</string> <string id="password_repeat">repeat password</string>
@ -133,8 +137,8 @@
<!-- upload page --> <!-- upload page -->
<string id="file">file</string> <string id="file">file</string>
<string id="button_next_page">continue</string> <string id="button_next_page">Continue</string>
<string id="button_upload">upload</string> <string id="button_upload_send_file">Upload</string>
<string id="title_page_1">Basic Information</string> <string id="title_page_1">Basic Information</string>
<string id="title_page_2">Similar Videos</string> <string id="title_page_2">Similar Videos</string>
<string id="title_page_3">Additional Metainformation</string> <string id="title_page_3">Additional Metainformation</string>
@ -157,10 +161,15 @@
<string id="instruction_rights">Specify the copyright owner of the video.</string> <string id="instruction_rights">Specify the copyright owner of the video.</string>
<string id="instruction_license">Specify the license, preferably by URL.</string> <string id="instruction_license">Specify the license, preferably by URL.</string>
<string id="instruction_license_cc">Optionally, choose Creative Commons licensing.</string> <string id="instruction_license_cc">Optionally, choose Creative Commons licensing.</string>
<string id="instruction_license_cc_remix">Permit modification.</string> <string id="instruction_license_cc_remix">Modification is <xhtml:em>allowed</xhtml:em>.</string>
<string id="instruction_license_cc_sharealike">Permit modification, derivatives must use the same license.</string> <string id="instruction_license_cc_sharealike">Modification is <xhtml:em>allowed</xhtml:em>, as long as derivatives use the same license.</string>
<string id="instruction_license_cc_noderivatives">Prohibit modification.</string> <string id="instruction_license_cc_noderivatives">Modification is <xhtml:em>not allowed</xhtml:em>.</string>
<string id="instruction_license_cc_noncommercial">Prohibit commercial use.</string> <string id="instruction_license_cc_commercial">
Commercial use is <xhtml:em>allowed</xhtml:em>.
</string>
<string id="instruction_license_cc_noncommercial">
Commercial use is <xhtml:em>not allowed</xhtml:em>.
</string>
<string id="this_is_page_1">This is page 1 of 5.</string> <string id="this_is_page_1">This is page 1 of 5.</string>
<string id="this_is_page_2">This is page 2 of 5.</string> <string id="this_is_page_2">This is page 2 of 5.</string>
<string id="this_is_page_3">This is page 3 of 5.</string> <string id="this_is_page_3">This is page 3 of 5.</string>
@ -177,8 +186,6 @@
<!-- video page --> <!-- video page -->
<string id="video_download">Download</string> <string id="video_download">Download</string>
<string id="video_playback">Plackback</string> <string id="video_playback">Plackback</string>
<string id="junk_video">mark as junk</string>
<string id="edit_video">edit</string>
<string id="watch_browserplugin">use browser plugin</string> <string id="watch_browserplugin">use browser plugin</string>
<string id="watch_cortadoapplet">use java applet</string> <string id="watch_cortadoapplet">use java applet</string>
<string id="license_conditions">license conditions</string> <string id="license_conditions">license conditions</string>
@ -186,6 +193,62 @@
<string id="login_to_comment">Login to comment</string> <string id="login_to_comment">Login to comment</string>
<string id="comment_post">Post</string> <string id="comment_post">Post</string>
<string id="video_plugin_help">
<h1>Common Questions</h1>
<h2>Why Not Use Flash ?</h2>
<p>
Many video sharing sites use the <a href="http://www.adobe.com/de/products/flashplayer/"><em>Adobe Flash Plugin</em></a> to play embedded video.
We disapprove of that because <em>Flash</em> is <em>proprietary</em> (not <a href="http://www.gnu.org/philosophy/free-sw.html"><em>free software</em></a>).
</p>
<p>
Additionally, well-known video formats like <a href="http://en.wikipedia.org/wiki/Divx"><em>DivX</em></a> or <a href="http://en.wikipedia.org/wiki/H264"><em>H.264</em></a> are <a href="http://en.wikipedia.org/wiki/H264#Patent_licensing">patent-encumbered</a> in many countries.
Because license fees have to be paid for usage, it might be a legal risk to include them in free software:
<a href="http://www.gnu.org/"><em>GNU</em></a>/<a href="http://kernel.org/"><em>Linux</em></a> distributions like <a href="http://www.debian.org/"><em>Debian</em></a> or <a href="http://www.ubuntu.com/"><em>Ubuntu</em></a> do not include them in their default installation.
</p>
<p>
Therefore, Yolanda uses the <a href="http://en.wikipedia.org/wiki/Ogg"><em>Ogg</em></a> container format containing the codecs <a href="http://www.theora.org/"><em>Theora</em></a> and <a href="http://www.vorbis.com/"><em>Vorbis</em></a>, which are maintained by <a href="http://www.xiph.org/"><em>Xiph.org</em></a>.
As of 2008, <em>Ogg</em> and <em>Vorbis</em> are free of patent claims and all known patents regarding <em>Theora</em> have been donated to the public.
</p>
<h2>Which Plugins Do I Have to Download ?</h2>
<p>
Each media player plugin that can play <em>Ogg Theora + Vorbis</em> can be used.
While there are several plugins that qualify, this section will only focus on three of them, that are also <em>free software</em>.
</p>
<h3>VLC Media Player</h3>
<p>
<img class="icon-mediaplayer" src="/images/vlc.png"/>
The <em>VLC Media Player</em>, started by students of <em>École Centrale Paris</em> plays almost any video format on a wide range of platforms.
Be sure to install the <em>Mozilla</em> plugin or you will die a horrible, agonizing death.
</p>
<p>
Downloads can be found on the <a href="http://www.videolan.org/vlc/">Videolan web page</a>.
Be sure to check your operating systems software repository before downloading untrusted binaries from questionable sources.
</p>
<h3>Mplayer</h3>
<p>
<img class="icon-mediaplayer" src="/images/mplayer.png"/>
<em>Mplayer</em>, the media player for <em>EXPERT PROGRAMMERS</em>, is only available for <em>real</em> operating systems.
It does work with both <em>Mozilla</em> and <em>Konqueror</em>.
</p>
<p>
Downloads can be found on the <a href="http://www.mplayerhq.hu/design7/dload.html">Mplayer web page</a>.
Be sure to check your operating systems software repository before downloading untrusted binaries from questionable sources.
</p>
<h3>Totem</h3>
<p>
<img class="icon-mediaplayer" src="/images/totem.png"/>
<em>Totem</em> is the default media player in <a href="http://www.gnome.org/"><em>GNOME</em></a> and therefore only used by <em>SPIDER EXPERTS</em> like <em>Miguel de Icaza</em>.
</p>
<p>
Downloads can and should not be found, go ask <em>Miguel</em> for the <em>OOXML</em> specification instead.
</p>
</string>
<!-- embedded video page--> <!-- embedded video page-->
<string id="backlink">backlink</string> <string id="backlink">backlink</string>

View file

@ -53,31 +53,6 @@ div
border-color: #555753; border-color: #555753;
} }
div.cc-license
{
}
div.cc-license img
{
}
div.loginbox
{
}
div.loginbox form
{
}
div.loginbox form fieldset
{
}
div.loginbox form fieldset input:after
{
content: url(../../images/openid-icon.png);
}
div.messagebox div.messagebox
{ {
} }
@ -116,6 +91,12 @@ div.loginbox
border-color: #555753; border-color: #555753;
} }
fieldset
{
/* "Aluminium 5" */
border-color: #555753;
}
/* TODO: make images configureable (maybe via symlinks?) */ /* TODO: make images configureable (maybe via symlinks?) */
li#search_custom_one li#search_custom_one
{ {

View file

@ -51,15 +51,9 @@ div
border-style: solid; border-style: solid;
border-width: 1px; border-width: 1px;
margin: 0.5em; margin: 0.5em;
padding: 0.5em; padding: 1em;
} }
div.button-download
{
/* TODO: find out /why we do this/ (see div.searchbar) ! */
margin-top: 0em;
}
div.description div.description
{ {
/* TODO: find out /why we do this/ (see div.searchbar) ! */ /* TODO: find out /why we do this/ (see div.searchbar) ! */
@ -100,12 +94,11 @@ div
div.settingsform, div.settingsform,
div.uploadform div.uploadform
{ {
line-height: 2.5em;
/* correct spacing to avoid overlapping with float:right elements */ /* correct spacing to avoid overlapping with float:right elements */
margin-right: 22em; margin-right: 22em;
} }
div.loginbox #loginbox
{ {
/* TODO: find out /why we do this/ (see div.searchbar) ! */ /* TODO: find out /why we do this/ (see div.searchbar) ! */
margin-top: 0em; margin-top: 0em;
@ -193,7 +186,7 @@ div#preview
border-width: 1px; border-width: 1px;
} }
div.searchbar #searchbar
{ {
/* TODO: find out /why we do this/ ! /* TODO: find out /why we do this/ !
does float make zero top margin really necessary or is it a bug ? does float make zero top margin really necessary or is it a bug ?
@ -220,19 +213,14 @@ div#preview
{ {
} }
form fieldset
{ {
border-style: solid;
border-width: 1px;
margin: 0.5em;
padding: 1em;
} }
form fieldset
{
border-width: 0px;
}
form fieldset input[type="text"]
{
}
h1 h1
{ {
font-weight: normal; font-weight: normal;
@ -256,11 +244,14 @@ li
{ {
} }
input input,
textarea
{ {
text-align: left; text-align: left;
vertical-align: middle;
} }
img img
{ {
border-width: 0px border-width: 0px
@ -309,6 +300,11 @@ span
content: "( "; content: "( ";
} }
table
{
text-align: justify;
}
ul#header ul#header
{ {
/* don't overlapt with the site logo */ /* don't overlapt with the site logo */

View file

@ -44,7 +44,7 @@ div
{ {
clear: right; clear: right;
float: right; float: right;
width: 20em; width: 18em;
} }
div.cc-license img div.cc-license img
@ -59,14 +59,14 @@ div
{ {
clear: right; clear: right;
float: right; float: right;
width: 20em; width: 18em;
} }
div.loginbox #loginbox
{ {
clear: right; clear: right;
float: right; float: right;
width: 20em; width: 18em;
} }
div.messagebox div.messagebox
@ -82,7 +82,7 @@ div
{ {
clear: right; clear: right;
float: right; float: right;
width: 20em; width: 18em;
} }
div.page-number div.page-number
@ -157,10 +157,10 @@ div
margin-right: -34px; margin-right: -34px;
} }
div.searchbar #searchbar
{ {
float: right; float: right;
width: 20em; width: 18em;
} }
div.splashbox div.splashbox
@ -171,7 +171,7 @@ div
{ {
clear: right; clear: right;
float: right; float: right;
width: 20em; width: 18em;
} }
div.video div.video
@ -204,9 +204,11 @@ form
{ {
} }
h1 form fieldset button[name="upload"]
{ {
} width: 15em;
height: 15em;
}
img img
{ {
@ -215,6 +217,7 @@ img
img#logo img#logo
{ {
float: left; float: left;
height: 3em;
} }
img.icon-mediaplayer img.icon-mediaplayer

View file

@ -30,25 +30,28 @@ sub getElementDC
return $node; return $node;
} }
$video->appendChild( getElementDC( "abstract", "xsd:string") ); $video->appendChild( getElementDC( "title", "xsd:normalizedString") );
$video->appendChild( getElementDC( "alternative", "xsd:normalizedString") ); $video->appendChild( getElementDC( "alternative", "xsd:normalizedString") );
$video->appendChild( getElementDC( "abstract", "xsd:string") );
$video->appendChild( getElementDC( "spatial", "xsd:normalizedString") );
$video->appendChild( getElementDC( "subject", "xsd:normalizedString") );
$video->appendChild( getElementDC( "temporal", "xsd:date") );
$video->appendChild( getElementDC( "language", "xsd:language") );
$video->appendChild( getElementDC( "creator", "xsd:normalizedString") );
$video->appendChild( getElementDC( "contributor", "xsd:normalizedString") ); $video->appendChild( getElementDC( "contributor", "xsd:normalizedString") );
$video->appendChild( getElementDC( "created", "xsd:date") ); $video->appendChild( getElementDC( "created", "xsd:date") );
$video->appendChild( getElementDC( "creator", "xsd:normalizedString") );
$video->appendChild( getElementDC( "hasFormat", "xsd:normalizedString") ); $video->appendChild( getElementDC( "hasFormat", "xsd:normalizedString") );
$video->appendChild( getElementDC( "hasPart", "xsd:normalizedString") ); $video->appendChild( getElementDC( "hasPart", "xsd:normalizedString") );
$video->appendChild( getElementDC( "isFormatOf", "xsd:normalizedString") ); $video->appendChild( getElementDC( "isFormatOf", "xsd:normalizedString") );
$video->appendChild( getElementDC( "isPartOf", "xsd:normalizedString") ); $video->appendChild( getElementDC( "isPartOf", "xsd:normalizedString") );
$video->appendChild( getElementDC( "language", "xsd:language") );
$video->appendChild( getElementDC( "license", "xsd:normalizedString") );
$video->appendChild( getElementDC( "references", "xsd:normalizedString") ); $video->appendChild( getElementDC( "references", "xsd:normalizedString") );
$video->appendChild( getElementDC( "replaces", "xsd:normalizedString") ); $video->appendChild( getElementDC( "replaces", "xsd:normalizedString") );
$video->appendChild( getElementDC( "rightsHolder", "xsd:normalizedString") ); $video->appendChild( getElementDC( "rightsHolder", "xsd:normalizedString") );
$video->appendChild( getElementDC( "source", "xsd:normalizedString") ); $video->appendChild( getElementDC( "source", "xsd:normalizedString") );
$video->appendChild( getElementDC( "spatial", "xsd:normalizedString") ); $video->appendChild( getElementDC( "license", "xsd:normalizedString") );
$video->appendChild( getElementDC( "subject", "xsd:normalizedString") );
$video->appendChild( getElementDC( "temporal", "xsd:date") );
$video->appendChild( getElementDC( "title", "xsd:normalizedString") );
$video->appendChild( getElementDC( "data", "xsd:base64Binary") ); $video->appendChild( getElementDC( "data", "xsd:base64Binary") );
$instance->appendChild($video); $instance->appendChild($video);

View file

@ -9,41 +9,41 @@
<xsl:template name="loginbox"> <xsl:template name="loginbox">
<div class="loginbox"> <form method="post">
<form method="post"> <xsl:attribute name="action">
<xsl:value-of select="$site_strings[@id='path_login']" />
</xsl:attribute>
<xsl:attribute name="action"> <fieldset id="loginbox">
<xsl:value-of select="$site_strings[@id='path_login']" />
</xsl:attribute>
<fieldset> <legend>
<xsl:value-of select="$lang_strings[@id='login']" />
</legend>
<label for="user"> <label for="user">
<xsl:value-of select="$lang_strings[@id='username_or_openid']" />: <xsl:value-of select="$lang_strings[@id='username_or_openid']" />:
</label> </label>
<br /> <br />
<input id="username" name="user" onkeyup="check_openid();" type="text" /> <input id="username" name="user" onkeyup="check_openid();" type="text" />
<br /> <br />
<label for="pass"> <label for="pass">
<xsl:value-of select="$lang_strings[@id='password']" />: <xsl:value-of select="$lang_strings[@id='password']" />:
</label> </label>
<br /> <br />
<input id="password" name="pass" type="password" /> <input id="password" name="pass" type="password" />
<input type="submit" name="login" > <input type="submit" name="login" >
<xsl:attribute name="value"> <xsl:attribute name="value">
<xsl:value-of select="$lang_strings[@id='button_login']" /> <xsl:value-of select="$lang_strings[@id='button_login']" />
</xsl:attribute> </xsl:attribute>
</input> </input>
</fieldset> </fieldset>
</form> </form>
</div>
<script type="text/javascript"> <script type="text/javascript">
<!-- <!--

View file

@ -9,63 +9,11 @@
<xsl:template name="pluginhelp"> <xsl:template name="pluginhelp">
<div class="pluginhelp" style="margin-right:22em;"> <fieldset class="pluginhelp">
<h1>Common Questions</h1> <xsl:copy-of select="$lang_strings[@id='video_plugin_help']/node()" />
<h2>Why Not Use Flash ?</h2> </fieldset>
<p>
Many video sharing sites use the <a href="http://www.adobe.com/de/products/flashplayer/"><em>Adobe Flash Plugin</em></a> to play embedded video.
We disapprove of that because <em>Flash</em> is <em>proprietary</em> (not <a href="http://www.gnu.org/philosophy/free-sw.html"><em>free software</em></a>).
</p>
<p>
Additionally, well-known video formats like <a href="http://en.wikipedia.org/wiki/Divx"><em>DivX</em></a> or <a href="http://en.wikipedia.org/wiki/H264"><em>H.264</em></a> are <a href="http://en.wikipedia.org/wiki/H264#Patent_licensing">patent-encumbered</a> in many countries.
Because license fees have to be paid for usage, it might be a legal risk to include them in free software:
<a href="http://www.gnu.org/"><em>GNU</em></a>/<a href="http://kernel.org/"><em>Linux</em></a> distributions like <a href="http://www.debian.org/"><em>Debian</em></a> or <a href="http://www.ubuntu.com/"><em>Ubuntu</em></a> do not include them in their default installation.
</p>
<p>
Therefore, Yolanda uses the <a href="http://en.wikipedia.org/wiki/Ogg"><em>Ogg</em></a> container format containing the codecs <a href="http://www.theora.org/"><em>Theora</em></a> and <a href="http://www.vorbis.com/"><em>Vorbis</em></a>, which are maintained by <a href="http://www.xiph.org/"><em>Xiph.org</em></a>.
As of 2008, <em>Ogg</em> and <em>Vorbis</em> are free of patent claims and all known patents regarding <em>Theora</em> have been donated to the public.
</p>
<h2>Which Plugins Do I Have to Download ?</h2>
<p>
Each media player plugin that can play <em>Ogg Theora + Vorbis</em> can be used.
While there are several plugins that qualify, this section will only focus on three of them, that are also <em>free software</em>.
</p>
<h3>VLC Media Player</h3>
<p>
<img class="icon-mediaplayer" src="/images/vlc.png"/>
The <em>VLC Media Player</em>, started by students of <em>École Centrale Paris</em> plays almost any video format on a wide range of platforms.
Be sure to install the <em>Mozilla</em> plugin or you will die a horrible, agonizing death.
</p>
<p>
Downloads can be found on the <a href="http://www.videolan.org/vlc/">Videolan web page</a>.
Be sure to check your operating systems software repository before downloading untrusted binaries from questionable sources.
</p>
<h3>Mplayer</h3>
<p>
<img class="icon-mediaplayer" src="/images/mplayer.png"/>
<em>Mplayer</em>, the media player for <em>EXPERT PROGRAMMERS</em>, is only available for <em>real</em> operating systems.
It does work with both <em>Mozilla</em> and <em>Konqueror</em>.
</p>
<p>
Downloads can be found on the <a href="http://www.mplayerhq.hu/design7/dload.html">Mplayer web page</a>.
Be sure to check your operating systems software repository before downloading untrusted binaries from questionable sources.
</p>
<h3>Totem</h3>
<p>
<img class="icon-mediaplayer" src="/images/totem.png"/>
<em>Totem</em> is the default media player in <a href="http://www.gnome.org/"><em>GNOME</em></a> and therefore only used by <em>SPIDER EXPERTS</em> like <em>Miguel de Icaza</em>.
</p>
<p>
Downloads can and should not be found, go ask <em>Miguel</em> for the <em>OOXML</em> specification instead.
</p>
</div>
</xsl:template> </xsl:template>

View file

@ -9,63 +9,64 @@
<xsl:template name="searchbar"> <xsl:template name="searchbar">
<div class="searchbar"> <form method="get" enctype="application/x-www-form-urlencoded">
<form method="get" enctype="application/x-www-form-urlencoded"> <xsl:attribute name="action">
<xsl:attribute name="action"> <xsl:value-of select="$site_strings[@id='path_search']" />
<xsl:value-of select="$site_strings[@id='path_search']" /> </xsl:attribute>
</xsl:attribute>
<fieldset>
<label for="query">
<xsl:value-of select="$lang_strings[@id='search']" />:<br />
</label>
<input type="text" name="query">
<xsl:attribute name="value">
<xsl:if test="//results/@argument='query'">
<xsl:value-of select="//results/@value" />
</xsl:if>
</xsl:attribute>
</input>
<input type="submit">
<xsl:attribute name="value">
<xsl:value-of select="$lang_strings[@id='button_find']" />
</xsl:attribute>
</input>
</fieldset>
</form>
<ul id="queries" role="navigation"> <fieldset id="searchbar">
<li id="search_custom_one"> <legend>
<a> <xsl:value-of select="$lang_strings[@id='search']" />
<xsl:attribute name="href"> </legend>
<xsl:value-of select="$site_strings[@id='path_query_custom_one']" />
</xsl:attribute>
<xsl:value-of select="$lang_strings[@id='search_custom_one']" />
</a>
</li>
<li id="search_custom_two"> <input type="text" name="query">
<a> <xsl:attribute name="value">
<xsl:attribute name="href"> <xsl:if test="//results/@argument='query'">
<xsl:value-of select="$site_strings[@id='path_query_custom_two']" /> <xsl:value-of select="//results/@value" />
</xsl:attribute> </xsl:if>
<xsl:value-of select="$lang_strings[@id='search_custom_two']" /> </xsl:attribute>
</a> </input>
</li> <input type="submit">
<xsl:attribute name="value">
<xsl:value-of select="$lang_strings[@id='button_find']" />
</xsl:attribute>
</input>
<li id="search_custom_three"> <ul id="queries" role="navigation">
<a>
<xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='path_query_custom_three']" />
</xsl:attribute>
<xsl:value-of select="$lang_strings[@id='search_custom_three']" />
</a>
</li>
</ul> <li id="search_custom_one">
<a>
<xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='path_query_custom_one']" />
</xsl:attribute>
<xsl:value-of select="$lang_strings[@id='search_custom_one']" />
</a>
</li>
</div> <li id="search_custom_two">
<a>
<xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='path_query_custom_two']" />
</xsl:attribute>
<xsl:value-of select="$lang_strings[@id='search_custom_two']" />
</a>
</li>
<li id="search_custom_three">
<a>
<xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='path_query_custom_three']" />
</xsl:attribute>
<xsl:value-of select="$lang_strings[@id='search_custom_three']" />
</a>
</li>
</ul>
</fieldset>
</form>
</xsl:template> </xsl:template>

View file

@ -10,633 +10,172 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
> >
<xsl:template name="uploadform"> <xsl:template name="uploadform">
<div class="uploadform">
<form method="post"> <form method="post">
<xsl:for-each select="/page/xforms:instance/*/*">
<label> <xsl:attribute name="action">
<xsl:attribute name="for"> <xsl:value-of select="$site_strings[@id='path_upload']" />
<xsl:value-of select="local-name()"/> </xsl:attribute>
</xsl:attribute>
<xsl:value-of select="local-name()"/>
</label>
<br /> <fieldset>
<table>
<xsl:choose> <xsl:for-each select="/page/xforms:instance/*/*">
<xsl:when test="@xsi:type='xsd:base64Binary'"> <tr>
<input type="file"> <td>
<xsl:attribute name="name"> <label>
<xsl:value-of select="local-name()"/> <xsl:attribute name="for">
<xsl:value-of select="name()"/>
</xsl:attribute> </xsl:attribute>
</input> <xsl:value-of select="name()"/>
</xsl:when> </label>
</td>
<xsl:when test="@xsi:type='xsd:normalizedString'"> <td>
<input type="text"> <xsl:choose>
<xsl:attribute name="name">
<xsl:value-of select="local-name()"/>
</xsl:attribute>
</input>
</xsl:when>
<xsl:when test="@xsi:type='xsd:string'"> <xsl:when test="@xsi:type='xsd:base64Binary'">
<textarea> <input type="file">
<xsl:attribute name="name"> <xsl:attribute name="name">
<xsl:value-of select="local-name()"/> <xsl:value-of select="name()"/>
</xsl:attribute>
</textarea>
</xsl:when>
<xsl:when test="@xsi:type='xsd:date'">
<select>
<xsl:attribute name="name">
<xsl:value-of select="local-name()"/>
</xsl:attribute>
<option>
<xsl:value-of select="local-name()"/>
</option>
<xsl:call-template name="for-loop">
<xsl:with-param name="start">1</xsl:with-param>
<xsl:with-param name="end">31</xsl:with-param>
<xsl:with-param name="element">option</xsl:with-param>
</xsl:call-template>
</select>
<select>
<option>
<xsl:value-of select="local-name()"/>
</option>
<xsl:call-template name="for-loop">
<xsl:with-param name="start">1</xsl:with-param>
<xsl:with-param name="end">12</xsl:with-param>
<xsl:with-param name="element">option</xsl:with-param>
</xsl:call-template>
</select>
<select>
<option>
<xsl:value-of select="local-name()"/>
</option>
<xsl:call-template name="for-loop">
<xsl:with-param name="start">1890</xsl:with-param>
<xsl:with-param name="end">2008</xsl:with-param>
<xsl:with-param name="element">option</xsl:with-param>
</xsl:call-template>
</select>
</xsl:when>
<xsl:when test="@xsi:type='xsd:language'">
<select>
<xsl:attribute name="name">
<xsl:value-of select="local-name()"/>
</xsl:attribute>
<option>
<xsl:value-of select="local-name()"/>
</option>
<xsl:variable name="language" select="//@locale" />
<xsl:for-each select="$language_strings">
<option>
<xsl:attribute name="value">
<xsl:value-of select="short" />
</xsl:attribute> </xsl:attribute>
<!-- </input>
<xsl:if test="$short=$language"> </xsl:when>
<xsl:attribute name="selected">selected</xsl:attribute>
</xsl:if>
-->
<xsl:value-of select="name[@lang='en']" /><!-- language hardcoded to en - this will be solved through simple if/else -->
<xsl:value-of select="name[@lang=$language]" />
<xsl:value-of select="$language" /><!-- debug debug debug -->
</option>
</xsl:for-each> <xsl:when test="@xsi:type='xsd:normalizedString'">
<input type="text">
<xsl:attribute name="name">
<xsl:value-of select="name()"/>
</xsl:attribute>
</input>
</xsl:when>
</select> <xsl:when test="@xsi:type='xsd:string'">
</xsl:when> <textarea>
<xsl:attribute name="name">
<xsl:value-of select="name()"/>
</xsl:attribute>
</textarea>
</xsl:when>
</xsl:choose> <xsl:when test="@xsi:type='xsd:date'">
<select>
<xsl:attribute name="name">
<xsl:value-of select="name()"/>
</xsl:attribute>
<option>
<xsl:value-of select="$lang_strings[@id='unit_day']"/>
</option>
<xsl:call-template name="for-loop">
<xsl:with-param name="start">1</xsl:with-param>
<xsl:with-param name="end">31</xsl:with-param>
<xsl:with-param name="element">option</xsl:with-param>
</xsl:call-template>
</select>
<select>
<option>
<xsl:value-of select="$lang_strings[@id='unit_month']"/>
</option>
<xsl:call-template name="for-loop">
<xsl:with-param name="start">1</xsl:with-param>
<xsl:with-param name="end">12</xsl:with-param>
<xsl:with-param name="element">option</xsl:with-param>
</xsl:call-template>
</select>
<select>
<option>
<xsl:value-of select="$lang_strings[@id='unit_year']"/>
</option>
<xsl:call-template name="for-loop">
<xsl:with-param name="start">1890</xsl:with-param>
<xsl:with-param name="end">2008</xsl:with-param>
<xsl:with-param name="element">option</xsl:with-param>
</xsl:call-template>
</select>
</xsl:when>
<br /> <xsl:when test="@xsi:type='xsd:language'">
<select>
<xsl:attribute name="name">
<xsl:value-of select="name()"/>
</xsl:attribute>
<option>
<xsl:value-of select="name()"/>
</option>
</xsl:for-each> <xsl:variable name="language" select="//@locale" />
<button type="submit" name="submit"> <xsl:for-each select="$language_strings">
<option>
<xsl:attribute name="value">
<xsl:value-of select="short" />
</xsl:attribute>
<!--
<xsl:if test="$short=$language">
<xsl:attribute name="selected">selected</xsl:attribute>
</xsl:if>
-->
<xsl:value-of select="name[@lang='en']" /><!-- language hardcoded to en - this will be solved through simple if/else -->
<xsl:value-of select="name[@lang=$language]" />
<xsl:value-of select="$language" /><!-- debug debug debug -->
</option>
</xsl:for-each>
</select>
</xsl:when>
</xsl:choose>
</td>
</tr>
</xsl:for-each>
</table>
</fieldset>
<fieldset>
<input type="radio" name="modification" value="remix" />
<xsl:copy-of select="$lang_strings[@id='instruction_license_cc_remix']/node()" />
<br />
<input type="radio" name="modification" value="sharealike" />
<xsl:copy-of select="$lang_strings[@id='instruction_license_cc_sharealike']/node()" />
<br />
<input type="radio" name="modification" value="noderivatives" />
<xsl:copy-of select="$lang_strings[@id='instruction_license_cc_noderivatives']/node()" />
</fieldset>
<fieldset>
<legend>
allow commercial use ?
</legend>
<input type="radio" name="commercial" value="true" />
<xsl:copy-of select="$lang_strings[@id='instruction_license_cc_commercial']/node()" />
<br />
<input type="radio" name="commercial" value="false" />
<xsl:copy-of select="$lang_strings[@id='instruction_license_cc_noncommercial']/node()" />
</fieldset>
<fieldset>
<button name="upload" type="submit">
<xsl:attribute name="value"> <xsl:attribute name="value">
<xsl:value-of select="$lang_strings[@id='button_next_page']" /> <xsl:value-of select="$lang_strings[@id='button_next_page']" />
</xsl:attribute> </xsl:attribute>
<img src="/images/tango/32x32/actions/go-next.png"> <img src="/images/tango/128x128/actions/document-send.png">
<xsl:attribute name="alt"> <xsl:attribute name="alt">
<xsl:value-of select="$lang_strings[@id='button_next_page']" /> <xsl:value-of select="$lang_strings[@id='button_upload_send_file']" />
</xsl:attribute> </xsl:attribute>
</img> </img>
</button> </button>
</form> </fieldset>
<!-- </form>
information below this line won't match anything anytime soon.
this code will be removed in furute revisions but is kept for reference reasons.
-->
<xsl:choose>
<xsl:when test="//uploadform/@page=1">
<h1>
<xsl:value-of select="$lang_strings[@id='title_page_1']" />
</h1>
<br />
<span class="instruction">
<xsl:value-of select="$lang_strings[@id='instruction_page_1']" />
</span>
<br />
<form method="post">
<xsl:attribute name="action">
<xsl:value-of select="$site_strings[@id='path_upload']" />
</xsl:attribute>
<fieldset>
<xsl:value-of select="$lang_strings[@id='instruction_title']" />
<br />
<input name="DC.Title" type="text">
<xsl:attribute name="value">
<xsl:value-of select="//uploadform/@DC.Title" />
</xsl:attribute>
</input>
<br />
<xsl:value-of select="$lang_strings[@id='instruction_subject']" />
<br />
<input name="DC.Subject" type="text">
<xsl:attribute name="value">
<xsl:value-of select="//uploadform/@DC.Subject" />
</xsl:attribute>
</input>
<br />
<xsl:value-of select="$lang_strings[@id='instruction_description']" />
<br />
<textarea name="DC.Description">
<xsl:value-of select="//uploadform/@DC.Description" />
</textarea>
<br />
<xsl:value-of select="$lang_strings[@id='instruction_coverage']" />
<br />
<select name="DC.Coverage.day"><!-- DC.Coverage.day is NOT an official qualifier -->
<option>
<xsl:value-of select="$lang_strings[@id='unit_day']" />
</option>
<xsl:call-template name="for-loop">
<xsl:with-param name="start">1</xsl:with-param>
<xsl:with-param name="end">32</xsl:with-param>
<xsl:with-param name="element">option</xsl:with-param>
</xsl:call-template>
</select>
<select name="DC.Coverage.month"><!-- DC.Coverage.month is NOT an official qualifier -->
<option>
<xsl:value-of select="$lang_strings[@id='unit_month']" />
</option>
<xsl:call-template name="for-loop">
<xsl:with-param name="start">1</xsl:with-param>
<xsl:with-param name="end">12</xsl:with-param>
<xsl:with-param name="element">option</xsl:with-param>
</xsl:call-template>
</select>
<select name="DC.Coverage.year"><!-- DC.Coverage.year is NOT an official qualifier -->
<option>
<xsl:value-of select="$lang_strings[@id='unit_year']" />
</option>
<xsl:call-template name="for-loop">
<xsl:with-param name="start">1890</xsl:with-param><!-- Monkeyshines, No. 1 -->
<xsl:with-param name="end">2008</xsl:with-param><!-- present day, present time -->
<xsl:with-param name="element">option</xsl:with-param>
</xsl:call-template>
</select>
<br />
<input name="DC.Coverage.placeName" type="text" size="30">
<xsl:attribute name="value">
<xsl:value-of select="//uploadform/@DC.Coverage.placeName" />
</xsl:attribute>
</input>
<br />
<xsl:value-of select="$lang_strings[@id='instruction_language']" />
<br />
<!-- one cannot access DC.Language from inside the for-each... -->
<xsl:variable name="language" select="//@locale" />
<!--
<xsl:variable name="language" select="//uploadform/@DC.Language" />
<option>
<xsl:if test="not($language)">
<xsl:attribute name="selected">selected</xsl:attribute>
</xsl:if>
<xsl:attribute name="value"></xsl:attribute>
<xsl:value-of select="$lang_strings[@id='instruction_language_choose']" />
</option>
-->
<select name="DC.Language" size="1">
<xsl:for-each select="$language_strings">
<option>
<xsl:attribute name="value">
<xsl:value-of select="short" />
</xsl:attribute>
<!--
<xsl:if test="$short=$language">
<xsl:attribute name="selected">selected</xsl:attribute>
</xsl:if>
-->
<xsl:value-of select="name[@lang='en']" /><!-- language hardcoded to en - this will be solved through simple if/else -->
<xsl:value-of select="name[@lang=$language]" />
<xsl:value-of select="$language" /><!-- debug debug debug -->
</option>
</xsl:for-each>
</select>
<br />
<button type="submit" name="2">
<xsl:attribute name="value">
<xsl:value-of select="$lang_strings[@id='button_next_page']" />
</xsl:attribute>
<img src="/images/tango/32x32/actions/go-next.png">
<xsl:attribute name="alt">
<xsl:value-of select="$lang_strings[@id='button_next_page']" />
</xsl:attribute>
</img>
</button>
<br />
<span class="protip">
<xsl:value-of select="$lang_strings[@id='this_is_page_1']" />
</span>
</fieldset>
</form>
</xsl:when>
<!--
visual blockade between section that is being worked on (↑↑) and those that isn't (↓↓)
-->
<xsl:when test="//uploadform/@page=2">
<span class="heading">
<xsl:value-of select="$lang_strings[@id='title_page_2']" />
</span>
<br />
<span class="instruction">
<xsl:value-of select="$lang_strings[@id='instruction_page_2']" />
</span>
<form method="post">
<xsl:attribute name="action">
<xsl:value-of select="$site_strings[@id='path_upload']" />
</xsl:attribute>
<fieldset>
<input type="submit" name="3">
<xsl:attribute name="value">
<xsl:value-of select="$lang_strings[@id='button_next_page']" />
</xsl:attribute>
</input>
<br />
<span class="protip">
<xsl:value-of select="$lang_strings[@id='this_is_page_2']" />
</span>
</fieldset>
</form>
<xsl:call-template name="results-listing"/>
</xsl:when>
<xsl:when test="//uploadform/@page=3">
<span class="heading">
<xsl:value-of select="$lang_strings[@id='title_page_3']" />
</span>
<br />
<span class="instruction">
<xsl:value-of select="$lang_strings[@id='instruction_page_3']" />
</span>
<form method="post">
<xsl:attribute name="action">
<xsl:value-of select="$site_strings[@id='path_upload']" />
</xsl:attribute>
<fieldset>
<xsl:value-of select="$lang_strings[@id='instruction_creator']" />
<br />
<input name="DC.Creator" type="text" size="30">
<xsl:attribute name="value">
<xsl:value-of select="//uploadform/@DC.Creator" />
</xsl:attribute>
</input>
<br />
<xsl:value-of select="$lang_strings[@id='instruction_source']" />
<br />
<input name="DC.Source" type="text" size="30">
<xsl:attribute name="value">
<xsl:value-of select="//uploadform/@DC.Source" />
</xsl:attribute>
</input>
<br />
<input type="submit" name="4">
<xsl:attribute name="value">
<xsl:value-of select="$lang_strings[@id='button_next_page']" />
</xsl:attribute>
</input>
<br />
<span class="protip">
<xsl:value-of select="$lang_strings[@id='this_is_page_3']" />
</span>
</fieldset>
</form>
</xsl:when>
<xsl:when test="//uploadform/@page=4">
<span class="heading">
<xsl:value-of select="$lang_strings[@id='title_page_4']" />
</span>
<br />
<span class="instruction">
<xsl:value-of select="$lang_strings[@id='instruction_page_4']" />
</span>
<form method="post">
<xsl:attribute name="action">
<xsl:value-of select="$site_strings[@id='path_upload']" />
</xsl:attribute>
<fieldset>
<xsl:value-of select="$lang_strings[@id='instruction_rights']" />
<br />
<input name="DC.Rights" type="text" size="30">
<xsl:attribute name="value">
<xsl:value-of select="//uploadform/@DC.Rights" />
</xsl:attribute>
</input>
<br />
<xsl:value-of select="$lang_strings[@id='instruction_license']" />
<br />
<input name="DC.License" type="text" size="30">
<xsl:attribute name="value">
<xsl:value-of select="//uploadform/@DC.License" />
</xsl:attribute>
</input>
<br />
<xsl:value-of select="$lang_strings[@id='instruction_license_cc']" />
<br />
<div class="cc-license-chooser">
<img src="./images/cc/cc-remix.png" />
<input type="radio" name="modification" value="remix">
<xsl:if test="//uploadform/@remix='true'">
<xsl:attribute name="checked">
checked
</xsl:attribute>
</xsl:if>
</input>
<br />
<span class="protip">
<xsl:value-of select="$lang_strings[@id='instruction_license_cc_remix']" />
</span>
<br />
<img src="./images/cc/cc-sharealike.png" />
<input type="radio" name="modification" value="sharealike">
<xsl:if test="//uploadform/@sharealike='true'">
<xsl:attribute name="checked">
checked
</xsl:attribute>
</xsl:if>
</input>
<br />
<span class="protip">
<xsl:value-of select="$lang_strings[@id='instruction_license_cc_sharealike']" />
</span>
<br />
<img src="./images/cc/cc-noderivatives.png" />
<input type="radio" name="modification" value="noderivatives">
<xsl:if test="//uploadform/@noderivatives='true'">
<xsl:attribute name="checked">
checked
</xsl:attribute>
</xsl:if>
</input>
<br />
<span class="protip">
<xsl:value-of select="$lang_strings[@id='instruction_license_cc_noderivatives']" />
</span>
<br />
<img src="./images/cc/cc-noncommercial.png" />
<input type="checkbox" name="noncommercial" value="CommercialUse">
<xsl:if test="//uploadform/@noncommercial='true'">
<xsl:attribute name="checked">
checked
</xsl:attribute>
</xsl:if>
</input>
<br />
<span class="protip">
<xsl:value-of select="$lang_strings[@id='instruction_license_cc_noncommercial']" />
</span>
</div>
<input type="submit" name="5">
<xsl:attribute name="value">
<xsl:value-of select="$lang_strings[@id='button_next_page']" />
</xsl:attribute>
</input>
<br />
<span class="protip">
<xsl:value-of select="$lang_strings[@id='this_is_page_4']" />
</span>
</fieldset>
</form>
</xsl:when>
<xsl:when test="//uploadform/@page=5">
<span class="heading">
<xsl:value-of select="$lang_strings[@id='title_page_5']" />
</span>
<br />
<span class="instruction">
<xsl:value-of select="$lang_strings[@id='instruction_page_5']" />
</span>
<form method="post">
<xsl:attribute name="action">
<xsl:value-of select="$site_strings[@id='path_upload']" />
</xsl:attribute>
<fieldset>
<table class="metadata-upload">
<tr>
<td class="metadata-title">
<xsl:value-of select="$lang_strings[@id='DC.Title']" />:
</td>
<td class="metadata-content">
<xsl:value-of select="//uploadform/@DC.Title" />
</td>
</tr>
<tr>
<td class="metadata-title">
<xsl:value-of select="$lang_strings[@id='DC.Subject']" />:
</td>
<td class="metadata-content">
<xsl:value-of select="//uploadform/@DC.Subject" />
</td>
</tr>
<tr>
<td class="metadata-title">
<xsl:value-of select="$lang_strings[@id='DC.Description']" />:
</td>
<td class="metadata-content">
<xsl:value-of select="//uploadform/@DC.Description" />
</td>
</tr>
</table>
<input type="submit" name="1">
<xsl:attribute name="value">
<xsl:value-of select="$lang_strings[@id='button_page_1']" />
</xsl:attribute>
</input>
<table class="metadata-upload">
<tr>
<td class="metadata-title">
<xsl:value-of select="$lang_strings[@id='DC.Creator']" />:
</td>
<td class="metadata-content">
<xsl:value-of select="//uploadform/@DC.Creator" />
</td>
</tr>
<tr>
<td class="metadata-title">
<xsl:value-of select="$lang_strings[@id='DC.Source']" />:
</td>
<td class="metadata-content">
<xsl:value-of select="//uploadform/@DC.Source" />
</td>
</tr>
<tr>
<td class="metadata-title">
<xsl:value-of select="$lang_strings[@id='DC.Language']" />:
</td>
<td class="metadata-content">
<xsl:value-of select="//uploadform/@DC.Language" />
</td>
</tr>
<tr>
<td class="metadata-title">
<xsl:value-of select="$lang_strings[@id='DC.Coverage']" />:
</td>
<td class="metadata-content">
<xsl:value-of select="//uploadform/@DC.Coverage" />
</td>
</tr>
</table>
<input type="submit" name="3">
<xsl:attribute name="value">
<xsl:value-of select="$lang_strings[@id='button_page_3']" />
</xsl:attribute>
</input>
<table class="metadata-upload">
<tr>
<td class="metadata-title">
<xsl:value-of select="$lang_strings[@id='DC.Rights']" />:
</td>
<td class="metadata-content">
<xsl:value-of select="//uploadform/@DC.Rights" />
</td>
</tr>
<tr>
<td class="metadata-title">
<xsl:value-of select="$lang_strings[@id='DC.License']" />:
</td>
<td class="metadata-content">
<xsl:value-of select="//uploadform/@DC.License" />
</td>
</tr>
</table>
<input type="submit" name="4">
<xsl:attribute name="value">
<xsl:value-of select="$lang_strings[@id='button_page_4']" />
</xsl:attribute>
</input>
</fieldset>
</form>
<form method="post" enctype="multipart/form-data">
<xsl:attribute name="action">
<xsl:value-of select="$site_strings[@id='path_uploader']" />
</xsl:attribute>
<fieldset>
<xsl:value-of select="$lang_strings[@id='instruction_file']" />
<br />
<input name="file" type="file" size="13" />
<br />
<input type="submit">
<xsl:attribute name="value">
<xsl:value-of select="$lang_strings[@id='button_upload']" />
</xsl:attribute>
</input>
<br />
<span class="protip">
<xsl:value-of select="$lang_strings[@id='this_is_page_5']" />
</span>
</fieldset>
</form>
</xsl:when>
</xsl:choose>
</div>
</xsl:template> </xsl:template>

View file

@ -400,7 +400,7 @@
<xsl:attribute name="value"> <xsl:attribute name="value">
<xsl:value-of select="$lang_strings[@id='video_playback']" /> <xsl:value-of select="$lang_strings[@id='video_playback']" />
</xsl:attribute> </xsl:attribute>
<img src="/images/tango/128x128/player_play.png"> <img src="/images/tango/128x128/actions/player_play.png">
<xsl:attribute name="alt"> <xsl:attribute name="alt">
<xsl:value-of select="$lang_strings[@id='video_playback']" /> <xsl:value-of select="$lang_strings[@id='video_playback']" />
</xsl:attribute> </xsl:attribute>
@ -413,7 +413,7 @@
<xsl:attribute name="value"> <xsl:attribute name="value">
<xsl:value-of select="$lang_strings[@id='video_download']" /> <xsl:value-of select="$lang_strings[@id='video_download']" />
</xsl:attribute> </xsl:attribute>
<img src="/images/tango/128x128/document-save.png"> <img src="/images/tango/128x128/actions/document-save.png">
<xsl:attribute name="alt"> <xsl:attribute name="alt">
<xsl:value-of select="$lang_strings[@id='video_download']" /> <xsl:value-of select="$lang_strings[@id='video_download']" />
</xsl:attribute> </xsl:attribute>

View file

@ -14,7 +14,7 @@
<body> <body>
<xsl:if test="//video"> <xsl:if test="/page/video">
<xsl:attribute name="onload"> <xsl:attribute name="onload">
hide_movie() hide_movie()
</xsl:attribute> </xsl:attribute>

View file

@ -40,8 +40,11 @@
</xsl:attribute> </xsl:attribute>
</link> </link>
<!-- TODO: get server root from config file--> <link rel="pingback">
<link rel="pingback" href="http://localhost/pingback.pl" /> <xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='path_root']" />pingback.pl
</xsl:attribute>
</link>
<xsl:choose> <xsl:choose>
<xsl:when test="//frontpage"> <xsl:when test="//frontpage">
@ -54,7 +57,7 @@
</xsl:when> </xsl:when>
<xsl:when test="//page/video"> <xsl:when test="/page/video">
<title> <title>
<xsl:value-of select="$site_strings[@id='site_name']" /> <xsl:value-of select="$site_strings[@id='site_name']" />
@ -64,7 +67,7 @@
</xsl:when> </xsl:when>
<xsl:when test="//page//results"> <xsl:when test="/page/results">
<link <link
rel="alternate" rel="alternate"