document/meeting updates

app/views/calentries/_nested_form.html.erb

@@ -4,10 +4,15 @@
 <%= semantic_form_for @calentry, :remote=>true, :html=>{:class=>"inline"} do |f| %>
 
  <%= f.input :start, :as => :datetimepicker  %>
- <%= f.input :dauer , :as => :string, :append=>"h"  %>
+<% if @calentry.typ==1 %> 
+<%= f.input :dauer , :as => :string, :append=>"h"  %>
+<% else %>
+ <%= f.input :ende, :as => :datetimepicker  %>
+
+<% end %>
  <%= f.input :object_id , :as => :hidden  %>
  <%= f.input :object_type , :as => :hidden  %>
-<%= f.input :typ , :as => :hidden  %>
+ <%= f.input :typ , :as => :hidden  %>
 
  
     <%= f.action :submit, :as => :input_ %>

app/views/documents/edit.html.erb

@@ -1,6 +0,0 @@
-<h1>Editing Dokument</h1>
-
-<%= render 'form' %>
-
-<%= link_to 'Show', @document %> |
-

app/views/documents/show.html.erb

@@ -1,8 +1,10 @@
+<%= link_to "parent" , @document.parent %>
+<%= link_to "show", document_path(@document), remote: true %>
+<%= link_to "Write", write_document_path(@document) %>
+<%= link_to "read", read_from_etherpad_document_path(@document) %>
+<%= link_to "dump", dump_to_etherpad_document_path(@document) %>
 <h2><%= @document.name %></h2>
+<div id="">
 <%= raw(@document.text) %>
-<%= semantic_form_for @document, :html=>{:class=>""} do |f| %>
- <%= f.input :text, :as=>:tinymce_text  %>
-<%= f.action :submit, :as => :input_ %>
- 
-<% end %>
-<%= tinymce %>
+</div>
+

app/views/fragen/_form.html.erb

@@ -1,7 +1,7 @@
 <%= tinymce_assets %>
 <%= semantic_form_for @frage do |f| %>
   <%= f.inputs do %>
-    <%= f.input :title %>
+    <%= f.input :title , :as=>:text %>
     <%= f.input :thema %>
     <%= f.input :text, :as=>:tinymce_text%>
   <% end %>

app/views/fragen/_rform.html.erb

@@ -1,7 +1,7 @@
 <%= tinymce_assets %>
 <%= semantic_form_for @frage , :remote=>true do |f| %>
   <%= f.inputs do %>
-    <%= f.input :title %>
+    <%= f.input :title, :as=>:text %>
     <%= f.input :thema %>
     <%= f.input :text, :as=>:tinymce_text%>
   <% end %>

app/views/home/index.html.erb

@@ -1,5 +1,6 @@
 <div class="content-wrap content-column">
- <h1><%= I18n.t('home.willkommen') %></h1></p>
+ <h1><%= I18n.t('home.willkommen') %></h1>
+<%= render partial: "themen/small", object: @starttopic %>
 <div class="container-fluid">
 <div class="row-fluid">
 <div class="span6">

app/views/home/kontakt.html.erb

@@ -3,8 +3,5 @@
 <% @themen.each do |th| %>
 <%= render partial: "themen/small", object: th %>
 <% end %>
-
-
- 
  
 </div>

app/views/layouts/_login.html.erb

@@ -1,9 +1,17 @@
 <% if user_signed_in? %>
-	  <li>Logged in as : <%= current_user.email %>
-	    <%= link_to('Logout', destroy_user_session_path, :method => :delete) %>        
-	  </li>
-	  <% else %>
-	  <li>
-	    <%= link_to('Login', new_user_session_path)  %>  
-	  </li>
-	  <% end %>
+<li class="dropdown">
+  <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= ff_icon('icon-user')%><b class="caret"></b></a>
+  <ul class="dropdown-menu">	 
+    <li style="padding:5px">
+      <%= image_tag current_user.fetprofile.picture.thumb.url,class: "pull-left" unless current_user.fetprofile.nil? %>
+ <%= current_user.email %> is logged in.
+      
+    </li>
+<li><%= link_to('Logout', destroy_user_session_path, :method => :delete) %>        </li>
+  </ul>	
+</li>
+<% else %>
+<li>
+  <%= link_to('Login', new_user_session_path)  %>  
+</li>
+<% end %>

app/views/layouts/menu.html.erb

@@ -35,15 +35,18 @@
 	
 	</ul>
 	</li>
-	</ul>
+	<%= render 'layouts/login' %>
+</ul>
+
 	<!--<span class="pull-right"><%if I18n.locale == :en %>
 	  <%= link_to image_tag("/flaggen/png/at.png") + " Deutsch" ,switch_locale_url(:de)%>
 	  <% elsif I18n.locale == :de %>
 	  <%= link_to image_tag("/flaggen/png/gb.png") + " English" ,switch_locale_url(:en)%>
 	  <%end %>
 	</span>-->
-	
+
       </div>
+
     </div>
   </div>
 </div>

app/views/meetings/_nested_form.html.erb

@@ -8,9 +8,9 @@
 
  <%= f.semantic_fields_for :calentry, @meeting.calentry do |ff| %>
     <%= ff.input :start, :as => :datetimepicker  %>
-    <%= ff.input :dauer , :as => :string, :append=>"h"  %>
-    <%= ff.input :typ %>
-    <% ff.input :object_id %>
+    <%= ff.input :ende, :as => :datetimepicker  %>
+        <%= ff.input :typ %>
+    <% ff.input :object_id, :as=>:hidden %>
     <% ff.input :object_type %>
 
  <% end %>

app/views/rubriken/show.html.erb

@@ -1,4 +1,6 @@
 <%= content_for :header do %>
+
+
 <title>Fetsite - <%= @rubrik.name %></title>
 <% set_meta_tags :og => {
 :title => @rubrik.name.to_s,
@@ -8,7 +10,9 @@
 <%= display_meta_tags %>
 
 <% end %>
+
 <%= render 'tabs' %>
+<%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
 <p id="notice"><%= notice %></p>
 <div class="content-wrap content-column">
 <div class="container-fluid">
@@ -52,7 +56,6 @@
 </div>
 
 <br>
-<%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
 </div>
 </div>
 

app/views/themen/_verw_liste.html.erb

@@ -9,6 +9,9 @@
 <li><%= link_to sanitize_thema_path(thema),:remote=>true do %> <%= ff_icon('icon-leaf') %> Sanitize <% end %>  </li>
 
 <li><%= link_to fragen_thema_path(thema),:remote=>true do %> Fragen <% end %></li>
+<li><%= link_to documents_thema_path(thema),:remote=>true do %> Fragen <% end %></li>
+<li><%= link_to meetings_thema_path(thema),:remote=>true do %> Fragen <% end %></li>
+
 <li><%= link_to attachments_thema_path(thema),:remote=>true do %> Attachments <% end %></li>
 </ul>
 </li>

app/views/themes/blue1/home/index.html.erb

@@ -1,5 +1,8 @@
 <div class="content-wrap content-column">
- <h1><%= I18n.t('home.willkommen') %></h1></p>
+ <h1><%= I18n.t('home.willkommen') %></h1>
+<%= raw(@starttopic.text) %>
+
+
 <div class="container-fluid">
 <div class="row-fluid">
 <div class="span6">