Permalink
Browse files

convert to using font glyphicon

  • Loading branch information...
1 parent 201a8bc commit 724c028361b657ec0fc3575b18dc6d4dc42eab70 @lukebaker lukebaker committed Aug 21, 2013
@@ -16,7 +16,7 @@
%td= @choice.created_at.getlocal.strftime("%m/%d/%Y")
%tr
%th= t('items.score')
- %td= @choice.score.round.to_s + ' ' + link_to('', '#score_explanation', :"data-toggle" => 'modal', :"data-dismiss" => 'modal', :class => 'icon-question-sign')
+ %td= @choice.score.round.to_s + ' ' + link_to('', '#score_explanation', :"data-toggle" => 'modal', :"data-dismiss" => 'modal', :class => 'glyphicon glyphicon-question-sign')
%tr
%th= t('items.completed_contests')
%td#num_votes= @num_votes
@@ -13,16 +13,16 @@
%th= t('admin.active_user_ideas')
%th
Vote Rate
- = link_to('', '#vote-rate', :"data-toggle" => 'modal', :class => 'icon-question-sign')
+ = link_to('', '#vote-rate', :"data-toggle" => 'modal', :class => 'glyphicon glyphicon-question-sign')
%th
UPR
- = link_to('', '#upload-participation-rate', :"data-toggle" => 'modal', :class => 'icon-question-sign')
+ = link_to('', '#upload-participation-rate', :"data-toggle" => 'modal', :class => 'glyphicon glyphicon-question-sign')
%th
MRS
- = link_to('', '#median-responses-session', :"data-toggle" => 'modal', :class => 'icon-question-sign')
+ = link_to('', '#median-responses-session', :"data-toggle" => 'modal', :class => 'glyphicon glyphicon-question-sign')
%th
VUC
- = link_to('', '#votes-uploaded-choice', :"data-toggle" => 'modal', :class => 'icon-question-sign')
+ = link_to('', '#votes-uploaded-choice', :"data-toggle" => 'modal', :class => 'glyphicon glyphicon-question-sign')
%th= t('admin.created')
%th= "Status"
%tbody
@@ -11,7 +11,7 @@
<meta property="og:site_name" content="All Our Ideas"/>
%link{:rel => "shortcut icon", :href => "http://www.allourideas.org/favicon.ico"}
%title= t('common.title')
- = stylesheet_link_tag 'flexslider/flexslider.css', 'styles', 'screen'
+ = stylesheet_link_tag 'glyphicon', 'flexslider/flexslider.css', 'styles', 'screen'
<link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.7.3/themes/ui-lightness/jquery-ui.css" type="text/css" media="all" />
= stylesheet_link_tag 'ui.theme', :media => 'all'
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js" type="text/javascript"></script>
@@ -16,12 +16,12 @@
%span.question-name
= @question.attributes['name']
- if ((@question.votes_count == 0 && current_user.owns?(@earl)) || current_user.admin?)
- = link_to("<i class='icon-pencil'></i>", '#edit-question', :"data-toggle" => 'modal', :class => 'btn')
+ = link_to("<i class='glyphicon glyphicon-pencil'></i>", '#edit-question', :"data-toggle" => 'modal', :class => 'btn')
- else
- = link_to("<i class='icon-pencil'></i>", '#cant-edit-question', :"data-toggle" => 'modal', :class => 'btn')
+ = link_to("<i class='glyphicon glyphicon-pencil'></i>", '#cant-edit-question', :"data-toggle" => 'modal', :class => 'btn')
%th.score
= t('items.score')
- = link_to('', '#score_explanation', :"data-toggle" => 'modal', :class => 'icon-question-sign')
+ = link_to('', '#score_explanation', :"data-toggle" => 'modal', :class => 'glyphicon glyphicon-question-sign')
%th.score= t('questions.source')
%th.score= t('items.list.status').titleize
%tbody
@@ -58,27 +58,27 @@
.controls
= text_field_tag '', @earl.name, :disabled => true, :id => 'question_username'
.control-group
- = f.label :pass, t('user.password') + link_to(' <i class="icon-question-sign"></i>', '#password_explanation', :"data-toggle" => 'modal'), :class => 'control-label'
+ = f.label :pass, t('user.password') + ' ' + link_to('<i class="glyphicon glyphicon-question-sign"></i>', '#password_explanation', :"data-toggle" => 'modal'), :class => 'control-label'
.controls
= f.text_field :pass
.control-group
- = f.label :welcome_message, "Welcome message" + link_to(' <i class="icon-question-sign"></i>', '#welcome_msg_explanation', :"data-toggle" => 'modal'), :class => 'control-label'
+ = f.label :welcome_message, "Welcome message " + link_to('<i class="glyphicon glyphicon-question-sign"></i>', '#welcome_msg_explanation', :"data-toggle" => 'modal'), :class => 'control-label'
.controls
= f.text_area :welcome_message, :rows => 5, :cols => 65, :class => 'input-xxlarge'
.control-group
- = f.label :default_lang, "Default language" + link_to(' <i class="icon-question-sign"></i>', 'http://blog.allourideas.org/post/5137327337/languages-and-all-our-ideas', :target=> '_blank'), :class => 'control-label'
+ = f.label :default_lang, "Default language " + link_to('<i class="glyphicon glyphicon-question-sign"></i>', 'http://blog.allourideas.org/post/5137327337/languages-and-all-our-ideas', :target=> '_blank'), :class => 'control-label'
.controls
= # Have English be the first, but sort the rest
= f.select :default_lang, [["English", "en"]] + [["French", "fr"], ["Spanish", "es"], ["Portuguese", "pt"], ["Arabic", "ar"], ["Turkish", "tr"], ["Italian", "it"], ["Dutch", "nl"], ["Hebrew", "he"], ["German", "de"], ["Farsi", "fa"], ["Finnish", "fi"], ["Albanian", "sq"], ["Chinese", "zh"]].sort
.control-group
- = f.label :ga_code, t('admin.google_analytics_code') + link_to(' <i class="icon-quesiton-sign"></i>', 'http://blog.allourideas.org/post/947544304/add-google-analytics-on-your-idea-marketplace', :target=> '_blank'), :class => 'control-label'
+ = f.label :ga_code, t('admin.google_analytics_code') + ' ' + link_to('<i class="glyphicon glyphicon-question-sign"></i>', 'http://blog.allourideas.org/post/947544304/add-google-analytics-on-your-idea-marketplace', :target=> '_blank'), :class => 'control-label'
.controls
= f.text_field :ga_code
.control-group
%label.control-label
= t('admin.widget_embed_code')
- = link_to('', 'http://blog.allourideas.org/post/912665189/improved-widget-gives-you-more-control', :target=> '_blank', :class => 'icon-question-sign')
+ = link_to('', 'http://blog.allourideas.org/post/912665189/improved-widget-gives-you-more-control', :target=> '_blank', :class => 'glyphicon glyphicon-question-sign')
.controls
%input.widget-embed-code.input-xxlarge{:type => 'text', :readonly => 'readonly', :size => 30, :value => "<iframe src='http://widget.allourideas.org/#{@earl.name}' width='550' height='650' frameborder='0' scrolling='no'></iframe>"}
#edit-image.control-group
@@ -92,7 +92,7 @@
.controls
%label.checkbox
= f.check_box :flag_enabled
- = f.label :flag_enabled, t('admin.allow_flag_as_inappropriate') + link_to(' <i class="icon-question-sign"></i>', '#allow_flag_as_inappropriate_exp', :"data-toggle" => 'modal')
+ = f.label :flag_enabled, t('admin.allow_flag_as_inappropriate') + ' ' + link_to('', '#allow_flag_as_inappropriate_exp', :"data-toggle" => 'modal', :class => 'glyphicon glyphicon-question-sign')
= f.check_box :question_should_autoactivate_ideas
= f.label :question_should_autoactivate_ideas, t('admin.auto_activate_exp')
.form-actions
@@ -106,7 +106,7 @@
%tr
%th
= t('admin.download_idea_marketplace_data')
- = link_to('', 'http://blog.allourideas.org/post/2739358388/download-your-data', :target=> '_blank', :class => 'icon-question-sign')
+ = link_to('', 'http://blog.allourideas.org/post/2739358388/download-your-data', :target=> '_blank', :class => 'glyphicon glyphicon-question-sign')
%tbody
%tr
%td.title
@@ -14,7 +14,7 @@
%th.score
%h4
= t('common.score').titleize + " (0 - 100)"
- = link_to('', '#score_explanation', :"data-toggle" => 'modal', :class => 'icon-question-sign')
+ = link_to('', '#score_explanation', :"data-toggle" => 'modal', :class => 'glyphicon glyphicon-question-sign')
%th &nbsp;
%tbody
- @choices.each do |choice|
@@ -52,7 +52,7 @@
.accordion-heading
.accordion-toggle{:"data-toggle" => 'collapse', :"data-target" => '#word_cloud_ideas'}
= link_to(t('results.word_cloud_ideas_title'), url_for(:action => :word_cloud), :"data-preventDefault" => true)
- = link_to('', '#word_cloud_exp', :"data-toggle" => 'modal', :class => 'icon-question-sign')
+ = link_to('', '#word_cloud_exp', :"data-toggle" => 'modal', :class => 'glyphicon glyphicon-question-sign')
%button.close.hide x
#word_cloud_ideas.accordion-body.collapse
.accordion-inner
@@ -62,7 +62,7 @@
.accordion-heading
.accordion-toggle{:"data-toggle" => 'collapse', :"data-target" => '#word_cloud_weighted'}
= link_to(t('results.word_cloud_weighted_title'), url_for(:action => :word_cloud, :type => 'weight_by_score'), :"data-preventDefault" => true)
- = link_to('', '#word_cloud_exp', :"data-toggle" => 'modal', :class => 'icon-question-sign')
+ = link_to('', '#word_cloud_exp', :"data-toggle" => 'modal', :class => 'glyphicon glyphicon-question-sign')
%button.close.hide x
#word_cloud_weighted.accordion-body.collapse
#wcdiv-weight_by_score.accordion-inner
@@ -72,7 +72,7 @@
.accordion-heading
.accordion-toggle{:"data-toggle" => 'collapse', :"data-target" => '#word_cloud_uploaded'}
= link_to(t('results.word_cloud_uploaded_title'), url_for(:action => :word_cloud, :type => 'uploaded'), :"data-preventDefault" => true)
- = link_to('', '#word_cloud_exp', :"data-toggle" => 'modal', :class => 'icon-question-sign')
+ = link_to('', '#word_cloud_exp', :"data-toggle" => 'modal', :class => 'glyphicon glyphicon-question-sign')
%button.close.hide x
#word_cloud_uploaded.accordion-body.collapse
.accordion-inner
@@ -82,7 +82,7 @@
.accordion-heading
.accordion-toggle{:"data-toggle" => 'collapse', :"data-target" => '#word_cloud_uploaded_weighted'}
= link_to(t('results.word_cloud_uploaded_weighted_title'), url_for(:action => :word_cloud, :type => 'uploaded_weight_by_score'), :"data-preventDefault" => true)
- = link_to('', '#word_cloud_exp', :"data-toggle" => 'modal', :class => 'icon-question-sign')
+ = link_to('', '#word_cloud_exp', :"data-toggle" => 'modal', :class => 'glyphicon glyphicon-question-sign')
%button.close.hide x
#word_cloud_uploaded_weighted.accordion-body.collapse
.accordion-inner
@@ -140,7 +140,7 @@
.accordion-heading
.accordion-toggle{:"data-toggle" => 'collapse', :"data-target" => "#world_map_bounces"}
= link_to("World Map of bounces (viewed once and then left) (super-admin only)", url_for(:action => :voter_map, :type => 'bounces'), :"data-preventDefault" => true)
- = link_to('', '#bounce_explanation', :"data-toggle" => 'modal', :class => 'icon-question-sign')
+ = link_to('', '#bounce_explanation', :"data-toggle" => 'modal', :class => 'glyphicon glyphicon-question-sign')
%button.close.hide x
#world_map_bounces.accordion-body.collapse.map
.accordion-inner
@@ -16,9 +16,9 @@
= image_tag(@earl.logo.url(@earl.logo_size.to_sym))
-if (current_user.try(:owns?, @earl) || current_user.try(:admin?)) && local_assigns.has_key?("show_delete")
.survey-image-links
- =link_to("<i class='icon-pencil'></i>", url_for(:action => :admin, :controller => :questions, :id => @the_id, :anchor => 'edit-image'), :class => 'btn')
+ =link_to("<i class='glyphicon glyphicon-pencil'></i>", url_for(:action => :admin, :controller => :questions, :id => @the_id, :anchor => 'edit-image'), :class => 'btn')
- if !@earl.logo_file_name.nil?
- =link_to("<i class='icon-trash'></i>", {:action => :delete_logo}, :method => :delete, :class => 'btn')
+ =link_to("<i class='glyphicon glyphicon-trash'></i>", {:action => :delete_logo}, :method => :delete, :class => 'btn')
.row-fluid
.span12
%ul.nav.nav-tabs.vote-tabs.pull-right
Binary file not shown.
Oops, something went wrong.

0 comments on commit 724c028

Please sign in to comment.