forked from bofh/fetsite
small fix neue verknüpfung dialog
This commit is contained in:
@@ -18,7 +18,6 @@ GIT
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
RedCloth (4.2.9)
|
||||
actionmailer (3.2.13)
|
||||
actionpack (= 3.2.13)
|
||||
mail (~> 2.5.3)
|
||||
@@ -86,7 +85,6 @@ GEM
|
||||
erubis (2.7.0)
|
||||
execjs (1.4.0)
|
||||
multi_json (~> 1.0)
|
||||
expression_parser (0.9.0)
|
||||
factory_girl (4.3.0)
|
||||
activesupport (>= 3.0.0)
|
||||
factory_girl_rails (4.3.0)
|
||||
@@ -214,7 +212,6 @@ GEM
|
||||
rdoc (3.12.2)
|
||||
json (~> 1.4)
|
||||
ref (1.0.5)
|
||||
rinku (1.7.3)
|
||||
rmagick (2.13.2)
|
||||
rolify (3.2.0)
|
||||
rspec-core (2.14.7)
|
||||
@@ -264,16 +261,11 @@ GEM
|
||||
warden (1.2.3)
|
||||
rack (>= 1.0)
|
||||
webrick (1.3.1)
|
||||
wikicloth (0.8.1)
|
||||
builder
|
||||
expression_parser
|
||||
rinku
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
RedCloth
|
||||
acts_as_votable
|
||||
annotate (>= 2.5.0)
|
||||
awesome_nested_set
|
||||
@@ -322,4 +314,3 @@ DEPENDENCIES
|
||||
tinymce-rails (~> 4.1.0)
|
||||
uglifier (>= 1.0.3)
|
||||
webrick (= 1.3.1)
|
||||
wikicloth
|
||||
|
||||
@@ -40,9 +40,16 @@
|
||||
<%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
|
||||
</div>
|
||||
<%= render partial: 'nlink_list_whole', :object=>@neuigkeit.nlinks %>
|
||||
|
||||
<% if can? :find_link , @neuigkeit %>
|
||||
<a id="findlink-open" href="#"> Neue Verknüpfungen </a>
|
||||
<div id="findlink-body" style="background:white">
|
||||
<% end %>
|
||||
</div>
|
||||
<style>
|
||||
div.ui-dialog-titlebar {
|
||||
background:white;
|
||||
}
|
||||
</style>
|
||||
<div id="findlink-body" style="background:white; border:solid black 1pt">
|
||||
<% 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 %>
|
||||
@@ -67,5 +74,3 @@ $(function(){
|
||||
$("#findlink-open").on("click",function(){dialog.dialog("open")})
|
||||
});
|
||||
</script>
|
||||
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user