jro_apps/redmine Commit - r9268:baa4ebd05f39

Merged r9389 from trunk....

Jean-Philippe Lang -

r9268:baa4ebd05f39

parent child

Context file:

r9268:baa4ebd05f39

Collapse all files

Gemfile +1 -1

             source :rubygems
             gem "rails", "2.3.14"
             gem "i18n", "~> 0.4.2"
-            gem "coderay", "~> 1.0.0"
+            gem "coderay", "~> 1.0.6"
             gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
             gem "tzinfo", "~> 0.3.31"
             # Optional gem for LDAP authentication
             group :ldap do
               gem "net-ldap", "~> 0.3.1"
             end
             # Optional gem for OpenID authentication
             group :openid do
               gem "ruby-openid", "~> 2.1.4", :require => "openid"
             end
             # Optional gem for exporting the gantt to a PNG file, not supported with jruby
             platforms :mri, :mingw do
               group :rmagick do
                 # RMagick 2 supports ruby 1.9
                 # RMagick 1 would be fine for ruby 1.8 but Bundler does not support
                 # different requirements for the same gem on different platforms
                 gem "rmagick", ">= 2.0.0"
               end
             end
             # Database gems
             platforms :mri, :mingw do
               group :postgresql do
                 gem "pg", ">= 0.11.0"
               end
               group :sqlite do
                 gem "sqlite3"
               end
             end
             platforms :mri_18, :mingw_18 do
               group :mysql do
                 gem "mysql"
               end
             end
             platforms :mri_19, :mingw_19 do
               group :mysql do
                 gem "mysql2", "~> 0.2.7"
               end
             end
             platforms :jruby do
               gem "jruby-openssl"
               group :mysql do
                 gem "activerecord-jdbcmysql-adapter"
               end
               group :postgresql do
                 gem "activerecord-jdbcpostgresql-adapter"
               end
               group :sqlite do
                 gem "activerecord-jdbcsqlite3-adapter"
               end
             end
             group :development do
               gem "rdoc", ">= 2.4.2"
             end
             group :test do
               gem "shoulda", "~> 2.10.3"
               gem "edavis10-object_daddy", :require => "object_daddy"
               gem "mocha"
             end
             if File.exists?('Gemfile.local')
               puts "Loading Gemfile.local ..." if $DEBUG # `ruby -d` or `bundle -v`
               instance_eval File.read('Gemfile.local')
             end
             # Load plugins' Gemfiles
             Dir.glob File.expand_path("../vendor/plugins/*/Gemfile", __FILE__) do |file|
               puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
               instance_eval File.read(file)
             end

lib/redmine/syntax_highlighting.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2011  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             module Redmine
               module SyntaxHighlighting
                 class << self
                   attr_reader :highlighter
                   delegate :highlight_by_filename, :highlight_by_language, :to => :highlighter
                   def highlighter=(name)
                     if name.is_a?(Module)
                       @highlighter = name
                     else
                       @highlighter = const_get(name)
                     end
                   end
                 end
                 module CodeRay
                   require 'coderay'
                   require 'coderay/helpers/file_type'
                   class << self
                     # Highlights +text+ as the content of +filename+
                     # Should not return line numbers nor outer pre tag
                     def highlight_by_filename(text, filename)
                       language = ::CodeRay::FileType[filename]
-                      language ? ::CodeRay.scan(text, language).html : ERB::Util.h(text)
+                      language ? ::CodeRay.scan(text, language).html(:break_lines => true) : ERB::Util.h(text)
                     end
                     # Highlights +text+ using +language+ syntax
                     # Should not return outer pre tag
                     def highlight_by_language(text, language)
                       ::CodeRay.scan(text, language).html(:line_numbers => :inline, :line_number_anchors => false, :wrap => :span)
                     end
                   end
                 end
               end
               SyntaxHighlighting.highlighter = 'CodeRay'
             end

public/stylesheets/scm.css +35 -38

             table.revision-info td {
                 margin:  0px;
                 padding: 0px;
             }
             div.revision-graph { position: absolute; }
             div.changeset-changes ul { margin: 0; padding: 0; }
             div.changeset-changes ul > ul { margin-left: 18px; padding: 0; }
             li.change {
                 list-style-type:none;
                 background-image: url(../images/bullet_black.png);
                 background-position: 1px 1px;
                 background-repeat: no-repeat;
                 padding-top: 1px;
                 padding-bottom: 1px;
                 padding-left: 20px;
                 margin: 0;
             }
             li.change.folder { background-image: url(../images/folder_open.png); }
             li.change.folder.change-A { background-image: url(../images/folder_open_add.png); }
             li.change.folder.change-M { background-image: url(../images/folder_open_orange.png); }
             li.change.change-A { background-image: url(../images/bullet_add.png); }
             li.change.change-M { background-image: url(../images/bullet_orange.png); }
             li.change.change-C { background-image: url(../images/bullet_blue.png); }
             li.change.change-R { background-image: url(../images/bullet_purple.png); }
             li.change.change-D { background-image: url(../images/bullet_delete.png); }
             li.change .copied-from { font-style: italic; color: #999; font-size: 0.9em; }
             li.change .copied-from:before { content: " - "}
             #changes-legend { float: right; font-size: 0.8em; margin: 0; }
             #changes-legend li { float: left; background-position: 5px 0; }
             table.filecontent { border: 1px solid #ccc;  border-collapse: collapse; width:98%; background-color: #fafafa; }
             table.filecontent th { border: 1px solid #ccc; background-color: #eee; }
             table.filecontent th.filename { background-color: #e4e4d4; text-align: left; padding: 0.2em;}
             table.filecontent tr.spacing th { text-align:center; }
             table.filecontent tr.spacing td { height: 0.4em; background: #EAF2F5;}
             table.filecontent th.line-num {
                 border: 1px solid #d7d7d7;
                 font-size: 0.8em;
                 text-align: right;
                 width: 2%;
                 padding-right: 3px;
                 color: #999;
                 user-select: none;
                 -moz-user-select: none;
                 -o-user-select: none;
                 -ms-user-select: none;
                 -webkit-user-select: none;
             }
             table.filecontent th.line-num a {
                 text-decoration: none;
                 color: inherit;
             }
             table.filecontent td.line-code pre {
                 margin: 0px;
                 white-space: pre-wrap;
             }
             /* 12 different colors for the annonate view */
             table.annotate tr.bloc-0 {background: #FFFFBF;}
             table.annotate tr.bloc-1 {background: #EABFFF;}
             table.annotate tr.bloc-2 {background: #BFFFFF;}
             table.annotate tr.bloc-3 {background: #FFD9BF;}
             table.annotate tr.bloc-4 {background: #E6FFBF;}
             table.annotate tr.bloc-5 {background: #BFCFFF;}
             table.annotate tr.bloc-6 {background: #FFBFEF;}
             table.annotate tr.bloc-7 {background: #FFE6BF;}
             table.annotate tr.bloc-8 {background: #FFE680;}
             table.annotate tr.bloc-9 {background: #AA80FF;}
             table.annotate tr.bloc-10 {background: #FFBFDC;}
             table.annotate tr.bloc-11 {background: #BFE4FF;}
             table.annotate td.revision {
                 text-align: center;
                 width: 2%;
                 padding-left: 1em;
                 background: inherit;
             }
             table.annotate td.author {
                 text-align: center;
                 border-right: 1px solid #d7d7d7;
                 white-space: nowrap;
                 padding-left: 1em;
                 padding-right: 1em;
                 width: 3%;
                 background: inherit;
                 font-size: 90%;
             }
             table.annotate td.line-code { background-color: #fafafa; }
             div.action_M { background: #fd8 }
             div.action_D { background: #f88 }
             div.action_A { background: #bfb }
             /************* CodeRay styles *************/
             .syntaxhl div {display: inline;}
             .syntaxhl .line-numbers {
                 padding: 2px 4px 2px 4px; background-color: #eee; margin:0px 5px 0px 0px;
                 user-select: none;
                 -moz-user-select: none;
                 -o-user-select: none;
                 -ms-user-select: none;
                 -webkit-user-select: none;
             }
             .syntaxhl .code pre { overflow: auto }
-            .syntaxhl .debug { color:white ! important; background:blue ! important; }
+            .syntaxhl .debug { color: white !important; background: blue !important; }
-            .syntaxhl .attribute-name { color:#b48 }
             .syntaxhl .annotation { color:#007 }
+            .syntaxhl .attribute-name { color:#b48 }
             .syntaxhl .attribute-value { color:#700 }
             .syntaxhl .binary { color:#509 }
-            .syntaxhl .comment { color:#777 }
-            .syntaxhl .comment .char { color:#444 }
-            .syntaxhl .comment .delimiter { color:#444 }
-            .syntaxhl .char { color:#D20 }
             .syntaxhl .char .content { color:#D20 }
             .syntaxhl .char .delimiter { color:#710 }
+            .syntaxhl .char { color:#D20 }
             .syntaxhl .class { color:#B06; font-weight:bold }
+            .syntaxhl .class-variable { color:#369 }
+            .syntaxhl .color { color:#0A0 }
+            .syntaxhl .comment { color:#777 }
+            .syntaxhl .comment .char { color:#444 }
+            .syntaxhl .comment .delimiter { color:#444 }
             .syntaxhl .complex { color:#A08 }
             .syntaxhl .constant { color:#036; font-weight:bold }
-            .syntaxhl .color { color:#0A0 }
-            .syntaxhl .class-variable { color:#369 }
             .syntaxhl .decorator { color:#B0B }
             .syntaxhl .definition { color:#099; font-weight:bold }
-            .syntaxhl .directive { color:#088; font-weight:bold }
             .syntaxhl .delimiter { color:black }
+            .syntaxhl .directive { color:#088; font-weight:bold }
             .syntaxhl .doc { color:#970 }
-            .syntaxhl .doctype { color:#34b }
             .syntaxhl .doc-string { color:#D42; font-weight:bold }
-            .syntaxhl .escape  { color:#666 }
+            .syntaxhl .doctype { color:#34b }
             .syntaxhl .entity { color:#800; font-weight:bold }
             .syntaxhl .error { color:#F00; background-color:#FAA }
+            .syntaxhl .escape  { color:#666 }
             .syntaxhl .exception { color:#C00; font-weight:bold }
             .syntaxhl .float { color:#60E }
             .syntaxhl .function { color:#06B; font-weight:bold }
             .syntaxhl .global-variable { color:#d70 }
             .syntaxhl .hex { color:#02b }
-            .syntaxhl .integer  { color:#00D }
-            .syntaxhl .include { color:#B44; font-weight:bold }
             .syntaxhl .imaginary { color:#f00 }
+            .syntaxhl .include { color:#B44; font-weight:bold }
             .syntaxhl .inline { background-color: hsla(0,0%,0%,0.07); color: black }
             .syntaxhl .inline-delimiter { font-weight: bold; color: #666 }
             .syntaxhl .instance-variable { color:#33B }
+            .syntaxhl .integer  { color:#00D }
+            .syntaxhl .key .char { color: #60f }
+            .syntaxhl .key .delimiter { color: #404 }
+            .syntaxhl .key { color: #606 }
+            .syntaxhl .keyword { color:#080; font-weight:bold }
             .syntaxhl .label { color:#970; font-weight:bold }
             .syntaxhl .local-variable { color:#963 }
             .syntaxhl .namespace { color:#707; font-weight:bold }
             .syntaxhl .octal { color:#40E }
             .syntaxhl .operator { }
-            .syntaxhl .predefined-constant { color:#069 }
             .syntaxhl .predefined { color:#369; font-weight:bold }
+            .syntaxhl .predefined-constant { color:#069 }
             .syntaxhl .predefined-type { color:#0a5; font-weight:bold }
             .syntaxhl .preprocessor { color:#579 }
             .syntaxhl .pseudo-class { color:#00C; font-weight:bold }
-            .syntaxhl .reserved { color:#080; font-weight:bold }
-            .syntaxhl .key .char { color: #60f }
-            .syntaxhl .key .delimiter { color: #404 }
-            .syntaxhl .key { color: #606 }
-            .syntaxhl .keyword { color:#080; font-weight:bold }
-            .syntaxhl .regexp { background-color:hsla(300,100%,50%,0.06); }
             .syntaxhl .regexp .content { color:#808 }
             .syntaxhl .regexp .delimiter { color:#404 }
             .syntaxhl .regexp .modifier { color:#C2C }
+            .syntaxhl .regexp { background-color:hsla(300,100%,50%,0.06); }
-            .syntaxhl .string { background-color:hsla(0,100%,50%,0.05); }
+            .syntaxhl .reserved { color:#080; font-weight:bold }
-            .syntaxhl .string .content { color: #D20 }
+            .syntaxhl .shell .content { color:#2B2 }
+            .syntaxhl .shell .delimiter { color:#161 }
+            .syntaxhl .shell { background-color:hsla(120,100%,50%,0.06); }
             .syntaxhl .string .char { color: #b0b }
+            .syntaxhl .string .content { color: #D20 }
             .syntaxhl .string .delimiter { color: #710 }
             .syntaxhl .string .modifier { color: #E40 }
+            .syntaxhl .string { background-color:hsla(0,100%,50%,0.05); }
-            .syntaxhl .shell { background-color:hsla(120,100%,50%,0.06); }
-            .syntaxhl .shell .content { color:#2B2 }
-            .syntaxhl .shell .delimiter { color:#161 }
-            .syntaxhl .symbol { color:#A60 }
             .syntaxhl .symbol .content { color:#A60 }
             .syntaxhl .symbol .delimiter { color:#630 }
+            .syntaxhl .symbol { color:#A60 }
             .syntaxhl .tag { color:#070 }
             .syntaxhl .type { color:#339; font-weight:bold }
             .syntaxhl .value { color: #088; }
             .syntaxhl .variable  { color:#037 }
             .syntaxhl .insert { background: hsla(120,100%,50%,0.12) }
             .syntaxhl .delete { background: hsla(0,100%,50%,0.12) }
             .syntaxhl .change { color: #bbf; background: #007; }
             .syntaxhl .head { color: #f8f; background: #505 }
             .syntaxhl .head .filename { color: white; }
+            .syntaxhl .delete .eyecatcher { background-color: hsla(0,100%,50%,0.2); border: 1px solid hsla(0,100%,45%,0.5); margin: -1px; border-bottom: none; border-top-left-radius: 5px; border-top-right-radius: 5px; }
+            .syntaxhl .insert .eyecatcher { background-color: hsla(120,100%,50%,0.2); border: 1px solid hsla(120,100%,25%,0.5); margin: -1px; border-top: none; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; }
+            .syntaxhl .insert .insert { color: #0c0; background:transparent; font-weight:bold }
+            .syntaxhl .delete .delete { color: #c00; background:transparent; font-weight:bold }
+            .syntaxhl .change .change { color: #88f }
+            .syntaxhl .head .head { color: #f4f }

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