Download as
Browse Code »

Commit 8d6f1089b19d1759d5f6268276617dc60b19f651

Authored by AntonioTerceiro
1 parent bb97911d
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

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
  Diff comments   View file @8d6f108
... ... @@ -95,31 +95,31 @@ module ApplicationHelper
95 95 [ link_to_profile(_('My home page')) ],
96 96 [ link_to_cms(_('Manage content')) ],
97 97 ].join("\n")
98   - content_tag('div', links, :id => 'user_links')
  98 + content_tag('span', links, :id => 'user_links')
99 99 end
100 100  
101 101 def header
102   - virtual_community_identification + login_or_register_or_logout
  102 + virtual_community_identification + "\n" + login_or_register_or_logout
103 103 end
104 104  
105 105 def login_or_register_or_logout
106 106 if logged_in?
107   - user_links + logout_box
  107 + user_links + " " + logout_box
108 108 else
109   - login_box + register_box
  109 + login_box + " " + register_box
110 110 end
111 111 end
112 112  
113 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 115 end
116 116  
117 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 119 end
120 120  
121 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 123 end
124 124  
125 125 # FIXME
... ...
public/designs/templates/default/stylesheets/style.css
  Diff comments   View file @8d6f108
... ... @@ -8,12 +8,13 @@ body {
8 8  
9 9 #header {
10 10 border-bottom: 1px solid black;
11   - padding-left: 1em;
12   - padding-right: 1em;
  11 + padding: 0.5em;
13 12 }
14 13  
15 14 #menu {
16 15 float: right;
  16 + margin-right: 1em;
  17 + margin-top: 1em;
17 18 }
18 19  
19 20 #content {
... ... @@ -24,3 +25,12 @@ body {
24 25 text-align: center;
25 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 +
... ...