jro_apps/redmine Commit - r5121:f7edfe7652a3

Prettier wiki syntax help link....

Jean-Philippe Lang -

r5121:f7edfe7652a3

parent child

Context file:

r5121:f7edfe7652a3

Collapse all files

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

             # Redmine - project management software
-            # Copyright (C) 2006-2008  Jean-Philippe Lang
+            # 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 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 = link_to(l(:setting_text_formatting), url,
-                      help_link = l(:setting_text_formatting) + ': ' +
+                        :onclick => "window.open(\"#{ url }\", \"\", \"resizable=yes, location=no, width=300, height=640, menubar=no, status=no, scrollbars=yes\"); return false;")
-                        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
                       unless @heads_for_wiki_formatter_included
                         content_for :header_tags do
                           javascript_include_tag('jstoolbar/jstoolbar') +
                           javascript_include_tag('jstoolbar/textile') +
                           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

public/stylesheets/jstoolbar.css +2 -1

             .jstEditor {
             	padding-left: 0px;
             }
             .jstEditor textarea, .jstEditor iframe {
               margin: 0;
             }
             .jstHandle {
             	height: 10px;
             	font-size: 0.1em;
             	cursor: s-resize;
             	/*background: transparent url(img/resizer.png) no-repeat 45% 50%;*/
             }
             .jstElements {
             	padding: 3px 3px;
             }
             .jstElements button {
             	margin-right : 6px;
             	width : 24px;
             	height: 24px;
             	padding: 4px;
             	border-style: solid;
             	border-width: 1px;
             	border-color: #ddd;
             	background-color : #f7f7f7;
             	background-position : 50% 50%;
             	background-repeat: no-repeat;
             }
             .jstElements button:hover {
             	border-color : #000;
             }
             .jstElements button span {
             	display : none;
             }
             .jstElements span {
             	display : inline;
             }
             .jstSpacer {
             	width : 0px;
             	font-size: 1px;
             	margin-right: 4px;
             }
-            .jstElements .help { float: right; margin-right: 1em; padding-top: 8px; font-size: 0.9em; }
+            .jstElements .help { float: right; margin-right: 0.5em; padding-top: 8px; font-size: 0.9em; }
+            .jstElements .help a {padding: 2px 0 2px 20px; background: url(../images/help.png) no-repeat 0 50%;}
             /* Buttons
             -------------------------------------------------------- */
             .jstb_strong {
             	background-image: url(../images/jstoolbar/bt_strong.png);
             }
             .jstb_em {
             	background-image: url(../images/jstoolbar/bt_em.png);
             }
             .jstb_ins {
             	background-image: url(../images/jstoolbar/bt_ins.png);
             }
             .jstb_del {
             	background-image: url(../images/jstoolbar/bt_del.png);
             }
             .jstb_code {
             	background-image: url(../images/jstoolbar/bt_code.png);
             }
             .jstb_h1 {
             	background-image: url(../images/jstoolbar/bt_h1.png);
             }
             .jstb_h2 {
             	background-image: url(../images/jstoolbar/bt_h2.png);
             }
             .jstb_h3 {
             	background-image: url(../images/jstoolbar/bt_h3.png);
             }
             .jstb_ul {
             	background-image: url(../images/jstoolbar/bt_ul.png);
             }
             .jstb_ol {
             	background-image: url(../images/jstoolbar/bt_ol.png);
             }
             .jstb_bq {
             	background-image: url(../images/jstoolbar/bt_bq.png);
             }
             .jstb_unbq {
             	background-image: url(../images/jstoolbar/bt_bq_remove.png);
             }
             .jstb_pre {
             	background-image: url(../images/jstoolbar/bt_pre.png);
             }
             .jstb_link {
             	background-image: url(../images/jstoolbar/bt_link.png);
             }
             .jstb_img {
             	background-image: url(../images/jstoolbar/bt_img.png);
             }

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