From ced782d7c8d9332b5af73211f2303ae10742c820 Mon Sep 17 00:00:00 2001 From: Alain Reguera Delgado Date: Aug 30 2011 04:47:05 +0000 Subject: Update `Apps/Home/page.py'. --- diff --git a/Scripts/CentOS-Web/Apps/Home/page.py b/Scripts/CentOS-Web/Apps/Home/page.py index 9376f3e..7c5ff62 100755 --- a/Scripts/CentOS-Web/Apps/Home/page.py +++ b/Scripts/CentOS-Web/Apps/Home/page.py @@ -6,7 +6,7 @@ from Apps import page app = page.Layout() -def page_navibar_tabs(): +def page_navibar(): """Returns application main pages. The application main pages are organized as tabs in the @@ -25,7 +25,7 @@ def page_navibar_tabs(): else: focus = names[0].lower() - return app.navibar_app(names, attrs, focus) + return app.page_navibar(names, attrs, focus) def page_content(): @@ -49,13 +49,13 @@ def page_content(): output += app.admonition('Caution', '', app.tag_p({}, [16, 1], 'This is a paragraph. '*5)) output += app.tag_p({}, [12, 1], 'This is a paragraph. '*30 ) elif p == 'articles': - output = app.tag_h1({'class': 'title'}, [12, 1], 'Articles' ) + output = app.content_list('articles') elif p == 'events': output = app.tag_h1({'class': 'title'}, [12, 1], 'Events' ) else: output = app.tag_p('', [12, 1], 'Page Empty.') - return app.content(output) + return output def main(): @@ -74,11 +74,11 @@ def main(): # Define page header. This is the information displayed # between the page top and the page content. app.header = app.logo() - app.header += app.ads_google() - app.header += app.navibar_top() - app.header += app.lastreleases() - app.header += app.appslinks() - app.header += page_navibar_tabs() + app.header += app.google() + app.header += app.navibar() + app.header += app.releases() + app.header += app.page_links() + app.header += page_navibar() # Define page body. This is the information displayed between the # page header and page footer.