summaryrefslogtreecommitdiffstats
path: root/app/views/news
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-07-22 13:29:26 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-07-22 13:29:26 +0000
commit6a2ca5e0342751b6d38a1a05ad25b5c0002d6e46 (patch)
treeaf09ea2d29ce61690b656be91fbf82a3009ea1ed /app/views/news
parent387836f8aa736eba4dfe0da879ad71bbc19dd224 (diff)
downloadredmine-6a2ca5e0342751b6d38a1a05ad25b5c0002d6e46.tar.gz
redmine-6a2ca5e0342751b6d38a1a05ad25b5c0002d6e46.zip
JQuery in, Prototype/Scriptaculous out (#11445).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10068 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/news')
-rw-r--r--app/views/news/index.html.erb4
-rw-r--r--app/views/news/show.html.erb4
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/news/index.html.erb b/app/views/news/index.html.erb
index e62cce498..38eecd262 100644
--- a/app/views/news/index.html.erb
+++ b/app/views/news/index.html.erb
@@ -2,7 +2,7 @@
<%= link_to(l(:label_news_new),
new_project_news_path(@project),
:class => 'icon icon-add',
- :onclick => 'Element.show("add-news"); Form.Element.focus("news_title"); return false;') if @project && User.current.allowed_to?(:manage_news, @project) %>
+ :onclick => 'showAndScrollTo("add-news", "news_title"); return false;') if @project && User.current.allowed_to?(:manage_news, @project) %>
</div>
<div id="add-news" style="display:none;">
@@ -12,7 +12,7 @@
<%= render :partial => 'news/form', :locals => { :f => f } %>
<%= submit_tag l(:button_create) %>
<%= preview_link preview_news_path(:project_id => @project), 'news-form' %> |
-<%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("add-news")' %>
+<%= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()' %>
<% end if @project %>
<div id="preview" class="wiki"></div>
</div>
diff --git a/app/views/news/show.html.erb b/app/views/news/show.html.erb
index 51a896e12..295aecfb2 100644
--- a/app/views/news/show.html.erb
+++ b/app/views/news/show.html.erb
@@ -4,7 +4,7 @@
edit_news_path(@news),
:class => 'icon icon-edit',
:accesskey => accesskey(:edit),
- :onclick => 'Element.show("edit-news"); return false;') if User.current.allowed_to?(:manage_news, @project) %>
+ :onclick => '$("#edit-news").show(); return false;') if User.current.allowed_to?(:manage_news, @project) %>
<%= delete_link news_path(@news) if User.current.allowed_to?(:manage_news, @project) %>
</div>
@@ -17,7 +17,7 @@
<%= render :partial => 'form', :locals => { :f => f } %>
<%= submit_tag l(:button_save) %>
<%= preview_link preview_news_path(:project_id => @project), 'news-form' %> |
-<%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("edit-news"); return false;' %>
+<%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;' %>
<% end %>
<div id="preview" class="wiki"></div>
</div>