@@ -47,7 +47,10 class NewsController < ApplicationController | |||||
47 | :limit => @limit) |
|
47 | :limit => @limit) | |
48 |
|
48 | |||
49 | respond_to do |format| |
|
49 | respond_to do |format| | |
50 | format.html { render :layout => false if request.xhr? } |
|
50 | format.html { | |
|
51 | @news = News.new # for adding news inline | |||
|
52 | render :layout => false if request.xhr? | |||
|
53 | } | |||
51 | format.api |
|
54 | format.api | |
52 | format.atom { render_feed(@newss, :title => (@project ? @project.name : Setting.app_title) + ": #{l(:label_news_plural)}") } |
|
55 | format.atom { render_feed(@newss, :title => (@project ? @project.name : Setting.app_title) + ": #{l(:label_news_plural)}") } | |
53 | end |
|
56 | end |
@@ -1,7 +1,6 | |||||
1 | <h2><%=l(:label_news)%></h2> |
|
1 | <h2><%=l(:label_news)%></h2> | |
2 |
|
2 | |||
3 | <% labelled_tabular_form_for :news, @news, :url => news_path(@news), |
|
3 | <% labelled_tabular_form_for @news, :html => { :id => 'news-form', :method => :put } do |f| %> | |
4 | :html => { :id => 'news-form', :method => :put } do |f| %> |
|
|||
5 | <%= render :partial => 'form', :locals => { :f => f } %> |
|
4 | <%= render :partial => 'form', :locals => { :f => f } %> | |
6 | <%= submit_tag l(:button_save) %> |
|
5 | <%= submit_tag l(:button_save) %> | |
7 | <%= link_to_remote l(:label_preview), |
|
6 | <%= link_to_remote l(:label_preview), |
@@ -7,7 +7,7 | |||||
7 |
|
7 | |||
8 | <div id="add-news" style="display:none;"> |
|
8 | <div id="add-news" style="display:none;"> | |
9 | <h2><%=l(:label_news_new)%></h2> |
|
9 | <h2><%=l(:label_news_new)%></h2> | |
10 |
<% labelled_tabular_form_for |
|
10 | <% labelled_tabular_form_for @news, :url => project_news_index_path(@project), | |
11 | :html => { :id => 'news-form' } do |f| %> |
|
11 | :html => { :id => 'news-form' } do |f| %> | |
12 | <%= render :partial => 'news/form', :locals => { :f => f } %> |
|
12 | <%= render :partial => 'news/form', :locals => { :f => f } %> | |
13 | <%= submit_tag l(:button_create) %> |
|
13 | <%= submit_tag l(:button_create) %> |
@@ -1,6 +1,6 | |||||
1 | <h2><%=l(:label_news_new)%></h2> |
|
1 | <h2><%=l(:label_news_new)%></h2> | |
2 |
|
2 | |||
3 |
<% labelled_tabular_form_for |
|
3 | <% labelled_tabular_form_for @news, :url => project_news_index_path(@project), | |
4 | :html => { :id => 'news-form' } do |f| %> |
|
4 | :html => { :id => 'news-form' } do |f| %> | |
5 | <%= render :partial => 'news/form', :locals => { :f => f } %> |
|
5 | <%= render :partial => 'news/form', :locals => { :f => f } %> | |
6 | <%= submit_tag l(:button_create) %> |
|
6 | <%= submit_tag l(:button_create) %> |
General Comments 0
You need to be logged in to leave comments.
Login now