# HG changeset patch
# User Chris Cannam
# Date 1352472935 0
# Node ID 96f4b03623edbc8970f52fb1a3d38e4c97c3b739
# Parent f6ede18f3e6e68bd2e3be5350d4b03c9340e89db# Parent 48ddad528c51ada8ebb1d1a9c6a59672a84637e2
Merge from branch "cannam"
diff -r f6ede18f3e6e -r 96f4b03623ed app/helpers/projects_helper.rb
--- a/app/helpers/projects_helper.rb Fri Nov 09 14:55:45 2012 +0000
+++ b/app/helpers/projects_helper.rb Fri Nov 09 14:55:35 2012 +0000
@@ -162,14 +162,12 @@
end
- # Renders a tree of projects that the current user does not belong
- # to, or of all projects if the current user is not logged in. The
- # given collection may be a subset of the whole project tree
- # (eg. some intermediate nodes are private and can not be seen). We
- # are potentially interested in various things: the project name,
- # description, manager(s), creation date, last activity date,
- # general activity level, whether there is anything actually hosted
- # here for the project, etc.
+ # Renders a tree of projects. The given collection may be a subset
+ # of the whole project tree (eg. some intermediate nodes are private
+ # and can not be seen). We are potentially interested in various
+ # things: the project name, description, manager(s), creation date,
+ # last activity date, general activity level, whether there is
+ # anything actually hosted here for the project, etc.
def render_project_table(projects)
s = ""
diff -r f6ede18f3e6e -r 96f4b03623ed public/help/wiki_syntax.html
--- a/public/help/wiki_syntax.html Fri Nov 09 14:55:45 2012 +0000
+++ b/public/help/wiki_syntax.html Fri Nov 09 14:55:35 2012 +0000
@@ -44,11 +44,15 @@
 | h2. Title 2 | Title 2 |
|---|
 | h3. Title 3 | Title 3 |
|---|
+| Table of contents |
|---|
+ | {{toc}} | Left-aligned table of contents |
|---|
+ | {{>toc}} | Right-aligned table of contents |
|---|
+
| Links |
|---|
| http://foo.bar | http://foo.bar |
|---|
| "Foo":http://foo.bar | Foo |
|---|
-| Redmine links |
|---|
+| Magic links |
|---|
 | [[Wiki page]] | Wiki page |
|---|
| Issue #12 | Issue #12 |
|---|
| Revision r43 | Revision r43 |
|---|
diff -r f6ede18f3e6e -r 96f4b03623ed public/stylesheets/application.css
--- a/public/stylesheets/application.css Fri Nov 09 14:55:45 2012 +0000
+++ b/public/stylesheets/application.css Fri Nov 09 14:55:35 2012 +0000
@@ -5,7 +5,7 @@
h1 {margin:0; padding:0; font-size: 24px;}
h2, .wiki h1 {font-size: 20px;padding: 2px 10px 1px 0px;margin: 0 0 10px 0; border-bottom: 1px solid #bbbbbb; color: #444;}
h3, .wiki h2 {font-size: 16px;padding: 2px 10px 1px 0px;margin: 0 0 10px 0; border-bottom: 1px solid #bbbbbb; color: #444;}
-h4, .wiki h3 {font-size: 13px;padding: 2px 10px 1px 0px;margin-bottom: 5px; border-bottom: 1px dotted #bbbbbb; color: #444;}
+h4, .wiki h3 {font-size: 14px;padding: 2px 10px 1px 0px;margin-bottom: 5px; border-bottom: 1px dotted #bbbbbb; color: #444;}
/***** Layout *****/
#wrapper {background: white;}
@@ -24,14 +24,14 @@
#account {float:right;}
-#header {height:5.3em;margin:0;background-color:#507AAA;color:#f8f8f8; padding: 4px 8px 0px 6px; position:relative;}
+#header {height:68px;margin:0;background-color:#507AAA;color:#f8f8f8; padding: 4px 8px 0px 6px; position:relative;}
#header a {color:#f8f8f8;}
#header h1 a.ancestor { font-size: 80%; }
#project-search-jump {float:right; }
-#main-menu {position: absolute; bottom: 0px; left:6px; margin-right: -500px;}
+#main-menu {position: absolute; bottom: 0px; left:8px; margin-right: -500px;}
#main-menu ul {margin: 0; padding: 0;}
#main-menu li {
float:left;
diff -r f6ede18f3e6e -r 96f4b03623ed public/themes/soundsoftware/stylesheets/application.css
--- a/public/themes/soundsoftware/stylesheets/application.css Fri Nov 09 14:55:45 2012 +0000
+++ b/public/themes/soundsoftware/stylesheets/application.css Fri Nov 09 14:55:35 2012 +0000
@@ -34,7 +34,7 @@
h2,h3,h4,.wiki h1 {
color: #3e442c;
- font-weight: bold;
+/* font-weight: bold; */
}
.wiki h2,.wiki h3,.wiki h4 {
@@ -119,14 +119,14 @@
#quick-search { margin-right: 6px; margin-top: 1em; color: #000; }
#project-jump-box { float: right; margin-right: 6px; margin-top: 5px; color: #000; }
#project-ancestors-title {
- margin-bottom: 0px;
+ margin-bottom: -6px;
margin-left: 12px;
margin-top: 6px;
}
-#main-menu { position: absolute; top: 100px; /* background-color: #be5700; */ left: 0; border-top: 0; width: 100%;/* height: 1.82em; */ padding: 0; margin: 0; border: 0; }
+#main-menu { position: absolute; top: 100px; /* background-color: #be5700; */ left: 2px; border-top: 0; width: 100%;/* height: 1.82em; */ padding: 0; margin: 0; border: 0; }
#main-menu li { margin: 0; padding: 0; }
-#main-menu li a { background-color: #fdfbf5; color: #be5700; border-right: 1px solid #a9b680; font-size: 97%; padding: 0em 8px 0.2em 10px; font-weight: normal; }
+#main-menu li a { background-color: #fdfbf5; color: #be5700; border-right: 1px solid #a9b680; font-size: 97%; padding: 0em 8px 0em 10px; font-weight: normal; }
#main-menu li:last-child a { border-right: 0; }
#main-menu li a:hover { background-color: #fdfbf5; color: #be5700; text-decoration: underline; }
#main-menu li a.selected, #main-menu li a.selected:hover { background-color: #fdfbf5; color: #3e442c; }
@@ -145,7 +145,9 @@
h2, h3, h4, .wiki h1, .wiki h2, .wiki h3 { border-bottom: 0px; }
/*h2, .wiki h1 { letter-spacing:-1px; }
*/
-h4 { border-bottom: dotted 1px #c0c0c0; }
+/* h4 { border-bottom: dotted 1px #c0c0c0; } */
+
+.wiki p { margin-left: 3em; margin-right: 3em; }
div.issue { background: #fdfaf0; border: 1px solid #a9b680; border-left: 4px solid #a9b680; }
diff -r f6ede18f3e6e -r 96f4b03623ed public/themes/soundsoftware/stylesheets/fonts-generic.css
--- a/public/themes/soundsoftware/stylesheets/fonts-generic.css Fri Nov 09 14:55:45 2012 +0000
+++ b/public/themes/soundsoftware/stylesheets/fonts-generic.css Fri Nov 09 14:55:35 2012 +0000
@@ -1,12 +1,24 @@
@import url(fonts.css);
-h1, #project-ancestors-title {
- font-family: GilliusADFNo2, 'Gill Sans', Tahoma, sans-serif;
- font-weight: normal;
+h1, #project-ancestors-title, #top-menu a {
+ font-family: Insider, 'Gill Sans', Tahoma, sans-serif;
+ font-weight: bold;
}
-body,p,h2,h3,h4,li,table,.wiki h1,.embedded h1 {
- font-family: DroidSans, 'Liberation Sans', tahoma, verdana, sans-serif;
+#top-menu div, #top-menu li {
+ font-size: 12px;
+}
+
+body,p,li,table {
+ font-family: Insider, DroidSans, 'Liberation Sans', tahoma, verdana, sans-serif;
+ font-size: 14px;
+ line-height: 1.34;
+ font-weight: normal;
+}
+
+h2,h3,h4,.wiki h1,.embedded h1 {
+ font-family: Insider, DroidSans, 'Liberation Sans', tahoma, verdana, sans-serif;
+ font-weight: bold;
line-height: 1.34;
}
diff -r f6ede18f3e6e -r 96f4b03623ed public/themes/soundsoftware/stylesheets/fonts-mac.css
--- a/public/themes/soundsoftware/stylesheets/fonts-mac.css Fri Nov 09 14:55:45 2012 +0000
+++ b/public/themes/soundsoftware/stylesheets/fonts-mac.css Fri Nov 09 14:55:35 2012 +0000
@@ -1,11 +1,24 @@
@import url(fonts.css);
-h1, #project-ancestors-title {
- font-family: GilliusADFNo2, 'Gill Sans', Tahoma, sans-serif;
- font-weight: normal;
+h1, #project-ancestors-title, #top-menu a {
+ font-family: Insider, "Lucida Grande", sans-serif;
+ font-weight: bold;
}
-body,p,h2,h3,h4,li,table,.wiki h1,.embedded h1 {
- font-family: 'Lucida Grande', 'Lucida Sans Unicode', DroidSans, 'Liberation Sans', tahoma, verdana, sans-serif;
+#top-menu div, #top-menu li {
+ font-size: 12px;
+}
+
+body,p,li,table {
+ font-family: Insider, "Lucida Grande", sans-serif;
+ font-size: 14px;
+ line-height: 1.34;
+ font-weight: normal;
+}
+
+h2,h3,h4,.wiki h1,.embedded h1 {
+ font-family: Insider, "Lucida Grande", sans-serif;
+ font-weight: bold;
line-height: 1.34;
}
+
diff -r f6ede18f3e6e -r 96f4b03623ed public/themes/soundsoftware/stylesheets/fonts-ms.css
--- a/public/themes/soundsoftware/stylesheets/fonts-ms.css Fri Nov 09 14:55:45 2012 +0000
+++ b/public/themes/soundsoftware/stylesheets/fonts-ms.css Fri Nov 09 14:55:35 2012 +0000
@@ -1,11 +1,26 @@
@import url(fonts.css);
-h1, #project-ancestors-title {
- font-family: GilliusADFNo2, 'Gill Sans', Tahoma, sans-serif;
+/* IE likes us to separate out normal & bold into different fonts
+ rather than use the selectors on the same font */
+
+h1, #project-ancestors-title, #top-menu a {
+ font-family: Insider-Medium, Tahoma, sans-serif;
font-weight: normal;
}
-body,p,h2,h3,h4,li,table,.wiki h1,.embedded h1 {
- font-family: Calibri, DroidSans, 'Liberation Sans', tahoma, verdana, sans-serif;
+#top-menu div, #top-menu li {
+ font-size: 12px;
+}
+
+body,p,li,table {
+ font-family: Insider-Regular, tahoma, verdana, sans-serif;
+ font-size: 14px;
+ line-height: 1.34;
+ font-weight: normal;
+}
+
+h2,h3,h4,.wiki h1,.embedded h1 {
+ font-family: Insider-Medium, tahoma, verdana, sans-serif;
+ font-weight: normal;
line-height: 1.34;
}
diff -r f6ede18f3e6e -r 96f4b03623ed public/themes/soundsoftware/stylesheets/fonts.css
--- a/public/themes/soundsoftware/stylesheets/fonts.css Fri Nov 09 14:55:45 2012 +0000
+++ b/public/themes/soundsoftware/stylesheets/fonts.css Fri Nov 09 14:55:35 2012 +0000
@@ -1,51 +1,32 @@
-
-/* Font pack generated by FontSquirrel */
@font-face {
- font-family: 'GilliusADFNo2';
- src: url('fonts/gilliusadfno2-bolditalic-webfont.eot');
- src: local('☺'), url('fonts/gilliusadfno2-bolditalic-webfont.woff') format('woff'), url('fonts/gilliusadfno2-bolditalic-webfont.ttf') format('truetype'), url('fonts/GilliusADFNo2-BoldItalic.otf') format('opentype'), url('fonts/gilliusadfno2-bolditalic-webfont.svg#webfontLmhvPwzc') format('svg');
- font-weight: bold;
- font-style: italic;
+ font-family: 'Insider';
+ font-weight: bold;
+ font-style: normal;
+ src: url('fonts/24BC0E_0_0.eot');
+ src: url('fonts/24BC0E_0_0.eot?#iefix') format('embedded-opentype'), url('fonts/24BC0E_0_0.woff') format('woff'), url('fonts/24BC0E_0_0.ttf') format('truetype');
+}
+
+@font-face {
+ font-family: 'Insider';
+ font-weight: normal;
+ font-style: normal;
+ src: url('fonts/24BC35_0_0.eot');
+ src: url('fonts/24BC35_0_0.eot?#iefix') format('embedded-opentype'), url('fonts/24BC35_0_0.woff') format('woff'), url('fonts/24BC35_0_0.ttf') format('truetype');
}
@font-face {
- font-family: 'GilliusADFNo2';
- src: url('fonts/gilliusadfno2-italic-webfont.eot');
- src: local('☺'), url('fonts/gilliusadfno2-italic-webfont.woff') format('woff'), url('fonts/gilliusadfno2-italic-webfont.ttf') format('truetype'), url('fonts/GilliusADFNo2-Italic.otf') format('opentype'), url('fonts/gilliusadfno2-italic-webfont.svg#webfonteHBtzgS0') format('svg');
- font-weight: normal;
- font-style: italic;
+ font-family: 'Insider-Medium';
+ font-weight: normal;
+ font-style: normal;
+ src: url('fonts/24BC0E_0_0.eot');
+ src: url('fonts/24BC0E_0_0.eot?#iefix') format('embedded-opentype'), url('fonts/24BC0E_0_0.woff') format('woff'), url('fonts/24BC0E_0_0.ttf') format('truetype');
}
-
+
@font-face {
- font-family: 'GilliusADFNo2';
- src: url('fonts/gilliusadfno2-bold-webfont.eot');
- src: local('☺'), url('fonts/gilliusadfno2-bold-webfont.woff') format('woff'), url('fonts/gilliusadfno2-bold-webfont.ttf') format('truetype'), url('fonts/GilliusADFNo2-Bold.otf') format('opentype'), url('fonts/gilliusadfno2-bold-webfont.svg#webfontntXmQMqk') format('svg');
- font-weight: bold;
- font-style: normal;
+ font-family: 'Insider-Regular';
+ font-weight: normal;
+ font-style: normal;
+ src: url('fonts/24BC35_0_0.eot');
+ src: url('fonts/24BC35_0_0.eot?#iefix') format('embedded-opentype'), url('fonts/24BC35_0_0.woff') format('woff'), url('fonts/24BC35_0_0.ttf') format('truetype');
}
-
-@font-face {
- font-family: 'GilliusADFNo2';
- src: url('fonts/gilliusadfno2-regular-webfont.eot');
- src: local('☺'), url('fonts/gilliusadfno2-regular-webfont.woff') format('woff'), url('fonts/gilliusadfno2-regular-webfont.ttf') format('truetype'), url('fonts/GilliusADFNo2-Regular.otf') format('opentype'), url('fonts/gilliusadfno2-regular-webfont.svg#webfontvJUiAdi3') format('svg');
- font-weight: normal;
- font-style: normal;
-}
-
-@font-face {
- font-family: 'DroidSans';
- src: url('fonts/DroidSans-webfont.eot');
- src: local('☺'), url('fonts/DroidSans-webfont.woff') format('woff'), url('fonts/DroidSans-webfont.ttf') format('truetype'), url('fonts/DroidSans-webfont.svg#webfontKYIQSBQk') format('svg');
- font-weight: normal;
- font-style: normal;
-}
-
-@font-face {
- font-family: 'DroidSans';
- src: url('fonts/DroidSans-Bold-webfont.eot');
- src: local('☺'), url('fonts/DroidSans-Bold-webfont.woff') format('woff'), url('fonts/DroidSans-Bold-webfont.ttf') format('truetype'), url('fonts/DroidSans-Bold-webfont.svg#webfontljpTCDjw') format('svg');
- font-weight: bold;
- font-style: normal;
-}
-
diff -r f6ede18f3e6e -r 96f4b03623ed vendor/plugins/redmine_tags/lib/redmine_tags/patches/projects_controller_patch.rb
--- a/vendor/plugins/redmine_tags/lib/redmine_tags/patches/projects_controller_patch.rb Fri Nov 09 14:55:45 2012 +0000
+++ b/vendor/plugins/redmine_tags/lib/redmine_tags/patches/projects_controller_patch.rb Fri Nov 09 14:55:35 2012 +0000
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
require_dependency 'projects_controller'
module RedmineTags
@@ -127,13 +128,10 @@
end
unless @tag_list.empty?
- @tagged_projects_ids = Project.visible.tagged_with(@tag_list).collect{ |project| Project.find(project.id) }
+ @tagged_projects_ids = Project.visible.tagged_with(@tag_list).collect{ |project| Project.find(project.id).root }
@projects = @projects & @tagged_projects_ids
+ @projects = @projects.uniq
end
-
- @projects = @projects.collect{ |project| project.root }
- @projects = @projects.uniq
-
end
end
end