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

rename all account occurrences to settings

Browse source 
git-svn-id: http://yolanda.mister-muffin.de/svn@212 7eef14d0-6ed0-489d-bf55-20463b2d70db
This commit is contained in:
josch 2007-12-19 23:12:39 +00:00
parent 2c3acd9344
commit b918e1eef4
5 changed files with 128 additions and 200 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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&#160;</string> <string id="logged_in_as">logged in as&#160;</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">&#160;-&#160;</string> <string id="rss_separator">&#160;-&#160;</string>

8
trunk/settings.pl
View file

@ -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
{ {

5
trunk/site/main.xml
View file

@ -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>

17
trunk/xsl/xhtml.xsl
View file

@ -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>

63
trunk/xsl/xhtml/account.xsl
View file

@ -7,61 +7,11 @@
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>
<xsl:choose>
<xsl:when test="//account/@show='uploads'">
<xsl:value-of select="$locale_strings[@id='account_uploads']" />
</xsl:when>
<xsl:otherwise>
<a>
<xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='page_account_uploads']" />
</xsl:attribute>
<xsl:value-of select="$locale_strings[@id='account_uploads']" />
</a>
</xsl:otherwise>
</xsl:choose>
<xsl:value-of select="$locale_strings[@id='separator']" />
<xsl:choose>
<xsl:when test="//account/@show='settings'">
<xsl:value-of select="$locale_strings[@id='account_settings']" />
</xsl:when>
<xsl:otherwise>
<a>
<xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='page_account_settings']" />
</xsl:attribute>
<xsl:value-of select="$locale_strings[@id='account_settings']" />
</a>
</xsl:otherwise>
</xsl:choose>
<xsl:value-of select="$locale_strings[@id='separator']" />
<xsl:choose>
<xsl:when test="//account/@show='bookmarks'">
<xsl:value-of select="$locale_strings[@id='account_bookmarks']" />
</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> <h2><xsl:value-of select="$locale_strings[@id='account_settings']" /></h2>
<form method="POST"> <form method="POST">
<xsl:attribute name="action"> <xsl:attribute name="action">
<xsl:value-of select="$site_strings[@id='page_account_settings']" /> <xsl:value-of select="$site_strings[@id='page_account']" />
</xsl:attribute> </xsl:attribute>
<input type="hidden" name="show" value="settings" /> <input type="hidden" name="show" value="settings" />
<div> <div>
@ -172,15 +122,6 @@
<input name="submit" type="submit" /> <input name="submit" type="submit" />
</div> </div>
</form> </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>