Permalink
Browse files

Get help modal working under straight theme

  • Loading branch information...
markhop committed Jan 29, 2014
1 parent 9df5076 commit 9438afa5e0aa3b2263ca38672bf1368ad4ae637a
@@ -20,7 +20,7 @@
<link rel="stylesheet" type="text/css" href="/files/fitnesse/css/fitnesse_pages.css" />
<link rel="stylesheet" type="text/css" href="/files/fitnesse/wysiwyg/wysiwyg.css" media="screen"/>
<link rel="stylesheet" type="text/css" href="/files/fitnesse/bootstrap/css/fitnesse-bootstrap.css">
- <link rel="stylesheet" type="text/css" href="/files/fitnesse/questionmark/question.mark.css" />
+ <link rel="stylesheet" type="text/css" href="/files/fitnesse/question.mark/question.mark.css" />
<link rel="wysiwyg.base" href="/" />
<link rel="wysiwyg.stylesheet" type="text/css" href="/files/fitnesse/css/fitnesse.css" media="screen" />
@@ -32,6 +32,8 @@
<script src="/files/fitnesse/bootstrap/js/bootstrap.js" type="text/javascript"></script>
+ <script src="/files/fitnesse/javascript/mousetrap.min.js" type="text/javascript"></script>
+ <script src="/files/fitnesse/question.mark/question.mark.js" type="text/javascript"></script>
</head>
<body#if( $bodyClass ) class="$bodyClass"#end>
@@ -121,7 +121,7 @@
}
.help-key {
- min-width: 120px;
+ min-width: 60px;
float: left;
clear: left;
position: relative;
@@ -8,10 +8,10 @@
https://gist.github.com/jonathantneal/2415137
(included in the repo as attachevent.js).
Doesn't work in IE6/7, but feel free to fork and fix.
- Included and adjusted for FitNesse bt Mark Hopkins.
+ Included and adjusted for FitNesse by Mark Hopkins.
*/
-(function() {
+$(function() {
'use strict';
@@ -19,13 +19,16 @@
<link rel="stylesheet" type="text/css" href="/files/fitnesse/css/fitnesse_pages.css" />
<link rel="stylesheet" type="text/css" href="/files/fitnesse/css/${theme}.css" />
<link rel="stylesheet" type="text/css" href="/files/fitnesse/wysiwyg/wysiwyg.css" media="screen"/>
+ <link rel="stylesheet" type="text/css" href="/files/fitnesse/question.mark/question.mark.css" />
<link rel="wysiwyg.base" href="/" />
<link rel="wysiwyg.stylesheet" type="text/css" href="/files/fitnesse/css/fitnesse.css" media="screen" />
<link rel="wysiwyg.stylesheet" type="text/css" href="/files/fitnesse/wysiwyg/editor.css" media="screen" />
<link rel="shortcut icon" type="image/x-icon" href="/files/fitnesse/images/favicon.ico" />
<script src="/files/fitnesse/javascript/jquery-1.7.2.min.js" type="text/javascript"></script>
<script src="/files/fitnesse/javascript/fitnesse.js" type="text/javascript"></script>
<script src="/files/fitnesse/javascript/${theme}.js" type="text/javascript"></script>
+ <script src="/files/fitnesse/javascript/mousetrap.min.js" type="text/javascript"></script>
+ <script src="/files/fitnesse/question.mark/question.mark.js" type="text/javascript"></script>
</head>
<body#if( $bodyClass ) class="$bodyClass"#end>
@@ -1,39 +1 @@
-$footerContent.render()
-
-<script src="/files/fitnesse/javascript/mousetrap.min.js"></script>
-<script src="/files/fitnesse/question.mark/question.mark.js"></script>
-
-<script>
-
- #set( $localPath = $actions.localPageName )
-
- #if( $actions.testPage )
- Mousetrap.bind('t', function() { window.location.href ="$localPath?test"; });
- #end
- #if( $actions.withEdit && !$actions.imported)
- Mousetrap.bind('e', function() { window.location.href ="$localPath?edit"; });
- #end
- #if( $actions.withEdit)
- Mousetrap.bind('a', function() { window.location.href ="$localPath?new"; });
- #end
- #if( $actions.withProperties )
- Mousetrap.bind('p', function() { window.location.href ="$localPath?properties"; });
- #end
- #if( $actions.withWhereUsed )
- Mousetrap.bind('w', function() { window.location.href ="$localPath?whereUsed"; });
- #end
- #if( $actions.withVersions )
- Mousetrap.bind('v', function() { window.location.href ="$localPath?versions"; });
- #end
- #if( $actions.withSearch )
- Mousetrap.bind('s', function() { window.location.href ="$localPath?searchForm"; });
- Mousetrap.bind('/', function() {
- document.getElementById('searchString').focus();
- return false; // stops the / character appearing in search box
- });
- #end
- #if( $actions.withUserGuide )
- Mousetrap.bind('g u', function() { window.location.href =".FitNesse.UserGuide"; });
- #end
-
-</script>
+$footerContent.render()
@@ -1 +1,36 @@
-$content.render()
+$content.render()
+
+<script type="text/javascript">
+
+ #set( $localPath = $actions.localPageName )
+
+ #if( $actions.testPage )
+ Mousetrap.bind('t', function() { window.location.href ="$localPath?test"; });
+ #end
+ #if( $actions.withEdit && !$actions.imported)
+ Mousetrap.bind('e', function() { window.location.href ="$localPath?edit"; });
+ #end
+ #if( $actions.withEdit)
+ Mousetrap.bind('a', function() { window.location.href ="$localPath?new"; });
+ #end
+ #if( $actions.withProperties )
+ Mousetrap.bind('p', function() { window.location.href ="$localPath?properties"; });
+ #end
+ #if( $actions.withWhereUsed )
+ Mousetrap.bind('w', function() { window.location.href ="$localPath?whereUsed"; });
+ #end
+ #if( $actions.withVersions )
+ Mousetrap.bind('v', function() { window.location.href ="$localPath?versions"; });
+ #end
+ #if( $actions.withSearch )
+ Mousetrap.bind('s', function() { window.location.href ="$localPath?searchForm"; });
+ Mousetrap.bind('/', function() {
+ document.getElementById('searchString').focus();
+ return false; // stops the / character appearing in search box
+ });
+ #end
+ #if( $actions.withUserGuide )
+ Mousetrap.bind('g u', function() { window.location.href =".FitNesse.UserGuide"; });
+ #end
+
+</script>

0 comments on commit 9438afa

Please sign in to comment.