rename all account occurrences to settings
git-svn-id: http://yolanda.mister-muffin.de/svn@212 7eef14d0-6ed0-489d-bf55-20463b2d70db
This commit is contained in:
josch
parent
2c3acd9344
commit
b918e1eef4
5 changed files with 128 additions and 200 deletions
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
<string id="upload_video">upload video</string>
|
<string id="upload_video">upload video</string>
|
||||||
<string id="bookmarks">bookmarks</string>
|
<string id="bookmarks">bookmarks</string>
|
||||||
<string id="account_details">account details</string>
|
<string id="settings_details">settings details</string>
|
||||||
|
|
||||||
<string id="logged_in_as">logged in as </string>
|
<string id="logged_in_as">logged in as </string>
|
||||||
<string id="logout">logout</string>
|
<string id="logout">logout</string>
|
||||||
|
|
@ -177,13 +177,10 @@
|
||||||
<string id="duration">duration</string>
|
<string id="duration">duration</string>
|
||||||
<string id="viewcount">viewcount</string>
|
<string id="viewcount">viewcount</string>
|
||||||
|
|
||||||
<!-- account page -->
|
<!-- settings page -->
|
||||||
<string id="account_uploads">my uploads</string>
|
<string id="settings_locale">locale</string>
|
||||||
<string id="account_settings">edit my settings</string>
|
<string id="settings_pagesize">pagesize</string>
|
||||||
<string id="account_bookmarks">my bookmarks</string>
|
<string id="settings_cortado">cortado</string>
|
||||||
<string id="account_locale">locale</string>
|
|
||||||
<string id="account_pagesize">pagesize</string>
|
|
||||||
<string id="account_cortado">cortado</string>
|
|
||||||
|
|
||||||
<!-- rss feed -->
|
<!-- rss feed -->
|
||||||
<string id="rss_separator"> - </string>
|
<string id="rss_separator"> - </string>
|
||||||
|
|
|
||||||
|
|
@ -21,10 +21,10 @@ if($userinfo->{'username'})
|
||||||
|
|
||||||
if($userinfo->{'username'})
|
if($userinfo->{'username'})
|
||||||
{
|
{
|
||||||
$page->{'account'}->{'show'} = 'settings';
|
$page->{'settings'}->{'show'} = 'settings';
|
||||||
$page->{'account'}->{'locale'} = $userinfo->{'locale'};
|
$page->{'settings'}->{'locale'} = $userinfo->{'locale'};
|
||||||
$page->{'account'}->{'pagesize'} = $userinfo->{'pagesize'};
|
$page->{'settings'}->{'pagesize'} = $userinfo->{'pagesize'};
|
||||||
$page->{'account'}->{'cortado'} = $userinfo->{'cortado'}
|
$page->{'settings'}->{'cortado'} = $userinfo->{'cortado'}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -8,10 +8,7 @@
|
||||||
<string id="site_motto">WebTV free as in Speech</string>
|
<string id="site_motto">WebTV free as in Speech</string>
|
||||||
|
|
||||||
<!-- invisible -->
|
<!-- invisible -->
|
||||||
<string id="page_account">/account.pl</string>
|
<string id="page_account">/settings.pl</string>
|
||||||
<string id="page_account_settings">/account.pl?show=settings</string>
|
|
||||||
<string id="page_account_uploads">/account.pl?show=uploads</string>
|
|
||||||
<string id="page_account_bookmarks">/account.pl?show=bookmarks</string>
|
|
||||||
<string id="page_login">/login.pl</string>
|
<string id="page_login">/login.pl</string>
|
||||||
<string id="page_login-openid">/login.pl?action=openid</string>
|
<string id="page_login-openid">/login.pl?action=openid</string>
|
||||||
<string id="page_logout">/login.pl?action=logout</string>
|
<string id="page_logout">/login.pl?action=logout</string>
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@
|
||||||
<xsl:include href="./xhtml/upload.xsl"/>
|
<xsl:include href="./xhtml/upload.xsl"/>
|
||||||
<xsl:include href="./xhtml/video.xsl"/>
|
<xsl:include href="./xhtml/video.xsl"/>
|
||||||
<xsl:include href="./xhtml/register.xsl"/>
|
<xsl:include href="./xhtml/register.xsl"/>
|
||||||
<xsl:include href="./xhtml/account.xsl"/>
|
<xsl:include href="./xhtml/settings.xsl"/>
|
||||||
|
|
||||||
<xsl:variable name="locale">
|
<xsl:variable name="locale">
|
||||||
<xsl:choose>
|
<xsl:choose>
|
||||||
|
|
@ -164,16 +164,9 @@
|
||||||
<xsl:value-of select="$locale_strings[@id='separator']" />
|
<xsl:value-of select="$locale_strings[@id='separator']" />
|
||||||
<a>
|
<a>
|
||||||
<xsl:attribute name="href">
|
<xsl:attribute name="href">
|
||||||
<xsl:value-of select="$site_strings[@id='page_account_bookmarks']" />
|
<xsl:value-of select="$site_strings[@id='page_settings']" />
|
||||||
</xsl:attribute>
|
</xsl:attribute>
|
||||||
<xsl:value-of select="$locale_strings[@id='bookmarks']" />
|
<xsl:value-of select="$locale_strings[@id='settings_details']" />
|
||||||
</a>
|
|
||||||
<xsl:value-of select="$locale_strings[@id='separator']" />
|
|
||||||
<a>
|
|
||||||
<xsl:attribute name="href">
|
|
||||||
<xsl:value-of select="$site_strings[@id='page_account']" />
|
|
||||||
</xsl:attribute>
|
|
||||||
<xsl:value-of select="$locale_strings[@id='account_details']" />
|
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="header2">
|
<div class="header2">
|
||||||
|
|
@ -230,8 +223,8 @@
|
||||||
<xsl:when test="//video">
|
<xsl:when test="//video">
|
||||||
<xsl:call-template name="video"/>
|
<xsl:call-template name="video"/>
|
||||||
</xsl:when>
|
</xsl:when>
|
||||||
<xsl:when test="//account">
|
<xsl:when test="//settings">
|
||||||
<xsl:call-template name="account"/>
|
<xsl:call-template name="settings"/>
|
||||||
</xsl:when>
|
</xsl:when>
|
||||||
</xsl:choose>
|
</xsl:choose>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,180 +7,121 @@
|
||||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||||
>
|
>
|
||||||
|
|
||||||
<xsl:template name="account">
|
<xsl:template name="settings">
|
||||||
<div>
|
<h2><xsl:value-of select="$locale_strings[@id='account_settings']" /></h2>
|
||||||
<xsl:choose>
|
<form method="POST">
|
||||||
<xsl:when test="//account/@show='uploads'">
|
<xsl:attribute name="action">
|
||||||
<xsl:value-of select="$locale_strings[@id='account_uploads']" />
|
<xsl:value-of select="$site_strings[@id='page_account']" />
|
||||||
</xsl:when>
|
</xsl:attribute>
|
||||||
<xsl:otherwise>
|
<input type="hidden" name="show" value="settings" />
|
||||||
<a>
|
<div>
|
||||||
<xsl:attribute name="href">
|
<h3><xsl:value-of select="$locale_strings[@id='account_locale']" /></h3>
|
||||||
<xsl:value-of select="$site_strings[@id='page_account_uploads']" />
|
<br />
|
||||||
|
<select name="locale" size="2">
|
||||||
|
<option value="en-us">
|
||||||
|
<xsl:if test="//account/@locale='en-us'">
|
||||||
|
<xsl:attribute name="selected">
|
||||||
|
selected
|
||||||
|
</xsl:attribute>
|
||||||
|
</xsl:if>
|
||||||
|
<xsl:value-of select="$locale_strings[@id='language_en-us']" />
|
||||||
|
</option>
|
||||||
|
<option value="de-de">
|
||||||
|
<xsl:if test="//account/@locale='de-de'">
|
||||||
|
<xsl:attribute name="selected">
|
||||||
|
selected
|
||||||
|
</xsl:attribute>
|
||||||
|
</xsl:if>
|
||||||
|
<xsl:value-of select="$locale_strings[@id='language_de-de']" />
|
||||||
|
</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<h3><xsl:value-of select="$locale_strings[@id='account_pagesize']" /></h3>
|
||||||
|
<br />
|
||||||
|
<select name="pagesize" size="7">
|
||||||
|
<option>
|
||||||
|
<xsl:if test="//account/@pagesize=1">
|
||||||
|
<xsl:attribute name="selected">
|
||||||
|
selected
|
||||||
|
</xsl:attribute>
|
||||||
|
</xsl:if>
|
||||||
|
1
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<xsl:if test="//account/@pagesize=2">
|
||||||
|
<xsl:attribute name="selected">
|
||||||
|
selected
|
||||||
|
</xsl:attribute>
|
||||||
|
</xsl:if>
|
||||||
|
2
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<xsl:if test="//account/@pagesize=5">
|
||||||
|
<xsl:attribute name="selected">
|
||||||
|
selected
|
||||||
|
</xsl:attribute>
|
||||||
|
</xsl:if>
|
||||||
|
5
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<xsl:if test="//account/@pagesize=10">
|
||||||
|
<xsl:attribute name="selected">
|
||||||
|
selected
|
||||||
|
</xsl:attribute>
|
||||||
|
</xsl:if>
|
||||||
|
10
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<xsl:if test="//account/@pagesize=20">
|
||||||
|
<xsl:attribute name="selected">
|
||||||
|
selected
|
||||||
|
</xsl:attribute>
|
||||||
|
</xsl:if>
|
||||||
|
20
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<xsl:if test="//account/@pagesize=50">
|
||||||
|
<xsl:attribute name="selected">
|
||||||
|
selected
|
||||||
|
</xsl:attribute>
|
||||||
|
</xsl:if>
|
||||||
|
50
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<xsl:if test="//account/@pagesize=100">
|
||||||
|
<xsl:attribute name="selected">
|
||||||
|
selected
|
||||||
|
</xsl:attribute>
|
||||||
|
</xsl:if>
|
||||||
|
100
|
||||||
|
</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<h3><xsl:value-of select="$locale_strings[@id='account_cortado']" /></h3>
|
||||||
|
<input type="radio" name="cortado" value="1">
|
||||||
|
<xsl:if test="//account/@cortado=1">
|
||||||
|
<xsl:attribute name="checked">
|
||||||
|
checked
|
||||||
</xsl:attribute>
|
</xsl:attribute>
|
||||||
<xsl:value-of select="$locale_strings[@id='account_uploads']" />
|
</xsl:if>
|
||||||
</a>
|
</input>
|
||||||
</xsl:otherwise>
|
<xsl:value-of select="$locale_strings[@id='watch_cortadoapplet']" />
|
||||||
</xsl:choose>
|
<br />
|
||||||
<xsl:value-of select="$locale_strings[@id='separator']" />
|
<input type="radio" name="cortado" value="0">
|
||||||
<xsl:choose>
|
<xsl:if test="//account/@cortado=0">
|
||||||
<xsl:when test="//account/@show='settings'">
|
<xsl:attribute name="checked">
|
||||||
<xsl:value-of select="$locale_strings[@id='account_settings']" />
|
checked
|
||||||
</xsl:when>
|
|
||||||
<xsl:otherwise>
|
|
||||||
<a>
|
|
||||||
<xsl:attribute name="href">
|
|
||||||
<xsl:value-of select="$site_strings[@id='page_account_settings']" />
|
|
||||||
</xsl:attribute>
|
</xsl:attribute>
|
||||||
<xsl:value-of select="$locale_strings[@id='account_settings']" />
|
</xsl:if>
|
||||||
</a>
|
</input>
|
||||||
</xsl:otherwise>
|
<xsl:value-of select="$locale_strings[@id='watch_browserplugin']" />
|
||||||
</xsl:choose>
|
</div>
|
||||||
<xsl:value-of select="$locale_strings[@id='separator']" />
|
<div>
|
||||||
<xsl:choose>
|
<input name="submit" type="submit" />
|
||||||
<xsl:when test="//account/@show='bookmarks'">
|
</div>
|
||||||
<xsl:value-of select="$locale_strings[@id='account_bookmarks']" />
|
</form>
|
||||||
</xsl:when>
|
|
||||||
<xsl:otherwise>
|
|
||||||
<a>
|
|
||||||
<xsl:attribute name="href">
|
|
||||||
<xsl:value-of select="$site_strings[@id='page_account_bookmarks']" />
|
|
||||||
</xsl:attribute>
|
|
||||||
<xsl:value-of select="$locale_strings[@id='account_bookmarks']" />
|
|
||||||
</a>
|
|
||||||
</xsl:otherwise>
|
|
||||||
</xsl:choose>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<xsl:choose>
|
|
||||||
<xsl:when test="//account/@show='uploads'">
|
|
||||||
<h2><xsl:value-of select="$locale_strings[@id='account_uploads']" /></h2>
|
|
||||||
<xsl:call-template name="results"/>
|
|
||||||
</xsl:when>
|
|
||||||
<xsl:when test="//account/@show='settings'">
|
|
||||||
<h2><xsl:value-of select="$locale_strings[@id='account_settings']" /></h2>
|
|
||||||
<form method="POST">
|
|
||||||
<xsl:attribute name="action">
|
|
||||||
<xsl:value-of select="$site_strings[@id='page_account_settings']" />
|
|
||||||
</xsl:attribute>
|
|
||||||
<input type="hidden" name="show" value="settings" />
|
|
||||||
<div>
|
|
||||||
<h3><xsl:value-of select="$locale_strings[@id='account_locale']" /></h3>
|
|
||||||
<br />
|
|
||||||
<select name="locale" size="2">
|
|
||||||
<option value="en-us">
|
|
||||||
<xsl:if test="//account/@locale='en-us'">
|
|
||||||
<xsl:attribute name="selected">
|
|
||||||
selected
|
|
||||||
</xsl:attribute>
|
|
||||||
</xsl:if>
|
|
||||||
<xsl:value-of select="$locale_strings[@id='language_en-us']" />
|
|
||||||
</option>
|
|
||||||
<option value="de-de">
|
|
||||||
<xsl:if test="//account/@locale='de-de'">
|
|
||||||
<xsl:attribute name="selected">
|
|
||||||
selected
|
|
||||||
</xsl:attribute>
|
|
||||||
</xsl:if>
|
|
||||||
<xsl:value-of select="$locale_strings[@id='language_de-de']" />
|
|
||||||
</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<h3><xsl:value-of select="$locale_strings[@id='account_pagesize']" /></h3>
|
|
||||||
<br />
|
|
||||||
<select name="pagesize" size="7">
|
|
||||||
<option>
|
|
||||||
<xsl:if test="//account/@pagesize=1">
|
|
||||||
<xsl:attribute name="selected">
|
|
||||||
selected
|
|
||||||
</xsl:attribute>
|
|
||||||
</xsl:if>
|
|
||||||
1
|
|
||||||
</option>
|
|
||||||
<option>
|
|
||||||
<xsl:if test="//account/@pagesize=2">
|
|
||||||
<xsl:attribute name="selected">
|
|
||||||
selected
|
|
||||||
</xsl:attribute>
|
|
||||||
</xsl:if>
|
|
||||||
2
|
|
||||||
</option>
|
|
||||||
<option>
|
|
||||||
<xsl:if test="//account/@pagesize=5">
|
|
||||||
<xsl:attribute name="selected">
|
|
||||||
selected
|
|
||||||
</xsl:attribute>
|
|
||||||
</xsl:if>
|
|
||||||
5
|
|
||||||
</option>
|
|
||||||
<option>
|
|
||||||
<xsl:if test="//account/@pagesize=10">
|
|
||||||
<xsl:attribute name="selected">
|
|
||||||
selected
|
|
||||||
</xsl:attribute>
|
|
||||||
</xsl:if>
|
|
||||||
10
|
|
||||||
</option>
|
|
||||||
<option>
|
|
||||||
<xsl:if test="//account/@pagesize=20">
|
|
||||||
<xsl:attribute name="selected">
|
|
||||||
selected
|
|
||||||
</xsl:attribute>
|
|
||||||
</xsl:if>
|
|
||||||
20
|
|
||||||
</option>
|
|
||||||
<option>
|
|
||||||
<xsl:if test="//account/@pagesize=50">
|
|
||||||
<xsl:attribute name="selected">
|
|
||||||
selected
|
|
||||||
</xsl:attribute>
|
|
||||||
</xsl:if>
|
|
||||||
50
|
|
||||||
</option>
|
|
||||||
<option>
|
|
||||||
<xsl:if test="//account/@pagesize=100">
|
|
||||||
<xsl:attribute name="selected">
|
|
||||||
selected
|
|
||||||
</xsl:attribute>
|
|
||||||
</xsl:if>
|
|
||||||
100
|
|
||||||
</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<h3><xsl:value-of select="$locale_strings[@id='account_cortado']" /></h3>
|
|
||||||
<input type="radio" name="cortado" value="1">
|
|
||||||
<xsl:if test="//account/@cortado=1">
|
|
||||||
<xsl:attribute name="checked">
|
|
||||||
checked
|
|
||||||
</xsl:attribute>
|
|
||||||
</xsl:if>
|
|
||||||
</input>
|
|
||||||
<xsl:value-of select="$locale_strings[@id='watch_cortadoapplet']" />
|
|
||||||
<br />
|
|
||||||
<input type="radio" name="cortado" value="0">
|
|
||||||
<xsl:if test="//account/@cortado=0">
|
|
||||||
<xsl:attribute name="checked">
|
|
||||||
checked
|
|
||||||
</xsl:attribute>
|
|
||||||
</xsl:if>
|
|
||||||
</input>
|
|
||||||
<xsl:value-of select="$locale_strings[@id='watch_browserplugin']" />
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<input name="submit" type="submit" />
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
</xsl:when>
|
|
||||||
<xsl:when test="//account/@show='bookmarks'">
|
|
||||||
<h2><xsl:value-of select="$locale_strings[@id='account_bookmarks']" /></h2>
|
|
||||||
<p>coming soon...</p>
|
|
||||||
</xsl:when>
|
|
||||||
<xsl:otherwise>
|
|
||||||
<p></p>
|
|
||||||
</xsl:otherwise>
|
|
||||||
</xsl:choose>
|
|
||||||
</xsl:template>
|
</xsl:template>
|
||||||
|
|
||||||
</xsl:stylesheet>
|
</xsl:stylesheet>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue