jro_apps/redmine Commit - r343:143be7ee0292

0

app/controllers/feeds_controller.rb +2 -2

               # news feeds
               def news
                 News.with_scope(:find => @find_options) do
-                  @news = News.find :all, :order => "#{News.table_name}.created_on DESC", :limit => 10, :include => [ :author, :project ]
+                  @news = News.find :all, :order => "#{News.table_name}.created_on DESC", :include => [ :author, :project ]
                 end
                 headers["Content-Type"] = "application/rss+xml"
                 render :action => 'news_atom' if 'atom' == params[:format]
                   # global feed
                   scope = ["#{Project.table_name}.is_public=?", true]
                 end
-                @find_options = {:conditions => scope, :limit => 10}
+                @find_options = {:conditions => scope, :limit => Setting.feeds_limit}
                 return true
               end
             end

0

app/views/settings/edit.rhtml +5 0

             <h2><%= l(:label_settings) %></h2>
+            <div id="settings">
             <% form_tag({:action => 'edit'}, :class => "tabular") do %>
             <div class="box">
             <p><label><%= l(:setting_app_title) %></label>
             <p><label><%= l(:setting_wiki_compression) %></label>
             <%= select_tag 'settings[wiki_compression]', options_for_select( [[l(:label_none), 0], ["gzip", "gzip"]], Setting.wiki_compression) %></p>
+            <p><label><%= l(:setting_feeds_limit) %></label>
+            <%= text_field_tag 'settings[feeds_limit]', Setting.feeds_limit, :size => 6 %></p>
             </div>
             <%= submit_tag l(:button_save) %>
+            </div>
             <% end %>

0

config/settings.yml +4 -1

@@ -46,4 +46,7 wiki_compression:
46	default_language:	46	default_language:
47	default: en	47	default: en
48	host_name:	48	host_name:
49	default: localhost:3000 No newline at end of file	49	default: localhost:3000
		50	feeds_limit:
		51	format: int
		52	default: 15

0

lang/de.yml +1 0

             setting_host_name: Host Name
             setting_text_formatting: Textformatierung
             setting_wiki_compression: Wiki Geschichte Kompression
+            setting_feeds_limit: Feed content limit
             label_user: Benutzer
             label_user_plural: Benutzer

0

lang/en.yml +1 0

             setting_host_name: Host name
             setting_text_formatting: Text formatting
             setting_wiki_compression: Wiki history compression
+            setting_feeds_limit: Feed content limit
             label_user: User
             label_user_plural: Users

0

lang/es.yml +1 0

             setting_host_name: Nombre de anfitrión
             setting_text_formatting: Formato de texto
             setting_wiki_compression: Compresión de la historia de Wiki
+            setting_feeds_limit: Feed content limit
             label_user: Usuario
             label_user_plural: Usuarios

0

lang/fr.yml +1 0

             setting_host_name: Nom d'hôte
             setting_text_formatting: Formatage du texte
             setting_wiki_compression: Compression historique wiki
+            setting_feeds_limit: Limite du contenu des flux RSS
             label_user: Utilisateur
             label_user_plural: Utilisateurs

0

lang/it.yml +1 0

             setting_host_name: Nome host
             setting_text_formatting: Formattazione testo
             setting_wiki_compression: Compressione di storia di Wiki
+            setting_feeds_limit: Feed content limit
             label_user: Utente
             label_user_plural: Utenti

0

lang/ja.yml +1 0

             setting_host_name: ホスト名
             setting_text_formatting: テキストの書式
             setting_wiki_compression: Wiki history compression
+            setting_feeds_limit: Feed content limit
             label_user: ユーザ
             label_user_plural: ユーザ

0

public/stylesheets/application.css +2 0

             color: #cc0000;
             }
+            #settings .tabular p{ padding-left: 250px; }
+            #settings .tabular label{ margin-left: -250px; width: 245px; }
             /*.threepxfix class below:
             Targets IE6- ONLY. Adds 3 pixel indent for multi-line form contents.

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages