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

several html + css layout changes (incomplete)

Browse source 
git-svn-id: http://yolanda.mister-muffin.de/svn@232 7eef14d0-6ed0-489d-bf55-20463b2d70db
This commit is contained in:
erlehmann 2008-02-06 07:01:45 +00:00
parent 357dcf431e
commit cc83540aa2
5 changed files with 218 additions and 120 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
trunk/images/bka.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
trunk/images/logo-small.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

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

@ -6,13 +6,13 @@
<string id="separator">&#160;|&#160;</string> <string id="separator">&#160;|&#160;</string>
<!-- header --> <!-- header -->
<string id="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="login_openid">login with OpenID</string> <string id="login_openid">login with OpenID</string>
<string id="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 details</string>
<string id="logged_in_as">logged in as&#160;</string> <string id="logged_in_as">logged in as&#160;</string>

196
trunk/style/default.css
View file

@ -1,8 +1,43 @@
/*
Yolanda default stylesheet
(c) 2007-2008 Nils Dagsson Moskopp
*/
/* global default */
* *
{ {
clear: both; clear: both;
} }
body
{
font-family: sans-serif;
font-size: 8pt;
font-weight: bold;
margin: 1.5em;
min-height: 100%;
text-align: center;
}
div
{
border-width: 0px;
}
input
{
text-align: left;
}
img
{
border-width: 0;
}
/* links */
a a
{ {
color: #3f3fff; color: #3f3fff;
@ -26,20 +61,101 @@ a
margin-right: 0.25em; margin-right: 0.25em;
} }
body /* header, footer */
{
font-family: sans-serif; a.footer,
font-size: 8pt; a.header,
font-weight: bold; div.footer,
min-width: 550px; div.header
margin: 2em; {
text-align: center; background-color: #f0f0f0;
} border-color: #f0f0f0;
border-style: solid;
clear: none;
font-size: 1em;
line-height: 3em;
height: 3em;
}
a.footer,
a.header
{
border-bottom-width: 0px;
border-top-width: 0px;
border-left-width: 1px;
border-right-width: 1px;
display: block;
padding-left: 1em;
padding-right: 1em;
}
a.footer:hover,
a.header:hover
{
background-color: #ffffff;
border-color: #c0c0c0;
}
a.latest-additions,
a.view-license
{
border-left-width: 0px;
}
a.register,
a.upload-video,
a.view-xml
{
border-right-width: 0px;
}
a.latest-additions,
a.most-downloads,
a.most-views,
a.report-bug,
a.view-license,
a.view-source-code
{
float: left;
}
a.login,
a.login-openid,
a.logout,
a.preferences,
a.register,
a.upload-video,
a.view-xml
{
float: right;
}
div.footer,
div.header
{
border-color: #c0c0c0;
border-width: 1px;
}
div.footer
{
position: absolute;
bottom: 1.5em;
margin-right: 1.5em;
}
img.logo-header
{
display: none;
border: 1px black solid;
clear: none;
float: left;
margin-left: 1.5em;
margin-right: 0.5em;
}
/* content */
div
{
border-width: 0px;
}
div.button-download, div.button-download,
div.button-edit, div.button-edit,
@ -81,30 +197,6 @@ div
{ {
} }
div.footer
{
line-height: 2.5em;
padding: 0.75em;
}
div.header1
{
color: #525252;
float: left;
text-align: left;
width: 50%;
vertical-align: bottom;
}
div.header2
{
clear: none;
float: right;
text-align: right;
width: 50%;
vertical-align: bottom;
}
div.messagebox div.messagebox
{ {
border-color: #606060; border-color: #606060;
@ -226,41 +318,11 @@ fieldset
border-width: 0px; border-width: 0px;
} }
hr
{
background-color: #c0c0c0;
position: relative;
top: 0.25em;
margin-bottom: 1.5em;
}
input
{
text-align: left;
}
img
{
border-width: 0;
}
img.bka
{
bottom: 0px;
left: 0px;
position: fixed;
z-index: 1;
}
img.logo-big img.logo-big
{ {
padding-bottom: 0.5em; padding-bottom: 0.5em;
} }
img.logo-small
{
}
img.openid-icon img.openid-icon
{ {
padding-left: 0.2em; padding-left: 0.2em;

138
trunk/xsl/xhtml.xsl
View file

@ -147,81 +147,110 @@
</head> </head>
<body> <body>
<!-- crime detection -->
<img class="bka" src="/images/bka.png" />
<xsl:if test="not(//@embed='true')"> <xsl:if test="not(//@embed='true')">
<xsl:choose>
<xsl:when test="string-length(//@username)=0"> <!--
<div class="header1"> <a href="/">
<a> <img class="logo-header" src="/images/logo-small.png" alt="Yolanda logo top (160x25)" />
</a>
-->
<div class="header">
<a class="header latest-additions">
<xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='page_query_latestadditions']" />
</xsl:attribute>
<xsl:value-of select="$locale_strings[@id='query_latestadditions']" />
</a>
<a class="header most-views">
<xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='page_query_mostviews']" />
</xsl:attribute>
<xsl:value-of select="$locale_strings[@id='query_mostviews']" />
</a>
<a class="header most-downloads">
<xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='page_query_mostdownloads']" />
</xsl:attribute>
<xsl:value-of select="$locale_strings[@id='query_mostdownloads']" />
</a>
<xsl:choose>
<xsl:when test="string-length(//@username)=0">
<!--
<a class="header">
<xsl:attribute name="href"> <xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='page_login']" /> <xsl:value-of select="$site_strings[@id='page_login']" />
</xsl:attribute> </xsl:attribute>
<xsl:value-of select="$locale_strings[@id='login_to_upload']" /> <xsl:value-of select="$locale_strings[@id='header_login-to-upload']" />
</a> </a>
</div> -->
<div class="header2"> <a class="header register">
<a>
<xsl:attribute name="href"> <xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='page_register']" /> <xsl:value-of select="$site_strings[@id='page_register']" />
</xsl:attribute> </xsl:attribute>
<xsl:value-of select="$locale_strings[@id='register']" /> <xsl:value-of select="$locale_strings[@id='register']" />
</a> </a>
<xsl:value-of select="$locale_strings[@id='separator']" />
<a> <a class="header login">
<xsl:attribute name="href"> <xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='page_login']" /> <xsl:value-of select="$site_strings[@id='page_login']" />
</xsl:attribute> </xsl:attribute>
<xsl:value-of select="$locale_strings[@id='login']" /> <xsl:value-of select="$locale_strings[@id='login']" />
</a> </a>
<xsl:value-of select="$locale_strings[@id='separator']" />
<img class="openid-icon" src="/images/openid-icon.png" alt="open id logo" /> <a class="header login-openid">
<a>
<xsl:attribute name="href"> <xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='page_login-openid']" /> <xsl:value-of select="$site_strings[@id='page_login-openid']" />
</xsl:attribute> </xsl:attribute>
<img class="openid-icon" src="/images/openid-icon.png" alt="open id logo" />
<xsl:value-of select="$locale_strings[@id='login_openid']" /> <xsl:value-of select="$locale_strings[@id='login_openid']" />
</a> </a>
</div>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<div class="header1">
<a> <a class="header upload-video">
<xsl:attribute name="href"> <xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='page_upload']" /> <xsl:value-of select="$site_strings[@id='page_upload']" />
</xsl:attribute> </xsl:attribute>
<xsl:value-of select="$locale_strings[@id='upload_video']" /> <xsl:value-of select="$locale_strings[@id='header_upload-video']" />
</a> </a>
<xsl:value-of select="$locale_strings[@id='separator']" />
<a> <a class="header preferences">
<xsl:attribute name="href"> <xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='page_settings']" /> <xsl:value-of select="$site_strings[@id='page_settings']" />
</xsl:attribute> </xsl:attribute>
<xsl:value-of select="$locale_strings[@id='settings_details']" /> <xsl:value-of select="$locale_strings[@id='settings_details']" />
</a> </a>
</div>
<div class="header2"> <!--
<xsl:value-of select="$locale_strings[@id='logged_in_as']" /> <xsl:value-of select="$locale_strings[@id='logged_in_as']" />
<a>
<a class="header">
<xsl:attribute name="href"> <xsl:attribute name="href">
user/<xsl:value-of select="//@username" /> user/<xsl:value-of select="//@username" />
</xsl:attribute> </xsl:attribute>
<xsl:value-of select="//@username" /> <xsl:value-of select="//@username" />
</a> </a>
<xsl:value-of select="$locale_strings[@id='separator']" /> -->
<a>
<a class="header logout">
<xsl:attribute name="href"> <xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='page_logout']" /> <xsl:value-of select="$site_strings[@id='page_logout']" />
</xsl:attribute> </xsl:attribute>
<xsl:value-of select="$locale_strings[@id='logout']" /> <xsl:value-of select="$locale_strings[@id='logout']" />
</a> </a>
</div>
</xsl:otherwise>
</xsl:choose>
<hr /> </xsl:otherwise>
</xsl:choose>
</div>
<xsl:if test="//message"> <xsl:if test="//message">
<xsl:call-template name="message"/> <xsl:call-template name="message"/>
@ -236,7 +265,7 @@
</xsl:if> </xsl:if>
</xsl:if> </xsl:if>
<xsl:choose> <xsl:choose>
<xsl:when test="//frontpage"> <xsl:when test="//frontpage">
<xsl:call-template name="frontpage"/> <xsl:call-template name="frontpage"/>
@ -265,29 +294,31 @@
</xsl:choose> </xsl:choose>
<xsl:if test="not(//@embed='true')"> <xsl:if test="not(//@embed='true')">
<div class="footer"> <div class="footer">
<a>
<a class="footer view-license">
<xsl:attribute name="href"> <xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='page_license']" /> <xsl:value-of select="$site_strings[@id='page_license']" />
</xsl:attribute> </xsl:attribute>
<xsl:value-of select="$locale_strings[@id='footer_license']" /> <xsl:value-of select="$locale_strings[@id='footer_license']" />
</a> </a>
<xsl:value-of select="$locale_strings[@id='separator']" />
<a> <a class="footer view-source-code">
<xsl:attribute name="href"> <xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='page_source-code']" /> <xsl:value-of select="$site_strings[@id='page_source-code']" />
</xsl:attribute> </xsl:attribute>
<xsl:value-of select="$locale_strings[@id='footer_source_code']" /> <xsl:value-of select="$locale_strings[@id='footer_source_code']" />
</a> </a>
<xsl:value-of select="$locale_strings[@id='separator']" />
<a> <a class="footer report-bug">
<xsl:attribute name="href"> <xsl:attribute name="href">
<xsl:value-of select="$site_strings[@id='page_report_bug']" /> <xsl:value-of select="$site_strings[@id='page_report_bug']" />
</xsl:attribute> </xsl:attribute>
<xsl:value-of select="$locale_strings[@id='footer_report_bug']" /> <xsl:value-of select="$locale_strings[@id='footer_report_bug']" />
</a> </a>
<xsl:value-of select="$locale_strings[@id='separator']" />
<a> <a class="footer view-xml">
<xsl:attribute name="href"> <xsl:attribute name="href">
<!-- <!--
caveat: this currently does not work on root level caveat: this currently does not work on root level
@ -297,15 +328,20 @@
</xsl:attribute> </xsl:attribute>
<xsl:value-of select="$locale_strings[@id='footer_view_xml']" /> <xsl:value-of select="$locale_strings[@id='footer_view_xml']" />
</a> </a>
<br />
<xsl:value-of select="$locale_strings[@id='footer_copyright']" />
<br />
<span class="protip">
<xsl:value-of select="$locale_strings[@id='footer_warranty']" />
</span>
</div> </div>
<!--
<br />
<xsl:value-of select="$locale_strings[@id='footer_copyright']" />
-->
<br />
<span class="protip">
<xsl:value-of select="$locale_strings[@id='footer_warranty']" />
</span>
</xsl:if> </xsl:if>
</body> </body>
@ -315,9 +351,9 @@
<xsl:template name="logo-small"> <xsl:template name="logo-small">
<a href="/"> <!-- <a href="/">
<img class="logo-small" src="/images/logo-small.png" alt="Yolanda logo top (160x25)" /> <img class="logo-small" src="/images/logo-small.png" alt="Yolanda logo top (160x25)" />
</a> </a>-->
</xsl:template> </xsl:template>