From 8d6f1089b19d1759d5f6268276617dc60b19f651 Mon Sep 17 00:00:00 2001 From: AntonioTerceiro Date: Wed, 1 Aug 2007 16:49:49 +0000 Subject: [PATCH] ActionItem0: making a slightly better design --- app/helpers/application_helper.rb | 14 +++++++------- public/designs/templates/default/stylesheets/style.css | 14 ++++++++++++-- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index d32da96..dff3560 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -95,31 +95,31 @@ module ApplicationHelper [ link_to_profile(_('My home page')) ], [ link_to_cms(_('Manage content')) ], ].join("\n") - content_tag('div', links, :id => 'user_links') + content_tag('span', links, :id => 'user_links') end def header - virtual_community_identification + login_or_register_or_logout + virtual_community_identification + "\n" + login_or_register_or_logout end def login_or_register_or_logout if logged_in? - user_links + logout_box + user_links + " " + logout_box else - login_box + register_box + login_box + " " + register_box end end def login_box - content_tag('div', (link_to _('Login'), :controller => 'account', :action => 'login'), :id => 'login_box') + content_tag('span', (link_to _('Login'), :controller => 'account', :action => 'login'), :id => 'login_box') end def register_box - content_tag('div', (link_to _('Not a user yet? Register now!'), :controller => 'account', :action => 'signup'), :id => 'register_box') + content_tag('span', (link_to _('Not a user yet? Register now!'), :controller => 'account', :action => 'signup'), :id => 'register_box') end def logout_box - content_tag('div', (link_to _('Logout'), { :controller => 'account', :action => 'logout'}, :method => 'post'), :id => 'logout_box') + content_tag('span', (link_to _('Logout'), { :controller => 'account', :action => 'logout'}, :method => 'post'), :id => 'logout_box') end # FIXME diff --git a/public/designs/templates/default/stylesheets/style.css b/public/designs/templates/default/stylesheets/style.css index 440208f..a9d8a7c 100644 --- a/public/designs/templates/default/stylesheets/style.css +++ b/public/designs/templates/default/stylesheets/style.css @@ -8,12 +8,13 @@ body { #header { border-bottom: 1px solid black; - padding-left: 1em; - padding-right: 1em; + padding: 0.5em; } #menu { float: right; + margin-right: 1em; + margin-top: 1em; } #content { @@ -24,3 +25,12 @@ body { text-align: center; border-top: 1px solid black; } + +#notice, #errorExplanation { + border: 1px solid black; + margin-top: 1em; + margin-left: 30%; + margin-right: 30%; + padding: 0.5em; +} + -- libgit2 0.21.2