gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch header navigation glyphs to FontAwesome

Browse source
This commit is contained in:
James Mason 2014-08-15 18:30:21 -07:00
parent ba1aed3c54
commit d50ac96c6b
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/views/layouts/_navigation.html.haml
View file

@ -29,16 +29,16 @@
- if current_page?(new_registration_path('user')) - if current_page?(new_registration_path('user'))
%li.active %li.active
= link_to(new_registration_path('user')) do = link_to(new_registration_path('user')) do
%span.glyphicon.glyphicon-heart %span.fa.fa-heart
Sign Up Sign Up
- else - else
%li %li
= link_to(new_registration_path('user')) do = link_to(new_registration_path('user')) do
%span.glyphicon.glyphicon-heart %span.fa.fa-heart
Sign Up Sign Up
%li.dropdown.visible-desktop %li.dropdown.visible-desktop
%a.dropdown-toggle{"data-toggle" => "dropdown", :href => "#"} %a.dropdown-toggle{"data-toggle" => "dropdown", :href => "#"}
%span.glyphicon.glyphicon-user %span.fa.fa-user
Sign In Sign In
%span.caret %span.caret
.dropdown-menu{:style => "padding: 17px;"} .dropdown-menu{:style => "padding: 17px;"}

12
app/views/layouts/_user_menu.html.haml
View file

@ -1,29 +1,29 @@
%li %li
= link_to(edit_user_registration_path) do = link_to(edit_user_registration_path) do
%span.glyphicon.glyphicon-wrench %span.fa.fa-wrench
Edit Account Edit Account
-if @conference and @conference.id -if @conference and @conference.id
%li %li
= link_to(conference_proposal_index_path(@conference.short_title)) do = link_to(conference_proposal_index_path(@conference.short_title)) do
%span.glyphicon.glyphicon-comment %span.fa.fa-comment
My Submissions My Submissions
%li %li
= link_to(destroy_user_session_path, :method=>'delete') do = link_to(destroy_user_session_path, :method=>'delete') do
%span.glyphicon.glyphicon-minus %span.fa.fa-minus
Sign out Sign out
- if can? :index, Conference - if can? :index, Conference
%li.divider %li.divider
%li %li
= link_to(admin_conference_index_path()) do = link_to(admin_conference_index_path()) do
- if Conference.any? - if Conference.any?
%span.glyphicon.glyphicon-home %span.fa.fa-home
Administration Administration
- else - else
%span.glyphicon.glyphicon-plus %span.fa.fa-plus
Create Conference Create Conference
-if @conference and @conference.id and can? :show, @conference -if @conference and @conference.id and can? :show, @conference
%li %li
= link_to(admin_conference_path(@conference.short_title)) do = link_to(admin_conference_path(@conference.short_title)) do
%span.glyphicon.glyphicon-cog %span.fa.fa-cog
Manage Manage
= @conference.short_title = @conference.short_title