CSS hackery

git-svn-id: http://yolanda.mister-muffin.de/svn@380 7eef14d0-6ed0-489d-bf55-20463b2d70db
This commit is contained in:
erlehmann 2008-09-26 03:35:43 +00:00
parent bd4eb10579
commit 3fe979bd98
7 changed files with 175 additions and 149 deletions

View file

@ -7,24 +7,23 @@ log = logging.getLogger(__name__)
class AccountController(BaseController): class AccountController(BaseController):
def __before__(self): def __before__(self):
self.openid_session = session.get("openid_session", {}) self.openid_session = session.get("openid_session", {})
# @validate(schema=something, form='login') # @validate(schema=something, form='login')
def login(self): def login(self):
#FIXME: do not operate in stateless mode - replace store with local #FIXME: do not operate in stateless mode - replace store with local
# openid store (app global) to make login faster with less overhead # openid store (app global) to make login faster with less overhead
self.consumer = Consumer(self.openid_session, None) self.consumer = Consumer(self.openid_session, None)
openid = request.params.get('username', None) openid = request.params.get('username', None)
if openid is None:
# invalid openid
c.error = "invalid openid"
return render('/xhtml/index.mako')
try: try:
authrequest = self.consumer.begin(openid) authrequest = self.consumer.begin(openid)
except DiscoveryFailure, e: except DiscoveryFailure, e:
# invalid openid # invalid openid
c.error = "invalid openid" c.message = {
'type': 'error',
'text': 'You were not logged on due to entering an invalid OpenID.'
}
return render('/xhtml/index.mako') return render('/xhtml/index.mako')
redirecturl = authrequest.redirectURL( redirecturl = authrequest.redirectURL(
h.url_for('',qualified=True), h.url_for('',qualified=True),
return_to=h.url_for('/account/verified',qualified=True), return_to=h.url_for('/account/verified',qualified=True),

View file

@ -9,104 +9,17 @@ Purpose of this file is to provide decoration, such as:
- colors - colors
- images (background, list bullets etc.) - images (background, list bullets etc.)
- generated content - generated content
- text attributes
*/ */
a a
{ {
color: #88D9F3; color: #88D9F3;
text-decoration: none;
} }
a:hover
{
text-decoration: underline;
}
a.tag1
{
font-size: 1.5em;
line-height: 1.25em;
}
a.tag2
{
font-size: 1.4em;
line-height: 1.2em;
}
a.tag3
{
font-size: 1.3em;
line-height: 1.15em;
}
a.tag4
{
font-size: 1.2em;
line-height: 1.25em;
}
a.tag5
{
font-size: 1.1em;
line-height: 1.05em;
}
a.tag6
{
font-size: 1em;
line-height: 1em;
}
body body
{ {
background-color: #000000; background-color: #000000;
color: #E5E5E5; color: #E5E5E5;
font-size: 12px;
font-family: sans-serif;
}
blockquote:before
{
content: open-quote;
font-size: 2em;
margin-left: 7.5em;
}
blockquote:after
{
content: close-quote;
font-size: 2em;
margin-right: 7.5em;
}
code
{
font-family: monospace;
}
em
{
font-style: italic;
}
h1
{
font-size: 1.5em;
line-height: 1.25em;
}
h2
{
font-size: 1.4em;
line-height: 1.2em;
}
h3
{
font-size: 1.3em;
line-height: 1.15em;
} }
input input
@ -150,33 +63,11 @@ ol#results
font-weight: bold; font-weight: bold;
} }
p
{
line-height: 1.4em;
}
q:before
{
content: open-quote;
}
q:after
{
content: close-quote;
}
ul#queries ul#queries
{ {
list-style-position: inside; list-style-position: inside;
} }
ul#queries li
{
font-size: 1.5em;
line-height: 1.25em;
text-transform: uppercase;
}
ul#queries li#important ul#queries li#important
{ {
list-style-image: url(/images/tango/16x16/emblems/emblem-important.png) list-style-image: url(/images/tango/16x16/emblems/emblem-important.png)
@ -199,27 +90,36 @@ ul#queries
/* classes */ /* classes */
.messagebox #messagebox
{ {
border-color: #363636;
border-style: solid;
} }
.messagebox.error #messagebox.error
{ {
/* "Scarlet Red 1" + 30 luminosity */ /* "Scarlet Red 1" */
background-color: #f46060; background-color: #ef2929;
color: #ffffff;
} }
.messagebox.information #messagebox.information
{ {
/* "Chameleon 1" + 30 luminosity */ /* "Chameleon 1" */
background-color: #a9ec68; background-color: #8ae234;
color: #131313;
} }
.messagebox.warning #messagebox.warning
{ {
/* "Orange 1" */ /* "Orange 1" */
background-color: #fcaf3e; background-color: #fcaf3e;
color: #131313;
}
#messagebox #message
{
font-size: 1.4em;
} }
/* ids */ /* ids */

View file

@ -9,4 +9,5 @@ Purpose of this file is to import reset, decoration and structure stylesheets.
@import "reset.css"; @import "reset.css";
@import "colors/tango.css"; @import "colors/tango.css";
@import "fonts/hurrdurr.css";
@import "structure/fake6.css"; @import "structure/fake6.css";

View file

@ -0,0 +1,132 @@
/*
Yolanda HURR DURR font / text decoration stylesheet
(c) 2007-2008 Nils Dagsson Moskopp
This file is licensed under the WTF Public License.
Purpose of this file is to provide font / text decoration.
*/
a
{
text-decoration: none;
}
a:hover
{
text-decoration: underline;
}
a.tag1
{
font-size: 1.5em;
line-height: 1.25em;
}
a.tag2
{
font-size: 1.4em;
line-height: 1.2em;
}
a.tag3
{
font-size: 1.3em;
line-height: 1.15em;
}
a.tag4
{
font-size: 1.2em;
line-height: 1.25em;
}
a.tag5
{
font-size: 1.1em;
line-height: 1.05em;
}
a.tag6
{
font-size: 1em;
line-height: 1em;
}
/*
blockquote:before
{
content: open-quote;
font-size: 2em;
}
blockquote:after
{
content: close-quote;
font-size: 2em;
}
*/
body
{
font-size: 12px;
font-family: sans-serif;
}
code
{
font-family: monospace;
}
em
{
font-style: italic;
}
h1
{
font-size: 1.5em;
line-height: 1.25em;
}
h2
{
font-size: 1.4em;
line-height: 1.2em;
}
h3
{
font-size: 1.3em;
line-height: 1.15em;
}
p
{
line-height: 1.4em;
}
q
{
}
q:before
{
content: open-quote;
}
q:after
{
content: close-quote;
}
ul
{
}
ul#queries li
{
font-size: 1.5em;
line-height: 1.25em;
text-transform: uppercase;
}

View file

@ -117,14 +117,17 @@ ul
ul#queries ul#queries
{ {
padding-left: 0.5em; padding-left: 0.5em;
} }
/* classes */ /* classes */
.messagebox #messagebox
{ {
margin-right: 28em; border-width: 1px;
margin-right: 28em !important;
padding: 1em;
text-align: center;
} }
/* ids */ /* ids */

View file

@ -40,8 +40,6 @@
<%def name="login()"> <%def name="login()">
<div id="login"> <div id="login">
<h1>To upload videos, login.</h1>
${h.form(h.url_for('account/login'), method='post')} ${h.form(h.url_for('account/login'), method='post')}
${h.text_field('username')} ${h.text_field('username')}
@ -54,21 +52,11 @@
<%def name="messagebox()"> <%def name="messagebox()">
%if c.error: %if c.message:
<div class="messagebox error"> <div id="messagebox" class="${c.message['type']}">
${c.error} <span id="message">
</div> ${c.message['text']}
%endif </span>
%if c.information:
<div class="messagebox information">
${c.information}
</div>
%endif
%if c.warning:
<div class="messagebox warning">
${c.warning}
</div> </div>
%endif %endif
@ -133,6 +121,12 @@
<body> <body>
<div id="header">
<img src="${h.url_for('/images/logo.png')}" alt="Yolanda logo"/>
</div>
${self.login()}
<div id="heading"> <div id="heading">
<h1> <h1>
${self.heading()} ${self.heading()}
@ -141,8 +135,6 @@
${self.search()} ${self.search()}
${self.login()}
${self.tagcloud()} ${self.tagcloud()}
${self.messagebox()} ${self.messagebox()}

View file

@ -5,8 +5,7 @@
</%def> </%def>
<%def name="heading()"> <%def name="heading()">
Welcome to Yolanda, a place for people who hate Adobe Flash. Welcome to Yolanda, a video CMS missing a proper slogan.
${request.headers.get('REFERER')}
</%def> </%def>
<h1>An introduction to Yolanda</h1> <h1>An introduction to Yolanda</h1>