From 530286832746425e3ed9299c9015a055dbca8653 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Schw=C3=B6rer=20=28Macbook=29?= Date: Thu, 16 Jan 2020 11:48:27 +0100 Subject: [PATCH] WebApps+About --- www/fragments/panel_aoc_calendar.php | 14 +- www/fragments/panel_blog.php | 4 +- www/fragments/panel_books.php | 4 +- www/fragments/panel_euler.php | 4 +- www/fragments/panel_programs.php | 4 +- www/internals/modules/mikeschergitgraph.php | 1 - www/pages/about.php | 162 +++++++++----------- www/pages/programs_view.php | 4 +- www/pages/webapps_list.php | 63 +++----- 9 files changed, 108 insertions(+), 152 deletions(-) diff --git a/www/fragments/panel_aoc_calendar.php b/www/fragments/panel_aoc_calendar.php index 431d72b..4c1629e 100644 --- a/www/fragments/panel_aoc_calendar.php +++ b/www/fragments/panel_aoc_calendar.php @@ -18,11 +18,9 @@ $ajax = $parameter['ajax']; $frame = $parameter['frame']; $frameid = $parameter['frameid']; -$AOC = $SITE->modules->AdventOfCode(); - -$assocdays = $AOC->listSingleYearAssociative($year); -$prev_year = $shownav ? $AOC->getPrevYear($year) : null; -$next_year = $shownav ? $AOC->getNextYear($year) : null; +$assocdays = $SITE->modules->AdventOfCode()->listSingleYearAssociative($year); +$prev_year = $shownav ? $SITE->modules->AdventOfCode()->getPrevYear($year) : null; +$next_year = $shownav ? $SITE->modules->AdventOfCode()->getNextYear($year) : null; if ($ajax) $FRAME_OPTIONS->addScript("/data/javascript/aoc_panel_interactive.js", true); @@ -37,14 +35,14 @@ if ($ajax) $FRAME_OPTIONS->addScript("/data/javascript/aoc_panel_interactive.js" if ($ajax) echo '<'; else - echo '<'; + echo '<'; } else { echo '<'; } - if ($linkheader) echo ''.$year.''; + if ($linkheader) echo ''.$year.''; else echo ''.$year.''; if ($next_year !== null) @@ -52,7 +50,7 @@ if ($ajax) $FRAME_OPTIONS->addScript("/data/javascript/aoc_panel_interactive.js" if ($ajax) echo '>'; else - echo '>'; + echo '>'; } else { diff --git a/www/fragments/panel_blog.php b/www/fragments/panel_blog.php index f5b5284..2f4d605 100644 --- a/www/fragments/panel_blog.php +++ b/www/fragments/panel_blog.php @@ -11,9 +11,7 @@ $parameter = $FRAGMENT_PARAM; ?> modules->Blog(); - - $allposts = $BLOG->listAllNewestFirst(); +$allposts = $SITE->modules->Blog()->listAllNewestFirst(); ?>
diff --git a/www/fragments/panel_books.php b/www/fragments/panel_books.php index 9209902..ed3ea9c 100644 --- a/www/fragments/panel_books.php +++ b/www/fragments/panel_books.php @@ -11,9 +11,7 @@ $parameter = $FRAGMENT_PARAM; ?> modules->Books(); - - $allbooks = $BOOKS->listAllNewestFirst(); +$allbooks = $SITE->modules->Books()->listAllNewestFirst(); ?>
diff --git a/www/fragments/panel_euler.php b/www/fragments/panel_euler.php index 143859a..843be72 100644 --- a/www/fragments/panel_euler.php +++ b/www/fragments/panel_euler.php @@ -11,9 +11,7 @@ $parameter = $FRAGMENT_PARAM; ?> modules->Euler(); - - $data = $EULER->listAll(); + $data = $SITE->modules->Euler()->listAll(); $RATING_CLASSES = ['euler_pnl_celltime_perfect', 'euler_pnl_celltime_good', 'euler_pnl_celltime_ok', 'euler_pnl_celltime_bad', 'euler_pnl_celltime_fail']; ?> diff --git a/www/fragments/panel_programs.php b/www/fragments/panel_programs.php index 63ab45b..ad82e36 100644 --- a/www/fragments/panel_programs.php +++ b/www/fragments/panel_programs.php @@ -11,9 +11,7 @@ $parameter = $FRAGMENT_PARAM; ?> modules->Programs(); - - $allprograms = $PROGRAMS->listAllNewestFirst(); +$allprograms = $SITE->modules->Programs()->listAllNewestFirst(); ?>
diff --git a/www/internals/modules/mikeschergitgraph.php b/www/internals/modules/mikeschergitgraph.php index 78259c2..059eab8 100644 --- a/www/internals/modules/mikeschergitgraph.php +++ b/www/internals/modules/mikeschergitgraph.php @@ -20,7 +20,6 @@ class MikescherGitGraph /** * @return string|null - * @throws Exception */ public function get() { diff --git a/www/pages/about.php b/www/pages/about.php index 3eea2d9..19cffb6 100644 --- a/www/pages/about.php +++ b/www/pages/about.php @@ -1,114 +1,98 @@ - - - - - Mikescher.com - About - - - - - - -
- +title = 'About'; +$FRAME_OPTIONS->canonical_url = 'https://www.mikescher.com/about'; +$FRAME_OPTIONS->activeHeader = 'about'; +?> -
+
-
+

About mikescher.com

-

About mikescher.com

+ - +
+
About me
-
-
About me
+
-
+

Welcome to my Mikescher.com

+

This is my personal homepage, I use it to upload programs I have written, web serials I have style-setted and sometimes for a little bit of blogging.

+

Its mostly just a collection of stuff I wanted to put only, but I guess thats the core of most personal homepages

-

Welcome to my Mikescher.com

-

This is my personal homepage, I use it to upload programs I have written, web serials I have style-setted and sometimes for a little bit of blogging.

-

Its mostly just a collection of stuff I wanted to put only, but I guess thats the core of most personal homepages

+
+
-
+ -
+
+
My git timeline
- +
-
-
My git timeline
+ addScript('/data/javascript/extendedgitgraph.js', true); + echo $SITE->modules->ExtendedGitGraph()->get(); + ?> -
+
- +
-
+ -
+
+
Other addresses
- +
-
-
Other addresses
+ + + + + Github + + + + + + Goodreads + + + + + + Stackoverflow + + + + + + Reddit + + + + + + Delphi-Praxis + + + + + + E-Mail + -
+
- - - - - Github - - - - - - Goodreads - - - - - - Stackoverflow - - - - - - Reddit - - - - - - Delphi-Praxis - - - - - - E-Mail - - -
- -
- -
- -
- - +
- - - - \ No newline at end of file diff --git a/www/pages/programs_view.php b/www/pages/programs_view.php index 91b98bc..20f3820 100644 --- a/www/pages/programs_view.php +++ b/www/pages/programs_view.php @@ -15,8 +15,6 @@ if ($prog === null) { $FRAME_OPTIONS->setForced404("Program not found"); return; $FRAME_OPTIONS->title = $prog['name']; $FRAME_OPTIONS->canonical_url =$prog['url']; $FRAME_OPTIONS->activeHeader = 'programs'; - -if ($prog['has_extra_images']) $FRAME_OPTIONS->addScript('/data/javascript/ms_basic.js', true); ?>
@@ -74,6 +72,8 @@ if ($prog['has_extra_images']) $FRAME_OPTIONS->addScript('/data/javascript/ms_ba + addScript('/data/javascript/ms_basic.js', true); ?> +
diff --git a/www/pages/webapps_list.php b/www/pages/webapps_list.php index 52183c7..c0cf0bf 100644 --- a/www/pages/webapps_list.php +++ b/www/pages/webapps_list.php @@ -1,52 +1,35 @@ - - - - - Mikescher.com - Tools - - - - - - - - - - \ No newline at end of file