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

fixin josch's retarded use of <h1>, <div> and other html elements

Browse source 
git-svn-id: http://yolanda.mister-muffin.de/svn@217 7eef14d0-6ed0-489d-bf55-20463b2d70db
This commit is contained in:
erlehmann 2007-12-20 17:08:11 +00:00
parent e870bcc211
commit 751ed83d13
4 changed files with 168 additions and 156 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
trunk/locale/en-us.xml
View file

@ -178,9 +178,10 @@
<string id="viewcount">viewcount</string> <string id="viewcount">viewcount</string>
<!-- settings page --> <!-- settings page -->
<string id="settings_locale">locale</string> <string id="settings_heading">account settings</string>
<string id="settings_pagesize">pagesize</string> <string id="settings_instruction_locale">locale</string>
<string id="settings_cortado">cortado</string> <string id="settings_instruction_pagesize">choose pagesize</string>
<string id="settings_instruction_method">choose your preferred method of video playback.</string>
<!-- rss feed --> <!-- rss feed -->
<string id="rss_separator">&#160;-&#160;</string> <string id="rss_separator">&#160;-&#160;</string>

2
trunk/style/default.css
View file

@ -91,7 +91,7 @@ div
vertical-align: bottom; vertical-align: bottom;
} }
div.loginform, div.registerform, div.uploadform div.loginform, div.registerform, div.uploadform, div.settingsform
{ {
line-height: 2.5em; line-height: 2.5em;
margin: 1.5em; margin: 1.5em;

115
trunk/xsl/xhtml/settings.xsl
View file

@ -8,16 +8,23 @@
> >
<xsl:template name="settings"> <xsl:template name="settings">
<h2><xsl:value-of select="$locale_strings[@id='settings_settings']" /></h2>
<form method="POST"> <div class="settingsform">
<xsl:attribute name="action">
<xsl:value-of select="$site_strings[@id='page_settings']" /> <span class="heading">
</xsl:attribute> <xsl:value-of select="$locale_strings[@id='settings_heading']" />
<input type="hidden" name="show" value="settings" /> </span>
<div>
<h3><xsl:value-of select="$locale_strings[@id='settings_locale']" /></h3> <form method="POST">
<xsl:attribute name="action">
<xsl:value-of select="$site_strings[@id='page_settings']" />
</xsl:attribute>
<xsl:value-of select="$locale_strings[@id='settings_instruction_locale']" />
<br /> <br />
<select name="locale" size="2"> <select name="locale" size="2">
<option value="en-us"> <option value="en-us">
<xsl:if test="//settings/@locale='en-us'"> <xsl:if test="//settings/@locale='en-us'">
<xsl:attribute name="selected"> <xsl:attribute name="selected">
@ -26,6 +33,7 @@
</xsl:if> </xsl:if>
<xsl:value-of select="$locale_strings[@id='language_en-us']" /> <xsl:value-of select="$locale_strings[@id='language_en-us']" />
</option> </option>
<option value="de-de"> <option value="de-de">
<xsl:if test="//settings/@locale='de-de'"> <xsl:if test="//settings/@locale='de-de'">
<xsl:attribute name="selected"> <xsl:attribute name="selected">
@ -34,72 +42,23 @@
</xsl:if> </xsl:if>
<xsl:value-of select="$locale_strings[@id='language_de-de']" /> <xsl:value-of select="$locale_strings[@id='language_de-de']" />
</option> </option>
</select> </select>
</div>
<div>
<h3><xsl:value-of select="$locale_strings[@id='settings_pagesize']" /></h3>
<br /> <br />
<select name="pagesize" size="7">
<option> <xsl:value-of select="$locale_strings[@id='settings_instruction_pagesize']" />
<xsl:if test="//settings/@pagesize=1"> <br />
<xsl:attribute name="selected">
selected <input name="pagesize" type="text" size="7">
</xsl:attribute> <xsl:attribute name="value">
</xsl:if> <xsl:value-of select="//settings/@pagesize" />
1 </xsl:attribute>
</option> </input>
<option> <br />
<xsl:if test="//settings/@pagesize=2">
<xsl:attribute name="selected"> <xsl:value-of select="$locale_strings[@id='settings_instruction_method']" />
selected <br />
</xsl:attribute>
</xsl:if>
2
</option>
<option>
<xsl:if test="//settings/@pagesize=5">
<xsl:attribute name="selected">
selected
</xsl:attribute>
</xsl:if>
5
</option>
<option>
<xsl:if test="//settings/@pagesize=10">
<xsl:attribute name="selected">
selected
</xsl:attribute>
</xsl:if>
10
</option>
<option>
<xsl:if test="//settings/@pagesize=20">
<xsl:attribute name="selected">
selected
</xsl:attribute>
</xsl:if>
20
</option>
<option>
<xsl:if test="//settings/@pagesize=50">
<xsl:attribute name="selected">
selected
</xsl:attribute>
</xsl:if>
50
</option>
<option>
<xsl:if test="//settings/@pagesize=100">
<xsl:attribute name="selected">
selected
</xsl:attribute>
</xsl:if>
100
</option>
</select>
</div>
<div>
<h3><xsl:value-of select="$locale_strings[@id='settings_cortado']" /></h3>
<input type="radio" name="cortado" value="1"> <input type="radio" name="cortado" value="1">
<xsl:if test="//settings/@cortado=1"> <xsl:if test="//settings/@cortado=1">
<xsl:attribute name="checked"> <xsl:attribute name="checked">
@ -107,6 +66,7 @@
</xsl:attribute> </xsl:attribute>
</xsl:if> </xsl:if>
</input> </input>
<xsl:value-of select="$locale_strings[@id='watch_cortadoapplet']" /> <xsl:value-of select="$locale_strings[@id='watch_cortadoapplet']" />
<br /> <br />
<input type="radio" name="cortado" value="0"> <input type="radio" name="cortado" value="0">
@ -116,12 +76,15 @@
</xsl:attribute> </xsl:attribute>
</xsl:if> </xsl:if>
</input> </input>
<xsl:value-of select="$locale_strings[@id='watch_browserplugin']" /> <xsl:value-of select="$locale_strings[@id='watch_browserplugin']" />
</div> <br />
<div>
<input name="submit" type="submit" /> <input name="submit" type="submit" />
</div>
</form> </form>
</div>
</xsl:template> </xsl:template>
</xsl:stylesheet> </xsl:stylesheet>

196
trunk/xsl/xhtml/upload.xsl
View file

@ -8,218 +8,266 @@
> >
<xsl:template name="uploadform"> <xsl:template name="uploadform">
<div class="uploadform"> <div class="uploadform">
<xsl:choose> <xsl:choose>
<xsl:when test="//uploadform/@page=1"> <xsl:when test="//uploadform/@page=1">
<span class="heading"> <span class="heading">
<xsl:value-of select="$locale_strings[@id='title_page_1']" /> <xsl:value-of select="$locale_strings[@id='title_page_1']" />
</span> </span>
<br /> <br />
<span class="instruction"> <span class="instruction">
<xsl:value-of select="$locale_strings[@id='instruction_page_1']" /> <xsl:value-of select="$locale_strings[@id='instruction_page_1']" />
</span> </span>
<br />
<form method="post"> <form method="post">
<xsl:attribute name="action"> <xsl:attribute name="action">
<xsl:value-of select="$site_strings[@id='page_upload']" /> <xsl:value-of select="$site_strings[@id='page_upload']" />
</xsl:attribute> </xsl:attribute>
<input name="DC.Creator" type="hidden"> <input name="DC.Creator" type="hidden">
<xsl:attribute name="value"> <xsl:attribute name="value">
<xsl:value-of select="//uploadform/@DC.Creator" /> <xsl:value-of select="//uploadform/@DC.Creator" />
</xsl:attribute> </xsl:attribute>
</input> </input>
<input name="DC.Source" type="hidden"> <input name="DC.Source" type="hidden">
<xsl:attribute name="value"> <xsl:attribute name="value">
<xsl:value-of select="//uploadform/@DC.Source" /> <xsl:value-of select="//uploadform/@DC.Source" />
</xsl:attribute> </xsl:attribute>
</input> </input>
<input name="DC.Language" type="hidden"> <input name="DC.Language" type="hidden">
<xsl:attribute name="value"> <xsl:attribute name="value">
<xsl:value-of select="//uploadform/@DC.Language" /> <xsl:value-of select="//uploadform/@DC.Language" />
</xsl:attribute> </xsl:attribute>
</input> </input>
<input name="DC.Coverage" type="hidden"> <input name="DC.Coverage" type="hidden">
<xsl:attribute name="value"> <xsl:attribute name="value">
<xsl:value-of select="//uploadform/@DC.Coverage" /> <xsl:value-of select="//uploadform/@DC.Coverage" />
</xsl:attribute> </xsl:attribute>
</input> </input>
<fieldset> <fieldset>
<div>
<xsl:value-of select="$locale_strings[@id='instruction_title']" /> <xsl:value-of select="$locale_strings[@id='instruction_title']" />
<br /> <br />
<input name="DC.Title" type="text" size="30">
<xsl:attribute name="value"> <input name="DC.Title" type="text" size="30">
<xsl:value-of select="//uploadform/@DC.Title" /> <xsl:attribute name="value">
</xsl:attribute> <xsl:value-of select="//uploadform/@DC.Title" />
</input> </xsl:attribute>
</div> </input>
<div> <br />
<xsl:value-of select="$locale_strings[@id='instruction_subject']" />
<br /> <xsl:value-of select="$locale_strings[@id='instruction_subject']" />
<input name="DC.Subject" type="text" size="30"> <br />
<xsl:attribute name="value">
<xsl:value-of select="//uploadform/@DC.Subject" /> <input name="DC.Subject" type="text" size="30">
</xsl:attribute> <xsl:attribute name="value">
</input> <xsl:value-of select="//uploadform/@DC.Subject" />
</div> </xsl:attribute>
<div> </input>
<xsl:value-of select="$locale_strings[@id='instruction_description']" /> <br />
<br />
<textarea name="DC.Description" cols="60" rows="2"> <xsl:value-of select="$locale_strings[@id='instruction_description']" />
<xsl:value-of select="//uploadform/@DC.Description" /> <br />
</textarea>
</div> <textarea name="DC.Description" cols="60" rows="2">
<xsl:value-of select="//uploadform/@DC.Description" />
</textarea>
<br />
<input type="submit" name="2"> <input type="submit" name="2">
<xsl:attribute name="value"> <xsl:attribute name="value">
<xsl:value-of select="$locale_strings[@id='button_next_page']" /> <xsl:value-of select="$locale_strings[@id='button_next_page']" />
</xsl:attribute> </xsl:attribute>
</input> </input>
<br /> <br />
<span class="protip"> <span class="protip">
<xsl:value-of select="$locale_strings[@id='this_is_page_1']" /> <xsl:value-of select="$locale_strings[@id='this_is_page_1']" />
</span> </span>
</fieldset> </fieldset>
</form> </form>
</xsl:when> </xsl:when>
<xsl:when test="//uploadform/@page=2"> <xsl:when test="//uploadform/@page=2">
<span class="heading"> <span class="heading">
<xsl:value-of select="$locale_strings[@id='title_page_2']" /> <xsl:value-of select="$locale_strings[@id='title_page_2']" />
</span> </span>
<br /> <br />
<span class="instruction"> <span class="instruction">
<xsl:value-of select="$locale_strings[@id='instruction_page_2']" /> <xsl:value-of select="$locale_strings[@id='instruction_page_2']" />
</span> </span>
<form method="post"> <form method="post">
<xsl:attribute name="action"> <xsl:attribute name="action">
<xsl:value-of select="$site_strings[@id='page_upload']" /> <xsl:value-of select="$site_strings[@id='page_upload']" />
</xsl:attribute> </xsl:attribute>
<input name="DC.Title" type="hidden"> <input name="DC.Title" type="hidden">
<xsl:attribute name="value"> <xsl:attribute name="value">
<xsl:value-of select="//uploadform/@DC.Title" /> <xsl:value-of select="//uploadform/@DC.Title" />
</xsl:attribute> </xsl:attribute>
</input> </input>
<input name="DC.Subject" type="hidden"> <input name="DC.Subject" type="hidden">
<xsl:attribute name="value"> <xsl:attribute name="value">
<xsl:value-of select="//uploadform/@DC.Subject" /> <xsl:value-of select="//uploadform/@DC.Subject" />
</xsl:attribute> </xsl:attribute>
</input> </input>
<input name="DC.Description" type="hidden"> <input name="DC.Description" type="hidden">
<xsl:attribute name="value"> <xsl:attribute name="value">
<xsl:value-of select="//uploadform/@DC.Description" /> <xsl:value-of select="//uploadform/@DC.Description" />
</xsl:attribute> </xsl:attribute>
</input> </input>
<input name="DC.Creator" type="hidden"> <input name="DC.Creator" type="hidden">
<xsl:attribute name="value"> <xsl:attribute name="value">
<xsl:value-of select="//uploadform/@DC.Creator" /> <xsl:value-of select="//uploadform/@DC.Creator" />
</xsl:attribute> </xsl:attribute>
</input> </input>
<input name="DC.Source" type="hidden"> <input name="DC.Source" type="hidden">
<xsl:attribute name="value"> <xsl:attribute name="value">
<xsl:value-of select="//uploadform/@DC.Source" /> <xsl:value-of select="//uploadform/@DC.Source" />
</xsl:attribute> </xsl:attribute>
</input> </input>
<input name="DC.Language" type="hidden"> <input name="DC.Language" type="hidden">
<xsl:attribute name="value"> <xsl:attribute name="value">
<xsl:value-of select="//uploadform/@DC.Language" /> <xsl:value-of select="//uploadform/@DC.Language" />
</xsl:attribute> </xsl:attribute>
</input> </input>
<input name="DC.Coverage" type="hidden"> <input name="DC.Coverage" type="hidden">
<xsl:attribute name="value"> <xsl:attribute name="value">
<xsl:value-of select="//uploadform/@DC.Coverage" /> <xsl:value-of select="//uploadform/@DC.Coverage" />
</xsl:attribute> </xsl:attribute>
</input> </input>
<fieldset> <fieldset>
<input type="submit" name="3"> <input type="submit" name="3">
<xsl:attribute name="value"> <xsl:attribute name="value">
<xsl:value-of select="$locale_strings[@id='button_next_page']" /> <xsl:value-of select="$locale_strings[@id='button_next_page']" />
</xsl:attribute> </xsl:attribute>
</input> </input>
<br /> <br />
<span class="protip"> <span class="protip">
<xsl:value-of select="$locale_strings[@id='this_is_page_2']" /> <xsl:value-of select="$locale_strings[@id='this_is_page_2']" />
</span> </span>
</fieldset> </fieldset>
</form> </form>
<xsl:call-template name="innerresults"/> <xsl:call-template name="innerresults"/>
</xsl:when> </xsl:when>
<xsl:when test="//uploadform/@page=3"> <xsl:when test="//uploadform/@page=3">
<span class="heading"> <span class="heading">
<xsl:value-of select="$locale_strings[@id='title_page_3']" /> <xsl:value-of select="$locale_strings[@id='title_page_3']" />
</span> </span>
<br /> <br />
<span class="instruction"> <span class="instruction">
<xsl:value-of select="$locale_strings[@id='instruction_page_3']" /> <xsl:value-of select="$locale_strings[@id='instruction_page_3']" />
</span> </span>
<form method="post"> <form method="post">
<xsl:attribute name="action"> <xsl:attribute name="action">
<xsl:value-of select="$site_strings[@id='page_upload']" /> <xsl:value-of select="$site_strings[@id='page_upload']" />
</xsl:attribute> </xsl:attribute>
<input name="DC.Title" type="hidden"> <input name="DC.Title" type="hidden">
<xsl:attribute name="value"> <xsl:attribute name="value">
<xsl:value-of select="//uploadform/@DC.Title" /> <xsl:value-of select="//uploadform/@DC.Title" />
</xsl:attribute> </xsl:attribute>
</input> </input>
<input name="DC.Subject" type="hidden"> <input name="DC.Subject" type="hidden">
<xsl:attribute name="value"> <xsl:attribute name="value">
<xsl:value-of select="//uploadform/@DC.Subject" /> <xsl:value-of select="//uploadform/@DC.Subject" />
</xsl:attribute> </xsl:attribute>
</input> </input>
<input name="DC.Description" type="hidden"> <input name="DC.Description" type="hidden">
<xsl:attribute name="value"> <xsl:attribute name="value">
<xsl:value-of select="//uploadform/@DC.Description" /> <xsl:value-of select="//uploadform/@DC.Description" />
</xsl:attribute> </xsl:attribute>
</input> </input>
<fieldset> <fieldset>
<div>
<xsl:value-of select="$locale_strings[@id='instruction_creator']" /> <xsl:value-of select="$locale_strings[@id='instruction_creator']" />
<br /> <br />
<input name="DC.Creator" type="text" size="30">
<xsl:attribute name="value"> <input name="DC.Creator" type="text" size="30">
<xsl:value-of select="//uploadform/@DC.Creator" /> <xsl:attribute name="value">
</xsl:attribute> <xsl:value-of select="//uploadform/@DC.Creator" />
</input> </xsl:attribute>
</div> </input>
<div> <br />
<xsl:value-of select="$locale_strings[@id='instruction_source']" />
<br /> <xsl:value-of select="$locale_strings[@id='instruction_source']" />
<input name="DC.Source" type="text" size="30"> <br />
<xsl:attribute name="value">
<xsl:value-of select="//uploadform/@DC.Source" /> <input name="DC.Source" type="text" size="30">
</xsl:attribute> <xsl:attribute name="value">
</input> <xsl:value-of select="//uploadform/@DC.Source" />
</div> </xsl:attribute>
<div> </input>
<xsl:value-of select="$locale_strings[@id='instruction_language']" /> <br />
<br />
<select name="DC.Language" size="2"> <xsl:value-of select="$locale_strings[@id='instruction_language']" />
<option> <br />
<xsl:if test="//uploadform/@DC.Language=$locale_strings[@id='language_en-us']">
<xsl:attribute name="selected"> <select name="DC.Language" size="2">
selected <option>
</xsl:attribute> <xsl:if test="//uploadform/@DC.Language=$locale_strings[@id='language_en-us']">
</xsl:if> <xsl:attribute name="selected">
<xsl:value-of select="$locale_strings[@id='language_en-us']" /> selected
</option> </xsl:attribute>
<option> </xsl:if>
<xsl:if test="//uploadform/@DC.Language=$locale_strings[@id='language_de-de']"> <xsl:value-of select="$locale_strings[@id='language_en-us']" />
<xsl:attribute name="selected"> </option>
selected <option>
</xsl:attribute> <xsl:if test="//uploadform/@DC.Language=$locale_strings[@id='language_de-de']">
</xsl:if> <xsl:attribute name="selected">
<xsl:value-of select="$locale_strings[@id='language_de-de']" /> selected
</option> </xsl:attribute>
</select> </xsl:if>
</div> <xsl:value-of select="$locale_strings[@id='language_de-de']" />
<div> </option>
<xsl:value-of select="$locale_strings[@id='instruction_coverage']" /> </select>
<br /> <br />
<input name="DC.Coverage" type="text" size="30">
<xsl:attribute name="value"> <xsl:value-of select="$locale_strings[@id='instruction_coverage']" />
<xsl:value-of select="//uploadform/@DC.Coverage" /> <br />
</xsl:attribute>
</input> <input name="DC.Coverage" type="text" size="30">
</div> <xsl:attribute name="value">
<xsl:value-of select="//uploadform/@DC.Coverage" />
</xsl:attribute>
</input>
<br />
<input type="submit" name="4"> <input type="submit" name="4">
<xsl:attribute name="value"> <xsl:attribute name="value">
<xsl:value-of select="$locale_strings[@id='button_next_page']" /> <xsl:value-of select="$locale_strings[@id='button_next_page']" />