Download as
Browse Code »

Commit 304c2974db789126112c075df3cdb52f548dde16

Authored by AurelioAHeckert
1 parent fc87be85
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

ActionItem183: more little things on login-box and more... 

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1537 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 3 changed files with 24 additions and 13 deletions   Show diff stats
app/views/account/user_info.rhtml
  Diff comments   View file @304c297
1   -<h2><%= user.identifier %></h2>
  1 +<div class="logged-user-info">
  2 +
  3 +<h2><%= _('Logged in as %s') % user.identifier %></h2>
2 4  
3 5 <ul>
4   - <li><%= _('User since %d') % user.person_info.created_at.year %></li>
  6 + <li><%= _('User since %{year}/%{month}') % { :year => user.person_info.created_at.year, :month => user.person_info.created_at.month } %></li>
5 7 <li><%= link_to_homepage _('Homepage') %></li>
6 8 </ul>
7 9  
8   -<ul>
9   - <li><%= lightbox_link_to _('Logout'), :controller => 'account', :action => 'logout_popup' %></li>
10   -</ul>
  10 +<div class="user-actions">
  11 +<%= lightbox_link_to content_tag('span', _('Logout')),
  12 + { :controller => 'account', :action => 'logout_popup' },
  13 + :class => 'button with-text icon-menu-logout' %>
  14 +</div>
  15 +
  16 +</div>
... ...
public/images/list-dot.gif 0 → 100644
View file @304c297

59 Bytes
public/stylesheets/login-box.css
  Diff comments   View file @304c297
... ... @@ -11,7 +11,7 @@
11 11 }
12 12  
13 13 .login-box-content {
14   - margin-top: -16px;
  14 + margin-top: -6px;
15 15 border: 2px solid #729FCF;
16 16 background: #B8CFE7;
17 17 padding: 0px 10px 5px 10px;
... ... @@ -30,8 +30,8 @@
30 30 padding: 0px 0px 10px 0px;
31 31 }
32 32  
33   -.login-box h2 {
34   - font-size: 18px;
  33 +#content .login-block h2 {
  34 + font-size: 20px;
35 35 text-align: center;
36 36 margin: 0px;
37 37 padding: 0px;
... ... @@ -54,9 +54,14 @@
54 54 font-size: 13px;
55 55 }
56 56  
57   -/*
58   -.login-box a.button, .login-box a.button:visited {
59   - height: 22px;
60   - color: #000;
  57 +#content .logged-user-info h2 {
  58 + font-size: 16px;
  59 +}
  60 +
  61 +.logged-user-info ul {
  62 + margin-top: 5px;
  63 +}
  64 +
  65 +.logged-user-info .user-actions {
  66 + padding-left: 50px;
61 67 }
62   -*/
... ...