diff --git a/app/assets/fonts/flatfeticon2.eot b/app/assets/fonts/flatfeticon2.eot new file mode 100644 index 0000000..d0c62f1 Binary files /dev/null and b/app/assets/fonts/flatfeticon2.eot differ diff --git a/app/assets/fonts/flatfeticon2.html b/app/assets/fonts/flatfeticon2.html new file mode 100644 index 0000000..798a1f3 --- /dev/null +++ b/app/assets/fonts/flatfeticon2.html @@ -0,0 +1,537 @@ + + + + + Flaticon WebFont + + + + + + +
+

+ + FLATICON + Font Demo +

+
+ +
+
+ +
Instructions:
+ + +
+ +
+ +
+
+
.flaticon-accident3
Author: Freepik
+
+
.flaticon-alphabet3
Author: Freepik
+
+
.flaticon-angel
Author: Freepik
+
+
.flaticon-angry
Author: Freepik
+
+
.flaticon-angry2
Author: Freepik
+
+
.flaticon-angry23
Author: Freepik
+
+
.flaticon-angry40
Author: Freepik
+
+
.flaticon-angry41
Author: Freepik
+
+
.flaticon-animal203
Author: Freepik
+
+
.flaticon-annulled3
Author: Freepik
+
+
.flaticon-bandaid
Author: Freepik
+
+
.flaticon-battery88
Author: Freepik
+
+
.flaticon-book97
Author: Freepik
+
+
.flaticon-boy11
Author: Freepik
+
+
.flaticon-boy12
Author: Freepik
+
+
.flaticon-business57
Author: SimpleIcon
+
+
.flaticon-camouflage
Author: Freepik
+
+
.flaticon-car65
Author: Freepik
+
+
.flaticon-certificate7
Author: Freepik
+
+
.flaticon-checklist4
Author: Freepik
+
+
.flaticon-circuit4
Author: Freepik
+
+
.flaticon-confused4
Author: Freepik
+
+
.flaticon-cpu
Author: Freepik
+
+
.flaticon-cpu1
Author: Freepik
+
+
.flaticon-cry1
Author: Freepik
+
+
.flaticon-cry2
Author: Freepik
+
+
.flaticon-crying7
Author: Freepik
+
+
.flaticon-customerservice10
Author:
+
+
.flaticon-doubt3
Author: Freepik
+
+
.flaticon-doubts1
Author: Freepik
+
+
.flaticon-drinks48
Author: Freepik
+
+
.flaticon-education6
Author: Freepik
+
+
.flaticon-election3
Author: Freepik
+
+
.flaticon-electronic51
Author: Freepik
+
+
.flaticon-emoticon101
Author: Freepik
+
+
.flaticon-emoticon82
Author: Freepik
+
+
.flaticon-emoticon83
Author: Freepik
+
+
.flaticon-emoticon98
Author: Freepik
+
+
.flaticon-emoticons11
Author: Freepik
+
+
.flaticon-family4
Author: OCHA
+
+
.flaticon-fear3
Author: Freepik
+
+
.flaticon-first21
Author: SimpleIcon
+
+
.flaticon-fright
Author: Freepik
+
+
.flaticon-furious3
Author: Freepik
+
+
.flaticon-graduate2
Author: Freepik
+
+
.flaticon-group58
Author: Freepik
+
+
.flaticon-handshake3
Author: Freepik
+
+
.flaticon-hatchback
Author: Freepik
+
+
.flaticon-help9
Author: Freepik
+
+
.flaticon-house77
Author: Freepik
+
+
.flaticon-illness1
Author: Freepik
+
+
.flaticon-inadequacy
Author: Freepik
+
+
.flaticon-incompetence
Author: Freepik
+
+
.flaticon-indifferent
Author: Freepik
+
+
.flaticon-kiss3
Author: Freepik
+
+
.flaticon-laughing7
Author: Freepik
+
+
.flaticon-laughing8
Author: Freepik
+
+
.flaticon-lifesaver28
Author: Freepik
+
+
.flaticon-lively
Author: Freepik
+
+
.flaticon-love2
Author: Freepik
+
+
.flaticon-mad1
Author: Freepik
+
+
.flaticon-man282
Author: Freepik
+
+
.flaticon-manager3
Author: Freepik
+
+
.flaticon-medical43
Author: Freepik
+
+
.flaticon-mobile26
Author: Icomoon
+
+
.flaticon-moustaches1
Author: Freepik
+
+
.flaticon-mute24
Author: Freepik
+
+
.flaticon-mute3
Author: Freepik
+
+
.flaticon-navigation28
Author: Freepik
+
+
.flaticon-nerd6
Author: Freepik
+
+
.flaticon-nervous
Author: Freepik
+
+
.flaticon-owl9
Author: Freepik
+
+
.flaticon-palmtrees1
Author:
+
+
.flaticon-panic1
Author: Freepik
+
+
.flaticon-pencil32
Author: Freepik
+
+
.flaticon-pirate5
Author: Freepik
+
+
.flaticon-plus13
Author: Freepik
+
+
.flaticon-protection24
Author: Freepik
+
+
.flaticon-robot30
Author: Freepik
+
+
.flaticon-robotic2
Author: Freepik
+
+
.flaticon-rough
Author: Freepik
+
+
.flaticon-sad34
Author: Freepik
+
+
.flaticon-sad35
Author: Freepik
+
+
.flaticon-sad37
Author: Freepik
+
+
.flaticon-sad38
Author: Freepik
+
+
.flaticon-sad39
Author: Freepik
+
+
.flaticon-sad74
Author: Freepik
+
+
.flaticon-sad75
Author: Freepik
+
+
.flaticon-sad77
Author: Freepik
+
+
.flaticon-scary
Author: Freepik
+
+
.flaticon-serious3
Author: Freepik
+
+
.flaticon-severe
Author: Freepik
+
+
.flaticon-silhouette121
Author: Freepik
+
+
.flaticon-singing4
Author: Freepik
+
+
.flaticon-sleep1
Author: Freepik
+
+
.flaticon-sleepness
Author: Freepik
+
+
.flaticon-sleepy6
Author: Freepik
+
+
.flaticon-smile31
Author: Freepik
+
+
.flaticon-smile32
Author: Freepik
+
+
.flaticon-smile33
Author: Freepik
+
+
.flaticon-smiley41
Author: Freepik
+
+
.flaticon-smiley42
Author: Freepik
+
+
.flaticon-smiling35
Author: Freepik
+
+
.flaticon-smiling36
Author: Freepik
+
+
.flaticon-solar12
Author: Freepik
+
+
.flaticon-spring13
Author: Freepik
+
+
.flaticon-square103
Author: Freepik
+
+
.flaticon-stars53
Author: Freepik
+
+
.flaticon-student12
Author: Freepik
+
+
.flaticon-study7
Author: Freepik
+
+
.flaticon-stupor
Author: Freepik
+
+
.flaticon-surprise5
Author: Freepik
+
+
.flaticon-surprised
Author: Freepik
+
+
.flaticon-surprised19
Author: Freepik
+
+
.flaticon-surprised21
Author: Freepik
+
+
.flaticon-surveillance1
Author: Freepik
+
+
.flaticon-suspicions
Author: Freepik
+
+
.flaticon-sweat1
Author: Freepik
+
+
.flaticon-sweating3
Author: Freepik
+
+
.flaticon-tears
Author: Freepik
+
+
.flaticon-telephone45
Author: Freepik
+
+
.flaticon-think7
Author: Freepik
+
+
.flaticon-timidity
Author: Freepik
+
+
.flaticon-tongue1
Author: Freepik
+
+
.flaticon-tongue2
Author: Freepik
+
+
.flaticon-two128
Author: Freepik
+
+
.flaticon-two210
Author: Freepik
+
+
.flaticon-users53
Author: Freepik
+
+
.flaticon-very7
Author: Freepik
+
+
.flaticon-wink
Author: Freepik
+
+
.flaticon-wink9
Author: Freepik
+
+
.flaticon-winking9
Author: Freepik
+
+
.flaticon-winners1
Author: Freepik
+ +
+ +
License and attribution:
Font generated by flaticon.com + under CC BY. The authors are: Freepik, SimpleIcon, , OCHA, Icomoon.
Copy the Attribution License:
+ + + +
+ +
+
Examples:
+

<i class="flaticon-accident3"></i>

<i class="flaticon-alphabet3"></i>

<i class="flaticon-angel"></i>

<i class="flaticon-angry"></i>

<i class="flaticon-angry2"></i>

<span class="flaticon-angry23"></span>

<span class="flaticon-angry40"></span>

<span class="flaticon-angry41"></span>

<span class="flaticon-animal203"></span>

<span class="flaticon-annulled3"></span>

<span class="flaticon-bandaid"></span>

<i class="flaticon-battery88"></i>

<i class="flaticon-book97"></i>

<i class="flaticon-boy11"></i>

<i class="flaticon-boy12"></i>

<span class="flaticon-business57"></span>

<span class="flaticon-camouflage"></span>

<span class="flaticon-car65"></span>

<span class="flaticon-certificate7"></span>

<span class="flaticon-checklist4"></span>

+
+ + + \ No newline at end of file diff --git a/app/assets/fonts/flatfeticon2.svg b/app/assets/fonts/flatfeticon2.svg new file mode 100644 index 0000000..700fe75 --- /dev/null +++ b/app/assets/fonts/flatfeticon2.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/assets/fonts/flatfeticon2.ttf b/app/assets/fonts/flatfeticon2.ttf new file mode 100644 index 0000000..ae259fe Binary files /dev/null and b/app/assets/fonts/flatfeticon2.ttf differ diff --git a/app/assets/fonts/flatfeticon2.woff b/app/assets/fonts/flatfeticon2.woff new file mode 100644 index 0000000..9c867bd Binary files /dev/null and b/app/assets/fonts/flatfeticon2.woff differ diff --git a/app/assets/stylesheets/flatfeticon2.css.scss b/app/assets/stylesheets/flatfeticon2.css.scss new file mode 100644 index 0000000..9f9340e --- /dev/null +++ b/app/assets/stylesheets/flatfeticon2.css.scss @@ -0,0 +1,415 @@ +@font-face { + font-family: "ffi2"; + src: url("/assets/flatfeticon2.eot"); + src: url("/assets/flatfeticon2.eot#iefix") format("embedded-opentype"), + url("/assets/flatfeticon2.woff") format("woff"), + url("/assets/flatfeticon2.ttf") format("truetype"), + url("/assets/flatfeticon2.svg") format("svg"); + font-weight: normal; + font-style: normal; +} +[class^="ffi2-"]:before, [class*=" ffi2-"]:before, +[class^="ffi2-"]:after, [class*=" ffi2-"]:after { + font-family: ffi2; + font-size: 20px; +font-style: normal; +margin-left: 20px; +}.ffi2-accident3:before { + content: "\e000"; +} +.ffi2-alphabet3:before { + content: "\e001"; +} +.ffi2-angel:before { + content: "\e002"; +} +.ffi2-angry:before { + content: "\e003"; +} +.ffi2-angry2:before { + content: "\e004"; +} +.ffi2-angry23:before { + content: "\e005"; +} +.ffi2-angry40:before { + content: "\e006"; +} +.ffi2-angry41:before { + content: "\e007"; +} +.ffi2-animal203:before { + content: "\e008"; +} +.ffi2-annulled3:before { + content: "\e009"; +} +.ffi2-bandaid:before { + content: "\e00a"; +} +.ffi2-battery88:before { + content: "\e00b"; +} +.ffi2-book97:before { + content: "\e00c"; +} +.ffi2-boy11:before { + content: "\e00d"; +} +.ffi2-boy12:before { + content: "\e00e"; +} +.ffi2-business57:before { + content: "\e00f"; +} +.ffi2-camouflage:before { + content: "\e010"; +} +.ffi2-car65:before { + content: "\e011"; +} +.ffi2-certificate7:before { + content: "\e012"; +} +.ffi2-checklist4:before { + content: "\e013"; +} +.ffi2-circuit4:before { + content: "\e014"; +} +.ffi2-confused4:before { + content: "\e015"; +} +.ffi2-cpu:before { + content: "\e016"; +} +.ffi2-cpu1:before { + content: "\e017"; +} +.ffi2-cry1:before { + content: "\e018"; +} +.ffi2-cry2:before { + content: "\e019"; +} +.ffi2-crying7:before { + content: "\e01a"; +} +.ffi2-customerservice10:before { + content: "\e01b"; +} +.ffi2-doubt3:before { + content: "\e01c"; +} +.ffi2-doubts1:before { + content: "\e01d"; +} +.ffi2-drinks48:before { + content: "\e01e"; +} +.ffi2-education6:before { + content: "\e01f"; +} +.ffi2-election3:before { + content: "\e020"; +} +.ffi2-electronic51:before { + content: "\e021"; +} +.ffi2-emoticon101:before { + content: "\e022"; +} +.ffi2-emoticon82:before { + content: "\e023"; +} +.ffi2-emoticon83:before { + content: "\e024"; +} +.ffi2-emoticon98:before { + content: "\e025"; +} +.ffi2-emoticons11:before { + content: "\e026"; +} +.ffi2-family4:before { + content: "\e027"; +} +.ffi2-fear3:before { + content: "\e028"; +} +.ffi2-first21:before { + content: "\e029"; +} +.ffi2-fright:before { + content: "\e02a"; +} +.ffi2-furious3:before { + content: "\e02b"; +} +.ffi2-graduate2:before { + content: "\e02c"; +} +.ffi2-group58:before { + content: "\e02d"; +} +.ffi2-handshake3:before { + content: "\e02e"; +} +.ffi2-hatchback:before { + content: "\e02f"; +} +.ffi2-help9:before { + content: "\e030"; +} +.ffi2-house77:before { + content: "\e031"; +} +.ffi2-illness1:before { + content: "\e032"; +} +.ffi2-inadequacy:before { + content: "\e033"; +} +.ffi2-incompetence:before { + content: "\e034"; +} +.ffi2-indifferent:before { + content: "\e035"; +} +.ffi2-kiss3:before { + content: "\e036"; +} +.ffi2-laughing7:before { + content: "\e037"; +} +.ffi2-laughing8:before { + content: "\e038"; +} +.ffi2-lifesaver28:before { + content: "\e039"; +} +.ffi2-lively:before { + content: "\e03a"; +} +.ffi2-love2:before { + content: "\e03b"; +} +.ffi2-mad1:before { + content: "\e03c"; +} +.ffi2-man282:before { + content: "\e03d"; +} +.ffi2-manager3:before { + content: "\e03e"; +} +.ffi2-medical43:before { + content: "\e03f"; +} +.ffi2-mobile26:before { + content: "\e040"; +} +.ffi2-moustaches1:before { + content: "\e041"; +} +.ffi2-mute24:before { + content: "\e042"; +} +.ffi2-mute3:before { + content: "\e043"; +} +.ffi2-navigation28:before { + content: "\e044"; +} +.ffi2-nerd6:before { + content: "\e045"; +} +.ffi2-nervous:before { + content: "\e046"; +} +.ffi2-owl9:before { + content: "\e047"; +} +.ffi2-palmtrees1:before { + content: "\e048"; +} +.ffi2-panic1:before { + content: "\e049"; +} +.ffi2-pencil32:before { + content: "\e04a"; +} +.ffi2-pirate5:before { + content: "\e04b"; +} +.ffi2-plus13:before { + content: "\e04c"; +} +.ffi2-protection24:before { + content: "\e04d"; +} +.ffi2-robot30:before { + content: "\e04e"; +} +.ffi2-robotic2:before { + content: "\e04f"; +} +.ffi2-rough:before { + content: "\e050"; +} +.ffi2-sad34:before { + content: "\e051"; +} +.ffi2-sad35:before { + content: "\e052"; +} +.ffi2-sad37:before { + content: "\e053"; +} +.ffi2-sad38:before { + content: "\e054"; +} +.ffi2-sad39:before { + content: "\e055"; +} +.ffi2-sad74:before { + content: "\e056"; +} +.ffi2-sad75:before { + content: "\e057"; +} +.ffi2-sad77:before { + content: "\e058"; +} +.ffi2-scary:before { + content: "\e059"; +} +.ffi2-serious3:before { + content: "\e05a"; +} +.ffi2-severe:before { + content: "\e05b"; +} +.ffi2-silhouette121:before { + content: "\e05c"; +} +.ffi2-singing4:before { + content: "\e05d"; +} +.ffi2-sleep1:before { + content: "\e05e"; +} +.ffi2-sleepness:before { + content: "\e05f"; +} +.ffi2-sleepy6:before { + content: "\e060"; +} +.ffi2-smile31:before { + content: "\e061"; +} +.ffi2-smile32:before { + content: "\e062"; +} +.ffi2-smile33:before { + content: "\e063"; +} +.ffi2-smiley41:before { + content: "\e064"; +} +.ffi2-smiley42:before { + content: "\e065"; +} +.ffi2-smiling35:before { + content: "\e066"; +} +.ffi2-smiling36:before { + content: "\e067"; +} +.ffi2-solar12:before { + content: "\e068"; +} +.ffi2-spring13:before { + content: "\e069"; +} +.ffi2-square103:before { + content: "\e06a"; +} +.ffi2-stars53:before { + content: "\e06b"; +} +.ffi2-student12:before { + content: "\e06c"; +} +.ffi2-study7:before { + content: "\e06d"; +} +.ffi2-stupor:before { + content: "\e06e"; +} +.ffi2-surprise5:before { + content: "\e06f"; +} +.ffi2-surprised:before { + content: "\e070"; +} +.ffi2-surprised19:before { + content: "\e071"; +} +.ffi2-surprised21:before { + content: "\e072"; +} +.ffi2-surveillance1:before { + content: "\e073"; +} +.ffi2-suspicions:before { + content: "\e074"; +} +.ffi2-sweat1:before { + content: "\e075"; +} +.ffi2-sweating3:before { + content: "\e076"; +} +.ffi2-tears:before { + content: "\e077"; +} +.ffi2-telephone45:before { + content: "\e078"; +} +.ffi2-think7:before { + content: "\e079"; +} +.ffi2-timidity:before { + content: "\e07a"; +} +.ffi2-tongue1:before { + content: "\e07b"; +} +.ffi2-tongue2:before { + content: "\e07c"; +} +.ffi2-two128:before { + content: "\e07d"; +} +.ffi2-two210:before { + content: "\e07e"; +} +.ffi2-users53:before { + content: "\e07f"; +} +.ffi2-very7:before { + content: "\e080"; +} +.ffi2-wink:before { + content: "\e081"; +} +.ffi2-wink9:before { + content: "\e082"; +} +.ffi2-winking9:before { + content: "\e083"; +} +.ffi2-winners1:before { + content: "\e084"; +} diff --git a/app/assets/stylesheets/layout.css.scss b/app/assets/stylesheets/layout.css.scss index cfe73a0..ebf98cf 100755 --- a/app/assets/stylesheets/layout.css.scss +++ b/app/assets/stylesheets/layout.css.scss @@ -39,6 +39,7 @@ a:hover { @import 'tinymce'; @import 'fetlogo'; @import 'flatfeticon1'; +@import 'flatfeticon2'; @@ -221,4 +222,7 @@ ul.ui-menu > li > a padding:2px; padding-left:10px; cursor: pointer; -} \ No newline at end of file +} + +a.choice-true +{text-width:bold} \ No newline at end of file diff --git a/app/views/survey/choices/_choice.html.erb b/app/views/survey/choices/_choice.html.erb index 2aef5b9..4ca00cb 100644 --- a/app/views/survey/choices/_choice.html.erb +++ b/app/views/survey/choices/_choice.html.erb @@ -1,8 +1,12 @@ -<%= -value=(current_user.id.nil?)? false : choice.answers.where(user_id: current_user.id).count>0 -cstyle=(value) ? "true" :"false" -link_to ((value)? fa_icon("arrow-right"): "")+choice.text, answer_survey_question_path(choice.question, params: {survey_question: {selected: [choice.id]}}) +<% +if current_user.nil? + t=choice.text +else + value=(current_user.id.nil?)? false : choice.answers.where(user_id: current_user.id).count>0 + cstyle=(value) ? "true" :"false" + t= link_to ((value)? fa_icon("arrow-right"): "")+choice.text, answer_survey_question_path(choice.question, class: "choice-"+cstyle, params: {survey_question: {selected: [choice.id]}}) +end -#url_for({controller: obj.class.name.tableize,action: :flag, flag: flag, value: !value, theme: nil, locale: nil, id: obj.id}), remote: true, class:("flag-"+cstyle +" flag-"+flag + "-"+cstyle ), id: obj.flaglinkid(flag) %> - +<%= t %> +<%= ff_icon("ffi2-boy12") %> diff --git a/app/views/survey/questions/_answeredquestion.html.erb b/app/views/survey/questions/_answeredquestion.html.erb index 04a6a43..14dadc5 100644 --- a/app/views/survey/questions/_answeredquestion.html.erb +++ b/app/views/survey/questions/_answeredquestion.html.erb @@ -1,4 +1,4 @@ -
+
<%= answeredquestion.title%>
    diff --git a/app/views/survey/questions/_question.html.erb b/app/views/survey/questions/_question.html.erb index b40e1ae..9c05a29 100644 --- a/app/views/survey/questions/_question.html.erb +++ b/app/views/survey/questions/_question.html.erb @@ -1,12 +1,15 @@ <% if current_user.nil? %> <%= render partial: "answeredquestion", object: question %> <% else %> -
    <%= question.title%> -
      +
      +
      + <%= question.title%>
      +
      +
        <% question.choices.each do |c| %>
      • <%= render c %>
        • <% end %> -
      +
    <%= render partial: "answeredquestion", object: question if question.answers.where(user_id: current_user.id).count>0%>