Skip to content

O
OHR Support
Commit cd64d11e authored by Eric Davis's avatar Eric Davis
Browse files
Options

Merge branch 'master' into unstable 

Conflicts:
	app/controllers/watchers_controller.rb
	app/views/issues/_action_menu.rhtml
	config/locales/pt-BR.yml
	doc/CHANGELOG.rdoc
	lib/redmine/export/pdf.rb
	lib/redmine/wiki_formatting/textile/helper.rb
parents 46f66add 44b1bcfa
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1843 additions and 136 deletions
app/controllers/auto_completes_controller.rb
View file @ cd64d11e
...@@ -4,17 +4,18 @@ class AutoCompletesController < ApplicationController ...@@ -4,17 +4,18 @@ class AutoCompletesController < ApplicationController
def issues def issues
@issues = [] @issues = []
q = params[:q].to_s q = params[:q].to_s
query = (params[:scope] == "all" && Setting.cross_project_issue_relations?) ? Issue : @project.issues
if q.match(/^\d+$/) if q.present?
@issues << query.visible.find_by_id(q.to_i) query = (params[:scope] == "all" && Setting.cross_project_issue_relations?) ? Issue : @project.issues
end
unless q.blank? @issues |= query.visible.find_all_by_id(q.to_i) if q =~ /^\d+$/
@issues += query.visible.find(:all,
@issues |= query.visible.find(:all,
:limit => 10, :limit => 10,
:order => "#{Issue.table_name}.id ASC", :order => "#{Issue.table_name}.id ASC",
:conditions => ["LOWER(#{Issue.table_name}.subject) LIKE :q OR CAST(#{Issue.table_name}.id AS CHAR(13)) LIKE :q", {:q => "%#{q.downcase}%" }]) :conditions => ["LOWER(#{Issue.table_name}.subject) LIKE :q OR CAST(#{Issue.table_name}.id AS CHAR(13)) LIKE :q", {:q => "%#{q.downcase}%" }])
end end
@issues.compact!
render :layout => false render :layout => false
end end
......
app/controllers/help_controller.rb 0 → 100644
View file @ cd64d11e
class HelpController < ApplicationController
def wiki_syntax
end
def wiki_syntax_detailed
end
end
app/helpers/application_helper.rb
View file @ cd64d11e
...@@ -60,6 +60,11 @@ module ApplicationHelper ...@@ -60,6 +60,11 @@ module ApplicationHelper
h(user.to_s) h(user.to_s)
end end
end end
# Show a sorted linkified (if active) comma-joined list of users
def list_users(users, options={})
users.sort.collect{|u| link_to_user(u, options)}.join(", ")
end
# Displays a link to +issue+ with its subject. # Displays a link to +issue+ with its subject.
# Examples: # Examples:
......
public/help/wiki_syntax.html → app/views/help/wiki_syntax.html.erb
View file @ cd64d11e
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <% content_for :styles do %>
<html xmlns="http://www.w3.org/1999/xhtml"> h1 { font-family: Verdana, sans-serif; font-size: 14px; text-align: center; color: #444; }
<head> body { font-family: Verdana, sans-serif; font-size: 12px; color: #444; }
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> table th { padding-top: 1em; }
<meta http-equiv="Content-Style-Type" content="text/css" /> table td { vertical-align: top; background-color: #f5f5f5; height: 2em; vertical-align: middle;}
<title>Wiki formatting</title> table td code { font-size: 1.2em; }
<style type="text/css"> table td h1 { font-size: 1.8em; text-align: left; }
h1 { font-family: Verdana, sans-serif; font-size: 14px; text-align: center; color: #444; } table td h2 { font-size: 1.4em; text-align: left; }
body { font-family: Verdana, sans-serif; font-size: 12px; color: #444; } table td h3 { font-size: 1.2em; text-align: left; }
table th { padding-top: 1em; } <% end %>
table td { vertical-align: top; background-color: #f5f5f5; height: 2em; vertical-align: middle;}
table td code { font-size: 1.2em; } <% html_title "Wiki Syntax Quick Reference" %>
table td h1 { font-size: 1.8em; text-align: left; }
table td h2 { font-size: 1.4em; text-align: left; }
table td h3 { font-size: 1.2em; text-align: left; }
</style>
</head>
<body>
<h1>Wiki Syntax Quick Reference</h1> <h1>Wiki Syntax Quick Reference</h1>
<table width="100%"> <table width="100%">
...@@ -48,8 +40,9 @@ table td h3 { font-size: 1.2em; text-align: left; } ...@@ -48,8 +40,9 @@ table td h3 { font-size: 1.2em; text-align: left; }
<tr><th></th><td>http://foo.bar</td><td><a href="#">http://foo.bar</a></td></tr> <tr><th></th><td>http://foo.bar</td><td><a href="#">http://foo.bar</a></td></tr>
<tr><th></th><td>"Foo":http://foo.bar</td><td><a href="#">Foo</a></td></tr> <tr><th></th><td>"Foo":http://foo.bar</td><td><a href="#">Foo</a></td></tr>
<tr><th colspan="3">Redmine links</th></tr> <tr><th colspan="3">ChiliProject links</th></tr>
<tr><th><img src="../images/jstoolbar/bt_link.png" style="border: 1px solid #bbb;" alt="Link to a Wiki page" /></th><td>[[Wiki page]]</td><td><a href="#">Wiki page</a></td></tr> <tr><th><img src="../images/jstoolbar/bt_link.png" style="border: 1px solid #bbb;" alt="Link to a Wiki page" /></th><td>[[Wiki page]]</td><td><a href="#">Wiki page</a></td></tr>
<tr><th><img src="../images/jstoolbar/bt_link.png" style="border: 1px solid #bbb;" alt="Link to a Wiki page" /></th><td>[[Sandbox:Wiki page]]</td><td><a href="#">Wiki page</a> (On the Sandbox project)</td></tr>
<tr><th></th><td>Issue #12</td><td>Issue <a href="#">#12</a></td></tr> <tr><th></th><td>Issue #12</td><td>Issue <a href="#">#12</a></td></tr>
<tr><th></th><td>Revision r43</td><td>Revision <a href="#">r43</a></td></tr> <tr><th></th><td>Revision r43</td><td>Revision <a href="#">r43</a></td></tr>
<tr><th></th><td>commit:f30e13e43</td><td><a href="#">f30e13e4</a></td></tr> <tr><th></th><td>commit:f30e13e43</td><td><a href="#">f30e13e4</a></td></tr>
...@@ -60,7 +53,4 @@ table td h3 { font-size: 1.2em; text-align: left; } ...@@ -60,7 +53,4 @@ table td h3 { font-size: 1.2em; text-align: left; }
<tr><th></th><td>!<em>attached_image</em>!</td><td></td></tr> <tr><th></th><td>!<em>attached_image</em>!</td><td></td></tr>
</table> </table>
<p><a href="wiki_syntax_detailed.html" onclick="window.open('wiki_syntax_detailed.html', '', ''); return false;">More Information</a></p> <p><a href="wiki_syntax_detailed" onclick="window.open('wiki_syntax_detailed', '', ''); return false;">More Information</a></p>
</body>
</html>
public/help/wiki_syntax_detailed.html → app/views/help/wiki_syntax_detailed.html.erb
View file @ cd64d11e
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <% content_for :styles do %>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<title>RedmineWikiFormatting</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<style type="text/css">
body { font:80% Verdana,Tahoma,Arial,sans-serif; } body { font:80% Verdana,Tahoma,Arial,sans-serif; }
h1, h2, h3, h4 { font-family: Trebuchet MS,Georgia,"Times New Roman",serif; } h1, h2, h3, h4 { font-family: Trebuchet MS,Georgia,"Times New Roman",serif; }
pre, code { font-size:120%; } pre, code { font-size:120%; }
...@@ -19,35 +14,34 @@ ...@@ -19,35 +14,34 @@
a.new { color: #b73535; } a.new { color: #b73535; }
.CodeRay .c { color:#666; } .CodeRay .c { color:#666; }
.CodeRay .cl { color:#B06; font-weight:bold } .CodeRay .cl { color:#B06; font-weight:bold }
.CodeRay .dl { color:black } .CodeRay .dl { color:black }
.CodeRay .fu { color:#06B; font-weight:bold } .CodeRay .fu { color:#06B; font-weight:bold }
.CodeRay .il { background: #eee } .CodeRay .il { background: #eee }
.CodeRay .il .idl { font-weight: bold; color: #888 } .CodeRay .il .idl { font-weight: bold; color: #888 }
.CodeRay .iv { color:#33B } .CodeRay .iv { color:#33B }
.CodeRay .r { color:#080; font-weight:bold } .CodeRay .r { color:#080; font-weight:bold }
.CodeRay .s { background-color:#fff0f0 } .CodeRay .s { background-color:#fff0f0 }
.CodeRay .s .dl { color:#710 } .CodeRay .s .dl { color:#710 }
</style> <% end %>
</head>
<body> <% html_title "Wiki Formatting" %>
<h1><a name="1" class="wiki-page"></a>Wiki formatting</h1> <h1><a name="1" class="wiki-page"></a>Wiki Formatting</h1>
<h2><a name="2" class="wiki-page"></a>Links</h2> <h2><a name="2" class="wiki-page"></a>Links</h2>
<h3><a name="3" class="wiki-page"></a>Redmine links</h3> <h3><a name="3" class="wiki-page"></a>ChiliProject links</h3>
<p>Redmine allows hyperlinking between issues, changesets and wiki pages from anywhere wiki formatting is used.</p> <p>ChiliProject allows hyperlinking between issues, changesets and wiki pages from anywhere wiki formatting is used.</p>
<ul> <ul>
<li>Link to an issue: <strong>#124</strong> (displays <del><a href="#" class="issue" title="bulk edit doesn't change the category or fixed version properties (Closed)">#124</a></del>, link is striked-through if the issue is closed)</li> <li>Link to an issue: <strong>#124</strong> (displays <del><a href="#" class="issue" title="bulk edit doesn't change the category or fixed version properties (Closed)">#124</a></del>, link is striked-through if the issue is closed)</li>
<li>Link to a changeset: <strong>r758</strong> (displays <a href="#" class="changeset" title="Search engine now only searches objects the user is allowed to view.">r758</a>)</li> <li>Link to a changeset: <strong>r758</strong> (displays <a href="#" class="changeset" title="Search engine now only searches objects the user is allowed to view.">r758</a>)</li>
<li>Link to a changeset with a non-numeric hash: <strong>commit:c6f4d0fd</strong> (displays <a href="#" class="changeset">c6f4d0fd</a>).</li> <li>Link to a changeset with a non-numeric hash: <strong>commit:c6f4d0fd</strong> (displays <a href="#" class="changeset">c6f4d0fd</a>).</li>
<li>Link to a changeset of another project: <strong>sandbox:r758</strong> (displays <a href="#" class="changeset" title="Search engine now only searches objects the user is allowed to view.">sanbox:r758</a>)</li> <li>Link to a changeset of another project: <strong>sandbox:r758</strong> (displays <a href="#" class="changeset" title="Search engine now only searches objects the user is allowed to view.">sandbox:r758</a>)</li>
<li>Link to a changeset with a non-numeric hash: <strong>sandbox:c6f4d0fd</strong> (displays <a href="#" class="changeset">sandbox:c6f4d0fd</a>).</li> <li>Link to a changeset with a non-numeric hash: <strong>sandbox:c6f4d0fd</strong> (displays <a href="#" class="changeset">sandbox:c6f4d0fd</a>).</li>
</ul> </ul>
...@@ -130,8 +124,8 @@ ...@@ -130,8 +124,8 @@
<p>Escaping:</p> <p>Escaping:</p>
<ul> <ul>
<li>You can prevent Redmine links from being parsed by preceding them with an exclamation mark: !</li> <li>You can prevent ChiliProject links from being parsed by preceding them with an exclamation mark: !</li>
</ul> </ul>
...@@ -140,24 +134,24 @@ ...@@ -140,24 +134,24 @@
<p>HTTP URLs and email addresses are automatically turned into clickable links:</p> <p>HTTP URLs and email addresses are automatically turned into clickable links:</p>
<pre> <pre>
http://www.redmine.org, someone@foo.bar https://www.chiliproject.org, someone@foo.bar
</pre> </pre>
<p>displays: <a class="external" href="http://www.redmine.org">http://www.redmine.org</a>, <a href="mailto:someone@foo.bar" class="email">someone@foo.bar</a></p> <p>displays: <a class="external" href="https://www.chiliproject.org">https://www.chiliproject.org</a>, <a href="mailto:someone@foo.bar" class="email">someone@foo.bar</a></p>
<p>If you want to display a specific text instead of the URL, you can use the standard textile syntax:</p> <p>If you want to display a specific text instead of the URL, you can use the standard textile syntax:</p>
<pre> <pre>
"Redmine web site":http://www.redmine.org "ChiliProject web site":https://www.chiliproject.org
</pre> </pre>
<p>displays: <a href="http://www.redmine.org" class="external">Redmine web site</a></p> <p>displays: <a href="https://www.chiliproject.org" class="external">ChiliProject web site</a></p>
<h2><a name="5" class="wiki-page"></a>Text formatting</h2> <h2><a name="5" class="wiki-page"></a>Text formatting</h2>
<p>For things such as headlines, bold, tables, lists, Redmine supports Textile syntax. See <a class="external" href="http://www.textism.com/tools/textile/">http://www.textism.com/tools/textile/</a> for information on using any of these features. A few samples are included below, but the engine is capable of much more of that.</p> <p>For things such as headlines, bold, tables, lists, ChiliProject supports Textile syntax. See <a class="external" href="http://www.textism.com/tools/textile/">http://www.textism.com/tools/textile/</a> for information on using any of these features. A few samples are included below, but the engine is capable of much more of that.</p>
<h3><a name="6" class="wiki-page"></a>Font style</h3> <h3><a name="6" class="wiki-page"></a>Font style</h3>
...@@ -195,7 +189,7 @@ h2. Subheading ...@@ -195,7 +189,7 @@ h2. Subheading
h3. Subsubheading h3. Subsubheading
</pre> </pre>
<p>Redmine assigns an anchor to each of those headings thus you can link to them with "#Heading", "#Subheading" and so forth.</p> <p>ChiliProject assigns an anchor to each of those headings thus you can link to them with "#Heading", "#Subheading" and so forth.</p>
<h3><a name="9" class="wiki-page"></a>Paragraphs</h3> <h3><a name="9" class="wiki-page"></a>Paragraphs</h3>
...@@ -205,7 +199,7 @@ p>. right aligned ...@@ -205,7 +199,7 @@ p>. right aligned
p=. centered p=. centered
</pre> </pre>
<p style="text-align:center;">This is centered paragraph.</p> <p style="text-align:center;">This is a centered paragraph.</p>
<h3><a name="10" class="wiki-page"></a>Blockquotes</h3> <h3><a name="10" class="wiki-page"></a>Blockquotes</h3>
...@@ -233,7 +227,7 @@ To go live, all you need to add is a database and a web server. ...@@ -233,7 +227,7 @@ To go live, all you need to add is a database and a web server.
<h2><a name="12" class="wiki-page"></a>Macros</h2> <h2><a name="12" class="wiki-page"></a>Macros</h2>
<p>Redmine has the following builtin macros:</p> <p>ChiliProject has the following builtin macros:</p>
<p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p> <p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
...@@ -266,5 +260,3 @@ To go live, all you need to add is a database and a web server. ...@@ -266,5 +260,3 @@ To go live, all you need to add is a database and a web server.
<span class="no"><strong>10</strong></span> <span class="r">end</span> <span class="no"><strong>10</strong></span> <span class="r">end</span>
</code> </code>
</pre> </pre>
</body>
</html>
app/views/issue_relations/_form.rhtml
View file @ cd64d11e
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<p><%= f.select :relation_type, collection_for_relation_type_select, {}, :onchange => "setPredecessorFieldsVisibility();" %> <p><%= f.select :relation_type, collection_for_relation_type_select, {}, :onchange => "setPredecessorFieldsVisibility();" %>
<%= l(:label_issue) %> #<%= f.text_field :issue_to_id, :size => 10 %> <%= l(:label_issue) %> #<%= f.text_field :issue_to_id, :size => 10 %>
<div id="related_issue_candidates" class="autocomplete"></div> <div id="related_issue_candidates" class="autocomplete"></div>
<%= javascript_tag "observeRelatedIssueField('#{auto_complete_issues_path(:id => @issue, :project_id => @project) }')" %> <%= javascript_tag "observeRelatedIssueField('#{auto_complete_issues_path(:id => @issue, :project_id => @project, :escape => false) }')" %>
<span id="predecessor_fields" style="display:none;"> <span id="predecessor_fields" style="display:none;">
<%= l(:field_delay) %>: <%= f.text_field :delay, :size => 3 %> <%= l(:label_day_plural) %> <%= l(:field_delay) %>: <%= f.text_field :delay, :size => 3 %> <%= l(:label_day_plural) %>
</span> </span>
......
app/views/issues/_form.rhtml
View file @ cd64d11e
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<% if User.current.allowed_to?(:manage_subtasks, @project) %> <% if User.current.allowed_to?(:manage_subtasks, @project) %>
<p id="parent_issue"><%= f.text_field :parent_issue_id, :size => 10 %></p> <p id="parent_issue"><%= f.text_field :parent_issue_id, :size => 10 %></p>
<div id="parent_issue_candidates" class="autocomplete"></div> <div id="parent_issue_candidates" class="autocomplete"></div>
<%= javascript_tag "observeParentIssueField('#{auto_complete_issues_path(:id => @issue, :project_id => @project) }')" %> <%= javascript_tag "observeParentIssueField('#{auto_complete_issues_path(:id => @issue, :project_id => @project, :escape => false) }')" %>
<% end %> <% end %>
<p><%= f.text_area :description, <p><%= f.text_area :description,
......
app/views/layouts/help.html.erb 0 → 100644
View file @ cd64d11e
<!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>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<style type="text/css">
<%= yield(:styles) %>
</style>
</head>
<body>
<%= yield %>
</body>
</html>
app/views/layouts/mailer.text.html.erb
View file @ cd64d11e
...@@ -18,6 +18,12 @@ hr { ...@@ -18,6 +18,12 @@ hr {
background: #ccc; background: #ccc;
border: 0; border: 0;
} }
blockquote {
border-left: 3px solid #E0E0E0;
font-style: italic;
margin-left: 2.4em;
padding-left: 0.6em;
}
.footer { .footer {
font-size: 0.8em; font-size: 0.8em;
font-style: italic; font-style: italic;
......
app/views/users/_form.rhtml
View file @ cd64d11e
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
<p><%= f.select :auth_source_id, ([[l(:label_internal), ""]] + @auth_sources.collect { |a| [a.name, a.id] }), {}, :onchange => "if (this.value=='') {Element.show('password_fields');} else {Element.hide('password_fields');}" %></p> <p><%= f.select :auth_source_id, ([[l(:label_internal), ""]] + @auth_sources.collect { |a| [a.name, a.id] }), {}, :onchange => "if (this.value=='') {Element.show('password_fields');} else {Element.hide('password_fields');}" %></p>
<% end %> <% end %>
<div id="password_fields" style="<%= 'display:none;' if @user.auth_source %>"> <div id="password_fields" style="<%= 'display:none;' if @user.auth_source %>">
<p><%= f.password_field :password, :required => true, :size => 25 %><br /> <p><%= f.password_field :password, :required => true, :size => 25, :autocomplete => :off %><br />
<em><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p> <em><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em></p>
<p><%= f.password_field :password_confirmation, :required => true, :size => 25 %></p> <p><%= f.password_field :password_confirmation, :required => true, :size => 25, :autocomplete => :off %></p>
</div> </div>
</div> </div>
......
config/locales/pt-BR.yml
View file @ cd64d11e
...@@ -972,17 +972,18 @@ pt-BR: ...@@ -972,17 +972,18 @@ pt-BR:
button_collapse_all: Collapse all button_collapse_all: Collapse all
label_additional_workflow_transitions_for_assignee: Additional transitions allowed when the user is the assignee label_additional_workflow_transitions_for_assignee: Additional transitions allowed when the user is the assignee
label_additional_workflow_transitions_for_author: Additional transitions allowed when the user is the author label_additional_workflow_transitions_for_author: Additional transitions allowed when the user is the author
label_cvs_module: Module
label_filesystem_path: Root directory
label_darcs_path: Root directory
field_effective_date: Due date field_effective_date: Due date
label_bazaar_path: Root directory
label_cvs_path: CVSROOT label_cvs_path: CVSROOT
label_git_path: Path to .git directory
text_powered_by: Powered by %{link} text_powered_by: Powered by %{link}
label_mercurial_path: Root directory
text_default_encoding: "Default: UTF-8" text_default_encoding: "Default: UTF-8"
text_git_repo_example: a bare and local repository (e.g. /gitrepo, c:\gitrepo) text_git_repo_example: a bare and local repository (e.g. /gitrepo, c:\gitrepo)
label_notify_member_plural: Email issue updates label_notify_member_plural: Email issue updates
label_path_encoding: Path encoding label_path_encoding: Path encoding
text_mercurial_repo_example: local repository (e.g. /hgrepo, c:\hgrepo) text_mercurial_repo_example: local repository (e.g. /hgrepo, c:\hgrepo)
label_cvs_module: Módulo
label_filesystem_path: Diretório raiz
label_darcs_path: Diretório raiz
label_bazaar_path: Diretório raiz
label_git_path: Caminho para o diretório .git
label_mercurial_path: Diretório raiz
doc/CHANGELOG.rdoc
View file @ cd64d11e
...@@ -19,6 +19,25 @@ ...@@ -19,6 +19,25 @@
* Patch #7598: Extensible MailHandler * Patch #7598: Extensible MailHandler
* Patch #7795: Internal server error at journals#index with custom fields * Patch #7795: Internal server error at journals#index with custom fields
== 2011-05-27 v1.4.0
* Bug #81: Replace favicon
* Bug #311: Update the watcher list on "watch"-link click
* Bug #322: reposman.rb doesn't work with Rubygems >= 1.6.0
* Bug #340: Properly format blockquotes in HTML mails
* Bug #357: Wrap long text fields properly in PDF exports
* Bug #360: Set autocomplete=off for some fields in user form
* Bug #373: Issue auto completion returns duplicates
* Bug #374: HTML-escaped URLs in JavaScript
* Bug #379: Help controller headings rendered differently in Ruby 1.9
* Bug #380: Wiki-Help Page
* Bug #424: Loading issue context menu causes two identical AJAX requests
* Bug #425: Deprecation warning when using ChiliProject with Rake 0.9
* Feature #202: Adding the theme used on chiliproject.org to the repository
* Feature #304: Add a helper to format user lists
* Feature #361: [Cleanup] Removing code comment, by answering the implied question in wikitoolbar_for helper
* Feature #362: Introduce Help controller to dynamically generate wiki help pages
== 2011-05-01 v1.3.0 == 2011-05-01 v1.3.0
* Bug #309: The login screen after lost_password redirects back to lost_password after you login * Bug #309: The login screen after lost_password redirects back to lost_password after you login
......
extra/svn/Redmine.pm
View file @ cd64d11e
...@@ -482,6 +482,7 @@ sub get_project_identifier { ...@@ -482,6 +482,7 @@ sub get_project_identifier {
my $location = $r->location; my $location = $r->location;
my ($identifier) = $r->uri =~ m{$location/*([^/]+)}; my ($identifier) = $r->uri =~ m{$location/*([^/]+)};
$identifier =~ s/\.git$// if (defined $cfg->{RedmineGitSmartHttp} and $cfg->{RedmineGitSmartHttp});
$identifier; $identifier;
} }
......
extra/svn/reposman.rb
View file @ cd64d11e
...@@ -66,6 +66,10 @@ require 'rdoc/usage' ...@@ -66,6 +66,10 @@ require 'rdoc/usage'
require 'find' require 'find'
require 'etc' require 'etc'
# working around deprecation in RubyGems 1.6
# needed for rails <2.3.9 only, don't merge to unstable!
require 'thread'
Version = "1.3" Version = "1.3"
SUPPORTED_SCM = %w( Subversion Darcs Mercurial Bazaar Git Filesystem ) SUPPORTED_SCM = %w( Subversion Darcs Mercurial Bazaar Git Filesystem )
......
lib/generators/chiliproject_plugin/USAGE 0 → 100644
View file @ cd64d11e
Description:
The plugin generator creates stubs for a new ChiliProject plugin.
Example:
./script/generate chliproject_plugin meetings
create vendor/plugins/chiliproject_meetings/app/controllers
create vendor/plugins/chiliproject_meetings/app/helpers
create vendor/plugins/chiliproject_meetings/app/models
create vendor/plugins/chiliproject_meetings/app/views
create vendor/plugins/chiliproject_meetings/db/migrate
create vendor/plugins/chiliproject_meetings/lib/tasks
create vendor/plugins/chiliproject_meetings/assets/images
create vendor/plugins/chiliproject_meetings/assets/javascripts
create vendor/plugins/chiliproject_meetings/assets/stylesheets
create vendor/plugins/chiliproject_meetings/lang
create vendor/plugins/chiliproject_meetings/README
create vendor/plugins/chiliproject_meetings/init.rb
create vendor/plugins/chiliproject_meetings/lang/en.yml
create vendor/plugins/chiliproject_meetings/config/locales/en.yml
create vendor/plugins/chiliproject_meetings/test/test_helper.rb
lib/generators/redmine_plugin/redmine_plugin_generator.rb → lib/generators/chiliproject_plugin/chiliproject_plugin_generator.rb
View file @ cd64d11e
class RedminePluginGenerator < Rails::Generator::NamedBase class ChiliprojectPluginGenerator < Rails::Generator::NamedBase
attr_reader :plugin_path, :plugin_name, :plugin_pretty_name attr_reader :plugin_path, :plugin_name, :plugin_pretty_name
def initialize(runtime_args, runtime_options = {}) def initialize(runtime_args, runtime_options = {})
super super
@plugin_name = "redmine_#{file_name.underscore}" @plugin_name = "chiliproject_#{file_name.underscore}"
@plugin_pretty_name = plugin_name.titleize @plugin_pretty_name = plugin_name.titleize
@plugin_path = "vendor/plugins/#{plugin_name}" @plugin_path = "vendor/plugins/#{plugin_name}"
end end
......
lib/generators/redmine_plugin/templates/init.rb.erb → lib/generators/chiliproject_plugin/templates/init.rb.erb
View file @ cd64d11e
...@@ -3,7 +3,7 @@ require 'redmine' ...@@ -3,7 +3,7 @@ require 'redmine'
Redmine::Plugin.register :<%= plugin_name %> do Redmine::Plugin.register :<%= plugin_name %> do
name '<%= plugin_pretty_name %> plugin' name '<%= plugin_pretty_name %> plugin'
author 'Author name' author 'Author name'
description 'This is a plugin for Redmine' description 'This is a plugin for ChiliProject'
version '0.0.1' version '0.0.1'
url 'http://example.com/path/to/plugin' url 'http://example.com/path/to/plugin'
author_url 'http://example.com/about' author_url 'http://example.com/about'
......
lib/generators/redmine_plugin_controller/USAGE → lib/generators/chiliproject_plugin_controller/USAGE
View file @ cd64d11e
...@@ -2,4 +2,4 @@ Description: ...@@ -2,4 +2,4 @@ Description:
Generates a plugin controller. Generates a plugin controller.
Example: Example:
./script/generate redmine_plugin_controller MyPlugin Pools index show vote ./script/generate chiliproject_plugin_controller MyPlugin Pools index show vote
lib/generators/redmine_plugin_controller/redmine_plugin_controller_generator.rb → lib/generators/chiliproject_plugin_controller/chiliproject_plugin_controller_generator.rb
View file @ cd64d11e
require 'rails_generator/base' require 'rails_generator/base'
require 'rails_generator/generators/components/controller/controller_generator' require 'rails_generator/generators/components/controller/controller_generator'
class RedminePluginControllerGenerator < ControllerGenerator class ChiliprojectPluginControllerGenerator < ControllerGenerator
attr_reader :plugin_path, :plugin_name, :plugin_pretty_name attr_reader :plugin_path, :plugin_name, :plugin_pretty_name
def initialize(runtime_args, runtime_options = {}) def initialize(runtime_args, runtime_options = {})
runtime_args = runtime_args.dup runtime_args = runtime_args.dup
usage if runtime_args.empty? usage if runtime_args.empty?
@plugin_name = "redmine_" + runtime_args.shift.underscore @plugin_name = "chiliproject_" + runtime_args.shift.underscore
@plugin_pretty_name = plugin_name.titleize @plugin_pretty_name = plugin_name.titleize
@plugin_path = "vendor/plugins/#{plugin_name}" @plugin_path = "vendor/plugins/#{plugin_name}"
super(runtime_args, runtime_options) super(runtime_args, runtime_options)
......
lib/generators/redmine_plugin_model/USAGE → lib/generators/chiliproject_plugin_model/USAGE
View file @ cd64d11e
...@@ -2,4 +2,4 @@ Description: ...@@ -2,4 +2,4 @@ Description:
Generates a plugin model. Generates a plugin model.
Examples: Examples:
./script/generate redmine_plugin_model MyPlugin pool title:string question:text ./script/generate chiliproject_plugin_model MyPlugin pool title:string question:text
lib/generators/redmine_plugin_model/redmine_plugin_model_generator.rb → lib/generators/chiliproject_plugin_model/chiliproject_plugin_model_generator.rb
View file @ cd64d11e
require 'rails_generator/base' require 'rails_generator/base'
require 'rails_generator/generators/components/model/model_generator' require 'rails_generator/generators/components/model/model_generator'
class RedminePluginModelGenerator < ModelGenerator class ChiliprojectPluginModelGenerator < ModelGenerator
attr_accessor :plugin_path, :plugin_name, :plugin_pretty_name attr_accessor :plugin_path, :plugin_name, :plugin_pretty_name
def initialize(runtime_args, runtime_options = {}) def initialize(runtime_args, runtime_options = {})
runtime_args = runtime_args.dup runtime_args = runtime_args.dup
usage if runtime_args.empty? usage if runtime_args.empty?
@plugin_name = "redmine_" + runtime_args.shift.underscore @plugin_name = "chiliproject_" + runtime_args.shift.underscore
@plugin_pretty_name = plugin_name.titleize @plugin_pretty_name = plugin_name.titleize
@plugin_path = "vendor/plugins/#{plugin_name}" @plugin_path = "vendor/plugins/#{plugin_name}"
super(runtime_args, runtime_options) super(runtime_args, runtime_options)
......
lib/generators/redmine_plugin/USAGE deleted 100644 → 0
View file @ 46f66add
Description:
The plugin generator creates stubs for a new Redmine plugin.
Example:
./script/generate redmine_plugin meetings
create vendor/plugins/redmine_meetings/app/controllers
create vendor/plugins/redmine_meetings/app/helpers
create vendor/plugins/redmine_meetings/app/models
create vendor/plugins/redmine_meetings/app/views
create vendor/plugins/redmine_meetings/db/migrate
create vendor/plugins/redmine_meetings/lib/tasks
create vendor/plugins/redmine_meetings/assets/images
create vendor/plugins/redmine_meetings/assets/javascripts
create vendor/plugins/redmine_meetings/assets/stylesheets
create vendor/plugins/redmine_meetings/lang
create vendor/plugins/redmine_meetings/README
create vendor/plugins/redmine_meetings/init.rb
create vendor/plugins/redmine_meetings/lang/en.yml
create vendor/plugins/redmine_meetings/config/locales/en.yml
create vendor/plugins/redmine_meetings/test/test_helper.rb
lib/redmine/export/pdf.rb
View file @ cd64d11e
...@@ -156,7 +156,7 @@ module Redmine ...@@ -156,7 +156,7 @@ module Redmine
end || '' end || ''
return txt return txt
end end
def RDMCell(w,h=0,txt='',border=0,ln=0,align='',fill=0,link='') def RDMCell(w,h=0,txt='',border=0,ln=0,align='',fill=0,link='')
Cell(w,h,fix_text_encoding(txt),border,ln,align,fill,link) Cell(w,h,fix_text_encoding(txt),border,ln,align,fill,link)
end end
...@@ -193,13 +193,25 @@ module Redmine ...@@ -193,13 +193,25 @@ module Redmine
pdf.SetTitle(title) pdf.SetTitle(title)
pdf.alias_nb_pages pdf.alias_nb_pages
pdf.footer_date = format_date(Date.today) pdf.footer_date = format_date(Date.today)
pdf.SetAutoPageBreak(false)
pdf.AddPage("L") pdf.AddPage("L")
row_height = 6 # Landscape A4 = 210 x 297 mm
page_height = 210
page_width = 297
right_margin = 10
bottom_margin = 20
col_id_width = 10
row_height = 5
# column widths
table_width = page_width - right_margin - 10 # fixed left margin
col_width = [] col_width = []
unless query.columns.empty? unless query.columns.empty?
col_width = query.columns.collect {|column| column.name == :subject ? 4.0 : 1.0 } col_width = query.columns.collect do |c|
ratio = 262.0 / col_width.inject(0) {|s,w| s += w} (c.name == :subject || (c.is_a?(QueryCustomFieldColumn) && ['string', 'text'].include?(c.custom_field.field_format)))? 4.0 : 1.0
end
ratio = (table_width - col_id_width) / col_width.inject(0) {|s,w| s += w}
col_width = col_width.collect {|w| w * ratio} col_width = col_width.collect {|w| w * ratio}
end end
...@@ -211,7 +223,7 @@ module Redmine ...@@ -211,7 +223,7 @@ module Redmine
# headers # headers
pdf.SetFontStyle('B',8) pdf.SetFontStyle('B',8)
pdf.SetFillColor(230, 230, 230) pdf.SetFillColor(230, 230, 230)
pdf.RDMCell(15, row_height, "#", 1, 0, 'L', 1) pdf.RDMCell(col_id_width, row_height, "#", 1, 0, 'L', 1)
query.columns.each_with_index do |column, i| query.columns.each_with_index do |column, i|
pdf.RDMCell(col_width[i], row_height, column.caption, 1, 0, 'L', 1) pdf.RDMCell(col_width[i], row_height, column.caption, 1, 0, 'L', 1)
end end
...@@ -230,8 +242,9 @@ module Redmine ...@@ -230,8 +242,9 @@ module Redmine
pdf.SetFontStyle('',8) pdf.SetFontStyle('',8)
previous_group = group previous_group = group
end end
pdf.RDMCell(15, row_height, issue.id.to_s, 1, 0, 'L', 1)
query.columns.each_with_index do |column, i| # fetch all the row values
col_values = query.columns.collect do |column|
s = if column.is_a?(QueryCustomFieldColumn) s = if column.is_a?(QueryCustomFieldColumn)
cv = issue.custom_values.detect {|v| v.custom_field_id == column.custom_field.id} cv = issue.custom_values.detect {|v| v.custom_field_id == column.custom_field.id}
show_value(cv) show_value(cv)
...@@ -244,18 +257,64 @@ module Redmine ...@@ -244,18 +257,64 @@ module Redmine
else else
value value
end end
end end
pdf.RDMCell(col_width[i], row_height, s.to_s, 1, 0, 'L', 1) s.to_s
end end
pdf.Ln
# render it off-page to find the max height used
base_x = pdf.GetX
base_y = pdf.GetY
pdf.SetY(2 * page_height)
max_height = issues_to_pdf_write_cells(pdf, col_values, col_width, row_height)
pdf.SetXY(base_x, base_y)
# make new page if it doesn't fit on the current one
space_left = page_height - base_y - bottom_margin
if max_height > space_left
pdf.AddPage("L")
base_x = pdf.GetX
base_y = pdf.GetY
end
# write the cells on page
pdf.Cell(col_id_width, row_height, issue.id.to_s, "T", 0, 'C', 1)
issues_to_pdf_write_cells(pdf, col_values, col_width, row_height)
issues_to_pdf_draw_borders(pdf, base_x, base_y, base_y + max_height, col_id_width, col_width)
pdf.SetY(base_y + max_height);
end end
if issues.size == Setting.issues_export_limit.to_i if issues.size == Setting.issues_export_limit.to_i
pdf.SetFontStyle('B',10) pdf.SetFontStyle('B',10)
pdf.RDMCell(0, row_height, '...') pdf.RDMCell(0, row_height, '...')
end end
pdf.Output pdf.Output
end end
# Renders MultiCells and returns the maximum height used
def issues_to_pdf_write_cells(pdf, col_values, col_widths, row_height)
base_y = pdf.GetY
max_height = row_height
col_values.each_with_index do |column, i|
col_x = pdf.GetX
pdf.RDMMultiCell(col_widths[i], row_height, col_values[i], "T", 'L', 1)
max_height = (pdf.GetY - base_y) if (pdf.GetY - base_y) > max_height
pdf.SetXY(col_x + col_widths[i], base_y);
end
return max_height
end
# Draw lines to close the row (MultiCell border drawing in not uniform)
def issues_to_pdf_draw_borders(pdf, top_x, top_y, lower_y, id_width, col_widths)
col_x = top_x + id_width
pdf.Line(col_x, top_y, col_x, lower_y) # id right border
col_widths.each do |width|
col_x += width
pdf.Line(col_x, top_y, col_x, lower_y) # columns right border
end
pdf.Line(top_x, top_y, top_x, lower_y) # left border
pdf.Line(top_x, lower_y, col_x, lower_y) # bottom border
end
# Returns a PDF string of a single issue # Returns a PDF string of a single issue
def issue_to_pdf(issue) def issue_to_pdf(issue)
if ( current_language.to_s.downcase == 'ko' || if ( current_language.to_s.downcase == 'ko' ||
...@@ -273,7 +332,7 @@ module Redmine ...@@ -273,7 +332,7 @@ module Redmine
pdf.AddPage pdf.AddPage
pdf.SetFontStyle('B',11) pdf.SetFontStyle('B',11)
pdf.RDMCell(190,10, "#{issue.project} - #{issue.tracker} # #{issue.id}: #{issue.subject}") pdf.RDMMultiCell(190,5, "#{issue.project} - #{issue.tracker} # #{issue.id}: #{issue.subject}")
pdf.Ln pdf.Ln
y0 = pdf.GetY y0 = pdf.GetY
...@@ -325,19 +384,13 @@ module Redmine ...@@ -325,19 +384,13 @@ module Redmine
pdf.RDMMultiCell(155,5, (show_value custom_value),"R") pdf.RDMMultiCell(155,5, (show_value custom_value),"R")
end end
pdf.SetFontStyle('B',9)
pdf.RDMCell(35,5, l(:field_subject) + ":","LTB")
pdf.SetFontStyle('',9)
pdf.RDMCell(155,5, issue.subject,"RTB")
pdf.Ln
pdf.SetFontStyle('B',9) pdf.SetFontStyle('B',9)
pdf.RDMCell(35,5, l(:field_description) + ":") pdf.RDMCell(35,5, l(:field_description) + ":")
pdf.SetFontStyle('',9) pdf.SetFontStyle('',9)
pdf.RDMMultiCell(155,5, issue.description.to_s,"BR") pdf.RDMMultiCell(155,5, issue.description.to_s,"BR")
pdf.Line(pdf.GetX, y0, pdf.GetX, pdf.GetY) pdf.Line(pdf.GetX, y0, pdf.GetX, pdf.GetY)
pdf.Line(pdf.GetX, pdf.GetY, 170, pdf.GetY) pdf.Line(pdf.GetX, pdf.GetY, pdf.GetX + 190, pdf.GetY)
pdf.Ln pdf.Ln
if issue.changesets.any? && User.current.allowed_to?(:view_changesets, issue.project) if issue.changesets.any? && User.current.allowed_to?(:view_changesets, issue.project)
...@@ -359,16 +412,17 @@ module Redmine ...@@ -359,16 +412,17 @@ module Redmine
pdf.SetFontStyle('B',9) pdf.SetFontStyle('B',9)
pdf.RDMCell(190,5, l(:label_history), "B") pdf.RDMCell(190,5, l(:label_history), "B")
pdf.Ln pdf.Ln
for journal in issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_at ASC") for journal in issue.journals.find(:all, :include => [:user], :order => "#{Journal.table_name}.created_at ASC")
pdf.SetFontStyle('B',8) pdf.SetFontStyle('B',8)
pdf.RDMCell(190,5, format_time(journal.created_at) + " - " + journal.user.name) pdf.RDMCell(190,5, format_time(journal.created_at) + " - " + journal.user.name)
pdf.Ln pdf.Ln
pdf.SetFontStyle('I',8) pdf.SetFontStyle('I',8)
for detail in journal.details for detail in journal.details
pdf.RDMCell(190,5, "- " + journal.render_detail(detail, true)) pdf.RDMMultiCell(190,5, "- " + journal.render_detail(detail, true))
pdf.Ln pdf.Ln
end end
if journal.notes? if journal.notes?
pdf.Ln unless journal.details.empty?
pdf.SetFontStyle('',8) pdf.SetFontStyle('',8)
pdf.RDMMultiCell(190,5, journal.notes.to_s) pdf.RDMMultiCell(190,5, journal.notes.to_s)
end end
......
lib/redmine/version.rb
View file @ cd64d11e
...@@ -3,7 +3,7 @@ require 'rexml/document' ...@@ -3,7 +3,7 @@ require 'rexml/document'
module Redmine module Redmine
module VERSION #:nodoc: module VERSION #:nodoc:
MAJOR = 1 MAJOR = 1
MINOR = 3 MINOR = 4
PATCH = 0 PATCH = 0
TINY = PATCH # Redmine compat TINY = PATCH # Redmine compat
......
lib/redmine/wiki_formatting/textile/helper.rb
View file @ cd64d11e
...@@ -21,9 +21,7 @@ module Redmine ...@@ -21,9 +21,7 @@ module Redmine
module Helper module Helper
def wikitoolbar_for(field_id) def wikitoolbar_for(field_id)
heads_for_wiki_formatter heads_for_wiki_formatter
# Is there a simple way to link to a public resource? url = url_for(:controller => 'help', :action => 'wiki_syntax')
url = "#{Redmine::Utils.relative_url_root}/help/wiki_syntax.html"
help_link = link_to(l(:setting_text_formatting), url, help_link = link_to(l(:setting_text_formatting), url,
:onclick => "window.open(\"#{ url }\", \"\", \"resizable=yes, location=no, width=300, height=640, menubar=no, status=no, scrollbars=yes\"); return false;", :onclick => "window.open(\"#{ url }\", \"\", \"resizable=yes, location=no, width=300, height=640, menubar=no, status=no, scrollbars=yes\"); return false;",
:tabindex => -1) :tabindex => -1)
......
lib/tasks/email.rake
View file @ cd64d11e
...@@ -167,12 +167,12 @@ END_DESC ...@@ -167,12 +167,12 @@ END_DESC
end end
desc "Send a test email to the user with the provided login name" desc "Send a test email to the user with the provided login name"
task :test, :login, :needs => :environment do |task, args| task :test, [:login] => :environment do |task, args|
include Redmine::I18n include Redmine::I18n
abort l(:notice_email_error, "Please include the user login to test with. Example: login=examle-login") if args[:login].blank? abort l(:notice_email_error, "Please include the user login to test with. Example: login=example-login") if args[:login].blank?
user = User.find_by_login(args[:login]) user = User.find_by_login(args[:login])
abort l(:notice_email_error, "User #{args[:login]} not found") unless user.logged? abort l(:notice_email_error, "User #{args[:login]} not found") unless user && user.logged?
ActionMailer::Base.raise_delivery_errors = true ActionMailer::Base.raise_delivery_errors = true
begin begin
......
public/javascripts/context_menu.js
View file @ cd64d11e
...@@ -85,9 +85,6 @@ ContextMenu.prototype = { ...@@ -85,9 +85,6 @@ ContextMenu.prototype = {
} }
} }
} }
else{
this.RightClick(e);
}
}, },
createMenu: function() { createMenu: function() {
......
public/themes/chiliproject/CHANGELOG 0 → 100644
View file @ cd64d11e
0.2.0 (22-05-2009)
* Defect #236: Icons (ticket__*.png) aren't referenced correctly
* Feature #243: Add support for Redmine Graphs plugin
* Feature #261: Add support for Redmine Bugcloud plugin
* Feature #262: Add support for Redmine Scrumdashboard plugin
* Feature #263: Add support for Redmine Code Review plugin
* Enhancement #230: Other font-family for header
* Enhancement #233: Change used Fugue-icon for Roadmap project-menu item
* Enhancement #255: Make image-references relative for sub-URI compatibility
* Enhancement #256: Fix upcoming change in supported Budget-plugin
* Enhancement #258: Fix upcoming change in supported Invoices-plugin
* Enhancement #259: Fix upcoming change in supported Scores-plugin
* Enhancement #260: Fix upcoming change in supported Simple-CI plugin
* Enhancement #267: Fix upcoming change in supported Todos plugin
* Task-HITDM #235: Update vendor source of the fugue icon-set to current release
* Task-HITDM #257: Clean-up and Fix project-menu declarations of supported plugins
* Task-HITDM #266: Remove unused images while creating the 0.2-release branch
0.1.0 (21-03-2009)
* Defect #186: Project-menu icons aren't rendered after Redmine core rev2022
* Defect #187: Right-aligned columns on version-page have a white background instead of transparent
* Defect #193: There exists some cross-browser compatibility-errors on Presto-engine
* Defect #195: Some faulty references to non-existing images exists due to typos
* Defect #196: Fix overflow of the content
* Defect #199: Issue-journals should be displayed *behind* the related-revisions block, not below it
* Defect #207: Several PNG-images are rendered with a white background, disrupting the nice gray-gradient
* Defect #208: Fix the rendering of the note-icon when inline-editing an issue-journal
* Defect #211: After r40 unordered lists inside the issue-journal comment are smaller-sized too
* Defect #212: Issue-journal comment note-icons rendered for all paragraphs instead of the first only
* Defect #213: After r37 the context-menu item-links are rendered as bold; should be normal
* Defect #228: After r6 selected project-menu tabs aren't highlighted anymore
* Feature #210: Add specific declarations for third-party plugins
* Feature #229: Add KHTML-support for rounded-borders on the first & last project-menu items
* Enhancement #190: Improve link-visibility globally
* Enhancement #191: Refactor the styling of the issue-journals
* Enhancement #192: Modify (overall) font-sizes to make the UI more consistent
* Enhancement #194: Sidebar should have a bit more width
* Enhancement #198: Overrule bordered-table styles imported from the Alternate-theme
* Enhancement #214: Project-menu overflows the right border when lots of modules are enabled on a project
* Enhancement #223: Improve icon-declarations
* Task-HITDM #188: Remove project-body headers introduced by Squeejee based on a core-hack
* Task-HITDM #189: Undue the theme from dependency on (import of) the Alternate-theme
* Task-HITDM #200: Remove unused images from release
* Task-HITDM #201: Clean CSS-styles coding
* Task-HITDM #205: 0.1.0 Release QA
* Task-HITDM #209: CSS-Code Cleanup (round 2)
* Task-HITDM #215: Update vendor source of the fugue icon-set to 1.4.6
* Task-HITDM #224: Update vendor source of the fugue icon-set to 1.4.7
* Task-HITDM #226: Fix issues found in 0.1.0 Release QA-Sprint/2 (#205)
0.0.0
Initial source by Wynn Netherland as of 20-11-2008
public/themes/chiliproject/GPL.txt 0 → 100644
View file @ cd64d11e
This diff is collapsed.
public/themes/chiliproject/README.rdoc 0 → 100644
View file @ cd64d11e
= ChiliProject.org theme
This theme is based on the Redmine Squeejee theme. It is available bundled with ChiliProject as well as on Github.
* ChiliProject - https://www.chiliproject.org
* Github - https://github.com/edavis10/squeejee_theme/tree/chiliproject.org
See README.redmine for the official Squeejee theme readme.
public/themes/chiliproject/README.redmine 0 → 100644
View file @ cd64d11e
h1. Squeejee theme
A theme for Redmine which is based on a dark but "shiny" color-scheme and which includes a subtle (re)styled project-menu.
h2. Packager, contributor and maintainer
* Mischa The Evil
h2. Initial author
* "Wynn Netherland":http://www.squeejee.com/team.html#wynn_netherland
h2. History
For the complete history of the theme's creation you could see "this forum-thread":http://www.redmine.org/boards/1/topics/2736.
h2. Features
The Squeejee© theme is an updated, packaged release of Wynn Netherland's work for "Squeejee's":http://www.squeejee.com internal Redmine instance. It initially was a heavily modified derivation of the [[ThemeAlternate|alternate theme]] which required Redmine core hacks but is made stand-alone and working without core hacks (by using the core's support for project-menu item styling (r2059)) for this release.
It's looks can be best described as a dark theme with gradient backgrounds, dark-gray and bold links, but all with a "shiny" and "friendly" touch. It reintroduces the project-menu item-icons with the extension that styling of third-party plugins (including selected icons) is supported too.
Also the overflow to a second line of the project-menu, when using a lot of plugins with menu-items, is handled without disturbing the surrounding layout and elements.
The colour-scheme basically consists of three basic colours: black, grey and white.
It includes:
* issue-colouring in the issuelist, based on default priority-enumerations for issues
* more sophistically styled "tabs", "tables", etc.
* (project-menu item styling) support for (lots of) third-party plugins
h2. Screenshots
[ ... see online version of this page ... ]
h2. Compatibility
h3. Redmine compatibility
The theme is compatible with the Redmine 0.8-stable branch (thus including releases: 0.8.0, 0.8.1, 0.8.2 and 0.8.3) and the trunk.
h3. Browser compatibility
* This theme is fully compatible with the current, big-four of browser-engines:
* Gecko (Mozilla)
* Trident (Internet Explorer 8)
* Presto (Opera)
* WebKit (Safari/Chrome)
* This theme is for about 95% compatible with the following browser-engine:
* Trident (Internet Explorer 7)
Though, tiny differences can occur across different browsers.
h2. Obtaining the theme
The theme can be downloaded as a packaged release from:
* this page; the archive is attached
* this MediaFire-mirror: http://www.mediafire.com/evildev
* the upcoming website http://www.evil-dev.net
h2. Installation
Follow the Redmine theme installation steps at: http://www.redmine.org/wiki/redmine/Themes#Installing-a-theme.
h2. Upgrade
1. Download the latest archive file from the available sources (see "Obtaining the theme")
2. Backup the currently deployed squeejee theme (in _"../public/themes"_: @mv squeejee squeejee-backup@)
3. Unzip the downloaded file to your Redmine into the theme-directory _"../public/themes"_
4. Restart your Redmine
h2. Uninstall
1. Remove the directory "squeejee" from the theme-directory _"../public/themes"_
2. Restart Redmine
h2. Changelog
For the complete changelog see the @CHANGELOG@-file in the Squeejee theme directory.
h2. Credits
Thanks goes out to the following people:
* Wynn Netherland, Squeejee (http://www.squeejee.com)
** Initial author (designer and coder) of the draft of this theme which can be found here: http://github.com/squeejee/redmine/tree/master/public/themes/squeejee
* Jean-Philippe Lang, Project-leader of Redmine (http://www.redmine.org)
** For creating and maintaining the Redmine system...
h2. Licensing
This theme is open-source and licensed under the "GNU General Public License v2":http://www.gnu.org/licenses/old-licenses/gpl-2.0.html (GPL). Certain icons are part of the Fugue icon-set (http://www.pinvoke.com) which is released under the "Creative Commons Attribution 3.0 Unported":http://creativecommons.org/licenses/by/3.0 license.
* (C)2009, Mischa The Evil (http://www.evil-dev.net)
* (C)2008, Wynn Netherland (http://www.squeejee.com)
h2. Support
If you need help, would like to report a bug or request a new feature you can contact the
maintainer via mail (mischa_the_evil [AT] hotmail [DOT] com) or at his (upcoming) website: http://www.evil-dev.net.
public/themes/chiliproject/images/fugue/history.txt 0 → 100644
View file @ cd64d11e
Version 2.0 (May 13, 2009)
- Add <drive*>.
- Add <edit-disable>.
- Add <navigation*>.
- Add <report-excel>.
- Add <smiley-paint-brush>.
- Add <ui-toolbar-bookmark>.
- Add <umbrella-disable>.
- Add <user-disable> and <user-female-disable>.
--------------------------------------------------------------------------------
Version 1.9.3 (May 12, 2009)
- Add <balloon-ellipsis> and <balloon-sound>.
- Add <brightness-control*>.
- Add <clock-disable>.
- Add <contrast-control*>.
- Add <hammer-disable> and <hammer-screwdriver-disable>.
- Add <keyboard-disable> and <keyboard-space>.
- Add <pill-disable>.
- Add <pin-disable>.
- Add <plug-disable>.
- Add <printer-disable>.
- Add <ruler-disable> and <ruler-triangle-disable>.
- Add <safe-disable>.
- Add <scissors-disable>.
- Add <screwdriver-disable>.
- Add <switch-disable>.
- Add <target-disable>.
- Add <thumb-disable> and <thumb-up-disable>.
- Add <wand-disable>.
- Add <webcam*>.
- Add <wrench-disable> and <wrench-screwdriver-disable>.
--------------------------------------------------------------------------------
Version 1.9.2 (May 10, 2009)
* Increase contrast.
- Add <alarm-clock-disable>.
- Add <block-disable>.
- Add <broom-disable>.
- Add <compass-disable>.
- Add <direction-disable>.
- Add <drill-disable>.
- Add <eye-disable>.
- Add <information-balloon>.
- Add <lifebuoy-disable>.
- Add <megaphone-disable>.
- Add <microphone-disable>.
- Add <question-balloon>.
--------------------------------------------------------------------------------
Version 1.9.1 (May 9, 2009)
- Add <cake*>.
- Add <clipboard-list>.
- Add <document-copy> and <document-list>.
- Add <image-empty>.
- Add <keyboard*>.
- Add <paint-brush*>.
- Add <pencil-ruler>.
- Add <switch-small>.
- Add <table-delete-row>, <table-insert-row> and <table-sheet>.
- Add <ui-combo-box-calendar>.
- Add <ui-progress-bar-indeterminate>.
- Add <universal>.
- Add <user-nude*> and <user-white*>.
- Add <yin-yang>.
--------------------------------------------------------------------------------
Version 1.9 (May 4, 2009)
- Add <document-hf*> and <document-insert>.
- Add <film-cast>.
- Add <grid-snap*>.
- Add <guide*>.
- Add <image-cast>.
- Add <layer-shade>.
- Add <megaphone*>.
- Add <subversion>.
- Add <volume*>.
--------------------------------------------------------------------------------
Version 1.8.1 (May 1, 2009)
- Add <block-small>.
- Add <border*>.
- Add <document-block> and <document-code>.
- Add <media-player-cast>.
- Add <script-attribute*>, <script-block>, <script-code>, <script-flash> and <script-globe>.
--------------------------------------------------------------------------------
Version 1.8 (April 29, 2009)
- Add <credit-card*>.
- Add <credit-cards>.
- Add <document-attribute*>, <document-globe> and <document-photoshop-image>.
- Add <edit-diff>.
- Add <globe-place>.
- Add <layer-resize-replicate*>.
--------------------------------------------------------------------------------
Version 1.7 (April 15, 2009)
--------------------------------------------------------------------------------
Version 1.6 (April 6, 2009)
--------------------------------------------------------------------------------
Version 1.5 (March 17, 2009)
--------------------------------------------------------------------------------
Version 1.4 (January 28, 2009)
--------------------------------------------------------------------------------
Version 1.3 (January 22, 2009)
--------------------------------------------------------------------------------
Version 1.2 (January 11, 2009)
--------------------------------------------------------------------------------
Version 1.1 (January 2, 2009)
--------------------------------------------------------------------------------
Version 1.0 (October 12, 2008)
* Initial non-beta release.
--------------------------------------------------------------------------------
Version 0.9 (August 4, 2008)
--------------------------------------------------------------------------------
Version 0.8 (July 28, 2008)
--------------------------------------------------------------------------------
Version 0.7 (July 22, 2008)
--------------------------------------------------------------------------------
Version 0.6 (July 14, 2008)
--------------------------------------------------------------------------------
Version 0.5 (July 13, 2008)
--------------------------------------------------------------------------------
Version 0.4 (July 9, 2008)
--------------------------------------------------------------------------------
Version 0.3 (June 29, 2008)
--------------------------------------------------------------------------------
Version 0.2 (June 27, 2008)
--------------------------------------------------------------------------------
Version 0.1 (June 17, 2008)
* Initial beta release.
\ No newline at end of file
public/themes/chiliproject/images/fugue/readme.txt 0 → 100644
View file @ cd64d11e
Fugue Icons
================================================================================
Copyright (C) 2009 Yusuke Kamiyamane. All rights reserved.
The icons are licensed under a Creative Commons Attribution 3.0 license.
<http://creativecommons.org/licenses/by/3.0/>
--------------------------------------------------------------------------------
If you can't or don't want to place link back, please purchase a royalty-free license.
<http://www.pinvoke.com/>
--------------------------------------------------------------------------------
I'm unavailable for custom icon design work. But your suggestions are always welcome!
<mailto:yusuke.kamiyamane@gmail.com>
\ No newline at end of file
public/themes/chiliproject/images/wiki_styles/info_small.png 0 → 100644
View file @ cd64d11e
This diff is collapsed.
public/themes/chiliproject/images/wiki_styles/note.png 0 → 100644
View file @ cd64d11e
This diff is collapsed.
public/themes/chiliproject/images/wiki_styles/note_small.png 0 → 100644
View file @ cd64d11e
This diff is collapsed.
public/themes/chiliproject/images/wiki_styles/see-also.png 0 → 100644
View file @ cd64d11e
This diff is collapsed.
public/themes/chiliproject/images/wiki_styles/see-also_small.png 0 → 100644
View file @ cd64d11e
This diff is collapsed.
public/themes/chiliproject/images/wiki_styles/tip.png 0 → 100644
View file @ cd64d11e
This diff is collapsed.
public/themes/chiliproject/images/wiki_styles/tip_small.png 0 → 100644
View file @ cd64d11e
This diff is collapsed.
public/themes/chiliproject/stylesheets/application.css 0 → 100644
View file @ cd64d11e
This diff is collapsed.
test/functional/help_controller_test.rb 0 → 100644
View file @ cd64d11e
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment