diff --git a/assets/less/mio/classes/forum/post.less b/assets/less/mio/classes/forum/post.less index bd5749f9..f3243b29 100644 --- a/assets/less/mio/classes/forum/post.less +++ b/assets/less/mio/classes/forum/post.less @@ -72,11 +72,6 @@ margin: 5px; max-width: 170px; - // somewhat temporary? - // more stuff will be added eventually which this will be mixed in with - display: flex; - flex-direction: column-reverse; - @media (max-width: @mio-forum-post-mobile) { display: none; } diff --git a/assets/less/mio/classes/news/preview.less b/assets/less/mio/classes/news/preview.less index e6492b6f..1ed6eeff 100644 --- a/assets/less/mio/classes/news/preview.less +++ b/assets/less/mio/classes/news/preview.less @@ -28,6 +28,10 @@ flex-shrink: 0; } + &__date { + display: block; + } + &__user { text-decoration: none; color: inherit; diff --git a/build.sh b/build.sh index 939de00d..c00a34f1 100644 --- a/build.sh +++ b/build.sh @@ -12,19 +12,23 @@ PUBLIC_JS="$PUBLIC_DIR/js" NODE_PATH='./node_modules' -NODE_DEST_JS="$PUBLIC_JS/libs.js" +NODE_DEST_JS="$PUBLIC_JS/libraries.js" NODE_IMPORT_JS=( #'turbolinks/dist/turbolinks.js' #'highlightjs/highlight.pack.min.js' + 'timeago.js/dist/timeago.min.js' + 'timeago.js/dist/timeago.locales.min.js' ) -NODE_DEST_CSS="$PUBLIC_CSS/libs.css" +NODE_DEST_CSS="$PUBLIC_CSS/libraries.css" NODE_IMPORT_CSS=( #'highlightjs/styles/default.css' ) # delete old files, using find to avoid errors echo "=> Cleanup" +mkdir -p $PUBLIC_CSS +mkdir -p $PUBLIC_JS find $ASSETS_TS -type f -name "*.d.ts" -delete -print find $PUBLIC_CSS -type f -name "*.css" -delete -print find $PUBLIC_JS -type f -name "*.js" -delete -print diff --git a/composer.json b/composer.json index 73ecfebb..14ad2486 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,8 @@ "nesbot/carbon": "~1.22", "swiftmailer/swiftmailer": "~6.0", "erusev/parsedown": "~1.6", - "geoip2/geoip2": "~2.0" + "geoip2/geoip2": "~2.0", + "twig/extensions": "^1.5" }, "require-dev": { "phpunit/phpunit": "~6.0" diff --git a/composer.lock b/composer.lock index fa4647a4..f214bbcc 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f30e0f8bcfb4eb650250a7e4efb17058", + "content-hash": "b859e162d3882d5c8dbbfbb02b1eb0b7", "packages": [ { "name": "composer/ca-bundle", @@ -603,6 +603,62 @@ "homepage": "https://symfony.com", "time": "2018-04-30T01:23:47+00:00" }, + { + "name": "twig/extensions", + "version": "v1.5.1", + "source": { + "type": "git", + "url": "https://github.com/twigphp/Twig-extensions.git", + "reference": "d188c76168b853481cc75879ea045bf93d718e9c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/twigphp/Twig-extensions/zipball/d188c76168b853481cc75879ea045bf93d718e9c", + "reference": "d188c76168b853481cc75879ea045bf93d718e9c", + "shasum": "" + }, + "require": { + "twig/twig": "~1.27|~2.0" + }, + "require-dev": { + "symfony/phpunit-bridge": "~3.3@dev", + "symfony/translation": "~2.3|~3.0" + }, + "suggest": { + "symfony/translation": "Allow the time_diff output to be translated" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.5-dev" + } + }, + "autoload": { + "psr-0": { + "Twig_Extensions_": "lib/" + }, + "psr-4": { + "Twig\\Extensions\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Common additional features for Twig that do not directly belong in core", + "homepage": "http://twig.sensiolabs.org/doc/extensions/index.html", + "keywords": [ + "i18n", + "text" + ], + "time": "2017-06-08T18:19:53+00:00" + }, { "name": "twig/twig", "version": "v2.4.8", diff --git a/package.json b/package.json new file mode 100644 index 00000000..a224c9a0 --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "timeago.js": "^3.0.2" + } +} diff --git a/src/Database.php b/src/Database.php index f69765f1..c44d972a 100644 --- a/src/Database.php +++ b/src/Database.php @@ -141,7 +141,11 @@ final class Database $dsn .= 'dbname=' . $this->configManager->get($section, 'database', 'string', 'misuzu') . ';'; - $options[PDO::MYSQL_ATTR_INIT_COMMAND] = "SET SESSION sql_mode='ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION'"; + $options[PDO::MYSQL_ATTR_INIT_COMMAND] = " + SET SESSION + sql_mode='ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION', + time_zone = '+00:00'; + "; break; } diff --git a/src/TemplateEngine.php b/src/TemplateEngine.php index 51de1da9..32abba11 100644 --- a/src/TemplateEngine.php +++ b/src/TemplateEngine.php @@ -2,6 +2,7 @@ namespace Misuzu; use Twig_Environment; +use Twig_Extensions_Extension_Date; use Twig_Loader_Filesystem; use Twig_SimpleFilter; use Twig_SimpleFunction; @@ -56,6 +57,7 @@ class TemplateEngine 'auto_reload' => $autoReload, 'debug' => $debug, ]); + $this->twig->addExtension(new Twig_Extensions_Extension_Date); } /** diff --git a/views/mio/forum/macros.twig b/views/mio/forum/macros.twig index e535cbe9..6a6c72ed 100644 --- a/views/mio/forum/macros.twig +++ b/views/mio/forum/macros.twig @@ -101,7 +101,9 @@ style="color:{{ forum.recent_post_user_colour|colour_get_css }}" class="forum__listing__entry__activity__user">{{ forum.recent_post_username }}, {% endif %} - {{ forum.recent_post_created }} + @@ -135,7 +137,10 @@ {% if archived %} This topic has been archived. {% else %} - This topic was locked on . + This topic was locked . {% endif %} @@ -197,7 +202,7 @@ style="color:{{ topic.author_colour|colour_get_css }}">{{ topic.author_name }}, {% endif %} - {{ topic.topic_created }} + @@ -214,7 +219,9 @@
- {{ topic.response_created }} +
{% if topic.respondent_id is not null %} @@ -262,7 +269,7 @@ style="color:{{ post.poster_colour|colour_get_css }}">{{ post.poster_name }}
- joined {{ post.poster_joined }} + joined
{% else %} @@ -276,7 +283,7 @@
- {{ post.post_created }} + #{{ post.post_id }} diff --git a/views/mio/forum/topic.twig b/views/mio/forum/topic.twig index 6bd16c37..2f642401 100644 --- a/views/mio/forum/topic.twig +++ b/views/mio/forum/topic.twig @@ -36,12 +36,12 @@ {% if can_reply %} {{ forum_posting_form('Reply', topic_info.topic_id, true, 'reply', true) }} - + {% endif %} {{ navigation(mio_navigation, '/forum/') }} diff --git a/views/mio/master.twig b/views/mio/master.twig index 590b2db9..6c80932c 100644 --- a/views/mio/master.twig +++ b/views/mio/master.twig @@ -77,7 +77,12 @@
+