From 591afdb5f330be28505aa8eac00360652ff69ae4 Mon Sep 17 00:00:00 2001 From: Martin Kucera Date: Fri, 11 Jan 2013 22:29:59 +0100 Subject: [PATCH 1/8] permalink --- wp-content/themes/juniorinternet/home.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wp-content/themes/juniorinternet/home.php b/wp-content/themes/juniorinternet/home.php index 732b543..d23b74e 100644 --- a/wp-content/themes/juniorinternet/home.php +++ b/wp-content/themes/juniorinternet/home.php @@ -16,7 +16,7 @@
> -

+

From 119c79cc58d0c35cf5dae43308670caef8944085 Mon Sep 17 00:00:00 2001 From: Martin Kucera Date: Fri, 11 Jan 2013 22:31:27 +0100 Subject: [PATCH 2/8] display single post --- wp-content/themes/juniorinternet/single.php | 27 ++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/wp-content/themes/juniorinternet/single.php b/wp-content/themes/juniorinternet/single.php index 3e7633a..4e6fdb0 100644 --- a/wp-content/themes/juniorinternet/single.php +++ b/wp-content/themes/juniorinternet/single.php @@ -1 +1,26 @@ - \ No newline at end of file + + +
+ +
+ + +
> + +

+ +
+ + + + + + + +
+ +
+ + + + \ No newline at end of file From c408f88521f18c0b1555f3815b29f2b140145efc Mon Sep 17 00:00:00 2001 From: Martin Kucera Date: Fri, 11 Jan 2013 22:32:05 +0100 Subject: [PATCH 3/8] banner moved to header-classic --- wp-content/themes/juniorinternet/header-classic.php | 12 +++++++++++- wp-content/themes/juniorinternet/home.php | 9 --------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/wp-content/themes/juniorinternet/header-classic.php b/wp-content/themes/juniorinternet/header-classic.php index 992bed5..effc024 100644 --- a/wp-content/themes/juniorinternet/header-classic.php +++ b/wp-content/themes/juniorinternet/header-classic.php @@ -2,4 +2,14 @@ > - \ No newline at end of file + + + \ No newline at end of file diff --git a/wp-content/themes/juniorinternet/home.php b/wp-content/themes/juniorinternet/home.php index d23b74e..4730965 100644 --- a/wp-content/themes/juniorinternet/home.php +++ b/wp-content/themes/juniorinternet/home.php @@ -1,13 +1,4 @@ -
From 1d071d03e8597e0664c5adf5e886ca37e1c32ee5 Mon Sep 17 00:00:00 2001 From: Martin Kucera Date: Fri, 11 Jan 2013 23:20:08 +0100 Subject: [PATCH 4/8] the_date only shows the different dates... using the_time and with configurable format --- wp-content/themes/juniorinternet/home.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wp-content/themes/juniorinternet/home.php b/wp-content/themes/juniorinternet/home.php index 4730965..9e25e94 100644 --- a/wp-content/themes/juniorinternet/home.php +++ b/wp-content/themes/juniorinternet/home.php @@ -6,7 +6,7 @@
> - +

From c670882e72a015d1527d9cd6149c902747f626ad Mon Sep 17 00:00:00 2001 From: Martin Kucera Date: Fri, 11 Jan 2013 23:23:58 +0100 Subject: [PATCH 5/8] paginator --- wp-content/themes/juniorinternet/home.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/wp-content/themes/juniorinternet/home.php b/wp-content/themes/juniorinternet/home.php index 9e25e94..20ecd5e 100644 --- a/wp-content/themes/juniorinternet/home.php +++ b/wp-content/themes/juniorinternet/home.php @@ -12,6 +12,13 @@
+ max_num_pages > 1 ) : ?> + + + From 423baed0e9a3509263577d6b4232069917acf9bb Mon Sep 17 00:00:00 2001 From: Martin Kucera Date: Fri, 11 Jan 2013 23:29:52 +0100 Subject: [PATCH 6/8] everyone has to change his wp-config.php and this makes problems with merges (uncommited changes) --- .gitignore | 1 + README.md | 1 + 2 files changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7d3d22f --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +wp-config.php \ No newline at end of file diff --git a/README.md b/README.md index ae88049..40be806 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ běží na Wordpress 3.4.2 ## Instalace - vytvoř si databázi - např. `juniorinternet_blog` - do ní si naimportuj soubor `.sql` +- zkopíruj si soubor `wp-config-sample.php` a kopii přejmenuj na `wp_config.php` - edituj `wp_config.php` podle svého nastavení MySQL - web by měl běžet. Defaultní user: admin / admin (na produkci změněno) From df83d3c2ca44d43b21ee5362bb7e8b66d409ce44 Mon Sep 17 00:00:00 2001 From: Martin Kucera Date: Sat, 12 Jan 2013 00:04:04 +0100 Subject: [PATCH 7/8] moved 404 to index.php (if these template files don't exist, index.php is used automatically) --- .../themes/juniorinternet/404-header.php | 3 - wp-content/themes/juniorinternet/archive.php | 1 - .../themes/juniorinternet/comments-popup.php | 1 - wp-content/themes/juniorinternet/index.php | 114 +----------------- wp-content/themes/juniorinternet/search.php | 1 - 5 files changed, 3 insertions(+), 117 deletions(-) delete mode 100644 wp-content/themes/juniorinternet/404-header.php delete mode 100644 wp-content/themes/juniorinternet/archive.php delete mode 100644 wp-content/themes/juniorinternet/comments-popup.php delete mode 100644 wp-content/themes/juniorinternet/search.php diff --git a/wp-content/themes/juniorinternet/404-header.php b/wp-content/themes/juniorinternet/404-header.php deleted file mode 100644 index 29052f5..0000000 --- a/wp-content/themes/juniorinternet/404-header.php +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/wp-content/themes/juniorinternet/comments-popup.php b/wp-content/themes/juniorinternet/comments-popup.php deleted file mode 100644 index 3e7633a..0000000 --- a/wp-content/themes/juniorinternet/comments-popup.php +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/wp-content/themes/juniorinternet/index.php b/wp-content/themes/juniorinternet/index.php index 2158b51..29052f5 100644 --- a/wp-content/themes/juniorinternet/index.php +++ b/wp-content/themes/juniorinternet/index.php @@ -1,111 +1,3 @@ - - - - -
- -
-

Soutěže

-

Ukaž co v tobě je. Přihlaš projekt do soutěže a vyhraj hodnotné ceny.

-

Junior Internet se může stát tvým odrazovým můstkem, který tě vyhoupne do světa úspěšných mladých internetových webdesignerů, programátorů, internetových novinářů, či náctiletých podnikatelů.

-

Přihlášky končí 17. února 2013 o půlnoci.

-
-
-

Junior Web

-
-
-

Webové stránky, internetové služby a projekty umístěné na Internetu.

-
-
-
-
-

Junior Design

-
-
-

Design webových stránek či jiné elektronické grafické práce.

-
-
-
-
-

Junior Text

-
-
-

Slohová práce na téma "internet a vzdělávání".

-
-
-
-
-

Junior Erb

-
-
-

Obecně prospěšné internetové projekty nebo stránky týkající se místa vašeho bydliště.

-
-
-
-
-

Letos udělujeme také speciální ceny napříč soutěžemi Junior Web a Junior Erb:

-
    -
  • Technologické zpracování
    • -
  • Uživatelský prožitek na mobilech
    • -
  • Nadace Vodafone za obecně prospěšný projekt
    • -
  • Cena veřejnosti
    • -
-

Přihlásit se do soutěže

-

- další informace | - pravidla soutěže & průběh hodnocení -

-
- -
- - - - - - - \ No newline at end of file + \ No newline at end of file From 12b6fbeaa8f1513be252a8b3ddd656462131b56c Mon Sep 17 00:00:00 2001 From: Martin Kucera Date: Wed, 30 Jan 2013 15:08:33 +0100 Subject: [PATCH 8/8] fix: header on 404 is custom --- wp-content/themes/juniorinternet/404.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wp-content/themes/juniorinternet/404.php b/wp-content/themes/juniorinternet/404.php index bd06b35..e6f9592 100644 --- a/wp-content/themes/juniorinternet/404.php +++ b/wp-content/themes/juniorinternet/404.php @@ -1,4 +1,4 @@ - +