jro_apps/redmine Commit - r5119:bf58ad61e57a

Load scripts and css for wiki formatter toolbar when needed....

Jean-Philippe Lang -

r5119:bf58ad61e57a

parent child

Context file:

r5119:bf58ad61e57a

Collapse all files

app/views/layouts/base.rhtml 0 -1

             <!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>
             <meta http-equiv="content-type" content="text/html; charset=utf-8" />
             <title><%=h html_title %></title>
             <meta name="description" content="<%= Redmine::Info.app_name %>" />
             <meta name="keywords" content="issue,bug,tracker" />
             <%= csrf_meta_tag %>
             <%= favicon %>
             <%= stylesheet_link_tag 'application', :media => 'all' %>
             <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
             <%= javascript_heads %>
             <%= heads_for_theme %>
-            <%= heads_for_wiki_formatter %>
             <!--[if IE 6]>
                 <style type="text/css">
                   * html body{ width: expression( document.documentElement.clientWidth < 900 ? '900px' : '100%' ); }
                   body {behavior: url(<%= stylesheet_path "csshover.htc" %>);}
                 </style>
             <![endif]-->
             <%= call_hook :view_layouts_base_html_head %>
             <!-- page specific tags -->
             <%= yield :header_tags -%>
             </head>
             <body class="<%=h body_css_classes %>">
             <div id="wrapper">
             <div id="wrapper2">
             <div id="top-menu">
                 <div id="account">
                     <%= render_menu :account_menu -%>
                 </div>
                 <%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}", :id => 'loggedas') if User.current.logged? %>
                 <%= render_menu :top_menu if User.current.logged? || !Setting.login_required? -%>
             </div>
             <div id="header">
                 <% if User.current.logged? || !Setting.login_required? %>
                 <div id="quick-search">
                     <% form_tag({:controller => 'search', :action => 'index', :id => @project}, :method => :get ) do %>
                     <%= hidden_field_tag(controller.default_search_scope, 1, :id => nil) if controller.default_search_scope %>
                     <%= link_to l(:label_search), {:controller => 'search', :action => 'index', :id => @project}, :accesskey => accesskey(:search) %>:
                     <%= text_field_tag 'q', @question, :size => 20, :class => 'small', :accesskey => accesskey(:quick_search) %>
                     <% end %>
                     <%= render_project_jump_box %>
                 </div>
                 <% end %>
                 <h1><%= page_header_title %></h1>
                 <% if display_main_menu?(@project) %>
                 <div id="main-menu">
                     <%= render_main_menu(@project) %>
                 </div>
                 <% end %>
             </div>
             <%= tag('div', {:id => 'main', :class => (has_content?(:sidebar) ? '' : 'nosidebar')}, true) %>
                 <div id="sidebar">
                     <%= yield :sidebar %>
                     <%= call_hook :view_layouts_base_sidebar %>
                 </div>
                 <div id="content">
             				<%= render_flash_messages %>
                     <%= yield %>
                     <%= call_hook :view_layouts_base_content %>
             				<div style="clear:both;"></div>
                 </div>
             </div>
             <div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
             <div id="footer">
               <div class="bgl"><div class="bgr">
                 Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2006-2011 Jean-Philippe Lang
               </div></div>
             </div>
             </div>
             </div>
             <%= call_hook :view_layouts_base_body_bottom %>
             </body>
             </html>

lib/redmine/wiki_formatting/textile/helper.rb +10 -5

             # Redmine - project management software
             # Copyright (C) 2006-2008  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 WikiFormatting
                 module Textile
                   module Helper
                     def wikitoolbar_for(field_id)
+                      heads_for_wiki_formatter
                       # Is there a simple way to link to a public resource?
                       url = "#{Redmine::Utils.relative_url_root}/help/wiki_syntax.html"
                       help_link = l(:setting_text_formatting) + ': ' +
                         link_to(l(:label_help), url,
                                 :onclick => "window.open(\"#{ url }\", \"\", \"resizable=yes, location=no, width=300, height=640, menubar=no, status=no, scrollbars=yes\"); return false;")
                       javascript_tag("var wikiToolbar = new jsToolBar($('#{field_id}')); wikiToolbar.setHelpLink('#{help_link}'); wikiToolbar.draw();")
                     end
                     def initial_page_content(page)
                       "h1. #{@page.pretty_title}"
                     end
                     def heads_for_wiki_formatter
-                      @@heads_for_wiki_formatter ||=
+                      unless @heads_for_wiki_formatter_included
-                        javascript_include_tag('jstoolbar/jstoolbar') +
+                        content_for :header_tags do
-                        javascript_include_tag('jstoolbar/textile') +
+                          javascript_include_tag('jstoolbar/jstoolbar') +
-                        javascript_include_tag("jstoolbar/lang/jstoolbar-#{current_language.to_s.downcase}") +
+                          javascript_include_tag('jstoolbar/textile') +
-                        stylesheet_link_tag('jstoolbar')
+                          javascript_include_tag("jstoolbar/lang/jstoolbar-#{current_language.to_s.downcase}") +
+                          stylesheet_link_tag('jstoolbar')
+                        end
+                        @heads_for_wiki_formatter_included = true
+                      end
                     end
                   end
                 end
               end
             end

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