\nMauris et dolor. Suspendisse potenti. Proin diam augue, semper vitae, varius et, viverra id, felis. Praesent lacus. Pellentesque tempor. Suspendisse viverra placerat tortor. Maecenas justo. Aenean justo ipsum, luctus ut, volutpat laoreet, vehicula in, libero. Morbi volutpat. Cras gravida. \n
\n\n\nSed non ipsum. Maecenas justo. Etiam fermentum. Praesent scelerisque. Quisque malesuada nulla sed pede volutpat pulvinar. Curabitur tincidunt tellus nec purus. Praesent a lacus vitae turpis consequat semper. Aenean turpis ipsum, rhoncus vitae, posuere vitae, euismod sed, ligula. Praesent semper, neque vel condimentum hendrerit, lectus elit pretium ligula, nec consequat nisl velit at dui. Nam malesuada sapien eu nibh. \n
\n\n\nEtiam fermentum. Quisque arcu ante, cursus in, ornare quis, viverra ut, justo. Nulla sed lacus. Morbi turpis arcu, egestas congue, condimentum quis, tristique cursus, leo. Vestibulum non arcu a ante feugiat vestibulum. Quisque facilisis, urna sit amet pulvinar mollis, purus arcu adipiscing velit, non condimentum diam purus eu massa. Nulla sagittis condimentum ligula. Quisque dictum quam vel neque. Nam id neque. Fusce venenatis ligula in pede. \n
\n\n') + context.write(u'\n\n\nYolanda is a free software video platform and, as far as we (the developers) know, the only one that doesn\'t rely on proprietary browser extensions. Instead, we only use open standards, namely XHTML, CSS and JavaScript; Videos are served in Ogg Theora format. Since Yolanda is free software, you can download the source code to adapt, modify and extend it.\n
\n\n\nIf you use a recent GNU/Linux Desktop distribution such as Ubuntu, no additional software is required. Users of inferior operating systems and arcane desktop environments are advised to install the VLC media player web plugin (Links and Lynx users should use VLC\'s aalib or libcaca output). As soon as browsers support the XHTML 5 <video> element, we will use it, which means that no additional software will be required.\n
\n\n\nSed non ipsum. Maecenas justo. Etiam fermentum. Praesent scelerisque. Quisque malesuada nulla sed pede volutpat pulvinar. Curabitur tincidunt tellus nec purus. Praesent a lacus vitae turpis consequat semper. Aenean turpis ipsum, rhoncus vitae, posuere vitae, euismod sed, ligula. Praesent semper, neque vel condimentum hendrerit, lectus elit pretium ligula, nec consequat nisl velit at dui. Nam malesuada sapien eu nibh. \n
\n\n\nProbably because it is not free (as in freedom). If you are serious about your suggestion, please file a ticket in our bug tracker.\n
\n\n') return '' finally: context.caller_stack.pop_frame() diff --git a/trunk/data/templates/xhtml/index.mako.pyc b/trunk/data/templates/xhtml/index.mako.pyc index 83eaddd..6a0576d 100644 Binary files a/trunk/data/templates/xhtml/index.mako.pyc and b/trunk/data/templates/xhtml/index.mako.pyc differ diff --git a/trunk/data/templates/xhtml/results.mako.py b/trunk/data/templates/xhtml/results.mako.py index ada0be3..7b35457 100644 --- a/trunk/data/templates/xhtml/results.mako.py +++ b/trunk/data/templates/xhtml/results.mako.py @@ -1,7 +1,7 @@ from mako import runtime, filters, cache UNDEFINED = runtime.UNDEFINED _magic_number = 2 -_modified_time = 1218464716.3410029 +_modified_time = 1218555558.912719 _template_filename='/home/nils/src/yolanda/trunk/yolanda/templates/xhtml/results.mako' _template_uri='/xhtml/results.mako' _template_cache=cache.Cache(__name__, _modified_time) @@ -80,10 +80,10 @@ def render_heading(context): try: c = context.get('c', UNDEFINED) # SOURCE LINE 7 - context.write(u'\n 9001 results for "') + context.write(u'\n There are over 9000 videos matching "') # SOURCE LINE 8 context.write(unicode(c.query)) - context.write(u'":\n') + context.write(u'".\n') return '' finally: context.caller_stack.pop_frame() diff --git a/trunk/data/templates/xhtml/results.mako.pyc b/trunk/data/templates/xhtml/results.mako.pyc index a9b4ffa..686ab37 100644 Binary files a/trunk/data/templates/xhtml/results.mako.pyc and b/trunk/data/templates/xhtml/results.mako.pyc differ diff --git a/trunk/yolanda/public/css/colors/tango.css b/trunk/yolanda/public/css/colors/tango.css index 3a1f46c..96d74d2 100644 --- a/trunk/yolanda/public/css/colors/tango.css +++ b/trunk/yolanda/public/css/colors/tango.css @@ -13,17 +13,54 @@ Purpose of this file is to provide decoration, such as: */ a - { +{ color: #88D9F3; text-decoration: none; - } +} a:hover - { +{ text-decoration: underline; +} + + a.tag1 + { + font-size: 1.5em; + line-height: 1.25em; } -body { + 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 +{ background-color: #000000; color: #E5E5E5; font-size: 12px; @@ -62,20 +99,20 @@ h1 h2 { - font-size: 1.25em; - line-height: 1.125em; + font-size: 1.4em; + line-height: 1.2em; } h3 { - font-size: 1.125em; - line-height: 1.0625em; + font-size: 1.3em; + line-height: 1.15em; } input { - background-color: #E5E5E5; - color: #131313; + background-color: #E5E5E5; + color: #131313; border-color: #363636; border-style: solid; } @@ -113,6 +150,11 @@ ol#results font-weight: bold; } +p +{ + line-height: 1.4em; +} + q:before { content: open-quote; @@ -132,22 +174,22 @@ ul#queries { font-size: 1.5em; line-height: 1.25em; - text-transform: uppercase; + text-transform: uppercase; } 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) } ul#queries li#new { - list-style-image:url(/images/tango/16x16/actions/document-new.png) + list-style-image: url(/images/tango/16x16/actions/document-new.png) } ul#queries li#popular { - list-style-image:url(/images/tango/16x16/emblems/emblem-favorite.png) + list-style-image: url(/images/tango/16x16/emblems/emblem-favorite.png) } ul#queries li a @@ -165,10 +207,10 @@ ul#queries font-family: monospace; } -#heading-box, -#login-box, -#search-box, -#tagcloud-box +#heading, +#login, +#search, +#tagcloud { background-color: #131313; border-color: #363636; diff --git a/trunk/yolanda/public/css/default.css b/trunk/yolanda/public/css/default.css index 6e512a0..f88b71a 100644 --- a/trunk/yolanda/public/css/default.css +++ b/trunk/yolanda/public/css/default.css @@ -4,7 +4,7 @@ Yolanda default stylesheet colors (using tango color palette) This file is licensed under the WTF Public License -Purpose of this file is to import color, decoration and structure stylesheets. +Purpose of this file is to import reset, decoration and structure stylesheets. */ @import "reset.css"; diff --git a/trunk/yolanda/public/css/structure/fake6.css b/trunk/yolanda/public/css/structure/fake6.css index 08c2733..5269216 100644 --- a/trunk/yolanda/public/css/structure/fake6.css +++ b/trunk/yolanda/public/css/structure/fake6.css @@ -20,6 +20,26 @@ body min-width: 46em; } +form +{ + margin-bottom: 0.5em; +} + +h1 +{ + margin-bottom: 0.33em; /* roughly 0.5em of relative to base */ +} + +h2 +{ + margin-bottom: 0.35em; /* roughly 0.5em of relative to base */ +} + +h3 +{ + margin-bottom: 0.38em; /* roughly 0.5em of relative to base */ +} + h1, h2, h3 @@ -48,38 +68,58 @@ input width: 9.5em; } -ol#results +ol { -/* compensate for list element margin */ - margin-left: -1em; - text-align: center; } - ol#results li + ol#results { - display: inline-block; - margin-left: 1em; - margin-bottom: 1em; - width: 216px; + /* compensate for list element margin */ + margin-left: -1em; + text-align: center; } - ol#results li img + ol#results li { - border-width: 1px; + display: inline-block; + margin-left: 1em; + margin-bottom: 1em; + width: 216px; } - ol#results li a.title - { - display: block; - height: 1em; - overflow: hidden; - } + ol#results li img + { + border-width: 1px; + } -ul#queries + ol#results li a.title + { + display: block; + height: 1em; + overflow: hidden; + } + +ul { - padding-left: 0.5em; } + ul#badges + { + text-align: center; + } + + #badges li + { + display: inline-block; + margin-left: 0.5em; + margin-right: 0.5em; + } + + ul#queries + { + padding-left: 0.5em; + } + /* classes */ /* ids */ @@ -87,24 +127,26 @@ ul#queries /* sidebar stuff */ #copyright, -#heading-box, -#login-box, -#search-box, -#tagcloud-box +#heading, +#login, +#search, +#tagcloud { border-width: 1px; clear: right; margin-bottom: 1em; padding: 1em; + text-align: justify; } -#heading-box, -#login-box, -#search-box, -#tagcloud-box +#heading, +#login, +#search, +#tagcloud { float: right; width: 25em; + padding-bottom: 0.5em; } #results diff --git a/trunk/yolanda/templates/xhtml/base.mako b/trunk/yolanda/templates/xhtml/base.mako index 9638600..8c8b924 100644 --- a/trunk/yolanda/templates/xhtml/base.mako +++ b/trunk/yolanda/templates/xhtml/base.mako @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <%def name="search()"> --Mauris et dolor. Suspendisse potenti. Proin diam augue, semper vitae, varius et, viverra id, felis. Praesent lacus. Pellentesque tempor. Suspendisse viverra placerat tortor. Maecenas justo. Aenean justo ipsum, luctus ut, volutpat laoreet, vehicula in, libero. Morbi volutpat. Cras gravida. +Yolanda is a free software video platform and, as far as we (the developers) know, the only one that doesn't rely on proprietary browser extensions. Instead, we only use open standards, namely XHTML, CSS and JavaScript; Videos are served in Ogg Theora format. Since Yolanda is free software, you can download the source code to adapt, modify and extend it.
++If you use a recent GNU/Linux Desktop distribution such as Ubuntu, no additional software is required. Users of inferior operating systems and arcane desktop environments are advised to install the VLC media player web plugin (Links and Lynx users should use VLC's aalib or libcaca output). As soon as browsers support the XHTML 5 <video> element, we will use it, which means that no additional software will be required. +
+ +Sed non ipsum. Maecenas justo. Etiam fermentum. Praesent scelerisque. Quisque malesuada nulla sed pede volutpat pulvinar. Curabitur tincidunt tellus nec purus. Praesent a lacus vitae turpis consequat semper. Aenean turpis ipsum, rhoncus vitae, posuere vitae, euismod sed, ligula. Praesent semper, neque vel condimentum hendrerit, lectus elit pretium ligula, nec consequat nisl velit at dui. Nam malesuada sapien eu nibh.
--Etiam fermentum. Quisque arcu ante, cursus in, ornare quis, viverra ut, justo. Nulla sed lacus. Morbi turpis arcu, egestas congue, condimentum quis, tristique cursus, leo. Vestibulum non arcu a ante feugiat vestibulum. Quisque facilisis, urna sit amet pulvinar mollis, purus arcu adipiscing velit, non condimentum diam purus eu massa. Nulla sagittis condimentum ligula. Quisque dictum quam vel neque. Nam id neque. Fusce venenatis ligula in pede. +Probably because it is not free (as in freedom). If you are serious about your suggestion, please file a ticket in our bug tracker.
diff --git a/trunk/yolanda/templates/xhtml/results.mako b/trunk/yolanda/templates/xhtml/results.mako index a11c605..335cf6e 100644 --- a/trunk/yolanda/templates/xhtml/results.mako +++ b/trunk/yolanda/templates/xhtml/results.mako @@ -5,7 +5,7 @@ <%def name="heading()"> - 9001 results for "${c.query}": + There are over 9000 videos matching "${c.query}". <%def name="results_listing(results)">