document/meeting updates

2015-01-03 10:06:58 +01:00
parent de8802c34a
commit d72f78488d
24 changed files with 278 additions and 54 deletions
--- a/app/views/layouts/menu.html.erb
+++ b/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>