From 2f5c31b696d71449f2c6b59e20f3b9b215d847dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Schw=C3=B6rer?= Date: Sun, 8 Jun 2014 15:31:44 +0200 Subject: [PATCH] Improved ExtendedGitGraph Design in /about --- .idea/workspace.xml | 184 +++++++++++++++------------ www/css/styles.css | 70 +++++++++- www/protected/views/msmain/about.php | 40 +++++- www/protected/views/msmain/admin.php | 13 +- 4 files changed, 213 insertions(+), 94 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 9c4f271..07a809d 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,12 +3,12 @@ - - - + + + @@ -62,7 +62,26 @@ - + + + + + + + + + + + + + + + + + + + + @@ -75,7 +94,6 @@ @@ -620,7 +639,7 @@ - + @@ -628,20 +647,20 @@ - - + + - + - + @@ -665,15 +684,10 @@ - - - - - - @@ -844,11 +858,6 @@ - - - - - @@ -859,46 +868,19 @@ - - - - - - - - - - - - - - - + - - - - - - - - - - + - - - - - + @@ -908,51 +890,85 @@ - - - - - - - - - - - - - - - - - - - - - - - - + - + + + + + + - + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/www/css/styles.css b/www/css/styles.css index b5077bb..fec4061 100644 --- a/www/css/styles.css +++ b/www/css/styles.css @@ -440,4 +440,72 @@ ul.nav li.dropdown-append:hover > ul.dropdown-menu { text-decoration: none; color: #2C3E50; text-shadow: 0px 0px 8px #00F; -} \ No newline at end of file +} + +/* About/Gitbox +-------------------------------------------------- */ + +.gitbox-container { + border: 2px solid #CAECEC; + border-radius: 6px; + + text-align: center; + + margin-bottom: 10px; +} + +.gitbox-header { + background-color: #F5F5F5; + border-bottom: 2px solid #CAECEC; + + border-top-left-radius: 6px; + border-top-right-radius: 6px; + + padding: 5px; + margin-bottom: 10px; + + font-size: 13px; + font-weight: bold; + color: gray; +} + +.gitbox-footer { + background-color: #F5F5F5; + border-top: 2px solid #CAECEC; + + border-bottom-left-radius: 6px; + border-bottom-right-radius: 6px; + + margin-top: 10px; +} + +.gitbox-footer-box { + width: 385px; + display: table-cell; +} + +.gitbox-footer-box:not(:first-child) { + border-left: 2px solid #CAECEC; +} + +.gitbox-footer-box-header { + display: block; + + color: #777; + font-size: 11px; +} + +.gitbox-footer-box-number { + display: block; + + font-weight: 300; + line-height: 1.3em; + font-size: 24px; +} + +.gitbox-footer-box-footer { + display: block; + + color: #777; + font-size: 11px; +} diff --git a/www/protected/views/msmain/about.php b/www/protected/views/msmain/about.php index 343cc75..e1417bd 100644 --- a/www/protected/views/msmain/about.php +++ b/www/protected/views/msmain/about.php @@ -27,8 +27,44 @@ $this->selectedNav = 'about';

If you want you can look at the things I programd

- loadFinished(); ?> -
+ loadFinishedData(); ?> +
+
My Github Commits
+ + + +
+
+ Last Update + diff(new DateTime())->format('%d'); ?> daydiff(new DateTime())->format('d') == 1) ? '' : 's')?> ago + format('M d Y'); ?> +
+ +
+ Total commits + + format('M d Y') . ' - ' . $egh['end']->format('M d Y'); ?> +
+ +
+ Longest streak + day + format('M d Y') . ' - ' . $egh['streak_end']->format('M d Y'); ?> +
+ +
+ Max commits + / day + format('M d Y'); ?> +
+ +
+ Avg commits + / day + format('M d Y') . ' - ' . $egh['end']->format('M d Y'); ?> +
+
+
loadData(); + $egh = $egh = (new ExtendedGitGraph('Mikescher'))->loadFinishedData(); ?>

ExtendedGitGraph

- Last Update: getFinishedDate()->format('d.m.Y H:i'); ?>
- Repositories: repositories); ?>
- Commits: commits); ?>
+ Last Update: format('d.m.Y H:i'); ?>
+ Repositories:
+ Commits: