Commit b647645d2beb4f0f6183d14e2ec52e8a10ec5a71

Date: Mon Apr 14 16:50:45 +0000 2008
Committer: mtkd (mtkd@prj2.com)
Author: mtkd (mtkd@prj2.com)
Commit SHA1: b647645d2beb4f0f6183d14e2ec52e8a10ec5a71
Tree SHA1: e01babd8d5b84fab43f03dedf0800c49f8b96d51

Added activity tab

Commit diff
Comments (0)

app/views/projects/ac_list.html.erb 2 -+
app/helpers/tickets_helper.rb 1 +
db/migrate/407_create_tickets.rb 2 -+
config/initializers/appcast_config.rb 2 -+
app/views/site/ac_about.html.erb 2 -+
app/views/articles/ac_index.html.erb 2 -+
app/views/articles/ac_show.html.erb 2 -+
app/controllers/projects_controller.rb 12 ------++++++
app/views/tickets/ac_project_index.html.erb 2 -+
app/views/projects/ac_activity.html.erb 4 ++++
app/views/wikis/ac_index.html.erb 2 -+
app/views/searches/ac_search.html.erb 2 -+
app/views/repositories/_ac_right_actionbox_repos_summary.html.erb 2 -+
app/views/site/appcast_index.html.erb 2 -+
app/models/project.rb 6 ---+++
config/routes.rb 2 -+
app/views/forums/ac_index.html.erb 2 -+
app/helpers/projects_helper.rb 70 -------------------+++++++++++++++++++++++++++++++++++++++++++++++++++
app/views/projects/ac_roadmap.html.erb 4 ++++
app/helpers/application_helper.rb 10 -----+++++
app/views/users/ac_show.html.erb 2 -+

Commit diff

Diff rendering mode:
inline
side by side

app/controllers/projects_controller.rb


114	114	end
115	115	end
116	116
117		~~# def timeline~~
118		~~# if load_tab_defaults(PRJ_TAB_EVENTS) then~~
119		~~# @title, @url_suffix = Project.tab_settings(PRJ_TAB_EVENTS)~~
120		~~# render :action => "ac_timeline"~~
121		~~# end~~
122		~~# end~~
	117	def activity
	118	if load_tab_defaults(PRJ_TAB_ACTIVITY) then
	119	@title, @url_suffix = Project.tab_settings(PRJ_TAB_ACTIVITY)
	120	render :action => "ac_activity"
	121	end
	122	end
123	123
124	124	def roadmap
125	125	if load_tab_defaults(PRJ_TAB_ROADMAP) then
toggle raw diff
--- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -114,12 +114,12 @@ class ProjectsController < ApplicationController end end -# def timeline -# if load_tab_defaults(PRJ_TAB_EVENTS) then -# @title, @url_suffix = Project.tab_settings(PRJ_TAB_EVENTS) -# render :action => "ac_timeline" -# end -# end + def activity + if load_tab_defaults(PRJ_TAB_ACTIVITY) then + @title, @url_suffix = Project.tab_settings(PRJ_TAB_ACTIVITY) + render :action => "ac_activity" + end + end def roadmap if load_tab_defaults(PRJ_TAB_ROADMAP) then

app/helpers/application_helper.rb


302	302	end
303	303	end
304	304
305		~~def render_right_actionbox_default (flags = {})~~
	305	def actionbox_default (flags = {})
306	306	out = %Q{<ul>}
307	307	if logged_in? then
308	308	#
…	…
318	318	out
319	319	end
320	320
321		~~def render_right_actionbox_basic (flags = {})~~
	321	def actionbox_basic (flags = {})
322	322	out = %Q{<table class='right_default_table'>}
323	323	out << %Q{<tr><th>Actions</th></tr>}
324		~~out << %Q{<tr><td>#{render_right_actionbox_default(flags)}</td></tr>}~~
	324	out << %Q{<tr><td>#{actionbox_default(flags)}</td></tr>}
325	325	out << %Q{</table>}
326	326	out
327	327	end
328	328
329		~~def render_right_actionbox_complex (flags = {})~~
	329	def actionbox_complex (flags = {})
330	330	out = %Q{<table class='right_default_table'>}
331	331	out << %Q{<tr><th>Actions</th></tr>}
332	332	#
…	…
342	342	acts << %Q{<li>#{link_to("New Milestone", new_project_milestone_path(@project.slug))}</li>} if flags[:new_milestone] && is_member
343	343	acts << %Q{<li>#{link_to("Clone Mainline", new_project_repository_path(@project.slug, @repository))}</li>} if flags[:clone_mainline] && logged_in?
344	344	out << %Q{<tr><td><ul>#{acts}</ul></td></tr>} if acts != ""
345		~~out << %Q{<tr><td>#{render_right_actionbox_default(flags)}</td></tr>}~~
	345	out << %Q{<tr><td>#{actionbox_default(flags)}</td></tr>}
346	346	out << %Q{</table>}
347	347	out
348	348	end
toggle raw diff
--- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -302,7 +302,7 @@ module ApplicationHelper end end - def render_right_actionbox_default (flags = {}) + def actionbox_default (flags = {}) out = %Q{<ul>} if logged_in? then # @@ -318,15 +318,15 @@ module ApplicationHelper out end - def render_right_actionbox_basic (flags = {}) + def actionbox_basic (flags = {}) out = %Q{<table class='right_default_table'>} out << %Q{<tr><th>Actions</th></tr>} - out << %Q{<tr><td>#{render_right_actionbox_default(flags)}</td></tr>} + out << %Q{<tr><td>#{actionbox_default(flags)}</td></tr>} out << %Q{</table>} out end - def render_right_actionbox_complex (flags = {}) + def actionbox_complex (flags = {}) out = %Q{<table class='right_default_table'>} out << %Q{<tr><th>Actions</th></tr>} # @@ -342,7 +342,7 @@ module ApplicationHelper acts << %Q{<li>#{link_to("New Milestone", new_project_milestone_path(@project.slug))}</li>} if flags[:new_milestone] && is_member acts << %Q{<li>#{link_to("Clone Mainline", new_project_repository_path(@project.slug, @repository))}</li>} if flags[:clone_mainline] && logged_in? out << %Q{<tr><td><ul>#{acts}</ul></td></tr>} if acts != "" - out << %Q{<tr><td>#{render_right_actionbox_default(flags)}</td></tr>} + out << %Q{<tr><td>#{actionbox_default(flags)}</td></tr>} out << %Q{</table>} out end

app/helpers/projects_helper.rb


52	52	out = ""
53	53	out << "<ul id='tabmenu'>"
54	54	out << project_tab(active_tab, PRJ_TAB_WIKI)
	55	out << project_tab(active_tab, PRJ_TAB_ACTIVITY)
55	56	out << project_tab(active_tab, PRJ_TAB_REPOS)
56	57	out << project_tab(active_tab, PRJ_TAB_ROADMAP)
57	58	out << project_tab(active_tab, PRJ_TAB_TICKETS)
…	…
63	63	out << "</ul>"
64	64	out
65	65	end
66
67
	66
68	67	def breadcrumb_repos_tab(subtab)
69	68	subtab == PRJ_TAB_SUBTAB_NONE ? out = "" : out = breadcrumb_repositories
70	69	case subtab
…	…
92	92	when PRJ_TAB_WIKI
93	93	case subtab
94	94	when PRJ_TAB_WIKI_EDIT, PRJ_TAB_WIKI_NEW
95		~~out << render_right_actionbox_basic(:allow_shortcuts => true)~~
	95	out << actionbox_basic(:allow_shortcuts => true)
96	96	when PRJ_TAB_WIKI_LIST
97		~~out << render_right_actionbox_complex(:allow_shortcuts => true, :new_project_wiki => true)~~
	97	out << actionbox_complex(:allow_shortcuts => true, :new_project_wiki => true)
98	98	else
99		~~out << render_right_actionbox_complex(:allow_shortcuts => true, :edit_project_wiki => true, :new_project_wiki => true, :list_project_wikis => true)~~
	99	out << actionbox_complex(:allow_shortcuts => true, :edit_project_wiki => true, :new_project_wiki => true, :list_project_wikis => true)
100	100	end
101	101	out << render_right_project_extrainfo
102	102	out << render_right_project_contributors
103		~~when PRJ_TAB_DOWNLOADS~~
104		~~out << render_right_actionbox_basic(:allow_shortcuts => true)~~
	103	when PRJ_TAB_ACTIVITY
	104	out << actionbox_basic(:allow_shortcuts => true)
105	105	when PRJ_TAB_REPOS
106	106	case subtab
107	107	when PRJ_TAB_SUBTAB_NONE
108		~~out << render_right_actionbox_complex(:allow_shortcuts => true, :clone_mainline => true)~~
	108	out << actionbox_complex(:allow_shortcuts => true, :clone_mainline => true)
109	109	when PRJ_TAB_REPOS_SUMMARY
110	110	out << render(:partial => "repositories/ac_right_actionbox_repos_summary")
111	111	when PRJ_TAB_REPOS_LOGS
112		~~out << render_right_actionbox_basic(:allow_shortcuts => true)~~
	112	out << actionbox_basic(:allow_shortcuts => true)
113	113	out << render(:partial => "repositories/ac_right_branches")
114	114	when PRJ_TAB_REPOS_COMMIT
115		~~out << render_right_actionbox_basic(:allow_shortcuts => true)~~
	115	out << actionbox_basic(:allow_shortcuts => true)
116	116	out << render(:partial => "commits/ac_right_diff_mode_selector")
117	117	when PRJ_TAB_REPOS_TREE
118		~~out << render_right_actionbox_basic(:allow_shortcuts => true)~~
	118	out << actionbox_basic(:allow_shortcuts => true)
119	119	out << render(:partial => "trees/ac_right_branches")
120	120	when PRJ_TAB_REPOS_MERGEREQUESTS
121		~~out << render_right_actionbox_basic(:allow_shortcuts => true)~~
	121	out << actionbox_basic(:allow_shortcuts => true)
122	122	end
123	123	when PRJ_TAB_ROADMAP
124		~~out << render_right_actionbox_complex(:allow_shortcuts => true, :new_milestone => true)~~
	124	out << actionbox_complex(:allow_shortcuts => true, :new_milestone => true)
125	125	when PRJ_TAB_TICKETS
126		~~out << render_right_actionbox_complex(:allow_shortcuts => true, :new_ticket => true)~~
	126	out << actionbox_complex(:allow_shortcuts => true, :new_ticket => true)
	127	out << actionbox_ticket_filter
127	128	when PRJ_TAB_ARTICLES
128		~~out << render_right_actionbox_complex(:allow_shortcuts => true, :new_article => true)~~
	129	out << actionbox_complex(:allow_shortcuts => true, :new_article => true)
129	130	when PRJ_TAB_FORUM
130		~~out << render_right_actionbox_basic(:allow_shortcuts => true)~~
	131	out << actionbox_basic(:allow_shortcuts => true)
131	132	when PRJ_TAB_EVENTS
132		~~out << render_right_actionbox_basic(:allow_shortcuts => true)~~
	133	out << actionbox_basic(:allow_shortcuts => true)
133	134	when PRJ_TAB_CONFIG
134		~~out << render_right_actionbox_basic(:allow_shortcuts => true)~~
	135	out << actionbox_basic(:allow_shortcuts => true)
135	136	end
136	137	out
137		~~end~~
	138	end
	139
	140	#TODO need to find a better place for these (partial?)
	141	def actionbox_ticket_filter
	142	out = ""
	143	out << %Q{<table class='right_default_table' cellspacing=0px>}
	144	out << %Q{<tr><th>Ticket Filter</th></tr>}
	145
	146	out << %Q{<tr><td>Type:</td></tr>}
	147	out << %Q{<tr><td>  <input type=checkbox>Defect</td></tr>}
	148	out << %Q{<tr><td>  <input type=checkbox>Enhancement</td></tr>}
	149	out << %Q{<tr><td>  <input type=checkbox>Task</td></tr>}
	150
	151	out << %Q{<tr><td>Status:</td></tr>}
	152	out << %Q{<tr><td>  <input type=checkbox>Proposed</td></tr>}
	153	out << %Q{<tr><td>  <input type=checkbox>Open</td></tr>}
	154	out << %Q{<tr><td>  <input type=checkbox>Closed</td></tr>}
	155
	156	out << %Q{<tr><td>Impact:</td></tr>}
	157	out << %Q{<tr><td>  <input type=checkbox>Low</td></tr>}
	158	out << %Q{<tr><td>  <input type=checkbox>High</td></tr>}
	159	out << %Q{<tr><td>  <input type=checkbox>Security</td></tr>}
	160
	161	out << %Q{<tr><td>Priority:</td></tr>}
	162	out << %Q{<tr><td>  <input type=checkbox>None</td></tr>}
	163	out << %Q{<tr><td>  <input type=checkbox>Low</td></tr>}
	164	out << %Q{<tr><td>  <input type=checkbox>High</td></tr>}
	165	out << %Q{<tr><td>  <input type=checkbox>Critical</td></tr>}
	166
	167	out << %Q{</table>}
	168	out
	169	end
138	170
139	171	def format_life_cycle (ls)
140	172	case ls
toggle raw diff
--- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -52,6 +52,7 @@ module ProjectsHelper out = "" out << "<ul id='tabmenu'>" out << project_tab(active_tab, PRJ_TAB_WIKI) + out << project_tab(active_tab, PRJ_TAB_ACTIVITY) out << project_tab(active_tab, PRJ_TAB_REPOS) out << project_tab(active_tab, PRJ_TAB_ROADMAP) out << project_tab(active_tab, PRJ_TAB_TICKETS) @@ -62,8 +63,7 @@ module ProjectsHelper out << "</ul>" out end - - + def breadcrumb_repos_tab(subtab) subtab == PRJ_TAB_SUBTAB_NONE ? out = "" : out = breadcrumb_repositories case subtab @@ -92,49 +92,81 @@ module ProjectsHelper when PRJ_TAB_WIKI case subtab when PRJ_TAB_WIKI_EDIT, PRJ_TAB_WIKI_NEW - out << render_right_actionbox_basic(:allow_shortcuts => true) + out << actionbox_basic(:allow_shortcuts => true) when PRJ_TAB_WIKI_LIST - out << render_right_actionbox_complex(:allow_shortcuts => true, :new_project_wiki => true) + out << actionbox_complex(:allow_shortcuts => true, :new_project_wiki => true) else - out << render_right_actionbox_complex(:allow_shortcuts => true, :edit_project_wiki => true, :new_project_wiki => true, :list_project_wikis => true) + out << actionbox_complex(:allow_shortcuts => true, :edit_project_wiki => true, :new_project_wiki => true, :list_project_wikis => true) end out << render_right_project_extrainfo out << render_right_project_contributors - when PRJ_TAB_DOWNLOADS - out << render_right_actionbox_basic(:allow_shortcuts => true) + when PRJ_TAB_ACTIVITY + out << actionbox_basic(:allow_shortcuts => true) when PRJ_TAB_REPOS case subtab when PRJ_TAB_SUBTAB_NONE - out << render_right_actionbox_complex(:allow_shortcuts => true, :clone_mainline => true) + out << actionbox_complex(:allow_shortcuts => true, :clone_mainline => true) when PRJ_TAB_REPOS_SUMMARY out << render(:partial => "repositories/ac_right_actionbox_repos_summary") when PRJ_TAB_REPOS_LOGS - out << render_right_actionbox_basic(:allow_shortcuts => true) + out << actionbox_basic(:allow_shortcuts => true) out << render(:partial => "repositories/ac_right_branches") when PRJ_TAB_REPOS_COMMIT - out << render_right_actionbox_basic(:allow_shortcuts => true) + out << actionbox_basic(:allow_shortcuts => true) out << render(:partial => "commits/ac_right_diff_mode_selector") when PRJ_TAB_REPOS_TREE - out << render_right_actionbox_basic(:allow_shortcuts => true) + out << actionbox_basic(:allow_shortcuts => true) out << render(:partial => "trees/ac_right_branches") when PRJ_TAB_REPOS_MERGEREQUESTS - out << render_right_actionbox_basic(:allow_shortcuts => true) + out << actionbox_basic(:allow_shortcuts => true) end when PRJ_TAB_ROADMAP - out << render_right_actionbox_complex(:allow_shortcuts => true, :new_milestone => true) + out << actionbox_complex(:allow_shortcuts => true, :new_milestone => true) when PRJ_TAB_TICKETS - out << render_right_actionbox_complex(:allow_shortcuts => true, :new_ticket => true) + out << actionbox_complex(:allow_shortcuts => true, :new_ticket => true) + out << actionbox_ticket_filter when PRJ_TAB_ARTICLES - out << render_right_actionbox_complex(:allow_shortcuts => true, :new_article => true) + out << actionbox_complex(:allow_shortcuts => true, :new_article => true) when PRJ_TAB_FORUM - out << render_right_actionbox_basic(:allow_shortcuts => true) + out << actionbox_basic(:allow_shortcuts => true) when PRJ_TAB_EVENTS - out << render_right_actionbox_basic(:allow_shortcuts => true) + out << actionbox_basic(:allow_shortcuts => true) when PRJ_TAB_CONFIG - out << render_right_actionbox_basic(:allow_shortcuts => true) + out << actionbox_basic(:allow_shortcuts => true) end out - end + end + + #TODO need to find a better place for these (partial?) + def actionbox_ticket_filter + out = "" + out << %Q{<table class='right_default_table' cellspacing=0px>} + out << %Q{<tr><th>Ticket Filter</th></tr>} + + out << %Q{<tr><td>Type:</td></tr>} + out << %Q{<tr><td>  <input type=checkbox>Defect</td></tr>} + out << %Q{<tr><td>  <input type=checkbox>Enhancement</td></tr>} + out << %Q{<tr><td>  <input type=checkbox>Task</td></tr>} + + out << %Q{<tr><td>Status:</td></tr>} + out << %Q{<tr><td>  <input type=checkbox>Proposed</td></tr>} + out << %Q{<tr><td>  <input type=checkbox>Open</td></tr>} + out << %Q{<tr><td>  <input type=checkbox>Closed</td></tr>} + + out << %Q{<tr><td>Impact:</td></tr>} + out << %Q{<tr><td>  <input type=checkbox>Low</td></tr>} + out << %Q{<tr><td>  <input type=checkbox>High</td></tr>} + out << %Q{<tr><td>  <input type=checkbox>Security</td></tr>} + + out << %Q{<tr><td>Priority:</td></tr>} + out << %Q{<tr><td>  <input type=checkbox>None</td></tr>} + out << %Q{<tr><td>  <input type=checkbox>Low</td></tr>} + out << %Q{<tr><td>  <input type=checkbox>High</td></tr>} + out << %Q{<tr><td>  <input type=checkbox>Critical</td></tr>} + + out << %Q{</table>} + out + end def format_life_cycle (ls) case ls

app/helpers/tickets_helper.rb


57	57	out
58	58	end
59	59
	60
60	61	end
toggle raw diff
--- a/app/helpers/tickets_helper.rb +++ b/app/helpers/tickets_helper.rb @@ -57,4 +57,5 @@ module TicketsHelper out end + end

app/models/project.rb


237	237	when PRJ_TAB_WIKI
238	238	title = "Wiki"
239	239	url_suffix = ""
240		~~when PRJ_TAB_DOWNLOADS~~
241		~~title = "Downloads"~~
242		~~url_suffix = "/downloads"~~
	240	when PRJ_TAB_ACTIVITY
	241	title = "Activity"
	242	url_suffix = "/activity"
243	243	when PRJ_TAB_REPOS
244	244	title = "Repositories"
245	245	url_suffix = "/repos"
toggle raw diff
--- a/app/models/project.rb +++ b/app/models/project.rb @@ -237,9 +237,9 @@ class Project < ActiveRecord::Base when PRJ_TAB_WIKI title = "Wiki" url_suffix = "" - when PRJ_TAB_DOWNLOADS - title = "Downloads" - url_suffix = "/downloads" + when PRJ_TAB_ACTIVITY + title = "Activity" + url_suffix = "/activity" when PRJ_TAB_REPOS title = "Repositories" url_suffix = "/repos"

app/views/articles/ac_index.html.erb


7	7	<%= div_breadcrumb_close %>
8	8
9	9	<%= div_rightcolumn_open %>
10		~~<%= render_right_actionbox_basic %>~~
	10	<%= actionbox_basic %>
11	11	<%= render_right_article_project_grid %>
12	12	<%= render_right_popular_authors %>
13	13	<%= render_right_categories %>
toggle raw diff
--- a/app/views/articles/ac_index.html.erb +++ b/app/views/articles/ac_index.html.erb @@ -7,7 +7,7 @@ <%= div_breadcrumb_close %> <%= div_rightcolumn_open %> -<%= render_right_actionbox_basic %> +<%= actionbox_basic %> <%= render_right_article_project_grid %> <%= render_right_popular_authors %> <%= render_right_categories %>

app/views/articles/ac_show.html.erb


6	6	<%= div_breadcrumb_close %>
7	7
8	8	<%= div_rightcolumn_open %>
9		~~<%= render_right_actionbox_basic %>~~
	9	<%= actionbox_basic %>
10	10	<%= render_right_article_project_grid %>
11	11	<%= div_rightcolumn_close %>
12	12
toggle raw diff
--- a/app/views/articles/ac_show.html.erb +++ b/app/views/articles/ac_show.html.erb @@ -6,7 +6,7 @@ <%= div_breadcrumb_close %> <%= div_rightcolumn_open %> -<%= render_right_actionbox_basic %> +<%= actionbox_basic %> <%= render_right_article_project_grid %> <%= div_rightcolumn_close %>

app/views/forums/ac_index.html.erb


6	6	<%= div_breadcrumb_close %>
7	7
8	8	<%= div_rightcolumn_open %>
9		~~<%= render_right_actionbox_basic %>~~
	9	<%= actionbox_basic %>
10	10	<%= div_rightcolumn_close %>
11	11
12	12	<%= div_content_open(STYLE_WITHRIGHTCOLUMN) %>
toggle raw diff
--- a/app/views/forums/ac_index.html.erb +++ b/app/views/forums/ac_index.html.erb @@ -6,7 +6,7 @@ <%= div_breadcrumb_close %> <%= div_rightcolumn_open %> -<%= render_right_actionbox_basic %> +<%= actionbox_basic %> <%= div_rightcolumn_close %> <%= div_content_open(STYLE_WITHRIGHTCOLUMN) %>

app/views/projects/ac_activity.html.erb


	1
	2	<%= render :partial => "ac_project_header", :locals => { :tab => PRJ_TAB_ACTIVITY, :project => @project, :pagetitle => @title } %>
	3
	4	<%= render :partial => "ac_project_footer" %>
toggle raw diff
--- /dev/null +++ b/app/views/projects/ac_activity.html.erb @@ -0,0 +1,4 @@ + +<%= render :partial => "ac_project_header", :locals => { :tab => PRJ_TAB_ACTIVITY, :project => @project, :pagetitle => @title } %> + +<%= render :partial => "ac_project_footer" %>

app/views/projects/ac_list.html.erb


6	6	<%= div_breadcrumb_close %>
7	7
8	8	<%= div_rightcolumn_open %>
9		~~<%= render_right_actionbox_basic %>~~
	9	<%= actionbox_basic %>
10	10	<%= div_rightcolumn_close %>
11	11
12	12	<%= div_content_open(STYLE_WITHRIGHTCOLUMN) %>
toggle raw diff
--- a/app/views/projects/ac_list.html.erb +++ b/app/views/projects/ac_list.html.erb @@ -6,7 +6,7 @@ <%= div_breadcrumb_close %> <%= div_rightcolumn_open %> -<%= render_right_actionbox_basic %> +<%= actionbox_basic %> <%= div_rightcolumn_close %> <%= div_content_open(STYLE_WITHRIGHTCOLUMN) %>

app/views/projects/ac_roadmap.html.erb


1	1
2	2	<%= render :partial => "ac_project_header", :locals => { :tab => PRJ_TAB_ROADMAP, :project => @project, :pagetitle => @title } %>
3	3
	4	<div id='todo'>
	5	<p>Show milestones and allow tickets to be dragged between them, show unmilestoned tickets, clicking ticket goes to ticket tab.</p>
	6	</div>
	7
4	8	<%= render :partial => "ac_project_footer" %>
toggle raw diff
--- a/app/views/projects/ac_roadmap.html.erb +++ b/app/views/projects/ac_roadmap.html.erb @@ -1,4 +1,8 @@ <%= render :partial => "ac_project_header", :locals => { :tab => PRJ_TAB_ROADMAP, :project => @project, :pagetitle => @title } %> +<div id='todo'> +<p>Show milestones and allow tickets to be dragged between them, show unmilestoned tickets, clicking ticket goes to ticket tab.</p> +</div> + <%= render :partial => "ac_project_footer" %>

app/views/repositories/_ac_right_actionbox_repos_summary.html.erb


30	30	<br />
31	31	<% end %>
32	32
33		~~<%= render_right_actionbox_default(:allow_shortcuts => true) -%>~~
	33	<%= actionbox_default(:allow_shortcuts => true) -%>
34	34	</td></tr>
35	35	</table>
36	36
toggle raw diff
--- a/app/views/repositories/_ac_right_actionbox_repos_summary.html.erb +++ b/app/views/repositories/_ac_right_actionbox_repos_summary.html.erb @@ -30,7 +30,7 @@ <br /> <% end %> - <%= render_right_actionbox_default(:allow_shortcuts => true) -%> + <%= actionbox_default(:allow_shortcuts => true) -%> </td></tr> </table>

app/views/searches/ac_search.html.erb


6	6	<%= div_breadcrumb_close %>
7	7
8	8	<%= div_rightcolumn_open %>
9		~~<%= render_right_actionbox_basic %>~~
	9	<%= actionbox_basic %>
10	10	<%= div_rightcolumn_close %>
11	11
12	12	<%= div_content_open(STYLE_WITHRIGHTCOLUMN) %>
toggle raw diff
--- a/app/views/searches/ac_search.html.erb +++ b/app/views/searches/ac_search.html.erb @@ -6,7 +6,7 @@ <%= div_breadcrumb_close %> <%= div_rightcolumn_open %> -<%= render_right_actionbox_basic %> +<%= actionbox_basic %> <%= div_rightcolumn_close %> <%= div_content_open(STYLE_WITHRIGHTCOLUMN) %>

app/views/site/ac_about.html.erb


6	6	<%= div_breadcrumb_close %>
7	7
8	8	<%= div_rightcolumn_open %>
9		~~<%= render_right_actionbox_basic %>~~
	9	<%= actionbox_basic %>
10	10	<%= div_rightcolumn_close %>
11	11
12	12	<%= div_content_open(STYLE_WITHRIGHTCOLUMN) %>
toggle raw diff
--- a/app/views/site/ac_about.html.erb +++ b/app/views/site/ac_about.html.erb @@ -6,7 +6,7 @@ <%= div_breadcrumb_close %> <%= div_rightcolumn_open %> -<%= render_right_actionbox_basic %> +<%= actionbox_basic %> <%= div_rightcolumn_close %> <%= div_content_open(STYLE_WITHRIGHTCOLUMN) %>

app/views/site/appcast_index.html.erb


5	5	<%= div_breadcrumb_close %>
6	6
7	7	<%= div_rightcolumn_open %>
8		~~<%= render_right_actionbox_basic %>~~
	8	<%= actionbox_basic %>
9	9	<%= render_right_article_project_grid %>
10	10	<%= div_rightcolumn_close %>
11	11
toggle raw diff
--- a/app/views/site/appcast_index.html.erb +++ b/app/views/site/appcast_index.html.erb @@ -5,7 +5,7 @@ <%= div_breadcrumb_close %> <%= div_rightcolumn_open %> -<%= render_right_actionbox_basic %> +<%= actionbox_basic %> <%= render_right_article_project_grid %> <%= div_rightcolumn_close %>

app/views/tickets/ac_project_index.html.erb


1	1	<%= render :partial => "projects/ac_project_header", :locals => { :tab => PRJ_TAB_TICKETS, :project => @project, :pagetitle => @title } %>
2	2
3	3	<div id='todo'>
4		~~<p>Mostly now obscelete, ticket system being redesigned</p>~~
	4	<p>Ticket management</p>
5	5	</div>
6	6
7	7
toggle raw diff
--- a/app/views/tickets/ac_project_index.html.erb +++ b/app/views/tickets/ac_project_index.html.erb @@ -1,7 +1,7 @@ <%= render :partial => "projects/ac_project_header", :locals => { :tab => PRJ_TAB_TICKETS, :project => @project, :pagetitle => @title } %> <div id='todo'> -<p>Mostly now obscelete, ticket system being redesigned</p> +<p>Ticket management</p> </div>

app/views/users/ac_show.html.erb


6	6	<%= div_breadcrumb_close %>
7	7
8	8	<%= div_rightcolumn_open %>
9		~~<%= render_right_actionbox_basic %>~~
	9	<%= actionbox_basic %>
10	10	<%= div_rightcolumn_close %>
11	11
12	12	<%= div_content_open(STYLE_WITHRIGHTCOLUMN) %>
toggle raw diff
--- a/app/views/users/ac_show.html.erb +++ b/app/views/users/ac_show.html.erb @@ -6,7 +6,7 @@ <%= div_breadcrumb_close %> <%= div_rightcolumn_open %> -<%= render_right_actionbox_basic %> +<%= actionbox_basic %> <%= div_rightcolumn_close %> <%= div_content_open(STYLE_WITHRIGHTCOLUMN) %>

app/views/wikis/ac_index.html.erb


7	7	<%= div_breadcrumb_close %>
8	8
9	9	<%= div_rightcolumn_open %>
10		~~<%= render_right_actionbox_basic %>~~
	10	<%= actionbox_basic %>
11	11	<%= div_rightcolumn_close %>
12	12
13	13	<%= div_content_open(STYLE_WITHRIGHTCOLUMN) %>
toggle raw diff
--- a/app/views/wikis/ac_index.html.erb +++ b/app/views/wikis/ac_index.html.erb @@ -7,7 +7,7 @@ <%= div_breadcrumb_close %> <%= div_rightcolumn_open %> -<%= render_right_actionbox_basic %> +<%= actionbox_basic %> <%= div_rightcolumn_close %> <%= div_content_open(STYLE_WITHRIGHTCOLUMN) %>

config/initializers/appcast_config.rb


10	10
11	11	# Tabs for project page
12	12	PRJ_TAB_WIKI = 1
13		~~PRJ_TAB_DOWNLOADS = 2~~
	13	PRJ_TAB_ACTIVITY = 2
14	14	PRJ_TAB_REPOS = 3
15	15	PRJ_TAB_ROADMAP = 4
16	16	PRJ_TAB_TICKETS = 5
toggle raw diff
--- a/config/initializers/appcast_config.rb +++ b/config/initializers/appcast_config.rb @@ -10,7 +10,7 @@ STYLE_NORIGHTCOLUMN = 2 # Tabs for project page PRJ_TAB_WIKI = 1 -PRJ_TAB_DOWNLOADS = 2 +PRJ_TAB_ACTIVITY = 2 PRJ_TAB_REPOS = 3 PRJ_TAB_ROADMAP = 4 PRJ_TAB_TICKETS = 5

config/routes.rb


34	34	project_cat.formatted_projects_category "projects/category/:id.:format"
35	35	end
36	36	#TODO Note the extra members :repository for Appcast tabs (should these be added to a function that checks $application_mode?)
37		~~map.resources :projects, :member => {:confirm_delete => :get, :forum => :get, :roadmap => :get, :config => :get} do \|projects\|~~
	37	map.resources :projects, :member => {:confirm_delete => :get, :forum => :get, :activity => :get, :roadmap => :get, :config => :get} do \|projects\|
38	38	projects.resources(:repositories, :member => {
39	39	:new => :get, :create => :post,
40	40	:writable_by => :get,
toggle raw diff
--- a/config/routes.rb +++ b/config/routes.rb @@ -34,7 +34,7 @@ ActionController::Routing::Routes.draw do \|map\| project_cat.formatted_projects_category "projects/category/:id.:format" end #TODO Note the extra members :repository for Appcast tabs (should these be added to a function that checks $application_mode?) - map.resources :projects, :member => {:confirm_delete => :get, :forum => :get, :roadmap => :get, :config => :get} do \|projects\| + map.resources :projects, :member => {:confirm_delete => :get, :forum => :get, :activity => :get, :roadmap => :get, :config => :get} do \|projects\| projects.resources(:repositories, :member => { :new => :get, :create => :post, :writable_by => :get,

db/migrate/407_create_tickets.rb


68	68	t.column :impact, :enum, :limit => [:low, :high, :security], :default => :low
69	69	t.integer :impact_jid
70	70	#
71		~~t.column :priority, :enum, :limit => [:none, :low, :medium, :high, :critical], :default => :none~~
	71	t.column :priority, :enum, :limit => [:none, :low, :high, :critical], :default => :none
72	72	t.integer :priority_jid
73	73	#
74	74	t.column :audience, :enum, :limit => [:public, :members], :default => :public
toggle raw diff
--- a/db/migrate/407_create_tickets.rb +++ b/db/migrate/407_create_tickets.rb @@ -68,7 +68,7 @@ class CreateTickets < ActiveRecord::Migration t.column :impact, :enum, :limit => [:low, :high, :security], :default => :low t.integer :impact_jid # - t.column :priority, :enum, :limit => [:none, :low, :medium, :high, :critical], :default => :none + t.column :priority, :enum, :limit => [:none, :low, :high, :critical], :default => :none t.integer :priority_jid # t.column :audience, :enum, :limit => [:public, :members], :default => :public