From cad51b5f5553aa0fd306d2089c3e05da73ecc5d4 Mon Sep 17 00:00:00 2001
From: Martin Kucera <martin@mkucera.cz>
Date: Sat, 23 Feb 2013 22:45:12 +0100
Subject: [PATCH 01/15] routes moved to a special file

---
 app/bootstrap.php | 48 +----------------------------------------
 app/routes.php    | 54 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 47 deletions(-)
 create mode 100644 app/routes.php

diff --git a/app/bootstrap.php b/app/bootstrap.php
index e131709..f3d04f2 100755
--- a/app/bootstrap.php
+++ b/app/bootstrap.php
@@ -3,8 +3,6 @@
 /**
  * My Application bootstrap file.
  */
-use Nette\Application\Routers\Route;
-
 
 // Load Nette Framework or autoloader generated by Composer
 require LIBS_DIR . '/autoload.php';
@@ -29,51 +27,7 @@
 $container = $configurator->createContainer();
 
 // Setup router
-// ================= "funkcni" a prevedene stranky ================
-$container->router[] = new Route('index.php', 'Homepage:default', Route::ONE_WAY);
-$container->router[] = new Route('novinky', 'Homepage:news');
-$container->router[] = new Route('news', 'Homepage:news', Route::ONE_WAY);
-
-// souteze
-$container->router[] = new Route('souteze', 'Homepage:competition');
-$container->router[] = new Route('competitions.aspx', 'Homepage:competition', Route::ONE_WAY);
-$container->router[] = new Route('competitions/<name>.aspx', 'Homepage:competition', Route::ONE_WAY);
-
-$container->router[] = new Route('kontakt', 'Homepage:contact');
-$container->router[] = new Route('contact.aspx', 'Homepage:contact', Route::ONE_WAY);
-
-// ================= rozpracovane a nedodelane ================
-// about
-$container->router[] = new Route('o-projektu', 'Homepage:about');
-$container->router[] = new Route('about.aspx', 'Homepage:about', Route::ONE_WAY);
-$container->router[] = new Route('about/history.aspx', 'Homepage:about', Route::ONE_WAY);
-$container->router[] = new Route('about/seminars.aspx', 'Homepage:about', Route::ONE_WAY); // stary obsah - spis na Junior Camp?
-$container->router[] = new Route('download.aspx', 'Homepage:about', Route::ONE_WAY); // asi dame casem ke stazeni loga (pripadne na 'media'?)
-
-// konference
-$container->router[] = new Route('konference', 'Homepage:conference');
-$container->router[] = new Route('conference.aspx', 'Homepage:conference', Route::ONE_WAY);
-
-// pro media
-$container->router[] = new Route('pro-media', 'Homepage:media');
-$container->router[] = new Route('mediaroom.aspx', 'Homepage:media', Route::ONE_WAY);
-$container->router[] = new Route('mediaroom/<name>.aspx', 'Homepage:media', Route::ONE_WAY); // how-to-promote, wrote-about-us, press-releases
-
-// pribehy vitezu / success stories
-$container->router[] = new Route('pribehy-vitezu', 'Homepage:successStories');
-
-// Předchozí ročníky
-$container->router[] = new Route('predchozi-rocniky', 'Homepage:previous');
-$container->router[] = new Route('winners.aspx', 'Homepage:previous', Route::ONE_WAY);
-$container->router[] = new Route('winners/year/<year>.aspx', 'Homepage:previous', Route::ONE_WAY);
-$container->router[] = new Route('winners/competition/<competition>.aspx', 'Homepage:previous', Route::ONE_WAY);
-
-// Výzva
-$container->router[] = new Route('hledame-dalsiho-viteze', 'Homepage:appeal', Route::ONE_WAY);
-$container->router[] = new Route('hledame-viteze', 'Homepage:appeal');
-
-// ostatni -> da se flash message, ze jsme ji smazali
-$container->router[] = new Route('<action>[.aspx]', 'Homepage:default');
+$container->router = require 'routes.php';
 
 // Configure and run the application!
 $container->application->run();
diff --git a/app/routes.php b/app/routes.php
new file mode 100644
index 0000000..d0ab17b
--- /dev/null
+++ b/app/routes.php
@@ -0,0 +1,54 @@
+<?php
+
+use Nette\Application\Routers\Route,
+    Nette\Application\Routers\RouteList;
+
+$router = new RouteList;
+
+// ================= "funkcni" a prevedene stranky ================
+$router[] = new Route('index.php', 'Homepage:default', Route::ONE_WAY);
+$router[] = new Route('novinky', 'Homepage:news');
+$router[] = new Route('news', 'Homepage:news', Route::ONE_WAY);
+
+// souteze
+$router[] = new Route('souteze', 'Homepage:competition');
+$router[] = new Route('competitions.aspx', 'Homepage:competition', Route::ONE_WAY);
+$router[] = new Route('competitions/<name>.aspx', 'Homepage:competition', Route::ONE_WAY);
+
+$router[] = new Route('kontakt', 'Homepage:contact');
+$router[] = new Route('contact.aspx', 'Homepage:contact', Route::ONE_WAY);
+
+// ================= rozpracovane a nedodelane ================
+// about
+$router[] = new Route('o-projektu', 'Homepage:about');
+$router[] = new Route('about.aspx', 'Homepage:about', Route::ONE_WAY);
+$router[] = new Route('about/history.aspx', 'Homepage:about', Route::ONE_WAY);
+$router[] = new Route('about/seminars.aspx', 'Homepage:about', Route::ONE_WAY); // stary obsah - spis na Junior Camp?
+$router[] = new Route('download.aspx', 'Homepage:about', Route::ONE_WAY); // asi dame casem ke stazeni loga (pripadne na 'media'?)
+
+// konference
+$router[] = new Route('konference', 'Homepage:conference');
+$router[] = new Route('conference.aspx', 'Homepage:conference', Route::ONE_WAY);
+
+// pro media
+$router[] = new Route('pro-media', 'Homepage:media');
+$router[] = new Route('mediaroom.aspx', 'Homepage:media', Route::ONE_WAY);
+$router[] = new Route('mediaroom/<name>.aspx', 'Homepage:media', Route::ONE_WAY); // how-to-promote, wrote-about-us, press-releases
+
+// pribehy vitezu / success stories
+$router[] = new Route('pribehy-vitezu', 'Homepage:successStories');
+
+// Předchozí ročníky
+$router[] = new Route('predchozi-rocniky', 'Homepage:previous');
+$router[] = new Route('winners.aspx', 'Homepage:previous', Route::ONE_WAY);
+$router[] = new Route('winners/year/<year>.aspx', 'Homepage:previous', Route::ONE_WAY);
+$router[] = new Route('winners/competition/<competition>.aspx', 'Homepage:previous', Route::ONE_WAY);
+
+// Výzva
+$router[] = new Route('hledame-dalsiho-viteze', 'Homepage:appeal', Route::ONE_WAY);
+$router[] = new Route('hledame-viteze', 'Homepage:appeal');
+
+// ostatni -> da se flash message, ze jsme ji smazali
+$router[] = new Route('<action>[.aspx]', 'Homepage:default'); 
+
+return $router;
\ No newline at end of file

From 1e30fb0848a3c78324e7e925770198ab2765c2f7 Mon Sep 17 00:00:00 2001
From: Martin Kucera <martin@mkucera.cz>
Date: Sat, 23 Feb 2013 22:49:35 +0100
Subject: [PATCH 02/15] function for creating links to nette pages

---
 .../themes/juniorinternet/functions.php        | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/novinky/wp-content/themes/juniorinternet/functions.php b/novinky/wp-content/themes/juniorinternet/functions.php
index 22fb7b3..c66f196 100644
--- a/novinky/wp-content/themes/juniorinternet/functions.php
+++ b/novinky/wp-content/themes/juniorinternet/functions.php
@@ -4,4 +4,20 @@
     return get_stylesheet_directory_uri(). '/assets/css/screen.css';
 }); 
 
-add_option('urlToCompetitionSystem', 'http://souteze.juniorinternet.cz/register/');
\ No newline at end of file
+add_option('urlToCompetitionSystem', 'http://souteze.juniorinternet.cz/register/');
+
+
+function netteLink($destination)
+{  
+  require_once ABSPATH. '../libs/autoload.php';
+
+  $a = strrpos($destination, ':');
+  $presenter = substr($destination, 0, $a);
+  $action = $a === strlen($destination) - 1 ? NULL : substr($destination, $a + 1);
+  
+  $request = new Nette\Application\Request( $presenter, 'GET', array('action' => $action) );
+  
+  $router = require ABSPATH. '../app/routes.php';
+
+  return $router->constructUrl( $request, new Nette\Http\Url( home_url("/") ) );
+}
\ No newline at end of file

From eea55e34e49aaa521b6e5c02534a646972e8bf46 Mon Sep 17 00:00:00 2001
From: Martin Kucera <martin@mkucera.cz>
Date: Wed, 27 Feb 2013 17:45:57 +0100
Subject: [PATCH 03/15] the router variable is static and the routes won't be
 included more times

---
 novinky/wp-content/themes/juniorinternet/functions.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/novinky/wp-content/themes/juniorinternet/functions.php b/novinky/wp-content/themes/juniorinternet/functions.php
index c66f196..d5f9bc2 100644
--- a/novinky/wp-content/themes/juniorinternet/functions.php
+++ b/novinky/wp-content/themes/juniorinternet/functions.php
@@ -10,14 +10,16 @@
 function netteLink($destination)
 {  
   require_once ABSPATH. '../libs/autoload.php';
+  
+  static $router = NULL;
+  
+  if ( !isset($router) ) $router = require ABSPATH. '../app/routes.php';
 
   $a = strrpos($destination, ':');
   $presenter = substr($destination, 0, $a);
   $action = $a === strlen($destination) - 1 ? NULL : substr($destination, $a + 1);
   
   $request = new Nette\Application\Request( $presenter, 'GET', array('action' => $action) );
-  
-  $router = require ABSPATH. '../app/routes.php';
 
   return $router->constructUrl( $request, new Nette\Http\Url( home_url("/") ) );
 }
\ No newline at end of file

From ed5a795ff4b525f9a547f3bf30346afe65586e19 Mon Sep 17 00:00:00 2001
From: Martin Kucera <martin@mkucera.cz>
Date: Wed, 27 Feb 2013 18:10:21 +0100
Subject: [PATCH 04/15] using nette routes for links

---
 .../wp-content/themes/juniorinternet/navigation.php  | 12 ++++++------
 novinky/wp-content/themes/juniorinternet/sidebar.php |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/novinky/wp-content/themes/juniorinternet/navigation.php b/novinky/wp-content/themes/juniorinternet/navigation.php
index 9a05fcf..f13f9f8 100644
--- a/novinky/wp-content/themes/juniorinternet/navigation.php
+++ b/novinky/wp-content/themes/juniorinternet/navigation.php
@@ -1,9 +1,9 @@
 <div class="nav mainnav" role="navigation">
-	<a href="/novinky">Aktuálně</a>
-	<a href="/predchozi-rocniky">Předchozí&nbsp;ročníky</a>
-	<a href="/pribehy-vitezu">Příběhy&nbsp;vítězů</a>
-	<a href="/o-projektu">O&nbsp;projektu</a>
-	<a href="/pro-media">Pro&nbsp;média</a>
-	<a href="/kontakt">Kontakt</a>
+	<a href="<?php echo netteLink('Homepage:news') ?>">Aktuálně</a>
+	<a href="<?php echo netteLink('Homepage:previous') ?>">Předchozí&nbsp;ročníky</a>
+	<a href="<?php echo netteLink('Homepage:successStories') ?>">Příběhy&nbsp;vítězů</a>
+	<a href="<?php echo netteLink('Homepage:about') ?>">O&nbsp;projektu</a>
+	<a href="<?php echo netteLink('Homepage:media') ?>">Pro&nbsp;média</a>
+	<a href="<?php echo netteLink('Homepage:contact') ?>">Kontakt</a>
 </div>
 
diff --git a/novinky/wp-content/themes/juniorinternet/sidebar.php b/novinky/wp-content/themes/juniorinternet/sidebar.php
index a6756d6..797ec90 100644
--- a/novinky/wp-content/themes/juniorinternet/sidebar.php
+++ b/novinky/wp-content/themes/juniorinternet/sidebar.php
@@ -8,7 +8,7 @@
 		<p>
 			<a class="btn btn-primary" href="<?php echo get_option('urlToCompetitionSystem') ?>">přihlásit projekt</a>
 			<span class="line-break-tablet"></span>
-			<a href="http://www.juniorinternet.cz/souteze">více informací</a>
+			<a href="<?php echo netteLink('Homepage:competition') ?>">více informací</a>
 		</p>
 	</div>
 	<div class="organise">

From f97b37ed3c29fec76b2611517652ab3c9509efd9 Mon Sep 17 00:00:00 2001
From: Martin Kucera <martin@mkucera.cz>
Date: Wed, 27 Feb 2013 20:40:43 +0100
Subject: [PATCH 05/15] refactor netteLink and move to libs

---
 libs/NetteLink.php                            | 35 +++++++++++++++++++
 .../themes/juniorinternet/functions.php       | 18 ----------
 2 files changed, 35 insertions(+), 18 deletions(-)
 create mode 100644 libs/NetteLink.php

diff --git a/libs/NetteLink.php b/libs/NetteLink.php
new file mode 100644
index 0000000..82c9007
--- /dev/null
+++ b/libs/NetteLink.php
@@ -0,0 +1,35 @@
+<?php
+
+class NetteLink
+{
+  /** @var Nette\Application\Routers\RouteList */
+  public static $router;
+  
+  /** 
+   * Function to be used for the link generating.
+   * @var Nette\Callback
+   */
+  public static $function;
+
+  public static function link($destination)
+  {
+    if ( isset(self::$function) ) return self::$function->invoke($destination);
+    
+    if ( !isset(self::$router) ) throw new MissingAttributeException("Either NetteLink::\$router or NetteLink::\$function must be set for this method to work!");
+  
+    $a = strrpos($destination, ':');
+    $presenter = substr($destination, 0, $a);
+    $action = $a === strlen($destination) - 1 ? NULL : substr($destination, $a + 1);
+    
+    $request = new Nette\Application\Request( $presenter, 'GET', array('action' => $action) );
+
+    return self::$router->constructUrl( $request, new Nette\Http\Url( home_url("/") ) );
+  }
+}
+
+class MissingAttributeException extends Exception {}
+
+function netteLink($destination)
+{
+  return NetteLink::link($destination);
+}
\ No newline at end of file
diff --git a/novinky/wp-content/themes/juniorinternet/functions.php b/novinky/wp-content/themes/juniorinternet/functions.php
index d5f9bc2..6cc726b 100644
--- a/novinky/wp-content/themes/juniorinternet/functions.php
+++ b/novinky/wp-content/themes/juniorinternet/functions.php
@@ -5,21 +5,3 @@
 }); 
 
 add_option('urlToCompetitionSystem', 'http://souteze.juniorinternet.cz/register/');
-
-
-function netteLink($destination)
-{  
-  require_once ABSPATH. '../libs/autoload.php';
-  
-  static $router = NULL;
-  
-  if ( !isset($router) ) $router = require ABSPATH. '../app/routes.php';
-
-  $a = strrpos($destination, ':');
-  $presenter = substr($destination, 0, $a);
-  $action = $a === strlen($destination) - 1 ? NULL : substr($destination, $a + 1);
-  
-  $request = new Nette\Application\Request( $presenter, 'GET', array('action' => $action) );
-
-  return $router->constructUrl( $request, new Nette\Http\Url( home_url("/") ) );
-}
\ No newline at end of file

From 15dd5580bc9790ab573660a8ea9449d762b5b68a Mon Sep 17 00:00:00 2001
From: Martin Kucera <martin@mkucera.cz>
Date: Wed, 27 Feb 2013 20:41:58 +0100
Subject: [PATCH 06/15] constants moved in a unique file - will be used by
 wordpress, too

---
 www/consts.php | 10 ++++++++++
 www/index.php  |  9 +--------
 2 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 www/consts.php

diff --git a/www/consts.php b/www/consts.php
new file mode 100644
index 0000000..bba3aac
--- /dev/null
+++ b/www/consts.php
@@ -0,0 +1,10 @@
+<?php
+
+// absolute filesystem path to this web root
+define('WWW_DIR', __DIR__);
+
+// absolute filesystem path to the application root
+define('APP_DIR', WWW_DIR . '/../app');
+
+// absolute filesystem path to the libraries
+define('LIBS_DIR', WWW_DIR . '/../libs'); 
diff --git a/www/index.php b/www/index.php
index 5af9714..514e6a3 100755
--- a/www/index.php
+++ b/www/index.php
@@ -3,14 +3,7 @@
 // uncomment this line if you must temporarily take down your site for maintenance
 // require '.maintenance.php';
 
-// absolute filesystem path to this web root
-define('WWW_DIR', __DIR__);
-
-// absolute filesystem path to the application root
-define('APP_DIR', WWW_DIR . '/../app');
-
-// absolute filesystem path to the libraries
-define('LIBS_DIR', WWW_DIR . '/../libs');
+require 'consts.php';
 
 // load bootstrap file
 require APP_DIR . '/bootstrap.php';

From 1d12c9566be4799041f99b642de97e2ae986cf35 Mon Sep 17 00:00:00 2001
From: Martin Kucera <martin@mkucera.cz>
Date: Wed, 27 Feb 2013 20:42:29 +0100
Subject: [PATCH 07/15] setup NetteLink

---
 app/presenters/BasePresenter.php                       | 2 ++
 novinky/wp-content/themes/juniorinternet/functions.php | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/app/presenters/BasePresenter.php b/app/presenters/BasePresenter.php
index c478308..955f336 100755
--- a/app/presenters/BasePresenter.php
+++ b/app/presenters/BasePresenter.php
@@ -17,6 +17,8 @@ public function beforeRender()
 		$this->template->registerHelper('texy', callback($texy, 'process'));
 
 		$this->template->urlToCompetitionSystem = $this->context->parameters['urlToCompetitionSystem'];
+		
+		NetteLink::$function = callback($this, 'link');
 	}
 
 }
diff --git a/novinky/wp-content/themes/juniorinternet/functions.php b/novinky/wp-content/themes/juniorinternet/functions.php
index 6cc726b..a5ad81d 100644
--- a/novinky/wp-content/themes/juniorinternet/functions.php
+++ b/novinky/wp-content/themes/juniorinternet/functions.php
@@ -1,5 +1,8 @@
 <?php
 
+require_once LIBS_DIR. '/NetteLink.php';
+NetteLink::$router = require APP_DIR. '/routes.php';
+
 add_filter('stylesheet_uri', function() {
     return get_stylesheet_directory_uri(). '/assets/css/screen.css';
 }); 

From 10187a658af707a32013cc3825c2f68fd9ef409c Mon Sep 17 00:00:00 2001
From: Martin Kucera <martin@mkucera.cz>
Date: Wed, 27 Feb 2013 20:44:44 +0100
Subject: [PATCH 08/15] constants from Nette

---
 novinky/index.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/novinky/index.php b/novinky/index.php
index 1e3364a..8b51db7 100644
--- a/novinky/index.php
+++ b/novinky/index.php
@@ -13,5 +13,7 @@
  */
 define('WP_USE_THEMES', true);
 
+require_once ('../www/consts.php');
+
 /** Loads the WordPress Environment and Template */
 require('./wp-blog-header.php');

From 2b8df0420467c8d1b4becb536d3ac48b226c49a5 Mon Sep 17 00:00:00 2001
From: Martin Kucera <martin@mkucera.cz>
Date: Wed, 27 Feb 2013 20:44:56 +0100
Subject: [PATCH 09/15] autoload Nette files

---
 novinky/index.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/novinky/index.php b/novinky/index.php
index 8b51db7..bb1777e 100644
--- a/novinky/index.php
+++ b/novinky/index.php
@@ -15,5 +15,7 @@
 
 require_once ('../www/consts.php');
 
+require_once (LIBS_DIR. '/autoload.php');
+
 /** Loads the WordPress Environment and Template */
 require('./wp-blog-header.php');

From a0891b686f53d366dd217ce3a15033725b3d698b Mon Sep 17 00:00:00 2001
From: Martin Kucera <martin@mkucera.cz>
Date: Wed, 27 Feb 2013 20:47:03 +0100
Subject: [PATCH 10/15] one header for Wordpress and Nette

---
 app/templates/@layout.latte                   |  9 +------
 app/templates/Homepage/default.latte          | 23 +-----------------
 app/templates/headerBanner.php                | 24 +++++++++++++++++++
 app/templates/headerBannerClassic.php         |  9 +++++++
 app/templates/mainNav.php                     |  8 +++++++
 .../templates}/old_browser.php                |  0
 .../themes/juniorinternet/header-classic.php  | 14 +++--------
 7 files changed, 46 insertions(+), 41 deletions(-)
 create mode 100644 app/templates/headerBanner.php
 create mode 100644 app/templates/headerBannerClassic.php
 create mode 100644 app/templates/mainNav.php
 rename {novinky/wp-content/themes/juniorinternet => app/templates}/old_browser.php (100%)

diff --git a/app/templates/@layout.latte b/app/templates/@layout.latte
index 7804160..c18a84a 100755
--- a/app/templates/@layout.latte
+++ b/app/templates/@layout.latte
@@ -7,14 +7,7 @@
 {/define}
 
 {define #mainNav}
-<div class="nav mainnav" role="navigation">
-	<a n:href="news">Aktuálně</a>
-	<a n:href="previous">Předchozí&nbsp;ročníky</a>
-	<a n:href="successStories">Příběhy&nbsp;vítězů</a>
-	<a n:href="about">O&nbsp;projektu</a>
-	<a n:href="media">Pro&nbsp;média</a>
-	<a n:href="contact">Kontakt</a>
-</div>
+  {include mainNav.php}
 {/define}
 
 <!doctype html>
diff --git a/app/templates/Homepage/default.latte b/app/templates/Homepage/default.latte
index 709a5a6..3334bf8 100644
--- a/app/templates/Homepage/default.latte
+++ b/app/templates/Homepage/default.latte
@@ -3,28 +3,7 @@
 {block #title}Junior Internet{/block}
 
 {block #content}
-<div role="banner" class="clearfix banner primary">
-	<div class="inner">
-		<span class="year">2013 &mdash; 14. ročník</span>
-		<h1 class="logo">Junior Internet</h1>
-		<h2>Odrazový můstek <span class="line-break"></span>pro mladé internetové nadšence.</h2>
-		<p>Již 14 let pomáháme mladým lidem poznávat internetové technologie, potkávat zajímavé lidi a prosadit se na internetu.</p>
-		<p n:foreach="$flashes as $flash" class="flash {$flash->type}">{$flash->message}</p>
-		<p class="nav quicknav" role="navigation">
-			Organizujeme:
-			<a n:href="competition">Soutěže</a>
-
-			<!-- <a href="/konference">Konference</a> -->
-			<span class="wip" title="V přípravě">Konference (registrace se otevřou v průběhu února)</span>
-
-			<!-- <a href="/junior-camp">Junior&nbsp;Camp</a>
-			<span class="wip" title="V přípravě">Junior&nbsp;Camp</span> -->
-		</p>
-
-		{include #mainNav}
-	</div>
-
-</div>
+{include ../headerBanner.php}
 
 <div role="main" class="content clearfix secondary competition">
 
diff --git a/app/templates/headerBanner.php b/app/templates/headerBanner.php
new file mode 100644
index 0000000..c01b2d7
--- /dev/null
+++ b/app/templates/headerBanner.php
@@ -0,0 +1,24 @@
+<div role="banner" class="clearfix banner primary">
+  <div class="inner">
+    <span class="year">2013 &mdash; 14. ročník</span>
+    <h1 class="logo">Junior Internet</h1>
+    <h2>Odrazový můstek <span class="line-break"></span>pro mladé internetové nadšence.</h2>
+    <p>Již 14 let pomáháme mladým lidem poznávat internetové technologie, potkávat zajímavé lidi a prosadit se na internetu.</p>
+    <?php foreach( $flashes as $flash ): ?>
+      <p class="flash <?php echo $flash->type ?>"><?php echo $flash->message ?></p>
+    <?php endforeach ?>
+    <p class="nav quicknav" role="navigation">
+      Organizujeme:
+      <a href="<?php echo netteLink('Homepage:competition'); ?>">Soutěže</a>
+
+      <!-- <a href="/konference">Konference</a> -->
+      <span class="wip" title="V přípravě">Konference (registrace se otevřou v průběhu února)</span>
+
+      <!-- <a href="/junior-camp">Junior&nbsp;Camp</a>
+      <span class="wip" title="V přípravě">Junior&nbsp;Camp</span> -->
+    </p>
+
+    <?php require APP_DIR. '/templates/mainNav.php' ?>
+  </div>
+
+</div>
diff --git a/app/templates/headerBannerClassic.php b/app/templates/headerBannerClassic.php
new file mode 100644
index 0000000..3cf7097
--- /dev/null
+++ b/app/templates/headerBannerClassic.php
@@ -0,0 +1,9 @@
+<div role="banner" class="clearfix banner primary small-banner">
+  <div class="inner">
+    <span class="year">2013 &mdash; 14. ročník</span>
+
+    <p class="main-text">Co se <strong>aktuálně</strong> děje <span class="line-break-mobile"></span> v projektu <a href="/"><span>Junior Internet</span></a></p>
+
+    <?php require APP_DIR. '/templates/mainNav.php' ?>
+  </div>
+</div> 
diff --git a/app/templates/mainNav.php b/app/templates/mainNav.php
new file mode 100644
index 0000000..25d13d9
--- /dev/null
+++ b/app/templates/mainNav.php
@@ -0,0 +1,8 @@
+<div class="nav mainnav" role="navigation">
+	<a href="<?php echo netteLink('Homepage:news') ?>">Aktuálně</a>
+	<a href="<?php echo netteLink('Homepage:previous') ?>">Předchozí&nbsp;ročníky</a>
+	<a href="<?php echo netteLink('Homepage:successStories') ?>">Příběhy&nbsp;vítězů</a>
+	<a href="<?php echo netteLink('Homepage:about') ?>">O&nbsp;projektu</a>
+	<a href="<?php echo netteLink('Homepage:media') ?>">Pro&nbsp;média</a>
+	<a href="<?php echo netteLink('Homepage:contact') ?>">Kontakt</a>
+</div>
\ No newline at end of file
diff --git a/novinky/wp-content/themes/juniorinternet/old_browser.php b/app/templates/old_browser.php
similarity index 100%
rename from novinky/wp-content/themes/juniorinternet/old_browser.php
rename to app/templates/old_browser.php
diff --git a/novinky/wp-content/themes/juniorinternet/header-classic.php b/novinky/wp-content/themes/juniorinternet/header-classic.php
index 36f962d..c20e79d 100644
--- a/novinky/wp-content/themes/juniorinternet/header-classic.php
+++ b/novinky/wp-content/themes/juniorinternet/header-classic.php
@@ -1,15 +1,7 @@
-<?php get_template_part( 'html_head' ); ?>
+<?php get_template_part( 'html_head' ) ?>
 
 <body <?php body_class('page-classic') ?>>
 
-<?php get_template_part( 'old_browser' ); ?>
+<?php require APP_DIR. '/templates/old_browser.php' ?>
 
-<div role="banner" class="clearfix banner primary small-banner">
-	<div class="inner">
-		<span class="year">2013 &mdash; 14. ročník</span>
-
-		<p class="main-text">Co se <strong>aktuálně</strong> děje <span class="line-break-mobile"></span> v projektu <a href="/"><span>Junior Internet</span></a></p>
-
-		<?php get_template_part( 'navigation' ); ?>
-	</div>
-</div>
+<?php require APP_DIR. '/templates/headerBannerClassic.php' ?>
\ No newline at end of file

From 028936fe4d76fbf6de25e5204859af7d2eb2cd79 Mon Sep 17 00:00:00 2001
From: Martin Kucera <martin@mkucera.cz>
Date: Wed, 27 Feb 2013 20:49:34 +0100
Subject: [PATCH 11/15] this is generated by Nette

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 1e5efb1..4293e1e 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 temp/cache/*
+temp/btfj.dat
\ No newline at end of file

From 9949701ce893b5b236a663725138c39bf6dd5fbe Mon Sep 17 00:00:00 2001
From: Martin Kucera <martin@mkucera.cz>
Date: Wed, 27 Feb 2013 22:22:08 +0100
Subject: [PATCH 12/15] aside is common for Nette and Wordpress

---
 app/templates/Homepage/about.latte            |  2 +-
 app/templates/Homepage/aside.php              | 20 ++++++++++++++++++
 app/templates/Homepage/contact.latte          |  2 +-
 app/templates/Homepage/media.latte            |  2 +-
 app/templates/Homepage/news.latte             |  2 +-
 app/templates/Homepage/previous.latte         |  2 +-
 app/templates/Homepage/successStories.latte   |  2 +-
 .../themes/juniorinternet/sidebar.php         | 21 ++-----------------
 8 files changed, 28 insertions(+), 25 deletions(-)
 create mode 100644 app/templates/Homepage/aside.php

diff --git a/app/templates/Homepage/about.latte b/app/templates/Homepage/about.latte
index 719b46d..4313143 100644
--- a/app/templates/Homepage/about.latte
+++ b/app/templates/Homepage/about.latte
@@ -44,7 +44,7 @@ Věříme, že Junior Internet může být jedinečnou příležitost pro mnoho
 			</div>
 		</div>
 
-		{include 'aside.latte'}
+		{include 'aside.php'}
 
 	</div>
 
diff --git a/app/templates/Homepage/aside.php b/app/templates/Homepage/aside.php
new file mode 100644
index 0000000..ae973f7
--- /dev/null
+++ b/app/templates/Homepage/aside.php
@@ -0,0 +1,20 @@
+<div role="navigation" class="aside">
+	<h3>O Junior Internetu</h3>
+	<p>Již 14 let pomáháme mladým lidem poznávat internetové technologie, potkávat zajímavé lidi a prosadit se na internetu.</p>
+	<h3>Pořádáme</h3>
+	<div class="organise">
+		<h4>Soutěže</h4>
+		<p>Ukaž co v tobě je. Přihlaš projekt do soutěže a vyhraj hodnotné ceny.</p>
+		<p>
+			<a class="btn btn-primary" href="<?php $url = isset($urlToCompetitionSystem) ?: get_option('urlToCompetitionSystem'); echo $url  ?>">přihlásit projekt</a>
+			<span class="line-break-tablet"></span>
+			<a href="<?php echo netteLink('Homepage:competition') ?>">více informací</a>
+		</p>
+	</div>
+	<div class="organise">
+		<h4>Konference</h4>
+		<p>23. března 2013 zažijete den plný nezapomenutelných přednášek, nových kamarádů, zajímavých rozhovorů a finále soutěží Junior Internet.</p>
+		<p>Registrace na konferenci se otevřou v únoru 2013.</p>
+	</div>
+
+</div> 
diff --git a/app/templates/Homepage/contact.latte b/app/templates/Homepage/contact.latte
index 40e8a93..bbaec68 100644
--- a/app/templates/Homepage/contact.latte
+++ b/app/templates/Homepage/contact.latte
@@ -93,7 +93,7 @@ Together Czech Republic, o.s. je občanské sdružení vedené mladými lidmi za
 		</div>
 		</div>
 
-		{include 'aside.latte'}
+		{include 'aside.php'}
 
 	</div>
 
diff --git a/app/templates/Homepage/media.latte b/app/templates/Homepage/media.latte
index 25df012..5809545 100644
--- a/app/templates/Homepage/media.latte
+++ b/app/templates/Homepage/media.latte
@@ -41,7 +41,7 @@ Logo Junior Internet ("PDF":http://www.juniorinternet.cz/files/logo.pdf, "AI":ht
 			</div>
 		</div>
 
-		{include 'aside.latte'}
+		{include 'aside.php'}
 
 	</div>
 
diff --git a/app/templates/Homepage/news.latte b/app/templates/Homepage/news.latte
index 2de25b4..a035df7 100644
--- a/app/templates/Homepage/news.latte
+++ b/app/templates/Homepage/news.latte
@@ -75,7 +75,7 @@
 
 		</div>
 
-		{include 'aside.latte'}
+		{include 'aside.php'}
 
 	</div>
 
diff --git a/app/templates/Homepage/previous.latte b/app/templates/Homepage/previous.latte
index f6ba892..2992b26 100644
--- a/app/templates/Homepage/previous.latte
+++ b/app/templates/Homepage/previous.latte
@@ -111,7 +111,7 @@ Bude doplněno
 			</div>
 		</div>
 
-		{include 'aside.latte'}
+		{include 'aside.php'}
 
 	</div>
 
diff --git a/app/templates/Homepage/successStories.latte b/app/templates/Homepage/successStories.latte
index eec11c3..d5b3f55 100644
--- a/app/templates/Homepage/successStories.latte
+++ b/app/templates/Homepage/successStories.latte
@@ -50,7 +50,7 @@ Jste bývalý vítěz a chcete přidat svůj příběh? "Napište nám ho":info@
 			</div>
 		</div>
 
-		{include 'aside.latte'}
+		{include 'aside.php'}
 
 	</div>
 
diff --git a/novinky/wp-content/themes/juniorinternet/sidebar.php b/novinky/wp-content/themes/juniorinternet/sidebar.php
index 797ec90..ff97dce 100644
--- a/novinky/wp-content/themes/juniorinternet/sidebar.php
+++ b/novinky/wp-content/themes/juniorinternet/sidebar.php
@@ -1,20 +1,3 @@
-<div role="navigation" class="aside">
-	<h3>O Junior Internetu</h3>
-	<p>Již 14 let pomáháme mladým lidem poznávat internetové technologie, potkávat zajímavé lidi a prosadit se na internetu.</p>
-	<h3>Pořádáme</h3>
-	<div class="organise">
-		<h4>Soutěže</h4>
-		<p>Ukaž co v tobě je. Přihlaš projekt do soutěže a vyhraj hodnotné ceny.</p>
-		<p>
-			<a class="btn btn-primary" href="<?php echo get_option('urlToCompetitionSystem') ?>">přihlásit projekt</a>
-			<span class="line-break-tablet"></span>
-			<a href="<?php echo netteLink('Homepage:competition') ?>">více informací</a>
-		</p>
-	</div>
-	<div class="organise">
-		<h4>Konference</h4>
-		<p>23. března 2013 zažijete den plný nezapomenutelných přednášek, nových kamarádů, zajímavých rozhovorů a finále soutěží Junior Internet.</p>
-		<p>Registrace na konferenci se otevřou v únoru 2013.</p>
-	</div>
+<?php
 
-</div>
+require APP_DIR. '/templates/Homepage/aside.php';
\ No newline at end of file

From c5245a15e47fd259890d15a3927a61d2d546b36d Mon Sep 17 00:00:00 2001
From: Martin Kucera <martin@mkucera.cz>
Date: Wed, 27 Feb 2013 22:28:52 +0100
Subject: [PATCH 13/15] this is not being used anymore

---
 app/templates/Homepage/aside.latte            | 20 -------------------
 .../themes/juniorinternet/navigation.php      |  9 ---------
 2 files changed, 29 deletions(-)
 delete mode 100644 app/templates/Homepage/aside.latte
 delete mode 100644 novinky/wp-content/themes/juniorinternet/navigation.php

diff --git a/app/templates/Homepage/aside.latte b/app/templates/Homepage/aside.latte
deleted file mode 100644
index fa47114..0000000
--- a/app/templates/Homepage/aside.latte
+++ /dev/null
@@ -1,20 +0,0 @@
-<div role="navigation" class="aside">
-	<h3>O Junior Internetu</h3>
-	<p>Již 14 let pomáháme mladým lidem poznávat internetové technologie, potkávat zajímavé lidi a prosadit se na internetu.</p>
-	<h3>Pořádáme</h3>
-	<div class="organise">
-		<h4>Soutěže</h4>
-		<p>Ukaž co v tobě je. Přihlaš projekt do soutěže a vyhraj hodnotné ceny.</p>
-		<p>
-			<a class="btn btn-primary" href="{!$urlToCompetitionSystem}">přihlásit projekt</a>
-			<span class="line-break-tablet"></span>
-			<a n:href="competition">více informací</a>
-		</p>
-	</div>
-	<div class="organise">
-		<h4>Konference</h4>
-		<p>23. března 2013 zažijete den plný nezapomenutelných přednášek, nových kamarádů, zajímavých rozhovorů a finále soutěží Junior Internet.</p>
-		<p>Registrace na konferenci se otevřou v únoru 2013.</p>
-	</div>
-
-</div>
diff --git a/novinky/wp-content/themes/juniorinternet/navigation.php b/novinky/wp-content/themes/juniorinternet/navigation.php
deleted file mode 100644
index f13f9f8..0000000
--- a/novinky/wp-content/themes/juniorinternet/navigation.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="nav mainnav" role="navigation">
-	<a href="<?php echo netteLink('Homepage:news') ?>">Aktuálně</a>
-	<a href="<?php echo netteLink('Homepage:previous') ?>">Předchozí&nbsp;ročníky</a>
-	<a href="<?php echo netteLink('Homepage:successStories') ?>">Příběhy&nbsp;vítězů</a>
-	<a href="<?php echo netteLink('Homepage:about') ?>">O&nbsp;projektu</a>
-	<a href="<?php echo netteLink('Homepage:media') ?>">Pro&nbsp;média</a>
-	<a href="<?php echo netteLink('Homepage:contact') ?>">Kontakt</a>
-</div>
-

From f16b9da474577d3f7e91bba8a91eb08a352c65b6 Mon Sep 17 00:00:00 2001
From: Martin Kucera <martin@mkucera.cz>
Date: Wed, 27 Feb 2013 22:30:08 +0100
Subject: [PATCH 14/15] fix: if isset returned TRUE, $url contained TRUE
 instead of the url

---
 app/templates/Homepage/aside.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/Homepage/aside.php b/app/templates/Homepage/aside.php
index ae973f7..126f174 100644
--- a/app/templates/Homepage/aside.php
+++ b/app/templates/Homepage/aside.php
@@ -6,7 +6,7 @@
 		<h4>Soutěže</h4>
 		<p>Ukaž co v tobě je. Přihlaš projekt do soutěže a vyhraj hodnotné ceny.</p>
 		<p>
-			<a class="btn btn-primary" href="<?php $url = isset($urlToCompetitionSystem) ?: get_option('urlToCompetitionSystem'); echo $url  ?>">přihlásit projekt</a>
+			<a class="btn btn-primary" href="<?php $url = $urlToCompetitionSystem ?: get_option('urlToCompetitionSystem'); echo $url  ?>">přihlásit projekt</a>
 			<span class="line-break-tablet"></span>
 			<a href="<?php echo netteLink('Homepage:competition') ?>">více informací</a>
 		</p>

From 306716f5464cd8888f40315885a78f252d416db4 Mon Sep 17 00:00:00 2001
From: Martin Kucera <martin@mkucera.cz>
Date: Sat, 16 Mar 2013 15:26:07 +0100
Subject: [PATCH 15/15] ignore .directory (settings file generated by Dolphin)

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 4293e1e..b9f8ecc 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 temp/cache/*
-temp/btfj.dat
\ No newline at end of file
+temp/btfj.dat
+.directory
\ No newline at end of file