From b4f9e793c37595a0ab0c7fa434fc6ee0594ac369 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Sun, 26 Oct 2014 13:14:37 +0100 Subject: [PATCH 1/2] fix link dialog #181 --- .../stylesheets/themes/blue1/application.css.scss | 3 ++- app/models/ability.rb | 2 +- app/views/home/_beispiele.html.erb | 2 +- app/views/neuigkeiten/_nlink_list.html.erb | 2 +- app/views/neuigkeiten/show.html.erb | 11 +++++------ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/assets/stylesheets/themes/blue1/application.css.scss b/app/assets/stylesheets/themes/blue1/application.css.scss index 28f08bb..53484fe 100755 --- a/app/assets/stylesheets/themes/blue1/application.css.scss +++ b/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' diff --git a/app/models/ability.rb b/app/models/ability.rb index e42d236..530d4e9 100755 --- a/app/models/ability.rb +++ b/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 diff --git a/app/views/home/_beispiele.html.erb b/app/views/home/_beispiele.html.erb index 5b73511..7c48beb 100644 --- a/app/views/home/_beispiele.html.erb +++ b/app/views/home/_beispiele.html.erb @@ -16,7 +16,7 @@ <%=b.name%> (<%=b.lva.full_name%>)
- <%=b.updated_at.to_s%> + <%= b.updated_at.to_s%>
<%end%> diff --git a/app/views/neuigkeiten/_nlink_list.html.erb b/app/views/neuigkeiten/_nlink_list.html.erb index 5328180..4c6a24e 100644 --- a/app/views/neuigkeiten/_nlink_list.html.erb +++ b/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 )) %> -<%= 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 %> <% end %> diff --git a/app/views/neuigkeiten/show.html.erb b/app/views/neuigkeiten/show.html.erb index 6505bac..80140bf 100755 --- a/app/views/neuigkeiten/show.html.erb +++ b/app/views/neuigkeiten/show.html.erb @@ -49,16 +49,15 @@ <%= render partial: 'nlink_list_whole', :object=>@neuigkeit.nlinks %> <% if can? :find_link , @neuigkeit %> - Neue Verknüpfungen +<%= fa_icon("link")%> Neue Verknüpfungen <% end %> -
+
<% 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" ); From f000e91b6dd66287bdf402c032ff571acfe75630 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Sun, 26 Oct 2014 13:15:12 +0100 Subject: [PATCH 2/2] #182 links versteckt --- app/controllers/moduls_controller.rb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app/controllers/moduls_controller.rb b/app/controllers/moduls_controller.rb index 9934e86..d53aed8 100755 --- a/app/controllers/moduls_controller.rb +++ b/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 << {:hicon=>'icon-pencil', :text=>"Lvas bearbeiten", :path=>edit_lvas_modul_path(@modul)} - @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=>I18n.t("modul.edit"), :path=>edit_modul_path(@modul)} - @toolbar_elements << {:hicon=>'icon-remove-circle', :text=>I18n.t("common.delete"),:path=>@modul , :method=>:delete , :data=>{:confirm =>'Are you sure'}} + @toolbar_elements=[] + @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-pencil', :text=>"Lvas bearbeiten", :path=>edit_lvas_modul_path(@modul)} if can? :edit, Lva + @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-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}