playground
/
entrydns
mirror of https://github.com/EntryDNS/entrydns.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

use b3 glyphicons font

pull/1/head
Nicolae Claudius 12 years ago
parent
e9776bc3d8
commit
94f030875c
4 changed files with 15 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      Gemfile
  2. 6
      Gemfile.lock
  3. 16
      app/views/shared/navigation/_public.html.erb
  4. 12
      app/views/shared/navigation/_users.html.erb

1
Gemfile
Unescape View File

@ -41,7 +41,6 @@ gem 'compass-rails',
gem 'bootstrap-sass', gem 'bootstrap-sass',
git: 'git://github.com/thomas-mcdonald/bootstrap-sass.git', git: 'git://github.com/thomas-mcdonald/bootstrap-sass.git',
branch: '3' branch: '3'
gem 'font-awesome-sass-rails', '~> 3.0.0'
gem 'webshims-rails', '~> 1.10.10' gem 'webshims-rails', '~> 1.10.10'
gem 'detect_timezone_rails', '~> 0.0.3' gem 'detect_timezone_rails', '~> 0.0.3'
# gem 'jquery-cookie-rails', '~> 1.3.1' # gem 'jquery-cookie-rails', '~> 1.3.1'

6
Gemfile.lock
Unescape View File

@ -14,7 +14,7 @@ GIT
GIT GIT
remote: git://github.com/thomas-mcdonald/bootstrap-sass.git remote: git://github.com/thomas-mcdonald/bootstrap-sass.git
revision: 4a8d1a9add83896cbc5f5441e209b00626f74338 revision: 571ba865e1cd01f583c5949446803b9f2cd21926
branch: 3 branch: 3
specs: specs:
bootstrap-sass (3.0.0.0) bootstrap-sass (3.0.0.0)
@ -161,9 +161,6 @@ GEM
ffi (1.9.0) ffi (1.9.0)
file-tail (1.0.12) file-tail (1.0.12)
tins (~> 0.5) tins (~> 0.5)
font-awesome-sass-rails (3.0.2.2)
railties (>= 3.1.1)
sass-rails (>= 3.1.1)
formatador (0.2.4) formatador (0.2.4)
fssm (0.2.10) fssm (0.2.10)
gem_plugin (0.2.3) gem_plugin (0.2.3)
@ -375,7 +372,6 @@ DEPENDENCIES
devise (~> 3.0.3) devise (~> 3.0.3)
factory_girl_rails (~> 4.2.1) factory_girl_rails (~> 4.2.1)
faker (~> 1.2.0) faker (~> 1.2.0)
font-awesome-sass-rails (~> 3.0.0)
guard (= 1.8.2) guard (= 1.8.2)
guard-rspec (= 3.0.2) guard-rspec (= 3.0.2)
jquery-rails (~> 3.0.4) jquery-rails (~> 3.0.4)

16
app/views/shared/navigation/_public.html.erb
Unescape View File

@ -1,31 +1,31 @@
<% semantic_navigation :public_nav, html: { class: 'nav navbar-nav' } do |n| %> <% semantic_navigation :public_nav, html: { class: 'nav navbar-nav' } do |n| %>
<%= n.item '', link: page_path('about') do %> <%= n.item '', link: page_path('about') do %>
<i class="icon-white icon-info-sign"></i> About <i class="glyphicon glyphicon-info-sign"></i> About
<% end %> <% end %>
<%= n.item '', link: page_path('team') do %> <%= n.item '', link: page_path('team') do %>
<i class="icon-white icon-user"></i> Team <i class="glyphicon glyphicon-user"></i> Team
<% end %> <% end %>
<%= n.item '', link: page_path('contact') do %> <%= n.item '', link: page_path('contact') do %>
<i class="icon-white icon-envelope"></i> Contact <i class="glyphicon glyphicon-envelope"></i> Contact
<% end %> <% end %>
<%= n.item '', link: page_path('help') do %> <%= n.item '', link: page_path('help') do %>
<i class="icon-white icon-question-sign"></i> Help & Support <i class="glyphicon glyphicon-question-sign"></i> Help & Support
<% end %> <% end %>
<% end %> <% end %>
<% semantic_navigation :session_nav, html: { class: 'nav navbar-nav pull-right' } do |n| %> <% semantic_navigation :session_nav, html: { class: 'nav navbar-nav pull-right' } do |n| %>
<%= n.item '', link: Settings.news_link, <%= n.item '', link: Settings.news_link,
html: { rel: 'tooltip', data: { placement: 'bottom' }, title: Settings.news_link } do %> html: { rel: 'tooltip', data: { placement: 'bottom' }, title: Settings.news_link } do %>
<i class="icon-white icon-share-alt"></i> News <i class="glyphicon glyphicon-share-alt"></i> News
<% end %> <% end %>
<%= n.item '', link: page_path('donate'), <%= n.item '', link: page_path('donate'),
html: { rel: 'tooltip', title: 'PayPal', data: { placement: 'bottom' }, class: 'highlight' } do %> html: { rel: 'tooltip', title: 'PayPal', data: { placement: 'bottom' }, class: 'highlight' } do %>
<i class="icon-white icon-heart"></i> Donate <i class="glyphicon glyphicon-heart"></i> Donate
<% end %> <% end %>
<%= n.item '', link: new_user_registration_path do %> <%= n.item '', link: new_user_registration_path do %>
<i class="icon-white icon-arrow-up"></i> Sign up <i class="glyphicon glyphicon-arrow-up"></i> Sign up
<% end %> <% end %>
<%= n.item '', link: new_user_session_path do %> <%= n.item '', link: new_user_session_path do %>
<i class="icon-white icon-arrow-right"></i> Sign in <i class="glyphicon glyphicon-arrow-right"></i> Sign in
<% end %> <% end %>
<% end %> <% end %>

12
app/views/shared/navigation/_users.html.erb
Unescape View File

@ -1,27 +1,27 @@
<% semantic_navigation :application_nav, html: { class: 'nav navbar-nav' } do |n| %> <% semantic_navigation :application_nav, html: { class: 'nav navbar-nav' } do |n| %>
<%= n.item '', link: domains_path do %> <%= n.item '', link: domains_path do %>
<i class="icon-white icon-th-list"></i> My Domains <i class="glyphicon glyphicon-th-list"></i> My Domains
<% end %> <% end %>
<%= n.item '', link: hosts_path do %> <%= n.item '', link: hosts_path do %>
<i class="icon-white icon-th"></i> Dynamic Hosts <i class="glyphicon glyphicon-th"></i> Dynamic Hosts
<% end %> <% end %>
<%= n.item '', link: page_path('help') do %> <%= n.item '', link: page_path('help') do %>
<i class="icon-white icon-question-sign"></i> Help & Support <i class="glyphicon glyphicon-question-sign"></i> Help & Support
<% end %> <% end %>
<% end %> <% end %>
<% semantic_navigation :user_nav, html: { class: 'nav navbar-nav navbar-right' } do |n| %> <% semantic_navigation :user_nav, html: { class: 'nav navbar-nav navbar-right' } do |n| %>
<%= n.item '', link: Settings.news_link, <%= n.item '', link: Settings.news_link,
html: { rel: 'tooltip', data: { placement: 'bottom' }, title: Settings.news_link } do %> html: { rel: 'tooltip', data: { placement: 'bottom' }, title: Settings.news_link } do %>
<i class="icon-white icon-share-alt"></i> News <i class="glyphicon glyphicon-share-alt"></i> News
<% end %> <% end %>
<%= n.item '', link: page_path('donate'), <%= n.item '', link: page_path('donate'),
html: { rel: 'tooltip', title: 'PayPal', data: { placement: 'bottom' }, class: 'highlight' } do %> html: { rel: 'tooltip', title: 'PayPal', data: { placement: 'bottom' }, class: 'highlight' } do %>
<i class="icon-white icon-heart"></i> Donate <i class="glyphicon glyphicon-heart"></i> Donate
<% end %> <% end %>
<li class="dropdown"> <li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">
<i class="icon-white icon-user"></i> <%= current_user.email %> <b class="caret"></b> <i class="glyphicon glyphicon-user"></i> <%= current_user.email %> <b class="caret"></b>
</a> </a>
<%= n.group do %> <%= n.group do %>
<%= n.item '', link: edit_user_registration_path, html: { rel: 'tooltip', title: "IP: #{client_remote_ip}" } do %> <%= n.item '', link: edit_user_registration_path, html: { rel: 'tooltip', title: "IP: #{client_remote_ip}" } do %>

Write Preview
Loading…
Cancel
Save