josch/yolanda
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

new upload interface,

Browse source 
upload is broken currently


git-svn-id: http://yolanda.mister-muffin.de/svn@126 7eef14d0-6ed0-489d-bf55-20463b2d70db
This commit is contained in:
erlehmann 2007-10-23 16:12:32 +00:00
parent f4de6ea494
commit 1a41016a10
5 changed files with 146 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
trunk/locale/en-US.xml
View file

@ -34,22 +34,25 @@
<!-- errors --> <!-- errors -->
<str id="error_202c">Error 202c - Access forbidden by government.</str> <str id="error_202c">Error 202c - Access forbidden by government.</str>
<str id="error_missing_file">You did not supply a file.</str>
<str id="error_missing_DC.Title">You did not supply a title.</str>
<str id="error_missing_DC.Creator">You did not supply a creator.</str>
<str id="error_missing_DC.Subject">You did not supply a subject.</str>
<str id="error_missing_DC.Description">You did not supply a description.</str>
<str id="error_missing_DC.Publisher">You did not supply a publisher.</str>
<str id="error_missing_DC.Title">You did not supply a title.</str>
<str id="error_missing_DC.Source">You did not supply a source.</str>
<str id="error_missing_DC.Language">You did not supply a language.</str>
<str id="error_missing_DC.Coverage">You did not supply a coverage.</str>
<str id="error_missing_DC.Rights">You did not supply a rights holder.</str>
<!-- information --> <!-- information -->
<str id="information_logged_in">You are now logged in.</str> <str id="information_logged_in">You are now logged in.</str>
<str id="information_logged_out">You are now logged out.</str> <str id="information_logged_out">You are now logged out.</str>
<str id="information_metainformation_needed">To put the video into context, additional metainformation is needed.</str>
<str id="information_metainformation_rights"></str>
<!-- warnings --> <!-- warnings -->
<str id="warning_missing_DC.Title">You did not supply a title.</str>
<str id="warning_missing_DC.Creator">You did not supply a creator.</str>
<str id="warning_missing_DC.Subject">You did not supply a subject.</str>
<str id="warning_missing_DC.Description">You did not supply a description.</str>
<str id="warning_missing_DC.Publisher">You did not supply a publisher.</str>
<str id="warning_missing_DC.Title">You did not supply a title.</str>
<str id="warning_missing_DC.Source">You did not supply a source.</str>
<str id="warning_missing_DC.Language">You did not supply a language.</str>
<str id="warning_missing_DC.Coverage">You did not supply a coverage.</str>
<str id="warning_missing_DC.Rights">You did not supply a rights holder.</str>
<!-- results page--> <!-- results page-->
<str id="results_for_query">results for query</str> <str id="results_for_query">results for query</str>
@ -65,7 +68,19 @@
<!-- upload page --> <!-- upload page -->
<str id="file">file</str> <str id="file">file</str>
<str id="button_next_page">next page</str>
<str id="button_upload">upload</str> <str id="button_upload">upload</str>
<str id="instruction_file">Specify the file you want to upload.</str>
<str id="instruction_title">State the title of the video.</str>
<str id="instruction_creator">Specify the creator of the video.</str>
<str id="instruction_subject">State the overall subject of the video.</str>
<str id="instruction_description">Describe the video in natural language.</str>
<str id="instruction_source">Specify the source, preferably by URL.</str>
<str id="instruction_language">State the language of the video.</str>
<str id="instruction_coverage">Specify the time and location covered.</str>
<str id="this_is_page_1">(This is page 1 of 3.)</str>
<str id="this_is_page_2">(This is page 2 of 3.)</str>
<str id="this_is_page_2">(This is page 3 of 3.)</str>
<!-- video page --> <!-- video page -->
<str id="download_video">download video</str> <str id="download_video">download video</str>

13
trunk/style/gnutube.css
View file

@ -89,13 +89,9 @@ div
div.loginform, div.registerform, div.uploadform div.loginform, div.registerform, div.uploadform
{ {
padding: 1.5em; line-height: 2.5em;
text-align: center;
}
div.loginform form, div.registerform form, div.uploadform form
{
margin: 1.5em; margin: 1.5em;
text-align: center;
} }
div.logo-big div.logo-big
@ -226,3 +222,8 @@ hr
position: relative; position: relative;
top: 0.25em; top: 0.25em;
} }
span.protip
{
color: #606060;
}

13
trunk/upload-1.xml Normal file
View file

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<?xml-stylesheet type="text/xsl" href="./xsl/xhtml.xsl" ?>
<page
locale="en-US"
stylesheet="./style/gnutube.css"
username="pedobear@myopenid.net"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://web.resource.org/cc/"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
>
<uploadform page="1" />
</page>

14
trunk/upload-2.xml Normal file
View file

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<?xml-stylesheet type="text/xsl" href="./xsl/xhtml.xsl" ?>
<page
locale="en-US"
stylesheet="./style/gnutube.css"
username="pedobear@myopenid.net"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://web.resource.org/cc/"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
>
<message type="information" text="information_metainformation_needed" />
<uploadform page="2" />
</page>

85
trunk/xsl/xhtml.xsl
View file

@ -487,21 +487,6 @@
</tr> </tr>
</table> </table>
<form method="post" action="video.pl">
<fieldset>
<input name="id" type="hidden">
<xsl:attribute name="value">
<xsl:value-of select="rdf:RDF/cc:Work/dc:identifier" />
</xsl:attribute>
</input>
Leave Comment:
<br />
<textarea name="comment" cols="50" rows="5"></textarea>
<br />
<input type="submit" name="send" />
</fieldset>
</form>
<table class="videometadata"> <table class="videometadata">
<xsl:for-each select="/page/comments/comment"> <xsl:for-each select="/page/comments/comment">
<tr> <tr>
@ -515,6 +500,23 @@
</xsl:for-each> </xsl:for-each>
</table> </table>
<div class="">
<form method="post" action="video.pl">
<fieldset>
<input name="id" type="hidden">
<xsl:attribute name="value">
<xsl:value-of select="rdf:RDF/cc:Work/dc:identifier" />
</xsl:attribute>
</input>
<xsl:value-of select="$locale_strings/str[@id='DC.Date']" />
<br />
<textarea name="comment" cols="50" rows="5"></textarea>
<br />
<input type="submit" name="send" />
</fieldset>
</form>
</div>
</xsl:template> </xsl:template>
<xsl:template match="registerform"> <xsl:template match="registerform">
@ -595,52 +597,79 @@
<xsl:template match="uploadform"> <xsl:template match="uploadform">
<div class="uploadform"> <div class="uploadform">
<xsl:choose>
<xsl:when test="@page=1">
<form method="post" enctype="multipart/form-data"> <form method="post" enctype="multipart/form-data">
<xsl:attribute name="action"> <xsl:attribute name="action">
<xsl:value-of select="$site_strings/str[@id='page_uploader']" /> <xsl:value-of select="$site_strings/str[@id='page_uploader']" />
</xsl:attribute> </xsl:attribute>
<fieldset> <fieldset>
<xsl:value-of select="$locale_strings/str[@id='file']" />: <xsl:value-of select="$locale_strings/str[@id='instruction_file']" />
<br /> <br />
<input name="file" type="file" size="13" /> <input name="file" type="file" size="13" />
<br /> <br />
<xsl:value-of select="$locale_strings/str[@id='DC.Title']" />: <xsl:value-of select="$locale_strings/str[@id='instruction_title']" />
<br /> <br />
<input name="DC.Title" type="text" size="30" /> <input name="DC.Title" type="text" size="30" />
<br /> <br />
<xsl:value-of select="$locale_strings/str[@id='DC.Creator']" />: <xsl:value-of select="$locale_strings/str[@id='instruction_description']" />
<br />
<input name="DC.Description" type="text" size="30" />
<br /><br />
<input type="submit" name="page2" >
<xsl:attribute name="value">
<xsl:value-of select="$locale_strings/str[@id='button_next_page']" />
</xsl:attribute>
</input>
<br />
<span class="protip">
<xsl:value-of select="$locale_strings/str[@id='this_is_page_1']" />
</span>
</fieldset>
</form>
</xsl:when>
<xsl:when test="@page=2">
<form method="post" enctype="multipart/form-data">
<xsl:attribute name="action">
<xsl:value-of select="$site_strings/str[@id='page_uploader']" />
</xsl:attribute>
<fieldset>
<xsl:value-of select="$locale_strings/str[@id='instruction_creator']" />
<br /> <br />
<input name="DC.Creator" type="text" size="30" /> <input name="DC.Creator" type="text" size="30" />
<br /> <br />
<xsl:value-of select="$locale_strings/str[@id='DC.Subject']" />: <xsl:value-of select="$locale_strings/str[@id='instruction_subject']" />
<br /> <br />
<input name="DC.Subject" type="text" size="30" /> <input name="DC.Subject" type="text" size="30" />
<br /> <br />
<xsl:value-of select="$locale_strings/str[@id='DC.Description']" />: <xsl:value-of select="$locale_strings/str[@id='instruction_source']" />
<br />
<input name="DC.Description" type="text" size="30" />
<br />
<xsl:value-of select="$locale_strings/str[@id='DC.Source']" />:
<br /> <br />
<input name="DC.Source" type="text" size="30" /> <input name="DC.Source" type="text" size="30" />
<br /> <br />
<xsl:value-of select="$locale_strings/str[@id='DC.Language']" />: <xsl:value-of select="$locale_strings/str[@id='instruction_language']" />
<br /> <br />
<input name="DC.Language" type="text" size="30" /> <input name="DC.Language" type="text" size="30" />
<br /> <br />
<xsl:value-of select="$locale_strings/str[@id='DC.Coverage']" />: <xsl:value-of select="$locale_strings/str[@id='instruction_coverage']" />
<br /> <br />
<input name="DC.Coverage" type="text" size="30" /> <input name="DC.Coverage" type="text" size="30" />
<br /> <br />
<input type="submit" name="submit" > <input type="submit" name="page2" >
<xsl:attribute name="value"> <xsl:attribute name="value">
<xsl:value-of select="$locale_strings/str[@id='button_upload']" /> <xsl:value-of select="$locale_strings/str[@id='button_next_page']" />
</xsl:attribute> </xsl:attribute>
</input> </input>
<br />
<span class="protip">
<xsl:value-of select="$locale_strings/str[@id='this_is_page_2']" />
</span>
</fieldset> </fieldset>
</form> </form>
</xsl:when>
</xsl:choose>
</div> </div>
</xsl:template> </xsl:template>