Commit 8d6f1089b19d1759d5f6268276617dc60b19f651
1 parent
bb97911d
Exists in
master
and in
29 other branches
ActionItem0: making a slightly better design
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@299 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing
2 changed files
with
19 additions
and
9 deletions
Show diff stats
app/helpers/application_helper.rb
| @@ -95,31 +95,31 @@ module ApplicationHelper | @@ -95,31 +95,31 @@ module ApplicationHelper | ||
| 95 | [ link_to_profile(_('My home page')) ], | 95 | [ link_to_profile(_('My home page')) ], |
| 96 | [ link_to_cms(_('Manage content')) ], | 96 | [ link_to_cms(_('Manage content')) ], |
| 97 | ].join("\n") | 97 | ].join("\n") |
| 98 | - content_tag('div', links, :id => 'user_links') | 98 | + content_tag('span', links, :id => 'user_links') |
| 99 | end | 99 | end |
| 100 | 100 | ||
| 101 | def header | 101 | def header |
| 102 | - virtual_community_identification + login_or_register_or_logout | 102 | + virtual_community_identification + "\n" + login_or_register_or_logout |
| 103 | end | 103 | end |
| 104 | 104 | ||
| 105 | def login_or_register_or_logout | 105 | def login_or_register_or_logout |
| 106 | if logged_in? | 106 | if logged_in? |
| 107 | - user_links + logout_box | 107 | + user_links + " " + logout_box |
| 108 | else | 108 | else |
| 109 | - login_box + register_box | 109 | + login_box + " " + register_box |
| 110 | end | 110 | end |
| 111 | end | 111 | end |
| 112 | 112 | ||
| 113 | def login_box | 113 | def login_box |
| 114 | - content_tag('div', (link_to _('Login'), :controller => 'account', :action => 'login'), :id => 'login_box') | 114 | + content_tag('span', (link_to _('Login'), :controller => 'account', :action => 'login'), :id => 'login_box') |
| 115 | end | 115 | end |
| 116 | 116 | ||
| 117 | def register_box | 117 | def register_box |
| 118 | - content_tag('div', (link_to _('Not a user yet? Register now!'), :controller => 'account', :action => 'signup'), :id => 'register_box') | 118 | + content_tag('span', (link_to _('Not a user yet? Register now!'), :controller => 'account', :action => 'signup'), :id => 'register_box') |
| 119 | end | 119 | end |
| 120 | 120 | ||
| 121 | def logout_box | 121 | def logout_box |
| 122 | - content_tag('div', (link_to _('Logout'), { :controller => 'account', :action => 'logout'}, :method => 'post'), :id => 'logout_box') | 122 | + content_tag('span', (link_to _('Logout'), { :controller => 'account', :action => 'logout'}, :method => 'post'), :id => 'logout_box') |
| 123 | end | 123 | end |
| 124 | 124 | ||
| 125 | # FIXME | 125 | # FIXME |
public/designs/templates/default/stylesheets/style.css
| @@ -8,12 +8,13 @@ body { | @@ -8,12 +8,13 @@ body { | ||
| 8 | 8 | ||
| 9 | #header { | 9 | #header { |
| 10 | border-bottom: 1px solid black; | 10 | border-bottom: 1px solid black; |
| 11 | - padding-left: 1em; | ||
| 12 | - padding-right: 1em; | 11 | + padding: 0.5em; |
| 13 | } | 12 | } |
| 14 | 13 | ||
| 15 | #menu { | 14 | #menu { |
| 16 | float: right; | 15 | float: right; |
| 16 | + margin-right: 1em; | ||
| 17 | + margin-top: 1em; | ||
| 17 | } | 18 | } |
| 18 | 19 | ||
| 19 | #content { | 20 | #content { |
| @@ -24,3 +25,12 @@ body { | @@ -24,3 +25,12 @@ body { | ||
| 24 | text-align: center; | 25 | text-align: center; |
| 25 | border-top: 1px solid black; | 26 | border-top: 1px solid black; |
| 26 | } | 27 | } |
| 28 | + | ||
| 29 | +#notice, #errorExplanation { | ||
| 30 | + border: 1px solid black; | ||
| 31 | + margin-top: 1em; | ||
| 32 | + margin-left: 30%; | ||
| 33 | + margin-right: 30%; | ||
| 34 | + padding: 0.5em; | ||
| 35 | +} | ||
| 36 | + |