[mb-commits] r9846 - in mb_server/branches/TemplateToolkit/root: . layout layout/sidebar static static/styles/extra user
root at musicbrainz.org
root at musicbrainz.org
Wed May 14 14:40:10 UTC 2008
Author: acid2
Date: 2008-05-14 14:40:10 +0000 (Wed, 14 May 2008)
New Revision: 9846
Added:
mb_server/branches/TemplateToolkit/root/static/styles/extra/user.css
Modified:
mb_server/branches/TemplateToolkit/root/layout.tt
mb_server/branches/TemplateToolkit/root/layout/footer-bar.tt
mb_server/branches/TemplateToolkit/root/layout/header.tt
mb_server/branches/TemplateToolkit/root/layout/sidebar/login.tt
mb_server/branches/TemplateToolkit/root/static/main.css
mb_server/branches/TemplateToolkit/root/user/profile.tt
Log:
Content first, moved to negative margin css. Fixed user interface problems with some bad floats
Modified: mb_server/branches/TemplateToolkit/root/layout/footer-bar.tt
===================================================================
--- mb_server/branches/TemplateToolkit/root/layout/footer-bar.tt 2008-05-14 09:33:51 UTC (rev 9845)
+++ mb_server/branches/TemplateToolkit/root/layout/footer-bar.tt 2008-05-14 14:40:10 UTC (rev 9846)
@@ -17,7 +17,7 @@
<a href="http://validator.w3.org/check?uri=referer">
<img src="/static/images/icon/valid-xhtml11-wm.png" alt="Valid XHTML 1.1" class="textIcon" />
</a>
- <a href="http://jigsaw.w3.org/css-validator/validator?uri=<% $cssurl %>">
+ <a href="http://jigsaw.w3.org/css-validator/validator">
<img src="/static/images/icon/valid-css2-wm.png" alt="Valid CSS 2.0" class="textIcon" />
</a>
</li>
Modified: mb_server/branches/TemplateToolkit/root/layout/header.tt
===================================================================
--- mb_server/branches/TemplateToolkit/root/layout/header.tt 2008-05-14 09:33:51 UTC (rev 9845)
+++ mb_server/branches/TemplateToolkit/root/layout/header.tt 2008-05-14 14:40:10 UTC (rev 9846)
@@ -1,3 +1,3 @@
<div id="header">
- <img src="/static/images/musicbrainz-text.gif" />
+ <img src="/static/images/musicbrainz-text.gif" alt="MusicBrainz"/>
</div>
Modified: mb_server/branches/TemplateToolkit/root/layout/sidebar/login.tt
===================================================================
--- mb_server/branches/TemplateToolkit/root/layout/sidebar/login.tt 2008-05-14 09:33:51 UTC (rev 9845)
+++ mb_server/branches/TemplateToolkit/root/layout/sidebar/login.tt 2008-05-14 14:40:10 UTC (rev 9846)
@@ -1,5 +1,5 @@
<ul>
- <li><a href="[% Catalyst.uri_for("/user/login") %]">Login</a></li>
+ <li><a href="[% c.uri_for('/user/login') %]">Login</a></li>
<li><a href="/bad_link">Register</a></li>
<li><a href="/bad_link">Forgot Password</a></li>
<li><a href="/bad_link">Donate!</a></li>
Modified: mb_server/branches/TemplateToolkit/root/layout.tt
===================================================================
--- mb_server/branches/TemplateToolkit/root/layout.tt 2008-05-14 09:33:51 UTC (rev 9845)
+++ mb_server/branches/TemplateToolkit/root/layout.tt 2008-05-14 14:40:10 UTC (rev 9846)
@@ -1,7 +1,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="expires" content="1" />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -22,11 +22,15 @@
<body>
[% INCLUDE "layout/header.tt" %]
+
+ <div id="container">
+ <div id="content">
+ [% content %]
+ </div>
+ </div>
+
[% INCLUDE "layout/sidebar.tt" %]
- <div id="content">
- [% content %]
- </div>
[% INCLUDE "layout/footer-bar.tt" %]
</body>
</html>
Modified: mb_server/branches/TemplateToolkit/root/static/main.css
===================================================================
--- mb_server/branches/TemplateToolkit/root/static/main.css 2008-05-14 09:33:51 UTC (rev 9845)
+++ mb_server/branches/TemplateToolkit/root/static/main.css 2008-05-14 14:40:10 UTC (rev 9846)
@@ -1,8 +1,9 @@
body {
- font-family: sans-serif;
+ font-family: Verdana,Geneva,Arial,Helvetica,sans-serif;
font-size: 12.5px;
line-height: 1.5em;
margin: 0;
+ width: 100%;
}
p {
@@ -81,8 +82,8 @@
#creditsBar li.right { float: right; }
#sidebar {
- float: left;
- width: 100pt;
+ width: 200px;
+ min-width: 110pt;
background: lightgray;
border-right: 1px solid black;
color: #050505;
@@ -146,8 +147,14 @@
padding-left: 10pt;
}
+#container {
+ width: 100%;
+ float: right;
+ margin-left: -200px;
+}
+
#content {
- margin-left: 100pt;
+ margin-left: 200px;
padding: 10pt;
}
@@ -175,4 +182,20 @@
div.box div.content {
padding: 5pt;
+}
+
+#content form p {
+ clear: both;
+}
+
+#content form label {
+ float: left;
+ text-align: right;
+ font-weight: bold;
+ margin-right: 10pt;
+ width: 100pt;
+}
+
+#content form p.no-label {
+ margin-left: 110pt;
}
\ No newline at end of file
Added: mb_server/branches/TemplateToolkit/root/static/styles/extra/user.css
Modified: mb_server/branches/TemplateToolkit/root/user/profile.tt
===================================================================
--- mb_server/branches/TemplateToolkit/root/user/profile.tt 2008-05-14 09:33:51 UTC (rev 9845)
+++ mb_server/branches/TemplateToolkit/root/user/profile.tt 2008-05-14 14:40:10 UTC (rev 9846)
@@ -1,4 +1,5 @@
[% META title = "User Profile" %]
+[% META extra_css = "user.css" %]
[% WRAPPER "layout.tt" %]
[% BLOCK property %]
@@ -35,11 +36,11 @@
[% user.name WRAPPER property name = "Name" %]
- [% user.type WRAPPER property name = "User Type" %]
+ [% user.type or "Unknown" WRAPPER property name = "User Type" %]
[% WRAPPER property name = "E-Mail" %]
- [% user.email or "[Hidden]" %] <br />
- Verified on [% user.email_verification_date %]
+ [% user.email or "[Hidden]" %]
+ (verified [% user.email_verification_date %])
[% END %]
[% user.homepage or "[None]" WRAPPER property name = "Homepage" %]
More information about the MusicBrainz-commits
mailing list