diff options
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/boards_controller.rb | 87 | ||||
-rw-r--r-- | app/controllers/messages_controller.rb | 66 | ||||
-rw-r--r-- | app/helpers/application_helper.rb | 5 | ||||
-rw-r--r-- | app/helpers/boards_helper.rb | 19 | ||||
-rw-r--r-- | app/helpers/messages_helper.rb | 28 | ||||
-rw-r--r-- | app/models/board.rb | 28 | ||||
-rw-r--r-- | app/models/message.rb | 37 | ||||
-rw-r--r-- | app/models/permission.rb | 3 | ||||
-rw-r--r-- | app/models/project.rb | 1 | ||||
-rw-r--r-- | app/views/boards/_form.rhtml | 8 | ||||
-rw-r--r-- | app/views/boards/edit.rhtml | 6 | ||||
-rw-r--r-- | app/views/boards/index.rhtml | 30 | ||||
-rw-r--r-- | app/views/boards/new.rhtml | 6 | ||||
-rw-r--r-- | app/views/boards/show.rhtml | 36 | ||||
-rw-r--r-- | app/views/layouts/base.rhtml | 2 | ||||
-rw-r--r-- | app/views/messages/_form.rhtml | 17 | ||||
-rw-r--r-- | app/views/messages/new.rhtml | 6 | ||||
-rw-r--r-- | app/views/messages/show.rhtml | 29 | ||||
-rw-r--r-- | app/views/projects/_boards.rhtml | 24 | ||||
-rw-r--r-- | app/views/projects/settings.rhtml | 5 |
20 files changed, 442 insertions, 1 deletions
diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb new file mode 100644 index 000000000..b3be6b7a2 --- /dev/null +++ b/app/controllers/boards_controller.rb @@ -0,0 +1,87 @@ +# redMine - project management software +# Copyright (C) 2006-2007 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +class BoardsController < ApplicationController + layout 'base' + before_filter :find_project + before_filter :authorize, :except => [:index, :show] + before_filter :check_project_privacy, :only => [:index, :show] + + helper :messages + include MessagesHelper + helper :sort + include SortHelper + + def index + @boards = @project.boards + # show the board if there is only one + if @boards.size == 1 + @board = @boards.first + show + render :action => 'show' + end + end + + def show + sort_init "#{Message.table_name}.updated_on", "desc" + sort_update + + @topic_count = @board.topics.count + @topic_pages = Paginator.new self, @topic_count, 25, params['page'] + @topics = @board.topics.find :all, :order => sort_clause, + :include => [:author, {:last_reply => :author}], + :limit => @topic_pages.items_per_page, + :offset => @topic_pages.current.offset + render :action => 'show', :layout => false if request.xhr? + end + + verify :method => :post, :only => [ :destroy ], :redirect_to => { :action => :index } + + def new + @board = Board.new(params[:board]) + @board.project = @project + if request.post? && @board.save + flash[:notice] = l(:notice_successful_create) + redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'boards' + end + end + + def edit + if request.post? && @board.update_attributes(params[:board]) + case params[:position] + when 'highest'; @board.move_to_top + when 'higher'; @board.move_higher + when 'lower'; @board.move_lower + when 'lowest'; @board.move_to_bottom + end if params[:position] + redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'boards' + end + end + + def destroy + @board.destroy + redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'boards' + end + +private + def find_project + @project = Project.find(params[:project_id]) + @board = @project.boards.find(params[:id]) if params[:id] + rescue ActiveRecord::RecordNotFound + render_404 + end +end diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb new file mode 100644 index 000000000..16a04097f --- /dev/null +++ b/app/controllers/messages_controller.rb @@ -0,0 +1,66 @@ +# redMine - project management software +# Copyright (C) 2006-2007 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +class MessagesController < ApplicationController + layout 'base' + before_filter :find_project, :check_project_privacy + before_filter :require_login, :only => [:new, :reply] + + verify :method => :post, :only => [ :reply, :destroy ], :redirect_to => { :action => :show } + + def show + @reply = Message.new(:subject => "RE: #{@message.subject}") + render :action => "show", :layout => false if request.xhr? + end + + def new + @message = Message.new(params[:message]) + @message.author = logged_in_user + @message.board = @board + if request.post? && @message.save + params[:attachments].each { |file| + next unless file.size > 0 + Attachment.create(:container => @message, :file => file, :author => logged_in_user) + } if params[:attachments] and params[:attachments].is_a? Array + redirect_to :action => 'show', :id => @message + end + end + + def reply + @reply = Message.new(params[:reply]) + @reply.author = logged_in_user + @reply.board = @board + @message.children << @reply + redirect_to :action => 'show', :id => @message + end + + def download + @attachment = @message.attachments.find(params[:attachment_id]) + send_file @attachment.diskfile, :filename => @attachment.filename + rescue + render_404 + end + +private + def find_project + @board = Board.find(params[:board_id], :include => :project) + @project = @board.project + @message = @board.topics.find(params[:id]) if params[:id] + rescue ActiveRecord::RecordNotFound + render_404 + end +end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index f5d262961..cd1b2ea09 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -215,6 +215,11 @@ module ApplicationHelper image_tag("calendar.png", {:id => "#{field_id}_trigger",:class => "calendar-trigger"}) + javascript_tag("Calendar.setup({inputField : '#{field_id}', ifFormat : '%Y-%m-%d', button : '#{field_id}_trigger' });") end + + def wikitoolbar_for(field_id) + return '' unless Setting.text_formatting == 'textile' + javascript_include_tag('jstoolbar') + javascript_tag("var toolbar = new jsToolBar($('#{field_id}')); toolbar.draw();") + end end class TabularFormBuilder < ActionView::Helpers::FormBuilder diff --git a/app/helpers/boards_helper.rb b/app/helpers/boards_helper.rb new file mode 100644 index 000000000..3719e0fe8 --- /dev/null +++ b/app/helpers/boards_helper.rb @@ -0,0 +1,19 @@ +# redMine - project management software +# Copyright (C) 2006-2007 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +module BoardsHelper +end diff --git a/app/helpers/messages_helper.rb b/app/helpers/messages_helper.rb new file mode 100644 index 000000000..bf23275c3 --- /dev/null +++ b/app/helpers/messages_helper.rb @@ -0,0 +1,28 @@ +# redMine - project management software +# Copyright (C) 2006-2007 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +module MessagesHelper + + def link_to_message(message) + return '' unless message + link_to h(truncate(message.subject, 60)), :controller => 'messages', + :action => 'show', + :board_id => message.board_id, + :id => message.root, + :anchor => (message.parent_id ? "message-#{message.id}" : nil) + end +end diff --git a/app/models/board.rb b/app/models/board.rb new file mode 100644 index 000000000..a6ea22f67 --- /dev/null +++ b/app/models/board.rb @@ -0,0 +1,28 @@ +# redMine - project management software +# Copyright (C) 2006-2007 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +class Board < ActiveRecord::Base + belongs_to :project + has_many :topics, :class_name => 'Message', :conditions => "#{Message.table_name}.parent_id IS NULL", :order => "#{Message.table_name}.created_on DESC" + has_many :messages, :dependent => :delete_all, :order => "#{Message.table_name}.created_on DESC" + belongs_to :last_message, :class_name => 'Message', :foreign_key => :last_message_id + acts_as_list :scope => :project_id + + validates_presence_of :name, :description + validates_length_of :name, :maximum => 30 + validates_length_of :description, :maximum => 255 +end diff --git a/app/models/message.rb b/app/models/message.rb new file mode 100644 index 000000000..1f8dde540 --- /dev/null +++ b/app/models/message.rb @@ -0,0 +1,37 @@ +# redMine - project management software +# Copyright (C) 2006-2007 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +class Message < ActiveRecord::Base + belongs_to :board + belongs_to :author, :class_name => 'User', :foreign_key => 'author_id' + acts_as_tree :counter_cache => :replies_count, :order => "#{Message.table_name}.created_on ASC" + has_many :attachments, :as => :container, :dependent => :destroy + belongs_to :last_reply, :class_name => 'Message', :foreign_key => 'last_reply_id' + + validates_presence_of :subject, :content + validates_length_of :subject, :maximum => 255 + + def after_create + board.update_attribute(:last_message_id, self.id) + board.increment! :messages_count + if parent + parent.reload.update_attribute(:last_reply_id, self.id) + else + board.increment! :topics_count + end + end +end diff --git a/app/models/permission.rb b/app/models/permission.rb index 609d5d561..f78118d86 100644 --- a/app/models/permission.rb +++ b/app/models/permission.rb @@ -31,7 +31,8 @@ class Permission < ActiveRecord::Base 1200 => :label_document_plural, 1300 => :label_attachment_plural, 1400 => :label_repository, - 1500 => :label_time_tracking + 1500 => :label_time_tracking, + 2000 => :label_board_plural }.freeze @@cached_perms_for_public = nil diff --git a/app/models/project.rb b/app/models/project.rb index 018efe37e..6dd6b2644 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -26,6 +26,7 @@ class Project < ActiveRecord::Base has_many :documents, :dependent => :destroy has_many :news, :dependent => :delete_all, :include => :author has_many :issue_categories, :dependent => :delete_all, :order => "#{IssueCategory.table_name}.name" + has_many :boards, :order => "position ASC" has_one :repository, :dependent => :destroy has_one :wiki, :dependent => :destroy has_and_belongs_to_many :custom_fields, :class_name => 'IssueCustomField', :join_table => "#{table_name_prefix}custom_fields_projects#{table_name_suffix}", :association_foreign_key => 'custom_field_id' diff --git a/app/views/boards/_form.rhtml b/app/views/boards/_form.rhtml new file mode 100644 index 000000000..7ede589ab --- /dev/null +++ b/app/views/boards/_form.rhtml @@ -0,0 +1,8 @@ +<%= error_messages_for 'board' %> + +<!--[form:board]--> +<div class="box"> +<p><%= f.text_field :name, :required => true %></p> +<p><%= f.text_field :description, :required => true, :size => 80 %></p> +</div> +<!--[eoform:board]--> diff --git a/app/views/boards/edit.rhtml b/app/views/boards/edit.rhtml new file mode 100644 index 000000000..ba4c8b5ac --- /dev/null +++ b/app/views/boards/edit.rhtml @@ -0,0 +1,6 @@ +<h2><%= l(:label_board) %></h2> + +<% labelled_tabular_form_for :board, @board, :url => {:action => 'edit', :id => @board} do |f| %> + <%= render :partial => 'form', :locals => {:f => f} %> + <%= submit_tag l(:button_save) %> +<% end %> diff --git a/app/views/boards/index.rhtml b/app/views/boards/index.rhtml new file mode 100644 index 000000000..3291d0194 --- /dev/null +++ b/app/views/boards/index.rhtml @@ -0,0 +1,30 @@ +<h2><%= l(:label_board_plural) %></h2> + +<table class="list"> + <thead><tr> + <th><%= l(:label_board) %></th> + <th><%= l(:label_topic_plural) %></th> + <th><%= l(:label_message_plural) %></th> + <th><%= l(:label_message_last) %></th> + </tr></thead> + <tbody> +<% for board in @boards %> + <tr class="<%= cycle 'odd', 'even' %>"> + <td> + <%= link_to h(board.name), {:action => 'show', :id => board}, :class => "icon22 icon22-comment" %><br /> + <%=h board.description %> + </td> + <td align="center"><%= board.topics_count %></td> + <td align="center"><%= board.messages_count %></td> + <td> + <small> + <% if board.last_message %> + <%= board.last_message.author.name %>, <%= format_time(board.last_message.created_on) %><br /> + <%= link_to_message board.last_message %> + <% end %> + </small> + </td> + </tr> +<% end %> + </tbody> +</table> diff --git a/app/views/boards/new.rhtml b/app/views/boards/new.rhtml new file mode 100644 index 000000000..b89121880 --- /dev/null +++ b/app/views/boards/new.rhtml @@ -0,0 +1,6 @@ +<h2><%= l(:label_board_new) %></h2> + +<% labelled_tabular_form_for :board, @board, :url => {:action => 'new'} do |f| %> + <%= render :partial => 'form', :locals => {:f => f} %> + <%= submit_tag l(:button_create) %> +<% end %> diff --git a/app/views/boards/show.rhtml b/app/views/boards/show.rhtml new file mode 100644 index 000000000..13a056046 --- /dev/null +++ b/app/views/boards/show.rhtml @@ -0,0 +1,36 @@ +<div class="contextual"> +<%= link_to l(:label_message_new), {:controller => 'messages', :action => 'new', :board_id => @board}, :class => "icon icon-add" %> +</div> + +<h2><%=h @board.name %></h2> + +<table class="list"> + <thead><tr> + <th><%= l(:field_subject) %></th> + <th><%= l(:field_author) %></th> + <%= sort_header_tag("#{Message.table_name}.created_on", :caption => l(:field_created_on)) %> + <th><%= l(:label_reply_plural) %></th> + <%= sort_header_tag("#{Message.table_name}.updated_on", :caption => l(:label_message_last)) %> + </tr></thead> + <tbody> + <% @topics.each do |topic| %> + <tr class="<%= cycle 'odd', 'even' %>"> + <td><%= link_to h(topic.subject), :controller => 'messages', :action => 'show', :board_id => @board, :id => topic %></td> + <td align="center"><%= link_to_user topic.author %></td> + <td align="center"><%= format_time(topic.created_on) %></td> + <td align="center"><%= topic.replies_count %></td> + <td> + <small> + <% if topic.last_reply %> + <%= topic.last_reply.author.name %>, <%= format_time(topic.last_reply.created_on) %><br /> + <%= link_to_message topic.last_reply %> + <% end %> + </small> + </td> + </tr> + <% end %> + </tbody> +</table> + +<p><%= pagination_links_full @topic_pages %> +[ <%= @topic_pages.current.first_item %> - <%= @topic_pages.current.last_item %> / <%= @topic_count %> ]</p> diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml index 5d23f6bbc..db9356f7f 100644 --- a/app/views/layouts/base.rhtml +++ b/app/views/layouts/base.rhtml @@ -79,6 +79,7 @@ <%= link_to l(:label_roadmap), {:controller => 'projects', :action => 'roadmap', :id => @project }, :class => "menuItem" %> <%= link_to l(:label_document_plural), {:controller => 'projects', :action => 'list_documents', :id => @project }, :class => "menuItem" %> <%= link_to l(:label_wiki), {:controller => 'wiki', :id => @project, :page => nil }, :class => "menuItem" if @project.wiki and !@project.wiki.new_record? %> + <%= link_to l(:label_board_plural), {:controller => 'boards', :project_id => @project }, :class => "menuItem" unless @project.boards.empty? %> <%= link_to l(:label_attachment_plural), {:controller => 'projects', :action => 'list_files', :id => @project }, :class => "menuItem" %> <%= link_to l(:label_search), {:controller => 'search', :action => 'index', :id => @project }, :class => "menuItem" %> <%= link_to l(:label_repository), {:controller => 'repositories', :action => 'show', :id => @project}, :class => "menuItem" if @project.repository and !@project.repository.new_record? %> @@ -103,6 +104,7 @@ <li><%= link_to l(:label_roadmap), :controller => 'projects', :action => 'roadmap', :id => @project %></li> <li><%= link_to l(:label_document_plural), :controller => 'projects', :action => 'list_documents', :id => @project %></li> <%= content_tag("li", link_to(l(:label_wiki), :controller => 'wiki', :id => @project, :page => nil)) if @project.wiki and !@project.wiki.new_record? %> + <%= content_tag("li", link_to(l(:label_board_plural), :controller => 'boards', :project_id => @project)) unless @project.boards.empty? %> <li><%= link_to l(:label_attachment_plural), :controller => 'projects', :action => 'list_files', :id => @project %></li> <li><%= link_to l(:label_search), :controller => 'search', :action => 'index', :id => @project %></li> <%= content_tag("li", link_to(l(:label_repository), :controller => 'repositories', :action => 'show', :id => @project)) if @project.repository and !@project.repository.new_record? %> diff --git a/app/views/messages/_form.rhtml b/app/views/messages/_form.rhtml new file mode 100644 index 000000000..453bd8b2a --- /dev/null +++ b/app/views/messages/_form.rhtml @@ -0,0 +1,17 @@ +<%= error_messages_for 'message' %> + +<div class="box"> +<!--[form:message]--> +<p><label><%= l(:field_subject) %></label><br /> +<%= f.text_field :subject, :required => true, :size => 80 %></p> + +<p><%= f.text_area :content, :required => true, :cols => 80, :rows => 15 %></p> +<%= wikitoolbar_for 'message_content' %> +<!--[eoform:message]--> + +<span class="tabular"> +<p id="attachments_p"><label><%=l(:label_attachment)%> +<%= image_to_function "add.png", "addFileField();return false" %></label> +<%= file_field_tag 'attachments[]', :size => 30 %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p> +</span> +</div> diff --git a/app/views/messages/new.rhtml b/app/views/messages/new.rhtml new file mode 100644 index 000000000..5c688f465 --- /dev/null +++ b/app/views/messages/new.rhtml @@ -0,0 +1,6 @@ +<h2><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> » <%= l(:label_message_new) %></h2> + +<% form_for :message, @message, :url => {:action => 'new'}, :html => {:multipart => true} do |f| %> + <%= render :partial => 'form', :locals => {:f => f} %> + <%= submit_tag l(:button_create) %> +<% end %> diff --git a/app/views/messages/show.rhtml b/app/views/messages/show.rhtml new file mode 100644 index 000000000..8f3d83a7e --- /dev/null +++ b/app/views/messages/show.rhtml @@ -0,0 +1,29 @@ +<h2><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> » <%=h @message.subject %></h2> + +<p><em><%= @message.author.name %>, <%= format_time(@message.created_on) %></em></p> +<div class="wiki"> +<%= textilizable(@message.content) %> +</div> +<div class="attachments"> +<% @message.attachments.each do |attachment| %> +<%= link_to attachment.filename, { :action => 'download', :id => @message, :attachment_id => attachment }, :class => 'icon icon-attachment' %> +(<%= number_to_human_size(attachment.filesize) %>)<br /> +<% end %> +</div> +<br /> +<h3 class="icon22 icon22-comment"><%= l(:label_reply_plural) %></h3> +<% @message.children.each do |message| %> + <a name="<%= "message-#{message.id}" %>"></a> + <h4><%=h message.subject %> - <%= message.author.name %>, <%= format_time(message.created_on) %></h4> + <div class="wiki"><p><%= textilizable message.content %></p></div> +<% end %> + +<p><%= toggle_link l(:button_reply), "reply", :focus => "reply_content" %></p> +<div id="reply" style="display:none;"> +<%= error_messages_for 'message' %> +<% form_for :reply, @reply, :url => {:action => 'reply', :id => @message} do |f| %> + <p><%= f.text_field :subject, :required => true, :size => 60 %></p> + <p><%= f.text_area :content, :required => true, :cols => 80, :rows => 10 %></p> + <p><%= submit_tag l(:button_submit) %></p> +<% end %> +</div> diff --git a/app/views/projects/_boards.rhtml b/app/views/projects/_boards.rhtml new file mode 100644 index 000000000..e3f4629c1 --- /dev/null +++ b/app/views/projects/_boards.rhtml @@ -0,0 +1,24 @@ +<table class="list"> + <thead><th><%= l(:label_board) %></th><th><%= l(:field_description) %></th><th style="width:15%"></th><th style="width:15%"></th><th style="width:15%"></th></thead> + <tbody> +<% @project.boards.each do |board| + next if board.new_record? %> + <tr class="<%= cycle 'odd', 'even' %>"> + <td><%=h board.name %></td> + <td><%=h board.description %></td> + <td align="center"> + <% if authorize_for("boards", "edit") %> + <%= link_to image_tag('2uparrow.png', :alt => l(:label_sort_highest)), {:controller => 'boards', :action => 'edit', :project_id => @project, :id => board, :position => 'highest'}, :method => :post, :title => l(:label_sort_highest) %> + <%= link_to image_tag('1uparrow.png', :alt => l(:label_sort_higher)), {:controller => 'boards', :action => 'edit', :project_id => @project, :id => board, :position => 'higher'}, :method => :post, :title => l(:label_sort_higher) %> - + <%= link_to image_tag('1downarrow.png', :alt => l(:label_sort_lower)), {:controller => 'boards', :action => 'edit', :project_id => @project, :id => board, :position => 'lower'}, :method => :post, :title => l(:label_sort_lower) %> + <%= link_to image_tag('2downarrow.png', :alt => l(:label_sort_lowest)), {:controller => 'boards', :action => 'edit', :project_id => @project, :id => board, :position => 'lowest'}, :method => :post, :title => l(:label_sort_lowest) %> + <% end %> + </td> + <td align="center"><small><%= link_to_if_authorized l(:button_edit), {:controller => 'boards', :action => 'edit', :project_id => @project, :id => board}, :class => 'icon icon-edit' %></small></td> + <td align="center"><small><%= link_to_if_authorized l(:button_delete), {:controller => 'boards', :action => 'destroy', :project_id => @project, :id => board}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %></small></td> + </tr> +<% end %> + </tbody> +</table> + +<p><%= link_to_if_authorized l(:label_board_new), {:controller => 'boards', :action => 'new', :project_id => @project} %></p> diff --git a/app/views/projects/settings.rhtml b/app/views/projects/settings.rhtml index 3405bfb64..81150dd54 100644 --- a/app/views/projects/settings.rhtml +++ b/app/views/projects/settings.rhtml @@ -6,6 +6,7 @@ <li><%= link_to l(:label_member_plural), {}, :id=> "tab-members", :onclick => "showTab('members'); this.blur(); return false;" %></li> <li><%= link_to l(:label_version_plural), {}, :id=> "tab-versions", :onclick => "showTab('versions'); this.blur(); return false;" %></li> <li><%= link_to l(:label_issue_category_plural), {}, :id=> "tab-categories", :onclick => "showTab('categories'); this.blur(); return false;" %></li> +<li><%= link_to l(:label_board_plural), {}, :id=> "tab-boards", :onclick => "showTab('boards'); this.blur(); return false;" %></li> </ul> </div> @@ -76,5 +77,9 @@ <% end %> </div> +<div id="tab-content-boards" class="tab-content" style="display:none;"> + <%= render :partial => 'boards' %> +</div> + <%= tab = params[:tab] ? h(params[:tab]) : 'info' javascript_tag "showTab('#{tab}');" %>
\ No newline at end of file |