From: Christian Weiske Date: Thu, 8 May 2014 20:29:09 +0000 (+0200) Subject: display success flash message after forking X-Git-Tag: v0.4.0~48 X-Git-Url: https://git.cweiske.de/phorkie.git/commitdiff_plain/0b76a56ce249146702d7e7b23a74d5b3ef290174 display success flash message after forking --- diff --git a/data/templates/display-head.htm b/data/templates/display-head.htm index ba1f467..f610f84 100644 --- a/data/templates/display-head.htm +++ b/data/templates/display-head.htm @@ -1,9 +1,4 @@ -{% if forksuccess %} -
- × - Paste has been successfully forked. -
-{% endif %} +{% include 'flashmessages.htm' %}

{{repo.getTitle}}

diff --git a/data/templates/flashmessages.htm b/data/templates/flashmessages.htm new file mode 100644 index 0000000..3ea654a --- /dev/null +++ b/data/templates/flashmessages.htm @@ -0,0 +1,6 @@ +{% for msgdata in flashmessages %} +
+ × + {{msgdata.msg}} +
+{% endfor %} \ No newline at end of file diff --git a/src/phorkie/FlashMessage.php b/src/phorkie/FlashMessage.php new file mode 100644 index 0000000..80b8824 --- /dev/null +++ b/src/phorkie/FlashMessage.php @@ -0,0 +1,27 @@ + $msg, + 'type' => $type + ); + } + + public static function getAll() + { + if (!isset($_SESSION['flashmessages']) + || !is_array($_SESSION['flashmessages']) + ) { + return array(); + } + + $msgs = $_SESSION['flashmessages']; + unset($_SESSION['flashmessages']); + return $msgs; + } +} +?> diff --git a/www/display.php b/www/display.php index a41f4a8..be79e4b 100644 --- a/www/display.php +++ b/www/display.php @@ -21,6 +21,7 @@ render( 'repo' => $repo, 'dh' => new \Date_HumanDiff(), 'htmlhelper' => new HtmlHelper(), + 'flashmessages' => FlashMessage::getAll(), ) ); ?> diff --git a/www/fork-remote.php b/www/fork-remote.php index f41f981..096f432 100644 --- a/www/fork-remote.php +++ b/www/fork-remote.php @@ -26,6 +26,7 @@ if (isset($_REQUEST['remote_url'])) { $new = $forker->forkRemote( $gitUrl['url'], $fr->getUrl(), $gitUrl['title'] ); + FlashMessage::save('Remote paste has been forked'); redirect($new->getLink('display', null, true)); } catch (\Exception $e) { $error = $e->getMessage(); diff --git a/www/fork.php b/www/fork.php index 352f8bc..cddf2bb 100644 --- a/www/fork.php +++ b/www/fork.php @@ -16,6 +16,6 @@ $repo->loadFromRequest(); $forker = new Forker(); $new = $forker->forkLocal($repo); -//FIXME: where to put fork source link? +FlashMessage::save('Paste has been forked'); redirect($new->getLink('display', null, true)); ?>