[mb-commits] r9836 - in mb_server/branches/TemplateToolkit/catalyst/root: . main static static/images static/styles static/styles/extra
root at musicbrainz.org
root at musicbrainz.org
Tue May 13 10:37:48 UTC 2008
Author: acid2
Date: 2008-05-13 10:37:48 +0000 (Tue, 13 May 2008)
New Revision: 9836
Added:
mb_server/branches/TemplateToolkit/catalyst/root/static/images/header-bg-lightpurplefade.gif
mb_server/branches/TemplateToolkit/catalyst/root/static/images/header-bg-orangefade.gif
mb_server/branches/TemplateToolkit/catalyst/root/static/styles/
mb_server/branches/TemplateToolkit/catalyst/root/static/styles/extra/
mb_server/branches/TemplateToolkit/catalyst/root/static/styles/extra/index.css
Modified:
mb_server/branches/TemplateToolkit/catalyst/root/layout.tt
mb_server/branches/TemplateToolkit/catalyst/root/main/index.tt
mb_server/branches/TemplateToolkit/catalyst/root/static/main.css
Log:
Cosmetic changes to better reflect the current MB landing page
Modified: mb_server/branches/TemplateToolkit/catalyst/root/layout.tt
===================================================================
--- mb_server/branches/TemplateToolkit/catalyst/root/layout.tt 2008-05-13 10:14:58 UTC (rev 9835)
+++ mb_server/branches/TemplateToolkit/catalyst/root/layout.tt 2008-05-13 10:37:48 UTC (rev 9836)
@@ -1,7 +1,3 @@
-[%- DEFAULT
- title = "MusicBrainz"
--%]
-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
@@ -10,10 +6,14 @@
<meta http-equiv="expires" content="1" />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>[% title %]</title>
+ <title>[% template.title %]</title>
<link rel="stylesheet" type="text/css" href="/static/main.css" />
+ [% IF template.extra_css %]
+ <link rel="stylesheet" type="text/css" href="/static/styles/extra/[% template.extra_css %]" />
+ [% END %]
+
<link rel="search" type="application/opensearchdescription+xml" title="MusicBrainz: Artist" href="/search/plugins/opensearch/musicbrainzartist.xml" />
<link rel="search" type="application/opensearchdescription+xml" title="MusicBrainz: Label" href="/search/plugins/opensearch/musicbrainzlabel.xml" />
<link rel="search" type="application/opensearchdescription+xml" title="MusicBrainz: Release" href="/search/plugins/opensearch/musicbrainzrelease.xml" />
Modified: mb_server/branches/TemplateToolkit/catalyst/root/main/index.tt
===================================================================
--- mb_server/branches/TemplateToolkit/catalyst/root/main/index.tt 2008-05-13 10:14:58 UTC (rev 9835)
+++ mb_server/branches/TemplateToolkit/catalyst/root/main/index.tt 2008-05-13 10:37:48 UTC (rev 9836)
@@ -1,91 +1,109 @@
-[% WRAPPER "layout.tt" title="Welcome to MusicBrainz!" %]
+[% META title = "Welcome to MusicBrainz!" %]
+[% META extra_css = "index.css" %]
-<h1>Welcome to MusicBrainz!</h1>
+[% WRAPPER "layout.tt" %]
-[% IF server_details.staging_server %]
- [% WRAPPER "components/box.tt"
- header = "You are using a MusicBrainz $server_details.staging_server server!"
- colour = "purple" %]
+<div id="rightSide">
+ <h1>News</h1>
+ [% WRAPPER "components/box.tt" color="purple" header="MetaBrainz Foundation" %]
<p>
- Unless you want to be testing the latest and greatest MusicBrainz features
- you probably want to go to the <a href="http://musicbrainz.org/">
- <img src="/images/icon/extlink.gif" alt="External Website" /> musicbrainz.org main
- server</a>.
+ The <a href="http://metabrainz.org">MetaBrainz Foundation</a>, a California
+ 501.(c).3 non-profit corporation, operates the MusicBrainz project. All
+ <a href="http://metabrainz.org/donate">donations</a> to MusicBrainz
+ are tax deductable!
</p>
[% END %]
-[% END %]
+
+ [% WRAPPER "components/box.tt" color="purple" header="MusicBrainz Blog" %]
+ <ul id="blog">
+ [% FOREACH post IN blog %]
+ <li>
+ <h3>[% post.title %]</h3>
+ <p>[% post.description %]</p>
+ <p>Posted: [% post.date_time %]</p>
+ [% END %]
+ </ul>
+ [% END %]
+</div>
-[% IF server_details.is_slave_db %]
- [% WRAPPER "components/box.tt" header="You are using a MusicBrainz mirror" colour="purple" %]
- <p>
- If you want to edit the MusicBrainz data, you will need to go to the
- <a href="http://musicbrainz.org/">
- <img src="/images/icon/extlink.gif" alt="" width="12" /> musicbrainz.org main server</a>.
- </p>
- [% END %]
-[% END %]
+<div id="leftSide">
+ <h1>Welcome to MusicBrainz!</h1>
-[% WRAPPER "components/box.tt" header="What is MusicBrainz?" %]
- <p>MusicBrainz is a community music metadatabase that attempts to create a comprehensive music information
- site. You can use the MusicBrainz data either by browsing this web site, or you can access the data from
- a client program - for example, a CD player program can use MusicBrainz to identify CDs and provide
- information about the CD, about the artist or about related information. You can also use the MusicBrainz
- Tagger to automatically identify and clean up the metadata tags in your digital music collections. Find
- out more in the introduction.
- </p>
-[% END %]
+ [% IF server_details.staging_server %]
+ [% WRAPPER "components/box.tt"
+ header = "You are using a MusicBrainz $server_details.staging_server server!"
+ color = "purple" %]
+ <p>
+ Unless you want to be testing the latest and greatest MusicBrainz features
+ you probably want to go to the <a href="http://musicbrainz.org/">
+ <img src="/images/icon/extlink.gif" alt="External Website" /> musicbrainz.org main
+ server</a>.
+ </p>
+ [% END %]
+ [% END %]
-[% WRAPPER "components/box.tt" header="Use MusicBrainz" %]
- <p>
- You can use Musicbrainz right now to automatically identify and label your music files - all you have to do is
- download and run a MusicBrainz enabled tagger.
- [% INCLUDE "components/doc-link.tt" to="MusicBrainzTagger" text="Read more about our taggers." %]
- </p>
- <ul>
- </ul>
- <p>
- Alternatively, you might just want to <a href="/search.html">search</a> or <a href="/browseartists.html">browse</a>
- the MusicBrainz database. If you spot a mistake, or something that is missing, you can even
- [% INCLUDE "components/doc-link.tt" to="HowEditingWorks" text="edit or add more data!" %]
- </p>
- <p>
- If you're new to MusicBrainz, please take a moment to read the
- [% INCLUDE "components/doc-link.tt" to="BeginnersGuide" text="beginners guide" %]
- before editing the database.
- </p>
- <p>
- If you are a software developer you might want to learn about the
- [% INCLUDE "components/doc-link.tt" to="libmusicbrainz" text="MusicBrainz client library/SDK" %]. You can use the
- library to enable your programs to access the MusicBrainz database, both for looking up data and also for
- submitting new data.
- </p>
-[% END %]
+ [% IF server_details.is_slave_db %]
+ [% WRAPPER "components/box.tt" header="You are using a MusicBrainz mirror" colour="purple" %]
+ <p>
+ If you want to edit the MusicBrainz data, you will need to go to the
+ <a href="http://musicbrainz.org/">
+ <img src="/images/icon/extlink.gif" alt="" width="12" /> musicbrainz.org main server</a>.
+ </p>
+ [% END %]
+ [% END %]
-[% WRAPPER "components/box.tt" header="Be a Part of MusicBrainz" %]
- <p>Many people are needed to make MusicBrainz work. Come and take part!</p>
- <ul>
- <li>Please download and use Picard. By doing so, you will be using and adding to the MusicBrainz database.</li>
- <li>
- <a href="/search.html">Search</a> or <a href="/browseartists.html">browse</a> the MusicBrainz data for
- your favourite artists, or for your <a href="/browsevarious.html">favourite releases</a>.
- </li>
- <li>
- If you spot something that is wrong, poorly entered or just plain missing, please
- <a href="/user/register.html">register</a> and
- [% INCLUDE "components/doc-link.tt" to="HowEditingWorks" text="edit the data" %]
- </li>
- </ul>
-[% END %]
+ [% WRAPPER "components/box.tt" header="What is MusicBrainz?" %]
+ <p>
+ MusicBrainz is a community music metadatabase that attempts to create a comprehensive music information
+ site. You can use the MusicBrainz data either by browsing this web site, or you can access the data from
+ a client program - for example, a CD player program can use MusicBrainz to identify CDs and provide
+ information about the CD, about the artist or about related information. You can also use the MusicBrainz
+ Tagger to automatically identify and clean up the metadata tags in your digital music collections. Find
+ out more in the introduction.
+ </p>
+ [% END %]
-[% WRAPPER "components/box.tt" color="purple" header="MusicBrainz Blog" %]
- <ul id="blog">
- [% FOREACH post IN blog %]
- <li>
- <h3>[% post.title %]</h3>
- <p>[% post.description %]</p>
- <p>Posted: [% post.date_time %]</p>
+ [% WRAPPER "components/box.tt" header="Use MusicBrainz" %]
+ <p>
+ You can use Musicbrainz right now to automatically identify and label your music files - all you have to do is
+ download and run a MusicBrainz enabled tagger.
+ [% INCLUDE "components/doc-link.tt" to="MusicBrainzTagger" text="Read more about our taggers." %]
+ </p>
+ <ul>
+ </ul>
+ <p>
+ Alternatively, you might just want to <a href="/search.html">search</a> or <a href="/browseartists.html">browse</a>
+ the MusicBrainz database. If you spot a mistake, or something that is missing, you can even
+ [% INCLUDE "components/doc-link.tt" to="HowEditingWorks" text="edit or add more data!" %]
+ </p>
+ <p>
+ If you're new to MusicBrainz, please take a moment to read the
+ [% INCLUDE "components/doc-link.tt" to="BeginnersGuide" text="beginners guide" %]
+ before editing the database.
+ </p>
+ <p>
+ If you are a software developer you might want to learn about the
+ [% INCLUDE "components/doc-link.tt" to="libmusicbrainz" text="MusicBrainz client library/SDK" %]. You can use the
+ library to enable your programs to access the MusicBrainz database, both for looking up data and also for
+ submitting new data.
+ </p>
[% END %]
- </ul>
-[% END %]
+ [% WRAPPER "components/box.tt" header="Be a Part of MusicBrainz" %]
+ <p>Many people are needed to make MusicBrainz work. Come and take part!</p>
+ <ul>
+ <li>Please download and use Picard. By doing so, you will be using and adding to the MusicBrainz database.</li>
+ <li>
+ <a href="/search.html">Search</a> or <a href="/browseartists.html">browse</a> the MusicBrainz data for
+ your favourite artists, or for your <a href="/browsevarious.html">favourite releases</a>.
+ </li>
+ <li>
+ If you spot something that is wrong, poorly entered or just plain missing, please
+ <a href="/user/register.html">register</a> and
+ [% INCLUDE "components/doc-link.tt" to="HowEditingWorks" text="edit the data" %]
+ </li>
+ </ul>
+ [% END %]
+</div>
+
[% END %]
Added: mb_server/branches/TemplateToolkit/catalyst/root/static/images/header-bg-lightpurplefade.gif
Property changes on: mb_server/branches/TemplateToolkit/catalyst/root/static/images/header-bg-lightpurplefade.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: mb_server/branches/TemplateToolkit/catalyst/root/static/images/header-bg-orangefade.gif
Property changes on: mb_server/branches/TemplateToolkit/catalyst/root/static/images/header-bg-orangefade.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: mb_server/branches/TemplateToolkit/catalyst/root/static/main.css
===================================================================
--- mb_server/branches/TemplateToolkit/catalyst/root/static/main.css 2008-05-13 10:14:58 UTC (rev 9835)
+++ mb_server/branches/TemplateToolkit/catalyst/root/static/main.css 2008-05-13 10:37:48 UTC (rev 9836)
@@ -160,14 +160,19 @@
border-bottom: 1px solid #FFBB55;
margin: 0;
padding: 2pt 4pt;
- background: #ffbb55;
+ background: url(/static/images/header-bg-orangefade.gif) repeat-y;
font-size: 10pt;
}
div.purple h2 {
- background: purple;
+ background: url(/static/images/header-bg-lightpurplefade.gif) repeat-y;
+ border-bottom: 1px solid #736DAB;
}
+div.purple {
+ border: 1px solid #736DAB;
+}
+
div.box div.content {
padding: 5pt;
}
\ No newline at end of file
Added: mb_server/branches/TemplateToolkit/catalyst/root/static/styles/extra/index.css
More information about the MusicBrainz-commits
mailing list