Skip to content

Commit

Permalink
Merge remote branch 'github/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@mcr
mcr committed Jan 31, 2011
2 parents 89c6b8e + d7265fc commit aca772e
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion Rakefile
View file
Expand Up @@ -4,7 +4,7 @@ require 'redmine_plugin_support'
Dir[File.expand_path(File.dirname(__FILE__)) + "/lib/tasks/**/*.rake"].sort.each { |ext| load ext }

RedminePluginSupport::Base.setup do |plugin|
plugin.project_name = 'redmine_clf2'
plugin.project_name = 'redmine-franglish'
plugin.default_task = [:test]
plugin.tasks = [:doc, :release, :clean, :test]
# TODO: gem not getting this automaticly
Expand Down
6 changes: 3 additions & 3 deletions app/views/layouts/_clf2_header_eng.html.erb
View file
@@ -1,11 +1,11 @@
<!-- FIP HEADER BEGINS | DEBUT DE L'EN-TETE PCIM -->
<div class="fip"><a name="tphp" id="tphp"><%= image_tag 'sig-eng.gif', :plugin => 'redmine_clf2', :width => '372', :height => '20', :alt => "Government of Canada" %></a></div>
<div class="cwm"><%= image_tag 'symbol.png', :plugin => 'redmine_clf2', :width => "83", :height=>"20", :alt=>"Symbol of the FRANGLISHPLUGIN" %></div>
<div class="fip"><a name="tphp" id="tphp"><%= image_tag 'sig-eng.gif', :plugin => 'redmine-franglish', :width => '372', :height => '20', :alt => "Government of Canada" %></a></div>
<div class="cwm"><%= image_tag 'symbol.png', :plugin => 'redmine-franglish', :width => "83", :height=>"20", :alt=>"Symbol of the FRANGLISHPLUGIN" %></div>
<!-- FIP HEADER ENDS | FIN DE L'EN-TETE PCIM -->

<!-- INSTITUTIONAL BANNER STARTS | DEBUT DE LA BANNIERE INSTITUTIONNELLE -->
<div class="banner">
<%= image_tag 'logo.png', :plugin => 'redmine_clf2', :class=>"lf pngfix" %>
<%= image_tag 'logo.png', :plugin => 'redmine-franglish', :class=>"lf pngfix" %>
<p class="main">FRANGLISH INSTANCE</p>
<p class="siteuri">FRANGLISHPLUGIN INSTANCE LONGER NAME</p>
<p class="siteuri">ENGLISH SITE URL</p>
Expand Down
4 changes: 2 additions & 2 deletions app/views/layouts/_clf2_header_fra.html.erb
View file
@@ -1,11 +1,11 @@
<!-- DEBUT DE L'EN-TETE PCIM | FIP HEADER BEGINS -->
<div class="fip"><a name="tphp" id="tphp"><%= image_tag 'sig-eng.gif', :plugin => 'redmine_clf2', :width => '372', :height => '20', :alt => "FRANGLISHPLUGIN ORG" %></a></div>
<div class="fip"><a name="tphp" id="tphp"><%= image_tag 'sig-eng.gif', :plugin => 'redmine-franglish', :width => '372', :height => '20', :alt => "FRANGLISHPLUGIN ORG" %></a></div>
<div class="cwm"><img src="/assets/images/symbol.png" width="83" height="20" alt="Symbole du FRANGLISHPLUGIN" /></div>
<!-- FIN DE L'EN-TETE PCIM | FIP HEADER ENDS -->

<!-- DEBUT DE LA BANNIERE INSTITUTIONNELLE | INSTITUTIONAL BANNER STARTS -->
<div class="banner">
<%= image_tag 'logo.png', :plugin => 'redmine_clf2', :class=>"lf pngfix" %>
<%= image_tag 'logo.png', :plugin => 'redmine-franglish', :class=>"lf pngfix" %>
<p class="main">FRANGLISHPLUGIN INSTANCE</p>
<p class="siteuri">FRANGLISHPLUGIN INSTANCE LONGER NAME</p>
<p class="siteuri">FRENCH SITE URL</p>
Expand Down
12 changes: 6 additions & 6 deletions app/views/layouts/_clf2_titlemetacss_eng.html.erb
View file
Expand Up @@ -23,9 +23,9 @@
<!-- META DATA ENDS | FIN DES META DONNEES -->

<!-- TEMPLATE SCRIPTS/CSS BEGIN | DEBUT DES SCRIPTS/CSS DU GABARIT -->
<%= stylesheet_link_tag 'base', :plugin => 'redmine_clf2', :media => 'screen,print' %>
<%= stylesheet_link_tag '3col', :plugin => 'redmine_clf2', :media => 'screen,print' %>
<%= stylesheet_link_tag 'base2', :plugin => 'redmine_clf2', :media => 'all' %>
<%= stylesheet_link_tag 'base', :plugin => 'redmine-franglish', :media => 'screen,print' %>
<%= stylesheet_link_tag '3col', :plugin => 'redmine-franglish', :media => 'screen,print' %>
<%= stylesheet_link_tag 'base2', :plugin => 'redmine-franglish', :media => 'all' %>
<!-- TEMPLATE SCRIPTS/CSS END | FIN DES SCRIPTS/CSS DU GABARIT -->

<!-- PROGRESSIVE ENHANCEMENT BEGINS | DEBUT DE L'AMELIORATION PROGRESSIVE -->
Expand All @@ -42,10 +42,10 @@
<!-- PROGRESSIVE ENHANCEMENT ENDS | FIN DE L'AMELIORATION PROGRESSIVE -->

<!-- CUSTOM SCRIPTS/CSS BEGIN | DEBUT DES SCRIPTS/CSS PERSONNALISES -->
<%= stylesheet_link_tag 'base-institution', :plugin => 'redmine_clf2', :media => 'screen,print' %>
<%= stylesheet_link_tag 'institution', :plugin => 'redmine_clf2', :media => 'screen,print' %>
<%= stylesheet_link_tag 'base-institution', :plugin => 'redmine-franglish', :media => 'screen,print' %>
<%= stylesheet_link_tag 'institution', :plugin => 'redmine-franglish', :media => 'screen,print' %>
<!-- CUSTOM SCRIPTS/CSS END | FIN DES SCRIPTS/CSS PERSONNALISES -->

<!-- TEMPLATE PRINT CSS BEGINS | DEBUT DU CSS DU GABARIT POUR L'IMPRESSION -->
<%= stylesheet_link_tag 'pf-if', :plugin => 'redmine_clf2', :media => 'screen,print' %>
<%= stylesheet_link_tag 'pf-if', :plugin => 'redmine-franglish', :media => 'screen,print' %>
<!-- TEMPLATE PRINT CSS ENDS | FIN DU CSS DU GABARIT POUR L'IMPRESSION -->
12 changes: 6 additions & 6 deletions app/views/layouts/_clf2_titlemetacss_fra.html.erb
View file
Expand Up @@ -23,9 +23,9 @@
<!-- FIN DES METADONNEES | METADATA ENDS -->

<!-- DEBUT DES SCRIPTS/CSS DU GABARIT | TEMPLATE SCRIPTS/CSS BEGIN -->
<%= stylesheet_link_tag 'base', :plugin => 'redmine_clf2', :media => 'screen,print' %>
<%= stylesheet_link_tag '3col', :plugin => 'redmine_clf2', :media => 'screen,print' %>
<%= stylesheet_link_tag 'base2', :plugin => 'redmine_clf2', :media => 'all' %>
<%= stylesheet_link_tag 'base', :plugin => 'redmine-franglish', :media => 'screen,print' %>
<%= stylesheet_link_tag '3col', :plugin => 'redmine-franglish', :media => 'screen,print' %>
<%= stylesheet_link_tag 'base2', :plugin => 'redmine-franglish', :media => 'all' %>
<!-- FIN DES SCRIPTS/CSS DU GABARIT | TEMPLATE SCRIPTS/CSS END -->

<!-- DEBUT DE L'AMELIORATION PROGRESSIVE | PROGRESSIVE ENHANCEMENT BEGINS -->
Expand All @@ -42,10 +42,10 @@
<!-- FIN DE L'AMELIORATION PROGRESSIVE | PROGRESSIVE ENHANCEMENT ENDS -->

<!-- DEBUT DES SCRIPTS/CSS PERSONNALISES | CUSTOM SCRIPTS/CSS BEGIN -->
<%= stylesheet_link_tag 'base-institution', :plugin => 'redmine_clf2', :media => 'screen,print' %>
<%= stylesheet_link_tag 'institution', :plugin => 'redmine_clf2', :media => 'screen,print' %>
<%= stylesheet_link_tag 'base-institution', :plugin => 'redmine-franglish', :media => 'screen,print' %>
<%= stylesheet_link_tag 'institution', :plugin => 'redmine-franglish', :media => 'screen,print' %>
<!-- FIN DES SCRIPTS/CSS PERSONNALISES | CUSTOM SCRIPTS/CSS END -->

<!-- DEBUT DU CSS DU GABARIT POUR L'IMPRESSION | TEMPLATE PRINT CSS BEGINS -->
<%= stylesheet_link_tag 'pf-if', :plugin => 'redmine_clf2', :media => 'screen,print' %>
<%= stylesheet_link_tag 'pf-if', :plugin => 'redmine-franglish', :media => 'screen,print' %>
<!-- FIN DU CSS DU GABARIT POUR L'IMPRESSION | TEMPLATE PRINT CSS ENDS -->
26 changes: 13 additions & 13 deletions app/views/layouts/base.rhtml
View file
Expand Up @@ -3,9 +3,9 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="<%= current_language() %>" xml:lang="<%= current_language() %>">

<head>
<%= render :partial => 'layouts/clf2_titlemetacss_eng', :plugin => 'redmine_clf2' unless current_language() == :fr %>
<%= render :partial => 'layouts/clf2_titlemetacss_fra', :plugin => 'redmine_clf2' if current_language() == :fr %>
<%= stylesheet_link_tag 'application', :plugin => 'redmine_clf2', :media => 'all' %>
<%= render :partial => 'layouts/clf2_titlemetacss_eng', :plugin => 'redmine-franglish' unless current_language() == :fr %>
<%= render :partial => 'layouts/clf2_titlemetacss_fra', :plugin => 'redmine-franglish' if current_language() == :fr %>
<%= stylesheet_link_tag 'application', :plugin => 'redmine-franglish', :media => 'all' %>
<%= javascript_include_tag :defaults %>
<%= heads_for_wiki_formatter %>
Expand All @@ -15,23 +15,23 @@
</head><body>
<div class="page"><div class="core">
<% if current_language() == :fr %>
<%= render :partial => 'layouts/clf2_header_fra', :plugin => 'redmine_clf2' %>
<%= render :partial => 'layouts/clf2_header_fra', :plugin => 'redmine-franglish' %>

<div class="colLayout"><div class="innerLayout">
<%= render :partial => 'layouts/clf2_leftmenu_fra', :plugin => 'redmine_clf2' %>
<%= render :partial => 'layouts/clf2_leftmenu_fra', :plugin => 'redmine-franglish' %>
<%= render :partial => 'layouts/clf2_rightmenu_fra', :plugin => 'redmine_clf2' %>
<%= render :partial => 'layouts/clf2_rightmenu_fra', :plugin => 'redmine-franglish' %>
<%= render :partial => 'layouts/clf2_contentstart_fra', :plugin => 'redmine_clf2' %>
<%= render :partial => 'layouts/clf2_contentstart_fra', :plugin => 'redmine-franglish' %>
<% else %>
<%= render :partial => 'layouts/clf2_header_eng', :plugin => 'redmine_clf2' %>
<%= render :partial => 'layouts/clf2_header_eng', :plugin => 'redmine-franglish' %>

<div class="colLayout"><div class="innerLayout">
<%= render :partial => 'layouts/clf2_leftmenu_eng', :plugin => 'redmine_clf2' %>
<%= render :partial => 'layouts/clf2_leftmenu_eng', :plugin => 'redmine-franglish' %>
<%= render :partial => 'layouts/clf2_rightmenu_eng', :plugin => 'redmine_clf2' %>
<%= render :partial => 'layouts/clf2_rightmenu_eng', :plugin => 'redmine-franglish' %>
<%= render :partial => 'layouts/clf2_contentstart_eng', :plugin => 'redmine_clf2' %>
<%= render :partial => 'layouts/clf2_contentstart_eng', :plugin => 'redmine-franglish' %>
<% end %>

<div id="content">
Expand All @@ -43,8 +43,8 @@
<div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
<%= call_hook :view_layouts_base_body_bottom %>
<%= render :partial => 'layouts/clf2_footer_eng', :plugin => 'redmine_clf2' unless current_language() == :fr %>
<%= render :partial => 'layouts/clf2_footer_fra', :plugin => 'redmine_clf2' if current_language() == :fr %>
<%= render :partial => 'layouts/clf2_footer_eng', :plugin => 'redmine-franglish' unless current_language() == :fr %>
<%= render :partial => 'layouts/clf2_footer_fra', :plugin => 'redmine-franglish' if current_language() == :fr %>
</div></div>
</div></div>
</body>
Expand Down
2 changes: 1 addition & 1 deletion lib/clf2_application_controller_patch.rb
View file
Expand Up @@ -71,7 +71,7 @@ def filter_already_added?(filter)
# to language mapping. In development mode this will be
# reloaded with each request but in production, it will be cached.
def load_clf2_subdomains_file
domain_file = File.join(Rails.plugins['redmine_clf2'].directory,'config','clf2_subdomains.yml')
domain_file = File.join(Rails.plugins['redmine-franglish'].directory,'config','clf2_subdomains.yml')
if File.exists?(domain_file)
self.clf2_subdomain_languages = YAML::load(File.read(domain_file))
logger.debug "Loaded CLF2 subdomain file"
Expand Down

0 comments on commit aca772e

Please sign in to comment.