From cba93a7b71a24c1d0c5d37e15a4efd8da1968ade Mon Sep 17 00:00:00 2001 From: Nicolae Claudius Date: Sun, 29 Jan 2012 07:08:54 -0800 Subject: [PATCH] ui tweaks --- .../bootstrap/glyphicons-halflings-white.png | Bin 0 -> 4352 bytes app/assets/javascripts/application.js | 1 + .../stylesheets/bootstrap/bootstrap.scss | 2 +- .../domains/_list_record_columns.html.erb | 2 +- app/views/fragments/_top.html.erb | 55 +++++++++++++++--- 5 files changed, 49 insertions(+), 11 deletions(-) create mode 100644 app/assets/images/bootstrap/glyphicons-halflings-white.png diff --git a/app/assets/images/bootstrap/glyphicons-halflings-white.png b/app/assets/images/bootstrap/glyphicons-halflings-white.png new file mode 100644 index 0000000000000000000000000000000000000000..a20760bfde58d1c92cee95116059fba03c68d689 GIT binary patch literal 4352 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 <% unless can_crud_permissions %> <% who = "#{record.user.name} #{mail_to record.user.email}" %> - diff --git a/app/views/fragments/_top.html.erb b/app/views/fragments/_top.html.erb index 3bbf070..066ad81 100644 --- a/app/views/fragments/_top.html.erb +++ b/app/views/fragments/_top.html.erb @@ -5,8 +5,16 @@
    <% if user_signed_in? %>
  • <%#= link_to('Dashboard', dashboard_path, :data => {:pjax => '#main'}) %>
    • -
  • <%= link_to 'My Domains', domains_path, :data => {:pjax => '#main'} %>
    • -
  • <%= link_to 'Dynamic Hosts', hosts_path, :data => {:pjax => '#main'} %>
    • +
  • + <%= link_to domains_path, :data => {:pjax => '#main'} do %> + My Domains + <% end %> +
    • +
  • + <%= link_to hosts_path, :data => {:pjax => '#main'} do %> + Dynamic Hosts + <% end %> +
    • <% else %>
  • <%= link_to('Home', root_path, :data => {:pjax => '#main'}) %>
  • <%= link_to('About', page_path('about'), :data => {:pjax => '#main'}) %>
    • @@ -28,15 +36,44 @@ :related => "_clyfe:vaijab" } %> -
  • <%= link_to('News', Settings.news_link) %>
    • -
  • <%= link_to('Donate', page_path('donate'), :class => 'highlight', :data => {:pjax => '#main'}) %>
    • +
  • + <%= link_to(Settings.news_link, :rel => 'tooltip', :title => Settings.news_link) do %> + News + <% end %> +
    • +
  • + <%= link_to(page_path('donate'), :class => 'highlight', :data => {:pjax => '#main'}) do %> + Donate + <% end %> +
    • <% if user_signed_in? %> -
  • <%= link_to('Help & Support', page_path('help'), :data => {:pjax => '#main'}) %>
    • -
  • <%= link_to(current_user.email, edit_user_registration_path, :title => "IP: #{client_remote_ip}", :data => {:pjax => '#main'}) %>
    • -
  • <%= link_to('Sign out', destroy_user_session_path, :method => :delete) %>
    • +
  • + <%= link_to(page_path('help'), :data => {:pjax => '#main'}) do %> + Help & Support + <% end %> +
    • +
  • + <%= link_to(edit_user_registration_path, :rel => 'tooltip', + :title => "IP: #{client_remote_ip}",:data => {:pjax => '#main'}) do %> + <%= current_user.email %> + <% end %> +
    • +
  • + <%= link_to(destroy_user_session_path, :method => :delete) do %> + Sign out + <% end %> +
    • <% else %> -
  • <%= link_to('Sign up', new_user_registration_path, :data => {:pjax => '#main'}) %>
    • -
  • <%= link_to('Sign in', new_user_session_path, :data => {:pjax => '#main'}) %>
    • +
  • + <%= link_to(new_user_registration_path, :data => {:pjax => '#main'}) do %> + Sign up + <% end %> +
    • +
  • + <%= link_to(new_user_session_path, :data => {:pjax => '#main'}) do %> + Sign in + <% end %> +
    • <% end %>