changeset 1314:033fecbc3438 redmine-2.2-integration

Merge

--- a/plugins/redmine_checkout/app/views/redmine_checkout_hooks/_view_repositories_show_contextual.html.erb	Tue Jun 18 14:59:04 2013 +0100
+++ b/plugins/redmine_checkout/app/views/redmine_checkout_hooks/_view_repositories_show_contextual.html.erb	Tue Jun 18 15:02:44 2013 +0100
@@ -16,9 +16,9 @@
     <p>
     <% if User.current.logged? %>
       <% if repository.is_external? %>
-      <%=l :label_access_type_all, :type => l(:label_access_read_only) %>
+      <%= (l :label_access_type_all, :type => l(:label_access_read_only)).html_safe %>
       <% else %>
-      <% if default_protocol %><%=l :label_access_type, :type => l(default_protocol.access_label(User.current)) %><% end %>
+      <% if default_protocol %><%= (l :label_access_type, :type => l(default_protocol.access_label(User.current))).html_safe %><% end %>
       <% end %>
     <% else %>
       &nbsp;
@@ -35,7 +35,7 @@
   <% if repository.is_external? %>
     <div style="clear: left">
     </div>
-    <p class="topline" style="padding-top: 1em"><%= l(:text_repository_external, :location => repository.external_url) %></p>
+    <p class="topline" style="padding-top: 1em"><%= (l(:text_repository_external, :location => repository.external_url)).html_safe %></p>
   <% end %>
 </div>
 <div style="clear: left"></div>

--- a/plugins/redmine_checkout/config/locales/en.yml	Tue Jun 18 14:59:04 2013 +0100
+++ b/plugins/redmine_checkout/config/locales/en.yml	Tue Jun 18 15:02:44 2013 +0100
@@ -16,8 +16,8 @@
   label_protocol_plural: "Protocols"
   button_add_protocol: "Add Protocol"
 
-  label_access_type: 'You have <span id="checkout_access">{{type}}</span> access to this URL.'
-  label_access_type_all: 'All access to this URL is <span id="checkout_access">{{type}}</span>.'
+  label_access_type: 'You have <span id="checkout_access">%{type}</span> access to this URL.'
+  label_access_type_all: 'All access to this URL is <span id="checkout_access">%{type}</span>.'
   label_access_read_only: 'Read Only'
   label_access_read_write: "Read and Write"
   label_access_permission: "Depending on user's permissions"
@@ -36,8 +36,8 @@
     supports back-references to braced expressions using the \1 notation.
   help_repository_checkout_protocols: |
     Leave the Checkout URL field empty to use the defined repository URL.
-  help_moved_settings: "The settings page has been moved to {{link}}."
+  help_moved_settings: "The settings page has been moved to %{link}."
   label_settings_location: "Administration -> Settings -> Checkout"
 
-  text_repository_external: "The primary repository for this project is hosted at <code>{{location}}</code> .<br>This repository is a read-only copy which is updated automatically every hour."
+  text_repository_external: "The primary repository for this project is hosted at <code>%{location}</code> .<br>This repository is a read-only copy which is updated automatically every hour."
 

--- a/plugins/redmine_tags/app/helpers/tags_helper.rb	Tue Jun 18 14:59:04 2013 +0100
+++ b/plugins/redmine_tags/app/helpers/tags_helper.rb	Tue Jun 18 15:02:44 2013 +0100
@@ -91,7 +91,7 @@
 
       content = content.html_safe
       tag_cloud tags, (1..8).to_a do |tag, weight|
-        content << " ".html_safe + content_tag(item_el, render_tag_link(tag, options), :class => "tag-nube-#{weight}") + " ".html_safe
+        content << " ".html_safe + content_tag(item_el, render_project_tag_link(tag, options), :class => "tag-nube-#{weight}") + " ".html_safe
       end
 
       content_tag(list_el, content, :class => 'tags')

--- a/public/stylesheets/scm.css	Tue Jun 18 14:59:04 2013 +0100
+++ b/public/stylesheets/scm.css	Tue Jun 18 15:02:44 2013 +0100
@@ -35,7 +35,7 @@
 #changes-legend li { float: left; background-position: 5px 0; }
 
 table.filecontent { border: 1px solid #e2e2e2;  border-collapse: collapse; width:98%; background-color: #fafafa; }
-table.filecontent tbody {font-family:"Liberation Mono", Courier, monospace; font-size:12px;}
+table.filecontent tbody {font-family:"SourceCodePro-Regular","Liberation Mono", Courier, monospace; font-size:12px;}
 table.filecontent th { border: 1px solid #e2e2e2; background-color: #eee; }
 table.filecontent th.filename { background-color: #e4e4d4; text-align: left; padding:5px;}
 table.filecontent tr.spacing th { text-align:center; }
@@ -61,7 +61,7 @@
 table.filecontent td.line-code pre {
     margin: 0px;
     white-space: pre-wrap;
-    font-family:"Liberation Mono", Courier, monospace; font-size:12px;
+    font-family:"SourceCodePro-Regular","Liberation Mono", Courier, monospace; font-size:12px;
 }
 
 /* 12 different colors for the annonate view */

--- a/public/themes/soundsoftware/stylesheets/fonts-generic.css	Tue Jun 18 14:59:04 2013 +0100
+++ b/public/themes/soundsoftware/stylesheets/fonts-generic.css	Tue Jun 18 15:02:44 2013 +0100
@@ -1,4 +1,4 @@
-@import url(fonts.css?2);
+@import url(fonts.css?3);
 
 h1, #project-ancestors-title, #top-menu a {
   font-family: Insider, 'Gill Sans', Tahoma, sans-serif;
@@ -22,3 +22,10 @@
   line-height: 1.34;
 }
 
+code,pre,.code,.line-code,.embedded a.el {
+  font-family: 'SourceCodePro-Regular', monospace;
+  font-weight: normal;
+  font-size: 0.9em;
+}
+
+

--- a/public/themes/soundsoftware/stylesheets/fonts-mac.css	Tue Jun 18 14:59:04 2013 +0100
+++ b/public/themes/soundsoftware/stylesheets/fonts-mac.css	Tue Jun 18 15:02:44 2013 +0100
@@ -1,4 +1,4 @@
-@import url(fonts.css?2);
+@import url(fonts.css?3);
 
 h1, #project-ancestors-title, #top-menu a {
   font-family: Insider, "Lucida Grande", sans-serif;
@@ -22,3 +22,9 @@
   line-height: 1.34;
 }
 
+code,pre,.code,.line-code,.embedded a.el {
+  font-family: 'SourceCodePro-Regular', monospace;
+  font-weight: normal;
+  font-size: 0.9em;
+}
+

--- a/public/themes/soundsoftware/stylesheets/fonts-ms.css	Tue Jun 18 14:59:04 2013 +0100
+++ b/public/themes/soundsoftware/stylesheets/fonts-ms.css	Tue Jun 18 15:02:44 2013 +0100
@@ -1,4 +1,4 @@
-@import url(fonts.css?2);
+@import url(fonts.css?3);
 
 /* IE likes us to separate out normal & bold into different fonts
    rather than use the selectors on the same font */
@@ -24,3 +24,10 @@
   font-weight: normal;
   line-height: 1.34;
 }
+
+code,pre,.code,.line-code,.embedded a.el {
+  font-family: 'SourceCodePro-Regular', monospace;
+  font-weight: normal;
+  font-size: 0.9em;
+}
+

--- a/public/themes/soundsoftware/stylesheets/fonts.css	Tue Jun 18 14:59:04 2013 +0100
+++ b/public/themes/soundsoftware/stylesheets/fonts.css	Tue Jun 18 15:02:44 2013 +0100
@@ -30,3 +30,11 @@
     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: 'SourceCodePro-Regular';
+    font-weight: normal;
+    font-style: normal;
+    src: url('fonts/SourceCodePro-Regular-webfont.eot');
+    src: url('fonts/SourceCodePro-Regular-webfont.eot?#iefix') format('embedded-opentype'), url('fonts/SourceCodePro-Regular-webfont.woff') format('woff'), url('fonts/SourceCodePro-Regular-webfont.ttf') format('truetype');
+}