Fixed tutorial design
diff --git a/public/js/demo/about.html b/public/js/demo/about.html
index 8381ae5..39afb46 100644
--- a/public/js/demo/about.html
+++ b/public/js/demo/about.html
@@ -8,53 +8,59 @@
</head>
<body class="embedded">
<div id="sidebar" tabindex="0" class="active">
- <h2>Tutorial</h2>
- <nav>
- <ul>
- <li>About ...
- <ul>
- <li>Kalamar</li>
- <li>Koral</li>
- <li>Kustvakt</li>
- <li>Krill</li>
- <!-- <li>Karang</li> -->
- </ul>
- </li>
- <li>Query Languages
- <ul>
- <li>Cosmas II</li>
- <li>Poliqarp</li>
- <li>Annis QL</li>
- <li>CQL</li>
- <li>RegExp</li>
- </ul>
- </li>
- <li>Data
- <ul>
- <li>Corpora
- <ul>
- <li>DeReKo</li>
- </ul>
- </li>
- <li>Annotations
- <ul>
- <li>Connexor</li>
- <li>Mate</li>
- <li>TreeTagger</li>
- </ul>
- </li>
- </ul>
- </li>
- <li>API
- <ul>
- <li>KoralQuery</li>
- <li>Search API</li>
- <li>Match Information API</li>
- <li>User API</li>
- </ul>
- </li>
- </ul>
- </nav>
+ <div>
+<!-- Not embedded:
+ <h2>Tutorial</h2>
+-->
+ <nav>
+ <ul>
+ <li><a href="/doc/korap">KorAP</a>
+ <ul>
+ <li><a href="/doc/kalamar" class="active">Kalamar</a></li>
+ <li><a href="/doc/koral">Koral</a></li>
+ <li><a href="/doc/kustvakt">Kustvakt</a></li>
+ <li><a href="/doc/krill">Krill</a></li>
+ <!-- <li>Karang</li> -->
+ </ul>
+ </li>
+ <li><a href="/doc/ql">Query Languages</a>
+ <ul>
+ <li><a href="/doc/ql/cosmas-2">Cosmas II</a></li>
+ <li><a href="/doc/ql/poliqarp-plus">Poliqarp+</a></li>
+ <li><a href="/doc/ql/annis">Annis QL</a></li>
+ <li><a href="/doc/ql/cql">CQL</a></li>
+ <li><a href="/doc/ql/regexp">RegExp</a></li>
+ </ul>
+ </li>
+ <li><a href="/doc/data">Data</a>
+ <ul>
+ <li><a href="/doc/data/corpus">Corpora</a>
+ <ul>
+ <li><a href="/doc/data/corpus/dereko">DeReKo</a></li>
+ </ul>
+ </li>
+ <li><a href="/doc/data/annotation">Annotations</a>
+ <ul>
+ <li><a href="/doc/data/annotation/connexor">Connexor</a></li>
+ <li><a href="/doc/data/annotation/mate">Mate</a></li>
+ <li><a href="/doc/data/annotation/treetagger">TreeTagger</a></li>
+ </ul>
+ </li>
+ </ul>
+ </li>
+ <li><a href="/doc/api">API</a>
+<!--
+ <ul>
+ <li><a href="/doc/api/koralquery">KoralQuery</a></li>
+ <li><a href="/doc/api/search">Search API</a></li>
+ <li><a href="/doc/api/match">Match Information API</a></li>
+ <li><a href="/doc/api/user">User API</a></li>
+ </ul>
+-->
+ </li>
+ </ul>
+ </nav>
+ </div>
</div>
<main class="tutorial">
<h2>KorAP-Tutorial</h2>
diff --git a/public/js/demo/all.html b/public/js/demo/all.html
index 7809da4..ec6d017 100644
--- a/public/js/demo/all.html
+++ b/public/js/demo/all.html
@@ -3,20 +3,7 @@
<head>
<title>CSS demo</title>
<meta charset="utf-8" />
- <script src="../lib/dagre/dagre.min.js"></script>
- <script src="../src/api.js"></script>
- <script src="../src/hint.js"></script>
- <script src="../src/match.js"></script>
- <script src="../src/menu.js"></script>
- <script src="../src/vc.js"></script>
- <script src="../src/session.js"></script>
- <script src="../src/tutorial.js"></script>
- <script src="../src/util.js"></script>
- <script src="./all.js"></script>
<link type="text/css" rel="stylesheet" href="../../css/build/kalamar.css" />
- <script>
- KorAP.URL = 'http://localhost:3000';
- </script>
</head>
<body>
<div id="kalamar-bg"></div>
@@ -30,15 +17,13 @@
id="q-field"
autofocus="autofocus" />
<button type="submit"><span>Go</span></button>
-<!--
- <i class="fa fa-arrow-circle-down show-hint" onclick="hint.popUp()"></i>
--->
+ <!-- <i class="fa fa-arrow-circle-down show-hint" onclick="hint.popUp()"></i> -->
</div>
<div id="vc-view"></div>
in <input type="hidden" id="vc-name" name="vc-name" value="Wikipedia" />
<input type="text" name="vc" id="vc" value="corpusID = Wikipedia" />
with <span class="select">
-<!-- Change this to js-menu -->
+ <!-- Change this to js-menu -->
<select name="ql" id="ql-field">
<option value="poliqarp">Poliqarp</option>
<option value="cosmas2">Cosmas II</option>
@@ -145,15 +130,27 @@
<p><strong>New to KorAP?</strong> Please check out our <a href="#">tutorial</a>!</p>
- <p>KorAP is developed at the <a href="http://www.ids-mannheim.de">Institute for German Language</a> and funded by the <a href="http://www.leibniz-gemeinschaft.de/en/about-us/leibniz-competition/projekte-2011/2011-funding-line-2/">Leibniz Association</a>. The separated modules are being published as open source at <a href="http://github.com/KorAP">GitHub</a>.</p>
+ <p>KorAP is developed at the <a href="http://www.ids-mannheim.de">Institute for the German Language</a> and funded by the <a href="http://www.leibniz-gemeinschaft.de/en/about-us/leibniz-competition/projekte-2011/2011-funding-line-2/">Leibniz Association</a>. The separated modules are being published as open source at <a href="http://github.com/KorAP">GitHub</a>.</p>
</div>
<div id="logos">
<div>
- <a href="http://www.ids-mannheim.de/" class="logo"><p id="ids-logo"><span>Developed at the Institute for German Language (IDS)</span></p></a>
- <a href="http://www.leibniz-gemeinschaft.de/" class="logo"><p id="leibniz-logo"><span>Funded by the Leibniz Association</span></p></a>
+ <a href="http://www.ids-mannheim.de/" class="logo"><p id="ids-logo"><span>Developed at the Institute for the German Language (IDS)</span></p></a>
+ <a href="http://www.leibniz-gemeinschaft.de/" class="logo"><p id="leibniz-logo"><span>Member of the Leibniz Association</span></p></a>
</div>
</div>
-
</main>
+ <script src="../lib/dagre/dagre.min.js"></script>
+ <script src="../src/api.js"></script>
+ <script src="../src/hint.js"></script>
+ <script src="../src/match.js"></script>
+ <script src="../src/menu.js"></script>
+ <script src="../src/vc.js"></script>
+ <script src="../src/session.js"></script>
+ <script src="../src/tutorial.js"></script>
+ <script src="../src/util.js"></script>
+ <script>
+ KorAP.URL = 'http://localhost:3000';
+ </script>
+ <script src="./all.js"></script>
</body>
</html>
diff --git a/public/js/demo/all.js b/public/js/demo/all.js
index 0a72f73..b29b0b5 100644
--- a/public/js/demo/all.js
+++ b/public/js/demo/all.js
@@ -444,7 +444,7 @@
// document.getElementById('vc-choose').click();
-// init.tutorial.show();
+ // init.tutorial.show();
// Don't hide!!!
menu.hide = function () {};