From 1736e9ca46174aba70b05da1e220e07310474f29 Mon Sep 17 00:00:00 2001
From: Johannes Ranke <jranke@uni-bremen.de>
Date: Fri, 6 Nov 2015 18:30:05 +0100
Subject: Provide links in the manual viewer instead of the manual
---
inst/GUI/gmkin.R | 25 +++----------------------
inst/GUI/gmkin_manual.html | 6 ------
inst/GUI/manual.html | 10 ++++++++++
3 files changed, 13 insertions(+), 28 deletions(-)
delete mode 100644 inst/GUI/gmkin_manual.html
create mode 100644 inst/GUI/manual.html
diff --git a/inst/GUI/gmkin.R b/inst/GUI/gmkin.R
index 7a91aef..6001ddc 100644
--- a/inst/GUI/gmkin.R
+++ b/inst/GUI/gmkin.R
@@ -1294,35 +1294,16 @@ plot.ftmp.savebutton <- gbutton("Save plot", cont = plot.ftmp.saveline,
plot.space <- ggroup(cont = plot.gg, horizontal = FALSE, height = 18)
plot.confint.gi <- gimage(NA, container = plot.gg, width = 400, height = 400)
# Manual {{{2
-gmkin_manual <- readLines(system.file("GUI/gmkin_manual.html", package = "gmkin"))
-gmb_start <- grep("<body>", gmkin_manual)
-gmb_end <- grep("</body>", gmkin_manual)
-gmkin_manual_body <- gmkin_manual[gmb_start:gmb_end]
+manual_html <- readLines(system.file("GUI/manual.html", package = "gmkin"))
-manual.gh <- ghtml(label = "Manual", paste0("<div class = 'manual' style = 'margin: 20px'>
+manual.gh <- ghtml(label = "Manuals", paste0("<div class = 'manual' style = 'margin: 20px'>
<style>
.manual h1{
font-size: 14px;
line-height: 20px;
}
-.manual h2{
- font-size: 14px;
- line-height: 20px;
-}
-.manual h3{
- font-size: 12px;
- line-height: 18px;
-}
-.manual ul{
- font-size: 12px;
- line-height: 12px;
-}
-.manual li{
- font-size: 12px;
- line-height: 12px;
-}
</style>
-", paste(gmkin_manual_body, collapse = '\n'), "
+", paste(manual_html, collapse = '\n'), "
</div>"), width = 460, cont = right)
# Changes {{{2
diff --git a/inst/GUI/gmkin_manual.html b/inst/GUI/gmkin_manual.html
deleted file mode 100644
index 10e0bf2..0000000
--- a/inst/GUI/gmkin_manual.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<div id="header">
-<h1 class="title">Manual for gmkin</h1>
-</div>
-<p>For system requirements and installation instructions, please refer to the <a href="http://kinfit.r-forge.r-project.org/gmkin_static" target = "gmkin_homepage">gmkin homepage</a>.</p>
-
-<p>The manual can be viewed online: <a href="http://kinfit.r-forge.r-project.org/gmkin_static/vignettes/gmkin_manual.html" target = "gmkin_manual">Manual at the gmkin homepage</a></p>
diff --git a/inst/GUI/manual.html b/inst/GUI/manual.html
new file mode 100644
index 0000000..5fa33a1
--- /dev/null
+++ b/inst/GUI/manual.html
@@ -0,0 +1,10 @@
+<div id="header">
+<h1 class="title">Manuals for gmkin</h1>
+</div>
+<p>For system requirements and installation instructions, please refer to the <a href="http://kinfit.r-forge.r-project.org/gmkin_static" target = "gmkin_static">gmkin homepage</a>.</p>
+
+<p>A local copy of the manual can be viewed as <a href="../library/gmkin/doc/gmkin_manual.html" target = "gmkin_manual">gmkin package vignette</a>.</p>
+
+<p>The mkin online documentation is <a href="http://kinfit.r-forge.r-project.org/mkin_static" target = "mkin_static">here</a>.</p>
+
+<p>The R package documentation of mkin can be viewed <a href="../library/mkin/html/00Index.html" target = "mkin_help">here</a>.</p>
--
cgit v1.2.1