From c396c7410e03b2560dca53c07814c8c5bd8c5d62 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Fri, 21 Aug 2015 20:03:03 +0200
Subject: [PATCH] AutoCommit Fre Aug 21 20:03:03 CEST 2015

---
 app/assets/stylesheets/layout.css.scss        | 10 +++++++++-
 app/helpers/survey/questions_helper.rb        |  4 ++--
 .../survey/questions/_new_question.html.erb   |  5 +++--
 .../themes/blue2/neuigkeiten/_menu.html.erb   | 20 +++++--------------
 .../neuigkeiten/_neuigkeit_view.html.erb      |  2 +-
 5 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/app/assets/stylesheets/layout.css.scss b/app/assets/stylesheets/layout.css.scss
index 35fc07a..8b79e2b 100755
--- a/app/assets/stylesheets/layout.css.scss
+++ b/app/assets/stylesheets/layout.css.scss
@@ -249,4 +249,12 @@ font-size:1em;
 }
 a.choice > i {font-size: 32px}
 span.highcharts-axis-labels > i {
-font-size:32px}
\ No newline at end of file
+font-size:32px}
+
+div.toolbar-inline > div.dropdown
+{ display:inline;
+
+}
+div.btn-toolbar > div.dropdown > ul.dropdown-menu 
+{	font-size: small;
+}
\ No newline at end of file
diff --git a/app/helpers/survey/questions_helper.rb b/app/helpers/survey/questions_helper.rb
index 5ac1928..97ba820 100644
--- a/app/helpers/survey/questions_helper.rb
+++ b/app/helpers/survey/questions_helper.rb
@@ -1,5 +1,5 @@
 module Survey::QuestionsHelper
-  def new_question_for(obj)
-    render partial: "survey/questions/new_question", locals: {question_templates: Survey::Question.templates, parent: obj}
+  def new_question_for(obj,t="Neue Frage")
+    render partial: "survey/questions/new_question", locals: {question_templates: Survey::Question.templates, parent: obj, text: t}
   end
 end
diff --git a/app/views/survey/questions/_new_question.html.erb b/app/views/survey/questions/_new_question.html.erb
index 8094fa6..1bb65f6 100644
--- a/app/views/survey/questions/_new_question.html.erb
+++ b/app/views/survey/questions/_new_question.html.erb
@@ -1,12 +1,13 @@
 <div class="dropdown">
   <button class="btn btn-default dropdown-toggle" type="button"  data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-    Neue Frage
+    <%= text %>
     <span class="caret"></span>
   </button>
   <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
     <li>
-			<%= link_to "Neue FRage", new_survey_question_path(params: {parent_type: parent.class.to_s, parent_id: parent.id.to_s}) %>
+			<%= link_to "Neue Frage", new_survey_question_path(params: {parent_type: parent.class.to_s, parent_id: parent.id.to_s}) %>
 		</li>
+		<li>Templates:</li>
 		<% question_templates.each do |q| %>
 			<li>
 				<%= link_to q.title, create_from_template_survey_question_path(q, params: {parent_type: parent.class.to_s, parent_id: parent.id.to_s}) %>
diff --git a/app/views/themes/blue2/neuigkeiten/_menu.html.erb b/app/views/themes/blue2/neuigkeiten/_menu.html.erb
index 21efba9..222eb9f 100644
--- a/app/views/themes/blue2/neuigkeiten/_menu.html.erb
+++ b/app/views/themes/blue2/neuigkeiten/_menu.html.erb
@@ -1,22 +1,11 @@
-
-	<%= link_to(fa_icon("edit"), edit_rubrik_neuigkeit_path( @neuigkeit.rubrik,  @neuigkeit), remote: true , class: "btn") if can? :edit, @neuigkeit %>
+<div class="toolbar-inline">
+	<%= link_to(fa_icon("edit"), edit_rubrik_neuigkeit_path( @neuigkeit.rubrik,  @neuigkeit), remote: true , class: "btn", title: "Edit") if can? :edit, @neuigkeit %>
 <span class="btn-group">
-	<%= link_to fa_icon("paperclip"), "#", class: "btn", id: "attachments-form-open" if can? :edit, @neuigkeit %>	
+	<%= link_to fa_icon("paperclip"), "#", class: "btn", id: "attachments-form-open", title: "Attachments" if can? :edit, @neuigkeit %>	
 	<%= link_to fa_icon("calendar-o"),  new_calentry_path(:object_id=>@neuigkeit.id, :object_type=>"Neuigkeit"), :remote=>true, class: :btn if can? :edit, @neuigkeit %>
 </span>
 
-<%  if can?(:edit, @neuigkeit) %>
-	<div class="dropdown" style="display:inline">		
-		<%= link_to fa_icon("plus"), "#", class: "btn dropdown-toggle", data: {toggle: "dropdown"}, title: "plus" %>
-		<ul class="dropdown-menu">
-			<li>
-			
-				
-			</li>
-		</ul>
-	</div>
-<% end %>
-	<%= new_question_for(@neuigkeit) if can? :new, Survey::Question %>
+<%= new_question_for(@neuigkeit, fa_icon("question")) if can? :new, Survey::Question %>
 
 <div class="dropdown pull-right">
 	<a class="dropdown-toggle btn" data-toggle="dropdown" title="publish" href="#"><%= fa_icon("mail-forward")%></a>
@@ -29,6 +18,7 @@
 <div class="ui-dialog" id="attachments-form">
 	<%= render_new_attachments_for(@neuigkeit, fa_icon("plus"), {class: "btn"})  %>
 
+</div>
 </div>
 <script>
 $(function(){
diff --git a/app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb b/app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb
index 0f184f5..e1912d7 100644
--- a/app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb
+++ b/app/views/themes/blue2/neuigkeiten/_neuigkeit_view.html.erb
@@ -39,7 +39,7 @@
     <% end %>
     <div class="media-body">
 			<h1 itemprop="name">
-				<%= raw(neuigkeit_view.title) %>				<%= link_to fa_icon("edit"), edit_rubrik_neuigkeit_path(neuigkeit_view.rubrik, neuigkeit_view), remote: true if can? :edit, neuigkeit_view %>
+				<%= raw(neuigkeit_view.title) %>				<%#= link_to fa_icon("edit"), edit_rubrik_neuigkeit_path(neuigkeit_view.rubrik, neuigkeit_view), remote: true if can? :edit, neuigkeit_view %>
 			</h1>
 			<div itemprop="articleBody">
 				<%= raw(neuigkeit_view.text) %>