jro_apps/redmine Commit - r1035:bd7542cf9815

Merged r1015, r1019, r1022 to r1025, r1045 and r1047 from trunk....

Jean-Philippe Lang -

r1035:bd7542cf9815

parent child

Context file:

r1035:bd7542cf9815

Collapse all files

app/views/layouts/_project_selector.rhtml +2 -2

             <% user_projects_by_root = User.current.projects.find(:all, :include => :parent).group_by(&:root) %>
             <select onchange="if (this.value != '') { window.location = this.value; }">
-            <option selected><%= l(:label_jump_to_a_project) %></option>
+            <option selected="selected"><%= l(:label_jump_to_a_project) %></option>
-            <option disabled>---</option>
+            <option disabled="disabled">---</option>
             <% user_projects_by_root.keys.sort.each do |root| %>
                 <%= content_tag('option', h(root.name), :value => url_for(:controller => 'projects', :action => 'show', :id => root)) %>
                 <% user_projects_by_root[root].sort.each do |project| %>

app/views/layouts/base.rhtml +2 -2

-            <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+            <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
             <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
             <head>
             <title><%=h html_title %></title>
             <div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
             <div id="footer">
-                Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> <%= Redmine::VERSION %> &copy 2006-2007 Jean-Philippe Lang
+                Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> <%= Redmine::VERSION %> &copy; 2006-2007 Jean-Philippe Lang
             </div>
             </body>
             </html>

app/views/news/_news.rhtml +2 -2

             <p><%= link_to(h(news.project.name), :controller => 'projects', :action => 'show', :id => news.project) + ': ' unless @project %>
             <%= link_to h(news.title), :controller => 'news', :action => 'show', :id => news %>
-            <%= "(#{news.comments_count} #{lwr(:label_comment, news.comments_count).downcase})" if news.comments_count > 0 %></span>
+            <%= "(#{news.comments_count} #{lwr(:label_comment, news.comments_count).downcase})" if news.comments_count > 0 %>
             <br />
             <% unless news.summary.blank? %><span class="summary"><%=h news.summary %></span><br /><% end %>
-            <span class="author"><%= authoring news.created_on, news.author %></p>
+            <span class="author"><%= authoring news.created_on, news.author %></span></p>

app/views/repositories/diff.rhtml +2 -2

               <%= select_tag 'type', options_for_select([[l(:label_diff_inline), "inline"], [l(:label_diff_side_by_side), "sbs"]], @diff_type), :onchange => "if (this.value != '') {this.form.submit()}" %></p>
             <% end %>
-            <div class="autoscroll">
             <% cache(@cache_key) do %>
             <% @diff.each do |table_file| %>
+            <div class="autoscroll">
             <% if @diff_type == 'sbs' %>
                 <table class="filecontent CodeRay">
                   <thead>
                   </tbody>
                 </table>
             <% end %>
+            </div>
             <% end %>
             <% end %>
-            </div>
             <% content_for :header_tags do %>
             <%= stylesheet_link_tag "scm" %>

app/views/wiki/show.rhtml +7 -6

             <%= link_to_attachments @page.attachments, :delete_url => (authorize_for('wiki', 'destroy_attachment') ? {:controller => 'wiki', :action => 'destroy_attachment', :page => @page.title} : nil) %>
-            <div class="contextual">
-            <%= l(:label_export_to) %>
-            <%= link_to 'HTML', {:page => @page.title, :export => 'html', :version => @content.version}, :class => 'icon icon-html' %>,
-            <%= link_to 'TXT', {:page => @page.title, :export => 'txt', :version => @content.version}, :class => 'icon icon-txt' %>
-            </div>
             <% if authorize_for('wiki', 'add_attachment') %>
             <p><%= toggle_link l(:label_attachment_new), "add_attachment_form" %></p>
             <% form_tag({ :controller => 'wiki', :action => 'add_attachment', :page => @page.title }, :multipart => true, :class => "tabular", :id => "add_attachment_form", :style => "display:none;") do %>
             <% end %>
             <% end %>
+            <div class="contextual">
+            <%= l(:label_export_to) %>
+            <%= link_to 'HTML', {:page => @page.title, :export => 'html', :version => @content.version}, :class => 'icon icon-html' %>,
+            <%= link_to 'TXT', {:page => @page.title, :export => 'txt', :version => @content.version}, :class => 'icon icon-txt' %>
+            </div>
+            &nbsp;
             <% content_for :header_tags do %>
               <%= stylesheet_link_tag 'scm' %>
             <% end %>

lib/redmine/scm/adapters/mercurial_adapter.rb +1 -1

                                                    :author => changeset[:user],
                                                    :time => Time.parse(changeset[:date]),
                                                    :message => changeset[:description],
-                                                   :paths => changeset[:files].split.collect{|path| {:action => 'X', :path => "/#{path}"}}
+                                                   :paths => changeset[:files].to_s.split.collect{|path| {:action => 'X', :path => "/#{path}"}}
                         })
                       end
                       return nil if $? && $?.exitstatus != 0

lib/redmine/themes.rb +4 0

                 super((@current_theme && @current_theme.stylesheets.include?(source)) ?
                   "/themes/#{@current_theme.dir}/stylesheets/#{source}" : source)
               end
+              def path_to_stylesheet(source)
+                stylesheet_path source
+              end
             end

public/javascripts/context_menu.js +4 -1

             		this.selection = tr;
             		var id = tr.id.substring(6, tr.id.length);
             		/* TODO: do not hard code path */
-            		new Ajax.Updater({success:'context-menu'}, '../../issues/context_menu/' + id, {asynchronous:true, evalScripts:true, onComplete:function(request){Effect.Appear('context-menu', {duration: 0.20})}})
+            		new Ajax.Updater({success:'context-menu'}, '../../issues/context_menu/' + id, {asynchronous:true, evalScripts:true, onComplete:function(request){
+            		  Effect.Appear('context-menu', {duration: 0.20});
+            		  if (window.parseStylesheets) { window.parseStylesheets(); }
+            		}})
             	}
             }

public/stylesheets/application.css +1 -1

             textarea.wiki-edit { width: 99%; }
             li p {margin-top: 0;}
             div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid #d7d7d7;}
-            .autoscroll {overflow-x: auto; padding:1px; width:100%;}
+            .autoscroll {overflow-x: auto; padding:1px; width:100%; margin-bottom: 1.2em;}
             #user_firstname, #user_lastname, #user_mail, #my_account_form select { width: 90%; }
             /***** Tabular forms ******/

public/stylesheets/context_menu.css +1 -1

             }
             #context-menu li.folder ul {
             	position:absolute;
-            	left:128px; /* IE */
+            	left:168px; /* IE6 */
             	top:-2px;
             }
             #context-menu li.folder>ul { left:148px; }

public/stylesheets/csshover.htc +2 0

             		return nodes;
             	}
+            window.parseStylesheets = parseStylesheets;
             </script>

test/functional/repositories_mercurial_controller_test.rb +82 -77

@@ -35,83 +35,88 class RepositoriesMercurialControllerTest < Test::Unit::TestCase
35	Repository::Mercurial.create(:project => Project.find(3), :url => REPOSITORY_PATH)	35	Repository::Mercurial.create(:project => Project.find(3), :url => REPOSITORY_PATH)
36	end	36	end
37		37
38	def test_show	38	if File.directory?(REPOSITORY_PATH)
39	get :show, :id => 3	39	def test_show
40	assert_response :success	40	get :show, :id => 3
41	assert_template 'show'	41	assert_response :success
42	assert_not_nil assigns(:entries)	42	assert_template 'show'
43	assert_not_nil assigns(:~~changeset~~s)	43	assert_not_nil assigns(:entries)
44	end	44	assert_not_nil assigns(:changesets)
45		45	end
46	def test_browse_root	46
47	get :browse, :id => 3	47	def test_browse_root
48	assert_response :success	48	get :browse, :id => 3
49	assert_template 'browse'	49	assert_response :success
50	assert_not_nil assigns(:entries)	50	assert_template 'browse'
51	assert_~~equal~~ 3, assigns(:entries).~~size~~	51	assert_not_nil assigns(:entries)
52	assert assigns(:entries).detect {\|e\| e.name == 'images' && e.kind == 'dir'}	52	assert_equal 3, assigns(:entries).size
53	assert assigns(:entries).detect {\|e\| e.name == '~~sourc~~es' && e.kind == 'dir'}	53	assert assigns(:entries).detect {\|e\| e.name == 'images' && e.kind == 'dir'}
54	assert assigns(:entries).detect {\|e\| e.name == '~~README~~' && e.kind == '~~file~~'}	54	assert assigns(:entries).detect {\|e\| e.name == 'sources' && e.kind == 'dir'}
55	end	55	assert assigns(:entries).detect {\|e\| e.name == 'README' && e.kind == 'file'}
56		56	end
57	def test_browse_directory	57
58	get :browse, :id => 3, :path => ['images']	58	def test_browse_directory
59	assert_response :success	59	get :browse, :id => 3, :path => ['images']
60	assert_template 'browse'	60	assert_response :success
61	assert_not_nil assigns(:entries)	61	assert_template 'browse'
62	assert_~~equal~~ 2, assigns(:entries).~~size~~	62	assert_not_nil assigns(:entries)
63	entry = assigns(:entries).detect {\|e\| e.name == 'edit.png'}	63	assert_equal 2, assigns(:entries).size
64	assert_not_nil entry	64	entry = assigns(:entries).detect {\|e\| e.name == 'edit.png'}
65	assert_~~equal~~ ~~'file'~~, entry.~~kind~~	65	assert_not_nil entry
66	assert_equal '~~images/edit.png~~', entry.~~path~~	66	assert_equal 'file', entry.kind
67	end	67	assert_equal 'images/edit.png', entry.path
68		68	end
69	def test_changes	69
70	get :changes, :id => 3, :path => ['images', 'edit.png']	70	def test_changes
71	assert_response :success	71	get :changes, :id => 3, :path => ['images', 'edit.png']
72	assert_~~templat~~e ~~'changes'~~	72	assert_response :success
73	assert_tag :tag => 'h2', :content => 'edit.png'	73	assert_template 'changes'
74	end	74	assert_tag :tag => 'h2', :content => 'edit.png'
75		75	end
76	def test_entry_show	76
77	get :entry, :id => 3, :path => ['sources', 'watchers_controller.rb']	77	def test_entry_show
78	assert_response :success	78	get :entry, :id => 3, :path => ['sources', 'watchers_controller.rb']
79	assert_template 'entry'	79	assert_response :success
80	# Line 19	80	assert_template 'entry'
81	assert_tag :tag => 'th',	81	# Line 19
82	:content => /10/,	82	assert_tag :tag => 'th',
83	:attributes => { :class => /line-num/ },	83	:content => /10/,
84	:sibling => { :tag => 'td', :content => /WITHOUT ANY WARRANTY/ }	84	:attributes => { :class => /line-num/ },
85	end	85	:sibling => { :tag => 'td', :content => /WITHOUT ANY WARRANTY/ }
86		86	end
87	def test_entry_download	87
88	get :entry, :id => 3, :path => ['sources', 'watchers_controller.rb'], :format => 'raw'	88	def test_entry_download
89	assert_response :success	89	get :entry, :id => 3, :path => ['sources', 'watchers_controller.rb'], :format => 'raw'
90	# File content	90	assert_response :success
91	assert @response.body.include?('WITHOUT ANY WARRANTY')	91	# File content
92	end	92	assert @response.body.include?('WITHOUT ANY WARRANTY')
93		93	end
94	def test_diff
95	# Full diff of changeset 4
96	get :diff, :id => 3, :rev => 4
97	assert_response :success
98	assert_template 'diff'
99	# Line 22 removed
100	assert_tag :tag => 'th',
101	:content => /22/,
102	:sibling => { :tag => 'td',
103	:attributes => { :class => /diff_out/ },
104	:content => /def remove/ }
105	end
106		94
107	def test_~~annotate~~	95	def test_diff
108	get :annotate, :id => 3, :path => ['sources', 'watchers_controller.rb']	96	# Full diff of changeset 4
109	assert_response :success	97	get :diff, :id => 3, :rev => 4
110	assert_template 'annotate'	98	assert_response :success
111	# Line 23, revision 4	99	assert_template 'diff'
112	assert_tag :tag => 'th', :content => /23/,	100	# Line 22 removed
113	:sibling => { :tag => 'td', :child => { :tag => 'a', :content => /4/ } },	101	assert_tag :tag => 'th',
114	~~:sibling~~ => { ~~:tag~~ => ~~'td'~~, :content => /~~jsmith~~/ },	102	:content => /22/,
115	:sibling => { :tag => 'td', ~~:content~~ => ~~/watcher =/~~ }	103	:sibling => { :tag => 'td',
		104	:attributes => { :class => /diff_out/ },
		105	:content => /def remove/ }
		106	end
		107
		108	def test_annotate
		109	get :annotate, :id => 3, :path => ['sources', 'watchers_controller.rb']
		110	assert_response :success
		111	assert_template 'annotate'
		112	# Line 23, revision 4
		113	assert_tag :tag => 'th', :content => /23/,
		114	:sibling => { :tag => 'td', :child => { :tag => 'a', :content => /4/ } },
		115	:sibling => { :tag => 'td', :content => /jsmith/ },
		116	:sibling => { :tag => 'td', :content => /watcher =/ }
		117	end
		118	else
		119	puts "Mercurial test repository NOT FOUND. Skipping functional tests !!!"
		120	def test_fake; assert true end
116	end	121	end
117	end	122	end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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