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

Merge pull request #455 from bear454/drop_glyphs

Browse source 
Drop glyphs, use FontAwesome instead.
This commit is contained in:
James Mason 2014-08-19 08:54:01 -07:00
commit 0daeaf859f
13 changed files with 138 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/osem.js
View file

@ -104,11 +104,11 @@ $(function () {
//Hide all except this
$siblings = $(this).siblings().find("ul:visible");
$siblings.hide();
$siblings.parent().find('span:nth-child(2)').toggleClass("glyphicon-chevron-down glyphicon-chevron-right");
$siblings.parent().find('span:nth-child(2)').toggleClass("fa-chevron-down fa-chevron-right");
//show this
$(this).find("ul").show();
$(this).find('span:nth-child(2)').toggleClass("glyphicon-chevron-down glyphicon-chevron-right");
$(this).find('span:nth-child(2)').toggleClass("fa-chevron-down fa-chevron-right");
}
});

2
app/assets/stylesheets/osem.css.scss
View file

@ -33,7 +33,7 @@ body {
text-transform: uppercase;
}
.glyphicon {
.fa {
margin-right: 10px;
}

55
app/assets/stylesheets/strap-on.css.scss
View file

@ -5,5 +5,58 @@ $navbar-default-color: #ffffff;
$navbar-default-link-color: #ffffff;
$navbar-default-link-hover-color: #000000;
@import 'bootstrap';
@import 'bootstrap-datetimepicker';
//
// Bootstrap components
//
// Core variables and mixins
@import "bootstrap/variables";
@import "bootstrap/mixins";
// Reset and dependencies
@import "bootstrap/normalize";
@import "bootstrap/print";
// @import "bootstrap/glyphicons"; // Using FontAwesome instead
// Core CSS
@import "bootstrap/scaffolding";
@import "bootstrap/type";
@import "bootstrap/code";
@import "bootstrap/grid";
@import "bootstrap/tables";
@import "bootstrap/forms";
@import "bootstrap/buttons";
// Components
@import "bootstrap/component-animations";
@import "bootstrap/dropdowns";
@import "bootstrap/button-groups";
@import "bootstrap/input-groups";
@import "bootstrap/navs";
@import "bootstrap/navbar";
@import "bootstrap/breadcrumbs";
@import "bootstrap/pagination";
@import "bootstrap/pager";
@import "bootstrap/labels";
@import "bootstrap/badges";
@import "bootstrap/jumbotron";
@import "bootstrap/thumbnails";
@import "bootstrap/alerts";
@import "bootstrap/progress-bars";
@import "bootstrap/media";
@import "bootstrap/list-group";
@import "bootstrap/panels";
@import "bootstrap/responsive-embed";
@import "bootstrap/wells";
@import "bootstrap/close";
// Components w/ JavaScript
@import "bootstrap/modals";
@import "bootstrap/tooltip";
@import "bootstrap/popovers";
@import "bootstrap/carousel";
// Utility classes
@import "bootstrap/utilities";
@import "bootstrap/responsive-utilities";

4
app/helpers/application_helper.rb
View file

@ -60,9 +60,9 @@ module ApplicationHelper
def icon_for_todo(bool)
if bool
return 'glyphicon glyphicon-ok'
return 'fa fa-check'
else
return 'glyphicon glyphicon-remove'
return 'fa fa-times'
end
end

6
app/views/admin/conference/index.html.haml
View file

@ -65,15 +65,15 @@
%ul.nav.nav-tabs#recentTable
%li.active
%a{:href=>"#recent_user", "data-toggle"=>"tab"}
%span.glyphicon.glyphicon-user
%span.fa.fa-user
Recent Users
%li
%a{:href=>"#recent_reg", "data-toggle"=>"tab"}
%span.glyphicon.glyphicon-star
%span.fa.fa-check-square
Recent Registrations
%li
%a{:href=>"#recent_submissions", "data-toggle"=>"tab"}
%span.glyphicon.glyphicon-comment
%span.fa.fa-file-text
Recent Submissions
.tab-content
.tab-pane.active#recent_user

60
app/views/admin/conference/show.html.haml
View file

@ -1,35 +1,35 @@
%h1
%span.glyphicon.glyphicon-dashboard
%span.fa.fa-tachometer
Dashboard for #{@conference.title}
%hr
.row
.col-sm-4
.col-sm-4.col-xs-4
.dashbox.text-center
.icon
%i.glyphicon.glyphicon-star
.text
%label.text-muted total registrations: #{@total_reg}
%label.text-muted new registrations: #{@new_reg}
.row
= render partial: 'targets', locals: { targets: @registration_targets, name: 'registrations' }
.col-sm-4
%span.fa.fa-user.fa-lg
%span.fa.fa-lg
= @total_user
%p
%small
#{'Registration'.pluralize(@registration_targets)}
.col-sm-4.col-xs-4
.dashbox.text-center
.icon
%i.glyphicon.glyphicon-comment
.text
%label.text-muted total submissions: #{@total_submissions}
%label.text-muted new submissions: #{@new_submissions}
.row
= render partial: 'targets', locals: { targets: @submission_targets, name: 'submissions' }
.col-sm-4
%span.fa.fa-check-square.fa-lg
%span.fa.fa-lg
= @total_reg
%p
%small
#{'Submission'.pluralize(@submission_targets)}
.col-sm-4.col-xs-4
.dashbox.text-center
.icon
%i.glyphicon.glyphicon-user
.text
%label.text-muted program: #{@program_length} min
%label.text-muted new program: #{@new_program_length} min
.row
= render partial: 'targets', locals: { targets: @program_minutes_targets, name: 'program_hours' }
%span.fa.fa-file-text.fa-lg
%span.fa.fa-lg
= @total_submissions
%p
%small
#{'Hour'.pluralize(@program_minutes_targets)}
.row
.col-md-12
.row
@ -61,11 +61,11 @@
%ul.nav.nav-tabs#doughnut_tabs
%li.active
%a{:href=>"#distribution_all", "data-toggle"=>"tab"}
%span.glyphicon.glyphicon-star
%span.fa.fa-star
All
%li
%a{:href=>"#distribution_confirmed", "data-toggle"=>"tab"}
%span.glyphicon.glyphicon-comment
%span.fa.fa-comment
Confirmed
.tab-content
.tab-pane.active#distribution_all
@ -90,11 +90,11 @@
%ul.nav.nav-tabs#recentTable
%li.active
%a{:href=>"#recent_reg", "data-toggle"=>"tab"}
%span.glyphicon.glyphicon-star
%span.fa.fa-user
Recent Registrations
%li
%a{:href=>"#recent_submissions", "data-toggle"=>"tab"}
%span.glyphicon.glyphicon-comment
%span.fa.fa-file-text
Recent Submissions
.tab-content
.tab-pane.active#recent_reg
@ -107,7 +107,7 @@
.col-md-12
%h3
%span
%i.glyphicon.glyphicon-flag
%i.fa.fa-flag
Campaigns
= render partial: 'campaigns', locals: {campaigns: @campaigns, name: 'campaigns'}

4
app/views/conference/_gallery.html.haml
View file

@ -9,9 +9,9 @@
<!-- Controls -->
%a{ class: "left carousel-control", href: "#carousel-example-generic", role: "button", "data-slide" => "prev" }
%span{ class: "glyphicon glyphicon-chevron-left" }
%span.fa.fa-chevron-left
%a{ class: "right carousel-control", href: "#carousel-example-generic", role: "button", "data-slide" => "next" }
%span{ class: "glyphicon glyphicon-chevron-right" }
%span.fa.fa-chevron-right
:javascript

36
app/views/layouts/_admin_sidebar.html.haml
View file

@ -1,25 +1,25 @@
%ul.nav.nav-stacked.nav-pills.mySidebar
.btn-group
%button{type:'button', class:'btn btn-default btn-link dropdown-toggle', 'data-toggle'=>'dropdown'}
%span.glyphicon.glyphicon-cog
%span.fa.fa-cog
= @conference.short_title
%span.caret
%ul.dropdown-menu{role:'menu'}
%li
= link_to(admin_conference_index_path) do
%span.glyphicon.glyphicon-home
%span.fa.fa-home
All Conferences
- @conferences.each do |conference|
- if can? :show, conference
%li
= link_to(admin_conference_path(conference.short_title)) do
%span.glyphicon.glyphicon-cog
%span.fa.fa-cog
Manage
= conference.short_title
- if (current_user.is_admin) || (current_user.has_role? :organizer, :any)
%li
= link_to(new_admin_conference_path) do
%span.glyphicon.glyphicon-plus
%span.fa.fa-plus
New Conference
%hr
- if can? :show, @conference
@ -56,35 +56,35 @@
- if can? :update, @conference.events.build
%li{:class=> active_nav_li(admin_conference_events_path(@conference.short_title))}
= link_to(admin_conference_events_path(@conference.short_title)) do
%span.glyphicon.glyphicon-comment
%span.fa.fa-comment
Events
- if can? :update, Registration.new(conference_id: @conference.id)
%li{:class=> active_nav_li(admin_conference_registrations_path(@conference.short_title))}
= link_to(admin_conference_registrations_path(@conference.short_title)) do
%span.glyphicon.glyphicon-user
%span.fa.fa-user
Registrations
- if can? :update, @conference.events.build
%li{class: active_nav_li(admin_conference_schedule_path(@conference.short_title))}
= link_to(admin_conference_schedule_path(@conference.short_title), target: '_blank') do
%span.glyphicon.glyphicon-calendar
%span.fa.fa-calendar
Schedule
- if can? :update, @conference
%li{class: active_nav_li(admin_conference_campaigns_path(@conference.short_title))}
= link_to(admin_conference_campaigns_path(@conference.short_title)) do
%span.glyphicon.glyphicon-bullhorn
%span.fa.fa-bullhorn
Campaigns
%hr
- if can? :update, @conference.targets.build
%li{:class=> "#{active_nav_li(admin_conference_targets_path(@conference.short_title))}"}
= link_to(admin_conference_targets_path(@conference.short_title)) do
%span.glyphicon.glyphicon-flag
%span.fa.fa-flag
Targets
- if can? :index, @conference.venue
%li{:class=> "#{active_nav_li(admin_conference_venue_info_path(@conference.short_title))} myAccordion"}
= link_to(admin_conference_venue_info_path(@conference.short_title)) do
%span.glyphicon.glyphicon-road
%span.fa.fa-road
Venue
%span.small.glyphicon.glyphicon-chevron-right
%span.small.fa.fa-chevron-right
%ul.nav.nav-stacked.nav-pills.small.collapse.subNav
- if can? :update, @conference.rooms.build
%li{:class=> active_nav_li(admin_conference_rooms_path(@conference.short_title))}
@ -95,9 +95,9 @@
- if can? :update, @conference.sponsorship_levels.build
%li{:class=> "#{active_nav_li(admin_conference_sponsorship_levels_path(@conference.short_title))} myAccordion" }
= link_to(admin_conference_sponsorship_levels_path(@conference.short_title)) do
%span.glyphicon.glyphicon-star
%span.fa.fa-star
Sponsorship
%span.small.glyphicon.glyphicon-chevron-right
%span.small.fa.fa-chevron-right
%ul.nav.nav-stacked.nav-pills.small.collapse.subNav
- if can? :update, @conference.sponsors.build
%li{:class=> active_nav_li(admin_conference_sponsors_path(@conference.short_title))}
@ -105,19 +105,19 @@
- if can? :update, @conference.supporter_levels.build
%li{ class: active_nav_li(admin_conference_supporter_levels_path(@conference.short_title)) }
= link_to(admin_conference_supporter_levels_path(@conference.short_title)) do
%span.glyphicon.glyphicon-usd
%span.fa.fa-usd
Supporter Levels
- if can? :update, @conference.email_settings
%li{:class=> active_nav_li(admin_conference_emails_path(@conference.short_title))}
= link_to(admin_conference_emails_path(@conference.short_title)) do
%span.glyphicon.glyphicon-envelope
%span.fa.fa-envelope
E-Mails
- if can? :update, CallForPapers.new(conference_id: @conference.id)
%li{:class=> "#{active_nav_li(admin_conference_callforpapers_path(@conference.short_title))} myAccordion"}
= link_to(admin_conference_callforpapers_path(@conference.short_title)) do
%span.glyphicon.glyphicon-comment
%span.fa.fa-comment
Call for papers
%span.small.glyphicon.glyphicon-chevron-right
%span.small.fa.fa-chevron-right
%ul.nav.nav-stacked.nav-pills.small.collapse.subNav
- if can? :update, @conference.tracks.build
%li{:class=> active_nav_li(admin_conference_tracks_path(@conference.short_title))}
@ -131,7 +131,7 @@
- if can? :update, Question.new(conference_id: @conference.id)
%li{:class=> active_nav_li(admin_conference_questions_path(@conference.short_title))}
= link_to(admin_conference_questions_path(@conference.short_title)) do
%span.glyphicon.glyphicon-question-sign
%span.fa.fa-question
Questions
- if can? :manage, @conference
%li{:class=> active_nav_li(roles_admin_conference_path(@conference.short_title))}

10
app/views/layouts/_admin_sidebar_index.html.haml
View file

@ -1,29 +1,29 @@
%ul.nav.nav-pills.nav-stacked.mySidebar
.btn-group
%button{type: 'button', class: 'btn btn-default btn-link dropdown-toggle', 'data-toggle'=>'dropdown'}
%span.glyphicon.glyphicon-home
%span.fa.fa-home
All Conferences
%span.caret
%ul.dropdown-menu{role: 'menu'}
%li
= link_to(admin_conference_index_path) do
%span.glyphicon.glyphicon-home
%span.fa.fa-home
All Conferences
- @conferences.each do |conference|
- if can? :show, conference
%li
= link_to(admin_conference_path(conference.short_title)) do
%span.glyphicon.glyphicon-cog
%span.fa.fa-cog
Manage
= conference.short_title
- if (current_user.is_admin) || (current_user.has_role? :organizer, :any)
%li
= link_to(new_admin_conference_path) do
%span.glyphicon.glyphicon-plus
%span.fa.fa-plus
New Conference
- if can? :index, User
%hr
%li
= link_to(admin_users_path) do
%span.glyphicon.glyphicon-user
%span.fa.fa-user
Users

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

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

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

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

8
app/views/proposal/_form.html.haml
View file

@ -55,7 +55,7 @@
.row-fluid.fileupload-buttonbar
.btn.btn-success.fileinput-button
%span.glyphicon.glyphicon-icon-plus.icon-white
%span.fa.fa-plus
Add files...
= f.file_field :attachment
= f.hidden_field :event_id, :value => @event.id
@ -100,7 +100,7 @@
{% } else if (o.files.valid && !i) { %}
<td class="start">{% if (!o.options.autoUpload) { %}
<button class="btn btn-primary">
<span class="glyphicon glyphicon-upload"></span>
<span class="fa fa-upload"></span>
<span>{%=locale.fileupload.start%}</span>
</button>
{% } %}</td>
@ -109,7 +109,7 @@
{% } %}
<td class="cancel">{% if (!i) { %}
<button class="btn btn-warning">
<span class="glyphicon glyphicon-circle"></span>
<span class="fa fa-times"></span>
<span>{%=locale.fileupload.cancel%}</span>
</button>
{% } %}</td>
@ -138,7 +138,7 @@
{% } %}
<td class="delete" colspan="2">
<button class="btn btn-danger pull-right" data-type="{%=file.delete_type%}" data-url="{%=file.delete_url%}">
<span class="glyphicon glyphicon-trash"></i>
<span class="fa fa-trash-o"></i>
<span>{%=locale.fileupload.destroy%}</span>
</button>
</td>

16
app/views/schedule/index.html.erb
View file

@ -54,7 +54,7 @@
:style => "padding:8px;" %>
<%- end %>
<h5>
<span class="glyphicon glyphicon-comment"></span>
<span class="fa fa-comment"></span>
<%= event[0].title %>
<% unless event[0].subtitle.blank? %>
<span class="schedule-subtitle">
@ -64,12 +64,12 @@
</h5>
</span>
<span class="schedule-speaker">
<span class="glyphicon glyphicon-user"></span>
<span class="fa fa-user"></span>
<%= "#{speaker.name}" %>
</span>
<% if event[0].track%>
<span class="schedule-track">
<span class="glyphicon glyphicon-road"></span>
<span class="fa fa-road"></span>
<span class="label" style="background-color:<%= event[0].track.color if event[0].track %>"><%= event[0].track.name %></span>
</span>
<% end -%>
@ -94,18 +94,18 @@
</div>
<%= javascript_tag do %>
jQuery( function($) {
$('tbody tr td[data-href]').addClass('clickable').mouseup(function(e) {
jQuery( function($) {
$('tbody tr td[data-href]').addClass('clickable').mouseup(function(e) {
if(e.which===1)
{
window.location = $(this).attr('data-href');
window.location = $(this).attr('data-href');
}
else if(e.which===2)
{
window.open($(this).attr('data-href'), '_blank');
}
});
});
});
});
$(function() {
// add a hash to the URL when the user clicks on a tab