diff --git a/trunk/data/templates/xhtml/base.mako.py b/trunk/data/templates/xhtml/base.mako.py index f433d88..f858bc3 100644 --- a/trunk/data/templates/xhtml/base.mako.py +++ b/trunk/data/templates/xhtml/base.mako.py @@ -1,12 +1,12 @@ from mako import runtime, filters, cache UNDEFINED = runtime.UNDEFINED _magic_number = 2 -_modified_time = 1217192624.700382 +_modified_time = 1218131048.479471 _template_filename=u'/home/nils/src/yolanda/trunk/yolanda/templates/xhtml/base.mako' _template_uri=u'/xhtml/base.mako' _template_cache=cache.Cache(__name__, _modified_time) _source_encoding=None -_exports = [] +_exports = ['search'] def render_body(context,**pageargs): @@ -16,31 +16,62 @@ def render_body(context,**pageargs): h = context.get('h', UNDEFINED) self = context.get('self', UNDEFINED) # SOURCE LINE 1 - context.write(u'\n\n\n\n\n\n\n \n\n \n\n\n') + # SOURCE LINE 16 + context.write(u'\n\n\n\n\n\n \n\n \n\n \n Yolanda - ') - # SOURCE LINE 22 + # SOURCE LINE 35 context.write(unicode(self.title())) context.write(u'\n \n\n\n\n\n\n
\n

\n ') - # SOURCE LINE 31 - context.write(unicode(self.heading())) - context.write(u'\n

\n
\n\n \n\n ') + context.write(unicode(self.heading())) + context.write(u'\n \n \n\n ') + # SOURCE LINE 48 + context.write(unicode(self.search())) + context.write(u'\n\n ') # SOURCE LINE 50 context.write(unicode(self.body())) - context.write(u'\n\n \n\n \n\n\n\n\n') + context.write(u'\n\n \n\n \n\n\n\n\n') + return '' + finally: + context.caller_stack.pop_frame() + + +def render_search(context): + context.caller_stack.push_frame() + try: + h = context.get('h', UNDEFINED) + # SOURCE LINE 5 + context.write(u'\n \n') return '' finally: context.caller_stack.pop_frame() diff --git a/trunk/data/templates/xhtml/base.mako.pyc b/trunk/data/templates/xhtml/base.mako.pyc index 3bde14b..a70266f 100644 Binary files a/trunk/data/templates/xhtml/base.mako.pyc and b/trunk/data/templates/xhtml/base.mako.pyc differ diff --git a/trunk/yolanda/controllers/search.py b/trunk/yolanda/controllers/search.py index 3981ae4..85957c5 100644 --- a/trunk/yolanda/controllers/search.py +++ b/trunk/yolanda/controllers/search.py @@ -12,19 +12,19 @@ class SearchController(BaseController): c.query = request.params['query'] # c.results dummy - c.results = [ - {'title': 'foobar', 'id': '23' , 'thumbnail': h.url_for('/images/404.png')}, - {'title': 'blablupp', 'id': '42', 'thumbnail': h.url_for('/images/404.png')}, - {'title': 'uiae nrdt', 'id': '555' , 'thumbnail': h.url_for('/images/404.png')}, - {'title': 'uiaenrtd uiaenrtd uiaenrdt', 'id': '666666666', 'thumbnail': h.url_for('/images/404.png')}, - {'title': 'foobar', 'id': '23' , 'thumbnail': h.url_for('/images/404.png')}, - {'title': 'blablupp', 'id': '42', 'thumbnail': h.url_for('/images/404.png')}, - {'title': 'James Bond drives a bulletproof Aston Martin !!!', 'id': '555' , 'thumbnail': h.url_for('/images/404.png')}, - {'title': 'uiaenrtd uiaenrtd uiaenrdt uiaenrtd uiaenrtd', 'id': '666666666', 'thumbnail': h.url_for('/images/404.png')}, - {'title': 'foobar', 'id': '123' , 'thumbnail': h.url_for('/images/404.png')}, - {'title': 'blablupp', 'id': '42', 'thumbnail': h.url_for('/images/404.png')}, - {'title': 'lolwtf hax !!!11', 'id': '9001', 'thumbnail': h.url_for('/images/404.png')} - ] + c.results = [ + {'title': 'foobar', 'id': '23' , 'thumbnail': h.url_for('/images/404.png')}, + {'title': 'blablupp', 'id': '42', 'thumbnail': h.url_for('/images/404.png')}, + {'title': 'uiae nrdt', 'id': '555' , 'thumbnail': h.url_for('/images/404.png')}, + {'title': 'uiaenrtd uiaenrtd uiaenrdt', 'id': '666666666', 'thumbnail': h.url_for('/images/404.png')}, + {'title': 'foobar', 'id': '23' , 'thumbnail': h.url_for('/images/404.png')}, + {'title': 'blablupp', 'id': '42', 'thumbnail': h.url_for('/images/404.png')}, + {'title': 'James Bond drives a bulletproof Aston Martin !!!', 'id': '555' , 'thumbnail': h.url_for('/images/404.png')}, + {'title': 'uiaenrtd uiaenrtd uiaenrdt uiaenrtd uiaenrtd', 'id': '666666666', 'thumbnail': h.url_for('/images/404.png')}, + {'title': 'foobar', 'id': '123' , 'thumbnail': h.url_for('/images/404.png')}, + {'title': 'blablupp', 'id': '42', 'thumbnail': h.url_for('/images/404.png')}, + {'title': 'lolwtf hax !!!11', 'id': '9001', 'thumbnail': h.url_for('/images/404.png')} + ] return render('/xhtml/results.mako') # return request.params['query'] diff --git a/trunk/yolanda/controllers/search.pyc b/trunk/yolanda/controllers/search.pyc index 2a1c40c..308c365 100644 Binary files a/trunk/yolanda/controllers/search.pyc and b/trunk/yolanda/controllers/search.pyc differ diff --git a/trunk/yolanda/controllers/video.py b/trunk/yolanda/controllers/video.py index 8697bda..71d21ec 100644 --- a/trunk/yolanda/controllers/video.py +++ b/trunk/yolanda/controllers/video.py @@ -7,6 +7,11 @@ log = logging.getLogger(__name__) class VideoController(BaseController): def index(self): + c.video = { + 'title': 'foobar', + 'description': 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nullam sapien mauris, venenatis at, fermentum at, tempus eu, urna.' , + 'preview': h.url_for('/images/404.png') + } return 'show a video html page' def file(self): diff --git a/trunk/yolanda/controllers/video.pyc b/trunk/yolanda/controllers/video.pyc index 546ab92..23ee5ab 100644 Binary files a/trunk/yolanda/controllers/video.pyc and b/trunk/yolanda/controllers/video.pyc differ diff --git a/trunk/yolanda/public/css/default.css b/trunk/yolanda/public/css/default.css index f1a778b..8be50d7 100644 --- a/trunk/yolanda/public/css/default.css +++ b/trunk/yolanda/public/css/default.css @@ -12,15 +12,6 @@ body text-align: center; } -div -{ - background-color: #eeeeec; - color: black; - border: 1px solid black; - margin: 0.5em; - padding: 0.5em; -} - form { padding: 0.5em; @@ -58,6 +49,7 @@ ol, ul[role="navigation"] ol#results li { display: inline-block; + font-weight: bold; padding: 0.5em; vertical-align: top; width: 227px; @@ -68,12 +60,12 @@ ol, ul[role="navigation"] border: 1px solid black; } - #antipixel li, #footer li + #badge li, #footer li { display: inline-block; } - #antipixel li + #badge li { padding: 0.5em; } @@ -91,6 +83,11 @@ ol, ul[role="navigation"] #heading-box, #search-box { + background-color: #eeeeec; + color: black; + border: 1px solid black; + margin: 0.5em; + padding: 0.5em; clear: right; float: right; width: 15em; diff --git a/trunk/yolanda/public/images/404.png b/trunk/yolanda/public/images/404.png index 22c3728..bf9bff8 100644 Binary files a/trunk/yolanda/public/images/404.png and b/trunk/yolanda/public/images/404.png differ diff --git a/trunk/yolanda/public/images/badges/COPYING b/trunk/yolanda/public/images/badges/COPYING new file mode 100644 index 0000000..08192f7 --- /dev/null +++ b/trunk/yolanda/public/images/badges/COPYING @@ -0,0 +1,4 @@ +Web badges + +License: GPL +Source: from http://www.zwahlendesign.ch/en/node/19 diff --git a/trunk/yolanda/public/images/badges/css.png b/trunk/yolanda/public/images/badges/css.png new file mode 100644 index 0000000..854a240 Binary files /dev/null and b/trunk/yolanda/public/images/badges/css.png differ diff --git a/trunk/yolanda/public/images/badges/ogg theora.png b/trunk/yolanda/public/images/badges/ogg theora.png new file mode 100644 index 0000000..be875f1 Binary files /dev/null and b/trunk/yolanda/public/images/badges/ogg theora.png differ diff --git a/trunk/yolanda/public/images/badges/xhtml 1.1.png b/trunk/yolanda/public/images/badges/xhtml 1.1.png new file mode 100644 index 0000000..52c38a3 Binary files /dev/null and b/trunk/yolanda/public/images/badges/xhtml 1.1.png differ diff --git a/trunk/yolanda/templates/xhtml/base.mako b/trunk/yolanda/templates/xhtml/base.mako index e9a16c9..5085e29 100644 --- a/trunk/yolanda/templates/xhtml/base.mako +++ b/trunk/yolanda/templates/xhtml/base.mako @@ -2,6 +2,19 @@ +<%def name="search()"> + + + @@ -32,28 +45,15 @@ - + ${self.search()} ${self.body()} @@ -61,25 +61,19 @@
  • - XHTML 1.1 logo + XHTML 1.1 logo
  • - CSS logo - -
    • - -
  • - - Javascript logo + CSS logo
  • - Ogg Theora logo + Ogg Theora logo