AutoCommit Fre Jul 31 18:03:05 CEST 2015

app/assets/stylesheets/flatfeticon2.css.scss

@@ -10,10 +10,10 @@
 }
 [class^="ffi2-"]:before, [class*=" ffi2-"]:before,
 [class^="ffi2-"]:after, [class*=" ffi2-"]:after {   
-	font-family: ffi2;
-        font-size: 20px;
-font-style: normal;
-margin-left: 20px;
+		font-family: ffi2;
+    font-size: normal;
+		font-style: normal;
+		margin-left: 4px;
 }.ffi2-accident3:before {
 	content: "\e000";
 }

app/assets/stylesheets/layout.css.scss

@@ -225,4 +225,25 @@ ul.ui-menu > li > a
 }				
 
 a.choice-true
-{text-width:bold}
+{font-weight: bold;}
+a.choice-false
+{color:grey}
+
+ul.choice-list
+{list-style-type: none;
+margin:0;
+
+}
+ul.choice-list > li 
+{
+}
+ul.choice-list > li > a {
+
+line-height:normal;
+}
+ul.choice-list > li > a > i { 
+font-size:3em;
+}
+ul.choice-list > li > a.btn > i { 
+font-size:1em;
+}

app/controllers/survey/choices_controller.rb

@@ -34,7 +34,7 @@ class Survey::ChoicesController < ApplicationController
 
   # GET /survey/choices/1/edit
   def edit
-    @survey_choice = Survey::Choice.find(params[:id])
+    @choice = Survey::Choice.find(params[:id])
   end
 
   # POST /survey/choices
@@ -65,7 +65,7 @@ class Survey::ChoicesController < ApplicationController
       else
         format.html { render action: "edit" }
         format.json { render json: @survey_choice.errors, status: :unprocessable_entity }
-      end
+5      end
     end
   end
 

app/helpers/application_helper.rb

@@ -45,6 +45,10 @@ m.save
   def ffi1_icon (name)
     content_tag("i","", class: "ffi1-"+name )
   end
+
+  def ffi2_icon (name)
+    content_tag("i","", class: "ffi2-"+name )
+  end
   def ff_icon (name)
     content_tag("i","", class: name )
   end
@@ -53,6 +57,11 @@ m.save
     y=YAML.load_file("#{::Rails.root.to_s}/config/flatfeticon1.yml")
     y["ffi1"]
   end
+  def ffi2_list 
+    y=YAML.load_file("#{::Rails.root.to_s}/config/flatfeticon2.yml")
+    y["ffi2"]
+  end
+
   def fa_list 
     y=YAML.load_file("#{::Rails.root.to_s}/config/fontawesome.yml")
     y["fa"]

app/models/survey/choice.rb

@@ -2,7 +2,11 @@ class Survey::Choice < ActiveRecord::Base
   belongs_to :question, class_name: 'Survey::Question'
   attr_accessible :picture, :sort, :text
   has_many :answers, class_name: 'Survey::Answer'
+  include ActionView::Helpers::TagHelper
   def to_s
-    self.text
+       self.text
+  end
+  def html
+       content_tag("i","", class: self.picture ) + self.text
   end
 end

app/views/survey/choices/_choice.html.erb

@@ -4,9 +4,11 @@ if current_user.nil?
 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]}}) 
+	t= link_to raw("" + choice.html), answer_survey_question_path(choice.question,  params: {survey_question: {selected: [choice.id]}}),class: "choice-"+cstyle 
 end
 
 %>
-<%= t %>
-<%= ff_icon("ffi2-boy12") %>
+
+
+<%= t %>   <%= link_to fa_icon("pencil"), edit_survey_choice_path(choice) , class: "btn btn-link navbar-btn" 
+%>

app/views/survey/choices/_form.html.erb

@@ -1,12 +1,44 @@
 <%= semantic_form_for @choice do |f| %>
   <%= f.inputs do %>
     <%= f.input :text %>
-    <%= f.input :question %>
+
     <%= f.input :sort %>
-    <%= f.input :picture %>
+    <%= f.input :picture, :input_html=>{:id=>"iconfield"} %>
   <% end %>
+    <i id="icon" style="font-size:2em" class="<%= @choice.picture %>"></i><a href="#" id="openselect" onclick=""> Choose Icon</a>
 
   <%= f.actions do %>
     <%= f.action :submit, :as => :input %>
   <% end %>
 <% end %>
+<script>
+$(
+  function()
+    {$('#iconfield').on('change', function(){$('#icon').attr("class",$(this).val())});
+$("#dialog").dialog({width:'100%', position:'center top', at:'left top',autoOpen: false,closeOnEscape: false});
+$("#openselect").on('click', function(){$('#dialog').dialog('open')});
+});
+</script>
+
+<div style="font-size:2em; line-height:1.2em" id ="dialog" title="Icon">
+<p>
+<% ffi1_list.each do |i| %>
+ <a onclick="$('#iconfield').val('ffi1-<%= i %>');$('#icon').attr('class','ffi1-<%= i %>'); $('#dialog').dialog('close')" href="#"><%=ffi1_icon(i)%>
+</a>
+<% end %> 
+</p>
+<p>
+<% ffi2_list.each do |i| %>
+ <a onclick="$('#iconfield').val('ffi2-<%= i %>');$('#icon').attr('class','ffi2-<%= i %>'); $('#dialog').dialog('close')" href="#"><%=ffi2_icon(i)%>
+</a>
+<% end %> 
+</p>
+
+<p>
+<% fa_list.each do |i| %>
+ <a onclick="$('#iconfield').val('fa <%= i %>');$('#icon').attr('class','fa <%= i %>'); $('#dialog').dialog('close')" href="#"><%=ff_icon('fa '+i)%>
+</a>
+<% end %> 
+
+</p>
+</div>

app/views/survey/questions/_answeredquestion.html.erb

@@ -24,7 +24,7 @@ $(function () {
             text: '<%= answeredquestion.text %>'
         },
         xAxis: {
-            categories: [<%= raw(answeredquestion.choices.map{|c| "'"+escape_javascript(ff_icon("ffi1-good2"))+c.text+"'"}.join(",")) %>],
+            categories: [<%= raw(answeredquestion.choices.map{|c| "'"+escape_javascript(c.html)+"'"}.join(",")) %>],
             title: {
                 text: null
             },

app/views/survey/questions/_question.html.erb

@@ -3,9 +3,10 @@
 <% else  %>
 	<div class="contentbox" style="background: grey">
 		<div class="contentbox">
-			<b><%= question.title%></b></div>
-	<div class="contentbox">
-	<ul>
+			<b><%= question.title%></b> <%=question.text%></div>
+
+		<div class="contentbox">
+		<ul class="choice-list">
 			<% question.choices.each do |c| %>
 				<li><%= render c %></li>
 			<% end %>

app/views/survey/questions/show.html.erb

@@ -1,24 +1,11 @@
 <p id="notice"><%= notice %></p>
-
-<p>
-  <b>Title:</b>
-  <%= @survey_question.title %>
-</p>
-
-<p>
-  <b>Text:</b>
-  <%= @survey_question.text %>
-</p><p>
-<%= params.to_yaml %>
-</p>
-
 <p>
   <b>Typ:</b>
   <%= @survey_question.typ %>
 </p>
 
 <%= render @survey_question %>
-<% render partial: "answeredquestion", object: @survey_question %>
+
 
 <%= link_to 'Edit', edit_survey_question_path(@survey_question) %> |
 <%= link_to 'Back', survey_questions_path %>