Merge branch 'master' of https://github.com/fetsite/fetsite

app/assets/stylesheets/themes/blue1/application.css.scss

@@ -12,7 +12,8 @@
  *= require_self
  * require_tree .
  *= require jquery.fileupload-ui
-*= require jquery.datetimepicker	
+ *= require jquery.datetimepicker	
+ *= require jquery.ui.dialog
  * require 'bootstrap'
 
  * require 'neuigkeiten'

app/controllers/moduls_controller.rb

@@ -175,11 +175,12 @@ end
   end
 
   def load_toolbar_show
-    @toolbar_elements = [{:hicon=>'icon-plus-sign', :text=>I18n.t("lva.add"), :path=>new_lva_path(:modul_id =>@modul.id)}]
+    @toolbar_elements=[]
-    @toolbar_elements << {:hicon=>'icon-pencil', :text=>"Lvas bearbeiten", :path=>edit_lvas_modul_path(@modul)}
+    @toolbar_elements = {:hicon=>'icon-plus-sign', :text=>I18n.t("lva.add"), :path=>new_lva_path(:modul_id =>@modul.id)} if can? :new, Lva
-    @toolbar_elements << {:hicon=>'icon-plus-sign', :text=>"ADD FROM TISS", :path=>load_tiss_modul_path(:modul_id =>@modul.id)}
+    @toolbar_elements << {:hicon=>'icon-pencil', :text=>"Lvas bearbeiten", :path=>edit_lvas_modul_path(@modul)} if can? :edit, Lva
-    @toolbar_elements << {:hicon=>'icon-pencil', :text=>I18n.t("modul.edit"), :path=>edit_modul_path(@modul)}
+    @toolbar_elements << {:hicon=>'icon-plus-sign', :text=>"ADD FROM TISS", :path=>load_tiss_modul_path(:modul_id =>@modul.id)} if can? :load_tiss, Modul
-    @toolbar_elements << {:hicon=>'icon-remove-circle', :text=>I18n.t("common.delete"),:path=>@modul , :method=>:delete , :data=>{:confirm =>'Are you sure'}}
+    @toolbar_elements << {:hicon=>'icon-pencil', :text=>I18n.t("modul.edit"), :path=>edit_modul_path(@modul)} if can? :edit, @modul
+    @toolbar_elements << {:hicon=>'icon-remove-circle', :text=>I18n.t("common.delete"),:path=>@modul , :method=>:delete , :data=>{:confirm =>'Are you sure'}} if can? :delete, @modul
     @topbar_elements = [{:hicon=>'icon-list', :text=>I18n.t("modul.list"),:path=>moduls_path}]
     @tb=[]
     
@@ -188,7 +189,7 @@ end
   
   def load_toolbar_index 
 
-      @toolbar_elements = [{:hicon=>'icon-plus-sign', :text=>I18n.t("modul.add"), :path=>new_modul_path}]
+      @toolbar_elements = [{:hicon=>'icon-plus-sign', :text=>I18n.t("modul.add"), :path=>new_modul_path}] if can? :new , Modul
       @topbar_elements =[{:hicon=>'icon-list', :text=>I18n.t("studien.allestudien"),:path=>studien_path}]
       @topbar_elements<<{:hicon=>'icon-list', :text=>I18n.t("modul.list"),:path=>moduls_path}
       @topbar_elements<<{:hicon=>'icon-list', :text=>I18n.t("lva.list"),:path=>lvas_path}

app/models/ability.rb

@@ -94,7 +94,7 @@ class Ability
       can :showintern, Rubrik
       can :seeintern, User
       can :shownonpublic, Rubrik
-
+      can :manage, Nlink
     end
     if user.has_role?("newsadmin") || user.has_role?("fetadmin") 
       can :addmoderator, Rubrik

app/views/home/_beispiele.html.erb

@@ -16,7 +16,7 @@
 	  <b><%=b.name%></b> (<%=b.lva.full_name%>)
 	</div>
 	<div class="span4">
-	  <%=b.updated_at.to_s%>
+	  <%= b.updated_at.to_s%>
 	</div>
       </div>
       <%end%>

app/views/neuigkeiten/_nlink_list.html.erb

@@ -5,7 +5,7 @@
     <% 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) if can? :delete, Nlink %>
+<%= link_to fa_icon("unlink"), delete_link_rubrik_neuigkeit_path(nlink_list.neuigkeit.rubrik,nlink_list.neuigkeit.id, :nlink_id=>nlink_list.id), :title=>"unlink" if can? :delete, Nlink %>
 </div>  
 
 <% end %>

app/views/neuigkeiten/show.html.erb

@@ -49,16 +49,15 @@
 </div>
 <%= render partial: 'nlink_list_whole', :object=>@neuigkeit.nlinks %>
 <% if can? :find_link , @neuigkeit %>
-<a id="findlink-open" href="#"> Neue Verknüpfungen </a>
+<a id="findlink-open" href="#"><%= fa_icon("link")%> Neue Verknüpfungen </a>
 <% end %>
 </div>
 <style>
-div.ui-dialog-titlebar {
+
-background:white;
-}
 </style>
-<div id="findlink-body" style="background:white; border:solid black 1pt">
+<div id="findlink-body"class="ui-dialog" style="">
 <% if can? :find_link, @neuigkeit %>
+Nach Element suchen:
 <%= 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 %>
@@ -70,9 +69,9 @@ background:white;
 $(function(){
   dialog = $( "#findlink-body" ).dialog({
       autoOpen: false,
-      height: 300,
       width: 350,
       modal: true,
+      title: "Neue Verknüpfung hinzufügen",
       buttons: {
         "Fertig": function() {
           dialog.dialog( "close" );