Browse Source

ui tweaks

pull/1/head
Nicolae Claudius 13 years ago
parent
commit
cba93a7b71
  1. BIN
      app/assets/images/bootstrap/glyphicons-halflings-white.png
  2. 1
      app/assets/javascripts/application.js
  3. 2
      app/assets/stylesheets/bootstrap/bootstrap.scss
  4. 2
      app/views/domains/_list_record_columns.html.erb
  5. 55
      app/views/fragments/_top.html.erb

BIN
app/assets/images/bootstrap/glyphicons-halflings-white.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

1
app/assets/javascripts/application.js

@ -16,4 +16,5 @@
$(function(){ $(function(){
$('[rel=popover]').popover(); $('[rel=popover]').popover();
$('[rel=tooltip]').tooltip();
}); });

2
app/assets/stylesheets/bootstrap/bootstrap.scss vendored

@ -12,7 +12,7 @@
*margin-left: 0; *margin-left: 0;
} }
.icon.white { .icon.white {
background-image: url(../img/glyphicons-halflings-white.png); background-image: url(image-path('bootstrap/glyphicons-halflings-white.png'));
} }
.icon.glass { .icon.glass {
background-position: 0 0; background-position: 0 0;

2
app/views/domains/_list_record_columns.html.erb

@ -16,7 +16,7 @@
end %> end %>
<% unless can_crud_permissions %> <% unless can_crud_permissions %>
<% who = "<strong>#{record.user.name}</strong> #{mail_to record.user.email}" %> <% who = "<strong>#{record.user.name}</strong> #{mail_to record.user.email}" %>
<i class="icon question-sign" style="float: right;" rel="popover" <i class="icon share" style="float: right;" rel="popover"
data-original-title="Shared domain" data-original-title="Shared domain"
data-content="This domain was shared with you by <%=h who %>" data-content="This domain was shared with you by <%=h who %>"
></i> ></i>

55
app/views/fragments/_top.html.erb

@ -5,8 +5,16 @@
<ul class="wat-cf"> <ul class="wat-cf">
<% if user_signed_in? %> <% if user_signed_in? %>
<li><%#= link_to('Dashboard', dashboard_path, :data => {:pjax => '#main'}) %></li> <li><%#= link_to('Dashboard', dashboard_path, :data => {:pjax => '#main'}) %></li>
<li><%= link_to 'My Domains', domains_path, :data => {:pjax => '#main'} %></li> <li>
<li><%= link_to 'Dynamic Hosts', hosts_path, :data => {:pjax => '#main'} %></li> <%= link_to domains_path, :data => {:pjax => '#main'} do %>
<i class="icon white th-list"></i> My Domains
<% end %>
</li>
<li>
<%= link_to hosts_path, :data => {:pjax => '#main'} do %>
<i class="icon white th"></i> Dynamic Hosts
<% end %>
</li>
<% else %> <% else %>
<li><%= link_to('Home', root_path, :data => {:pjax => '#main'}) %></li> <li><%= link_to('Home', root_path, :data => {:pjax => '#main'}) %></li>
<li><%= link_to('About', page_path('about'), :data => {:pjax => '#main'}) %></li> <li><%= link_to('About', page_path('about'), :data => {:pjax => '#main'}) %></li>
@ -28,15 +36,44 @@
:related => "_clyfe:vaijab" :related => "_clyfe:vaijab"
} %> } %>
</li> </li>
<li><%= link_to('News', Settings.news_link) %></li> <li>
<li><%= link_to('Donate', page_path('donate'), :class => 'highlight', :data => {:pjax => '#main'}) %></li> <%= link_to(Settings.news_link, :rel => 'tooltip', :title => Settings.news_link) do %>
<i class="icon white share-alt"></i> News
<% end %>
</li>
<li>
<%= link_to(page_path('donate'), :class => 'highlight', :data => {:pjax => '#main'}) do %>
<i class="icon white heart"></i> Donate
<% end %>
</li>
<% if user_signed_in? %> <% if user_signed_in? %>
<li><%= link_to('Help & Support', page_path('help'), :data => {:pjax => '#main'}) %></li> <li>
<li><%= link_to(current_user.email, edit_user_registration_path, :title => "IP: #{client_remote_ip}", :data => {:pjax => '#main'}) %></li> <%= link_to(page_path('help'), :data => {:pjax => '#main'}) do %>
<li><%= link_to('Sign out', destroy_user_session_path, :method => :delete) %></li> <i class="icon white question-sign"></i> Help & Support
<% end %>
</li>
<li>
<%= link_to(edit_user_registration_path, :rel => 'tooltip',
:title => "IP: #{client_remote_ip}",:data => {:pjax => '#main'}) do %>
<i class="icon white user"></i> <%= current_user.email %>
<% end %>
</li>
<li>
<%= link_to(destroy_user_session_path, :method => :delete) do %>
<i class="icon white off"></i> Sign out
<% end %>
</li>
<% else %> <% else %>
<li><%= link_to('Sign up', new_user_registration_path, :data => {:pjax => '#main'}) %></li> <li>
<li><%= link_to('Sign in', new_user_session_path, :data => {:pjax => '#main'}) %></li> <%= link_to(new_user_registration_path, :data => {:pjax => '#main'}) do %>
<i class="icon white arrow-up"></i> Sign up
<% end %>
</li>
<li>
<%= link_to(new_user_session_path, :data => {:pjax => '#main'}) do %>
<i class="icon white arrow-right"></i> Sign in
<% end %>
</li>
<% end %> <% end %>
</ul> </ul>
</div> </div>

Loading…
Cancel
Save