From 0e9525af814c4d5059e23b2bec1f9458a129b129 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Fri, 17 Jul 2015 13:03:05 +0200
Subject: [PATCH] AutoCommit Fre Jul 17 13:03:05 CEST 2015

---
 app/assets/stylesheets/layout.css.scss    |  12 +-
 app/inputs/checkbox_autocomplete_input.rb |  28 +++++
 app/views/lvas/_form.html.erb             | 142 ++++++++++------------
 app/views/lvas/edit.html.erb              |   2 +-
 app/views/moduls/_form.html.erb           |   4 +-
 5 files changed, 108 insertions(+), 80 deletions(-)
 create mode 100644 app/inputs/checkbox_autocomplete_input.rb

diff --git a/app/assets/stylesheets/layout.css.scss b/app/assets/stylesheets/layout.css.scss
index 7c655ed..79299b6 100755
--- a/app/assets/stylesheets/layout.css.scss
+++ b/app/assets/stylesheets/layout.css.scss
@@ -210,4 +210,14 @@ float:clear; }
 a.flag-true { color: $color_schema_3_dark}
 a.flag-true.flag-goodquality-true { color: green}
 
-a.flag-false { color: #CCC}
\ No newline at end of file
+a.flag-false { color: #CCC}
+
+ul.ui-menu 
+{list-style-type:none;
+}
+
+ul.ui-menu > li > a
+{padding:2px;
+padding-left:10px;
+cursor: pointer;
+}
\ No newline at end of file
diff --git a/app/inputs/checkbox_autocomplete_input.rb b/app/inputs/checkbox_autocomplete_input.rb
new file mode 100644
index 0000000..c320d72
--- /dev/null
+++ b/app/inputs/checkbox_autocomplete_input.rb
@@ -0,0 +1,28 @@
+class CheckboxAutocompleteInput < FormtasticBootstrap::Inputs::CheckboxInput
+	def input_html_options
+		super
+		#super.merge(:class => "input-append date")
+	end
+	def html_options
+		super
+		#super.merge(:default => Date.today)
+	end
+	def wrapper_html_options
+		super.merge(:class=>"")
+		#super.merge(:class=>"datepicker",'date-date-format'.to_sym=>"%d.%m.%Y")
+	end
+	def controls_wrapper_html_options
+	super.merge(:class=> "datepicker date input-append", 'data-date'.to_sym =>I18n.l(Date.today()).to_s, 'data-date-format'.to_sym=>I18n.t('date.formats.default-picker'))
+	end
+	def to_html
+		bootstrap_wrapping do
+      builder.text_field(method, input_html_options) + 'sdf'
+    end
+	end
+	def options
+		super
+#d.merge(:class=>"datepicker")
+		#super.merge(:append_content=>'<span class="add-on input-append"
+		#super.merge(:append_content=>'<span class="add-on" ><i class="icon-th"></i></span>')
+	end
+end
diff --git a/app/views/lvas/_form.html.erb b/app/views/lvas/_form.html.erb
index e173776..acec0dc 100755
--- a/app/views/lvas/_form.html.erb
+++ b/app/views/lvas/_form.html.erb
@@ -1,88 +1,76 @@
-
-<%= semantic_form_for @lva do |f| %>
-  <div class="row-fluid">
-    <%= f.inputs do %>
-
-      <div class="span9">
-	<div class="row-fluid">
-	  <div class="span9">
-	    <div class="form-group">
-	      <div class="row-fluid">
-		  <%= f.input :typ, :as=>:select,  :include_blank=>false, :collection=>Lva::ERLAUBTE_TYPEN, :wrapper_html=>{:class=>'span2'}%>
-		  
-		<%= f.input :name, :wrapper_html=>{:class=>'span10'}%>
+<div class="container-fluid">
+	<%= semantic_form_for @lva do |f| %>
+		<div class="row-fluid">
+			<%= f.inputs do %>
+				<div class="span12">
+					<%= f.input :typ, :as=>:select,  :include_blank=>false, :collection=>Lva::ERLAUBTE_TYPEN , :input_html=>{:style => "width:7em" } , :wrapper_html=> {style: "float: left"}%>
+					<%= f.input :name , :input_html=>{:style => "width:14em" }%>
+				</div>
 		</div>
 		<div class="row-fluid">
-		<div class="span7"%>
-	      	  <div class="row-fluid">
-		    <%= f.input :lvanr, :wrapper_html=>{:class=>'span4'}%>
+			<div class="span12"%>
 
-		    <%= f.input :ects, :wrapper_html=>{:class=>'span4'} %>
-		    <%= f.input :stunden, :wrapper_html=>{:class=>'span4'} %>
-		  </div>
-		
-	      	  <div class="row-fluid">
-		    <%= f.input :forumlink, :wrapper_html=>{:class=>'span12'}%>
-		  </div>
+					<%= f.input :lvanr, :input_html=>{:style => "width:9em" } , :wrapper_html=> {style: "float: left"}%>
+					<%= f.input :ects , :input_html=>{:style => "width:5em" } , :wrapper_html=> {style: "float: left"}%>
+					<%= f.input :stunden, :input_html=>{:style => "width:5em" } , :wrapper_html=> {style: "float: left"} %>
+
+			</div>
 		</div>
-	      </div>
-	    </div>
-	    <div class="form-group">
-	      <div class="row-fluid">
-		<%= f.input :desc , :as=>:tinymce_text %>
-		<%= f.input :pruefungsinformation %>
-	    	<%= f.input :lernaufwand %>
-	      </div>
-	    </div>
-	  </div>
-	  
-	  <div class="span3">
-	    <h1> BILD </h1>
-			<input id="lva" class="autocomplete-checkbox" data-checkboxdiv="lva_modul_input" data-checkboxname="lva[modul_ids][]" data-collection="<%= (Modul.all.map{|m| "{\"value\": \""+m.id.to_s + "\", \"label\": " + "\"" +escape_javascript( m.name.gsub("\"", "").gsub(";",",")).strip +  "\"}"}.join("; "))%>"> </input>
-	    <%= f.input :modul, :as => :check_boxes, :member_label=>:name, :collection => @lva.modul %>
-
-			
-	    <% f.input :modul, :as=>:check_boxes%>	  
-	
-    
-	
-	<% f.input :semester, :as=>:check_boxes, :collection=>@semester%>
-	
-	<input id="lva" class="autocomplete-checkbox" data-checkboxdiv="lva_semester_input" data-checkboxname="lva[semester_ids][]" data-collection="<%= (Semester.all.map{|m| "{\"value\": \""+m.id.to_s + "\", \"label\": " + "\"" +escape_javascript( m.name.gsub("\"", "").gsub(";",",")).strip +  "\"}"}.join("; "))%>"> </input>
-	    <%= f.input :semester, :as => :check_boxes, :member_label=>:name, :collection => @lva.semester %>
-
-
-			<input id="lva" class="autocomplete-checkbox" data-checkboxdiv="lva_lecturers_input" data-checkboxname="lva[lecturers_ids][]" data-collection="<%= (Lecturer.all.map{|m| "{\"value\": \""+m.id.to_s + "\", \"label\": " + "\"" +escape_javascript( m.name.gsub("\"", "").gsub(";",",")).strip +  "\"}"}.join("; "))%>"> </input>
-	    <%= f.input :lecturers, :as => :check_boxes, :member_label=>:name, :collection => @lva.lecturers %>
-
-
-
-	<% f.input :lecturers, :as=>:check_boxes%>
-      </div>
-    <% end %>
-    <%= f.actions do %>
-      <%= f.action :submit, :as => :input %>
-    <% end %>
-<% end %>
+	  <div class="row-fluid">
+			<%= f.input :forumlink, :wrapper_html=>{:class=>'span12'}%>
+		</div>
+		<div class="row-fluid">
+			<div class="span9">
+				
+				<%= f.input :desc , :as=>:tinymce_text %>
+				<%= f.input :pruefungsinformation %>
+				<%= f.input :lernaufwand %>
+			</div>
+		
+					
+			<div class="span3">
+				<h1> BILD </h1>
+				<input id="lva" class="autocomplete-checkbox" data-checkboxdiv="lva_modul_input" data-checkboxname="lva[modul_ids][]" data-collection="<%= (Modul.all.map{|m| "{\"value\": \""+m.id.to_s + "\", \"label\": " + "\"" +escape_javascript( m.name.gsub("\"", "").gsub(";",",")).strip +  "\"}"}.join("; "))%>"> </input>
+				<%= f.input :modul, :as => :check_boxes, :member_label=>:name, :collection => @lva.modul %>
+				<% f.input :modul, :as=>:check_boxes%>	  
+				<% f.input :semester, :as=>:check_boxes, :collection=>@semester%>
+						
+				<input id="lva" class="autocomplete-checkbox" data-checkboxdiv="lva_semester_input" data-checkboxname="lva[semester_ids][]" data-collection="<%= (Semester.all.map{|m| "{\"value\": \""+m.id.to_s + "\", \"label\": " + "\"" +escape_javascript( m.name.gsub("\"", "").gsub(";",",")).strip +  "\"}"}.join("; "))%>"> </input>
+				<%= f.input :semester, :as => :check_boxes, :member_label=>:name, :collection => @lva.semester %>
+						
 
+				<input id="lva" class="autocomplete-checkbox" data-checkboxdiv="lva_lecturers_input" data-checkboxname="lva[lecturers_ids][]" data-collection="<%= (Lecturer.all.map{|m| "{\"value\": \""+m.id.to_s + "\", \"label\": " + "\"" +escape_javascript( m.name.gsub("\"", "").gsub(";",",")).strip +  "\"}"}.join("; "))%>"> </input>
+				<%= f.input :lecturers, :as => :check_boxes, :member_label=>:name, :collection => @lva.lecturers %>
+				
+						
+						
+				<% f.input :lecturers, :as=>:check_boxes%>
+			</div>
+		</div>
+			<% end %>
+			<%= f.actions do %>
+				<%= f.action :submit, :as => :input %>
+			<% end %>
+	<% end %>
 
+</div>
 <script>
 $(function(){
- $( ".autocomplete-checkbox" ).autocomplete({
-      minLength: 0,
-      source: [],
-      focus: function( event, ui ) {
-        $( this ).val( ui.item.label );
-        return false;
-      },
-      select: function( event, ui ) {
-        $( this ).val( "" );
-        $( "#"+$(this).data("checkboxdiv")).append($("<label>").append($("<div>").attr("class", "checkbox").append($("<input>").attr("type","checkbox").attr("value", ui.item.value).attr("checked","checked").attr("name",$(this).data("checkboxname"))).append(ui.item.label)));
-        return false;
-      }
-    }).each(function() { // Goes through `.autocomplete` elements and sets source
-        $(this).autocomplete("option", "source", $(this).data('collection').split(";").map(function(el){console.log(el);return JSON.parse(el)}));
-    })
+	$( ".autocomplete-checkbox" ).autocomplete({
+    minLength: 0,
+    source: [],
+    focus: function( event, ui ) {
+      $( this ).val( ui.item.label );
+      return false;
+    },
+    select: function( event, ui ) {
+      $( this ).val( "" );
+      $( "#"+$(this).data("checkboxdiv")).append($("<label>").append($("<div>").attr("class", "checkbox").append($("<input>").attr("type","checkbox").attr("value", ui.item.value).attr("checked","checked").attr("name",$(this).data("checkboxname"))).append(ui.item.label)));
+      return false;
+    }
+  }).each(function() { // Goes through `.autocomplete` elements and sets source
+    $(this).autocomplete("option", "source", $(this).data('collection').split(";").map(function(el){console.log(el);return JSON.parse(el)}));
+  })
     .data( "ui-autocomplete" )._renderItem = function( ul, item ) {
       return $( "<li>" )
         .append( "<a>" + item.label +  "</a>" )
diff --git a/app/views/lvas/edit.html.erb b/app/views/lvas/edit.html.erb
index b728976..a35c556 100755
--- a/app/views/lvas/edit.html.erb
+++ b/app/views/lvas/edit.html.erb
@@ -1,4 +1,4 @@
-<h1>Editing lva</h1>
+<h1>Bearbeiten</h1>
 
 <%= render 'form' %>
 
diff --git a/app/views/moduls/_form.html.erb b/app/views/moduls/_form.html.erb
index 9147828..37e7c88 100755
--- a/app/views/moduls/_form.html.erb
+++ b/app/views/moduls/_form.html.erb
@@ -32,9 +32,11 @@
       </div>
     </div>
     <div class="span3">
+			<%= f.input :lvas, as: :checkbox_autocomplete %>
 
 <input id="lva" class="autocomplete-checkbox" data-checkboxdiv="modul_lvas_input" data-checkboxname="modul[lva_ids][]" data-collection="<%= (Lva.all.map{|l| "{\"value\": \""+l.id.to_s + "\", \"label\": " + "\"" +escape_javascript( l.full_name) +  "\"}"}.join("; "))%>"> </input>
 	    <%= f.input :lvas, :as => :check_boxes, :member_label=>:full_name, :collection => @modul.lvas %>
+
 <input id="modul" class="autocomplete-checkbox" data-checkboxdiv="modul_modulgruppen_input" data-checkboxname="modul[modulgruppe_ids][]" data-collection="<%= (Modulgruppe.all.map{|l| "{\"value\": \""+l.id.to_s + "\", \"label\": " + "\"" +escape_javascript( l.long_name) +  "\"}"}.join("; "))%>"> </input>
       <%= f.input :modulgruppen, :as => :check_boxes, :member_label=>:long_name, :collection => @modul.modulgruppen %>
     </div>
@@ -70,7 +72,7 @@ $(function(){
         .append( "<a>" + item.label +  "</a>" )
         .appendTo( ul );
     };
-	$("#tabs").tabs();
+ 	$("#tabs").tabs();
 });
 </script>
 </div>