nlink fix

app/controllers/neuigkeiten_controller.rb

@@ -131,7 +131,15 @@ class NeuigkeitenController < ApplicationController
       format.js
     end
   end
-
+  def delete_link
+    @neuigkeit = Neuigkeit.find(params[:id])
+    @nlink = @neuigkeit.nlinks.find(params[:nlink_id])
+    @nlink.destroy
+    respond_to do |format|
+      format.html { redirect_to @neuigkeit }
+      format.js
+    end
+  end  
   def create
     @neuigkeit = Neuigkeit.new(params[:neuigkeit])
     @neuigkeit.author=current_user
@@ -167,7 +175,7 @@ class NeuigkeitenController < ApplicationController
       format.html { redirect_to rubrik }
       
     end
-  end
+   end
 
 private
   def load_toolbar_elements

app/views/lvas/show.html.erb

@@ -1,11 +1,20 @@
 <div class="container-fluid">
   <%= render 'studien/tabs'%>
   <p id="notice"><%= notice %></p>
+  
+  <div class="row-fluid">
+    <div class="span12">
+      <%= render 'layouts/pretty_toolbar' %>
+    </div>
+  </div>
+
   <div class="row-fluid">
     <div class="span8">
       <h1><%= @lva.full_name %></h1>
       <ul class="linklist">
-	<li><%= link_to ffi1_icon("live2")+"ET-Forum",@lva.forumlink, class: :linkbox unless @lva.forumlink.nil? or @lva.forumlink.empty?%></li>
+	<li>
+	  <%= link_to ffi1_icon("live2")+"ET-Forum",@lva.forumlink, class: :linkbox unless @lva.forumlink.nil? or @lva.forumlink.empty?%>
+	</li>
       </ul>
 
       <h2>Prüfungsinformation</h2>
@@ -17,13 +26,12 @@
       <div class="">
 	<%= @lva.lernaufwand %>
       </div>
+
       <h2>Beschreibung</h2>
       <div class="">
 	<%= @lva.desc.to_s.html_safe %>
       </div>
       
-      
-   
     </div>
     <div class="span4">
       <div class="contentbox">
@@ -79,11 +87,6 @@
     </div>
   </div>
 
- <div class="row-fluid">
-    <div class="span12">
-      <%= render 'layouts/pretty_toolbar' %>
-    </div>
-  </div>
  <div class="row-fluid">
     <div class="span12">
       <%= render 'beispiele/form_bulk' %>

app/views/neuigkeiten/_nlink_list.html.erb

@@ -1,9 +1,13 @@
 
-    <%= link_to nlink_list.link do  %>
+<%= link_to nlink_list.link do  %>
-<div class="contentbox" style="height:9em">
+<div class="contentbox" >
+<div style="height:9em;overflow:hidden">
     <% p = nlink_list.link_type.downcase.pluralize+"/nlink" %>
     <%= raw(strip_links(render :partial=>p, :object=>nlink_list.link )) %>
+</div>
+<%= link_to "DELETE", delete_link_rubrik_neuigkeit_path(nlink_list.neuigkeit.rubrik,nlink_list.neuigkeit.id, :nlink_id=>nlink_list.id) %>
 </div>  
+
 <% end %>
 
 

app/views/neuigkeiten/show.html.erb

@@ -28,10 +28,32 @@
 <%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
 </div>
 <%= render partial: 'nlink_list_whole', :object=>@neuigkeit.nlinks %>
-<%= render partial: 'nlink_list_search_whole', object: @nlink_search %>
+
+<a id="findlink-open" href="#"> Neue Verknüpfungen </a>
+<div id="findlink-body" style="background:white">
 <% if can? :find_link, @neuigkeit %>
 <%= semantic_form_for :find_link, :url=>find_link_rubrik_neuigkeit_path(@rubrik,@neuigkeit), :html=>{:id=>"search_form", :method=>'get'} , :remote=> true do |f| %>
 <%= f.input :query, :input_html => { :name => 'query' },:label=>false %>
 <% end %>
+<%= render partial: 'nlink_list_search_whole', object: @nlink_search %>
+
 <% end %>
 </div>
+<script>
+$(function(){
+  dialog = $( "#findlink-body" ).dialog({
+      autoOpen: false,
+      height: 300,
+      width: 350,
+      modal: true,
+      buttons: {
+        "Fertig": function() {
+          dialog.dialog( "close" );
+        }
+      }
+    });
+  $("#findlink-open").on("click",function(){dialog.dialog("open")})
+  });
+</script>
+
+</div>

app/views/studien/_tabs.html.erb

@@ -20,6 +20,6 @@
   <% else %>
   <li class="pull-right">
 <% end %>
-<%= link_to I18n.t("studien.verwaltung.title"), studien_verwalten_path  if can? :verwalten, Studium %>
+<%=  link_to I18n.t("studien.verwaltung.title"), studien_verwalten_path  if can? :verwalten, Studium %>
 </li>
 </ul>

config/routes.rb

@@ -124,6 +124,7 @@ Fetsite::Application.routes.draw do
             get 'add_calentry'
             get 'rm_calentry'
             get 'create_link'
+            get 'delete_link'
             get 'find_link'
             get 'publish_to_facebook'
             get 'mail_to_fet'