Skip to content
Snippets Groups Projects
Verified Commit 5d04608f authored by Isabella Skořepová's avatar Isabella Skořepová
Browse files

Aktualizováno menu

parent fd781318
No related branches found
No related tags found
No related merge requests found
Pipeline #
...@@ -19,7 +19,7 @@ cli.main(function(args, options) { ...@@ -19,7 +19,7 @@ cli.main(function(args, options) {
var sitegin = function(config) { var sitegin = function(config) {
var options = config.options; var options = config.options;
require('./sitegin/sitegin')({ require('./sitegin/sitegin')({
watch: !options.noserver watch: !options.noserver && !options.nowatch
}) })
.then(function onLoad(jobs) { .then(function onLoad(jobs) {
var sass = require('node-sass'); var sass = require('node-sass');
...@@ -88,14 +88,16 @@ var sitegin = function(config) { ...@@ -88,14 +88,16 @@ var sitegin = function(config) {
var chokidar = require('chokidar'); var chokidar = require('chokidar');
// article or theme reload // article or theme reload
var watches = [path.join(config.sourceDir,'articles'),config.themeDir]; if(!options.nowatch) {
console.log('Watching',watches,'for changes'); var watches = [path.join(config.sourceDir,'articles'),config.themeDir];
chokidar.watch(watches, {ignoreInitial: true}) console.log('Watching',watches,'for changes');
.on('all', function(event, path) { chokidar.watch(watches, {ignoreInitial: true})
console.log('Content or theme changed. Rebuilding...'); .on('all', function(event, path) {
console.log('Change event:',event,'on path:',path); console.log('Content or theme changed. Rebuilding...');
run(); console.log('Change event:',event,'on path:',path);
}) run();
})
}
// sitegin reload // sitegin reload
jobs.onReload(function() { jobs.onReload(function() {
......
...@@ -20,6 +20,7 @@ var options = cli.parse({ ...@@ -20,6 +20,7 @@ var options = cli.parse({
builddir: [null, 'Allows to specify arbitrary content directory.', 'string', null], builddir: [null, 'Allows to specify arbitrary content directory.', 'string', null],
staticdir: [null, 'Allows to specify arbitrary directory for static files.', 'string', 'static'], staticdir: [null, 'Allows to specify arbitrary directory for static files.', 'string', 'static'],
baseurl: [null, 'BaseURL without trailing /', 'string', ''], baseurl: [null, 'BaseURL without trailing /', 'string', ''],
nowatch: [null, 'Disable watching for changes'],
debugarticle: [null, 'Article for which extra information should be printed out. Full file path '+ debugarticle: [null, 'Article for which extra information should be printed out. Full file path '+
'relative to contentdir (Ex. articles/2010/hello-word.md)','string', null] 'relative to contentdir (Ex. articles/2010/hello-word.md)','string', null]
}); });
......
...@@ -58,6 +58,9 @@ ...@@ -58,6 +58,9 @@
<a class="hide-on-small-only left" id="o-nas"> <a class="hide-on-small-only left" id="o-nas">
O nás O nás
</a> </a>
<a class="hide-on-small-only left" id="o-nas">
Aktuality
</a>
<a class="hide-on-small-only left" id="clanky"> <a class="hide-on-small-only left" id="clanky">
Články Články
</a> </a>
...@@ -101,17 +104,27 @@ ...@@ -101,17 +104,27 @@
<li><a href="{{ config.baseurl }}/clanek/o-radioklubu">O Radioklubu</a></li> <li><a href="{{ config.baseurl }}/clanek/o-radioklubu">O Radioklubu</a></li>
<li><a href="{{ config.baseurl }}/clanek/kontakt">Kontakt</a></li> <li><a href="{{ config.baseurl }}/clanek/kontakt">Kontakt</a></li>
<li><a href="{{ config.baseurl }}/clanek/krouzek-mladeze">Kroužek mládeže</a></li> <li><a href="{{ config.baseurl }}/clanek/krouzek-mladeze">Kroužek mládeže</a></li>
<li><a href="{{ config.baseurl }}/clanek/podporuji-nas">Podporují nás</a></li>
<li><a href="{{ config.baseurl }}/clanek/pro-cleny-rk">Pro členy RK</a></li> <li><a href="{{ config.baseurl }}/clanek/pro-cleny-rk">Pro členy RK</a></li>
</ul></div> </ul></div>
</li> </li>
<li class="no-padding"> <li class="no-padding">
<a class="collapsible-header waves-effect waves-teal">Články</a> <a class="collapsible-header waves-effect waves-teal">Aktuality</a>
<div class="collapsible-body"><ul> <div class="collapsible-body"><ul>
<li><a href="{{ config.baseurl }}/tag/clanek">Všechny články</a></li> <li><a href="{{ config.baseurl }}/tag/aktuality">Všechny aktuality</a></li>
<li><a href="{{ config.baseurl }}/tag/pozvanky">Pozvánky</a></li>
<li><a href="{{ config.baseurl }}/tag/stalo-se">Stalo se</a></li>
<li><a href="{{ config.baseurl }}/tag/zavody">Závody</a></li> <li><a href="{{ config.baseurl }}/tag/zavody">Závody</a></li>
<li><a href="{{ config.baseurl }}/tag/bastleni">Bastlení</a></li> </ul></div>
</li>
<li class="no-padding">
<a class="collapsible-header waves-effect waves-teal">Články</a>
<div class="collapsible-body"><ul>
<li><a href="{{ config.baseurl }}/tag/clanky">Všechny články</a></li>
<li><a href="{{ config.baseurl }}/tag/programovani">Programování</a></li> <li><a href="{{ config.baseurl }}/tag/programovani">Programování</a></li>
<li><a href="{{ config.baseurl }}/tag/mikroprocesory">Mikroprocesory</a></li>
<li><a href="{{ config.baseurl }}/tag/konstrukce">Konstrukce</a></li>
<li><a href="{{ config.baseurl }}/tag/technicke-clanky">Technické články</a></li>
<li><a href="{{ config.baseurl }}/tag/zajimavosti">Zajímavosti</a></li>
</ul></div> </ul></div>
</li> </li>
</ul> </ul>
...@@ -123,19 +136,31 @@ ...@@ -123,19 +136,31 @@
<li><a href="{{ config.baseurl }}/clanek/o-radioklubu">O Radioklubu</a></li> <li><a href="{{ config.baseurl }}/clanek/o-radioklubu">O Radioklubu</a></li>
<li><a href="{{ config.baseurl }}/clanek/kontakt">Kontakt</a></li> <li><a href="{{ config.baseurl }}/clanek/kontakt">Kontakt</a></li>
<li><a href="{{ config.baseurl }}/clanek/krouzek-mladeze">Kroužek mládeže</a></li> <li><a href="{{ config.baseurl }}/clanek/krouzek-mladeze">Kroužek mládeže</a></li>
<li><a href="{{ config.baseurl }}/clanek/podporuji-nas">Podporují nás</a></li>
<li><a href="{{ config.baseurl }}/clanek/pro-cleny-rk">Pro členy RK</a></li> <li><a href="{{ config.baseurl }}/clanek/pro-cleny-rk">Pro členy RK</a></li>
</ul> </ul>
</div> </div>
</nav> </nav>
<!-- Lower nav 2 --> <!-- Lower nav 2 - Aktuality -->
<nav class="subnav subnav2 hide-on-small-and-down" role="navigation"> <nav class="subnav subnav1 hide-on-small-and-down" role="navigation">
<div class="nav-wrapper container"> <div class="nav-wrapper container">
<ul class="right"> <ul class="right">
<li><a href="{{ config.baseurl }}/tag/clanek">Všechny články</a></li> <li><a href="{{ config.baseurl }}/tag/aktuality">Všechny aktuality</a></li>
<li><a href="{{ config.baseurl }}/tag/pozvanky">Pozvánky</a></li>
<li><a href="{{ config.baseurl }}/tag/stalo-se">Stalo se</a></li>
<li><a href="{{ config.baseurl }}/tag/zavody">Závody</a></li> <li><a href="{{ config.baseurl }}/tag/zavody">Závody</a></li>
<li><a href="{{ config.baseurl }}/tag/bastleni">Bastlení</a></li> </ul>
</div>
</nav>
<!-- Lower nav 3 - Články -->
<nav class="subnav subnav2 hide-on-small-and-down" role="navigation">
<div class="nav-wrapper container">
<ul class="right">
<li><a href="{{ config.baseurl }}/tag/clanky">Všechny články</a></li>
<li><a href="{{ config.baseurl }}/tag/programovani">Programování</a></li> <li><a href="{{ config.baseurl }}/tag/programovani">Programování</a></li>
<li><a href="{{ config.baseurl }}/tag/mikroprocesory">Mikroprocesory</a></li>
<li><a href="{{ config.baseurl }}/tag/konstrukce">Konstrukce</a></li>
<li><a href="{{ config.baseurl }}/tag/technicke-clanky">Technické články</a></li>
<li><a href="{{ config.baseurl }}/tag/zajimavosti">Zajímavosti</a></li>
</ul> </ul>
</div> </div>
</nav> </nav>
...@@ -158,7 +183,7 @@ ...@@ -158,7 +183,7 @@
</div> </div>
</div> </div>
<div class="container s6"> <div class="container s6">
Stránky pro OK1KVK vytvořil <a class="orange-text text-lighten-3" target="_blank" href="https://blog.skorepa.info">Jakub Skořepa</a> 2015-2016 Stránky pro OK1KVK vytvořil <a class="orange-text text-lighten-3" target="_blank" href="https://blog.skorepa.info">Jakub Skořepa</a> 2015-2017
</div> </div>
</footer> </footer>
......
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
$(window).resize(onresize); $(window).resize(onresize);
$(document).load(onresize); $(document).load(onresize);
$(document).ready(onresize); $(document).ready(onresize);
$(document).keypress(function(e) { $(document).keyup(function(e) {
if($("#search-overlay").hasClass("shown")) return; if($("#search-overlay").hasClass("shown")) return;
if(e.key == "ArrowRight") window.location = "{{config.baseurl}}/{{metadata.nexturl}}"; if(e.key == "ArrowRight") window.location = "{{config.baseurl}}/{{metadata.nexturl}}";
if(e.key == "ArrowLeft") window.location = "{{config.baseurl}}/{{metadata.prevurl}}"; if(e.key == "ArrowLeft") window.location = "{{config.baseurl}}/{{metadata.prevurl}}";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment