AutoCommit Sam Aug 1 23:03:02 CEST 2015

app/views/comments/_comment.html.erb

@@ -1,5 +1,7 @@
 <div id="<%= divid_for(comment) %>">
+<% if (!comment.anonym)  %>
   <a class="pull-left media-object" href="#"><%= image_tag comment.thumb_url %></a>
+<% end %>
   <div class="media-body"> 
 		<b><%= (!comment.anonym) ? comment.user.try(:email) : "Anonym" %>
 		</b> (<%= I18n.l(comment.created_at) %>) 

app/views/neuigkeiten/show.html.erb

@@ -34,10 +34,12 @@
 		<%= notice %>
 	</p>
 	<%= render partial: "neuigkeit_view", object: @neuigkeit %>
+</div>
 	<% @neuigkeit.questions.each do |q| %>
 		<%= render q%>
 	<% end %>
-</div>
+
+
 </div>
 <div class="fb-like" data-href"<%= rubrik_neuigkeit_url(@rubrik,@neuigkeit,{themes: nil, locale: nil})%>" data-layout="standard" data-action="like" data-show-faces="true" data-share="true"></div>
 

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

@@ -15,4 +15,5 @@ end
 
 <%= t %>   <%= link_to fa_icon("pencil"), edit_survey_choice_path(choice) , class: "btn btn-link navbar-btn" , remote: true
 %>
+<%= link_to fa_icon("pencil"), delete_survey_choice_path(choice) , class: "btn btn-link navbar-btn" , remote: true %>
 <% end %>

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

@@ -4,9 +4,9 @@
 	<% end %>
 <% else  %>
 	<div class="contentbox" id ="<%= divid_for(question) %>" style="">
-		<div class="contentbox">
-			<b><%= question.title%></b> <%=question.text%><%= link_to fa_icon("pencil"), edit_survey_question_path(question) , class: "btn btn-link navbar-btn" , remote: true%></div>
-		<div class="contentbox">
+		<div >
+			<b><%= question.title%></b> <%=question.text%><%= link_to fa_icon("pencil"), edit_survey_question_path(question) , class: "btn btn-link navbar-btn" , remote: true%>
+
 			<ul class="choice-list">
 				<% question.choices.each do |c| %>
 					<li><%= render c %></li>

app/views/survey/questions/edit.js.erb

@@ -0,0 +1 @@
+$('#<%= divid_for(@survey_question) %>').replaceWith("<%= escape_javascript(render partial: "form", object: @survey_question) %>")