author
int64
658
755k
date
stringlengths
19
19
timezone
int64
-46,800
43.2k
hash
stringlengths
40
40
message
stringlengths
5
490
mods
list
language
stringclasses
20 values
license
stringclasses
3 values
repo
stringlengths
5
68
original_message
stringlengths
12
491
95,144
02.07.2019 16:14:17
-7,200
343260bb53dbef6b602d64aeff28f6b949cca726
Use Dropzone locally, not from CDN
[ { "change_type": "MODIFY", "old_path": "assets/js/bolt.js", "new_path": "assets/js/bolt.js", "diff": "import '@babel/polyfill';\n+import 'dropzone';\nimport 'bootstrap';\nimport Axios from 'axios';\n" }, { "change_type": "MODIFY", "old_path": "package-lock.json", "new_path": "package-lock.json", "diff": "},\n\"minimist\": {\n\"version\": \"1.2.0\",\n- \"resolved\": \"https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz\",\n+ \"resolved\": \"http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz\",\n\"integrity\": \"sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=\",\n\"dev\": true\n},\n},\n\"@types/strip-bom\": {\n\"version\": \"3.0.0\",\n- \"resolved\": \"https://registry.npmjs.org/@types/strip-bom/-/strip-bom-3.0.0.tgz\",\n+ \"resolved\": \"http://registry.npmjs.org/@types/strip-bom/-/strip-bom-3.0.0.tgz\",\n\"integrity\": \"sha1-FKjsOVbC6B7bdSB5CuzyHCkK69I=\",\n\"dev\": true\n},\n},\n\"array-equal\": {\n\"version\": \"1.0.0\",\n- \"resolved\": \"https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz\",\n+ \"resolved\": \"http://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz\",\n\"integrity\": \"sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=\",\n\"dev\": true\n},\n},\n\"babel-plugin-syntax-object-rest-spread\": {\n\"version\": \"6.13.0\",\n- \"resolved\": \"https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz\",\n+ \"resolved\": \"http://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz\",\n\"integrity\": \"sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=\",\n\"dev\": true\n},\n\"resolved\": \"https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz\",\n\"integrity\": \"sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==\"\n},\n+ \"dropzone\": {\n+ \"version\": \"5.5.1\",\n+ \"resolved\": \"https://registry.npmjs.org/dropzone/-/dropzone-5.5.1.tgz\",\n+ \"integrity\": \"sha512-3VduRWLxx9hbVr42QieQN25mx/I61/mRdUSuxAmDGdDqZIN8qtP7tcKMa3KfpJjuGjOJGYYUzzeq6eGDnkzesA==\"\n+ },\n\"duplexer\": {\n\"version\": \"0.1.1\",\n\"resolved\": \"https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz\",\n},\n\"load-json-file\": {\n\"version\": \"1.1.0\",\n- \"resolved\": \"http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz\",\n\"integrity\": \"sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=\",\n\"dev\": true,\n\"requires\": {\n},\n\"minimist\": {\n\"version\": \"1.2.0\",\n- \"resolved\": \"http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz\",\n\"integrity\": \"sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=\",\n\"dev\": true\n},\n\"dependencies\": {\n\"semver\": {\n\"version\": \"5.3.0\",\n- \"resolved\": \"http://registry.npmjs.org/semver/-/semver-5.3.0.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/semver/-/semver-5.3.0.tgz\",\n\"integrity\": \"sha1-myzl094C0XxgEq0yaqa00M9U+U8=\",\n\"dev\": true\n}\n\"dependencies\": {\n\"minimist\": {\n\"version\": \"1.2.0\",\n- \"resolved\": \"https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz\",\n+ \"resolved\": \"http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz\",\n\"integrity\": \"sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=\",\n\"dev\": true\n}\n},\n\"load-json-file\": {\n\"version\": \"1.1.0\",\n- \"resolved\": \"http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz\",\n\"integrity\": \"sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=\",\n\"dev\": true,\n\"requires\": {\n},\n\"os-locale\": {\n\"version\": \"1.4.0\",\n- \"resolved\": \"http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz\",\n+ \"resolved\": \"https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz\",\n\"integrity\": \"sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=\",\n\"dev\": true,\n\"requires\": {\n},\n\"through\": {\n\"version\": \"2.3.8\",\n- \"resolved\": \"https://registry.npmjs.org/through/-/through-2.3.8.tgz\",\n+ \"resolved\": \"http://registry.npmjs.org/through/-/through-2.3.8.tgz\",\n\"integrity\": \"sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=\",\n\"dev\": true\n},\n" }, { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"bootbox\": \"^5.1.3\",\n\"bootstrap\": \"^4.3.1\",\n\"codemirror\": \"^5.48.0\",\n+ \"dropzone\": \"^5.5.1\",\n\"flagpack\": \"^1.0.3\",\n\"jquery\": \"^3.4.1\",\n\"luxon\": \"^1.16.0\",\n" }, { "change_type": "MODIFY", "old_path": "templates/finder/_uploader.html.twig", "new_path": "templates/finder/_uploader.html.twig", "diff": "-<script src=\"https://cdnjs.cloudflare.com/ajax/libs/dropzone/5.5.1/dropzone.js\" integrity=\"sha256-awEOL+kdrMJU/HUksRrTVHc6GA25FvDEIJ4KaEsFfG4=\" crossorigin=\"anonymous\"></script>\n-<link rel=\"stylesheet\" href=\"https://cdnjs.cloudflare.com/ajax/libs/dropzone/5.5.1/basic.css\" integrity=\"sha256-NI6EfwSJhhs7gXBPbwLXD00msI29Bku3GDJT8gYW+gc=\" crossorigin=\"anonymous\" />\n-\n<div class=\"card mb-4\">\n<div class=\"card-header\">{{ 'caption.file_uploader'|trans }}</div>\n<input name=\"file\" type=\"file\" multiple />\n</div>\n</form>\n-\n</div>\n" } ]
PHP
MIT License
bolt/core
Use Dropzone locally, not from CDN
95,192
03.07.2019 10:15:49
-7,200
c932e532ec1eb2472819cbb895013cd50ace1202
fix for slim
[ { "change_type": "MODIFY", "old_path": "assets/scss/modules/admin/_sidebar.scss", "new_path": "assets/scss/modules/admin/_sidebar.scss", "diff": ".admin {\n&.is-slim {\n.admin__sidebar {\n+ width: $admin-sidebar-width / 3;\n.admin__sidebar--separator,\n.admin__sidebar--footer {\ndisplay: none;\n" } ]
PHP
MIT License
bolt/core
fix for slim
95,192
04.07.2019 14:26:17
-7,200
9ebe553b9e10fd5f7ea4903d9ce8102a3df3cfa0
put common.js in place for generic backend js
[ { "change_type": "ADD", "old_path": null, "new_path": "assets/js/app/common.js", "diff": "+import $ from 'jquery';\n+\n+$(document).ready(function() {\n+\n+ // add a js class to indicate we have JS enabled. Might need a change to either modernizr or somethng comparable\n+ $('html').addClass('js');\n+\n+ /*\n+ ** Sidebar collapse functionality\n+ ** Collapsible Sidebar on load\n+ ** The 'admin__sidebar--is-collapsed' class has effect up to screen sizes where the sidebar menu cannot be totally\n+ ** offscreen anymore\n+ */\n+ $('.admin__sidebar').addClass('admin__sidebar--is-collapsed');\n+\n+ $('.admin-sidebar-toggler').on('click', function() {\n+ if ($('.admin__sidebar').hasClass('admin__sidebar--is-collapsed')) {\n+ $('.admin__sidebar').addClass('admin__sidebar--is-expanded').removeClass('admin__sidebar--is-collapsed');\n+ $(this).toggleClass('is-active');\n+ } else {\n+ $('.admin__sidebar').addClass('admin__sidebar--is-collapsed').removeClass('admin__sidebar--is-expanded');\n+ $(this).toggleClass('is-active');\n+ }\n+ });\n+\n+});\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "assets/js/app/index.js", "new_path": "assets/js/app/index.js", "diff": "@@ -5,3 +5,4 @@ import './listing';\nimport './editor';\nimport './login';\nimport './confirmation.js';\n+import './common.js';\n" }, { "change_type": "MODIFY", "old_path": "assets/js/app/notifications/index.js", "new_path": "assets/js/app/notifications/index.js", "diff": "@@ -2,19 +2,4 @@ import $ from 'jquery';\n$(document).ready(function() {\n$('.toast').toast('show');\n- // add a js class to indicate we have JS enabled. Needs a change to either modernizr or something custom @bobdenotter\n- $('html').addClass('js');\n-\n- $('.admin__sidebar').addClass('admin__sidebar--is-collapsed');\n-\n- $('.admin-sidebar-toggler').click(function() {\n- if ($('.admin__sidebar').hasClass('admin__sidebar--is-collapsed')) {\n- $('.admin__sidebar').addClass('admin__sidebar--is-expanded').removeClass('admin__sidebar--is-collapsed');\n- $(this).toggleClass('is-active');\n- } else {\n- $('.admin__sidebar').addClass('admin__sidebar--is-collapsed').removeClass('admin__sidebar--is-expanded');\n- $(this).toggleClass('is-active');\n- }\n- });\n-\n});\n\\ No newline at end of file\n" } ]
PHP
MIT License
bolt/core
put common.js in place for generic backend js
95,192
04.07.2019 14:36:17
-7,200
dd8b317bf83073efc7da41d45cab771cb5cd12d0
fix missed line to delete in file
[ { "change_type": "MODIFY", "old_path": "assets/scss/init/_variables.scss", "new_path": "assets/scss/init/_variables.scss", "diff": "@@ -85,7 +85,6 @@ $grid-breakpoints: (\n// Modal Dialog spacing\n$modal-dialog-margin-y-sm-up: 4rem;\n-=======\n// This number determines of a button has white or black text (a11y)\n// 150: about equal to 3.0 color contrast ( WCAG2 for bold and texts above 18pts).\n// 117: for 4.5 color contrast (WCAG2 for normal text) (see ~bootstrap/_functions.scss for use in function)\n" } ]
PHP
MIT License
bolt/core
fix missed line to delete in file
95,144
08.07.2019 21:10:03
-7,200
ed328729f91a7b56f3ec0d367af5814dc63b006b
Workaround for editing translations in backend
[ { "change_type": "ADD", "old_path": null, "new_path": "templates/bundles/TranslationBundle/SymfonyProfiler/translation.html.twig", "diff": "+{# Temporary workaround, until this patch is in a release:\n+ @see: https://github.com/php-translation/symfony-bundle/pull/311\n+ @see: https://github.com/bolt/four/issues/506\n+ #}\n+\n+{% extends '@WebProfiler/Collector/translation.html.twig' %}\n+\n+{#\n+ # Authors Tobias Nyholm, Damien Alexandre (damienalexandre), Damien Harper\n+ #}\n+\n+{% import _self as translation_helper %}\n+\n+{% block panelContent %}\n+ <h2>Translation Metrics</h2>\n+\n+ <div>\n+ <a class=\"btn\" href=\"javascript:void(0);\" onclick='syncAll()'>Synchronize all translations</a><br />\n+ <div id=\"top-result-area\"></div>\n+ </div>\n+\n+ <div class=\"metrics\">\n+ <div class=\"metric\">\n+ <span class=\"value\">{{ collector.countdefines }}</span>\n+ <span class=\"label\">Defined messages</span>\n+ </div>\n+\n+ <div class=\"metric\">\n+ <span class=\"value\">{{ collector.countFallbacks }}</span>\n+ <span class=\"label\">Fallback messages</span>\n+ </div>\n+\n+ <div class=\"metric\">\n+ <span class=\"value\">{{ collector.countMissings }}</span>\n+ <span class=\"label\">Missing messages</span>\n+ </div>\n+ </div>\n+\n+ <h2>Translation Messages</h2>\n+\n+ {# sort translation messages in groups #}\n+ {% set messages_defined, messages_missing, messages_fallback = [], [], [] %}\n+ {% for key, message in collector.messages %}\n+ {% if message.state == constant('Symfony\\\\Component\\\\Translation\\\\DataCollectorTranslator::MESSAGE_DEFINED') %}\n+ {% set messages_defined = messages_defined|merge({(key): message}) %}\n+ {% elseif message.state == constant('Symfony\\\\Component\\\\Translation\\\\DataCollectorTranslator::MESSAGE_MISSING') %}\n+ {% set messages_missing = messages_missing|merge({(key): message}) %}\n+ {% elseif message.state == constant('Symfony\\\\Component\\\\Translation\\\\DataCollectorTranslator::MESSAGE_EQUALS_FALLBACK') %}\n+ {% set messages_fallback = messages_fallback|merge({(key): message}) %}\n+ {% endif %}\n+ {% endfor %}\n+\n+ <form action=\"{{ path('php_translation_profiler_translation_create_assets', {'token': token}) }}\" method=\"post\"\n+ id=\"translations-list\" onSubmit=\"return saveTranslations(this);\" >\n+ <span class=\"hidden\">\n+ <img src=\"{{ asset(\"bundles/translation/css/images/loader.svg\") }}\" width=\"60\" id=\"svg-loader\">\n+ </span>\n+\n+ <div class=\"sf-tabs\">\n+ <div class=\"tab\">\n+ <h3 class=\"tab-title\">Defined <span class=\"badge\">{{ messages_defined|length }}</span></h3>\n+\n+ <div class=\"tab-content\">\n+ <p class=\"help\">\n+ These messages are correctly translated into the given locale.\n+ </p>\n+\n+ {% if messages_defined is empty %}\n+ <div class=\"empty\">\n+ <p>None of the used translation messages are defined for the given locale.</p>\n+ </div>\n+ {% else %}\n+ {{ translation_helper.render_table(messages_defined) }}\n+ {% endif %}\n+ </div>\n+ </div>\n+\n+ <div class=\"tab\">\n+ <h3 class=\"tab-title\">Fallback <span class=\"badge\">{{ messages_fallback|length }}</span></h3>\n+\n+ <div class=\"tab-content\">\n+ <p class=\"help\">\n+ These messages are not available for the given locale\n+ but Symfony found them in the fallback locale catalog.\n+ </p>\n+\n+ {% if messages_fallback is empty %}\n+ <div class=\"empty\">\n+ <p>No fallback translation messages were used.</p>\n+ </div>\n+ {% else %}\n+ {{ translation_helper.render_table(messages_fallback) }}\n+ {% endif %}\n+ </div>\n+ </div>\n+\n+ <div class=\"tab\">\n+ <h3 class=\"tab-title\">Missing <span class=\"badge\">{{ messages_missing|length }}</span></h3>\n+\n+ <div class=\"tab-content\">\n+ <p class=\"help\">\n+ These messages are not available for the given locale and cannot\n+ be found in the fallback locales. Add them to the translation\n+ catalogue to avoid Symfony outputting untranslated contents.\n+ </p>\n+\n+ {% if messages_missing is empty %}\n+ <div class=\"empty\">\n+ <p>There are no messages of this category.</p>\n+ </div>\n+ {% else %}\n+ {{ translation_helper.render_table(messages_missing, true) }}\n+ {% endif %}\n+ </div>\n+ </div>\n+ </div>\n+\n+ <p class=\"full-width\" id=\"translationResult\"></p>\n+\n+ <button type=\"submit\" class=\"btn\">\n+ Add selected messages\n+ </button>\n+\n+ </form>\n+ {% include \"@Translation/SymfonyProfiler/javascripts.html.twig\" %}\n+{% endblock %}\n+\n+{% block panel %}\n+ {{ block('panelContent') }}\n+{% endblock %}\n+\n+{% macro render_table(messages, checkedByDefault = false) %}\n+ <table>\n+ <thead>\n+ <tr>\n+ <th>\n+ <input type=\"checkbox\" id=\"check-all-control\" onchange=\"toggleCheckAll(this)\" {% if checkedByDefault %}checked=\"checked\"{% endif %}>\n+ </th>\n+ <th>Locale</th>\n+ <th>Domain</th>\n+ <th>Times used</th>\n+ <th>Message ID</th>\n+ <th>Message Preview</th>\n+ <th>Actions</th>\n+ </tr>\n+ </thead>\n+ <tbody>\n+ {% for key, message in messages %}\n+ <tr id=\"{{ key }}\">\n+ <td>\n+ {% if message.state == constant('Symfony\\\\Component\\\\Translation\\\\DataCollectorTranslator::MESSAGE_MISSING') %}\n+ <input type=\"checkbox\" name=\"translationKey\" value=\"{{ key }}\" checked=\"checked\" class=\"translation-key-checkbox\">\n+ {% else %}\n+ <input type=\"checkbox\" disabled=\"disabled\">\n+ {% endif %}\n+ </td>\n+ <td class=\"font-normal text-small\">{{ message.locale }}</td>\n+ <td class=\"font-normal text-small text-bold nowrap\">{{ message.domain }}</td>\n+ <td class=\"font-normal text-small\">{{ message.count }}</td>\n+ <td>\n+ {{ message.id }}\n+\n+ {% if message.transChoiceNumber is not null %}\n+ <small class=\"newline\">(pluralization is used)</small>\n+ {% endif %}\n+\n+ {% if message.parameters|length > 0 %}\n+ <button class=\"btn-link newline text-small sf-toggle\" data-toggle-selector=\"#parameters-{{ loop.index }}\" data-toggle-alt-content=\"Hide parameters\">Show parameters</button>\n+\n+ <div id=\"parameters-{{ loop.index }}\" class=\"hidden\">\n+ {% for parameters in message.parameters %}\n+ {{ profiler_dump(parameters) }}\n+ {% if not loop.last %}<br />{% endif %}\n+ {% endfor %}\n+ </div>\n+ {% endif %}\n+ </td>\n+ <td class=\"translation\">\n+ {{ message.translation }}\n+ </td>\n+ <td width=\"155px\">\n+ {% spaceless %}\n+ <a class=\"edit btn btn-sm\" href=\"javascript:void(0);\" onclick='getEditForm(\"{{ key }}\")'>Edit</a>\n+ |\n+ <a class=\"sync btn btn-sm\" href=\"javascript:void(0);\" onclick='syncMessage(\"{{ key }}\")'>Sync</a>\n+ {% endspaceless %}\n+ </td>\n+ </tr>\n+ {% endfor %}\n+ </tbody>\n+ </table>\n+{% endmacro %}\n" }, { "change_type": "MODIFY", "old_path": "translations/messages.en.xlf", "new_path": "translations/messages.en.xlf", "diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n-<xliff xmlns=\"urn:oasis:names:tc:xliff:document:2.0\" version=\"2.0\" srcLang=\"nl-NL\" trgLang=\"en\">\n+<xliff xmlns=\"urn:oasis:names:tc:xliff:document:2.0\" version=\"2.0\" srcLang=\"en\" trgLang=\"en\">\n<file id=\"messages.en\">\n<unit id=\"tbB2gib\" name=\"not_available\">\n<notes>\n" }, { "change_type": "MODIFY", "old_path": "translations/validators.en.xlf", "new_path": "translations/validators.en.xlf", "diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n-<xliff xmlns=\"urn:oasis:names:tc:xliff:document:2.0\" version=\"2.0\" srcLang=\"nl-NL\" trgLang=\"en\">\n+<xliff xmlns=\"urn:oasis:names:tc:xliff:document:2.0\" version=\"2.0\" srcLang=\"en\" trgLang=\"en\">\n<file id=\"validators.en\">\n<unit id=\"TG1D5NO\" name=\"post.blank_summary\">\n<notes>\n" } ]
PHP
MIT License
bolt/core
Workaround for editing translations in backend
95,144
08.07.2019 22:38:32
-7,200
78d1761058ecd742cfa90aeef37c9cdc97ed685c
Working on User editing
[ { "change_type": "MODIFY", "old_path": "src/Controller/Backend/UserEditController.php", "new_path": "src/Controller/Backend/UserEditController.php", "diff": "@@ -55,11 +55,13 @@ class UserEditController extends TwigAwareController implements BackendZone\n/**\n* @Route(\"/user-edit/{id}\", methods={\"GET\"}, name=\"bolt_user_edit\", requirements={\"id\": \"\\d+\"})\n*/\n- public function edit(User $user): Response\n+ public function edit(?User $user): Response\n{\n$roles = $this->getParameter('security.role_hierarchy.roles');\n- dump($roles);\n+ if (!$user instanceof User) {\n+ $user = User::factory();\n+ }\nreturn $this->renderTemplate('@bolt/users/edit.html.twig', [\n'display_name' => $user->getDisplayName(),\n@@ -71,19 +73,24 @@ class UserEditController extends TwigAwareController implements BackendZone\n/**\n* @Route(\"/user-edit/{id}\", methods={\"POST\"}, name=\"bolt_user_edit_post\", requirements={\"id\": \"\\d+\"})\n*/\n- public function save(User $user, Request $request): Response\n+ public function save(?User $user, Request $request): Response\n{\n$this->validateCsrf($request, 'useredit');\n+ if (!$user instanceof User) {\n+ $user = User::factory();\n+ }\n+\n$displayName = $user->getDisplayName();\n- $url = $this->urlGenerator->generate('bolt_profile_edit');\n+ $url = $this->urlGenerator->generate('bolt_users');\n$locale = Json::findScalar($request->get('locale'));\n+ $roles = (array) Json::findScalar($request->get('roles'));\n$newPassword = $request->get('password');\n$user->setDisplayName($request->get('displayName'));\n$user->setEmail($request->get('email'));\n$user->setLocale($locale);\n- $user->setRoles($request->get('roles'));\n+ $user->setRoles($roles);\n$user->setbackendTheme($request->get('backendTheme'));\nif ($this->validateUser($user, $newPassword) === false) {\n@@ -99,8 +106,6 @@ class UserEditController extends TwigAwareController implements BackendZone\n$this->em->flush();\n- $request->getSession()->set('_locale', $locale);\n-\n$this->addFlash('success', 'user.updated_profile');\nreturn new RedirectResponse($url);\n" }, { "change_type": "MODIFY", "old_path": "src/Entity/User.php", "new_path": "src/Entity/User.php", "diff": "@@ -4,6 +4,7 @@ declare(strict_types=1);\nnamespace Bolt\\Entity;\n+use Bolt\\Common\\Json;\nuse Doctrine\\ORM\\Mapping as ORM;\nuse Symfony\\Component\\Security\\Core\\User\\UserInterface;\nuse Symfony\\Component\\Serializer\\Annotation\\Groups;\n@@ -93,6 +94,20 @@ class User implements UserInterface, \\Serializable\n{\n}\n+ /**\n+ * @return User\n+ */\n+ public static function factory(string $displayName = '', string $username = '', string $email = ''): self\n+ {\n+ $user = new self();\n+\n+ $user->setDisplayName($displayName);\n+ $user->setUsername($username);\n+ $user->setEmail($email);\n+\n+ return $user;\n+ }\n+\npublic function getId(): int\n{\nreturn $this->id;\n@@ -236,7 +251,7 @@ class User implements UserInterface, \\Serializable\npublic function setLocale(?string $locale): self\n{\n- $this->locale = $locale;\n+ $this->locale = Json::findScalar($locale);\nreturn $this;\n}\n" }, { "change_type": "MODIFY", "old_path": "templates/users/edit.html.twig", "new_path": "templates/users/edit.html.twig", "diff": "'label' : 'label.username'|trans,\n'name' : 'username',\n'value' : user.username,\n- 'disabled' : true,\n+ 'disabled' : user.username is empty ? 'false' : 'true',\n} %}\n{% include '@bolt/_partials/fields/text.html.twig' with {\n" }, { "change_type": "MODIFY", "old_path": "templates/users/listing.html.twig", "new_path": "templates/users/listing.html.twig", "diff": "{% endfor %}\n</table>\n- {{ dump(users) }}\n+ <p class=\"buttons\">\n+ {{ macro.buttonlink('action.add_user', path('bolt_user_edit', {'id': 0}), 'user-plus', 'secondary') }}\n+ </p>\n+\n{% endblock %}\n" } ]
PHP
MIT License
bolt/core
Working on User editing
95,144
09.07.2019 07:42:39
-7,200
10d595b016129a53d58ad2697ae976547d5b979c
Working on Users
[ { "change_type": "MODIFY", "old_path": "assets/js/app/editor/Components/Editor/Password/Password.vue", "new_path": "assets/js/app/editor/Components/Editor/Password/Password.vue", "diff": "autocomplete=\"new-password\"\n/>\n- <i class=\"input-group-text fas fa-eye\" @click=\"togglePassword\"></i>\n+ <i class=\"input-group-text fas fa-eye\" @click=\"togglePassword\" ref=\"visibilityToggle\"></i>\n</div>\n</div>\n</template>\n<script>\nexport default {\nname: 'EditorPassword',\n- props: ['value', 'name', 'id'],\n+ props: ['value', 'name', 'id', 'hidden'],\nmethods: {\ntogglePassword(event) {\n@@ -35,5 +35,13 @@ export default {\n}\n},\n},\n+\n+ mounted: function() {\n+ // this.val = this.$options.filters.strip(this.value);\n+ console.log('joe!', this.value, this.hidden, this.$refs);\n+ if (!this.hidden) {\n+ this.$refs.visibilityToggle.click()\n+ }\n+ },\n};\n</script>\n" }, { "change_type": "MODIFY", "old_path": "src/Controller/Backend/AuthenticationController.php", "new_path": "src/Controller/Backend/AuthenticationController.php", "diff": "@@ -5,6 +5,7 @@ declare(strict_types=1);\nnamespace Bolt\\Controller\\Backend;\nuse Bolt\\Controller\\TwigAwareController;\n+use Cocur\\Slugify\\Slugify;\nuse Symfony\\Component\\HttpFoundation\\Response;\nuse Symfony\\Component\\Routing\\Annotation\\Route;\nuse Symfony\\Component\\Security\\Http\\Authentication\\AuthenticationUtils;\n@@ -16,8 +17,12 @@ class AuthenticationController extends TwigAwareController implements BackendZon\n*/\npublic function login(AuthenticationUtils $authenticationUtils): Response\n{\n+ $slugify = new Slugify();\n+\n// last username entered by the user (if any)\n- $last_username = $authenticationUtils->getLastUsername();\n+ $last_username = $slugify->slugify($authenticationUtils->getLastUsername());\n+\n+ dump($last_username);\n// last authentication error (if any)\n$error = $authenticationUtils->getLastAuthenticationError();\n" }, { "change_type": "MODIFY", "old_path": "src/Controller/Backend/UserEditController.php", "new_path": "src/Controller/Backend/UserEditController.php", "diff": "@@ -8,6 +8,7 @@ use Bolt\\Common\\Json;\nuse Bolt\\Controller\\CsrfTrait;\nuse Bolt\\Controller\\TwigAwareController;\nuse Bolt\\Entity\\User;\n+use Bolt\\Utils\\Str;\nuse Doctrine\\Common\\Persistence\\ObjectManager;\nuse Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\Security;\nuse Symfony\\Component\\HttpFoundation\\RedirectResponse;\n@@ -61,12 +62,16 @@ class UserEditController extends TwigAwareController implements BackendZone\nif (!$user instanceof User) {\n$user = User::factory();\n+ $suggestedPassword = Str::generatePassword();\n+ } else {\n+ $suggestedPassword = '';\n}\nreturn $this->renderTemplate('@bolt/users/edit.html.twig', [\n'display_name' => $user->getDisplayName(),\n'user' => $user,\n'roles' => $roles,\n+ 'suggestedPassword' => $suggestedPassword\n]);\n}\n@@ -85,14 +90,18 @@ class UserEditController extends TwigAwareController implements BackendZone\n$url = $this->urlGenerator->generate('bolt_users');\n$locale = Json::findScalar($request->get('locale'));\n$roles = (array) Json::findScalar($request->get('roles'));\n- $newPassword = $request->get('password');\n+ if (empty($user->getUsername())) {\n+ $user->setUsername($request->get('username'));\n+ }\n$user->setDisplayName($request->get('displayName'));\n$user->setEmail($request->get('email'));\n$user->setLocale($locale);\n$user->setRoles($roles);\n$user->setbackendTheme($request->get('backendTheme'));\n+ $newPassword = $request->get('password');\n+\nif ($this->validateUser($user, $newPassword) === false) {\nreturn $this->renderTemplate('@bolt/users/edit.html.twig', [\n'display_name' => $displayName,\n@@ -100,10 +109,11 @@ class UserEditController extends TwigAwareController implements BackendZone\n]);\n}\n- if ($newPassword !== null) {\n+ if ($request->get('password') !== null) {\n$user->setPassword($this->passwordEncoder->encodePassword($user, $newPassword));\n}\n+ $this->em->persist($user);\n$this->em->flush();\n$this->addFlash('success', 'user.updated_profile');\n" }, { "change_type": "MODIFY", "old_path": "src/Entity/User.php", "new_path": "src/Entity/User.php", "diff": "@@ -5,6 +5,7 @@ declare(strict_types=1);\nnamespace Bolt\\Entity;\nuse Bolt\\Common\\Json;\n+use Cocur\\Slugify\\Slugify;\nuse Doctrine\\ORM\\Mapping as ORM;\nuse Symfony\\Component\\Security\\Core\\User\\UserInterface;\nuse Symfony\\Component\\Serializer\\Annotation\\Groups;\n@@ -135,7 +136,9 @@ class User implements UserInterface, \\Serializable\npublic function setUsername(string $username): void\n{\n- $this->username = $username;\n+ $slugify = new Slugify();\n+ $cleanUsername = $slugify->slugify($username);\n+ $this->username = $cleanUsername;\n}\npublic function getEmail(): string\n" }, { "change_type": "MODIFY", "old_path": "templates/_macro/_macro.html.twig", "new_path": "templates/_macro/_macro.html.twig", "diff": "{# Button Macro with defaults #}\n+{% macro icon(icon = 'question-circle') %}{% spaceless %}\n+ {% set icon = icon|replace({'fa-': ''}) %}\n+\n+ <i class=\"fas fa-fw fa-{{ icon }}\"></i>\n+{% endspaceless %}{% endmacro %}\n{% macro button(label = 'Button', icon = 'question-circle', class = 'tertiary', attr = []) %}{% spaceless %}\n" }, { "change_type": "MODIFY", "old_path": "templates/_partials/fields/password.html.twig", "new_path": "templates/_partials/fields/password.html.twig", "diff": ":id=\"'{{ id }}'\"\n:name=\"'{{ name }}'\"\n:value=\"{{ value|json_encode }}\"\n+ :label=\"{{ label|json_encode }}\"\n+ :label_class=\"{{ label_class|default()|json_encode }}\"\n+ :class=\"{{ class|json_encode }}\"\n+ :hidden=\"{{ hidden|default('false') }}\"\n></editor-password>\n{% endblock %}\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "templates/security/login.html.twig", "new_path": "templates/security/login.html.twig", "diff": "'label_class': 'required',\n'name': 'password',\n'value': '',\n- 'class': 'form-control',\n+ 'hidden': 'true'\n} %}\n<div class=\"form-group form-check\">\n<input type=\"checkbox\" class=\"form-check-input\" name=\"_remember_me\" id=\"_remember_me\">\n" }, { "change_type": "MODIFY", "old_path": "templates/users/listing.html.twig", "new_path": "templates/users/listing.html.twig", "diff": "{% import '@bolt/_macro/_macro.html.twig' as macro %}\n{% block title %}\n- {{ title }}\n+ {{ macro.icon('users') }} {{ title }}\n{% endblock %}\n{% block container \"widecontent\" %}\n" }, { "change_type": "MODIFY", "old_path": "templates/users/profile.html.twig", "new_path": "templates/users/profile.html.twig", "diff": "'label_class': 'required',\n'name': 'password',\n'value': '',\n- 'class': 'form-control',\n} %}\n{% include '@bolt/_partials/fields/email.html.twig' with {\n" }, { "change_type": "MODIFY", "old_path": "translations/messages.en.xlf", "new_path": "translations/messages.en.xlf", "diff": "<target><![CDATA[This website is <a href='%url%' target='_blank' title='Sophisticated, lightweight & simple CMS'>Built with Bolt</a>.]]></target>\n</segment>\n</unit>\n+ <unit id=\"3zlZmRK\" name=\"action.add_user\">\n+ <segment>\n+ <source>action.add_user</source>\n+ <target>Add User</target>\n+ </segment>\n+ </unit>\n+ <unit id=\"ruQIhH0\" name=\"success\">\n+ <segment>\n+ <source>success</source>\n+ <target>Success!</target>\n+ </segment>\n+ </unit>\n+ <unit id=\"YDH.7uR\" name=\"user.updated_profile\">\n+ <segment>\n+ <source>user.updated_profile</source>\n+ <target>Updated User Profile</target>\n+ </segment>\n+ </unit>\n+ <unit id=\"iD6CNOO\" name=\"label.roles\">\n+ <segment>\n+ <source>label.roles</source>\n+ <target>Roles</target>\n+ </segment>\n+ </unit>\n+ <unit id=\"7whLbH8\" name=\"user.new_user\">\n+ <segment>\n+ <source>user.new_user</source>\n+ <target>New User</target>\n+ </segment>\n+ </unit>\n</file>\n</xliff>\n" } ]
PHP
MIT License
bolt/core
Working on Users
95,144
10.07.2019 07:28:26
-7,200
3bf3942d61491e13cfe30b6cff49d7ae75095cbf
Add a new `info` CLI command
[ { "change_type": "ADD", "old_path": "assets/static/logos/bolt_logo_cli.png", "new_path": "assets/static/logos/bolt_logo_cli.png", "diff": "Binary files /dev/null and b/assets/static/logos/bolt_logo_cli.png differ\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/Command/ImageTrait.php", "diff": "+<?php\n+\n+declare(strict_types=1);\n+\n+namespace Bolt\\Command;\n+\n+use Symfony\\Component\\Console\\Output\\OutputInterface;\n+\n+trait ImageTrait\n+{\n+ public function outputImage(OutputInterface $output): void\n+ {\n+ if (getenv('TERM_PROGRAM') !== 'iTerm.app') {\n+ return;\n+ }\n+\n+ $image = $this->getImage();\n+\n+ $output->write($image);\n+ }\n+\n+ public function getImage(): string\n+ {\n+ $filename = dirname(dirname(__DIR__)) . '/assets/static/logos/bolt_logo_cli.png';\n+ $imageFile = base64_encode(file_get_contents($filename));\n+\n+ return $this->unicodeString('\\u001B]1337;File=inline=1;width=auto;height=auto;preserveAspectRatio=1:' . $imageFile . '\\u0007');\n+ }\n+\n+ private function unicodeString(string $str, ?string $encoding = null): string\n+ {\n+ if ($encoding === null) {\n+ $encoding = ini_get('mbstring.internal_encoding');\n+ }\n+\n+ return preg_replace_callback('/\\\\\\\\u([0-9a-fA-F]{4})/u', function ($match) use ($encoding) {\n+ return mb_convert_encoding(pack('H*', $match[1]), $encoding, 'UTF-16BE');\n+ }, $str);\n+ }\n+}\n" }, { "change_type": "MODIFY", "old_path": "src/Version.php", "new_path": "src/Version.php", "diff": "@@ -83,9 +83,11 @@ final class Version\nreturn $version[0];\n}\n- /**\n- * @deprecated since 3.0, to be removed in 4.0.\n- */\n+ public static function fullName(): string\n+ {\n+ return static::VERSION;\n+ }\n+\npublic static function name(): ?string\n{\nif (mb_strpos(static::VERSION, ' ') === false) {\n" } ]
PHP
MIT License
bolt/core
Add a new `info` CLI command
95,192
10.07.2019 14:26:30
-7,200
0ef657b34c82992c27a41ecd859678b14c95d734
aside block var check, add class and reqrite grid layout. Removed widecontent class
[ { "change_type": "MODIFY", "old_path": "assets/scss/init/_variables.scss", "new_path": "assets/scss/init/_variables.scss", "diff": "@@ -79,7 +79,8 @@ $grid-breakpoints: (\nmd: 768px,\nlg: 992px,\nxl: 1200px,\n- wd: 1400px\n+ wd: 1400px,\n+ xw: 1750px\n);\n// Modal Dialog spacing\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/layout/_admin.scss", "new_path": "assets/scss/layout/_admin.scss", "diff": "@@ -76,27 +76,44 @@ $admin-header-height: 70px;\n&--container {\npadding: $spacer;\n+ @include media-breakpoint-up(xl) {\ndisplay: grid;\n+ //grid with autofit to make columns expand full width if other column(s) not present\ngrid-template-columns: repeat(12, 1fr);\ngrid-template-rows: auto;\ngrid-column-gap: 1.25rem;\n+ }\n@include media-breakpoint-up(wd) {\ngrid-column-gap: 1.5rem;\npadding: $spacer $spacer*1.5;\n}\n+ &--has-sidebar {\n+ // grid-template-columns: 3fr 1fr;\n+ .admin__body--main {\n+ @include media-breakpoint-up(xl) {\n+ grid-column: 1/9;\n+ }\n+ }\n+ }\n* {\ngrid-column: 1/-1;\n}\n}\n&--main {\n@include media-breakpoint-up(xl) {\n- grid-column: 1/9;\n+ grid-column: 1/13;\n}\n}\n&--aside {\n@include media-breakpoint-up(xl) {\ngrid-column: 9/13;\n+ // max-width: 300px;\n+ }\n+ @include media-breakpoint-up(xw) {\n+ grid-column: 9/12;\n}\n}\n}\n}\n+\n+\n" }, { "change_type": "MODIFY", "old_path": "templates/_base/layout.html.twig", "new_path": "templates/_base/layout.html.twig", "diff": "+{# Check if aside has value and set hasAside variable #}\n+{% set asideblock = block('aside') %}\n+{% set hasAside = asideblock|trim is not empty ? true : false %}\n+\n<!DOCTYPE html>\n<html id=\"{% block html_id %}{% endblock %}\">\nVue components, like `{{ dump() }}` statements #}\n{% endblock %}\n- <div class=\"admin__body--container\" id=\"{% block vue_id %}{% endblock %}\">\n+ <div class=\"admin__body--container{% if hasAside %} admin__body--container--has-sidebar{% endif%}\" id=\"{% block vue_id %}{% endblock %}\">\n<main class=\"admin__body--main\">\n{% block main %}\n{% endblock %}\n</main>\n+\n+ {% if hasAside %}\n<aside class=\"admin__body--aside\">\n{% block aside %}\n-\n{% endblock %}\n</aside>\n+ {% endif %}\n+ </div>\n+\n<div class=\"admin__notifications\">\n{{ include('@bolt/_partials/_flash_messages.html.twig') }}\n</div>\n</div>\n- </div>\n<!-- End Admin Main -->\n</div>\n" }, { "change_type": "MODIFY", "old_path": "templates/bundles/TranslationBundle/WebUI/base.html.twig", "new_path": "templates/bundles/TranslationBundle/WebUI/base.html.twig", "diff": "{% extends '@bolt/_base/layout.html.twig' %}\n-{% block container \"widecontent\" %}\n+{% block container %}\n+{% endblock %}\n{% block title %}\nEdit Translations\n" } ]
PHP
MIT License
bolt/core
aside block var check, add class and reqrite grid layout. Removed widecontent class
95,192
10.07.2019 14:49:26
-7,200
8c03c30e41f8470659624c79535585a861749b82
removed redundant container block
[ { "change_type": "MODIFY", "old_path": "templates/bundles/TranslationBundle/WebUI/base.html.twig", "new_path": "templates/bundles/TranslationBundle/WebUI/base.html.twig", "diff": "{% extends '@bolt/_base/layout.html.twig' %}\n-{% block container %}\n-{% endblock %}\n-\n{% block title %}\nEdit Translations\n{% endblock %}\n" } ]
PHP
MIT License
bolt/core
removed redundant container block
95,144
10.07.2019 17:53:26
-7,200
16182632b96ea5ffa17d609014e29f21c65bb185
Renaming commands to bolt:bla-bla
[ { "change_type": "MODIFY", "old_path": "src/Command/AddUserCommand.php", "new_path": "src/Command/AddUserCommand.php", "diff": "@@ -42,7 +42,7 @@ class AddUserCommand extends Command\n{\n// to make your command lazily loaded, configure the $defaultName static property,\n// so it will be instantiated only when the command is actually called.\n- protected static $defaultName = 'app:add-user';\n+ protected static $defaultName = 'bolt:add-user';\n/** @var SymfonyStyle */\nprivate $io;\n" }, { "change_type": "MODIFY", "old_path": "src/Command/DeleteUserCommand.php", "new_path": "src/Command/DeleteUserCommand.php", "diff": "@@ -34,7 +34,7 @@ use Symfony\\Component\\Console\\Style\\SymfonyStyle;\n*/\nclass DeleteUserCommand extends Command\n{\n- protected static $defaultName = 'app:delete-user';\n+ protected static $defaultName = 'bolt:delete-user';\n/** @var SymfonyStyle */\nprivate $io;\n" }, { "change_type": "MODIFY", "old_path": "src/Command/InfoCommand.php", "new_path": "src/Command/InfoCommand.php", "diff": "@@ -14,8 +14,7 @@ class InfoCommand extends Command\n{\nuse ImageTrait;\n- // a good practice is to use the 'app:' prefix to group all your custom application commands\n- protected static $defaultName = 'info';\n+ protected static $defaultName = 'bolt:info';\n/**\n* {@inheritdoc}\n" }, { "change_type": "MODIFY", "old_path": "src/Command/ListUsersCommand.php", "new_path": "src/Command/ListUsersCommand.php", "diff": "@@ -29,8 +29,7 @@ use Symfony\\Component\\Console\\Style\\SymfonyStyle;\n*/\nclass ListUsersCommand extends Command\n{\n- // a good practice is to use the 'app:' prefix to group all your custom application commands\n- protected static $defaultName = 'app:list-users';\n+ protected static $defaultName = 'bolt:list-users';\nprivate $mailer;\nprivate $emailSender;\n" }, { "change_type": "MODIFY", "old_path": "src/Controller/Backend/UserEditController.php", "new_path": "src/Controller/Backend/UserEditController.php", "diff": "@@ -8,6 +8,7 @@ use Bolt\\Common\\Json;\nuse Bolt\\Controller\\CsrfTrait;\nuse Bolt\\Controller\\TwigAwareController;\nuse Bolt\\Entity\\User;\n+use Bolt\\Utils\\Str;\nuse Doctrine\\Common\\Persistence\\ObjectManager;\nuse Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\Security;\nuse Symfony\\Component\\HttpFoundation\\RedirectResponse;\n" } ]
PHP
MIT License
bolt/core
Renaming commands to bolt:bla-bla
95,192
11.07.2019 17:22:28
-7,200
043dad3b68f9e1e5f24ae9cdea930b7e6c7e91d7
WIP total rewrite styling of content listing
[ { "change_type": "MODIFY", "old_path": "assets/js/app/listing/Components/Table/Row/index.vue", "new_path": "assets/js/app/listing/Components/Table/Row/index.vue", "diff": ":class=\"`is-${size}`\"\n@mouseleave=\"leave\"\n>\n+ <!-- column details -->\n+ <div class=\"listing__row--item is-details\">\n+ <a class=\"listing__row--item-title\" :href=\"record.extras.editLink\" :title=\"record.fieldValues.slug\">{{ record.extras.title | trim(62) }}</a>\n+ <span class=\"listing__row--item-title-excerpt\">{{ record.extras.excerpt }}</span>\n+ </div>\n+ <!-- end column -->\n+\n+ <!-- column meta -->\n+ <row-meta :type=\"type\" :size=\"size\" :record=\"record\"></row-meta>\n+ <!-- end column -->\n+\n<!-- column thumbnail -->\n<div\nv-if=\"size === 'normal' && record.extras.image !== null\"\n></div>\n<!-- end column -->\n- <!-- column details -->\n- <div class=\"listing__row--item is-details\">\n- <a :href=\"record.extras.editLink\" :title=\"record.fieldValues.slug\">{{ record.extras.title | trim(62) }}</a>\n+ <div class=\"listing__row--item is-excerpt\">\n<span>{{ record.extras.excerpt }}</span>\n</div>\n- <!-- end column -->\n-\n- <!-- column meta -->\n- <row-meta :type=\"type\" :size=\"size\" :record=\"record\"></row-meta>\n- <!-- end column -->\n<!-- column actions -->\n<row-actions\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/init/_variables.scss", "new_path": "assets/scss/init/_variables.scss", "diff": "@@ -71,13 +71,15 @@ $light: #E0E0E0;\n$dark: #333;\n$disabled: #C8C8C8;\n+$spacer: 1rem;\n+\n// Grid\n$grid-breakpoints: (\n- xs: 0,\n+ xs: 480px,\nsm: 576px,\nmd: 768px,\nlg: 992px,\n- xl: 1200px,\n+ xl: 1280px,\nwd: 1400px,\nxw: 1750px\n);\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/layout/_admin.scss", "new_path": "assets/scss/layout/_admin.scss", "diff": "@@ -81,11 +81,11 @@ $admin-header-height: 70px;\n//grid with autofit to make columns expand full width if other column(s) not present\ngrid-template-columns: repeat(12, 1fr);\ngrid-template-rows: auto;\n- grid-column-gap: 1.25rem;\n+ grid-column-gap: 1.8125rem;\n}\n@include media-breakpoint-up(wd) {\n- grid-column-gap: 1.5rem;\n- padding: $spacer $spacer*1.5;\n+ grid-column-gap: 1.8125rem;\n+ padding: $spacer $spacer*1.825;\n}\n&--has-sidebar {\n// grid-template-columns: 3fr 1fr;\n@@ -109,9 +109,6 @@ $admin-header-height: 70px;\ngrid-column: 9/13;\n// max-width: 300px;\n}\n- @include media-breakpoint-up(xw) {\n- grid-column: 9/12;\n- }\n}\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/modules/admin/_header.scss", "new_path": "assets/scss/modules/admin/_header.scss", "diff": "justify-content: space-between;\nalign-items: center;\nheight: 100%;\n- padding: $spacer;\n+ padding: $spacer $spacer*1.8125;\nposition: relative;\n}\n&--togglebar {\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/modules/listing/row/_container.scss", "new_path": "assets/scss/modules/listing/row/_container.scss", "diff": ".listing--container {\nposition: relative;\ndisplay: flex;\n- flex-wrap: wrap;\n+ // flex-wrap: wrap;\nwidth: 100%;\n- z-index: $big-z-index;\n+ // z-index: $big-z-index;\n// We raise the z-index by 1, to make sure the \"Edit\" dropdown is on top\n&:hover {\n- z-index: $big-z-index + 1;\n+ // z-index: $big-z-index + 1;\n}\n&.sortable-ghost {\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/modules/listing/row/row.scss", "new_path": "assets/scss/modules/listing/row/row.scss", "diff": "@@ -7,39 +7,29 @@ $checkbox-row-width: 30px;\nbackground: var(--foreground);\nborder-radius: $border-radius;\nmargin-bottom: $spacer / 1.25;\n- min-height: 50px;\n+ //min-height: 50px;\ndisplay: flex;\n- flex: auto;\n- justify-content: space-between;\n+ //flex: auto;\n+ flex-wrap: wrap;\n+ //justify-content: space-between;\nposition: relative;\n+ padding: $spacer/1.5;\n- &.is-small {\n- .listing__row--item {\n- display: flex;\n- align-items: center;\n-\n- &.is-details {\n- max-width: 60%;\n-\n- strong {\n- white-space: nowrap;\n- overflow: hidden;\n- text-overflow: ellipsis;\n+ @include media-breakpoint-up(md) {\n+ flex-wrap: wrap;\n+ padding: 0;\n}\n- span {\n+ &.is-small {\n+\n+ .listing__row--item-title-excerpt {\n+ display: none;\n+ @include media-breakpoint-up(md) {\ndisplay: none;\n}\n}\n- &.is-meta {\n- flex: 0 0 auto;\n- margin-left: auto;\n- }\n-\n&.is-actions {\n- flex: 0 0 auto;\n-\n.btn-group {\nheight: 1.8rem;\nwidth: auto;\n@@ -49,51 +39,84 @@ $checkbox-row-width: 30px;\nmargin: 0 0 0 0.4rem;\n}\n}\n- }\n- .listing--actions {\n+ .listing__row--item {\n+ &.is-details {\n+ display: flex;\n+ align-items: center;\n+ }\n+ &.is-meta {\n+ display: flex;\n+ align-items: center;\n+ }\n+ &.is-actions {\ndisplay: flex;\n- flex-direction: row-reverse;\n- height: 100%;\n-\n- li {\n- display: inline-flex;\nalign-items: center;\n- justify-content: center;\n- height: inherit;\n- margin-right: $spacer;\n- margin-bottom: 0;\n-\n- &:first-child {\n- margin-right: 0;\n}\n+\n+ &.is-excerpt {\n+ display: none;\n}\n}\n+\n}\n&--item {\nmin-height: inherit;\n- padding: $spacer / 2 $spacer;\n+ padding: 0;\n+ margin: 0 0 $spacer/4;\n+\n&.is-thumbnail {\n- flex: 0 0 100px;\n+ display: none;\n+ @include media-breakpoint-up(sm) {\n+ position: relative;\n+ top: 0.25rem;\n+ display: block;\n+ flex: 0 0 20%;\nmax-width: 100px;\n+ max-height: 70px;\nborder-radius: $border-radius 0 0 $border-radius;\nbackground-color: var(--shade-400);\nbackground-repeat: no-repeat;\nbackground-size: cover;\n}\n+ @include media-breakpoint-up(md) {\n+ order: 1;\n+ top: 0;\n+ margin-bottom: 0;\n+ max-height: none;\n+ }\n+ & ~ .is-excerpt {\n+ @include media-breakpoint-up(sm) {\n+ padding-left: 0.5rem;\n+ }\n+ @include media-breakpoint-up(md) {\n+ padding-left: 0;\n+ }\n+ }\n+ }\n&.is-details {\n+ flex: 0 0 100%;\n+\nflex-grow: 2;\noverflow: hidden;\ntext-overflow: ellipsis;\ndisplay: -webkit-box;\n-webkit-box-orient: vertical;\n-webkit-line-clamp: 3;\n- line-height: 1.3rem;\n+\n+ //line-height: 1.3rem;\nmax-height: 4.75rem;\n+ @include media-breakpoint-up(md) {\n+ order: 2;\n+ flex: 1 0 370px;\n+ padding: $spacer/2.5 $spacer/2;\n+ margin-bottom: 0;\n+ }\n+\na {\nfont-weight: bold;\n}\n@@ -103,33 +126,108 @@ $checkbox-row-width: 30px;\n}\n}\n+ .listing__row--item-title-excerpt {\n+ display: none;\n+ @include media-breakpoint-up(md) {\n+ display: inline;\n+ }\n+ }\n+\n+\n+ &.is-excerpt {\n+ display: none;\n+ @include media-breakpoint-up(xs) {\n+ display: inline;\n+ }\n+ @include media-breakpoint-up(sm) {\n+ flex: 1 1 80%;\n+ max-height: 70px;\n+ overflow: hidden;\n+ }\n+ @include media-breakpoint-up(md) {\n+ order: 2;\n+ flex: 1 1 auto;\n+ }\n+ @include media-breakpoint-up(md) {\n+ padding-left: 0;\n+ display: none;\n+ }\n+ p, span {\n+ @include media-breakpoint-up(sm) {\n+ display: -webkit-box;\n+ -webkit-box-orient: vertical;\n+ -webkit-line-clamp: 2;\n+ line-clamp: 2;\n+ overflow: hidden;\n+ }\n+ }\n+ }\n+\n&.is-meta {\n- flex: 0 0 17%;\n- margin-left: auto;\n- padding-bottom: 0;\n+ flex: 1 0 65%;\n+ display: flex;\n+ flex-wrap: wrap;\n+ padding-top: 0;\n+ margin-bottom:0;\n+ @include media-breakpoint-up(xs) {\n+ flex: 1 0 80%;\n+ }\n+ @include media-breakpoint-up(sm) {\n+ flex: 1 0 100%;\n+ }\n+ @include media-breakpoint-up(md) {\n+ flex: 0 0 125px;\n+ order: 3;\n+ padding: $spacer/2.5 $spacer/2;\n+ }\n}\n&.is-actions {\n- flex: 0 0 14%;\n+ flex: 1 0 35%;\n+ padding-top: 0;\n+ //flex: 0 0 14%;\n+ display: flex;\n+ justify-content: flex-end;\n+ align-items: flex-end;\nborder-radius: 0 $border-radius $border-radius 0;\n- align: right;\n+ margin-bottom:0;\n+ //align: right;\n+ @include media-breakpoint-up(xs) {\n+ flex: 1 0 20%;\n+ }\n+ @include media-breakpoint-up(md) {\n+ flex: 0 0 110px;\n+ order: 4;\n+ padding: $spacer/2.125 $spacer/2;\n+ align-items: flex-start;\n+ }\n}\n}\n&--list {\n+ display: flex;\n+ flex-wrap: wrap;\npadding: 0;\n- margin: 1px 0 0;\nlist-style: none;\n- font-size: 0.8rem;\n- line-height: 1.4;\n+ font-size: 0.875rem;\nletter-spacing: $letter-spacing;\n-\n+ margin-bottom: 0;\nli {\n- display: flex;\n- align-items: center;\n+ //display: flex;\n+ padding-right: 1rem;\n+ //align-items: center;\nmargin-bottom: $spacer / 4;\ncolor: var(--shade);\ntext-transform: capitalize;\n+ > :first-child, .status, .fas {\n+ margin-right: 0.125rem;\n+ top: 0.125rem;\n+ display: inline-block;\n+ font-size: 0.8125rem;\n+ }\n+ .status {\n+ margin-right: 0.25rem;\n+ }\n}\n}\n" } ]
PHP
MIT License
bolt/core
WIP total rewrite styling of content listing
95,192
12.07.2019 11:27:07
-7,200
cbf20b8968bc2184041d72dd5f340939bccd3627
sligment checkboxes on listing content type pages, styling tweaks, font awesome general margin
[ { "change_type": "MODIFY", "old_path": "assets/js/app/listing/Components/Records.vue", "new_path": "assets/js/app/listing/Components/Records.vue", "diff": "<template>\n- <div></div>\n+ <div class=\"listing-records\"></div>\n</template>\n<script>\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/init/_variables.scss", "new_path": "assets/scss/init/_variables.scss", "diff": "@@ -97,6 +97,7 @@ $yiq-contrasted-threshold: 150;\n--foreground: #FFF;\n--primary: #255687;\n--shade: #666;\n+ --shade-light: #ddd;\n--status-published: #08b883;\n--status-draft: #1078da;\n--status-held: #dd2443;\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/layout/_admin.scss", "new_path": "assets/scss/layout/_admin.scss", "diff": "@@ -114,3 +114,6 @@ $admin-header-height: 70px;\n}\n+.fa, .fas, .far, .fal, .fab {\n+ margin-right: 0.25em;\n+}\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/modules/listing/_filter.scss", "new_path": "assets/scss/modules/listing/_filter.scss", "diff": "}\n.custom-control {\n- margin-left: $spacer / 4;\n+ margin-left: $spacer*0.5;\n+ margin-top: $spacer*0.25;\n}\n.control--button {\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/modules/listing/row/_checkbox.scss", "new_path": "assets/scss/modules/listing/row/_checkbox.scss", "diff": ".listing--checkbox {\nwidth: $checkbox-row-width;\nuser-select: none;\n-\n+ margin-bottom: $spacer*0.8;\n.custom-control {\nposition: relative;\n- height: calc(100% - #{$spacer} / 1.25);\n+ height: 100%;\npadding: 0;\n-\n+ border: 1px solid var(--foreground);\n+ border-top-left-radius: 3px;\n+ border-bottom-left-radius: 3px;\n+ position: relative;\n+ background-color: var(--foreground);\n+ @include media-breakpoint-up(md) {\n+ // border: 1px solid var(--shade-light);\n+ // border-right: 1px solid var(--shade-light);\n+ }\n.custom-control-label {\nposition: absolute;\nleft: 0;\n&::before,\n&::after {\n- left: $spacer / 4;\n- top: 50%;\n- transform: translateY(-50%);\n+ left: $spacer*0.5;\n+ top: 0.625rem;\n}\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/modules/listing/row/row.scss", "new_path": "assets/scss/modules/listing/row/row.scss", "diff": "//** Listing | Row\n-$checkbox-row-width: 30px;\n+$checkbox-row-width: 34px;\n.listing__row {\nbox-shadow: $card-box-shadow;\n@@ -13,7 +13,7 @@ $checkbox-row-width: 30px;\nflex-wrap: wrap;\n//justify-content: space-between;\nposition: relative;\n- padding: $spacer/1.5;\n+ padding: $spacer*0.5 $spacer*2 $spacer*0.5 $spacer*0.625;\n@include media-breakpoint-up(md) {\nflex-wrap: wrap;\n@@ -112,8 +112,8 @@ $checkbox-row-width: 30px;\n@include media-breakpoint-up(md) {\norder: 2;\n- flex: 1 0 370px;\n- padding: $spacer/2.5 $spacer/2;\n+ flex: 1 0 360px;\n+ padding: $spacer*0.4 $spacer*2 $spacer*0.5 $spacer*0.625;\nmargin-bottom: 0;\n}\n@@ -176,9 +176,10 @@ $checkbox-row-width: 30px;\nflex: 1 0 100%;\n}\n@include media-breakpoint-up(md) {\n- flex: 0 0 125px;\n+ flex: 0 0 130px;\n+ max-width: 130px;\norder: 3;\n- padding: $spacer/2.5 $spacer/2;\n+ padding: $spacer*0.5;\n}\n}\n@@ -198,7 +199,7 @@ $checkbox-row-width: 30px;\n@include media-breakpoint-up(md) {\nflex: 0 0 110px;\norder: 4;\n- padding: $spacer/2.125 $spacer/2;\n+ padding: $spacer*0.625;\nalign-items: flex-start;\n}\n}\n" } ]
PHP
MIT License
bolt/core
sligment checkboxes on listing content type pages, styling tweaks, font awesome general margin
95,192
12.07.2019 11:49:38
-7,200
18e16aeaf89676bca5d87afbf8bba52f60675528
edit actions dropdown BEM classes and font size
[ { "change_type": "MODIFY", "old_path": "assets/js/app/listing/Components/Table/Row/_Actions.vue", "new_path": "assets/js/app/listing/Components/Table/Row/_Actions.vue", "diff": "<template>\n- <div class=\"listing__row--item is-actions\">\n+ <div class=\"listing__row--item is-actions edit-actions\">\n<div class=\"btn-group\">\n<a :href=\"record.extras.editLink\" class=\"btn btn-secondary btn-block btn-sm text-nowrap\">\n<i class=\"far fa-edit mr-1\"></i> Edit\n</a>\n<button\ntype=\"button\"\n- class=\"btn btn-sm btn-secondary dropdown-toggle dropdown-toggle-split\"\n+ class=\"btn btn-sm btn-secondary edit-actions__dropdown-toggler dropdown-toggle dropdown-toggle-split\"\ndata-toggle=\"dropdown\"\naria-haspopup=\"true\"\naria-expanded=\"false\"\n>\n<span class=\"sr-only\">Toggle Dropdown</span>\n</button>\n- <div class=\"dropdown-menu dropdown-menu-right\" style=\"width: 320px;\">\n+ <div class=\"edit-actions__dropdown dropdown-menu dropdown-menu-right\" style=\"width: 320px;\">\n<a v-if=\"record.status === 'published'\" class=\"dropdown-item\" :href=\"record.extras.link\" target=\"_blank\">\n<i class=\"fas fa-w fa-external-link-square-alt\"></i>\nView on Site\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/modules/listing/row/row.scss", "new_path": "assets/scss/modules/listing/row/row.scss", "diff": "@@ -281,6 +281,11 @@ $checkbox-row-width: 34px;\n}\n}\n+.edit-actions {\n+ &__dropdown {\n+ font-size: 0.9375rem;\n+ }\n+}\n.card-enter-active,\n.card-leave-active {\ntransition: all 0.25s;\n" } ]
PHP
MIT License
bolt/core
edit actions dropdown BEM classes and font size
95,192
12.07.2019 12:03:01
-7,200
92cb1fe8c17b77968e7d631d1d69252028fca5ee
pagination items styling
[ { "change_type": "MODIFY", "old_path": "assets/scss/init/_variables.scss", "new_path": "assets/scss/init/_variables.scss", "diff": "@@ -54,7 +54,7 @@ $card-border-width: 0;\n$card-border-radius: $border-radius;\n$card-border-color: transparent;\n$card-bg: var(--foreground);\n-$card-box-shadow: 0 7.5px 15px -5px rgba(0, 0, 0, 0.07);\n+$card-box-shadow: 0 7.5px 15px -5px rgba(0, 0, 0, 0.03);\n// Buttons\n$btn-font-weight: 500;\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/modules/base/_pagination.scss", "new_path": "assets/scss/modules/base/_pagination.scss", "diff": "span,\na {\n+ font-size: 0.9375rem;\ndisplay: flex;\nalign-items: center;\njustify-content: center;\nbox-shadow: $card-box-shadow;\npadding: $spacer / 2;\nmargin-right: $spacer / 3;\n- min-width: 25px;\n+ min-width: 34px;\nletter-spacing: $letter-spacing;\n&.disabled {\n" } ]
PHP
MIT License
bolt/core
pagination items styling
95,192
12.07.2019 13:35:25
-7,200
48fa0a5726695db8555a27aeb239b0780ef240ce
variables in one place, class for widgets
[ { "change_type": "MODIFY", "old_path": "assets/scss/init/_variables.scss", "new_path": "assets/scss/init/_variables.scss", "diff": "@@ -118,4 +118,10 @@ $yiq-contrasted-threshold: 150;\n}\n}\n+// Variables for admin, toolbar and admin sidebar\n+$admin-toolbar-height: 40px;\n+$admin-sidebar-width: 200px;\n+$admin-sidebar-width-wide: 250px;\n+$admin-aside-width: 320px;\n+$admin-header-height: 70px;\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/layout/_admin.scss", "new_path": "assets/scss/layout/_admin.scss", "diff": "//** Layout | Admin\n-// Note: Override for \"Wide content\" is below\n-\n-$admin-toolbar-height: 40px;\n-$admin-sidebar-width: 200px;\n-$admin-sidebar-width-wide: 250px;\n-$admin-aside-width: 320px;\n-$admin-header-height: 70px;\n-\n// Main Layout Grid\n.admin {\n@@ -117,3 +109,7 @@ $admin-header-height: 70px;\n.fa, .fas, .far, .fal, .fab {\nmargin-right: 0.25em;\n}\n+\n+.card-body {\n+ padding: $spacer $spacer*1.5;\n+}\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/modules/admin/_header.scss", "new_path": "assets/scss/modules/admin/_header.scss", "diff": "&--title {\nfont-weight: $font-weight-normal;\nfont-size: $h1-font-size;\n+ color: var(--admin-sidebar);\n+ @include media-breakpoint-up(md) {\n+ }\n+ @include media-breakpoint-up(lg) {\n+\n+ }\ni {\ncolor: var(--boltblue);\n}\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/modules/admin/_sidebar.scss", "new_path": "assets/scss/modules/admin/_sidebar.scss", "diff": "background: var(--admin-sidebar);\ncolor: var(--admin-sidebar-text);\nheight: 100%;\n+ padding-top: 0.625rem;\na {\nfont-size: 0.9375rem;\nposition: fixed;\nleft: 0;\nbottom: 40px;\n-\n+ @include media-breakpoint-up(md) {\n+ width: $admin-sidebar-width-wide;\n+ }\n&:hover,\n&:focus {\noutline: none;\n" }, { "change_type": "ADD", "old_path": null, "new_path": "assets/scss/modules/admin/_widgets.scss", "diff": "+.widget {\n+ margin-bottom: $spacer*1.625;\n+}\n+\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/modules/admin/admin.scss", "new_path": "assets/scss/modules/admin/admin.scss", "diff": "@import '_sidebar';\n@import '_header';\n@import '_toolbar';\n+@import '_widgets';\n" }, { "change_type": "MODIFY", "old_path": "src/Widget/BaseWidget.php", "new_path": "src/Widget/BaseWidget.php", "diff": "@@ -109,7 +109,7 @@ abstract class BaseWidget implements WidgetInterface\n}\nreturn sprintf(\n- '<div id=\"widget-%s\" name=\"%s\">%s</div>',\n+ '<div class=\"widget\" id=\"widget__%s\" name=\"%s\">%s</div>',\n$this->getSlug(),\n$this->getName(),\n$output\n" } ]
PHP
MIT License
bolt/core
variables in one place, class for widgets
95,192
12.07.2019 15:00:38
-7,200
13652ba45e3b210ad27b2f796dffebe8e36dc0fb
removed strong around titles, aligned body and sidebar in html 100%, styling tweaks on sidebar menu
[ { "change_type": "MODIFY", "old_path": "assets/scss/init/_base.scss", "new_path": "assets/scss/init/_base.scss", "diff": "//** Init | Base\n+html {\n+ height: 100%;\n+}\n+\nhtml,\nbody {\nmargin: 0;\n- height: 100vh;\ncolor: var(--body);\nbackground: var(--background);\n}\nbody {\n- min-height: 100vh;\n+ min-height: 100%;\n+ position:relative;\n}\nlabel {\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/layout/_admin.scss", "new_path": "assets/scss/layout/_admin.scss", "diff": "&__sidebar {\nposition: absolute;\nz-index: 2;\n- top: $admin-toolbar-height;\n+ top: 0;\nleft: 0;\ntransition: all 200ms;\nwidth: auto;\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/modules/admin/_header.scss", "new_path": "assets/scss/modules/admin/_header.scss", "diff": "font-weight: $font-weight-normal;\nfont-size: $h1-font-size;\ncolor: var(--admin-sidebar);\n- @include media-breakpoint-up(md) {\n-\n- }\n- @include media-breakpoint-up(lg) {\n-\n- }\ni {\ncolor: var(--boltblue);\n+ font-size: 2.125rem;\n+ top: -3px;\n+ position: relative;\n}\n}\njustify-content: space-between;\nalign-items: center;\nheight: 100%;\n- padding: $spacer $spacer*1.8125;\n+ padding: $spacer;\nposition: relative;\n+ @include media-breakpoint-up(wd) {\n+ padding: $spacer $spacer*1.8125;\n+ }\n}\n&--togglebar {\npadding: $spacer;\ntop: 1.625rem;\nright: 1rem;\nborder: 1px solid var(--primary);\n- padding: 0.25rem 0.625rem;\n+ padding: $spacer*0.4 $spacer;\ncolor: $white;\nbackground-color: var(--primary);\n@include media-breakpoint-up(lg) {\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/modules/admin/_sidebar.scss", "new_path": "assets/scss/modules/admin/_sidebar.scss", "diff": "background: var(--admin-sidebar);\ncolor: var(--admin-sidebar-text);\nheight: 100%;\n- padding-top: 0.625rem;\n-\n+ padding-top: 1.625rem;\na {\nfont-size: 0.9375rem;\n}\n&--separator {\npadding: 0 $spacer;\n- margin: $spacer / 2 0;\n+ margin: $spacer*1.625 0 0;\nopacity: 0.5;\nfont-weight: $font-weight-bold;\ntext-transform: uppercase;\npadding: 0;\nwidth: 100%;\nlist-style: none;\n- margin-top: $spacer;\n+\n}\n&--link {\nheight: 100%;\ndisplay: flex;\nalign-items: center;\n+ margin-right: 0;\n}\n.link--menu {\nfont-weight: $font-weight-bold;\nfont-size: $small-font-size;\nletter-spacing: $letter-spacing;\n-\n+ @include media-breakpoint-up(md) {\n+ width: $admin-sidebar-width-wide;\n+ }\na {\ncolor: var(--admin-sidebar-text);\nopacity: 0.75;\n-\n+ font-size: 0.875rem;\n&:hover {\ncolor: inherit;\n}\npadding: $spacer / 1.25 $spacer / 2;\n.link--icon {\n- font-size: 130%;\n+ font-size: 150%;\nmargin: 0;\nwidth: auto;\n}\nbottom: $spacer / 2;\n}\n}\n+ .admin__header, .admin__body {\n+ @include media-breakpoint-up(lg) {\n+ margin-left: $admin-sidebar-width / 3;\n+ }\n+ }\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/modules/admin/_toolbar.scss", "new_path": "assets/scss/modules/admin/_toolbar.scss", "diff": "}\n&__brand {\n+\n+ padding: $spacer*0.8125;\n+ .is-slim & {\n+ padding: $spacer*0.8125 $spacer*1.125;\n+ }\nsvg {\nheight: $admin-toolbar-height / 1.5;\nwidth: auto;\n" }, { "change_type": "MODIFY", "old_path": "templates/content/listing.html.twig", "new_path": "templates/content/listing.html.twig", "diff": "{% block title %}\n{% if contentType %}\n- <i class='fas mr-2 {{contentType.icon_one}}'></i> <strong>{{ contentType.name }}</strong>\n+ <i class='fas mr-2 {{contentType.icon_one}}'></i> {{ contentType.name }}\n{% else %}\n- <strong>{{ 'title.contentlisting'|trans }}</strong>\n+ {{ 'title.contentlisting'|trans }}\n{% endif %}\n{% endblock %}\n" }, { "change_type": "MODIFY", "old_path": "templates/pages/menupage.html.twig", "new_path": "templates/pages/menupage.html.twig", "diff": "{% endif %}\n{% endfor %}\n-{% block title %} <strong>{{ menu.name }}</strong>\n+{% block title %} {{ menu.name }}\n{% endblock title %}\n{% block main %}\n" } ]
PHP
MIT License
bolt/core
removed strong around titles, aligned body and sidebar in html 100%, styling tweaks on sidebar menu
95,192
12.07.2019 15:33:04
-7,200
e187b7b0c36e8aa7675851991cc75b7aee09da0c
fix tests for widgets
[ { "change_type": "MODIFY", "old_path": "src/Widget/BaseWidget.php", "new_path": "src/Widget/BaseWidget.php", "diff": "@@ -109,7 +109,7 @@ abstract class BaseWidget implements WidgetInterface\n}\nreturn sprintf(\n- '<div class=\"widget\" id=\"widget__%s\" name=\"%s\">%s</div>',\n+ '<div class=\"widget\" id=\"widget-%s\" name=\"%s\">%s</div>',\n$this->getSlug(),\n$this->getName(),\n$output\n" }, { "change_type": "MODIFY", "old_path": "tests/php/Widget/WidgetsTest.php", "new_path": "tests/php/Widget/WidgetsTest.php", "diff": "@@ -70,7 +70,7 @@ class WidgetsTest extends StringTestCase\n$widgets->registerWidget($weatherWidget);\n$this->assertSameHtml(\n- '<div id=\"widget-weather-widget\" name=\"Weather Widget\">[Hello, weather!]</div>',\n+ '<div class=\"widget\" id=\"widget-weather-widget\" name=\"Weather Widget\">[Hello, weather!]</div>',\n$widgets->renderWidgetByName('Weather Widget')\n);\n}\n@@ -86,7 +86,7 @@ class WidgetsTest extends StringTestCase\n$widgets->registerWidget($widget);\n$this->assertSameHtml(\n- '<div id=\"widget-dummy-widget\" name=\"Dummy Widget\">[Hello, Bar!]</div>',\n+ '<div class=\"widget\" id=\"widget-dummy-widget\" name=\"Dummy Widget\">[Hello, Bar!]</div>',\n$widgets->renderWidgetByName('Dummy Widget', ['foo' => 'Bar'])\n);\n}\n@@ -121,7 +121,7 @@ class WidgetsTest extends StringTestCase\n$widgets->processQueue($response);\n$this->assertSameHtml(\n- '<html><body>foo<div id=\"widget-weather-widget\" name=\"Weather Widget\">[Hello, weather!]</div></body></html>',\n+ '<html><body>foo<div class=\"widget\" id=\"widget-weather-widget\" name=\"Weather Widget\">[Hello, weather!]</div></body></html>',\n$response->getContent()\n);\n}\n@@ -142,7 +142,7 @@ class WidgetsTest extends StringTestCase\n$widgets->processQueue($response);\n$this->assertSameHtml(\n- '<html><body><div id=\"widget-weather-widget\" name=\"Weather Widget\">[Hello, weather!]</div>foo</body></html>',\n+ '<html><body><div class=\"widget\" id=\"widget-weather-widget\" name=\"Weather Widget\">[Hello, weather!]</div>foo</body></html>',\n$response->getContent()\n);\n}\n" } ]
PHP
MIT License
bolt/core
fix tests for widgets
95,144
12.07.2019 15:59:22
-7,200
6306fd69510c36c73b28606a1d25c2c6f5eede7e
Updating Version class, bumping to beta 1.
[ { "change_type": "MODIFY", "old_path": "src/Controller/Backend/GeneralController.php", "new_path": "src/Controller/Backend/GeneralController.php", "diff": "@@ -7,6 +7,7 @@ namespace Bolt\\Controller\\Backend;\nuse Bolt\\Controller\\TwigAwareController;\nuse Bolt\\Entity\\Content;\nuse Bolt\\Repository\\ContentRepository;\n+use Bolt\\Version;\nuse Sensio\\Bundle\\FrameworkExtraBundle\\Configuration\\Security;\nuse Symfony\\Component\\HttpFoundation\\Response;\nuse Symfony\\Component\\Routing\\Annotation\\Route;\n@@ -21,7 +22,11 @@ class GeneralController extends TwigAwareController implements BackendZone\n*/\npublic function about(): Response\n{\n- return $this->renderTemplate('@bolt/pages/about.html.twig');\n+ $twigVars = [\n+ 'installType' => Version::installType(),\n+ ];\n+\n+ return $this->renderTemplate('@bolt/pages/about.html.twig', $twigVars);\n}\n/**\n" }, { "change_type": "MODIFY", "old_path": "templates/pages/about.html.twig", "new_path": "templates/pages/about.html.twig", "diff": "<h2>Bolt {{ constant('Bolt\\\\Version::VERSION') }}</h2>\n+ <h3>{{ constant('Bolt\\\\Version::CODENAME') }} <small><em>({{ installType }})</em></small></h3>\n+\n<p>\nBolt is a CMS that strives to be simple, fast, straightforward and enjoyable to use. Both for\ndevelopers and content-editors. Bolt is Open Source, and as such it uses other Open Source\n" } ]
PHP
MIT License
bolt/core
Updating Version class, bumping to beta 1.
95,144
13.07.2019 11:32:04
-7,200
483c01d7bbc1803a4a84459cfea8c1b78c08ccdf
Add `bolt:install-assets` command, for composer create project
[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"prefer-stable\": true,\n\"scripts\": {\n\"post-install-cmd\": [\n- \"@auto-scripts\"\n+ \"@auto-scripts\",\n+ \"bin/console bolt:info\"\n],\n\"post-update-cmd\": [\n- \"@auto-scripts\"\n+ \"@auto-scripts\",\n+ \"bin/console bolt:info\"\n],\n\"auto-scripts\": {\n\"cache:clear\": \"symfony-cmd\",\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/Command/InstallAssetsCommand.php", "diff": "+<?php\n+\n+namespace Bolt\\Command;\n+\n+use Symfony\\Component\\Console\\Command\\Command;\n+use Symfony\\Component\\Console\\Exception\\InvalidArgumentException;\n+use Symfony\\Component\\Console\\Input\\InputArgument;\n+use Symfony\\Component\\Console\\Input\\InputInterface;\n+use Symfony\\Component\\Console\\Input\\InputOption;\n+use Symfony\\Component\\Console\\Output\\OutputInterface;\n+use Symfony\\Component\\Console\\Style\\SymfonyStyle;\n+use Symfony\\Component\\DependencyInjection\\ContainerInterface;\n+use Symfony\\Component\\Filesystem\\Exception\\IOException;\n+use Symfony\\Component\\Filesystem\\Filesystem;\n+use Symfony\\Component\\Finder\\Finder;\n+use Symfony\\Component\\HttpKernel\\Bundle\\BundleInterface;\n+use Symfony\\Component\\HttpKernel\\KernelInterface;\n+\n+class InstallAssetsCommand extends Command\n+{\n+ protected static $defaultName = 'bolt:install-assets';\n+\n+ private $filesystem;\n+\n+ public function __construct(Filesystem $filesystem)\n+ {\n+ parent::__construct();\n+\n+ $this->filesystem = $filesystem;\n+ }\n+\n+ protected function configure()\n+ {\n+ $this\n+ ->setDescription('Copy built assets and translation files into the project root')\n+ ;\n+ }\n+\n+\n+ /**\n+ * {@inheritdoc}\n+ */\n+ protected function execute(InputInterface $input, OutputInterface $output)\n+ {\n+ /** @var KernelInterface $kernel */\n+ $kernel = $this->getApplication()->getKernel();\n+\n+ $projectDir = $this->getProjectDirectory($kernel->getContainer());\n+ $publicDir = $this->getPublicDirectory($kernel->getContainer());\n+ $baseDir = dirname(dirname(__DIR__));\n+\n+ $dirs = [\n+ $baseDir . '/public/assets' => $publicDir .'/assets/',\n+ $baseDir . '/translations' => $projectDir . '/translations/',\n+ ];\n+\n+ $io = new SymfonyStyle($input, $output);\n+ $io->newLine();\n+ $io->text('Installing Bolt assets as <info>hard copies</info>.');\n+ $io->newLine();\n+\n+ $rows = [];\n+ $exitCode = 0;\n+\n+ foreach ($dirs as $originDir => $targetDir) {\n+\n+ try {\n+ $this->filesystem->remove($targetDir);\n+\n+ $message = basename($targetDir);\n+\n+ $this->hardCopy($originDir, $targetDir);\n+\n+ $rows[] = [sprintf('<fg=green;options=bold>%s</>', '\\\\' === \\DIRECTORY_SEPARATOR ? 'OK' : \"\\xE2\\x9C\\x94\" /* HEAVY CHECK MARK (U+2714) */), $message, 'copied'];\n+\n+ } catch (\\Exception $e) {\n+ $exitCode = 1;\n+ $rows[] = [sprintf('<fg=red;options=bold>%s</>', '\\\\' === \\DIRECTORY_SEPARATOR ? 'ERROR' : \"\\xE2\\x9C\\x98\" /* HEAVY BALLOT X (U+2718) */), $message, $e->getMessage()];\n+ }\n+ }\n+\n+ if ($rows) {\n+ $io->table(['', 'Bundle', 'Method / Error'], $rows);\n+ }\n+\n+ if (0 !== $exitCode) {\n+ $io->error('Some errors occurred while installing assets.');\n+ } else {\n+ $io->success($rows ? 'All assets were successfully installed.' : 'No assets were provided by any bundle.');\n+ }\n+\n+ return $exitCode;\n+ }\n+\n+ /**\n+ * Copies origin to target.\n+ */\n+ private function hardCopy(string $originDir, string $targetDir): void\n+ {\n+ $this->filesystem->mkdir($targetDir, 0777);\n+\n+ // We use a custom iterator to ignore VCS files\n+ $this->filesystem->mirror($originDir, $targetDir, Finder::create()->ignoreDotFiles(false)->in($originDir));\n+ }\n+\n+\n+\n+ private function getProjectDirectory(ContainerInterface $container): string\n+ {\n+ $defaultPublicDir = 'public';\n+\n+ if ($container->hasParameter('kernel.project_dir')) {\n+ return $container->getParameter('kernel.project_dir');\n+ }\n+\n+ return dirname(dirname(dirname(dirname(dirname(__DIR__)))));\n+ }\n+\n+ private function getPublicDirectory(ContainerInterface $container): string\n+ {\n+ $defaultPublicDir = 'public';\n+\n+ if (!$container->hasParameter('kernel.project_dir')) {\n+ return $defaultPublicDir;\n+ }\n+\n+ $composerFilePath = $container->getParameter('kernel.project_dir').'/composer.json';\n+\n+ if (!file_exists($composerFilePath)) {\n+ return $defaultPublicDir;\n+ }\n+\n+ $composerConfig = json_decode(file_get_contents($composerFilePath), true);\n+\n+ if (isset($composerConfig['extra']['public-dir'])) {\n+ return $composerConfig['extra']['public-dir'];\n+ }\n+\n+ return $this->getProjectDirectory($container) . '/' . $defaultPublicDir;\n+ }\n+}\n" } ]
PHP
MIT License
bolt/core
Add `bolt:install-assets` command, for composer create project
95,144
13.07.2019 12:54:52
-7,200
0de3818ecba4b228998a3835b2042aeff400da37
Add new temporary logo
[ { "change_type": "MODIFY", "old_path": "assets/static/logos/bolt_logo_cli.png", "new_path": "assets/static/logos/bolt_logo_cli.png", "diff": "Binary files a/assets/static/logos/bolt_logo_cli.png and b/assets/static/logos/bolt_logo_cli.png differ\n" }, { "change_type": "ADD", "old_path": null, "new_path": "assets/static/logos/bolt_logo_dashboard.svg", "diff": "+<svg width=\"658\" height=\"194\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M263.992 173.667h54.45c31.725 0 56.925-13.275 56.925-43.2 0-19.575-11.475-30.6-26.325-34.425v-.9c11.925-4.5 19.125-18.675 19.125-31.725 0-28.125-23.625-36.45-54-36.45h-50.175zm33.075-87.975V52.617h15.75c15.525 0 22.95 4.275 22.95 15.75 0 10.575-6.975 17.325-23.175 17.325zm0 62.325v-37.8h18.675c18.225 0 27.225 5.175 27.225 18 0 13.5-9.225 19.8-27.225 19.8zm148.275 28.35c28.125 0 54.225-21.375 54.225-58.5s-26.1-58.5-54.225-58.5c-28.35 0-54.45 21.375-54.45 58.5s26.1 58.5 54.45 58.5zm0-26.775c-13.725 0-20.475-12.375-20.475-31.725s6.75-31.725 20.475-31.725c13.5 0 20.475 12.375 20.475 31.725s-6.975 31.725-20.475 31.725zm107.325 26.775c7.425 0 13.05-1.125 16.65-2.7l-4.05-24.525c-1.8.45-2.7.45-4.05.45-2.7 0-5.85-2.25-5.85-9.225V15.942h-33.075v123.075c0 22.5 7.65 37.35 30.375 37.35zm76.95 0c10.8 0 18.9-2.25 24.75-4.05l-5.175-24.075c-2.925 1.125-6.975 2.25-10.575 2.25-8.775 0-14.4-5.175-14.4-17.775V87.942h26.775V62.067h-26.775v-29.7h-27.45l-3.825 29.7-17.1 1.35v24.525h15.3v45.225c0 25.875 10.8 43.2 38.475 43.2z\" fill=\"#fff\" style=\"fill:rgba(255, 255, 255, 1.000000);stroke-width:0.000000px;stroke:rgba(0, 0, 0, 1.000000)\"/><g stroke=\"#242f3c\"><path d=\"M37.246 156.754l34.827 33.762 47.043-11.825 46.652-13.28 13.28-46.653 11.826-47.042-33.763-34.827-34.827-33.763-47.042 11.826-46.653 13.28-13.28 46.652-11.825 47.043 33.762 34.827z\" stroke-linejoin=\"bevel\" fill=\"#242f3c\" stroke-width=\"6\"/><path d=\"M32.02 143.903l27.52 36.867 45.834-3.98 45.687-5.399 19.47-41.682L188.7 87.442 162.337 49.74l-27.52-36.866-45.833 3.979-45.688 5.4-19.47 41.682L5.658 106.2l26.363 37.703z\" fill=\"#fff\" stroke-width=\"2\"/><path d=\"M59.179 98.821c0-22.091 17.908-40 40-40 22.091 0 40 17.909 40 40 0 22.092-17.909 40-40 40-22.092 0-40-17.908-40-40z\" fill=\"none\" stroke-width=\"8\"/><path d=\"M57.179 96.821c0-22.091 17.908-40 40-40 22.091 0 40 17.909 40 40 0 22.092-17.909 40-40 40-22.092 0-40-17.908-40-40z\" fill=\"#3c5a7e\" stroke-width=\"2\"/></g></svg>\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "src/Command/ImageTrait.php", "new_path": "src/Command/ImageTrait.php", "diff": "@@ -25,7 +25,7 @@ trait ImageTrait\n$filename = dirname(dirname(__DIR__)) . '/assets/static/logos/bolt_logo_cli.png';\n$imageFile = base64_encode(file_get_contents($filename));\n- return $this->unicodeString('\\u001B]1337;File=inline=1;width=auto;height=auto;preserveAspectRatio=1:' . $imageFile . '\\u0007');\n+ return $this->unicodeString('\\u001B]1337;File=inline=1;width=40;height=auto;preserveAspectRatio=1:' . $imageFile . '\\u0007');\n}\nprivate function unicodeString(string $str, ?string $encoding = null): string\n" }, { "change_type": "MODIFY", "old_path": "templates/_base/layout.html.twig", "new_path": "templates/_base/layout.html.twig", "diff": "{# Setting the labels and their localisations that are used in the sidebar-menu. #}\n{% set labels = {\n'about.bolt_documentation': 'about.bolt_documentation'|trans,\n- 'action.visit_site': 'action.visit_site'|trans,\n+ 'action.view_site': 'action.view'|trans ~ ' ' ~ config.get('general/sitename'),\n'action.create_new': 'action.create_new'|trans,\n'general.greeting': 'general.greeting'|trans({'%name%': user_display_name}),\n'action.logout': 'action.logout'|trans,\n" }, { "change_type": "MODIFY", "old_path": "translations/messages.en.xlf", "new_path": "translations/messages.en.xlf", "diff": "<target>New User</target>\n</segment>\n</unit>\n+ <unit id=\"TtmWqX3\" name=\"action.view\">\n+ <segment>\n+ <source>action.view</source>\n+ <target>View</target>\n+ </segment>\n+ </unit>\n</file>\n</xliff>\n" } ]
PHP
MIT License
bolt/core
Add new temporary logo
95,144
13.07.2019 17:06:55
-7,200
f91c2f596ef9ebc5d2d30f7fb262f7db050dc8c3
Cleanup of some images
[ { "change_type": "RENAME", "old_path": "assets/static/logos/bolt_logo_cli.png", "new_path": "assets/static/images/bolt_logo_cli.png", "diff": "" }, { "change_type": "RENAME", "old_path": "assets/static/logos/bolt_logo_dashboard.svg", "new_path": "assets/static/images/bolt_logo_dashboard.svg", "diff": "" }, { "change_type": "DELETE", "old_path": "assets/static/logos/brand-icon.svg", "new_path": null, "diff": "-<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 91 79\">\n- <g fill=\"#2e2ec2\" fill-rule=\"evenodd\">\n- <path d=\"M22.38225 77.89275L0 38.859 22.6875 0l45.066.1725L90.1365 39.21 67.45275 78.0735l-45.063-.1725-.0075-.00825zm4.90786-7.46527l.00587.00666 35.31414.13936L80.3865 39.17671 62.8458 7.63936 27.52933 7.5 9.75 38.89315l17.5401 31.53433z\"/>\n- <path fill-rule=\"nonzero\" d=\"M31.5 31.5H39v15h-7.5z\"/>\n- <path fill-rule=\"nonzero\" d=\"M37.4625 35.25h22.5v7.5h-22.5z\"/>\n- </g>\n-</svg>\n\\ No newline at end of file\n" }, { "change_type": "DELETE", "old_path": "assets/static/logos/brand-long.svg", "new_path": null, "diff": "-<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 323 79\">\n- <g fill=\"none\" fill-rule=\"evenodd\">\n- <path fill=\"#0C223B\" d=\"M128.57914 57H111V24h17.04496c2.94606 0 5.2365.81633 6.8714 2.44903 1.6349 1.63269 2.45235 3.61992 2.45235 5.96176 0 1.97903-.53417 3.65292-1.60252 5.02174-1.06835 1.36883-2.39568 2.21814-3.98202 2.54798 1.74821.26387 3.22122 1.16266 4.41907 2.6964C137.40109 44.21065 138 46 138 48.04498c0 2.6057-.81744 4.74961-2.45234 6.43178C133.91276 56.15893 131.58994 57 128.57914 57zm-2.23539-20c1.125 0 2.01562-.31666 2.67188-.95.65625-.63334.98437-1.48333.98437-2.55 0-1.03334-.32812-1.875-.98438-2.525-.65625-.65-1.54686-.975-2.67187-.975H118v7h8.34375zm.54844 13c1.28873 0 2.29554-.30701 3.02045-.92105C130.63755 48.4649 131 47.60527 131 46.5c0-1.01316-.36245-1.84978-1.08736-2.50987-.72491-.66009-1.73172-.99013-3.02045-.99013H118v7h8.8922zm32.1322 7c-4.94311 0-9.01624-1.59322-12.21951-4.77971C143.6016 49.0338 142 44.96041 142 40s1.60161-9.0338 4.80488-12.22029C150.00815 24.59322 154.08128 23 159.02439 23c4.9106 0 8.96746 1.60143 12.17073 4.80435C174.3984 31.00726 176 35.07244 176 40c0 4.92756-1.60161 8.99274-4.80488 12.19565C167.99185 55.39857 163.93498 57 159.0244 57zm-7.25896-8.9726C153.60906 50.00914 156.0288 51 159.0247 51c2.9959 0 5.4074-.99086 7.23457-2.9726C168.08643 46.04565 169 43.53654 169 40.5c0-3.03654-.91357-5.54565-2.74074-7.5274C164.43209 30.99086 162.02059 30 159.02469 30c-3.02882 0-5.45678.99086-7.28395 2.9726C149.91357 34.95435 149 37.46346 149 40.5c0 3.03654.9218 5.54565 2.76543 7.5274zM201 57h-21V24h7.06588v26.8156H201V57zm14.5188 0h-6.98872V30.1844H199V24h26v6.1844h-9.4812V57zm29.74237 0c-4.61858 0-8.48338-1.585-11.5945-4.75507C230.55554 49.07486 229 44.99326 229 40s1.55554-9.07486 4.66667-12.24493C236.77779 24.58501 240.64259 23 245.26117 23c4.81102 0 8.70789 1.93814 11.69072 5.8145l-2.30928 1.52753c-1.02635-1.44542-2.37341-2.60338-4.04124-3.47391-1.66782-.87054-3.44787-1.3058-5.3402-1.3058-3.81674 0-6.99999 1.34685-9.54983 4.04058-2.54984 2.69373-3.82474 6.1594-3.82474 10.3971 0 4.20485 1.28292 7.6623 3.8488 10.37246 2.56587 2.71016 5.7411 4.06522 9.52577 4.06522 1.89233 0 3.67238-.43526 5.3402-1.3058 1.66782-.87053 3.0149-2.0285 4.04124-3.4739L257 51.13622C253.8568 55.04543 249.9439 57 245.26117 57zM293 57h-2.78846V27.56222L278.52884 57h-1.05769l-11.73077-29.43778V57H263V24h4.08654L278 51.45877 288.86539 24H293v33zm18.66736 0c-4.94112 0-8.8302-1.74105-11.66736-5.22319l1.76923-2.11884c2.70965 3.18649 6.04087 4.77971 9.99376 4.77971 2.9328 0 5.06063-.66521 6.38358-1.99565 1.32295-1.33044 1.9844-2.84975 1.9844-4.55797 0-1.31402-.35065-2.4227-1.05197-3.32609-.70132-.90339-1.6178-1.60145-2.74948-2.0942-1.13167-.49276-2.3749-.93623-3.72973-1.33044-1.35482-.3942-2.70962-.81304-4.06445-1.25652-1.35482-.44348-2.59805-.96908-3.72973-1.57681-1.13167-.60773-2.04816-1.46183-2.74948-2.56232-.70132-1.10049-1.05197-2.4227-1.05197-3.96667 0-2.62803 1.00415-4.74685 3.01247-6.35652C306.02496 23.80482 308.51142 23 311.4761 23c4.62234 0 8.22452 1.54395 10.80665 4.63188l-1.81704 2.06957c-2.23148-2.75943-5.2758-4.13913-9.13306-4.13913-2.13584 0-3.91302.56666-5.3316 1.7s-2.12786 2.58695-2.12786 4.36087c0 1.11691.35066 2.07777 1.05198 2.8826.70132.80484 1.6178 1.42899 2.74948 1.87247 1.13167.44348 2.3749.8541 3.72973 1.23188 1.35482.37778 2.70962.80483 4.06445 1.28116 1.35482.47634 2.59805 1.043 3.72973 1.7 1.13167.65701 2.04816 1.58502 2.74947 2.78406C322.64934 44.5744 323 46.0116 323 47.68696c0 2.49663-.90852 4.67293-2.72557 6.52898C318.45737 56.072 315.58838 57 311.66736 57z\"/>\n- <g fill=\"#2e2ec2\">\n- <path d=\"M22.38225 77.89275L0 38.859 22.6875 0l45.066.1725L90.1365 39.21 67.45275 78.0735l-45.063-.1725-.0075-.00825zm4.90786-7.46527l.00587.00666 35.31414.13936L80.3865 39.17671 62.8458 7.63936 27.52933 7.5 9.75 38.89315l17.5401 31.53433z\"/>\n- <path fill-rule=\"nonzero\" d=\"M31.5 31.5H39v15h-7.5z\"/>\n- <path fill-rule=\"nonzero\" d=\"M37.4625 35.25h22.5v7.5h-22.5z\"/>\n- </g>\n- </g>\n-</svg>\n\\ No newline at end of file\n" }, { "change_type": "DELETE", "old_path": "assets/static/logos/brand-white-icon.svg", "new_path": null, "diff": "-<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 91 79\">\n- <g fill=\"#FFF\" fill-rule=\"evenodd\">\n- <path d=\"M22.4439 78.14003L0 38.98236 22.75 0l45.19015.17305L90.3848 39.33448 67.63857 78.32135l-45.18714-.17305-.00752-.00827zm4.97036-7.58863l.00588.00667 35.31413.13936 17.77638-31.39679L62.96997 7.76328l-35.31649-.13935L9.87415 39.01708 27.41426 70.5514z\"/>\n- <path fill-rule=\"nonzero\" d=\"M31.58678 31.6h7.52066v15.04762h-7.52066z\"/>\n- <path fill-rule=\"nonzero\" d=\"M37.5657 35.3619h22.56198v7.52381H37.5657z\"/>\n- </g>\n-</svg>\n\\ No newline at end of file\n" }, { "change_type": "DELETE", "old_path": "assets/static/logos/brand-white-long.svg", "new_path": null, "diff": "-<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 323 79\">\n- <g fill=\"#FFF\" fill-rule=\"evenodd\">\n- <path d=\"M128.57914 57H111V24h17.04496c2.94606 0 5.2365.81633 6.8714 2.44903 1.6349 1.63269 2.45235 3.61992 2.45235 5.96176 0 1.97903-.53417 3.65292-1.60252 5.02174-1.06835 1.36883-2.39568 2.21814-3.98202 2.54798 1.74821.26387 3.22122 1.16266 4.41907 2.6964C137.40109 44.21065 138 46 138 48.04498c0 2.6057-.81744 4.74961-2.45234 6.43178C133.91276 56.15893 131.58994 57 128.57914 57zm-2.23539-20c1.125 0 2.01562-.31666 2.67188-.95.65625-.63334.98437-1.48333.98437-2.55 0-1.03334-.32812-1.875-.98438-2.525-.65625-.65-1.54686-.975-2.67187-.975H118v7h8.34375zm.54844 13c1.28873 0 2.29554-.30701 3.02045-.92105C130.63755 48.4649 131 47.60527 131 46.5c0-1.01316-.36245-1.84978-1.08736-2.50987-.72491-.66009-1.73172-.99013-3.02045-.99013H118v7h8.8922zm32.1322 7c-4.94311 0-9.01624-1.59322-12.21951-4.77971C143.6016 49.0338 142 44.96041 142 40s1.60161-9.0338 4.80488-12.22029C150.00815 24.59322 154.08128 23 159.02439 23c4.9106 0 8.96746 1.60143 12.17073 4.80435C174.3984 31.00726 176 35.07244 176 40c0 4.92756-1.60161 8.99274-4.80488 12.19565C167.99185 55.39857 163.93498 57 159.0244 57zm-7.25896-8.9726C153.60906 50.00914 156.0288 51 159.0247 51c2.9959 0 5.4074-.99086 7.23457-2.9726C168.08643 46.04565 169 43.53654 169 40.5c0-3.03654-.91357-5.54565-2.74074-7.5274C164.43209 30.99086 162.02059 30 159.02469 30c-3.02882 0-5.45678.99086-7.28395 2.9726C149.91357 34.95435 149 37.46346 149 40.5c0 3.03654.9218 5.54565 2.76543 7.5274zM201 57h-21V24h7.06588v26.8156H201V57zm14.5188 0h-6.98872V30.1844H199V24h26v6.1844h-9.4812V57zm29.74237 0c-4.61858 0-8.48338-1.585-11.5945-4.75507C230.55554 49.07486 229 44.99326 229 40s1.55554-9.07486 4.66667-12.24493C236.77779 24.58501 240.64259 23 245.26117 23c4.81102 0 8.70789 1.93814 11.69072 5.8145l-2.30928 1.52753c-1.02635-1.44542-2.37341-2.60338-4.04124-3.47391-1.66782-.87054-3.44787-1.3058-5.3402-1.3058-3.81674 0-6.99999 1.34685-9.54983 4.04058-2.54984 2.69373-3.82474 6.1594-3.82474 10.3971 0 4.20485 1.28292 7.6623 3.8488 10.37246 2.56587 2.71016 5.7411 4.06522 9.52577 4.06522 1.89233 0 3.67238-.43526 5.3402-1.3058 1.66782-.87053 3.0149-2.0285 4.04124-3.4739L257 51.13622C253.8568 55.04543 249.9439 57 245.26117 57zM293 57h-2.78846V27.56222L278.52884 57h-1.05769l-11.73077-29.43778V57H263V24h4.08654L278 51.45877 288.86539 24H293v33zm18.66736 0c-4.94112 0-8.8302-1.74105-11.66736-5.22319l1.76923-2.11884c2.70965 3.18649 6.04087 4.77971 9.99376 4.77971 2.9328 0 5.06063-.66521 6.38358-1.99565 1.32295-1.33044 1.9844-2.84975 1.9844-4.55797 0-1.31402-.35065-2.4227-1.05197-3.32609-.70132-.90339-1.6178-1.60145-2.74948-2.0942-1.13167-.49276-2.3749-.93623-3.72973-1.33044-1.35482-.3942-2.70962-.81304-4.06445-1.25652-1.35482-.44348-2.59805-.96908-3.72973-1.57681-1.13167-.60773-2.04816-1.46183-2.74948-2.56232-.70132-1.10049-1.05197-2.4227-1.05197-3.96667 0-2.62803 1.00415-4.74685 3.01247-6.35652C306.02496 23.80482 308.51142 23 311.4761 23c4.62234 0 8.22452 1.54395 10.80665 4.63188l-1.81704 2.06957c-2.23148-2.75943-5.2758-4.13913-9.13306-4.13913-2.13584 0-3.91302.56666-5.3316 1.7s-2.12786 2.58695-2.12786 4.36087c0 1.11691.35066 2.07777 1.05198 2.8826.70132.80484 1.6178 1.42899 2.74948 1.87247 1.13167.44348 2.3749.8541 3.72973 1.23188 1.35482.37778 2.70962.80483 4.06445 1.28116 1.35482.47634 2.59805 1.043 3.72973 1.7 1.13167.65701 2.04816 1.58502 2.74947 2.78406C322.64934 44.5744 323 46.0116 323 47.68696c0 2.49663-.90852 4.67293-2.72557 6.52898C318.45737 56.072 315.58838 57 311.66736 57zM22.4439 78.14003L0 38.98236 22.75 0l45.19015.17305L90.3848 39.33448 67.63857 78.32135l-45.18714-.17305-.00752-.00827zm4.97036-7.58863l.00588.00667 35.31413.13936 17.77638-31.39679L62.96997 7.76328l-35.31649-.13935L9.87415 39.01708 27.41426 70.5514z\"/>\n- <path fill-rule=\"nonzero\" d=\"M31.58678 31.6h7.52066v15.04762h-7.52066z\"/>\n- <path fill-rule=\"nonzero\" d=\"M37.5657 35.3619h22.56198v7.52381H37.5657z\"/>\n- </g>\n-</svg>\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "src/Command/ImageTrait.php", "new_path": "src/Command/ImageTrait.php", "diff": "@@ -22,7 +22,7 @@ trait ImageTrait\npublic function getImage(): string\n{\n- $filename = dirname(dirname(__DIR__)) . '/assets/static/logos/bolt_logo_cli.png';\n+ $filename = dirname(dirname(__DIR__)) . '/assets/static/images/bolt_logo_cli.png';\n$imageFile = base64_encode(file_get_contents($filename));\nreturn $this->unicodeString('\\u001B]1337;File=inline=1;width=40;height=auto;preserveAspectRatio=1:' . $imageFile . '\\u0007');\n" } ]
PHP
MIT License
bolt/core
Cleanup of some images
95,144
14.07.2019 13:11:59
-7,200
19ec903e1519111d796a00c15e08d3bfee3e3684
Some final tweaks before beta 1
[ { "change_type": "MODIFY", "old_path": "assets/scss/init/_base.scss", "new_path": "assets/scss/init/_base.scss", "diff": "@@ -13,6 +13,7 @@ body {\nbody {\nmin-height: 100%;\n+ width: 100%;\nposition: absolute;\n}\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/init/_variables.scss", "new_path": "assets/scss/init/_variables.scss", "diff": "@@ -112,7 +112,7 @@ $yiq-contrasted-threshold: 150;\n--admin-sidebar: #2F3E4D;\n--admin-sidebar-text: #EEE;\n--admin-sidebar-icon: #FFF;\n- --admin-sidebar-menu: #f0f3f5;\n+ --admin-sidebar-menu: #FFF;\n--admin-sidebar-menu-text: #666;\n--admin-toolbar: #4C6E91;\n--admin-toolbar-text-light: #fff;\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/modules/admin/_toolbar.scss", "new_path": "assets/scss/modules/admin/_toolbar.scss", "diff": "}\n.toolbar-menu {\n- @include darken(--admin-toolbar, 0.2);\n+ background: var(--admin-sidebar-menu);\n+ border-radius: 0 $border-radius $border-radius 0;\n+ box-shadow: 5px 5px 30px rgba(0, 0, 0, 0.2);\n+ border: 1px solid rgba(0, 0, 0, 0.1);\n+ color: var(--shade);\nfont-weight: $font-weight-normal;\nfont-size: 100%;\na {\npadding: $spacer / 2;\ndisplay: block;\n+ color: var(--shade);\n&:hover {\n- @include darken(--admin-toolbar, 0.3);\n-\n+ @include darken(--admin-sidebar, 0.02);\n+ color: var(--admin-sidebar-icon);\ntext-decoration: none;\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "package-lock.json", "new_path": "package-lock.json", "diff": "\"integrity\": \"sha1-aN/1++YMUes3cl6p4+0xDcwed24=\"\n},\n\"bootbox\": {\n- \"version\": \"5.1.3\",\n- \"resolved\": \"https://registry.npmjs.org/bootbox/-/bootbox-5.1.3.tgz\",\n- \"integrity\": \"sha512-bXNPIkFv3Dcgcdg9jj32F8RBWhRyF8hKDtZ8LY15Bk5WQ1+JzpPCi1qh5rwqI4Jjl/8AWLB44z/H7dFJz4Ql2A==\",\n+ \"version\": \"5.2.0\",\n+ \"resolved\": \"https://registry.npmjs.org/bootbox/-/bootbox-5.2.0.tgz\",\n+ \"integrity\": \"sha512-hEevUk73BtSRwQ3gvFm3Rxgd1SqfslKU/RKvd/G9/ykxnKuHf9a1yNEUso2Lwb7PYtm2OBbiLV3V58+Bk1dxsw==\",\n\"requires\": {\n\"bootstrap\": \">=3.0.0\",\n\"jquery\": \">=1.9.1\"\n" }, { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"@vue/cli-service\": \"^3.9.2\",\n\"axios\": \"^0.19.0\",\n\"baguettebox.js\": \"^1.11.0\",\n- \"bootbox\": \"^5.1.3\",\n+ \"bootbox\": \"^5.2.0\",\n\"bootstrap\": \"^4.3.1\",\n\"codemirror\": \"^5.48.0\",\n\"dropzone\": \"^5.5.1\",\n" } ]
PHP
MIT License
bolt/core
Some final tweaks before beta 1
95,144
14.07.2019 13:30:33
-7,200
e21bc31a30b1f78e4fcfd6f9fef92c1bb305d58a
Ninja-fix package-lock.json
[ { "change_type": "MODIFY", "old_path": "package-lock.json", "new_path": "package-lock.json", "diff": "}\n},\n\"mixin-deep\": {\n- \"version\": \"1.3.1\",\n- \"resolved\": \"https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz\",\n- \"integrity\": \"sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==\",\n+ \"version\": \"1.3.2\",\n+ \"resolved\": \"https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz\",\n+ \"integrity\": \"sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==\",\n\"requires\": {\n\"for-in\": \"^1.0.2\",\n\"is-extendable\": \"^1.0.1\"\n},\n\"js-yaml\": {\n\"version\": \"3.12.0\",\n- \"resolved\": \"https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz\",\n- \"integrity\": \"sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==\",\n+ \"resolved\": \"\",\n\"requires\": {\n\"argparse\": \"^1.0.7\",\n\"esprima\": \"^4.0.0\"\n\"integrity\": \"sha1-BF+XgtARrppoA93TgrJDkrPYkPc=\"\n},\n\"set-value\": {\n- \"version\": \"2.0.0\",\n- \"resolved\": \"https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz\",\n- \"integrity\": \"sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==\",\n+ \"version\": \"2.0.1\",\n+ \"resolved\": \"https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz\",\n+ \"integrity\": \"sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==\",\n\"requires\": {\n\"extend-shallow\": \"^2.0.1\",\n\"is-extendable\": \"^0.1.1\",\n}\n},\n\"union-value\": {\n- \"version\": \"1.0.0\",\n- \"resolved\": \"https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz\",\n- \"integrity\": \"sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=\",\n+ \"version\": \"1.0.1\",\n+ \"resolved\": \"https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz\",\n+ \"integrity\": \"sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==\",\n\"requires\": {\n\"arr-union\": \"^3.1.0\",\n\"get-value\": \"^2.0.6\",\n\"is-extendable\": \"^0.1.1\",\n- \"set-value\": \"^0.4.3\"\n- },\n- \"dependencies\": {\n- \"extend-shallow\": {\n- \"version\": \"2.0.1\",\n- \"resolved\": \"https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz\",\n- \"integrity\": \"sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=\",\n- \"requires\": {\n- \"is-extendable\": \"^0.1.0\"\n- }\n- },\n- \"set-value\": {\n- \"version\": \"0.4.3\",\n- \"resolved\": \"https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz\",\n- \"integrity\": \"sha1-fbCPnT0i3H945Trzw79GZuzfzPE=\",\n- \"requires\": {\n- \"extend-shallow\": \"^2.0.1\",\n- \"is-extendable\": \"^0.1.1\",\n- \"is-plain-object\": \"^2.0.1\",\n- \"to-object-path\": \"^0.3.0\"\n- }\n- }\n+ \"set-value\": \"^2.0.1\"\n}\n},\n\"uniq\": {\n" } ]
PHP
MIT License
bolt/core
Ninja-fix package-lock.json
95,144
14.07.2019 15:33:25
-7,200
387c17ed5fdc42db58e09df9ec2b084ef7ad4b83
Fix too-wide codemirror
[ { "change_type": "MODIFY", "old_path": "assets/scss/layout/_admin.scss", "new_path": "assets/scss/layout/_admin.scss", "diff": "&--main {\n@include media-breakpoint-up(xl) {\ngrid-column: 1/13;\n+ width: 100%;\n}\n}\n&--aside {\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/vendor/codemirror.scss", "new_path": "assets/scss/vendor/codemirror.scss", "diff": "@import '~codemirror/lib/codemirror.css';\n-\n-\n.CodeMirror.cm-s-default {\nborder: 1px solid #DDD;\nborder-radius: 4px;\n" }, { "change_type": "MODIFY", "old_path": "templates/finder/editfile.html.twig", "new_path": "templates/finder/editfile.html.twig", "diff": "{% endblock %}\n{% block main %}\n- <h2>{{ 'caption.path'|trans }}: <code>{{ location }}{{ file }}</code></h2>\n+ <h3>{{ 'caption.path'|trans }}: <code>{{ location }}{{ file }}</code></h3>\n<form method=\"post\">\n<input type=\"hidden\" name=\"file\" value=\"{{ file }}\">\n{% block javascripts %}\n{{ parent() }}\n<script>\n+ var editfile_textarea = document.getElementById('editfile_textarea');\nvar myCodeMirror = CodeMirror.fromTextArea(editfile_textarea, {\nlineNumbers: true,\nmode: '{{ mode }}'\n" } ]
PHP
MIT License
bolt/core
Fix too-wide codemirror
95,144
16.07.2019 21:07:59
-7,200
308b254806e00793ece0027e6ecb117de95e9f8b
No imageFetchFixture for tests
[ { "change_type": "MODIFY", "old_path": ".travis.yml", "new_path": ".travis.yml", "diff": "@@ -41,7 +41,7 @@ before_script:\n# prepare web server for e2e tests\n- ./bin/console doctrine:database:create\n- ./bin/console doctrine:schema:create\n- - ./bin/console doctrine:fixtures:load -n\n+ - ./bin/console doctrine:fixtures:load --group=without-images -n\n- ./bin/console server:start 127.0.0.1:8088\n# test if web server works\n- sleep 3\n" }, { "change_type": "ADD", "old_path": "public/files/foal.jpg", "new_path": "public/files/foal.jpg", "diff": "Binary files /dev/null and b/public/files/foal.jpg differ\n" }, { "change_type": "MODIFY", "old_path": "public/files/hal.jpg", "new_path": "public/files/hal.jpg", "diff": "Binary files a/public/files/hal.jpg and b/public/files/hal.jpg differ\n" }, { "change_type": "ADD", "old_path": "public/files/joey.jpg", "new_path": "public/files/joey.jpg", "diff": "Binary files /dev/null and b/public/files/joey.jpg differ\n" }, { "change_type": "MODIFY", "old_path": "public/files/kitten.jpg", "new_path": "public/files/kitten.jpg", "diff": "Binary files a/public/files/kitten.jpg and b/public/files/kitten.jpg differ\n" }, { "change_type": "ADD", "old_path": "public/files/kitten2.jpg", "new_path": "public/files/kitten2.jpg", "diff": "Binary files /dev/null and b/public/files/kitten2.jpg differ\n" }, { "change_type": "ADD", "old_path": "public/files/piglet.jpg", "new_path": "public/files/piglet.jpg", "diff": "Binary files /dev/null and b/public/files/piglet.jpg differ\n" }, { "change_type": "ADD", "old_path": "public/files/puppy.jpg", "new_path": "public/files/puppy.jpg", "diff": "Binary files /dev/null and b/public/files/puppy.jpg differ\n" }, { "change_type": "ADD", "old_path": "public/files/puppy2.jpg", "new_path": "public/files/puppy2.jpg", "diff": "Binary files /dev/null and b/public/files/puppy2.jpg differ\n" }, { "change_type": "MODIFY", "old_path": "public/files/vlinders.jpg", "new_path": "public/files/vlinders.jpg", "diff": "Binary files a/public/files/vlinders.jpg and b/public/files/vlinders.jpg differ\n" }, { "change_type": "MODIFY", "old_path": "src/Command/AddUserCommand.php", "new_path": "src/Command/AddUserCommand.php", "diff": "@@ -47,9 +47,16 @@ class AddUserCommand extends Command\n/** @var SymfonyStyle */\nprivate $io;\n+ /** @var EntityManagerInterface */\nprivate $entityManager;\n+\n+ /** @var UserPasswordEncoderInterface */\nprivate $passwordEncoder;\n+\n+ /** @var Validator */\nprivate $validator;\n+\n+ /** @var UserRepository */\nprivate $users;\npublic function __construct(EntityManagerInterface $em, UserPasswordEncoderInterface $encoder, Validator $validator, UserRepository $users)\n@@ -107,7 +114,7 @@ class AddUserCommand extends Command\nreturn;\n}\n- $this->io->title('Add User Command Interactive Wizard');\n+ $this->io->title('Add Bolt User Command');\n$this->io->text([\n'If you prefer to not use this interactive wizard, provide the',\n'arguments required by this command as follows:',\n" }, { "change_type": "MODIFY", "old_path": "src/DataFixtures/ImageFetchFixtures.php", "new_path": "src/DataFixtures/ImageFetchFixtures.php", "diff": "@@ -9,6 +9,8 @@ use Doctrine\\Bundle\\FixturesBundle\\FixtureGroupInterface;\nuse Doctrine\\Common\\Persistence\\ObjectManager;\nuse GuzzleHttp\\Client;\nuse Illuminate\\Support\\Collection;\n+use Symfony\\Component\\Console\\Helper\\ProgressBar;\n+use Symfony\\Component\\Console\\Output\\ConsoleOutput;\nclass ImageFetchFixtures extends BaseFixture implements FixtureGroupInterface\n{\n@@ -56,6 +58,11 @@ class ImageFetchFixtures extends BaseFixture implements FixtureGroupInterface\nmkdir($outputPath);\n}\n+ $output = new ConsoleOutput();\n+ $progressBar = new ProgressBar($output, self::AMOUNT);\n+\n+ $progressBar->start();\n+\nfor ($i = 1; $i <= self::AMOUNT; $i++) {\n$url = $this->urls->random() . random_int(10000, 99999);\n$filename = 'image_' . random_int(10000, 99999) . '.jpg';\n@@ -63,6 +70,11 @@ class ImageFetchFixtures extends BaseFixture implements FixtureGroupInterface\n$client = new Client();\n$resource = fopen($outputPath . $filename, 'w');\n$client->request('GET', $url, ['sink' => $resource]);\n+\n+ $progressBar->advance();\n}\n+\n+ $progressBar->finish();\n+ $output->writeln('');\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Entity/User.php", "new_path": "src/Entity/User.php", "diff": "@@ -136,7 +136,7 @@ class User implements UserInterface, \\Serializable\npublic function setUsername(string $username): void\n{\n- $slugify = new Slugify();\n+ $slugify = new Slugify(['separator' => '_']);\n$cleanUsername = $slugify->slugify($username);\n$this->username = $cleanUsername;\n}\n" } ]
PHP
MIT License
bolt/core
No imageFetchFixture for tests
95,144
17.07.2019 20:13:07
-7,200
f9a5fdc7a58f9aeb44b1fbe6573fc9095df021d6
Working on random users, without overwriting pre-defined 'admin user'
[ { "change_type": "MODIFY", "old_path": "src/Command/AddUserCommand.php", "new_path": "src/Command/AddUserCommand.php", "diff": "@@ -119,7 +119,7 @@ class AddUserCommand extends Command\n'If you prefer to not use this interactive wizard, provide the',\n'arguments required by this command as follows:',\n'',\n- ' $ php bin/console app:add-user username password email@example.com',\n+ ' $ php bin/console bolt:add-user username password email@example.com DisplayName',\n'',\n'Now we\\'ll ask you for the value of all the missing command arguments.',\n]);\n@@ -185,6 +185,8 @@ class AddUserCommand extends Command\n$user->setUsername($username);\n$user->setEmail($email);\n$user->setRoles([$isAdmin ? 'ROLE_ADMIN' : 'ROLE_USER']);\n+ $user->setLocale('en');\n+ $user->setBackendTheme('default');\n// See https://symfony.com/doc/current/book/security.html#security-encoding-password\n$encodedPassword = $this->passwordEncoder->encodePassword($user, $plainPassword);\n" }, { "change_type": "MODIFY", "old_path": "src/DataFixtures/UserFixtures.php", "new_path": "src/DataFixtures/UserFixtures.php", "diff": "@@ -5,10 +5,10 @@ declare(strict_types=1);\nnamespace Bolt\\DataFixtures;\nuse Bolt\\Entity\\User;\n+use Bolt\\Repository\\UserRepository;\nuse Bolt\\Utils\\Str;\nuse Doctrine\\Bundle\\FixturesBundle\\FixtureGroupInterface;\nuse Doctrine\\Common\\Persistence\\ObjectManager;\n-use Symfony\\Component\\Console\\Input\\ArgvInput;\nuse Symfony\\Component\\Security\\Core\\Encoder\\UserPasswordEncoderInterface;\nclass UserFixtures extends BaseFixture implements FixtureGroupInterface\n@@ -16,20 +16,28 @@ class UserFixtures extends BaseFixture implements FixtureGroupInterface\n/** @var UserPasswordEncoderInterface */\nprivate $passwordEncoder;\n+ /** @var UserRepository */\n+ private $users;\n+\nprivate $append = false;\n- public function __construct(UserPasswordEncoderInterface $passwordEncoder)\n+ /** @var array */\n+ private $allUsers = [];\n+\n+ public function __construct(UserPasswordEncoderInterface $passwordEncoder, UserRepository $users)\n{\n$this->passwordEncoder = $passwordEncoder;\n// If ran with `--append` we append users, and use random passwords for them\n- if (in_array('--append', $_SERVER['argv'])) {\n+ if (in_array('--append', $_SERVER['argv'], true)) {\n$this->append = true;\n}\n+ $this->users = $users;\n}\npublic function load(ObjectManager $manager): void\n{\n+ $this->getCurrentUsers();\n$this->loadUsers($manager);\n$manager->flush();\n@@ -43,6 +51,13 @@ class UserFixtures extends BaseFixture implements FixtureGroupInterface\nprivate function loadUsers(ObjectManager $manager): void\n{\nforeach ($this->getUserData() as $userData) {\n+ /** @var User $allUser */\n+ foreach ($this->allUsers as $allUser) {\n+ if (($allUser->getUsername() === $userData['username']) || ($allUser->getEmail() === $userData['username'])) {\n+ continue 2;\n+ }\n+ }\n+\n$user = new User();\n$user->setDisplayName($userData['displayname']);\n$user->setUsername($userData['username']);\n@@ -59,6 +74,16 @@ class UserFixtures extends BaseFixture implements FixtureGroupInterface\n$manager->flush();\n}\n+ private function getCurrentUsers(): void\n+ {\n+ $this->allUsers = $this->users->findBy([], ['username' => 'ASC'], 100);\n+\n+ /** @var User $user */\n+ foreach ($this->allUsers as $user) {\n+ $this->addReference('user_' . $user->getUsername(), $user);\n+ }\n+ }\n+\nprivate function getUserData(): array\n{\nreturn [\n" } ]
PHP
MIT License
bolt/core
Working on random users, without overwriting pre-defined 'admin user'
95,144
21.07.2019 17:15:57
-7,200
e0572a526bf3084c2a1afa29a119a8e166875cd2
Use ../bolt-assets package, if present
[ { "change_type": "MODIFY", "old_path": "src/Command/InstallAssetsCommand.php", "new_path": "src/Command/InstallAssetsCommand.php", "diff": "@@ -45,12 +45,21 @@ class InstallAssetsCommand extends Command\n$projectDir = $this->getProjectDirectory($kernel->getContainer());\n$publicDir = $this->getPublicDirectory($kernel->getContainer());\n- $baseDir = dirname(dirname(__DIR__));\n+ // Determine if we can use ../bolt-assets or not.\n+ if (file_exists(dirname(dirname(dirname(__DIR__))) . '/bolt-assets')) {\n+ $baseDir = dirname(dirname(dirname(__DIR__))) . '/bolt-assets';\n+ $dirs = [\n+ $baseDir . '/assets' => $publicDir .'/assets/',\n+ $baseDir . '/translations' => $projectDir . '/translations/',\n+ ];\n+ } else {\n+ $baseDir = dirname(dirname(__DIR__));\n$dirs = [\n$baseDir . '/public/assets' => $publicDir .'/assets/',\n$baseDir . '/translations' => $projectDir . '/translations/',\n];\n+ }\n$io = new SymfonyStyle($input, $output);\n$io->newLine();\n" } ]
PHP
MIT License
bolt/core
Use ../bolt-assets package, if present
95,144
21.07.2019 19:16:09
-7,200
b9c50f40b2a83d979e54e4fc274969d101131e41
Create SetupCommand.php
[ { "change_type": "ADD", "old_path": null, "new_path": "src/Command/SetupCommand.php", "diff": "+<?php\n+\n+declare(strict_types=1);\n+\n+namespace Bolt\\Command;\n+\n+use Symfony\\Component\\Console\\Command\\Command;\n+use Symfony\\Component\\Console\\Input\\ArrayInput;\n+use Symfony\\Component\\Console\\Input\\InputInterface;\n+use Symfony\\Component\\Console\\Output\\OutputInterface;\n+\n+class SetupCommand extends Command\n+{\n+ protected static $defaultName = 'bolt:setup';\n+\n+ protected function configure(): void\n+ {\n+ $this->setDescription('Run Bolt setup / installation commands');\n+ }\n+\n+ protected function execute(InputInterface $input, OutputInterface $output): ?int\n+ {\n+ $command = $this->getApplication()->find('doctrine:database:create');\n+ $commandInput = new ArrayInput(['-q' => true]);\n+ $command->run($commandInput, $output);\n+\n+ $command = $this->getApplication()->find('doctrine:schema:create');\n+ $commandInput = new ArrayInput([]);\n+ $command->run($commandInput, $output);\n+\n+ $command = $this->getApplication()->find('bolt:add-user');\n+ $commandInput = new ArrayInput(['--admin' => true]);\n+ $command->run($commandInput, $output);\n+\n+ $command = $this->getApplication()->find('doctrine:fixtures:load');\n+ $commandInput = new ArrayInput(['--append' => true]);\n+ $command->run($commandInput, $output);\n+ }\n+}\n" } ]
PHP
MIT License
bolt/core
Create SetupCommand.php
95,168
22.07.2019 10:04:38
-7,200
87ba31b1e05157b94c5e186414e53bebe16274bd
Work in sort functionality
[ { "change_type": "MODIFY", "old_path": "src/Controller/Backend/ContentOverviewController.php", "new_path": "src/Controller/Backend/ContentOverviewController.php", "diff": "@@ -27,7 +27,17 @@ class ContentOverviewController extends TwigAwareController implements BackendZo\n$page = (int) $request->query->get('page', 1);\n$amountPerPage = $contentType->get('records_per_page', 10);\n+ if($request->query->get('sort')){\n+ $sortBy = $request->query->get('sort');\n+ dump($sortBy);\n+ // die();\n+ $records = $contentRepository->findForListing($page, $amountPerPage, $contentType, false, $sortBy);\n+\n+ dump($request->query->get('sort'));\n+ // die();\n+ }else {\n$records = $contentRepository->findForListing($page, $amountPerPage, $contentType, false);\n+ }\nreturn $this->renderTemplate('@bolt/content/listing.html.twig', [\n'records' => $records,\n" }, { "change_type": "MODIFY", "old_path": "src/Repository/ContentRepository.php", "new_path": "src/Repository/ContentRepository.php", "diff": "@@ -32,7 +32,7 @@ class ContentRepository extends ServiceEntityRepository\nreturn $this->createQueryBuilder('content');\n}\n- public function findForListing(int $page, int $amountPerPage, ?ContentType $contentType = null, bool $onlyPublished = true): Pagerfanta\n+ public function findForListing(int $page, int $amountPerPage, ?ContentType $contentType = null, bool $onlyPublished = true, string $sortBy = '')\n{\n$qb = $this->getQueryBuilder()\n->addSelect('a')\n@@ -48,7 +48,20 @@ class ContentRepository extends ServiceEntityRepository\n->setParameter('status', Statuses::PUBLISHED);\n}\n- return $this->createPaginator($qb->getQuery(), $page, $amountPerPage);\n+ if ($sortBy) {\n+ $qb->addSelect('f')\n+ ->innerJoin('content.fields', 'f')\n+ ->andWhere('f.name = :title')\n+ ->setParameter('title', 'title')\n+ ->orderBy('f.value');\n+ }\n+ dump($qb->getDQL());\n+ dump($qb->getQuery()->getSQL());\n+ // dump($this->createPaginator($qb->getQuery(), $page, $amountPerPage));\n+ // die();\n+\n+ return $qb->getQuery()->getResult();\n+ // return $this->createPaginator($qb->getQuery(), $page, $amountPerPage);\n}\npublic function findForTaxonomy(int $page, string $taxonomyslug, string $slug, int $amountPerPage, bool $onlyPublished = true): Pagerfanta\n" } ]
PHP
MIT License
bolt/core
Work in sort functionality
95,144
22.07.2019 21:48:26
-7,200
a73adfa6ff0be12a1581d078aa5fce3f145842f1
Add theme asset package
[ { "change_type": "MODIFY", "old_path": "public/theme/skeleton/partials/_master.twig", "new_path": "public/theme/skeleton/partials/_master.twig", "diff": "{{- ' | ' ~ config.get('general/payoff') -}}\n{%- endif -%}\n</title>\n- {#<link rel=\"stylesheet\" href=\"{{ asset('css/normalize.css', 'theme') }}\">#}\n- {#<link rel=\"stylesheet\" href=\"{{ asset('css/sakura.css', 'theme') }}\">#}\n- <link rel=\"stylesheet\" href=\"/theme/skeleton/css/normalize.css\">\n- <link rel=\"stylesheet\" href=\"/theme/skeleton/css/sakura.css\">\n+ <link rel=\"stylesheet\" href=\"{{ asset('css/normalize.css', 'theme') }}\">\n+ <link rel=\"stylesheet\" href=\"{{ asset('css/sakura.css', 'theme') }}\">\n</head>\n<body>\n" }, { "change_type": "MODIFY", "old_path": "src/Controller/TwigAwareController.php", "new_path": "src/Controller/TwigAwareController.php", "diff": "@@ -7,6 +7,9 @@ namespace Bolt\\Controller;\nuse Bolt\\Configuration\\Config;\nuse Bolt\\Entity\\Field\\TemplateselectField;\nuse Symfony\\Bundle\\FrameworkBundle\\Controller\\AbstractController;\n+use Symfony\\Component\\Asset\\Packages;\n+use Symfony\\Component\\Asset\\PathPackage;\n+use Symfony\\Component\\Asset\\VersionStrategy\\EmptyVersionStrategy;\nuse Symfony\\Component\\HttpFoundation\\Response;\nuse Tightenco\\Collect\\Support\\Collection;\nuse Twig\\Environment;\n@@ -19,13 +22,17 @@ class TwigAwareController extends AbstractController\n/** @var Environment */\nprotected $twig;\n+ /** @var Packages */\n+ protected $packages;\n+\n/**\n* @required\n*/\n- public function setAutowire(Config $config, Environment $twig): void\n+ public function setAutowire(Config $config, Environment $twig, Packages $packages): void\n{\n$this->config = $config;\n$this->twig = $twig;\n+ $this->packages = $packages;\n}\n/**\n@@ -44,6 +51,8 @@ class TwigAwareController extends AbstractController\n// Set User in global Twig environment\n$parameters['user'] = $parameters['user'] ?? $this->getUser();\n+ $this->setThemePackage();\n+\n// Resolve string|array of templates into the first one that is found.\nif (is_array($template)) {\n$templates = (new Collection($template))\n@@ -69,4 +78,11 @@ class TwigAwareController extends AbstractController\nreturn $response;\n}\n+\n+ private function setThemePackage(): void\n+ {\n+ $themePath = '/theme/' . $this->config->get('general/theme');\n+ $themePackage = new PathPackage($themePath, new EmptyVersionStrategy());\n+ $this->packages->addPackage('theme', $themePackage);\n+ }\n}\n" } ]
PHP
MIT License
bolt/core
Add theme asset package
95,144
22.07.2019 22:14:24
-7,200
2cbaf022bbd0f33803678b14aacb604fe69683f2
Set 'theme' as the default package in frontend.
[ { "change_type": "MODIFY", "old_path": "public/theme/skeleton/partials/_master.twig", "new_path": "public/theme/skeleton/partials/_master.twig", "diff": "{{- ' | ' ~ config.get('general/payoff') -}}\n{%- endif -%}\n</title>\n- <link rel=\"stylesheet\" href=\"{{ asset('css/normalize.css', 'theme') }}\">\n- <link rel=\"stylesheet\" href=\"{{ asset('css/sakura.css', 'theme') }}\">\n+ <link rel=\"stylesheet\" href=\"{{ asset('css/normalize.css') }}\">\n+ <link rel=\"stylesheet\" href=\"{{ asset('css/sakura.css') }}\">\n</head>\n<body>\n-\n{% block body %}\n{{ include('partials/_header.twig') }}\n" }, { "change_type": "MODIFY", "old_path": "src/Controller/TwigAwareController.php", "new_path": "src/Controller/TwigAwareController.php", "diff": "@@ -81,8 +81,18 @@ class TwigAwareController extends AbstractController\nprivate function setThemePackage(): void\n{\n+ // get the default package, and re-add as `bolt`\n+ $boltPackage = $this->packages->getPackage();\n+ $this->packages->addPackage('bolt', $boltPackage);\n+\n+ // set `theme` package, and also as 'default'\n$themePath = '/theme/' . $this->config->get('general/theme');\n$themePackage = new PathPackage($themePath, new EmptyVersionStrategy());\n+ $this->packages->setDefaultPackage($themePackage);\n$this->packages->addPackage('theme', $themePackage);\n+\n+ // set `public` package\n+ $publicPackage = new PathPackage('/', new EmptyVersionStrategy());\n+ $this->packages->addPackage('public', $publicPackage);\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "templates/_base/layout.html.twig", "new_path": "templates/_base/layout.html.twig", "diff": "</head>\n<body id=\"{% block body_id %}{% endblock %}\">\n-\n<div class=\"admin has-{{ block('container') }}\">\n{% set admin_menu_json = admin_menu()|json_encode %}\n" }, { "change_type": "MODIFY", "old_path": "templates/_base/layout_blank.html.twig", "new_path": "templates/_base/layout_blank.html.twig", "diff": "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">\n<title>{{ block('title')|striptags }}</title>\n{% block stylesheets %}\n- <link href=\"https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600\" rel=\"stylesheet\">\n- <link rel=\"stylesheet\" href=\"https://use.fontawesome.com/releases/v5.5.0/css/all.css\" integrity=\"sha384-B4dIYHKNBt8Bc12p+WXckhzcICo0wtJAoU8YZTY5qE0Id1GSseTk6S+L3BlXeVIU\" crossorigin=\"anonymous\">\n- <link rel=\"stylesheet\" type=\"text/css\" href=\"{{ asset('assets/bolt.css') }}\">\n+ {{ encore_entry_link_tags('bolt') }}\n{% endblock %}\n</head>\n" } ]
PHP
MIT License
bolt/core
Set 'theme' as the default package in frontend.
95,144
23.07.2019 07:30:39
-7,200
ff9a7df7b62ce51abaa03d8da96ef517f252b3ed
Working on Twig Image funtions
[ { "change_type": "MODIFY", "old_path": "public/theme/skeleton/partials/_sub_fields.twig", "new_path": "public/theme/skeleton/partials/_sub_fields.twig", "diff": "{% if exclude|default is iterable %}\n{% set omittedkeys = omittedkeys|merge(exclude) %}\n{% endif %}\n+\n+ {# We also skip over the fields that are explicitly excluded. #}\n+ {% if magicimage|default %}\n+ {% set omittedkeys = omittedkeys|merge([magicimage]) %}\n+ {% endif %}\n+\n+\n+ {{ dump(omittedkeys) }}\n+\n{% endspaceless -%}\n{# SECTION 2: LOOPING AND ITERATION - The actual looping is done here. #}\n{% endif %}\n{# Finally, the repeaters and blocks #}\n+ {# @todo Fix this, see https://github.com/bolt/four/issues/176 #}\n{#{% if (repeaters|default(false) == true and record.type(key) == \"repeater\") or#}\n{#(blocks|default(false) == true and record.type(key) == \"block\") %}#}\n" }, { "change_type": "MODIFY", "old_path": "public/theme/skeleton/record.twig", "new_path": "public/theme/skeleton/record.twig", "diff": "<h1 class=\"heading\">{{ record|title }}</h1>\n{% endif %}\n- <hr>\n-\n- {% if record.image %}\n- <a href=\"{{ image(record.image) }}\">\n- <img src=\"{{ thumbnail(record.image, 400, 260) }}\">\n- </a>\n-\n- <hr>\n+ {% if record|image %}\n+ {{ popup(record|image, 1024, 768) }}\n{% endif %}\n{# Output all fields, in the order as defined in the content type.\nTo change the generated html and configure the options, see:\nhttps://docs.bolt.cm/templating #}\n- {% with { 'record': record, 'common': true, 'extended': true, 'repeaters': true, 'blocks': true } %}\n+ {% with { 'record': record, 'common': true, 'extended': true, 'repeaters': true, 'blocks': true, 'magicimage': record|imagename } %}\n{{ block('sub_fields', 'partials/_sub_fields.twig') }}\n{% endwith %}\n" }, { "change_type": "MODIFY", "old_path": "src/Controller/TwigAwareController.php", "new_path": "src/Controller/TwigAwareController.php", "diff": "@@ -94,5 +94,9 @@ class TwigAwareController extends AbstractController\n// set `public` package\n$publicPackage = new PathPackage('/', new EmptyVersionStrategy());\n$this->packages->addPackage('public', $publicPackage);\n+\n+ // set `files` package\n+ $filesPackage = new PathPackage('/files/', new EmptyVersionStrategy());\n+ $this->packages->addPackage('files', $filesPackage);\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Entity/ContentExtrasTrait.php", "new_path": "src/Entity/ContentExtrasTrait.php", "diff": "@@ -35,6 +35,7 @@ trait ContentExtrasTrait\nreturn [\n'title' => $this->contentExtension->getTitle($content),\n'image' => $this->contentExtension->getImage($content),\n+ 'imagename' => $this->contentExtension->getImageName($content),\n'excerpt' => $this->contentExtension->getExcerpt($content),\n'link' => $this->contentExtension->getLink($content),\n'editLink' => $this->contentExtension->getEditLink($content),\n" }, { "change_type": "MODIFY", "old_path": "src/Twig/ContentExtension.php", "new_path": "src/Twig/ContentExtension.php", "diff": "@@ -50,6 +50,7 @@ class ContentExtension extends AbstractExtension\nreturn [\nnew TwigFilter('title', [$this, 'getTitle'], $safe),\nnew TwigFilter('image', [$this, 'getImage'], $safe),\n+ new TwigFilter('imagename', [$this, 'getImageName']),\nnew TwigFilter('excerpt', [$this, 'getExcerpt'], $safe),\nnew TwigFilter('previous', [$this, 'getPreviousContent']),\nnew TwigFilter('next', [$this, 'getNextContent']),\n@@ -134,6 +135,20 @@ class ContentExtension extends AbstractExtension\nreturn null;\n}\n+ /**\n+ * @return string|null\n+ */\n+ public function getImageName(Content $content)\n+ {\n+ foreach ($content->getFields() as $field) {\n+ if ($field instanceof ImageField) {\n+ return $field->getName();\n+ }\n+ }\n+\n+ return null;\n+ }\n+\n/**\n* @param string|array|null $focus\n*/\n" }, { "change_type": "MODIFY", "old_path": "src/Twig/ImageExtension.php", "new_path": "src/Twig/ImageExtension.php", "diff": "@@ -5,22 +5,29 @@ declare(strict_types=1);\nnamespace Bolt\\Twig;\nuse Bolt\\Configuration\\Config;\n+use Bolt\\Entity\\Content;\nuse Bolt\\Entity\\Field\\ImageField;\nuse League\\Glide\\Urls\\UrlBuilderFactory;\n+use Symfony\\Component\\Asset\\Packages;\nuse Twig\\Extension\\AbstractExtension;\nuse Twig\\TwigFilter;\nuse Twig\\TwigFunction;\nclass ImageExtension extends AbstractExtension\n{\n+ /** @var Config */\n+ private $config;\n+\nprivate $secret = '';\n- private $config = [];\n+ /** @var Packages */\n+ private $packages;\n- public function __construct(Config $config)\n+ public function __construct(Config $config, Packages $packages)\n{\n$this->config = $config;\n$this->secret = $this->config->get('general/secret');\n+ $this->packages = $packages;\n}\n/**\n@@ -28,8 +35,11 @@ class ImageExtension extends AbstractExtension\n*/\npublic function getFilters(): array\n{\n+ // Note: we do _not_ include 'image' here, because it would clash with the\n+ // magic \"Image\" extras.\nreturn [\n- new TwigFilter('showimage', [$this, 'dummy']),\n+ new TwigFilter('popup', [$this, 'popup'], ['is_safe' => ['html']]),\n+ new TwigFilter('showimage', [$this, 'showImage'], ['is_safe' => ['html']]),\nnew TwigFilter('thumbnail', [$this, 'thumbnail'], ['is_safe' => ['html']]),\n];\n}\n@@ -40,22 +50,55 @@ class ImageExtension extends AbstractExtension\npublic function getFunctions(): array\n{\nreturn [\n- new TwigFunction('image', [$this, 'dummy'], ['is_safe' => ['html']]),\n+ new TwigFunction('image', [$this, 'image'], ['is_safe' => ['html']]),\n+ new TwigFunction('popup', [$this, 'popup'], ['is_safe' => ['html']]),\n+ new TwigFunction('showimage', [$this, 'showImage'], ['is_safe' => ['html']]),\nnew TwigFunction('thumbnail', [$this, 'thumbnail'], ['is_safe' => ['html']]),\n- new TwigFunction('popup', [$this, 'dummy'], ['is_safe' => ['html']]),\n+ new TwigFunction('magicimagename', [$this, 'magicImageName']),\n];\n}\n- public function thumbnail($image, $width = 320, $height = 240, $location = null, $path = null)\n+ /**\n+ * @param ImageField|array|string $image\n+ */\n+ public function image($image): string\n{\n- if ($image instanceof ImageField) {\n- $filename = $image->get('filename');\n- } elseif (is_array($image)) {\n- $filename = $image['filename'];\n- } elseif (is_string($image)) {\n- $filename = $image;\n+ $filename = $this->getFilename($image);\n+\n+ return $this->packages->getUrl($filename, 'files');\n+ }\n+\n+ public function popup($image, int $width = 320, int $height = 240): string\n+ {\n+ $link = $this->image($image);\n+ $thumbnail = $this->thumbnail($image, $width, $height);\n+ $alt = $this->getAlt($image);\n+\n+ return sprintf('<a href=\"%s\" class=\"bolt-popup\"><img src=\"%s\" alt=\"%s\" %s %s></a>', $link, $thumbnail, $alt, (string) $width, (string) $height);\n}\n+ /**\n+ * @param ImageField|array|string $image\n+ */\n+ public function showImage($image, ?int $width = null, ?int $height = null): string\n+ {\n+ $link = $this->image($image);\n+ $alt = $this->getAlt($image);\n+\n+ if ($width) {\n+ $width = sprintf('width=\"%s\"', $width);\n+ }\n+ if ($height) {\n+ $height = sprintf('height=\"%s\"', $height);\n+ }\n+\n+ return sprintf('<img src=\"%s\" alt=\"%s\" %s %s>', $link, $alt, (string) $width, (string) $height);\n+ }\n+\n+ public function thumbnail($image, int $width = 320, int $height = 240, ?string $location = null, ?string $path = null)\n+ {\n+ $filename = $this->getFilename($image);\n+\nif (empty($filename)) {\nreturn '';\n}\n@@ -79,8 +122,46 @@ class ImageExtension extends AbstractExtension\nreturn $urlBuilder->getUrl($filename, $params);\n}\n- public function dummy($input = null)\n+ public function magicImageName(Content $record): ?string\n+ {\n+ $record->getExtras()['imagename'];\n+ }\n+\n+ /**\n+ * @param ImageField|array|string $image\n+ */\n+ private function getFilename($image): string\n+ {\n+ $filename = '';\n+\n+ if ($image instanceof ImageField) {\n+ $filename = $image->get('filename');\n+ } elseif (is_array($image)) {\n+ $filename = $image['filename'];\n+ } elseif (is_string($image)) {\n+ $filename = $image;\n+ }\n+\n+ return $filename;\n+ }\n+\n+ /**\n+ * @param ImageField|array|string $image\n+ */\n+ private function getAlt($image): string\n{\n- return 'dummy';\n+ $alt = '';\n+\n+ if ($image instanceof ImageField) {\n+ $alt = $image->get('alt');\n+ } elseif (is_array($image)) {\n+ $alt = $image['alt'];\n+ } elseif (is_string($image)) {\n+ $alt = $image;\n+ }\n+\n+ return htmlentities($alt, ENT_QUOTES);\n}\n+\n+\n}\n" } ]
PHP
MIT License
bolt/core
Working on Twig Image funtions
95,143
23.07.2019 10:51:52
-7,200
67d811b258860e8cbe5cd84163bedb55b5b20240
First stab at Extensions. Add the Interface, Registry, Compiler pass and Kernel glue. See bolt/four#492
[ { "change_type": "ADD", "old_path": null, "new_path": "src/Extension/ExtensionCompilerPass.php", "diff": "+<?php\n+\n+declare(strict_types=1);\n+\n+namespace Bolt\\Extension;\n+\n+use Symfony\\Component\\DependencyInjection\\Compiler\\CompilerPassInterface;\n+use Symfony\\Component\\DependencyInjection\\ContainerBuilder;\n+use Symfony\\Component\\DependencyInjection\\Reference;\n+\n+class ExtensionCompilerPass implements CompilerPassInterface\n+{\n+ public function process(ContainerBuilder $container)\n+ {\n+ if (!$container->has(ExtensionRegistry::class)) {\n+ return;\n+ }\n+\n+ $repository = $container->findDefinition(ExtensionRegistry::class);\n+ // The important bit: grab all classes that were tagged with our specified CONTAINER_TAG, and shove them into our Repository\n+ foreach ($container->findTaggedServiceIds(ExtensionInterface::CONTAINER_TAG) as $id => $tags) {\n+ /** @see ExtensionRegistry::add() */\n+ $repository->addMethodCall('add', [new Reference($id)]);\n+ }\n+ }\n+}\n\\ No newline at end of file\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/Extension/ExtensionInterface.php", "diff": "+<?php\n+\n+declare(strict_types=1);\n+\n+namespace Bolt\\Extension;\n+\n+interface ExtensionInterface\n+{\n+ public const CONTAINER_TAG = 'bolt.extension';\n+ public function getName(): string;\n+}\n\\ No newline at end of file\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/Extension/ExtensionRegistry.php", "diff": "+<?php\n+\n+declare(strict_types=1);\n+\n+namespace Bolt\\Extension;\n+\n+class ExtensionRegistry\n+{\n+ /** @var ExtensionInterface[] **/\n+ protected $extensions = [];\n+\n+ public function add(ExtensionInterface $extension): void\n+ {\n+ $this->extensions[\\get_class($extension)] = $extension;\n+ }\n+\n+ /** @return ExtensionInterface[] */\n+ public function getExtensions(): array\n+ {\n+ return $this->extensions;\n+ }\n+}\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "src/Kernel.php", "new_path": "src/Kernel.php", "diff": "@@ -6,6 +6,8 @@ namespace Bolt;\nuse Bolt\\Configuration\\Parser\\ContentTypesParser;\nuse Bolt\\Configuration\\Parser\\TaxonomyParser;\n+use Bolt\\Extension\\ExtensionCompilerPass;\n+use Bolt\\Extension\\ExtensionInterface;\nuse Doctrine\\ORM\\Query;\nuse Gedmo\\Translatable\\Query\\TreeWalker\\TranslationWalker;\nuse Symfony\\Bundle\\FrameworkBundle\\Kernel\\MicroKernelTrait;\n@@ -60,6 +62,16 @@ class Kernel extends BaseKernel\n);\n}\n+ public function build(ContainerBuilder $container): void\n+ {\n+ $container\n+ ->registerForAutoconfiguration(ExtensionInterface::class)\n+ ->addTag(ExtensionInterface::CONTAINER_TAG);\n+\n+ // Process all our implementors through our CompilerPass\n+ $container->addCompilerPass(new ExtensionCompilerPass());\n+ }\n+\nprotected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void\n{\n$container->addResource(new FileResource($this->getProjectDir() . '/config/bundles.php'));\n" } ]
PHP
MIT License
bolt/core
First stab at Extensions. Add the Interface, Registry, Compiler pass and Kernel glue. See bolt/four#492
95,144
25.07.2019 15:37:31
-7,200
9730d38f1bedca12617bee912663e6350c37de7b
Keep 'title' and 'media'
[ { "change_type": "MODIFY", "old_path": "public/theme/skeleton/index.twig", "new_path": "public/theme/skeleton/index.twig", "diff": "<section class=\"imageholder\">\n{{ popup(record|image, 1200, 500) }}\n- <small>{{ record|image.alt }}</small>\n+ <small>{{ record|image.title|default(record|image.title)|default('title-less image') }}</small>\n</section>\n{{ record.content }}\n" }, { "change_type": "MODIFY", "old_path": "src/Entity/Field/ImageField.php", "new_path": "src/Entity/Field/ImageField.php", "diff": "@@ -7,7 +7,8 @@ namespace Bolt\\Entity\\Field;\nuse Bolt\\Entity\\Field;\nuse Bolt\\Entity\\FieldInterface;\nuse Doctrine\\ORM\\Mapping as ORM;\n-use League\\Glide\\Urls\\UrlBuilderFactory;\n+use Symfony\\Component\\Asset\\PathPackage;\n+use Symfony\\Component\\Asset\\VersionStrategy\\EmptyVersionStrategy;\n/**\n* @ORM\\Entity\n@@ -28,26 +29,19 @@ class ImageField extends Field implements FieldInterface\n{\n$value = parent::getValue() ?: [];\n+ // Remove cruft field getting stored as JSON.\n+ unset($value[0]);\n+\n// Generate a URL\n$value['path'] = $this->getPath();\n- // @todo temp fix for https://github.com/bolt/four/issues/318\n- unset($value['media']);\n- unset($value['title']);\n- unset($value[0]);\n-\nreturn $value;\n}\npublic function getPath(): string\n{\n- $urlBuilder = UrlBuilderFactory::create('/thumbs/');\n-\n- // @todo those dimensions shouldn't be hardcoded here\n- return $urlBuilder->getUrl($this->get('filename'), [\n- 'w' => 240,\n- 'h' => 160,\n- 'area' => 'files',\n- ]);\n+ $filesPackage = new PathPackage('/files/', new EmptyVersionStrategy());\n+\n+ return $filesPackage->getUrl($this->get('filename'));\n}\n}\n" } ]
PHP
MIT License
bolt/core
Keep 'title' and 'media'
95,144
25.07.2019 15:39:42
-7,200
6c6a02cd1176ee3f81f630b90ca8f302d356888d
remove dump..
[ { "change_type": "MODIFY", "old_path": "public/theme/skeleton/partials/_sub_fields.twig", "new_path": "public/theme/skeleton/partials/_sub_fields.twig", "diff": "{% set omittedkeys = omittedkeys|merge([magicimage]) %}\n{% endif %}\n-\n- {{ dump(omittedkeys) }}\n-\n{% endspaceless -%}\n{# SECTION 2: LOOPING AND ITERATION - The actual looping is done here. #}\n" } ]
PHP
MIT License
bolt/core
remove dump..
95,144
25.07.2019 20:47:36
-7,200
7b9d03fc9b27b6dd357abb4f4923b045ea40c9f6
Better escaping in most Field types
[ { "change_type": "MODIFY", "old_path": "config/bolt/contenttypes.yaml", "new_path": "config/bolt/contenttypes.yaml", "diff": "@@ -201,6 +201,8 @@ showcases:\ntype: checkbox\nlabel: \"This is a checkbox\"\ngroup: other\n+ email:\n+ type: email\ndatetime:\ntype: date\nmode: datetime\n" }, { "change_type": "MODIFY", "old_path": "package-lock.json", "new_path": "package-lock.json", "diff": "}\n},\n\"electron-to-chromium\": {\n- \"version\": \"1.3.197\",\n- \"resolved\": \"https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.197.tgz\",\n- \"integrity\": \"sha512-SfD7WfmueKrtKeHUESLczuANgnpdnfrSz3ZzerLdtmZf2UBZmAB3z9Q525zI5p3n9I7ii/lllUlyKHm2pIG7QQ==\"\n+ \"version\": \"1.3.200\",\n+ \"resolved\": \"https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.200.tgz\",\n+ \"integrity\": \"sha512-PUurrpyDA74MuAjJRD+79ss5BqJlU3mdArRbuu4wO/dt6jc3Ic/6BDmFJxkdwbfq39cHf/XKm2vW98XSvut9Dg==\"\n},\n\"express\": {\n\"version\": \"4.17.1\",\n\"integrity\": \"sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==\"\n},\n\"node-releases\": {\n- \"version\": \"1.1.25\",\n- \"resolved\": \"https://registry.npmjs.org/node-releases/-/node-releases-1.1.25.tgz\",\n- \"integrity\": \"sha512-fI5BXuk83lKEoZDdH3gRhtsNgh05/wZacuXkgbiYkceE7+QIMXOg98n9ZV7mz27B+kFHnqHcUpscZZlGRSmTpQ==\",\n+ \"version\": \"1.1.26\",\n+ \"resolved\": \"https://registry.npmjs.org/node-releases/-/node-releases-1.1.26.tgz\",\n+ \"integrity\": \"sha512-fZPsuhhUHMTlfkhDLGtfY80DSJTjOcx+qD1j5pqPkuhUHVS7xHZIg9EE4DHK8O3f0zTxXHX5VIkDG8pu98/wfQ==\",\n\"requires\": {\n\"semver\": \"^5.3.0\"\n},\n}\n},\n\"semver\": {\n- \"version\": \"6.2.0\",\n- \"resolved\": \"https://registry.npmjs.org/semver/-/semver-6.2.0.tgz\",\n- \"integrity\": \"sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==\"\n+ \"version\": \"6.3.0\",\n+ \"resolved\": \"https://registry.npmjs.org/semver/-/semver-6.3.0.tgz\",\n+ \"integrity\": \"sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==\"\n},\n\"send\": {\n\"version\": \"0.17.1\",\n}\n},\n\"semver\": {\n- \"version\": \"6.2.0\",\n- \"resolved\": \"https://registry.npmjs.org/semver/-/semver-6.2.0.tgz\",\n- \"integrity\": \"sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==\"\n+ \"version\": \"6.3.0\",\n+ \"resolved\": \"https://registry.npmjs.org/semver/-/semver-6.3.0.tgz\",\n+ \"integrity\": \"sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==\"\n},\n\"supports-color\": {\n\"version\": \"5.5.0\",\n\"dev\": true\n},\n\"async\": {\n- \"version\": \"2.6.2\",\n- \"resolved\": \"https://registry.npmjs.org/async/-/async-2.6.2.tgz\",\n- \"integrity\": \"sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==\",\n+ \"version\": \"2.6.3\",\n+ \"resolved\": \"https://registry.npmjs.org/async/-/async-2.6.3.tgz\",\n+ \"integrity\": \"sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==\",\n\"requires\": {\n- \"lodash\": \"^4.17.11\"\n+ \"lodash\": \"^4.17.14\"\n}\n},\n\"async-each\": {\n}\n},\n\"flatpickr\": {\n- \"version\": \"4.5.7\",\n- \"resolved\": \"https://registry.npmjs.org/flatpickr/-/flatpickr-4.5.7.tgz\",\n- \"integrity\": \"sha512-JqPfihUc9A/j9QAsh6otoARmMyUauPE17vRBEG+ThJwbl8zAq4ssGpxlPK3wWM/i8EFxkHg9UuVo0ds7XluKxw==\"\n+ \"version\": \"4.6.2\",\n+ \"resolved\": \"https://registry.npmjs.org/flatpickr/-/flatpickr-4.6.2.tgz\",\n+ \"integrity\": \"sha512-bRfBPyxohUQWgCTg6jPALUO1t/x+sRJ/S/RVti/NzYvHqGRpCAesKSWKLzOuLmpu+vGHfXBld4SXvOCLFgYb+g==\"\n},\n\"flatted\": {\n\"version\": \"2.0.0\",\n}\n},\n\"luxon\": {\n- \"version\": \"1.17.1\",\n- \"resolved\": \"https://registry.npmjs.org/luxon/-/luxon-1.17.1.tgz\",\n- \"integrity\": \"sha512-+xo7Pj54xwyEzlMdXzDqm60Ewqbn0QqACwfIo6so9M1idUtYQrD7/PHjEFQQmLCBu8wUe2IDC2jrcJJ3Buk4Pw==\"\n+ \"version\": \"1.17.2\",\n+ \"resolved\": \"https://registry.npmjs.org/luxon/-/luxon-1.17.2.tgz\",\n+ \"integrity\": \"sha512-qELKtIj3HD41N+MvgoxArk8DZGUb4Gpiijs91oi+ZmKJzRlxY6CoyTwNoUwnogCVs4p8HuxVJDik9JbnYgrCng==\"\n},\n\"make-dir\": {\n\"version\": \"1.3.0\",\n\"dev\": true\n},\n\"marked\": {\n- \"version\": \"0.6.2\",\n- \"resolved\": \"https://registry.npmjs.org/marked/-/marked-0.6.2.tgz\",\n- \"integrity\": \"sha512-LqxwVH3P/rqKX4EKGz7+c2G9r98WeM/SW34ybhgNGhUQNKtf1GmmSkJ6cDGJ/t6tiyae49qRkpyTw2B9HOrgUA==\"\n+ \"version\": \"0.7.0\",\n+ \"resolved\": \"https://registry.npmjs.org/marked/-/marked-0.7.0.tgz\",\n+ \"integrity\": \"sha512-c+yYdCZJQrsRjTPhUx7VKkApw9bwDkNbHUKo1ovgcfDjb2kc8rLuRbIFyXL5WOEUwzSSKo3IXpph2K6DqB/KZg==\"\n},\n\"mathml-tag-names\": {\n\"version\": \"2.1.1\",\n},\n\"js-yaml\": {\n\"version\": \"3.12.0\",\n- \"resolved\": \"\",\n+ \"resolved\": \"https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz\",\n+ \"integrity\": \"sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==\",\n\"requires\": {\n\"argparse\": \"^1.0.7\",\n\"esprima\": \"^4.0.0\"\n}\n},\n\"trumbowyg\": {\n- \"version\": \"2.15.0\",\n- \"resolved\": \"https://registry.npmjs.org/trumbowyg/-/trumbowyg-2.15.0.tgz\",\n- \"integrity\": \"sha512-L4iZKgcX7Sx8uU23/o7b9JUpEeqawE7p+gGTJysPvlM1pTPR3OQSnyuMjdAO89UJ1FQWsJZXIf29YUgpv57pLg==\"\n+ \"version\": \"2.18.0\",\n+ \"resolved\": \"https://registry.npmjs.org/trumbowyg/-/trumbowyg-2.18.0.tgz\",\n+ \"integrity\": \"sha512-0C6J3uYE3a9JO1IZdlOVQqTEvzvPA798jHM1Wxiixsr+UIFQNP+fFVYSZqTlO5i3WIiWHJzk3klRczyhHDUnKA==\"\n},\n\"tryer\": {\n\"version\": \"1.0.1\",\n" }, { "change_type": "MODIFY", "old_path": "templates/_partials/fields/date.html.twig", "new_path": "templates/_partials/fields/date.html.twig", "diff": "{% endif %}\n<editor-date\n- :value=\"'{{ value }}'\"\n- name=\"{{ name }}\"\n- :disabled=\"'{{ disabled }}'\"\n- form=\"{{ form }}\"\n- mode=\"{{ mode }}\"\n- locale=\"{{user.locale}}\"\n+ :value='{{ value|json_encode }}'\n+ name='{{ name }}'\n+ :disabled='{{ disabled|json_encode }}'\n+ form='{{ form }}'\n+ mode='{{ mode }}'\n+ locale='{{user.locale}}'\n></editor-date>\n{% endblock %}\n" }, { "change_type": "MODIFY", "old_path": "templates/_partials/fields/datetime.html.twig", "new_path": "templates/_partials/fields/datetime.html.twig", "diff": "{% endif %}\n<editor-datetime\n- :value=\"'{{ value }}'\"\n- :name=\"'{{ name }}'\"\n- :readonly=\"'{{ readonly }}'\"\n- :form=\"'{{ form }}'\"\n+ :value='{{ value|json_encode }}'\n+ :name='{{ name|json_encode }}'\n+ :readonly='{{ readonly|json_encode }}'\n+ :form='{{ form|json_encode }}'\n></editor-datetime>\n{% endblock %}\n" }, { "change_type": "MODIFY", "old_path": "templates/_partials/fields/email.html.twig", "new_path": "templates/_partials/fields/email.html.twig", "diff": "{% block field %}\n<editor-email\n- :id=\"'{{ id }}'\"\n- :name=\"'{{ name }}'\"\n+ :id='{{ id|json_encode }}'\n+ :name='{{ name|json_encode }}'\n:value=\"{{ value|json_encode }}\"\n></editor-email>\n{% endblock %}\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "templates/_partials/fields/embed.html.twig", "new_path": "templates/_partials/fields/embed.html.twig", "diff": "{% block field %}\n<editor-embed\n- :embedapi=\"'{{ path('bolt_embed') }}'\"\n- :name=\"'{{ name }}'\"\n- :url=\"'{{ field.get('url') }}'\"\n- :width=\"'{{ field.get('width') }}'\"\n- :height=\"'{{ field.get('height') }}'\"\n- :title=\"'{{ field.get('title')|e('js') }}'\"\n- :authorname=\"'{{ field.get('authorname')|e('js') }}'\"\n- :authorurl=\"'{{ field.get('authorurl') }}'\"\n- :html=\"'{{ field.get('html') }}'\"\n- :thumbnail=\"'{{ field.get('thumbnail') }}'\"\n+ :embedapi='{{ path('bolt_embed')|json_encode }}'\n+ :name='{{ name|json_encode }}'\n+ :url='{{ field.get('url')|json_encode }}'\n+ :width='{{ field.get('width')|json_encode }}'\n+ :height='{{ field.get('height')|json_encode }}'\n+ :title='{{ field.get('title')|e('js')|json_encode }}'\n+ :authorname='{{ field.get('authorname')|e('js')|json_encode }}'\n+ :authorurl='{{ field.get('authorurl')|json_encode }}'\n+ :html='{{ field.get('html')|json_encode }}'\n+ :thumbnail='{{ field.get('thumbnail')|json_encode }}'\n></editor-embed>\n{% endblock %}\n" }, { "change_type": "MODIFY", "old_path": "templates/_partials/fields/html.html.twig", "new_path": "templates/_partials/fields/html.html.twig", "diff": "{% block field %}\n<editor-html\n:value=\"{{ value|json_encode }}\"\n- :name=\"'{{ name }}'\"\n+ :name='{{ name|json_encode }}'\n></editor-html>\n{% endblock %}\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "templates/_partials/fields/image.html.twig", "new_path": "templates/_partials/fields/image.html.twig", "diff": "{% set setPath = field.definition.get('upload')|default('') %}\n{% set directory = path('bolt_async_upload', {'location': location|default('files'), 'path': setPath}) %}\n<editor-image\n- :name=\"'{{ name }}'\"\n- :filename=\"'{{ field.get('filename') }}'\"\n- :thumbnail=\"'{{ field|thumbnail(width=1200, height=1200) }}'\"\n- :title=\"'{{ field.get('title') }}'\"\n- :alt=\"'{{ field.get('alt') }}'\"\n- :media=\"'{{ field.get('media') }}'\"\n- :directory=\"'{{directory}}'\"\n- :csrf_token=\"'{{ csrf_token('upload') }}'\"\n+ :name='{{ name|json_encode }}'\n+ :filename='{{ field.get('filename')|json_encode }}'\n+ :thumbnail='{{ field|thumbnail(width=400, height=300)|json_encode }}'\n+ :title='{{ field.get('title')|json_encode }}'\n+ :alt='{{ field.get('alt')|json_encode }}'\n+ :media='{{ field.get('media')|json_encode }}'\n+ :directory='{{ directory|json_encode }}'\n+ :csrf_token='{{ csrf_token('upload') }}'\n></editor-image>\n+\n{% endblock %}\n" }, { "change_type": "MODIFY", "old_path": "templates/_partials/fields/markdown.html.twig", "new_path": "templates/_partials/fields/markdown.html.twig", "diff": "{% block field %}\n<editor-markdown\n:value='{{ value|json_encode }}'\n- :name=\"'{{ name }}'\"\n+ :name='{{ name|json_encode }}'\n></editor-markdown>\n{% endblock %}\n" }, { "change_type": "MODIFY", "old_path": "templates/_partials/fields/password.html.twig", "new_path": "templates/_partials/fields/password.html.twig", "diff": "{% block field %}\n<editor-password\n- :id=\"'{{ id }}'\"\n- :name=\"'{{ name }}'\"\n- :value=\"{{ value|json_encode }}\"\n- :label=\"{{ label|json_encode }}\"\n- :label_class=\"{{ label_class|default()|json_encode }}\"\n- :class=\"{{ class|json_encode }}\"\n- :hidden=\"{{ hidden|default('false') }}\"\n+ :id='{{ id|json_encode }}'\n+ :name='{{ name|json_encode }}'\n+ :value='{{ value|json_encode }}'\n+ :label='{{ label|json_encode }}'\n+ :label_class='{{ label_class|default()|json_encode }}'\n+ :class='{{ class|json_encode }}'\n+ :hidden='{{ hidden|default('false') }}'\n></editor-password>\n{% endblock %}\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "templates/_partials/fields/select.html.twig", "new_path": "templates/_partials/fields/select.html.twig", "diff": "{#<pre><code>{{ value|json_encode }}</code></pre>#}\n<editor-select\n:value=\"{{ value|json_encode }}\"\n- :name=\"'{{ name }}'\"\n- :id=\"'{{ id }}'\"\n+ :name='{{ name|json_encode }}'\n+ :id='{{ id|json_encode }}'\n:options=\"{{ options|json_encode }}\"\n- :form=\"'{{ form }}'\"\n+ :form='{{ form|json_encode }}'\n:multiple=\"{{ multiple }}\"\n:allowempty=\"{{ allowempty }}\"\n></editor-select>\n" }, { "change_type": "MODIFY", "old_path": "templates/_partials/fields/slug.html.twig", "new_path": "templates/_partials/fields/slug.html.twig", "diff": "{% block field %}\n<editor-slug\n- :value=\"'{{ value }}'\"\n- :name=\"'{{ name }}'\"\n- :prefix=\"'{{ field.slugPrefix }}'\"\n- :field-class=\"'{{ class }}'\"\n- :generate=\"'{{ field.slugUseFields|join(', ') }}'\"\n+ :value='{{ value|json_encode }}'\n+ :name='{{ name|json_encode }}'\n+ :prefix='{{ field.slugPrefix|json_encode }}'\n+ :field-class='{{ class|json_encode }}'\n+ :generate='{{ field.slugUseFields|join(', ')|json_encode }}'\n></editor-slug>\n{% endblock %}\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "templates/_partials/fields/text.html.twig", "new_path": "templates/_partials/fields/text.html.twig", "diff": "{% block field %}\n<editor-text\n- :id=\"'{{ id }}'\"\n+ :id='{{ id|json_encode }}'\n:value=\"{{ value|json_encode }}\"\n- :name=\"'{{ name }}'\"\n- :type=\"'{{ class }}'\"\n- :disabled=\"'{{ disabled }}'\"\n+ :name='{{ name|json_encode }}'\n+ :type='{{ class|json_encode }}'\n+ :disabled='{{ disabled|json_encode }}'\n></editor-text>\n{% endblock %}\n" }, { "change_type": "MODIFY", "old_path": "templates/_partials/fields/textarea.html.twig", "new_path": "templates/_partials/fields/textarea.html.twig", "diff": "{% block field %}\n<editor-textarea\n:value='{{ value|json_encode }}'\n- :label=\"'{{ label }}'\"\n- :name=\"'{{ name }}'\"\n+ :label='{{ label|json_encode }}'\n+ :name='{{ name|json_encode }}'\n></editor-textarea>\n{% endblock %}\n\\ No newline at end of file\n" } ]
PHP
MIT License
bolt/core
Better escaping in most Field types
95,192
26.07.2019 14:11:46
-7,200
964eaa2c0c81bafac6f0736536609a0b637495a1
some improvements to sidebar, button and version link
[ { "change_type": "MODIFY", "old_path": "assets/js/app/sidebar/Components/Sidebar.vue", "new_path": "assets/js/app/sidebar/Components/Sidebar.vue", "diff": "<template>\n<nav class=\"admin__sidebar--nav\">\n- <div><sidebar-menu :menu=\"menu\"></sidebar-menu></div>\n- <sidebar-footer :version=\"version\" :about-link=\"aboutLink\"></sidebar-footer>\n+ <sidebar-menu :menu=\"menu\"></sidebar-menu>\n+ <sidebar-toggler :version=\"version\" :about-link=\"aboutLink\"></sidebar-toggler>\n+ <footer class=\"admin__sidebar--footer\">\n+ <a :href=\"aboutLink\">Bolt v<span class=\"sr-only\">ersion </span>{{ version }}</a>\n+ </footer>\n</nav>\n</template>\n<script>\nimport Menu from './Menu';\n-import Footer from './_Footer';\n+import SidebarToggler from './_SidebarToggler';\nexport default {\nname: 'Sidebar',\ncomponents: {\n'sidebar-menu': Menu,\n- 'sidebar-footer': Footer,\n+ 'sidebar-toggler': SidebarToggler,\n},\nprops: ['menu', 'version', 'aboutLink'],\ncreated() {\n" }, { "change_type": "RENAME", "old_path": "assets/js/app/sidebar/Components/_Footer.vue", "new_path": "assets/js/app/sidebar/Components/_SidebarToggler.vue", "diff": "<template>\n- <div>\n<button class=\"admin__sidebar--slim\" @click=\"slimSidebar(!slim)\">\n- <i class=\"fas fa-arrows-alt-h\"></i>\n+ <i class=\"fas fa-exchange-alt\"></i>\n+ <span class=\"sr-only\">Toggle sidebar width</span>\n</button>\n- <footer class=\"admin__sidebar--footer\">\n- <a :href=\"aboutLink\">Bolt {{ version }}</a>\n- </footer>\n- </div>\n</template>\n<script>\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/modules/admin/_sidebar.scss", "new_path": "assets/scss/modules/admin/_sidebar.scss", "diff": "}\n&--menu {\n- margin: 0;\n+ margin: 0 0 2rem 0;\npadding: 0;\nwidth: 100%;\nlist-style: none;\nbackground: transparent;\nborder: 0;\ntext-align: center;\n- color: var(--admin-sidebar-icon);\n+ color: var(--shade-light);\nfont-size: $font-size-lg;\n- position: fixed;\n- left: 0;\n- bottom: 40px;\n+ position: relative;\n@include media-breakpoint-up(md) {\nwidth: $admin-sidebar-width-wide;\n}\n&:hover,\n&:focus {\n+ color: var(--admin-sidebar-icon);\noutline: none;\ncursor: pointer;\n}\n&--footer {\n-webkit-backface-visibility: hidden;\n-\n- background: transparent;\n-\ncolor: var(--admin-sidebar-text);\nposition: fixed;\nbottom: 0;\nleft: 0;\n- height: 40px;\n+ z-index: 1;\n+ min-height: 40px;\nwidth: $admin-sidebar-width;\npadding: 0 $spacer;\ndisplay: flex;\nalign-items: center;\njustify-content: center;\n- font-weight: $font-weight-bold;\n- font-size: $small-font-size;\n- letter-spacing: $letter-spacing;\n+ background-color: var(--admin-sidebar);\n@include media-breakpoint-up(md) {\nwidth: $admin-sidebar-width-wide;\n}\n&.is-slim {\n.admin__sidebar {\nwidth: $admin-sidebar-width / 3;\n- .admin__sidebar--separator,\n+ .admin__sidebar--separator {\n+ visibility: hidden;\n+ margin: 0;\n+ }\n.admin__sidebar--footer {\ndisplay: none;\n}\npadding: $spacer / 1.25 $spacer / 2;\n.link--icon {\n- font-size: 150%;\n+ font-size: 140%;\nmargin: 0;\nwidth: auto;\n}\n" } ]
PHP
MIT License
bolt/core
some improvements to sidebar, button and version link
95,144
26.07.2019 16:44:57
-7,200
edd486d0f7e8dd90ac9c3d6ecce8e109c7bd7898
Sensible placeholders for Widget Twig functions
[ { "change_type": "MODIFY", "old_path": "src/Twig/WidgetExtension.php", "new_path": "src/Twig/WidgetExtension.php", "diff": "@@ -28,9 +28,9 @@ class WidgetExtension extends AbstractExtension\n$safe = ['is_safe' => ['html']];\nreturn [\n- new TwigFunction('countwidgets', [$this, 'dummy']),\n- new TwigFunction('listwidgets', [$this, 'dummy']),\n- new TwigFunction('haswidgets', [$this, 'dummy']),\n+ new TwigFunction('countwidgets', [$this, 'countWidgets']),\n+ new TwigFunction('listwidgets', [$this, 'listWidgets']),\n+ new TwigFunction('haswidgets', [$this, 'hasWidgets']),\nnew TwigFunction('widgets', [$this, 'renderWidgetsForTarget'], $safe),\nnew TwigFunction('widget', [$this, 'renderWidgetByName'], $safe),\n];\n@@ -46,9 +46,21 @@ class WidgetExtension extends AbstractExtension\nreturn $this->widgetRenderer->renderWidgetsForTarget($target, $params);\n}\n- public function dummy($input = null): string\n+ public function hasWidgets($input = null): bool\n{\n// @todo See Github issue https://github.com/bolt/four/issues/135\n- return '<!-- Widget \"' . $input . '\" -->';\n+ return false;\n+ }\n+\n+ public function listwidgets($input = null): array\n+ {\n+ // @todo See Github issue https://github.com/bolt/four/issues/135\n+ return [];\n+ }\n+\n+ public function countwidgets($input = null): int\n+ {\n+ // @todo See Github issue https://github.com/bolt/four/issues/135\n+ return count($this->listwidgets($input));\n}\n}\n" } ]
PHP
MIT License
bolt/core
Sensible placeholders for Widget Twig functions
95,144
26.07.2019 16:47:39
-7,200
ebe74f209cd81851f20e3751b337489b425587df
Fix Excerpt Twig filter for other things than Content
[ { "change_type": "MODIFY", "old_path": "src/Twig/ContentExtension.php", "new_path": "src/Twig/ContentExtension.php", "diff": "@@ -149,8 +149,12 @@ class ContentExtension extends AbstractExtension\n/**\n* @param string|array|null $focus\n*/\n- public function getExcerpt(Content $content, int $length = 280, bool $includeTitle = true, $focus = null): string\n+ public function getExcerpt($content, int $length = 280, bool $includeTitle = true, $focus = null): string\n{\n+ if (is_string($content)) {\n+ return Excerpt::getExcerpt($content, $length);\n+ }\n+\n$excerptParts = [];\nif ($includeTitle) {\n" }, { "change_type": "MODIFY", "old_path": "src/Twig/RecordExtension.php", "new_path": "src/Twig/RecordExtension.php", "diff": "@@ -7,7 +7,6 @@ namespace Bolt\\Twig;\nuse Bolt\\Entity\\Content;\nuse Bolt\\Entity\\Field;\nuse Bolt\\Repository\\TaxonomyRepository;\n-use Bolt\\Utils\\Excerpt;\nuse Doctrine\\Common\\Collections\\Collection;\nuse Pagerfanta\\Pagerfanta;\nuse Tightenco\\Collect\\Support\\Collection as LaravelCollection;\n@@ -39,7 +38,6 @@ class RecordExtension extends AbstractExtension\n$env = ['needs_environment' => true];\nreturn [\n- new TwigFunction('excerpt', [$this, 'excerpt'], $safe),\nnew TwigFunction('list_templates', [$this, 'getListTemplates']),\nnew TwigFunction('pager', [$this, 'pager'], $env + $safe),\nnew TwigFunction('selectoptionsfromarray', [$this, 'selectoptionsfromarray']),\n@@ -66,11 +64,6 @@ class RecordExtension extends AbstractExtension\nreturn $twig->render($template, $context);\n}\n- public static function excerpt(string $text, int $length = 100): string\n- {\n- return Excerpt::getExcerpt($text, $length);\n- }\n-\npublic function icon(?Content $record = null, string $icon = 'question-circle'): string\n{\nif ($record instanceof Content) {\n" } ]
PHP
MIT License
bolt/core
Fix Excerpt Twig filter for other things than Content
95,144
26.07.2019 16:49:57
-7,200
9091ddab9e5a2fc6a9fab558ee1aeffebbb3abd2
Tweaking theme templates
[ { "change_type": "MODIFY", "old_path": "public/theme/skeleton/partials/_sub_fields.twig", "new_path": "public/theme/skeleton/partials/_sub_fields.twig", "diff": "{%- spaceless %}\n{# Set up the array of fieldnames that should be iterated. We do this by looping\nover _all_ the fields, and skipping those in the 'omittedkeys' array. #}\n- {% set omittedkeys = [ 'id', 'slug', 'image', 'datecreated', 'datechanged', 'datepublish',\n+ {% set omittedkeys = [ 'id', 'slug', 'datecreated', 'datechanged', 'datepublish',\n'datedepublish', 'username', 'status', 'ownerid', 'templatefields' ] %}\n{# Skip over the fields that are used in the slug, unless explicitly told not to,\n{% if exclude|default is iterable %}\n{% set omittedkeys = omittedkeys|merge(exclude) %}\n{% endif %}\n-\n- {# We also skip over the fields that are explicitly excluded. #}\n- {% if magicimage|default %}\n- {% set omittedkeys = omittedkeys|merge([magicimage]) %}\n- {% endif %}\n-\n{% endspaceless -%}\n{# SECTION 2: LOOPING AND ITERATION - The actual looping is done here. #}\n" }, { "change_type": "MODIFY", "old_path": "public/theme/skeleton/record.twig", "new_path": "public/theme/skeleton/record.twig", "diff": "{{ block('sub_fields', 'partials/_sub_fields.twig') }}\n{% endwith %}\n- {# Uncomment this if you wish to dump the entire record to the client, for debugging purposes.\n+ {# Comment this if you don't wish to dump the entire record to the client, for debugging purposes. #}\n{{ dump(record) }}\n- #}\n+\n{% include 'partials/_recordfooter.twig' with { 'record': record, 'extended': true } %}\n" } ]
PHP
MIT License
bolt/core
Tweaking theme templates
95,144
26.07.2019 16:50:57
-7,200
e6bbcf0a9039690a306b48dab43813f0056df607
Set contenttype in context for listingpages
[ { "change_type": "MODIFY", "old_path": "src/Controller/Frontend/ListingController.php", "new_path": "src/Controller/Frontend/ListingController.php", "diff": "@@ -44,7 +44,13 @@ class ListingController extends TwigAwareController implements FrontendZone\n$templates = $this->templateChooser->forListing($contentType);\n- return $this->renderTemplate($templates, ['records' => $records]);\n+ $twigVars = [\n+ 'records' => $records,\n+ $contentType->getSlug() => $records,\n+ 'contenttype' => $contentType,\n+ ];\n+\n+ return $this->renderTemplate($templates, $twigVars);\n}\n/**\n" } ]
PHP
MIT License
bolt/core
Set contenttype in context for listingpages
95,144
26.07.2019 16:51:58
-7,200
64b9138d92bcea19ef8183f64e894f5747d57936
Fixing two small type strictness things
[ { "change_type": "MODIFY", "old_path": "src/Twig/ImageExtension.php", "new_path": "src/Twig/ImageExtension.php", "diff": "@@ -130,9 +130,9 @@ class ImageExtension extends AbstractExtension\n/**\n* @param ImageField|array|string $image\n*/\n- private function getFilename($image): string\n+ private function getFilename($image): ?string\n{\n- $filename = '';\n+ $filename = null;\nif ($image instanceof ImageField) {\n$filename = $image->get('filename');\n" }, { "change_type": "MODIFY", "old_path": "src/Twig/LocaleExtension.php", "new_path": "src/Twig/LocaleExtension.php", "diff": "@@ -446,7 +446,7 @@ class LocaleExtension extends AbstractExtension\npublic function localedatetime($dateTime, string $format = '%B %e, %Y %H:%M', ?string $locale = '0'): string\n{\nif (! $dateTime instanceof \\DateTime) {\n- $dateTime = new \\DateTime($dateTime);\n+ $dateTime = new \\DateTime((string) $dateTime);\n}\n// Check for Windows to find and replace the %e modifier correctly\n" } ]
PHP
MIT License
bolt/core
Fixing two small type strictness things
95,144
27.07.2019 13:37:36
-7,200
458b4f81d0094288e65e037e9035cb2b9c050d2b
Add excerpt as a function
[ { "change_type": "MODIFY", "old_path": "src/Twig/ContentExtension.php", "new_path": "src/Twig/ContentExtension.php", "diff": "@@ -65,7 +65,10 @@ class ContentExtension extends AbstractExtension\n*/\npublic function getFunctions()\n{\n+ $safe = ['is_safe' => ['html']];\n+\nreturn [\n+ new TwigFunction('excerpt', [$this, 'getExcerpt'], $safe),\nnew TwigFunction('previous_record', [$this, 'getPreviousContent']),\nnew TwigFunction('next_record', [$this, 'getNextContent']),\n];\n" } ]
PHP
MIT License
bolt/core
Add excerpt as a function
95,144
27.07.2019 15:25:03
-7,200
020e45b5b5be0e7f351ba5315f8ac366597ac457
Add CopyThemes command
[ { "change_type": "RENAME", "old_path": "src/Command/InstallAssetsCommand.php", "new_path": "src/Command/CopyAssetsCommand.php", "diff": "@@ -14,9 +14,9 @@ use Symfony\\Component\\Filesystem\\Filesystem;\nuse Symfony\\Component\\Finder\\Finder;\nuse Symfony\\Component\\HttpKernel\\KernelInterface;\n-class InstallAssetsCommand extends Command\n+class CopyAssetsCommand extends Command\n{\n- protected static $defaultName = 'bolt:install-assets';\n+ protected static $defaultName = 'bolt:copy-assets';\nprivate $filesystem;\n@@ -84,7 +84,7 @@ class InstallAssetsCommand extends Command\n}\nif ($rows) {\n- $io->table(['', 'Bundle', 'Method / Error'], $rows);\n+ $io->table(['', 'Folder', 'Method / Error'], $rows);\n}\nif ($exitCode !== 0) {\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/Command/CopyThemesCommand.php", "diff": "+<?php\n+\n+declare(strict_types=1);\n+\n+namespace Bolt\\Command;\n+\n+use Symfony\\Bundle\\FrameworkBundle\\Console\\Application;\n+use Symfony\\Component\\Console\\Command\\Command;\n+use Symfony\\Component\\Console\\Input\\InputInterface;\n+use Symfony\\Component\\Console\\Output\\OutputInterface;\n+use Symfony\\Component\\Console\\Style\\SymfonyStyle;\n+use Symfony\\Component\\DependencyInjection\\ContainerInterface;\n+use Symfony\\Component\\Filesystem\\Filesystem;\n+use Symfony\\Component\\Finder\\Finder;\n+use Symfony\\Component\\HttpKernel\\KernelInterface;\n+\n+class CopyThemesCommand extends Command\n+{\n+ protected static $defaultName = 'bolt:copy-themes';\n+\n+ private $filesystem;\n+\n+ public function __construct(Filesystem $filesystem)\n+ {\n+ parent::__construct();\n+\n+ $this->filesystem = $filesystem;\n+ }\n+\n+ protected function configure(): void\n+ {\n+ $this\n+ ->setDescription('Copy theme files into the public/themes folder');\n+ }\n+\n+ /**\n+ * {@inheritdoc}\n+ */\n+ protected function execute(InputInterface $input, OutputInterface $output)\n+ {\n+ /** @var Application $app */\n+ $app = $this->getApplication();\n+ /** @var KernelInterface $kernel */\n+ $kernel = $app->getKernel();\n+\n+ $publicDir = $this->getPublicDirectory($kernel->getContainer());\n+\n+ // Determine if we can use ../bolt-assets or not.\n+ if (file_exists(dirname(dirname(dirname(__DIR__))) . '/themes')) {\n+ $baseDir = dirname(dirname(dirname(__DIR__))) . '/themes';\n+ $dirs = [\n+ $baseDir . '/base-2018' => $publicDir .'/theme/base-2018',\n+ $baseDir . '/skeleton' => $publicDir .'/theme/skeleton',\n+ ];\n+ } else {\n+ $io->error('Run \\'composer require bolt/themes\\' before using thie command.');\n+ return 1;\n+ }\n+\n+ $io = new SymfonyStyle($input, $output);\n+ $io->newLine();\n+ $io->text('Installing Bolt themes as <info>hard copies</info>.');\n+ $io->newLine();\n+\n+ $rows = [];\n+ $exitCode = 0;\n+\n+ foreach ($dirs as $originDir => $targetDir) {\n+ $message = basename($targetDir);\n+\n+ try {\n+ $this->filesystem->remove($targetDir);\n+ $this->hardCopy($originDir, $targetDir);\n+\n+ $rows[] = [sprintf('<fg=green;options=bold>%s</>', \"\\xE2\\x9C\\x94\"), $message, 'copied'];\n+ } catch (\\Throwable $e) {\n+ $exitCode = 1;\n+ $rows[] = [sprintf('<fg=red;options=bold>%s</>', \"\\xE2\\x9C\\x98\"), $message, $e->getMessage()];\n+ }\n+ }\n+\n+ if ($rows) {\n+ $io->table(['', 'Theme', 'Method / Error'], $rows);\n+ }\n+\n+ if ($exitCode !== 0) {\n+ $io->error('Some errors occurred while installing themes.');\n+ } else {\n+ $io->success($rows ? 'All themes were successfully installed.' : 'No themes were provided by any bundle.');\n+ }\n+\n+ return $exitCode;\n+ }\n+\n+ /**\n+ * Copies origin to target.\n+ */\n+ private function hardCopy(string $originDir, string $targetDir): void\n+ {\n+ $this->filesystem->mkdir($targetDir, 0777);\n+\n+ // We use a custom iterator to ignore VCS files\n+ $this->filesystem->mirror($originDir, $targetDir, Finder::create()->ignoreDotFiles(false)->in($originDir));\n+ }\n+\n+ private function getProjectDirectory(ContainerInterface $container): string\n+ {\n+ if ($container->hasParameter('kernel.project_dir')) {\n+ return $container->getParameter('kernel.project_dir');\n+ }\n+\n+ return dirname(dirname(dirname(dirname(dirname(__DIR__)))));\n+ }\n+\n+ private function getPublicDirectory(ContainerInterface $container): string\n+ {\n+ $defaultPublicDir = 'public';\n+\n+ if (! $container->hasParameter('kernel.project_dir')) {\n+ return $defaultPublicDir;\n+ }\n+\n+ $composerFilePath = $container->getParameter('kernel.project_dir').'/composer.json';\n+\n+ if (! file_exists($composerFilePath)) {\n+ return $defaultPublicDir;\n+ }\n+\n+ $composerConfig = json_decode(file_get_contents($composerFilePath), true);\n+\n+ if (isset($composerConfig['extra']['public-dir'])) {\n+ return $composerConfig['extra']['public-dir'];\n+ }\n+\n+ return $this->getProjectDirectory($container) . '/' . $defaultPublicDir;\n+ }\n+}\n" } ]
PHP
MIT License
bolt/core
Add CopyThemes command
95,144
28.07.2019 07:08:51
-7,200
e735f74139c8cd9ba4cd1c7d42b68b2eddf43368
Place the logo on the login screen
[ { "change_type": "MODIFY", "old_path": "assets/scss/layout/_login.scss", "new_path": "assets/scss/layout/_login.scss", "diff": "@@ -14,4 +14,14 @@ html#login {\nwidth: 22rem;\nbox-shadow: 10px 10px 20px rgba(0, 0, 0, 0.4);\n}\n+\n+ .logo {\n+ width: 22rem;\n+ }\n+\n+ h1 {\n+ color: #FFF;\n+ text-align: center;\n+ margin: 2rem 0;\n+ }\n}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "assets/static/images/bolt_logo_login.svg", "diff": "+<svg width=\"1117px\" height=\"256px\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\">\n+<g style=\"\"> <path d=\"M324.991667,204.666667 L379.441667,204.666667 C411.166667,204.666667,436.366667,191.391667,436.366667,161.466667 C436.366667,141.891667,424.891667,130.866667,410.041667,127.041667 L410.041667,126.141667 C421.966667,121.641667,429.166667,107.466667,429.166667,94.416667 C429.166667,66.291667,405.541667,57.966667,375.166667,57.966667 L324.991667,57.966667 Z M358.066667,116.691667 L358.066667,83.616667 L373.816667,83.616667 C389.341667,83.616667,396.766667,87.891667,396.766667,99.366667 C396.766667,109.941667,389.791667,116.691667,373.591667,116.691667 Z M358.066667,179.016667 L358.066667,141.216667 L376.741667,141.216667 C394.966667,141.216667,403.966667,146.391667,403.966667,159.216667 C403.966667,172.716667,394.741667,179.016667,376.741667,179.016667 Z M506.341667,207.366667 C534.466667,207.366667,560.566667,185.991667,560.566667,148.866667 C560.566667,111.741667,534.466667,90.366667,506.341667,90.366667 C477.991667,90.366667,451.891667,111.741667,451.891667,148.866667 C451.891667,185.991667,477.991667,207.366667,506.341667,207.366667 Z M506.341667,180.591667 C492.616667,180.591667,485.866667,168.216667,485.866667,148.866667 C485.866667,129.516667,492.616667,117.141667,506.341667,117.141667 C519.841667,117.141667,526.816667,129.516667,526.816667,148.866667 C526.816667,168.216667,519.841667,180.591667,506.341667,180.591667 Z M613.666667,207.366667 C621.091667,207.366667,626.716667,206.241667,630.316667,204.666667 L626.266667,180.141667 C624.466667,180.591667,623.566667,180.591667,622.216667,180.591667 C619.516667,180.591667,616.366667,178.341667,616.366667,171.366667 L616.366667,46.941667 L583.291667,46.941667 L583.291667,170.016667 C583.291667,192.516667,590.941667,207.366667,613.666667,207.366667 Z M690.616667,207.366667 C701.416667,207.366667,709.516667,205.116667,715.366667,203.316667 L710.191667,179.241667 C707.266667,180.366667,703.216667,181.491667,699.616667,181.491667 C690.841667,181.491667,685.216667,176.316667,685.216667,163.716667 L685.216667,118.941667 L711.991667,118.941667 L711.991667,93.066667 L685.216667,93.066667 L685.216667,63.366667 L657.766667,63.366667 L653.941667,93.066667 L636.841667,94.416667 L636.841667,118.941667 L652.141667,118.941667 L652.141667,164.166667 C652.141667,190.041667,662.941667,207.366667,690.616667,207.366667 Z \" style=\"fill: rgba(255, 255, 255, 1.000000); stroke-width: 0.000000px; stroke: rgba(36, 47, 60, 1.000000); \" fill=\"#feffff\" stroke=\"#2f3d4c\" stroke-width=\"0.000000\" />\n+ <path d=\"M791.166667,207.366667 C807.816667,207.366667,819.066667,200.616667,827.391667,194.541667 L817.041667,179.241667 C811.416667,183.741667,804.666667,187.791667,796.116667,187.791667 C781.266667,187.791667,773.841667,178.116667,773.841667,161.466667 C773.841667,134.016667,791.166667,111.066667,810.966667,111.066667 C818.391667,111.066667,822.891667,113.766667,828.066667,119.616667 L841.566667,104.991667 C835.491667,97.791667,826.041667,91.491667,812.541667,91.491667 C778.116667,91.491667,749.091667,122.766667,749.091667,162.366667 C749.091667,190.941667,766.866667,207.366667,791.166667,207.366667 Z M845.391667,204.666667 L869.691667,204.666667 L884.541667,129.291667 C895.566667,117.366667,905.016667,112.191667,910.866667,112.191667 C919.641667,112.191667,924.141667,116.916667,924.141667,126.366667 C924.141667,129.741667,923.466667,132.891667,922.341667,138.066667 L909.066667,204.666667 L933.141667,204.666667 L948.216667,129.291667 C959.466667,117.366667,968.916667,112.191667,974.541667,112.191667 C983.541667,112.191667,988.041667,116.916667,988.041667,126.366667 C988.041667,129.741667,987.366667,132.891667,986.241667,138.066667 L972.741667,204.666667 L997.041667,204.666667 L1010.991667,134.916667 C1012.116667,129.066667,1012.791667,124.566667,1012.791667,119.391667 C1012.791667,101.616667,1004.916667,91.491667,986.691667,91.491667 C974.766667,91.491667,961.491667,99.591667,948.441667,111.966667 C946.191667,100.041667,939.891667,91.491667,922.791667,91.491667 C910.866667,91.491667,898.041667,99.816667,886.791667,109.716667 L885.891667,109.716667 L887.016667,94.191667 L867.441667,94.191667 Z M1060.716667,207.366667 C1086.141667,207.366667,1104.591667,193.416667,1104.591667,172.041667 C1104.591667,158.541667,1096.491667,149.766667,1080.066667,140.991667 C1070.616667,135.591667,1061.166667,131.766667,1061.166667,123.666667 C1061.166667,116.016667,1068.591667,109.716667,1078.716667,109.716667 C1087.491667,109.716667,1094.241667,114.441667,1099.866667,120.066667 L1113.366667,107.241667 C1104.816667,98.241667,1093.116667,91.491667,1078.716667,91.491667 C1056.666667,91.491667,1038.441667,105.891667,1038.441667,125.916667 C1038.441667,139.191667,1047.441667,148.416667,1062.066667,156.516667 C1076.016667,164.166667,1081.866667,167.991667,1081.866667,174.966667 C1081.866667,183.066667,1072.866667,189.366667,1062.516667,189.366667 C1052.616667,189.366667,1043.616667,183.966667,1036.416667,174.516667 L1022.016667,186.216667 C1030.341667,198.816667,1046.766667,207.366667,1060.716667,207.366667 Z \" style=\"fill: rgba(80, 122, 173, 1.000000); stroke-width: 0.000000px; stroke: rgba(36, 47, 60, 1.000000); \" fill=\"#618ebb\" stroke=\"#2f3d4c\" stroke-width=\"0.000000\" />\n+</g><g style=\"\"> <path d=\"M3.178716,127.821284 C3.178716,58.785691,59.143122,2.821284,128.178716,2.821284 C197.214309,2.821284,253.178716,58.785691,253.178716,127.821284 C253.178716,196.856878,197.214309,252.821284,128.178716,252.821284 C59.143122,252.821284,3.178716,196.856878,3.178716,127.821284 Z \" style=\"fill: rgba(60, 90, 126, 1.000000); stroke-width: 5.000000px; stroke: rgba(36, 47, 60, 1.000000); \" fill=\"#4c6d91\" stroke=\"#2f3d4c\" stroke-width=\"5.000000\" />\n+ <path d=\"M68.246269,187.753731 L103.073269,221.516089 L150.115520,209.690530 L196.768076,196.410639 L210.047961,149.758078 L221.873525,102.715843 L188.111157,67.888833 L153.284165,34.126483 L106.241908,45.952041 L59.589357,59.231927 L46.309472,105.884477 L34.483903,152.926712 L68.246269,187.753731 Z \" stroke-linejoin=\"bevel\" style=\"fill: rgba(36, 47, 60, 1.000000); stroke-width: 6.000000px; stroke: rgba(36, 47, 60, 1.000000); \" fill=\"#2f3d4c\" stroke=\"#2f3d4c\" stroke-width=\"6.000000\" />\n+ <path d=\"M63.020626,174.903239 L90.540702,211.769961 L136.373842,207.790820 L182.061398,202.391094 L201.531932,160.708866 L219.699411,118.442423 L193.336801,80.739325 L165.816731,43.872611 L119.983586,47.851751 L74.296035,53.251473 L54.825508,94.933696 L36.658020,137.200132 L63.020626,174.903239 Z \" style=\"fill: rgba(255, 255, 255, 1.000000); stroke-width: 2.000000px; stroke: rgba(36, 47, 60, 1.000000); \" fill=\"#ffffff\" stroke=\"#2f3d4c\" stroke-width=\"2.000000\" />\n+ <path d=\"M90.178716,129.821284 C90.178716,107.729894,108.087326,89.821284,130.178716,89.821284 C152.270106,89.821284,170.178716,107.729894,170.178716,129.821284 C170.178716,151.912674,152.270106,169.821284,130.178716,169.821284 C108.087326,169.821284,90.178716,151.912674,90.178716,129.821284 Z \" style=\"fill: none; stroke-width: 8.000000px; stroke: rgba(36, 47, 60, 1.000000); \" fill=\"none\" stroke=\"#2f3d4c\" stroke-width=\"8.000000\" />\n+ <path d=\"M88.178716,127.821284 C88.178716,105.729894,106.087326,87.821284,128.178716,87.821284 C150.270106,87.821284,168.178716,105.729894,168.178716,127.821284 C168.178716,149.912674,150.270106,167.821284,128.178716,167.821284 C106.087326,167.821284,88.178716,149.912674,88.178716,127.821284 Z \" style=\"fill: rgba(60, 90, 126, 1.000000); stroke-width: 2.000000px; stroke: rgba(36, 47, 60, 1.000000); \" fill=\"#4c6d91\" stroke=\"#2f3d4c\" stroke-width=\"2.000000\" />\n+</g></svg>\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "templates/security/login.html.twig", "new_path": "templates/security/login.html.twig", "diff": "{% endblock %}\n{% block main %}\n+\n+<div>\n+\n+ <div>\n+ <img src=\"{{ asset('assets/images/bolt_logo_login.svg', 'public') }}\" class=\"logo\" alt=\"Bolt CMS logo\">\n+ <h1>{{ config.get('general/sitename') }}</h1>\n+ </div>\n+\n<div class=\"card\">\n- <div class=\"card-header\">\n- <i class=\"fa fa-lock\" aria-hidden=\"true\"></i>\n- Bolt &raquo; Login\n+ {% if error %}\n+ <div class=\"alert alert-danger\">\n+ <i class=\"fas fa-exclamation-circle\"></i>\n+ {{ error.messageKey|trans(error.messageData, 'security') }}\n+ </div>\n+ {% endif %}\n+\n+ <form action=\"{{ path('bolt_login') }}\" method=\"post\" class=\"\" id=\"login-form\">\n+ <input type=\"hidden\" name=\"_csrf_token\" value=\"{{ csrf_token('authenticate') }}\"/>\n+ {% include '@bolt/_partials/fields/text.html.twig' with {\n+ 'label' : 'label.fullname'|trans,\n+ 'name' : 'username',\n+ 'value' : last_username,\n+ 'disabled' : false,\n+ } %}\n+ {% include '@bolt/_partials/fields/password.html.twig' with {\n+ 'label': 'label.password'|trans,\n+ 'label_class': 'required',\n+ 'name': 'password',\n+ 'value': '',\n+ 'hidden': 'true'\n+ } %}\n+ <div class=\"form-group form-check\">\n+ <input type=\"checkbox\" class=\"form-check-input\" name=\"_remember_me\" id=\"_remember_me\">\n+ <label class=\"form-check-label\" for=\"_remember_me\">{{ 'label.rememberme'|trans }}</label>\n+ </div>\n+ <button type=\"submit\" class=\"btn btn-primary\">\n+ <i class=\"fas fa-sign-in-alt\" aria-hidden=\"true\"></i>\n+ {{ 'action.log_in'|trans }}\n+ </button>\n</div>\n<div class=\"card-body\">\n</form>\n</div>\n+</div>\n{% endblock %}\n" } ]
PHP
MIT License
bolt/core
Place the logo on the login screen
95,144
28.07.2019 07:14:25
-7,200
9aad6113434714c538b1c8af57d10c572f816f31
Update bolt_logo_login.svg
[ { "change_type": "MODIFY", "old_path": "assets/static/images/bolt_logo_login.svg", "new_path": "assets/static/images/bolt_logo_login.svg", "diff": "-<svg width=\"1117px\" height=\"256px\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\">\n-<g style=\"\"> <path d=\"M324.991667,204.666667 L379.441667,204.666667 C411.166667,204.666667,436.366667,191.391667,436.366667,161.466667 C436.366667,141.891667,424.891667,130.866667,410.041667,127.041667 L410.041667,126.141667 C421.966667,121.641667,429.166667,107.466667,429.166667,94.416667 C429.166667,66.291667,405.541667,57.966667,375.166667,57.966667 L324.991667,57.966667 Z M358.066667,116.691667 L358.066667,83.616667 L373.816667,83.616667 C389.341667,83.616667,396.766667,87.891667,396.766667,99.366667 C396.766667,109.941667,389.791667,116.691667,373.591667,116.691667 Z M358.066667,179.016667 L358.066667,141.216667 L376.741667,141.216667 C394.966667,141.216667,403.966667,146.391667,403.966667,159.216667 C403.966667,172.716667,394.741667,179.016667,376.741667,179.016667 Z M506.341667,207.366667 C534.466667,207.366667,560.566667,185.991667,560.566667,148.866667 C560.566667,111.741667,534.466667,90.366667,506.341667,90.366667 C477.991667,90.366667,451.891667,111.741667,451.891667,148.866667 C451.891667,185.991667,477.991667,207.366667,506.341667,207.366667 Z M506.341667,180.591667 C492.616667,180.591667,485.866667,168.216667,485.866667,148.866667 C485.866667,129.516667,492.616667,117.141667,506.341667,117.141667 C519.841667,117.141667,526.816667,129.516667,526.816667,148.866667 C526.816667,168.216667,519.841667,180.591667,506.341667,180.591667 Z M613.666667,207.366667 C621.091667,207.366667,626.716667,206.241667,630.316667,204.666667 L626.266667,180.141667 C624.466667,180.591667,623.566667,180.591667,622.216667,180.591667 C619.516667,180.591667,616.366667,178.341667,616.366667,171.366667 L616.366667,46.941667 L583.291667,46.941667 L583.291667,170.016667 C583.291667,192.516667,590.941667,207.366667,613.666667,207.366667 Z M690.616667,207.366667 C701.416667,207.366667,709.516667,205.116667,715.366667,203.316667 L710.191667,179.241667 C707.266667,180.366667,703.216667,181.491667,699.616667,181.491667 C690.841667,181.491667,685.216667,176.316667,685.216667,163.716667 L685.216667,118.941667 L711.991667,118.941667 L711.991667,93.066667 L685.216667,93.066667 L685.216667,63.366667 L657.766667,63.366667 L653.941667,93.066667 L636.841667,94.416667 L636.841667,118.941667 L652.141667,118.941667 L652.141667,164.166667 C652.141667,190.041667,662.941667,207.366667,690.616667,207.366667 Z \" style=\"fill: rgba(255, 255, 255, 1.000000); stroke-width: 0.000000px; stroke: rgba(36, 47, 60, 1.000000); \" fill=\"#feffff\" stroke=\"#2f3d4c\" stroke-width=\"0.000000\" />\n- <path d=\"M791.166667,207.366667 C807.816667,207.366667,819.066667,200.616667,827.391667,194.541667 L817.041667,179.241667 C811.416667,183.741667,804.666667,187.791667,796.116667,187.791667 C781.266667,187.791667,773.841667,178.116667,773.841667,161.466667 C773.841667,134.016667,791.166667,111.066667,810.966667,111.066667 C818.391667,111.066667,822.891667,113.766667,828.066667,119.616667 L841.566667,104.991667 C835.491667,97.791667,826.041667,91.491667,812.541667,91.491667 C778.116667,91.491667,749.091667,122.766667,749.091667,162.366667 C749.091667,190.941667,766.866667,207.366667,791.166667,207.366667 Z M845.391667,204.666667 L869.691667,204.666667 L884.541667,129.291667 C895.566667,117.366667,905.016667,112.191667,910.866667,112.191667 C919.641667,112.191667,924.141667,116.916667,924.141667,126.366667 C924.141667,129.741667,923.466667,132.891667,922.341667,138.066667 L909.066667,204.666667 L933.141667,204.666667 L948.216667,129.291667 C959.466667,117.366667,968.916667,112.191667,974.541667,112.191667 C983.541667,112.191667,988.041667,116.916667,988.041667,126.366667 C988.041667,129.741667,987.366667,132.891667,986.241667,138.066667 L972.741667,204.666667 L997.041667,204.666667 L1010.991667,134.916667 C1012.116667,129.066667,1012.791667,124.566667,1012.791667,119.391667 C1012.791667,101.616667,1004.916667,91.491667,986.691667,91.491667 C974.766667,91.491667,961.491667,99.591667,948.441667,111.966667 C946.191667,100.041667,939.891667,91.491667,922.791667,91.491667 C910.866667,91.491667,898.041667,99.816667,886.791667,109.716667 L885.891667,109.716667 L887.016667,94.191667 L867.441667,94.191667 Z M1060.716667,207.366667 C1086.141667,207.366667,1104.591667,193.416667,1104.591667,172.041667 C1104.591667,158.541667,1096.491667,149.766667,1080.066667,140.991667 C1070.616667,135.591667,1061.166667,131.766667,1061.166667,123.666667 C1061.166667,116.016667,1068.591667,109.716667,1078.716667,109.716667 C1087.491667,109.716667,1094.241667,114.441667,1099.866667,120.066667 L1113.366667,107.241667 C1104.816667,98.241667,1093.116667,91.491667,1078.716667,91.491667 C1056.666667,91.491667,1038.441667,105.891667,1038.441667,125.916667 C1038.441667,139.191667,1047.441667,148.416667,1062.066667,156.516667 C1076.016667,164.166667,1081.866667,167.991667,1081.866667,174.966667 C1081.866667,183.066667,1072.866667,189.366667,1062.516667,189.366667 C1052.616667,189.366667,1043.616667,183.966667,1036.416667,174.516667 L1022.016667,186.216667 C1030.341667,198.816667,1046.766667,207.366667,1060.716667,207.366667 Z \" style=\"fill: rgba(80, 122, 173, 1.000000); stroke-width: 0.000000px; stroke: rgba(36, 47, 60, 1.000000); \" fill=\"#618ebb\" stroke=\"#2f3d4c\" stroke-width=\"0.000000\" />\n-</g><g style=\"\"> <path d=\"M3.178716,127.821284 C3.178716,58.785691,59.143122,2.821284,128.178716,2.821284 C197.214309,2.821284,253.178716,58.785691,253.178716,127.821284 C253.178716,196.856878,197.214309,252.821284,128.178716,252.821284 C59.143122,252.821284,3.178716,196.856878,3.178716,127.821284 Z \" style=\"fill: rgba(60, 90, 126, 1.000000); stroke-width: 5.000000px; stroke: rgba(36, 47, 60, 1.000000); \" fill=\"#4c6d91\" stroke=\"#2f3d4c\" stroke-width=\"5.000000\" />\n- <path d=\"M68.246269,187.753731 L103.073269,221.516089 L150.115520,209.690530 L196.768076,196.410639 L210.047961,149.758078 L221.873525,102.715843 L188.111157,67.888833 L153.284165,34.126483 L106.241908,45.952041 L59.589357,59.231927 L46.309472,105.884477 L34.483903,152.926712 L68.246269,187.753731 Z \" stroke-linejoin=\"bevel\" style=\"fill: rgba(36, 47, 60, 1.000000); stroke-width: 6.000000px; stroke: rgba(36, 47, 60, 1.000000); \" fill=\"#2f3d4c\" stroke=\"#2f3d4c\" stroke-width=\"6.000000\" />\n- <path d=\"M63.020626,174.903239 L90.540702,211.769961 L136.373842,207.790820 L182.061398,202.391094 L201.531932,160.708866 L219.699411,118.442423 L193.336801,80.739325 L165.816731,43.872611 L119.983586,47.851751 L74.296035,53.251473 L54.825508,94.933696 L36.658020,137.200132 L63.020626,174.903239 Z \" style=\"fill: rgba(255, 255, 255, 1.000000); stroke-width: 2.000000px; stroke: rgba(36, 47, 60, 1.000000); \" fill=\"#ffffff\" stroke=\"#2f3d4c\" stroke-width=\"2.000000\" />\n- <path d=\"M90.178716,129.821284 C90.178716,107.729894,108.087326,89.821284,130.178716,89.821284 C152.270106,89.821284,170.178716,107.729894,170.178716,129.821284 C170.178716,151.912674,152.270106,169.821284,130.178716,169.821284 C108.087326,169.821284,90.178716,151.912674,90.178716,129.821284 Z \" style=\"fill: none; stroke-width: 8.000000px; stroke: rgba(36, 47, 60, 1.000000); \" fill=\"none\" stroke=\"#2f3d4c\" stroke-width=\"8.000000\" />\n- <path d=\"M88.178716,127.821284 C88.178716,105.729894,106.087326,87.821284,128.178716,87.821284 C150.270106,87.821284,168.178716,105.729894,168.178716,127.821284 C168.178716,149.912674,150.270106,167.821284,128.178716,167.821284 C106.087326,167.821284,88.178716,149.912674,88.178716,127.821284 Z \" style=\"fill: rgba(60, 90, 126, 1.000000); stroke-width: 2.000000px; stroke: rgba(36, 47, 60, 1.000000); \" fill=\"#4c6d91\" stroke=\"#2f3d4c\" stroke-width=\"2.000000\" />\n-</g></svg>\n\\ No newline at end of file\n+<svg width=\"1117\" height=\"256\" xmlns=\"http://www.w3.org/2000/svg\"><g><path d=\"M324.992 204.667h54.45c31.725 0 56.925-13.275 56.925-43.2 0-19.575-11.475-30.6-26.325-34.425v-.9c11.925-4.5 19.125-18.675 19.125-31.725 0-28.125-23.625-36.45-54-36.45h-50.175zm33.075-87.975V83.617h15.75c15.525 0 22.95 4.275 22.95 15.75 0 10.575-6.975 17.325-23.175 17.325zm0 62.325v-37.8h18.675c18.225 0 27.225 5.175 27.225 18 0 13.5-9.225 19.8-27.225 19.8zm148.275 28.35c28.125 0 54.225-21.375 54.225-58.5s-26.1-58.5-54.225-58.5c-28.35 0-54.45 21.375-54.45 58.5s26.1 58.5 54.45 58.5zm0-26.775c-13.725 0-20.475-12.375-20.475-31.725s6.75-31.725 20.475-31.725c13.5 0 20.475 12.375 20.475 31.725s-6.975 31.725-20.475 31.725zm107.325 26.775c7.425 0 13.05-1.125 16.65-2.7l-4.05-24.525c-1.8.45-2.7.45-4.05.45-2.7 0-5.85-2.25-5.85-9.225V46.942h-33.075v123.075c0 22.5 7.65 37.35 30.375 37.35zm76.95 0c10.8 0 18.9-2.25 24.75-4.05l-5.175-24.075c-2.925 1.125-6.975 2.25-10.575 2.25-8.775 0-14.4-5.175-14.4-17.775v-44.775h26.775V93.067h-26.775v-29.7h-27.45l-3.825 29.7-17.1 1.35v24.525h15.3v45.225c0 25.875 10.8 43.2 38.475 43.2z\" fill=\"#fff\"/><path d=\"M791.167 207.367c16.65 0 27.9-6.75 36.225-12.825l-10.35-15.3c-5.625 4.5-12.375 8.55-20.925 8.55-14.85 0-22.275-9.675-22.275-26.325 0-27.45 17.325-50.4 37.125-50.4 7.425 0 11.925 2.7 17.1 8.55l13.5-14.625c-6.075-7.2-15.525-13.5-29.025-13.5-34.425 0-63.45 31.275-63.45 70.875 0 28.575 17.775 45 42.075 45zm54.225-2.7h24.3l14.85-75.375c11.025-11.925 20.475-17.1 26.325-17.1 8.775 0 13.275 4.725 13.275 14.175 0 3.375-.675 6.525-1.8 11.7l-13.275 66.6h24.075l15.075-75.375c11.25-11.925 20.7-17.1 26.325-17.1 9 0 13.5 4.725 13.5 14.175 0 3.375-.675 6.525-1.8 11.7l-13.5 66.6h24.3l13.95-69.75c1.125-5.85 1.8-10.35 1.8-15.525 0-17.775-7.875-27.9-26.1-27.9-11.925 0-25.2 8.1-38.25 20.475-2.25-11.925-8.55-20.475-25.65-20.475-11.925 0-24.75 8.325-36 18.225h-.9l1.125-15.525h-19.575zm215.325 2.7c25.425 0 43.875-13.95 43.875-35.325 0-13.5-8.1-22.275-24.525-31.05-9.45-5.4-18.9-9.225-18.9-17.325 0-7.65 7.425-13.95 17.55-13.95 8.775 0 15.525 4.725 21.15 10.35l13.5-12.825c-8.55-9-20.25-15.75-34.65-15.75-22.05 0-40.275 14.4-40.275 34.425 0 13.275 9 22.5 23.625 30.6 13.95 7.65 19.8 11.475 19.8 18.45 0 8.1-9 14.4-19.35 14.4-9.9 0-18.9-5.4-26.1-14.85l-14.4 11.7c8.325 12.6 24.75 21.15 38.7 21.15z\" fill=\"#507aad\"/></g><g stroke=\"#242f3c\"><path d=\"M3.179 127.821c0-69.035 55.964-125 125-125 69.035 0 125 55.965 125 125 0 69.036-55.965 125-125 125-69.036 0-125-55.964-125-125z\" fill=\"#3c5a7e\" stroke-width=\"5\"/><path d=\"M68.246 187.754l34.827 33.762 47.043-11.825 46.652-13.28 13.28-46.653 11.826-47.042-33.763-34.827-34.827-33.763-47.042 11.826-46.653 13.28-13.28 46.652-11.825 47.043 33.762 34.827z\" stroke-linejoin=\"bevel\" fill=\"#242f3c\" stroke-width=\"6\"/><path d=\"M63.02 174.903l27.52 36.867 45.834-3.98 45.687-5.399 19.47-41.682 18.168-42.267-26.362-37.703-27.52-36.866-45.833 3.979-45.688 5.4-19.47 41.682L36.658 137.2l26.363 37.703z\" fill=\"#fff\" stroke-width=\"2\"/><path d=\"M90.179 129.821c0-22.091 17.908-40 40-40 22.091 0 40 17.909 40 40 0 22.092-17.909 40-40 40-22.092 0-40-17.908-40-40z\" fill=\"none\" stroke-width=\"8\"/><path d=\"M88.179 127.821c0-22.091 17.908-40 40-40 22.091 0 40 17.909 40 40 0 22.092-17.909 40-40 40-22.092 0-40-17.908-40-40z\" fill=\"#3c5a7e\" stroke-width=\"2\"/></g></svg>\n\\ No newline at end of file\n" } ]
PHP
MIT License
bolt/core
Update bolt_logo_login.svg
95,144
28.07.2019 15:11:12
-7,200
e8db640611661414bddf00955097e17c1c633faa
Working on "Files as Cards" feature
[ { "change_type": "MODIFY", "old_path": "assets/js/app/listing/Components/Filter.vue", "new_path": "assets/js/app/listing/Components/Filter.vue", "diff": ":class=\"{ 'is-selected': size === 'small' }\"\n@click=\"changeSize('small')\"\n>\n- <svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 70 55\">\n- <g fill-rule=\"nonzero\">\n- <rect width=\"70\" height=\"10\" rx=\"3\" />\n- <rect width=\"70\" height=\"10\" rx=\"3\" transform=\"translate(0 15)\" />\n- <rect width=\"70\" height=\"10\" rx=\"3\" transform=\"translate(0 30)\" />\n- <rect width=\"70\" height=\"10\" rx=\"3\" transform=\"translate(0 45)\" />\n- </g>\n- </svg>\n+ <i class=\"fas fa-align-justify fa-fw\"></i> Compact\n</button>\n</li>\n:class=\"{ 'is-selected': size === 'normal' }\"\n@click=\"changeSize('normal')\"\n>\n- <svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 70 55\">\n- <g fill-rule=\"nonzero\">\n- <rect width=\"70\" height=\"15\" rx=\"3\" />\n- <rect width=\"70\" height=\"15\" rx=\"3\" transform=\"translate(0 20)\" />\n- <rect width=\"70\" height=\"15\" rx=\"3\" transform=\"translate(0 40)\" />\n- </g>\n- </svg>\n+ <i class=\"fas fa-grip-lines fa-fw\"></i> Expanded\n</button>\n</li>\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/init/_base.scss", "new_path": "assets/scss/init/_base.scss", "diff": "@@ -37,6 +37,7 @@ code {\n.card {\nbox-shadow: $card-box-shadow;\nbackground: #fff;\n+ border: 1px solid #E8E8E8 !important;\n.card-header {\nfont-weight: $font-weight-bold;\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/modules/editor/fields/_image.scss", "new_path": "assets/scss/modules/editor/fields/_image.scss", "diff": "opacity: 0;\n}\n+.filepond--root {\n+ margin-bottom: 0 !important;\n+}\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/modules/listing/_filter.scss", "new_path": "assets/scss/modules/listing/_filter.scss", "diff": "border-radius: $border-radius;\nbox-shadow: $card-box-shadow;\npadding: $spacer / 2;\n+ font-size: 0.9rem;\n&:hover {\ncursor: pointer;\n&:focus {\noutline: none;\nbox-shadow: $input-btn-focus-box-shadow;\n-\n- svg,\n- g {\n- fill: theme-color('secondary');\n- }\n}\n&.is-selected {\n- background: var(--primary);\n-\n- svg g {\n- fill: var(--foreground);\n- }\n+ background: $disabled;\n}\n&.is-active {\nbackground: var(--primary);\ncolor: var(--foreground);\n}\n-\n- svg {\n- width: 18px;\n- height: 18px;\n-\n- g {\n- fill: var(--shade);\n- }\n- }\n}\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Controller/Backend/FilemanagerController.php", "new_path": "src/Controller/Backend/FilemanagerController.php", "diff": "@@ -47,6 +47,8 @@ class FilemanagerController extends TwigAwareController implements BackendZone\n$path .= '/';\n}\n+ $view = $request->query->get('view', 'list');\n+\n$location = $this->fileLocations->get($location);\n$finder = $this->findFiles($location->getBasepath(), $path);\n@@ -63,6 +65,7 @@ class FilemanagerController extends TwigAwareController implements BackendZone\n'parent' => $parent,\n'media' => $media,\n'allfiles' => $location->isShowAll() ? $this->buildIndex($location->getBasepath()) : false,\n+ 'view' => $view\n]);\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Twig/ImageExtension.php", "new_path": "src/Twig/ImageExtension.php", "diff": "@@ -95,7 +95,7 @@ class ImageExtension extends AbstractExtension\nreturn sprintf('<img src=\"%s\" alt=\"%s\" %s %s>', $link, $alt, (string) $width, (string) $height);\n}\n- public function thumbnail($image, int $width = 320, int $height = 240, ?string $location = null, ?string $path = null)\n+ public function thumbnail($image, int $width = 320, int $height = 240, ?string $location = null, ?string $path = null, ?string $fit = null)\n{\n$filename = $this->getFilename($image);\n@@ -114,6 +114,9 @@ class ImageExtension extends AbstractExtension\nif ($path) {\n$params['path'] = $path;\n}\n+ if ($fit) {\n+ $params['fit'] = $fit;\n+ }\n// Create an instance of the URL builder\n$urlBuilder = UrlBuilderFactory::create('/thumbs/', $this->secret);\n" }, { "change_type": "RENAME", "old_path": "templates/finder/_files.html.twig", "new_path": "templates/finder/_files_list.html.twig", "diff": "</td>\n<td class=\"listing-thumb\" style=\"padding: 0.2em;\">\n{%- if thumbnail -%}\n- <a href=\"{{ filename|thumbnail(width = 1000, height = 1000, location = location) }}\" class=\"lightbox\">\n+ <a href=\"{{ filename|thumbnail(width = 1000, height = 1000, location = location, fit = 'crop') }}\" class=\"lightbox\">\n<img src=\"{{ thumbnail }}\" width=\"100\" height=\"72\">\n</a>\n{%- else -%}\n" }, { "change_type": "MODIFY", "old_path": "templates/finder/_folders.html.twig", "new_path": "templates/finder/_folders.html.twig", "diff": "+\n+<div class=\"card mb-4\">\n+ <div class=\"card-header\">\n+ <i class=\"fas fa-folder\"></i>\n+ {{ 'caption.folders'|trans }}\n+ </div>\n+ <div class=\"card-body\" style=\"padding: 0.5rem 0.5rem 0\">\n+\n<table class=\"table table-striped\" style=\"background-color: #FFF;\">\n<thead class=\"thead-light\">\n<tr>\n</tr>\n{% endfor %}\n</table>\n+\n+ </div>\n+</div>\n" }, { "change_type": "MODIFY", "old_path": "templates/finder/finder.html.twig", "new_path": "templates/finder/finder.html.twig", "diff": "{% include '@bolt/finder/_quickselect.html.twig' %}\n- {% include '@bolt/finder/_folders.html.twig' %}\n-\n- {% include '@bolt/finder/_files.html.twig' %}\n+ {% if view == 'list' %}\n+ {% include '@bolt/finder/_files_list.html.twig' %}\n+ {% else %}\n+ {% include '@bolt/finder/_files_cards.html.twig' %}\n+ {% endif %}\n{% endblock %}\n<div class=\"card mb-4\">\n<div class=\"card-header\">{{ 'caption.meta_information'|trans }}</div>\n<div class=\"card-body\">\n-\n+ View: {{ view|default('none') }}\n+ <div class=\"btn-group\">\n+ <a href=\"?view=list\" class=\"btn btn-secondary\"><i class=\"fas fa-list fa-fw\"></i> List</a>\n+ <a href=\"?view=cards\" class=\"btn btn-secondary ml-1\"><i class=\"fas fa-th fa-fw\"></i>Cards</a>\n+ </div>\n</div>\n</div>\n+ {% include '@bolt/finder/_folders.html.twig' %}\n+\n{% include '@bolt/finder/_uploader.html.twig' %}\n{% endblock aside %}\n{% block stylesheets %}\n{{ parent() }}\n-\n- <style>\n- .filepond--root {\n- margin-bottom: 0 !important;\n- }\n- </style>\n{% endblock %}\n" } ]
PHP
MIT License
bolt/core
Working on "Files as Cards" feature
95,192
29.07.2019 13:43:53
-7,200
b1dd57cfba294b7e5c5f5dea2ad3ea59e3cd25ae
overall refinements, dashboard, titles, titleprefix, filters, layout, sidebar
[ { "change_type": "MODIFY", "old_path": "assets/js/app/listing/Components/Filter.vue", "new_path": "assets/js/app/listing/Components/Filter.vue", "diff": ":class=\"{ 'is-selected': size === 'small' }\"\n@click=\"changeSize('small')\"\n>\n+ <span class=\"sr-only\">Enable compact view mode</span>\n<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 70 55\">\n<g fill-rule=\"nonzero\">\n<rect width=\"70\" height=\"10\" rx=\"3\" />\n:class=\"{ 'is-selected': size === 'normal' }\"\n@click=\"changeSize('normal')\"\n>\n+ <span class=\"sr-only\">Enable standard view mode</span>\n<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 70 55\">\n<g fill-rule=\"nonzero\">\n<rect width=\"70\" height=\"15\" rx=\"3\" />\n" }, { "change_type": "MODIFY", "old_path": "assets/js/app/listing/Components/Table/Row/_Meta.vue", "new_path": "assets/js/app/listing/Components/Table/Row/_Meta.vue", "diff": "<div class=\"listing__row--item is-meta\">\n<ul class=\"listing__row--list text-nowrap\">\n<li>\n- <span class=\"status mr-2\" :class=\"`is-${record.status}`\" :title=\"record.status\"></span\n+ <span class=\"status\" :class=\"`is-${record.status}`\" :title=\"record.status\"></span\n>{{ record.publishedAt|date }}\n</li>\n<li v-if=\"size === 'normal'\">\n- <i class=\"fas fa-user mr-2\"></i> {{ record.authorName }}\n+ <i class=\"fas fa-user\"></i> {{ record.authorName }}\n</li>\n<li v-if=\"size === 'normal'\">\n- <i class=\"fas mr-2\" :class=\"record.extras.icon\"></i>\n+ <i class=\"fas\" :class=\"record.extras.icon\"></i>\n<template v-if=\"type === 'dashboard'\"\n><a :href=\"`/bolt/content/${record.contentType}`\">\n{{ record.extras.singular_name }}</a\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/init/_variables.scss", "new_path": "assets/scss/init/_variables.scss", "diff": "@@ -89,9 +89,11 @@ $grid-breakpoints: (\nxw: 1750px\n);\n+// sbonardt: if this is for grid-column of main grid layout, that's set back to 1.5rem. Do not change column-gap of main grid as this breaks the whole feel!\n$column-gap: 3rem;\n// Modal Dialog spacing\n+// sbonardt: if this is such a specific usage thing, why make it a sass variable?\n$modal-dialog-margin-y-sm-up: 4rem;\n// This number determines of a button has white or black text (a11y)\n@@ -127,6 +129,7 @@ $yiq-contrasted-threshold: 150;\n// Variables for admin, toolbar and admin sidebar\n$admin-toolbar-height: 40px;\n+$admin-toolbar-height-wide: 50px;\n$admin-sidebar-width: 200px;\n$admin-sidebar-width-wide: 250px;\n$admin-aside-width: 320px;\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/layout/_admin.scss", "new_path": "assets/scss/layout/_admin.scss", "diff": ".admin {\nmargin-top: $admin-toolbar-height;\nmin-height: inherit;\n-\n+ @include media-breakpoint-up(md) {\n+ margin-top: $admin-toolbar-height-wide;\n+ }\n&__toolbar {\n-webkit-backface-visibility: hidden;\nposition: fixed;\nheight: $admin-toolbar-height;\nwidth: 100vw;\nz-index: 5;\n+ @include media-breakpoint-up(md) {\n+ height: $admin-toolbar-height-wide;\n+ }\n}\n&__header {\nleft: 0;\ntransition: all 200ms;\nwidth: auto;\n+ min-width: 224px;\n+ box-shadow: 5px 0px 15px rgba(40, 40, 40, 0.2);\n+ @include media-breakpoint-up(md) {\n+ top: $admin-toolbar-height-wide;\n+ }\n// the sidebar comes into view on larger screens\n@include media-breakpoint-up(lg) {\nleft: 0;\nwidth: $admin-sidebar-width;\n+ min-width: auto;\n+ box-shadow: 0 0 0 rgba(255,255,255,100%);\n}\n@include media-breakpoint-up(wd) {\nwidth: $admin-sidebar-width-wide;\n}\n&--container {\n- padding: $spacer;\n+ padding: $spacer * 0.625;\n+ @include media-breakpoint-up(sm) {\n+ padding: $spacer * 1;\n+ }\n+ @include media-breakpoint-up(md) {\n+ padding: $spacer * 1.25;\n+ }\n@include media-breakpoint-up(xl) {\ndisplay: grid;\n//grid with autofit to make columns expand full width if other column(s) not present\ngrid-template-columns: repeat(12, 1fr);\ngrid-template-rows: auto;\n- grid-column-gap: $column-gap;\n+ grid-column-gap: 1.5rem;\n}\n@include media-breakpoint-up(wd) {\n- grid-column-gap: $column-gap;\n- padding: $spacer $spacer*2 $spacer $column-gap;\n+ grid-column-gap: 1.8125rem;\n+ padding: $spacer $spacer*2 $spacer $spacer*1.5;\n}\n&--has-sidebar {\n// grid-template-columns: 3fr 1fr;\n}\n}\n}\n- * {\n+ > * {\ngrid-column: 1/-1;\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/modules/admin/_header.scss", "new_path": "assets/scss/modules/admin/_header.scss", "diff": "//** Admin | Header\n.admin__header {\n+ @include media-breakpoint-up(sm) {\n+ background-color: var(--background);\n+ position: sticky;\n+ top: $admin-toolbar-height;\n+ z-index: 2;\n+ }\n+ //resets sticky as we don't use it above this breakpoint for now\n+ @include media-breakpoint-up(lg) {\n+ position: static;\n+ top: 0;\n+ }\n&--title {\n- font-weight: $font-weight-normal;\n+ font-weight: $font-weight-semibold;\n+ font-size: 1.825rem;\nfont-size: $h1-font-size;\ncolor: var(--admin-sidebar);\n+ margin-top: $spacer;\n+ position: relative;\n+ @include media-breakpoint-up(sm) {\n+ margin-top: $spacer*1.8125;\n+ }\ni {\ncolor: var(--boltblue);\n- font-size: 2.125rem;\n+ font-size: 1.5rem;\ntop: -3px;\nposition: relative;\n}\n+ &__prefix {\n+ font-weight: $font-weight-normal;\n+ font-size: 1rem;\n+ display: block;\n+ }\n}\n&--topbar {\njustify-content: space-between;\nalign-items: center;\nheight: 100%;\n- padding: $spacer;\n+ padding: $spacer $spacer*0.625 0;\nposition: relative;\n+ @include media-breakpoint-up(sm) {\n+ padding: $spacer*1 $spacer*1 0;\n+ }\n+ @include media-breakpoint-up(md) {\n+ padding: $spacer*1.25 $spacer*1.25 0;\n+ }\n@include media-breakpoint-up(wd) {\n- padding: $spacer*3 $column-gap $spacer;\n+ padding: $spacer*1.25 $spacer * 1.8125 1rem;\n}\n}\n&--togglebar {\nposition: absolute;\nz-index: 4;\nwidth: auto;\n- top: 1.625rem;\n- right: 1rem;\n+ top: 0.625rem;\n+ right: 0.625rem;\nborder: 1px solid var(--primary);\n- padding: $spacer*0.4 $spacer;\n+ padding: $spacer*0.4 $spacer*1.1;\ncolor: $white;\nbackground-color: var(--primary);\n+ @include media-breakpoint-up(sm) {\n+ right: $spacer * 1;\n+ }\n+ @include media-breakpoint-up(md) {\n+ right: $spacer * 1.25;\n+ }\n@include media-breakpoint-up(lg) {\ndisplay: none;\n}\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/modules/admin/_sidebar.scss", "new_path": "assets/scss/modules/admin/_sidebar.scss", "diff": "background: var(--admin-sidebar);\ncolor: var(--admin-sidebar-text);\nheight: 100%;\n-\npadding-top: 1.625rem;\n+ @include media-breakpoint-up(lg) {\n+ padding-top: 2.25rem;\n+ }\na {\nfont-size: 0.9375rem;\n}\ntext-transform: uppercase;\nfont-size: $small-font-size;\nletter-spacing: $letter-spacing;\n+ @include media-breakpoint-up(lg) {\n+ margin-top: $spacer*2.25;\n+ }\n}\n&--menu {\n// display only on larger screens\ndisplay: none;\n- @media (min-width: 768px) {\n+ @include media-breakpoint-up(lg) {\ndisplay: block;\n}\n}\n}\n}\n+\n+\n+.sidebar {\n+\n+}\n+\n+.sidebar--sticky {\n+ position: sticky;\n+ top: 60px;\n+ // reset this as sticky does not work together with display block on hover li's of the sidebar menu, above in this file\n+ @include media-breakpoint-up(lg) {\n+ position: static;\n+ top: 0;\n+ }\n+}\n\\ No newline at end of file\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/modules/admin/_toolbar.scss", "new_path": "assets/scss/modules/admin/_toolbar.scss", "diff": "align-items: center;\njustify-content: center;\npadding: $spacer*0.8125 $spacer;\n+ font-size: 0.75rem;\n+ @include media-breakpoint-up(md) {\nfont-size: 0.875rem;\n-\n+ }\na:hover {\ntext-decoration: none;\n}\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/modules/listing/_filter.scss", "new_path": "assets/scss/modules/listing/_filter.scss", "diff": ".listing__filter {\ndisplay: flex;\njustify-content: space-between;\n- height: 35px;\n+ min-height: 40px;\n+ background-color: #fff;\n+ padding: 0.35rem 0.625rem 0.35rem 0.5rem;\n+ border-radius: $border-radius;\n+ overflow: hidden;\n&:first-of-type {\nmargin-bottom: $spacer;\n}\n.custom-control {\n- margin-left: $spacer*0.5;\nmargin-top: $spacer*0.25;\n}\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/modules/listing/row/_checkbox.scss", "new_path": "assets/scss/modules/listing/row/_checkbox.scss", "diff": "&::before,\n&::after {\n- left: $spacer*0.5;\n- top: 0.625rem;\n+ left: $spacer*0.45;\n+ top: $spacer*0.6;\n}\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/modules/listing/row/row.scss", "new_path": "assets/scss/modules/listing/row/row.scss", "diff": "//** Listing | Row\n-$checkbox-row-width: 34px;\n+$checkbox-row-width: 32px;\n.listing__row {\nbox-shadow: $card-box-shadow;\n@@ -13,7 +13,7 @@ $checkbox-row-width: 34px;\nflex-wrap: wrap;\n//justify-content: space-between;\nposition: relative;\n- padding: $spacer*0.5 $spacer*2 $spacer*0.5 $spacer*0.625;\n+ padding: $spacer*0.625;\n@include media-breakpoint-up(md) {\nflex-wrap: wrap;\n@@ -225,9 +225,17 @@ $checkbox-row-width: 34px;\ntop: 0.125rem;\ndisplay: inline-block;\nfont-size: 0.8125rem;\n+ width: 0.75rem;\n+ height: 0.75rem;\n+ @include media-breakpoint-up(md) {\n+ margin-right: 0.35rem;\n+ }\n}\n.status {\n- margin-right: 0.25rem;\n+ margin-right: 0.3rem;\n+ @include media-breakpoint-up(md) {\n+ margin-right: 0.625rem;\n+ }\n}\n}\n}\n" } ]
PHP
MIT License
bolt/core
overall refinements, dashboard, titles, titleprefix, filters, layout, sidebar
95,192
29.07.2019 16:39:11
-7,200
ddcf7c77117a8a165bb487b38e7fc8eb74f2cd3d
rewrite of topbar links and btn-groups. Now tab-able!
[ { "change_type": "MODIFY", "old_path": "assets/scss/modules/admin/_toolbar.scss", "new_path": "assets/scss/modules/admin/_toolbar.scss", "diff": "display: flex;\nalign-items: center;\njustify-content: center;\n- padding: $spacer*0.8125 $spacer;\nfont-size: 0.875rem;\n+ padding: 0;\n+ a {\n+ font-size: 0.9375rem;\n+ padding: $spacer*0.625;\n+ display: block;\n+ color: var(--foreground);\n- a:hover {\n+ &:hover, &:active, &:focus {\n+ @include darken(--admin-sidebar, 0.02);\n+ color: var(--admin-sidebar-icon);\ntext-decoration: none;\n}\n-\n- &__brand {\n-\n- padding: $spacer*0.8125;\n- .is-slim & {\n- padding: $spacer*0.8125 $spacer*1.125;\n- }\n- svg {\n- height: $admin-toolbar-height / 1.5;\n- width: auto;\n- }\n- }\n-\n- &__profile {\n- margin-left: auto;\n- }\n-\n- &__new {\n- display: none;\n- @media screen and (min-width: 440px) {\n- display: flex;\n- }\n}\n&:hover {\n- opacity: 1;\n-\n- @include darken(--admin-toolbar, 0.2);\n-\n- > .toolbar-menu {\n- visibility: visible;\n- height: auto;\n- }\n+ .dropdown-menu {\n+ display: block;\n}\n}\n- .toolbar-menu {\n- background: var(--admin-sidebar-menu);\n- border-radius: 0 $border-radius $border-radius 0;\n- box-shadow: 5px 5px 30px rgba(0, 0, 0, 0.2);\n- border: 1px solid rgba(0, 0, 0, 0.1);\n- color: var(--shade);\n+ i, .fas {\n+ margin-right: 0.45rem;\n+ }\n- font-weight: $font-weight-normal;\n- font-size: 100%;\n- visibility: hidden;\n- height: 0;\n- list-style: none;\n- position: absolute;\n- left: 0;\n- top: 100%;\n- width: $admin-sidebar-width;\n+ .dropdown-menu {\nmargin: 0;\npadding: 0;\n-\n- li {\n+ min-width: 220px;\n+ top: calc(100% - 1px);\n+ ul {\n+ list-style: none;\n+ padding: 0;\n+ margin: 0;\n+ }\na {\n- padding: $spacer / 2;\n- display: block;\ncolor: var(--shade);\n-\n- &:hover {\n+ &:hover, &:active, &:focus {\n@include darken(--admin-sidebar, 0.02);\ncolor: var(--admin-sidebar-icon);\ntext-decoration: none;\n}\n}\n+ i, .fas {\n+ margin-right: 0.25rem;\n+ }\n+ }\n+\n+ .dropdown-toggle {\n+ color: var(--foreground);\n+ height: 100%;\n+ padding: 0.625rem 1rem;\n+ &:hover, &:active, &:focus {\n+ @include darken(--admin-sidebar, 0.02);\n+ }\n+ }\n+\n+ &__brand {\n+ .is-slim & {\n+\n+ }\n+ svg, img {\n+ margin-right: 0.25rem;\n}\n+ .dropdown-toggle {\n+ padding: 0 1rem;\n+ &:after {\n+ vertical-align: middle;\n}\n- .toolbar-item__profile {\n- .toolbar-menu {\n- left: auto;\n- right: 0;\n}\n}\n+\n+ &__profile {\n+ margin-left: auto;\n+ }\n+\n+ &__site a {\n+ height: 100%;\n+ padding: 0.625rem 1rem;\n+ i, .fas {\n+ margin-right: 0.25rem;\n+ }\n+ }\n+\n+ // &:hover {\n+ // opacity: 1;\n+\n+ // @include darken(--admin-toolbar, 0.2);\n+\n+ // > .toolbar-menu {\n+ // visibility: visible;\n+ // height: auto;\n+ // }\n+ // }\n+ }\n+\n+ // .toolbar-menu {\n+ // background: var(--admin-sidebar-menu);\n+ // border-radius: 0 $border-radius $border-radius 0;\n+ // box-shadow: 5px 5px 30px rgba(0, 0, 0, 0.2);\n+ // border: 1px solid rgba(0, 0, 0, 0.1);\n+ // color: var(--shade);\n+\n+ // font-weight: $font-weight-normal;\n+ // font-size: 100%;\n+ // visibility: hidden;\n+ // height: 0;\n+ // list-style: none;\n+ // position: absolute;\n+ // left: 0;\n+ // top: 100%;\n+ // width: $admin-sidebar-width;\n+ // margin: 0;\n+ // padding: 0;\n+\n+ // li {\n+ // a {\n+ // padding: $spacer / 2;\n+ // display: block;\n+ // color: var(--shade);\n+\n+ // &:hover {\n+ // @include darken(--admin-sidebar, 0.02);\n+ // color: var(--admin-sidebar-icon);\n+ // text-decoration: none;\n+ // }\n+ // }\n+ // }\n+ // }\n+ // .toolbar-item__profile {\n+ // .toolbar-menu {\n+ // left: auto;\n+ // right: 0;\n+ // }\n+ // }\n}\n" } ]
PHP
MIT License
bolt/core
rewrite of topbar links and btn-groups. Now tab-able!
95,192
29.07.2019 17:19:28
-7,200
b567d77d898a023a94d179896afad6731d6c1c17
layout sub items and profile button
[ { "change_type": "MODIFY", "old_path": "assets/scss/layout/_admin.scss", "new_path": "assets/scss/layout/_admin.scss", "diff": "//** Layout | Admin\n// Main Layout Grid\n-\n.admin {\nmargin-top: $admin-toolbar-height;\nmin-height: inherit;\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/modules/admin/_sidebar.scss", "new_path": "assets/scss/modules/admin/_sidebar.scss", "diff": "align-items: center;\njustify-content: center;\nbackground-color: var(--admin-sidebar);\n- @include media-breakpoint-up(md) {\n+ @include media-breakpoint-up(wd) {\nwidth: $admin-sidebar-width-wide;\n}\na {\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/modules/admin/_toolbar.scss", "new_path": "assets/scss/modules/admin/_toolbar.scss", "diff": "width: 100%;\ndisplay: flex;\npadding: 0;\n- @include media-breakpoint-up(lg) {\n- padding-right: 1rem;\n- }\n+ // @include media-breakpoint-up(lg) {\n+ // padding-right: 1rem;\n+ // }\n&.is-dark {\ncolor: var(--admin-toolbar-text-light);\n.dropdown-toggle {\ncolor: var(--foreground);\nheight: 100%;\n+ padding: 0.625rem;\n+ @include media-breakpoint-up(sm) {\npadding: 0.625rem 1rem;\n+ }\n&:hover, &:active, &:focus {\n@include darken(--admin-sidebar, 0.02);\n}\nmargin-right: 0.25rem;\n}\n.dropdown-toggle {\n+ padding: 0 0.8125rem;\n+ width: 45px;\n+ overflow: hidden;\n+ @include media-breakpoint-up(sm) {\n+ width: auto;\n+ overflow: auto;\npadding: 0 1rem;\n+ }\n&:after {\nvertical-align: middle;\n}\n}\n+\n}\n&__profile {\nmargin-left: auto;\n+ padding-right: 1rem;\n}\n- &__site a {\n+ &__site {\n+ display: none;\n+ @include media-breakpoint-up(sm) {\n+ display: block;\n+ }\n+ a {\nheight: 100%;\npadding: 0.625rem 1rem;\n+ }\ni, .fas {\nmargin-right: 0.25rem;\n}\n}\n-\n- // &:hover {\n- // opacity: 1;\n-\n- // @include darken(--admin-toolbar, 0.2);\n-\n- // > .toolbar-menu {\n- // visibility: visible;\n- // height: auto;\n- // }\n- // }\n}\n- // .toolbar-menu {\n- // background: var(--admin-sidebar-menu);\n- // border-radius: 0 $border-radius $border-radius 0;\n- // box-shadow: 5px 5px 30px rgba(0, 0, 0, 0.2);\n- // border: 1px solid rgba(0, 0, 0, 0.1);\n- // color: var(--shade);\n-\n- // font-weight: $font-weight-normal;\n- // font-size: 100%;\n- // visibility: hidden;\n- // height: 0;\n- // list-style: none;\n- // position: absolute;\n- // left: 0;\n- // top: 100%;\n- // width: $admin-sidebar-width;\n- // margin: 0;\n- // padding: 0;\n-\n- // li {\n- // a {\n- // padding: $spacer / 2;\n- // display: block;\n- // color: var(--shade);\n-\n- // &:hover {\n- // @include darken(--admin-sidebar, 0.02);\n- // color: var(--admin-sidebar-icon);\n- // text-decoration: none;\n- // }\n- // }\n- // }\n- // }\n- // .toolbar-item__profile {\n- // .toolbar-menu {\n- // left: auto;\n- // right: 0;\n- // }\n- // }\n}\n" } ]
PHP
MIT License
bolt/core
layout sub items and profile button
95,144
31.07.2019 08:18:23
-7,200
b82f5dbe4b7ba86f344565d669497fbaf51ebca3
Cleanup of overridden packages
[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"spec\\\\Bolt\\\\\": \"tests/spec/Bolt/\"\n}\n},\n- \"repositories\": [\n- {\n- \"type\": \"vcs\",\n- \"url\": \"https://github.com/bobdenotter/DoctrineExtensions\",\n- \"no-api\": true\n- },\n- {\n- \"type\": \"vcs\",\n- \"url\": \"https://github.com/jarjak/php-matcher\",\n- \"no-api\": true\n- }\n- ],\n\"minimum-stability\": \"stable\",\n\"prefer-stable\": true,\n\"scripts\": {\n" } ]
PHP
MIT License
bolt/core
Cleanup of overridden packages
95,168
02.08.2019 13:38:47
-7,200
40c91d94e9c81c28cdb4f544d6792ca2d389ca2d
Make controller work with sorting
[ { "change_type": "MODIFY", "old_path": "src/Repository/ContentRepository.php", "new_path": "src/Repository/ContentRepository.php", "diff": "@@ -22,6 +22,8 @@ use Symfony\\Bridge\\Doctrine\\RegistryInterface;\n*/\nclass ContentRepository extends ServiceEntityRepository\n{\n+ private $contentColumns = ['id', 'author', 'contentType', 'status', 'createdAt', 'modifiedAt', 'publishedAt', 'depublishedAt'];\n+\npublic function __construct(RegistryInterface $registry)\n{\nparent::__construct($registry, Content::class);\n@@ -48,20 +50,16 @@ class ContentRepository extends ServiceEntityRepository\n->setParameter('status', Statuses::PUBLISHED);\n}\n- if ($sortBy) {\n+ if ($sortBy && \\in_array($sortBy, $this->contentColumns)) {\n+ $qb->orderBy('content.' . $sortBy);\n+ } elseif ($sortBy == 'title') {\n$qb->addSelect('f')\n->innerJoin('content.fields', 'f')\n->andWhere('f.name = :title')\n->setParameter('title', 'title')\n->orderBy('f.value');\n}\n- dump($qb->getDQL());\n- dump($qb->getQuery()->getSQL());\n- // dump($this->createPaginator($qb->getQuery(), $page, $amountPerPage));\n- // die();\n-\n- return $qb->getQuery()->getResult();\n- // return $this->createPaginator($qb->getQuery(), $page, $amountPerPage);\n+ return $this->createPaginator($qb->getQuery(), $page, $amountPerPage);\n}\npublic function findForTaxonomy(int $page, string $taxonomyslug, string $slug, int $amountPerPage, bool $onlyPublished = true): Pagerfanta\n@@ -158,10 +156,10 @@ class ContentRepository extends ServiceEntityRepository\nprivate function createPaginator(Query $query, int $page, int $amountPerPage): Pagerfanta\n{\n- $paginator = new Pagerfanta(new DoctrineORMAdapter($query));\n+ $paginator = new Pagerfanta(new DoctrineORMAdapter($query, true, true));\n$paginator->setMaxPerPage($amountPerPage);\n$paginator->setCurrentPage($page);\n-\n+dump($paginator->count());\nreturn $paginator;\n}\n" } ]
PHP
MIT License
bolt/core
Make controller work with sorting
95,144
02.08.2019 14:09:14
-7,200
a9c2e89aca61788ff555c7685ccdb34c325f7330
Add extensions:list command
[ { "change_type": "ADD", "old_path": null, "new_path": "src/Command/ExtensionsListCommand.php", "diff": "+<?php\n+\n+declare(strict_types=1);\n+\n+namespace Bolt\\Command;\n+\n+use Bolt\\Extension\\ExtensionRegistry;\n+use Symfony\\Component\\Console\\Command\\Command;\n+use Symfony\\Component\\Console\\Input\\InputInterface;\n+use Symfony\\Component\\Console\\Output\\OutputInterface;\n+use Symfony\\Component\\Console\\Style\\SymfonyStyle;\n+use Symfony\\Component\\DependencyInjection\\Reference;\n+\n+class ExtensionsListCommand extends Command\n+{\n+ protected static $defaultName = 'extensions:list';\n+\n+ /** @var ExtensionRegistry */\n+ private $extensionRegistry;\n+\n+ public function __construct(ExtensionRegistry $extensionRegistry)\n+ {\n+ $this->extensionRegistry = $extensionRegistry;\n+\n+ parent::__construct();\n+ }\n+\n+ protected function configure(): void\n+ {\n+ $this\n+ ->setDescription('List extensions');\n+ }\n+\n+ protected function execute(InputInterface $input, OutputInterface $output): void\n+ {\n+ $io = new SymfonyStyle($input, $output);\n+\n+ dump($this->extensionRegistry->getExtensions());\n+\n+ $io->success('Done');\n+ }\n+}\n\\ No newline at end of file\n" } ]
PHP
MIT License
bolt/core
Add extensions:list command
95,168
02.08.2019 15:26:38
-7,200
1d17aaba7109258b40658e126127f6cea0bd4044
Add sort by select list and filter button
[ { "change_type": "MODIFY", "old_path": "templates/_partials/_pager.html.twig", "new_path": "templates/_partials/_pager.html.twig", "diff": "+{% set sortBy = app.request.get('sort')|default() %}\n+{% set routeParams = { 'contentType': contentType.slug|default() } %}\n+\n+{% if sortBy %}\n+ {% set routeParams = routeParams|merge({'sortBy': sortBy}) %}\n+{% endif %}\n+\n{% if records.haveToPaginate|default() %}\n<div class=\"pagination\">\n{{ pagerfanta(records, {\nrouteName: 'bolt_content_overview',\n- routeParams: { 'contentType': contentType.slug|default() }\n+ routeParams: routeParams\n}) }}\n</div>\n{% endif %}\n" }, { "change_type": "MODIFY", "old_path": "templates/content/listing.html.twig", "new_path": "templates/content/listing.html.twig", "diff": "singular=\"{{ contentType.singular_name }}\"\n></listing-select-box>\n+ {% set filterOptions = {'id': \"Id\", 'Author': 'Author', 'status': 'Status', 'createdAt': 'Created date', 'modifiedAt': 'Modified date', 'publishedAt': 'Published date', 'depublishedAt': 'Depublished date'} %}\n+ {% set sortBy = app.request.get('sort')|default() %}\n+\n<div class=\"card\">\n<div class=\"card-header\">\n{{ 'title.contentlisting'|trans }}\n</div>\n<div class=\"card-body\">\n- (filtering options go here)\n+ <form>\n+ <div class=\"form-group\">\n+ <p>\n+ <strong>Sort by</strong>:\n+ <select name=\"sort\" class=\"form-control\">\n+ <option value=\"\" disabled {% if sortBy is empty %}selected{% endif %}>\n+ Select item\n+ </option>\n+ {% for key, filterOption in filterOptions %}\n+ <option value=\"{{ key }}\" {% if sortBy == key %}selected{% endif %}>\n+ {{ filterOption }}\n+ </option>\n+ {% endfor %}\n+ </select>\n+ </p>\n+ </div>\n+ <div class=\"form-group\">\n+ <button type=\"submit\">Filter</button>\n+ </div>\n+ </form>\n</div>\n</div>\n" } ]
PHP
MIT License
bolt/core
Add sort by select list and filter button
95,168
02.08.2019 15:52:25
-7,200
8ec4050e7a4c7bcb76ff8831b8446761bb794793
Add Title to sort by options select list
[ { "change_type": "MODIFY", "old_path": "templates/content/listing.html.twig", "new_path": "templates/content/listing.html.twig", "diff": "singular=\"{{ contentType.singular_name }}\"\n></listing-select-box>\n- {% set filterOptions = {'id': \"Id\", 'Author': 'Author', 'status': 'Status', 'createdAt': 'Created date', 'modifiedAt': 'Modified date', 'publishedAt': 'Published date', 'depublishedAt': 'Depublished date'} %}\n+ {% set filterOptions = {'id': \"Id\", 'title': 'Title', 'Author': 'Author', 'status': 'Status', 'createdAt': 'Created date', 'modifiedAt': 'Modified date', 'publishedAt': 'Published date', 'depublishedAt': 'Depublished date'} %}\n{% set sortBy = app.request.get('sort')|default() %}\n<div class=\"card\">\n" } ]
PHP
MIT License
bolt/core
Add Title to sort by options select list
95,168
02.08.2019 15:53:07
-7,200
01880ee20819d1530f4bf4770cdda9a3837a6f7e
Make filter work in the Controller
[ { "change_type": "MODIFY", "old_path": "src/Controller/Backend/ContentOverviewController.php", "new_path": "src/Controller/Backend/ContentOverviewController.php", "diff": "@@ -35,7 +35,11 @@ class ContentOverviewController extends TwigAwareController implements BackendZo\ndump($request->query->get('sort'));\n// die();\n- }else {\n+ } elseif($request->query->get('filter')) {\n+ $filter = $request->query->get('filter');\n+ $records = $contentRepository->findForListing($page, $amountPerPage, $contentType, false, '', $filter);\n+ }\n+ else {\n$records = $contentRepository->findForListing($page, $amountPerPage, $contentType, false);\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Repository/ContentRepository.php", "new_path": "src/Repository/ContentRepository.php", "diff": "@@ -34,7 +34,7 @@ class ContentRepository extends ServiceEntityRepository\nreturn $this->createQueryBuilder('content');\n}\n- public function findForListing(int $page, int $amountPerPage, ?ContentType $contentType = null, bool $onlyPublished = true, string $sortBy = '')\n+ public function findForListing(int $page, int $amountPerPage, ?ContentType $contentType = null, bool $onlyPublished = true, string $sortBy = '', string $filter = '')\n{\n$qb = $this->getQueryBuilder()\n->addSelect('a')\n@@ -58,7 +58,15 @@ class ContentRepository extends ServiceEntityRepository\n->andWhere('f.name = :title')\n->setParameter('title', 'title')\n->orderBy('f.value');\n+ } elseif ($filter) {\n+ $qb->addSelect('f')\n+ ->innerJoin('content.fields', 'f')\n+ ->andWhere('f.name = :title')\n+ ->andWhere($qb->expr()->like('f.value', ':filterValue'))\n+ ->setParameter('title', 'title')\n+ ->setParameter('filterValue', '%' . $filter . '%');\n}\n+ dump($qb->getQuery()->getSQL());\nreturn $this->createPaginator($qb->getQuery(), $page, $amountPerPage);\n}\n" } ]
PHP
MIT License
bolt/core
Make filter work in the Controller
95,168
02.08.2019 16:01:25
-7,200
7fabea3bf0a615f1b054ffecbe7f4a65e1727c06
Add text input to filter on title
[ { "change_type": "MODIFY", "old_path": "templates/content/listing.html.twig", "new_path": "templates/content/listing.html.twig", "diff": "{% set filterOptions = {'id': \"Id\", 'title': 'Title', 'Author': 'Author', 'status': 'Status', 'createdAt': 'Created date', 'modifiedAt': 'Modified date', 'publishedAt': 'Published date', 'depublishedAt': 'Depublished date'} %}\n{% set sortBy = app.request.get('sort')|default() %}\n+ {% set filterValue = app.request.get('filter')|default() %}\n<div class=\"card\">\n<div class=\"card-header\">\n{% endfor %}\n</select>\n</p>\n+ <p>\n+ <strong>Title</strong>:\n+ <input class=\"form-control\" type=\"text\" name=\"filter\" value=\"{{ filterValue }}\" placeholder=\"Keyword ...\"></input>\n+ </p>\n</div>\n<div class=\"form-group\">\n<button type=\"submit\">Filter</button>\n" } ]
PHP
MIT License
bolt/core
Add text input to filter on title
95,144
02.08.2019 17:05:48
-7,200
bbc92634c43ec4758b6092b4410ff9025d22fb14
Working on First steps for Extensions
[ { "change_type": "MODIFY", "old_path": "src/Command/ExtensionsListCommand.php", "new_path": "src/Command/ExtensionsListCommand.php", "diff": "@@ -30,12 +30,24 @@ class ExtensionsListCommand extends Command\n->setDescription('List extensions');\n}\n- protected function execute(InputInterface $input, OutputInterface $output): void\n+ protected function execute(InputInterface $input, OutputInterface $output): ?int\n{\n+ $extensions = $this->extensionRegistry->getExtensions();\n+\n+ $rows = [];\n+\n+ foreach($extensions as $extension) {\n+ dump($extension);\n+ $extension->initialize();\n+ }\n+\n$io = new SymfonyStyle($input, $output);\n- dump($this->extensionRegistry->getExtensions());\n+// $io->table(['', 'Bundle', 'Method / Error'], $rows);\n+\n$io->success('Done');\n+\n+ return 0;\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Event/Subscriber/CheckRequirementsSubscriber.php", "new_path": "src/Event/Subscriber/CheckRequirementsSubscriber.php", "diff": "@@ -10,7 +10,7 @@ use Symfony\\Component\\Console\\ConsoleEvents;\nuse Symfony\\Component\\Console\\Event\\ConsoleErrorEvent;\nuse Symfony\\Component\\Console\\Style\\SymfonyStyle;\nuse Symfony\\Component\\EventDispatcher\\EventSubscriberInterface;\n-use Symfony\\Component\\HttpKernel\\Event\\GetResponseForExceptionEvent;\n+use Symfony\\Component\\HttpKernel\\Event\\ExceptionEvent;\nuse Symfony\\Component\\HttpKernel\\KernelEvents;\n/**\n@@ -66,7 +66,7 @@ class CheckRequirementsSubscriber implements EventSubscriberInterface\n* This method checks if the triggered exception is related to the database\n* and then, it checks if the required 'sqlite3' PHP extension is enabled.\n*/\n- public function handleKernelException(GetResponseForExceptionEvent $event): void\n+ public function handleKernelException(ExceptionEvent $event): void\n{\n$exception = $event->getException();\n// Since any exception thrown during a Twig template rendering is wrapped\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/Event/Subscriber/InitialiseExtensionsSubscriber.php", "diff": "+<?php\n+\n+declare(strict_types=1);\n+\n+namespace Bolt\\Event\\Subscriber;\n+\n+use Bolt\\Extension\\ExtensionRegistry;\n+use Symfony\\Component\\Console\\ConsoleEvents;\n+use Symfony\\Component\\Console\\Event\\ConsoleCommandEvent;\n+use Symfony\\Component\\EventDispatcher\\EventSubscriberInterface;\n+use Symfony\\Component\\HttpKernel\\Event\\ControllerEvent;\n+use Symfony\\Component\\HttpKernel\\KernelEvents;\n+\n+class InitialiseExtensionsSubscriber implements EventSubscriberInterface\n+{\n+ public const PRIORITY = 0;\n+\n+ /** @var ExtensionRegistry */\n+ private $extensionRegistry;\n+\n+ public function __construct(ExtensionRegistry $extensionRegistry)\n+ {\n+ $this->extensionRegistry = $extensionRegistry;\n+ }\n+\n+ /**\n+ * Kernel response listener callback.\n+ */\n+ public function onKernelResponse(ControllerEvent $event): void\n+ {\n+ $this->extensionRegistry->initializeAll();\n+ }\n+\n+ /**\n+ * Command response listener callback.\n+ */\n+ public function onConsoleResponse(ConsoleCommandEvent $event): void\n+ {\n+ $this->extensionRegistry->initializeAll();\n+ }\n+\n+ /**\n+ * Return the events to subscribe to.\n+ */\n+ public static function getSubscribedEvents(): array\n+ {\n+ return [\n+ KernelEvents::CONTROLLER => [['onKernelResponse', self::PRIORITY]],\n+ ConsoleEvents::COMMAND => [['onConsoleResponse', self::PRIORITY]],\n+ ];\n+ }\n+}\n" }, { "change_type": "RENAME", "old_path": "src/EventSubscriber/ProcessWidgetsQueueSubscriber.php", "new_path": "src/Event/Subscriber/ProcessWidgetsQueueSubscriber.php", "diff": "declare(strict_types=1);\n-namespace Bolt\\EventSubscriber;\n+namespace Bolt\\Event\\Subscriber;\nuse Bolt\\Widgets;\nuse Symfony\\Component\\EventDispatcher\\EventSubscriberInterface;\n-use Symfony\\Component\\HttpKernel\\Event\\FilterResponseEvent;\n+use Symfony\\Component\\HttpKernel\\Event\\ResponseEvent;\nuse Symfony\\Component\\HttpKernel\\KernelEvents;\nclass ProcessWidgetsQueueSubscriber implements EventSubscriberInterface\n@@ -24,7 +24,7 @@ class ProcessWidgetsQueueSubscriber implements EventSubscriberInterface\n/**\n* Kernel response listener callback.\n*/\n- public function onKernelResponse(FilterResponseEvent $event): void\n+ public function onKernelResponse(ResponseEvent $event): void\n{\n$response = $event->getResponse();\n" }, { "change_type": "RENAME", "old_path": "src/EventSubscriber/WidgetsSubscriber.php", "new_path": "src/Event/Subscriber/WidgetsSubscriber.php", "diff": "declare(strict_types=1);\n-namespace Bolt\\EventSubscriber;\n+namespace Bolt\\Event\\Subscriber;\nuse Bolt\\Widget\\BoltHeaderWidget;\nuse Bolt\\Widget\\CanonicalLinkWidget;\n@@ -13,7 +13,6 @@ use Bolt\\Widget\\SnippetWidget;\nuse Bolt\\Widget\\WeatherWidget;\nuse Bolt\\Widgets;\nuse Symfony\\Component\\EventDispatcher\\EventSubscriberInterface;\n-use Symfony\\Component\\HttpFoundation\\Request;\nuse Symfony\\Component\\HttpKernel\\Event\\RequestEvent;\nuse Symfony\\Component\\HttpKernel\\KernelEvents;\n" }, { "change_type": "RENAME", "old_path": "src/EventSubscriber/ZoneSubscriber.php", "new_path": "src/Event/Subscriber/ZoneSubscriber.php", "diff": "declare(strict_types=1);\n-namespace Bolt\\EventSubscriber;\n+namespace Bolt\\Event\\Subscriber;\nuse Bolt\\Controller\\Backend\\Async\\AsyncZone;\nuse Bolt\\Controller\\Backend\\BackendZone;\n" }, { "change_type": "MODIFY", "old_path": "src/Extension/ExtensionCompilerPass.php", "new_path": "src/Extension/ExtensionCompilerPass.php", "diff": "@@ -6,21 +6,20 @@ namespace Bolt\\Extension;\nuse Symfony\\Component\\DependencyInjection\\Compiler\\CompilerPassInterface;\nuse Symfony\\Component\\DependencyInjection\\ContainerBuilder;\n-use Symfony\\Component\\DependencyInjection\\Reference;\nclass ExtensionCompilerPass implements CompilerPassInterface\n{\npublic function process(ContainerBuilder $container): void\n{\n- if (! $container->has(ExtensionRegistry::class)) {\n+ if ($container->has(ExtensionRegistry::class) === false) {\nreturn;\n}\n$repository = $container->findDefinition(ExtensionRegistry::class);\n// The important bit: grab all classes that were tagged with our specified CONTAINER_TAG, and shove them into our Repository\n- foreach ($container->findTaggedServiceIds(ExtensionInterface::CONTAINER_TAG) as $id => $tags) {\n+ foreach (array_keys($container->findTaggedServiceIds(ExtensionInterface::CONTAINER_TAG)) as $id) {\n/* @see ExtensionRegistry::add() */\n- $repository->addMethodCall('add', [new Reference($id)]);\n+ $repository->addMethodCall('add', [$id]);\n}\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Extension/ExtensionInterface.php", "new_path": "src/Extension/ExtensionInterface.php", "diff": "@@ -7,5 +7,8 @@ namespace Bolt\\Extension;\ninterface ExtensionInterface\n{\npublic const CONTAINER_TAG = 'bolt.extension';\n+\npublic function getName(): string;\n+\n+ public function initialize(): void;\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Extension/ExtensionRegistry.php", "new_path": "src/Extension/ExtensionRegistry.php", "diff": "@@ -9,9 +9,17 @@ class ExtensionRegistry\n/** @var ExtensionInterface[] * */\nprotected $extensions = [];\n- public function add(ExtensionInterface $extension): void\n+ /** @var array */\n+ protected $extensionClasses = [];\n+\n+ public function add(string $extensionClass): void\n{\n- $this->extensions[\\get_class($extension)] = $extension;\n+ $this->extensionClasses[] = $extensionClass;\n+ }\n+\n+ private function getExtensionClasses(): array\n+ {\n+ return $this->extensionClasses;\n}\n/** @return ExtensionInterface[] */\n@@ -19,4 +27,14 @@ class ExtensionRegistry\n{\nreturn $this->extensions;\n}\n+\n+ public function initializeAll(): void\n+ {\n+ foreach ($this->getExtensionClasses() as $extensionClass) {\n+ $extension = new $extensionClass();\n+ $extension->initialize();\n+\n+ $this->extensions[$extensionClass] = $extension;\n+ }\n+ }\n}\n" } ]
PHP
MIT License
bolt/core
Working on First steps for Extensions
95,168
02.08.2019 17:28:19
-7,200
c4c5e92207f82b7f274a2be4a0b6c598038d9c28
Combine sort and filter content
[ { "change_type": "MODIFY", "old_path": "src/Controller/Backend/ContentOverviewController.php", "new_path": "src/Controller/Backend/ContentOverviewController.php", "diff": "@@ -27,11 +27,17 @@ class ContentOverviewController extends TwigAwareController implements BackendZo\n$page = (int) $request->query->get('page', 1);\n$amountPerPage = $contentType->get('records_per_page', 10);\n- if($request->query->get('sort')){\n+ if ($request->query->get('sort') && $request->query->get('filter')){\n+ $sortBy = $request->query->get('sort');\n+ $filter = $request->query->get('filter');\n+\n+ $records = $contentRepository->findForListing($page, $amountPerPage, $contentType, false, $sortBy, $filter);\n+ }\n+ elseif ($request->query->get('sort')){\n$sortBy = $request->query->get('sort');\ndump($sortBy);\n// die();\n- $records = $contentRepository->findForListing($page, $amountPerPage, $contentType, false, $sortBy);\n+ $records = $contentRepository->findForListing($page, $amountPerPage, $contentType, false, $sortBy, '');\ndump($request->query->get('sort'));\n// die();\n" }, { "change_type": "MODIFY", "old_path": "src/Repository/ContentRepository.php", "new_path": "src/Repository/ContentRepository.php", "diff": "@@ -50,20 +50,21 @@ class ContentRepository extends ServiceEntityRepository\n->setParameter('status', Statuses::PUBLISHED);\n}\n+ if (!empty($sortBy) || !empty($filter)) {\n+ $qb->addSelect('f')\n+ ->innerJoin('content.fields', 'f');\n+ }\n+\nif ($sortBy && \\in_array($sortBy, $this->contentColumns)) {\n$qb->orderBy('content.' . $sortBy);\n- } elseif ($sortBy == 'title') {\n- $qb->addSelect('f')\n- ->innerJoin('content.fields', 'f')\n- ->andWhere('f.name = :title')\n- ->setParameter('title', 'title')\n+ } elseif (!empty($sortBy)) {\n+ $qb->andWhere('f.name = :fieldname')\n+ ->setParameter('fieldname', $sortBy)\n->orderBy('f.value');\n- } elseif ($filter) {\n- $qb->addSelect('f')\n- ->innerJoin('content.fields', 'f')\n- ->andWhere('f.name = :title')\n- ->andWhere($qb->expr()->like('f.value', ':filterValue'))\n- ->setParameter('title', 'title')\n+ }\n+\n+ if ($filter) {\n+ $qb->andWhere($qb->expr()->like('f.value', ':filterValue'))\n->setParameter('filterValue', '%' . $filter . '%');\n}\ndump($qb->getQuery()->getSQL());\n" } ]
PHP
MIT License
bolt/core
Combine sort and filter content
95,168
02.08.2019 17:35:13
-7,200
2450f9a1120a51101da3a71401f802ce85586566
Add a clear button to clear sort/filter options
[ { "change_type": "MODIFY", "old_path": "templates/content/listing.html.twig", "new_path": "templates/content/listing.html.twig", "diff": "</p>\n</div>\n<div class=\"form-group\">\n- <button type=\"submit\">Filter</button>\n+ <button class=\"btn btn-tertiary\" type=\"submit\">Filter</button>\n+ {% if sortBy is not empty or filterValue is not empty %}\n+ <a class=\"btn btn-danger\" href=\"?\"><i class=\"fa fa-close\"></i> Clear sort/filter</a>\n+ {% endif %}\n</div>\n</form>\n</div>\n" } ]
PHP
MIT License
bolt/core
Add a clear button to clear sort/filter options
95,168
02.08.2019 17:36:59
-7,200
af7f81e53c930fc2a27ceed025acc31a15616e9e
Remove dumps and dies
[ { "change_type": "MODIFY", "old_path": "src/Controller/Backend/ContentOverviewController.php", "new_path": "src/Controller/Backend/ContentOverviewController.php", "diff": "@@ -35,12 +35,7 @@ class ContentOverviewController extends TwigAwareController implements BackendZo\n}\nelseif ($request->query->get('sort')){\n$sortBy = $request->query->get('sort');\n- dump($sortBy);\n- // die();\n$records = $contentRepository->findForListing($page, $amountPerPage, $contentType, false, $sortBy, '');\n-\n- dump($request->query->get('sort'));\n- // die();\n} elseif($request->query->get('filter')) {\n$filter = $request->query->get('filter');\n$records = $contentRepository->findForListing($page, $amountPerPage, $contentType, false, '', $filter);\n" }, { "change_type": "MODIFY", "old_path": "src/Repository/ContentRepository.php", "new_path": "src/Repository/ContentRepository.php", "diff": "@@ -67,7 +67,6 @@ class ContentRepository extends ServiceEntityRepository\n$qb->andWhere($qb->expr()->like('f.value', ':filterValue'))\n->setParameter('filterValue', '%' . $filter . '%');\n}\n- dump($qb->getQuery()->getSQL());\nreturn $this->createPaginator($qb->getQuery(), $page, $amountPerPage);\n}\n@@ -168,7 +167,6 @@ class ContentRepository extends ServiceEntityRepository\n$paginator = new Pagerfanta(new DoctrineORMAdapter($query, true, true));\n$paginator->setMaxPerPage($amountPerPage);\n$paginator->setCurrentPage($page);\n-dump($paginator->count());\nreturn $paginator;\n}\n" } ]
PHP
MIT License
bolt/core
Remove dumps and dies
95,144
03.08.2019 09:04:42
-7,200
e38b2ba99854b548a768ba11f39c1cb1829eb84a
Adding BaseExtension class
[ { "change_type": "ADD", "old_path": null, "new_path": "src/Extension/BaseExtension.php", "diff": "+<?php\n+\n+declare(strict_types=1);\n+\n+namespace Bolt\\Extension;\n+\n+/**\n+ * BaseWidget can be used as easy starter pack or as a base for your own extensions.\n+ */\n+abstract class BaseExtension implements ExtensionInterface\n+{\n+ public function getName(): string\n+ {\n+ return 'BaseExtension';\n+ }\n+\n+ public function getClass(): string\n+ {\n+ return static::class;\n+ }\n+\n+ public function initialize(): void\n+ {\n+ // Nothing\n+ }\n+}\n" } ]
PHP
MIT License
bolt/core
Adding BaseExtension class
95,144
03.08.2019 11:13:06
-7,200
08e8c11da071c4a31f3ac58aa60544605b5ca689
Let Extensions add Twig Filters and Functions and Bolt Widgets
[ { "change_type": "RENAME", "old_path": "src/Event/Subscriber/InitialiseExtensionsSubscriber.php", "new_path": "src/Event/Subscriber/ExtensionSubscriber.php", "diff": "@@ -5,22 +5,27 @@ declare(strict_types=1);\nnamespace Bolt\\Event\\Subscriber;\nuse Bolt\\Extension\\ExtensionRegistry;\n+use Bolt\\Widgets;\nuse Symfony\\Component\\Console\\ConsoleEvents;\nuse Symfony\\Component\\Console\\Event\\ConsoleCommandEvent;\nuse Symfony\\Component\\EventDispatcher\\EventSubscriberInterface;\nuse Symfony\\Component\\HttpKernel\\Event\\ControllerEvent;\nuse Symfony\\Component\\HttpKernel\\KernelEvents;\n-class InitialiseExtensionsSubscriber implements EventSubscriberInterface\n+class ExtensionSubscriber implements EventSubscriberInterface\n{\npublic const PRIORITY = 0;\n/** @var ExtensionRegistry */\nprivate $extensionRegistry;\n- public function __construct(ExtensionRegistry $extensionRegistry)\n+ /** @var Widgets */\n+ private $widgets;\n+\n+ public function __construct(ExtensionRegistry $extensionRegistry, Widgets $widgets)\n{\n$this->extensionRegistry = $extensionRegistry;\n+ $this->widgets = $widgets;\n}\n/**\n@@ -28,7 +33,7 @@ class InitialiseExtensionsSubscriber implements EventSubscriberInterface\n*/\npublic function onKernelResponse(ControllerEvent $event): void\n{\n- $this->extensionRegistry->initializeAll();\n+ $this->extensionRegistry->initializeAll($this->widgets);\n}\n/**\n@@ -36,7 +41,7 @@ class InitialiseExtensionsSubscriber implements EventSubscriberInterface\n*/\npublic function onConsoleResponse(ConsoleCommandEvent $event): void\n{\n- $this->extensionRegistry->initializeAll();\n+ $this->extensionRegistry->initializeAll($this->widgets);\n}\n/**\n" }, { "change_type": "RENAME", "old_path": "src/Event/Subscriber/WidgetsSubscriber.php", "new_path": "src/Event/Subscriber/WidgetSubscriber.php", "diff": "@@ -10,13 +10,12 @@ use Bolt\\Widget\\Injector\\RequestZone;\nuse Bolt\\Widget\\Injector\\Target;\nuse Bolt\\Widget\\NewsWidget;\nuse Bolt\\Widget\\SnippetWidget;\n-use Bolt\\Widget\\WeatherWidget;\nuse Bolt\\Widgets;\nuse Symfony\\Component\\EventDispatcher\\EventSubscriberInterface;\nuse Symfony\\Component\\HttpKernel\\Event\\RequestEvent;\nuse Symfony\\Component\\HttpKernel\\KernelEvents;\n-class WidgetsSubscriber implements EventSubscriberInterface\n+class WidgetSubscriber implements EventSubscriberInterface\n{\npublic const PRIORITY = 100;\n@@ -33,7 +32,6 @@ class WidgetsSubscriber implements EventSubscriberInterface\n*/\npublic function onKernelRequest(RequestEvent $event): void\n{\n- $this->widgets->registerWidget(new WeatherWidget());\n$this->widgets->registerWidget(new NewsWidget());\n$this->widgets->registerWidget(new CanonicalLinkWidget());\n$this->widgets->registerWidget(new BoltHeaderWidget());\n" }, { "change_type": "MODIFY", "old_path": "src/Extension/BaseExtension.php", "new_path": "src/Extension/BaseExtension.php", "diff": "@@ -4,23 +4,116 @@ declare(strict_types=1);\nnamespace Bolt\\Extension;\n+use Bolt\\Event\\Subscriber\\ExtensionSubscriber;\n+use Bolt\\Widgets;\n+use Twig\\Extension\\ExtensionInterface as TwigExtensionInterface;\n+use Twig\\NodeVisitor\\NodeVisitorInterface;\n+use Twig\\TokenParser\\TokenParserInterface;\n+use Twig\\TwigFilter;\n+use Twig\\TwigFunction;\n+use Twig\\TwigTest;\n+\n/**\n* BaseWidget can be used as easy starter pack or as a base for your own extensions.\n*/\n-abstract class BaseExtension implements ExtensionInterface\n+abstract class BaseExtension implements ExtensionInterface, TwigExtensionInterface\n{\n+ /** @var Widgets */\n+ protected $widgets;\n+\n+ /**\n+ * Returns the descriptive name of the Extension\n+ */\npublic function getName(): string\n{\nreturn 'BaseExtension';\n}\n+ /**\n+ * Returns the classname of the Extension\n+ */\npublic function getClass(): string\n{\nreturn static::class;\n}\n+ /**\n+ * Called when initialising the Extension. Use this to register widgets or\n+ * do other tasks after boot.\n+ */\npublic function initialize(): void\n{\n// Nothing\n}\n+\n+ /**\n+ * Injects commonly used objects into the extension, for use by the\n+ * extension. Called from the listener\n+ *\n+ * @see ExtensionSubscriber\n+ */\n+ public function injectObjects(Widgets $widgets): void\n+ {\n+ $this->widgets = $widgets;\n+ }\n+\n+ /**\n+ * Twig: Returns the token parser instances to add to the existing list.\n+ *\n+ * @return TokenParserInterface[]\n+ */\n+ public function getTokenParsers(): array\n+ {\n+ return [];\n+ }\n+\n+ /**\n+ * Twig: Returns the node visitor instances to add to the existing list.\n+ *\n+ * @return NodeVisitorInterface[]\n+ */\n+ public function getNodeVisitors(): array\n+ {\n+ return [];\n+ }\n+\n+ /**\n+ * Twig: Returns a list of filters to add to the existing list.\n+ *\n+ * @return TwigFilter[]\n+ */\n+ public function getFilters(): array\n+ {\n+ return [];\n+ }\n+\n+ /**\n+ * Twig: Returns a list of tests to add to the existing list.\n+ *\n+ * @return TwigTest[]\n+ */\n+ public function getTests(): array\n+ {\n+ return [];\n+ }\n+\n+ /**\n+ * Twig: Returns a list of functions to add to the existing list.\n+ *\n+ * @return TwigFunction[]\n+ */\n+ public function getFunctions(): array\n+ {\n+ return [];\n+ }\n+\n+ /**\n+ * Twig: Returns a list of operators to add to the existing list.\n+ *\n+ * @return array<array> First array of unary operators, second array of binary operators\n+ */\n+ public function getOperators()\n+ {\n+ return [];\n+ }\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Extension/ExtensionInterface.php", "new_path": "src/Extension/ExtensionInterface.php", "diff": "@@ -4,6 +4,8 @@ declare(strict_types=1);\nnamespace Bolt\\Extension;\n+use Bolt\\Widgets;\n+\ninterface ExtensionInterface\n{\npublic const CONTAINER_TAG = 'bolt.extension';\n@@ -12,5 +14,7 @@ interface ExtensionInterface\npublic function getClass(): string;\n+ public function injectObjects(Widgets $widgets): void;\n+\npublic function initialize(): void;\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Extension/ExtensionRegistry.php", "new_path": "src/Extension/ExtensionRegistry.php", "diff": "@@ -4,6 +4,8 @@ declare(strict_types=1);\nnamespace Bolt\\Extension;\n+use Bolt\\Widgets;\n+\nclass ExtensionRegistry\n{\n/** @var ExtensionInterface[] * */\n@@ -28,10 +30,11 @@ class ExtensionRegistry\nreturn $this->extensions;\n}\n- public function initializeAll(): void\n+ public function initializeAll(Widgets $widgets): void\n{\nforeach ($this->getExtensionClasses() as $extensionClass) {\n$extension = new $extensionClass();\n+ $extension->injectObjects($widgets);\n$extension->initialize();\n$this->extensions[$extensionClass] = $extension;\n" } ]
PHP
MIT License
bolt/core
Let Extensions add Twig Filters and Functions and Bolt Widgets
95,144
03.08.2019 15:21:11
-7,200
10b5d6f0f572cbdf61981c7fbfafde3aad727005
Auto-register extensions installed through Composer
[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"api-platform/core\": \"^2.4\",\n\"bolt/common\": \"^2.0.2\",\n\"cocur/slugify\": \"^3.2\",\n+ \"composer/composer\": \"^1.9\",\n\"doctrine/annotations\": \"^1.6\",\n\"doctrine/doctrine-bundle\": \"^1.11\",\n\"doctrine/doctrine-cache-bundle\": \"^1.3.1\",\n\"doctrine/orm\": \"^2.6\",\n+ \"drupol/composer-packages\": \"^1.0\",\n\"embed/embed\": \"^3.3\",\n\"erusev/parsedown\": \"^1.7\",\n\"ezyang/htmlpurifier\": \"^4.10\",\n" }, { "change_type": "MODIFY", "old_path": "src/Extension/ExtensionCompilerPass.php", "new_path": "src/Extension/ExtensionCompilerPass.php", "diff": "@@ -18,8 +18,8 @@ class ExtensionCompilerPass implements CompilerPassInterface\n$repository = $container->findDefinition(ExtensionRegistry::class);\n// The important bit: grab all classes that were tagged with our specified CONTAINER_TAG, and shove them into our Repository\nforeach (array_keys($container->findTaggedServiceIds(ExtensionInterface::CONTAINER_TAG)) as $id) {\n- /* @see ExtensionRegistry::add() */\n- $repository->addMethodCall('add', [$id]);\n+ /* @see ExtensionRegistry::addCompilerPass() */\n+ $repository->addMethodCall('addCompilerPass', [$id]);\n}\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/Extension/ExtensionRegistry.php", "new_path": "src/Extension/ExtensionRegistry.php", "diff": "@@ -5,6 +5,8 @@ declare(strict_types=1);\nnamespace Bolt\\Extension;\nuse Bolt\\Widgets;\n+use Composer\\Package\\PackageInterface;\n+use ComposerPackages\\Types;\nclass ExtensionRegistry\n{\n@@ -14,11 +16,33 @@ class ExtensionRegistry\n/** @var array */\nprotected $extensionClasses = [];\n- public function add(string $extensionClass): void\n+ public function addCompilerPass(string $extensionClass): void\n{\n$this->extensionClasses[] = $extensionClass;\n}\n+ private function addComposerPackages(): void\n+ {\n+ $packages = Types::boltExtension();\n+\n+ /** @var PackageInterface $package */\n+ foreach ($packages as $package) {\n+ $extra = $package->getExtra();\n+\n+ if (! array_key_exists('entrypoint', $extra)) {\n+ $message = sprintf(\"The extension \\\"%s\\\" has no 'extra/entrypoint' defined in its 'composer.json' file.\", $package->getName());\n+ throw new \\Exception($message);\n+ }\n+\n+ if (! class_exists($extra['entrypoint'])) {\n+ $message = sprintf(\"The extension \\\"%s\\\" has its 'extra/entrypoint' set to \\\"%s\\\", but that class does not exist\", $package->getName(), $extra['entrypoint']);\n+ throw new \\Exception($message);\n+ }\n+\n+ $this->extensionClasses[] = $extra['entrypoint'];\n+ }\n+ }\n+\nprivate function getExtensionClasses(): array\n{\nreturn $this->extensionClasses;\n@@ -32,6 +56,8 @@ class ExtensionRegistry\npublic function initializeAll(Widgets $widgets): void\n{\n+ $this->addComposerPackages();\n+\nforeach ($this->getExtensionClasses() as $extensionClass) {\n$extension = new $extensionClass();\n$extension->injectObjects($widgets);\n" }, { "change_type": "MODIFY", "old_path": "src/Widget/BaseWidget.php", "new_path": "src/Widget/BaseWidget.php", "diff": "@@ -6,6 +6,9 @@ namespace Bolt\\Widget;\nuse Bolt\\Widget\\Exception\\WidgetException;\nuse Cocur\\Slugify\\Slugify;\n+use Symfony\\Bundle\\TwigBundle\\Loader\\NativeFilesystemLoader;\n+use Twig\\Error\\LoaderError;\n+use Twig\\Loader\\FilesystemLoader;\n/**\n* BaseWidget can be used as easy starter pack or as a base for your own widgets.\n@@ -28,9 +31,12 @@ abstract class BaseWidget implements WidgetInterface\n/** @var int */\nprotected $priority = 0;\n- /** @var string path to Twig template */\n+ /** @var string filename of Twig template */\nprotected $template;\n+ /** @var string path to Twig templates folder */\n+ protected $templateFolder;\n+\n/** @var ?string */\nprotected $slug;\n@@ -103,7 +109,13 @@ abstract class BaseWidget implements WidgetInterface\n}\nif ($this instanceof TwigAware) {\n- $output = $this->getTWig()->render($this->getTemplate(), $params);\n+ $this->addTwigLoader();\n+ try {\n+ $output = $this->getTwig()->render($this->getTemplate(), $params);\n+ } catch (LoaderError $e) {\n+ $output = sprintf(\"<mark><strong>Could not render extension '%s'.</strong></mark><br>\", $this->getName());\n+ $output .= sprintf('<mark><code>%s</code></mark>', $e->getMessage());\n+ }\n} else {\n$output = $this->getTemplate();\n}\n@@ -131,6 +143,24 @@ abstract class BaseWidget implements WidgetInterface\nreturn $this->template;\n}\n+ public function getTemplateFolder(): string\n+ {\n+ if ($this->templateFolder === null) {\n+ $reflection = new \\ReflectionClass($this);\n+ $this->templateFolder = dirname(dirname($reflection->getFilename())) . DIRECTORY_SEPARATOR . 'templates';\n+ }\n+\n+ return $this->templateFolder;\n+ }\n+\n+ private function addTwigLoader(): void\n+ {\n+ /** @var NativeFilesystemLoader $twigLoaders */\n+ $twigLoaders = $this->getTwig()->getLoader();\n+\n+ $twigLoaders->addPath($this->getTemplateFolder(), $this->getSlug());\n+ }\n+\npublic function setZone(string $zone): self\n{\n$this->zone = $zone;\n" }, { "change_type": "MODIFY", "old_path": "symfony.lock", "new_path": "symfony.lock", "diff": "\"behatch/contexts\": {\n\"version\": \"3.2.0\"\n},\n+ \"bobdenotter/weatherwidget\": {\n+ \"version\": \"dev-master\"\n+ },\n\"bolt/common\": {\n\"version\": \"v1.1.0\"\n},\n\"composer/ca-bundle\": {\n\"version\": \"1.0.8\"\n},\n+ \"composer/composer\": {\n+ \"version\": \"1.9.0\"\n+ },\n\"composer/semver\": {\n\"version\": \"1.4.2\"\n},\n+ \"composer/spdx-licenses\": {\n+ \"version\": \"1.5.2\"\n+ },\n\"composer/xdebug-handler\": {\n\"version\": \"1.1.0\"\n},\n\"doctrine/reflection\": {\n\"version\": \"v1.0.0\"\n},\n+ \"drupol/composer-packages\": {\n+ \"version\": \"1.0.0\"\n+ },\n\"egulias/email-validator\": {\n\"version\": \"2.1.2\"\n},\n\"seld/jsonlint\": {\n\"version\": \"1.7.1\"\n},\n+ \"seld/phar-utils\": {\n+ \"version\": \"1.0.1\"\n+ },\n\"sensio/framework-extra-bundle\": {\n\"version\": \"4.0\",\n\"recipe\": {\n" } ]
PHP
MIT License
bolt/core
Auto-register extensions installed through Composer
95,144
03.08.2019 15:21:27
-7,200
2d38fddddc45bcea430c1d37aecd4de32cb1470c
Removing Weather Widget from Core
[ { "change_type": "DELETE", "old_path": "src/Widget/WeatherWidget.php", "new_path": null, "diff": "-<?php\n-\n-declare(strict_types=1);\n-\n-namespace Bolt\\Widget;\n-\n-use Bolt\\Widget\\Injector\\AdditionalTarget;\n-use Bolt\\Widget\\Injector\\RequestZone;\n-use GuzzleHttp\\Client;\n-use GuzzleHttp\\Exception\\RequestException;\n-\n-class WeatherWidget extends BaseWidget implements TwigAware, CacheAware, StopwatchAware\n-{\n- use CacheTrait;\n- use StopwatchTrait;\n-\n- protected $name = 'Weather Widget';\n- protected $target = AdditionalTarget::WIDGET_BACK_DASHBOARD_ASIDE_TOP;\n- protected $priority = 200;\n- protected $template = '@bolt/widgets/weather.twig';\n- protected $zone = RequestZone::BACKEND;\n- protected $cacheDuration = 1800;\n-\n- public function run(array $params = []): ?string\n- {\n- $weather = $this->getWeather();\n-\n- if (empty($weather)) {\n- return null;\n- }\n-\n- return parent::run(['weather' => $weather]);\n- }\n-\n- private function getWeather(): array\n- {\n- $url = 'wttr.in/?format=%c|%C|%h|%t|%w|%l|%m|%M|%p|%P';\n-\n- $details = [];\n-\n- try {\n- $client = new Client();\n- $result = $client->request('GET', $url)->getBody()->getContents();\n- if (mb_substr_count($result, '|') === 9) {\n- $details = explode('|', trim($result));\n- }\n- } catch (RequestException $e) {\n- // Do nothing, fall through to empty array\n- }\n-\n- return $details;\n- }\n-}\n" }, { "change_type": "DELETE", "old_path": "templates/widgets/weather.twig", "new_path": null, "diff": "-<div class=\"card mb-4\">\n- <div class=\"image card-img-top\"\n- style=\"background-image: url(https://source.unsplash.com/400x240/?{{ weather.5|url_encode }}); height: 200px; padding-top: 60px;\">\n- <center style='text-shadow: 2px 2px 6px rgba(0, 0, 0, 0.6); color: #FFF;'>\n- <span style=\"font-size: 175%; line-height: 1.75rem;\">{{ weather.0 }} {{ weather.1 }} {{ weather.3 }}</span><br>\n- <span style=\"font-size: 100%;\">\n- {{ weather.5 }}<br>\n- {{ weather.6 }} / {{ weather.8 }} / {{ weather.2 }} / {{ weather.9 }}\n- </span>\n- </center>\n- </div>\n- <div class=\"card-body\">\n- <a>\n- <i class=\"fa fa-socks\"></i>\n- Current weather by Wttr.in\n- </a>\n- </div>\n-</div>\n" } ]
PHP
MIT License
bolt/core
Removing Weather Widget from Core
95,144
03.08.2019 15:55:28
-7,200
f31d5fb828c015df8276bffb54832061d826653c
Don't register extensions, if there aren't any
[ { "change_type": "MODIFY", "old_path": "src/Extension/ExtensionRegistry.php", "new_path": "src/Extension/ExtensionRegistry.php", "diff": "@@ -23,6 +23,10 @@ class ExtensionRegistry\nprivate function addComposerPackages(): void\n{\n+ if (! method_exists(Types, 'boltExtension')) {\n+ return;\n+ }\n+\n$packages = Types::boltExtension();\n/** @var PackageInterface $package */\n" }, { "change_type": "MODIFY", "old_path": "src/Widget/BaseWidget.php", "new_path": "src/Widget/BaseWidget.php", "diff": "@@ -8,7 +8,6 @@ use Bolt\\Widget\\Exception\\WidgetException;\nuse Cocur\\Slugify\\Slugify;\nuse Symfony\\Bundle\\TwigBundle\\Loader\\NativeFilesystemLoader;\nuse Twig\\Error\\LoaderError;\n-use Twig\\Loader\\FilesystemLoader;\n/**\n* BaseWidget can be used as easy starter pack or as a base for your own widgets.\n" } ]
PHP
MIT License
bolt/core
Don't register extensions, if there aren't any
95,144
03.08.2019 16:13:24
-7,200
0feb11ca86d3b6f58e1396af9bdd3ec38e359dab
Rename to bolt/core
[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "{\n- \"name\": \"bolt/bolt\",\n+ \"name\": \"bolt/core\",\n\"type\": \"library\",\n- \"description\": \"Bolt 4 skeleton / prototype\",\n+ \"description\": \"Bolt 4 core\",\n\"license\": \"MIT\",\n\"require\": {\n\"php\": \">=7.1.3\",\n\"ext-mbstring\": \"*\",\n\"ext-pdo\": \"*\",\n\"api-platform/core\": \"^2.4\",\n- \"bobdenotter/weatherwidget\": \"dev-master\",\n\"bolt/common\": \"^2.0.2\",\n\"cocur/slugify\": \"^3.2\",\n\"composer/composer\": \"^1.9\",\n" } ]
PHP
MIT License
bolt/core
Rename to bolt/core
95,144
03.08.2019 17:13:49
-7,200
423bfe687c3c6d33379437cf1b0ea3b173507385
Removing News Widget, moving to standalone extension
[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"behat/mink-extension\": \"^2.3\",\n\"behat/mink-goutte-driver\": \"^1.2\",\n\"behatch/contexts\": \"^3.2\",\n+ \"bobdenotter/weatherwidget\": \"dev-master\",\n+ \"bolt/newswidget\": \"^1.0\",\n\"coduo/php-matcher\": \"^3.2\",\n\"dama/doctrine-test-bundle\": \"^5.0\",\n\"doctrine/doctrine-fixtures-bundle\": \"^3.1\",\n" }, { "change_type": "MODIFY", "old_path": "src/Event/Subscriber/WidgetSubscriber.php", "new_path": "src/Event/Subscriber/WidgetSubscriber.php", "diff": "@@ -8,7 +8,6 @@ use Bolt\\Widget\\BoltHeaderWidget;\nuse Bolt\\Widget\\CanonicalLinkWidget;\nuse Bolt\\Widget\\Injector\\RequestZone;\nuse Bolt\\Widget\\Injector\\Target;\n-use Bolt\\Widget\\NewsWidget;\nuse Bolt\\Widget\\SnippetWidget;\nuse Bolt\\Widgets;\nuse Symfony\\Component\\EventDispatcher\\EventSubscriberInterface;\n@@ -32,7 +31,6 @@ class WidgetSubscriber implements EventSubscriberInterface\n*/\npublic function onKernelRequest(RequestEvent $event): void\n{\n- $this->widgets->registerWidget(new NewsWidget());\n$this->widgets->registerWidget(new CanonicalLinkWidget());\n$this->widgets->registerWidget(new BoltHeaderWidget());\n" }, { "change_type": "MODIFY", "old_path": "src/Extension/ExtensionRegistry.php", "new_path": "src/Extension/ExtensionRegistry.php", "diff": "@@ -23,11 +23,14 @@ class ExtensionRegistry\nprivate function addComposerPackages(): void\n{\n- if (! method_exists(Types::class, 'boltExtension')) {\n- return;\n- }\n-\n+ // We do a try/catch here, instead of using `method_exists`. This is\n+ // because PHPStan is being a smart-ass, and takes the state of the\n+ // generated `Types` class into account. And that's exactly the point.\n+ try {\n$packages = Types::boltExtension();\n+ } catch (\\Throwable $e) {\n+ $packages = [];\n+ }\n/** @var PackageInterface $package */\nforeach ($packages as $package) {\n" }, { "change_type": "DELETE", "old_path": "src/Widget/NewsWidget.php", "new_path": null, "diff": "-<?php\n-\n-declare(strict_types=1);\n-\n-namespace Bolt\\Widget;\n-\n-use Bolt\\Common\\Exception\\ParseException;\n-use Bolt\\Common\\Json;\n-use Bolt\\Version;\n-use Bolt\\Widget\\Injector\\AdditionalTarget;\n-use Bolt\\Widget\\Injector\\RequestZone;\n-use GuzzleHttp\\Client;\n-use GuzzleHttp\\Exception\\RequestException;\n-\n-class NewsWidget extends BaseWidget implements TwigAware, RequestAware, CacheAware, StopwatchAware\n-{\n- use CacheTrait;\n- use StopwatchTrait;\n-\n- protected $name = 'News Widget';\n- protected $target = AdditionalTarget::WIDGET_BACK_DASHBOARD_ASIDE_TOP;\n- protected $priority = 150;\n- protected $template = '@bolt/widgets/news.twig';\n- protected $zone = RequestZone::BACKEND;\n- protected $cacheDuration = 3600;\n-\n- protected function run(array $params = []): ?string\n- {\n- $news = $this->getNews();\n-\n- if (isset($news['information'])) {\n- $currentItem = $news['information'];\n- } else {\n- $currentItem = $news['error'];\n- }\n-\n- $context = [\n- 'title' => $currentItem['title'],\n- 'news' => $currentItem['teaser'],\n- 'link' => $currentItem['link'],\n- 'datechanged' => $currentItem['datechanged'],\n- 'datefetched' => date('Y-m-d H:i:s'),\n- ];\n-\n- return parent::run($context);\n- }\n-\n- /**\n- * Get the news from Bolt HQ.\n- */\n- private function getNews(): array\n- {\n- $source = 'https://news.bolt.cm/';\n- $options = $this->fetchNewsOptions();\n-\n- // $this->app['logger.system']->info('Fetching from remote server: ' . $source, ['event' => 'news']);\n-\n- try {\n- $client = new Client(['base_uri' => $source]);\n- $fetchedNewsData = $client->request('GET', '/', $options)->getBody()->getContents();\n- } catch (RequestException $e) {\n- return [\n- 'error' => [\n- 'type' => 'error',\n- 'title' => 'Unable to fetch news!',\n- 'teaser' => \"<p>Unable to connect to ${source}</p>\",\n- 'link' => null,\n- 'datechanged' => '0000-01-01 00:00:00',\n- ],\n- ];\n- }\n-\n- try {\n- $fetchedNewsItems = Json::parse($fetchedNewsData);\n- } catch (ParseException $e) {\n- // Just move on, a user-friendly notice is returned below.\n- $fetchedNewsItems = [];\n- }\n-\n- $news = [];\n-\n- // Iterate over the items, pick the first news-item that\n- // applies and the first alert we need to show\n- foreach ($fetchedNewsItems as $item) {\n- $type = isset($item->type) ? $item->type : 'information';\n- if (! isset($news[$type])\n- && (empty($item->target_version) || Version::compare($item->target_version, '>'))\n- ) {\n- $news[$type] = $item;\n- }\n- }\n-\n- if ($news) {\n- return $news;\n- }\n-\n- // $this->app['logger.system']->error('Invalid JSON feed returned', ['event' => 'news']);\n-\n- return [\n- 'error' => [\n- 'type' => 'error',\n- 'title' => 'Unable to fetch news!',\n- 'teaser' => \"<p>Invalid JSON feed returned by ${source}</p>\",\n- ],\n- ];\n- }\n-\n- /**\n- * Get the guzzle options.\n- */\n- private function fetchNewsOptions(): array\n- {\n- // @todo Determine current database driver\n- $driver = 'unknown';\n-\n- return [\n- 'query' => [\n- 'v' => Version::VERSION,\n- 'p' => PHP_VERSION,\n- 'db' => $driver,\n- 'name' => $this->getRequest()->getHost(),\n- ],\n- 'connect_timeout' => 5,\n- 'timeout' => 10,\n- ];\n- }\n-}\n" }, { "change_type": "MODIFY", "old_path": "symfony.lock", "new_path": "symfony.lock", "diff": "\"bolt/common\": {\n\"version\": \"v1.1.0\"\n},\n+ \"bolt/newswidget\": {\n+ \"version\": \"1.0.0\"\n+ },\n\"clue/stream-filter\": {\n\"version\": \"v1.4.0\"\n},\n" }, { "change_type": "DELETE", "old_path": "templates/widgets/news.twig", "new_path": null, "diff": "-<div class=\"card mb-4\">\n- <div class=\"card-body\">\n- <h5 class=\"card-title\"><i class=\"far fa-newspaper\"></i> &nbsp; {{ __('general.latest_bolt_news') }}</h5>\n- <p><strong>{{ title|raw }}</strong></p>\n- {{ news|raw }}\n- </div>\n-</div>\n\\ No newline at end of file\n" } ]
PHP
MIT License
bolt/core
Removing News Widget, moving to standalone extension
95,144
03.08.2019 17:25:10
-7,200
d3526b3517281b68399fcf1945508a057422a6c9
Bumping composer.json
[ { "change_type": "MODIFY", "old_path": "composer.json", "new_path": "composer.json", "diff": "\"behat/mink-goutte-driver\": \"^1.2\",\n\"behatch/contexts\": \"^3.2\",\n\"bobdenotter/weatherwidget\": \"dev-master\",\n- \"bolt/newswidget\": \"^1.0\",\n+ \"bolt/newswidget\": \"^1.0.1\",\n\"coduo/php-matcher\": \"^3.2\",\n\"dama/doctrine-test-bundle\": \"^5.0\",\n\"doctrine/doctrine-fixtures-bundle\": \"^3.1\",\n" }, { "change_type": "MODIFY", "old_path": "symfony.lock", "new_path": "symfony.lock", "diff": "\"version\": \"v1.1.0\"\n},\n\"bolt/newswidget\": {\n- \"version\": \"1.0.0\"\n+ \"version\": \"1.0.1\"\n},\n\"clue/stream-filter\": {\n\"version\": \"v1.4.0\"\n" } ]
PHP
MIT License
bolt/core
Bumping composer.json
95,179
04.08.2019 12:41:38
-7,200
005c57caf5980ef7dd1a3c352a13a7c38b25e7f5
Hu location available
[ { "change_type": "MODIFY", "old_path": "config/bolt/contenttypes.yaml", "new_path": "config/bolt/contenttypes.yaml", "diff": "@@ -41,7 +41,7 @@ homepage:\ngroup: meta\nviewless: true\ntaxonomy: [ categories, tags, foobars ]\n- locales: ['en', 'nl', 'pt_BR', 'es']\n+ locales: ['en', 'nl', 'pt_BR', 'es', 'hu']\nsingleton: true\ndefault_status: published\nicon_many: \"fa:home\"\n" }, { "change_type": "MODIFY", "old_path": "config/packages/translation.yaml", "new_path": "config/packages/translation.yaml", "diff": "@@ -8,7 +8,7 @@ framework:\ntranslation:\nwebui:\nenabled: true\n- locales: ['en', 'nl', 'es', 'fr', 'de', 'pl', 'it', 'pt_BR']\n+ locales: ['en', 'nl', 'es', 'fr', 'de', 'pl', 'it', 'hu', 'pt_BR']\nedit_in_place:\nenabled: false\nconfigs:\n" }, { "change_type": "MODIFY", "old_path": "config/services.yaml", "new_path": "config/services.yaml", "diff": "parameters:\nlocale: 'en'\n# This parameter defines the codes of the locales (languages) enabled in the application\n- app_locales: en|nl|nl_NL|nl_BE|es|fr|de|pl|it|pt_BR\n+ app_locales: en|nl|nl_NL|nl_BE|es|fr|de|pl|it|hu|pt_BR\napp.notifications.email_sender: anonymous@example.com\ndoctrine.orm.entity_manager.class: Bolt\\Doctrine\\TranslatableEntityManager\nstof_doctrine_extensions.listener.translatable.class: Bolt\\Event\\Listener\\PreTranslatableListener\n" } ]
PHP
MIT License
bolt/core
Hu location available
95,168
05.08.2019 09:35:58
-7,200
4411f15da13fba4a1b7dbc0f27f3edf2b4aee7cf
Generate Url using path() when clearing the sort/filter
[ { "change_type": "MODIFY", "old_path": "templates/content/listing.html.twig", "new_path": "templates/content/listing.html.twig", "diff": "<div class=\"form-group\">\n<button class=\"btn btn-tertiary\" type=\"submit\">Filter</button>\n{% if sortBy is not empty or filterValue is not empty %}\n- <a class=\"btn btn-danger\" href=\"?\"><i class=\"fa fa-close\"></i> Clear sort/filter</a>\n+ <a class=\"btn btn-danger\" href=\"{{ path('bolt_content_overview', {'contentType': contentType.slug}) }}\"><i class=\"fa fa-close\"></i> Clear sort/filter</a>\n{% endif %}\n</div>\n</form>\n" } ]
PHP
MIT License
bolt/core
Generate Url using path() when clearing the sort/filter
95,168
05.08.2019 09:43:35
-7,200
010269a1d27162bf83f86d0e3213c80c508398c5
Make use of type hint in findForListing function
[ { "change_type": "MODIFY", "old_path": "src/Repository/ContentRepository.php", "new_path": "src/Repository/ContentRepository.php", "diff": "@@ -34,7 +34,7 @@ class ContentRepository extends ServiceEntityRepository\nreturn $this->createQueryBuilder('content');\n}\n- public function findForListing(int $page, int $amountPerPage, ?ContentType $contentType = null, bool $onlyPublished = true, string $sortBy = '', string $filter = '')\n+ public function findForListing(int $page, int $amountPerPage, ?ContentType $contentType = null, bool $onlyPublished = true, string $sortBy = '', string $filter = ''): Pagerfanta\n{\n$qb = $this->getQueryBuilder()\n->addSelect('a')\n" } ]
PHP
MIT License
bolt/core
Make use of type hint in findForListing function
95,179
05.08.2019 11:31:16
-7,200
bf9b387b1430d97dc7a48a67f1e203772efc8e44
WIP localizing templates
[ { "change_type": "MODIFY", "old_path": "assets/js/app/editor/Components/Editor/Image/Image.vue", "new_path": "assets/js/app/editor/Components/Editor/Image/Image.vue", "diff": "<div class=\"btn-toolbar\" role=\"toolbar\">\n<div class=\"btn-group mr-2\" role=\"group\">\n<button type=\"button\" class=\"btn btn-secondary\" @click=\"selectFile\">\n- <i class=\"fas fa-fw fa-upload\"></i> Upload\n+ <i class=\"fas fa-fw fa-upload\"></i>{{ labels.button_upload }}\n</button>\n</div>\n<div class=\"btn-group mr-2\" role=\"group\">\n<button type=\"button\" class=\"btn btn-secondary\">\n- <i class=\"fas fa-fw fa-th\"></i> From Library\n+ <i class=\"fas fa-fw fa-th\"></i> {{ labels.button_from_library }}\n</button>\n</div>\n</div>\n@@ -104,6 +104,7 @@ export default {\n'directory',\n'media',\n'csrf_token',\n+ 'labels',\n],\ndata: () => {\nreturn {\n" }, { "change_type": "MODIFY", "old_path": "assets/js/app/editor/Components/Editor/Slug/Slug.vue", "new_path": "assets/js/app/editor/Components/Editor/Slug/Slug.vue", "diff": "<div class=\"dropdown-menu\">\n<a class=\"dropdown-item\" @click=\"editSlug\">\n<template v-if=\"!edit\">\n- <i class=\"fas fa-pencil-alt fa-fw\"></i> Edit\n+ <i class=\"fas fa-pencil-alt fa-fw\"></i> {{ labels.button_edit }}\n</template>\n<template v-else>\n- <i class=\"fas fa-lock fa-fw\"></i> Lock\n+ <i class=\"fas fa-lock fa-fw\"></i> {{ labels.button_locked }}\n</template>\n</a>\n<a class=\"dropdown-item\" @click=\"generateSlug()\">\n- <i class=\"fas fa-link fa-fw\"></i> Generate from: {{ generate }}\n+ <i class=\"fas fa-link fa-fw\"></i> {{ labels.generate_from }} {{ generate }}\n</a>\n</div>\n</div>\n@@ -48,7 +48,7 @@ import field from '../../../mixins/value';\nexport default {\nname: 'EditorSlug',\nmixins: [field],\n- props: ['value', 'label', 'name', 'prefix', 'fieldClass', 'generate'],\n+ props: ['value', 'label', 'name', 'prefix', 'fieldClass', 'generate', 'labels'],\ndata: () => {\nreturn {\nedit: false,\n@@ -66,19 +66,20 @@ export default {\n}\n}, 0);\nthis.$root.$on('slugify-from-title', () => this.generateSlug());\n+ this.buttonText = this.$props.labels.button_locked;\n},\nmethods: {\neditSlug() {\nthis.$root.$emit('generate-from-title', false);\nif (!this.edit) {\nthis.edit = true;\n- this.buttonText = 'Edit';\n+ this.buttonText = this.$props.labels.button_edit;\nthis.icon = 'pencil-alt';\n} else {\nconst slug = this.$options.filters.slugify(this.val);\nthis.val = slug;\nthis.edit = false;\n- this.buttonText = 'Locked';\n+ this.buttonText = this.$props.labels.button_locked;\nthis.icon = 'lock';\n}\n},\n@@ -91,7 +92,7 @@ export default {\nthis.$root.$emit('generate-from-title', true);\nthis.edit = false;\n- this.buttonText = 'Locked';\n+ this.buttonText = this.$props.labels.button_locked;\nthis.icon = 'lock';\n},\n},\n" }, { "change_type": "MODIFY", "old_path": "assets/js/app/toolbar/Components/Toolbar.vue", "new_path": "assets/js/app/toolbar/Components/Toolbar.vue", "diff": "<li>\n<a href=\"https://bolt.cm/\" target=\"_blank\">\n<i class=\"fas fa-globe-americas fa-fw\"></i>\n- Visit Bolt.cm\n+ {{ labels['about.visit_bolt'] }}\n</a>\n</li>\n<li>\n" }, { "change_type": "MODIFY", "old_path": "templates/_base/layout.html.twig", "new_path": "templates/_base/layout.html.twig", "diff": "'action.create_new': 'action.create_new'|trans,\n'general.greeting': 'general.greeting'|trans({'%name%': user_display_name}),\n'action.logout': 'action.logout'|trans,\n- 'action.edit_profile': 'action.edit_profile'|trans\n+ 'action.edit_profile': 'action.edit_profile'|trans,\n+ 'about.visit_bolt': 'about.visit_bolt'|trans\n}|json_encode %}\n<admin-toolbar\n" }, { "change_type": "MODIFY", "old_path": "templates/_partials/fields/image.html.twig", "new_path": "templates/_partials/fields/image.html.twig", "diff": "{% block field %}\n{% set setPath = field.definition.get('upload')|default('') %}\n{% set directory = path('bolt_async_upload', {'location': location|default('files'), 'path': setPath}) %}\n+ {% set labels = {\n+ 'button_upload': 'image.button_upload'|trans,\n+ 'button_from_library': 'image.button_from_library'|trans,\n+ }|json_encode %}\n<editor-image\n:name='{{ name|json_encode }}'\n:filename='{{ field.get('filename')|json_encode }}'\n:media='{{ field.get('media')|json_encode }}'\n:directory='{{ directory|json_encode }}'\n:csrf_token='{{ csrf_token('upload')|json_encode }}'\n+ :labels='{{ labels }}'\n></editor-image>\n{% endblock %}\n" }, { "change_type": "MODIFY", "old_path": "templates/_partials/fields/slug.html.twig", "new_path": "templates/_partials/fields/slug.html.twig", "diff": ":prefix='{{ field.slugPrefix|json_encode }}'\n:field-class='{{ class|json_encode }}'\n:generate='{{ field.slugUseFields|join(', ')|json_encode }}'\n+ :labels='{{ {\n+ 'button_locked': 'slug.button_locked'|trans,\n+ 'button_edit': 'slug.button_edit'|trans,\n+ 'generate_from': 'slug.generate_from'|trans,\n+ }|json_encode }}'\n></editor-slug>\n{% endblock %}\n\\ No newline at end of file\n" } ]
PHP
MIT License
bolt/core
WIP localizing templates
95,179
05.08.2019 11:32:54
-7,200
f04c373b5edf902217b93b737f45009ce21ba3c3
Hu translation in progress
[ { "change_type": "MODIFY", "old_path": "translations/security.hu.xlf", "new_path": "translations/security.hu.xlf", "diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<xliff xmlns=\"urn:oasis:names:tc:xliff:document:1.2\" version=\"1.2\">\n- <file source-language=\"hu\" target-language=\"hu\" datatype=\"plaintext\" original=\"file.ext\">\n+ <file source-language=\"en\" target-language=\"hu\" datatype=\"plaintext\" original=\"file.ext\">\n<header>\n<tool tool-id=\"symfony\" tool-name=\"Symfony\"/>\n</header>\n" }, { "change_type": "MODIFY", "old_path": "translations/validators.hu.xlf", "new_path": "translations/validators.hu.xlf", "diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<xliff xmlns=\"urn:oasis:names:tc:xliff:document:1.2\" version=\"1.2\">\n- <file source-language=\"hu\" target-language=\"hu\" datatype=\"plaintext\" original=\"file.ext\">\n+ <file source-language=\"en\" target-language=\"hu\" datatype=\"plaintext\" original=\"file.ext\">\n<header>\n<tool tool-id=\"symfony\" tool-name=\"Symfony\"/>\n</header>\n" } ]
PHP
MIT License
bolt/core
Hu translation in progress
95,179
05.08.2019 11:33:53
-7,200
0167090a847e0255f5a5896feffa2a471df2fa6b
Get in Vue oriented component xlation
[ { "change_type": "MODIFY", "old_path": "assets/js/app/listing/Components/Records.vue", "new_path": "assets/js/app/listing/Components/Records.vue", "diff": "<script>\nexport default {\nname: 'ListingRecords',\n- props: ['type', 'data'],\n+ props: ['type', 'data', 'labels'],\ncreated() {\nthis.$store.dispatch('general/setType', this.type);\nthis.$store.dispatch('listing/setRecords', this.data);\n" }, { "change_type": "MODIFY", "old_path": "assets/js/app/listing/Components/Table/Row/_Actions.vue", "new_path": "assets/js/app/listing/Components/Table/Row/_Actions.vue", "diff": "<div class=\"edit-actions__dropdown dropdown-menu dropdown-menu-right\" style=\"width: 320px;\">\n<a v-if=\"record.status === 'published'\" class=\"dropdown-item\" :href=\"record.extras.link\" target=\"_blank\">\n<i class=\"fas fa-w fa-external-link-square-alt\"></i>\n- View on Site\n+ {{ label('view_on_site') }}\n</a>\n<a v-if=\"record.status !== 'published'\" class=\"dropdown-item\" :href=\"record.extras.statusLink + '&status=published'\">\n<span class=\"status mr-1 is-published\"></span>\nexport default {\nname: 'Actions',\nprops: ['type', 'record'],\n+ methods: {\n+ label(lbl) {\n+ return 'View on sssite';\n+ },\n+ }\n};\n</script>\n" }, { "change_type": "MODIFY", "old_path": "templates/_partials/_content_listing.html.twig", "new_path": "templates/_partials/_content_listing.html.twig", "diff": "<listing-records\ntype=\"{{ type }}\"\n:data=\"{{ records|json_records }}\"\n+ :labels=\"{{ { 'actions__view_on_site': 'content_listing.actions.view_on_site'|trans }|json_encode }}\"\n>\n</listing-records>\n<!-- end listing records -->\n" } ]
PHP
MIT License
bolt/core
Get in Vue oriented component xlation
95,144
05.08.2019 11:52:50
-7,200
3e99fc5f2212a30f9cdc2561afbc7c62aa820eda
Use 'Types::get' to avoid needing try/catch
[ { "change_type": "MODIFY", "old_path": "src/Extension/ExtensionRegistry.php", "new_path": "src/Extension/ExtensionRegistry.php", "diff": "@@ -24,14 +24,7 @@ class ExtensionRegistry\nprivate function addComposerPackages(): void\n{\n- // We do a try/catch here, instead of using `method_exists`. This is\n- // because PHPStan is being a smart-ass, and takes the state of the\n- // generated `Types` class into account. And that's exactly the point.\n- try {\n- $packages = Types::boltExtension();\n- } catch (\\Throwable $e) {\n- $packages = [];\n- }\n+ $packages = Types::get('bolt-extension');\n/** @var PackageInterface $package */\nforeach ($packages as $package) {\n" } ]
PHP
MIT License
bolt/core
Use 'Types::get' to avoid needing try/catch
95,179
05.08.2019 15:02:32
-7,200
cb1e4b2ea6d0f658a50a1f58eca32b1846806997
Listing components translations
[ { "change_type": "MODIFY", "old_path": "assets/js/app/listing/Components/SelectBox.vue", "new_path": "assets/js/app/listing/Components/SelectBox.vue", "diff": "<script>\nexport default {\nname: 'ListingSelectedBox',\n- props: ['singular', 'plural'],\n+ props: ['singular', 'plural', 'labels'],\ncomputed: {\nselectedCount() {\nreturn this.$store.getters['selecting/selectedCount'];\n" }, { "change_type": "MODIFY", "old_path": "assets/js/app/listing/Components/Table/Row/_Actions.vue", "new_path": "assets/js/app/listing/Components/Table/Row/_Actions.vue", "diff": "<div class=\"edit-actions__dropdown dropdown-menu dropdown-menu-right\" style=\"width: 320px;\">\n<a v-if=\"record.status === 'published'\" class=\"dropdown-item\" :href=\"record.extras.link\" target=\"_blank\">\n<i class=\"fas fa-w fa-external-link-square-alt\"></i>\n- {{ label('view_on_site') }}\n+ {{ labels.view_on_site }}\n</a>\n<a v-if=\"record.status !== 'published'\" class=\"dropdown-item\" :href=\"record.extras.statusLink + '&status=published'\">\n<span class=\"status mr-1 is-published\"></span>\n- Change status to 'publish'\n+ {{ labels.status_to_publish }}\n</a>\n<a v-if=\"record.status !== 'held'\" class=\"dropdown-item\" :href=\"record.extras.statusLink + '&status=held'\">\n<span class=\"status mr-1 is-held\"></span>\n- Change status to 'held'\n+ {{ labels.status_to_held }}\n</a>\n<a v-if=\"record.status !== 'draft'\" class=\"dropdown-item\" :href=\"record.extras.statusLink + '&status=draft'\">\n<span class=\"status mr-1 is-draft\"></span>\n- Change status to 'draft'\n+ {{ labels.status_to_draft }}\n</a>\n<a class=\"dropdown-item\" :href=\"record.extras.duplicateLink\">\n<i class=\"far fa-w fa-copy\"></i>\n- Duplicate {{ record.extras.singular_name }}\n+ {{ labels.duplicate }} {{ record.extras.singular_name }}\n</a>\n<a class=\"dropdown-item\" :href=\"record.extras.deleteLink\" data-confirmation=\"Are you sure you wish to delete this Content?\">\n<i class=\"fas fa-w fa-trash\"></i>\n- Delete {{ record.extras.singular_name }}\n+ {{ labels.delete }} {{ record.extras.singular_name }}\n</a>\n<div class=\"dropdown-divider\"></div>\n<span class=\"dropdown-item-text\">\n<i class=\"fas fa-link fa-w\"></i>\n- Slug: <code :title=\"record.fieldValues.slug\">{{ record.fieldValues.slug|trim(24) }}</code>\n+ {{ labels.slug }}: <code :title=\"record.fieldValues.slug\">{{ record.fieldValues.slug|trim(24) }}</code>\n</span>\n<span class=\"dropdown-item-text\">\n<i class=\"fas fa-asterisk fa-w\"></i>\n- Created on: <strong>{{ record.createdAt|datetime }}</strong>\n+ {{ labels.created_on }}: <strong>{{ record.createdAt|datetime }}</strong>\n</span>\n<span class=\"dropdown-item-text\">\n<i class=\"far fa-calendar-alt fa-w\"></i>\n- Published on: <strong>{{ record.publishedAt|datetime }}</strong>\n+ {{ labels.published_on }}: <strong>{{ record.publishedAt|datetime }}</strong>\n</span>\n<span class=\"dropdown-item-text\">\n<i class=\"fas fa-redo fa-w\"></i>\n- Last modified on: <strong>{{ record.modifiedAt|datetime }}</strong>\n+ {{ labels.last_modified_on }}: <strong>{{ record.modifiedAt|datetime }}</strong>\n</span>\n</div>\n</div>\n<script>\nexport default {\nname: 'Actions',\n- props: ['type', 'record'],\n- methods: {\n- label(lbl) {\n- return 'View on sssite';\n+ props: ['type', 'record', 'labels'],\n+ created() {\n+ console.log(this.labels);\n},\n- }\n};\n</script>\n" }, { "change_type": "MODIFY", "old_path": "assets/js/app/listing/Components/Table/Row/index.vue", "new_path": "assets/js/app/listing/Components/Table/Row/index.vue", "diff": ":type=\"type\"\n:record=\"record\"\n:size=\"size\"\n+ :labels=\"labels['actions']\"\n></row-actions>\n<!-- end column -->\n@@ -73,13 +74,7 @@ export default {\n'row-sorting': Sorting,\n},\nmixins: [type],\n- props: ['record'],\n- methods: {\n- leave(event) {\n- // When we 'leave' the row, make sure we close the dropdown.\n- $('.dropdown-toggle[aria-expanded=\"true\"').dropdown('toggle');\n- },\n- },\n+ props: ['record', 'labels'],\ncomputed: {\nsize() {\nreturn this.$store.getters['general/getRowSize'];\n@@ -88,5 +83,11 @@ export default {\nreturn this.$store.getters['general/getSorting'];\n},\n},\n+ methods: {\n+ leave(event) {\n+ // When we 'leave' the row, make sure we close the dropdown.\n+ $('.dropdown-toggle[aria-expanded=\"true\"').dropdown('toggle');\n+ },\n+ },\n};\n</script>\n" }, { "change_type": "MODIFY", "old_path": "assets/js/app/listing/Components/Table/index.vue", "new_path": "assets/js/app/listing/Components/Table/index.vue", "diff": "v-for=\"record in records\"\n:key=\"record.id\"\n:record=\"record\"\n+ :labels=\"labels\"\n></table-row>\n</transition-group>\n</draggable>\n@@ -20,6 +21,7 @@ export default {\ndraggable: draggable,\n'table-row': Row,\n},\n+ props: ['labels'],\ndata: () => {\nreturn {\ndraggableOptions: {\n" }, { "change_type": "MODIFY", "old_path": "templates/_partials/_content_listing.html.twig", "new_path": "templates/_partials/_content_listing.html.twig", "diff": "<listing-records\ntype=\"{{ type }}\"\n:data=\"{{ records|json_records }}\"\n- :labels=\"{{ { 'actions__view_on_site': 'content_listing.actions.view_on_site'|trans }|json_encode }}\"\n>\n</listing-records>\n<!-- end listing records -->\n<listing-filter></listing-filter>\n<!-- end listing filter -->\n- <listing-table ></listing-table>\n+ <listing-table\n+ :labels=\"{{\n+ { 'actions':\n+ {\n+ 'view_on_site': 'listing_table.actions.view_on_site'|trans,\n+ 'status_to_publish': 'listing_table.actions.status_to_publish'|trans,\n+ 'status_to_held': 'listing_table.actions.status_to_held'|trans,\n+ 'status_to_draft': 'listing_table.actions.status_to_draft'|trans,\n+ 'status_to_publish': 'listing_table.actions.status_to_publish'|trans,\n+ 'duplicate': 'listing_table.actions.duplicate'|trans,\n+ 'delete': 'listing_table.actions.delete'|trans,\n+ 'slug': 'listing_table.actions.slug'|trans,\n+ 'created_on': 'listing_table.actions.created_on'|trans,\n+ 'published_on': 'listing_table.actions.published_on'|trans,\n+ 'last_modified_on': 'listing_table.actions.last_modified_on'|trans,\n+ }\n+ }|json_encode }}\"\n+ ></listing-table>\n<nav class=\"listing__filter\">\n{% include '@bolt/_partials/_pager.html.twig' with { 'records': records } %}\n" }, { "change_type": "MODIFY", "old_path": "templates/content/listing.html.twig", "new_path": "templates/content/listing.html.twig", "diff": "<listing-select-box\nplural=\"{{ contentType.name }}\"\nsingular=\"{{ contentType.singular_name }}\"\n+ labels=\"{{\n+ { }|json_encode\n+ }}\"\n></listing-select-box>\n<div class=\"card\">\n" }, { "change_type": "MODIFY", "old_path": "translations/messages.en.xlf", "new_path": "translations/messages.en.xlf", "diff": "<source>action.add_user</source>\n<target>Add User</target>\n</trans-unit>\n- <trans-unit id=\"ruQIhH0\" resname=\"success\">\n- <source>success</source>\n- <target>Success!</target>\n- </trans-unit>\n<trans-unit id=\"YDH.7uR\" resname=\"user.updated_profile\">\n<source>user.updated_profile</source>\n<target>User Profile has been updated!</target>\n<source>image.button_from_library</source>\n<target>From library</target>\n</trans-unit>\n+ <trans-unit id=\"L0TE0M9\" resname=\"listing_table.actions.view_on_site\">\n+ <source>listing_table.actions.view_on_site</source>\n+ <target>View on Site</target>\n+ </trans-unit>\n+ <trans-unit id=\"PoauAuK\" resname=\"listing_table.actions.status_to_publish\">\n+ <source>listing_table.actions.status_to_publish</source>\n+ <target>Change status to 'publish'</target>\n+ </trans-unit>\n+ <trans-unit id=\"ZJxfdD6\" resname=\"listing_table.actions.status_to_held\">\n+ <source>listing_table.actions.status_to_held</source>\n+ <target>Change status to 'held'</target>\n+ </trans-unit>\n+ <trans-unit id=\"apyOs0o\" resname=\"listing_table.actions.status_to_draft\">\n+ <source>listing_table.actions.status_to_draft</source>\n+ <target>Change status to 'draft'</target>\n+ </trans-unit>\n+ <trans-unit id=\"5H60Xq6\" resname=\"listing_table.actions.duplicate\">\n+ <source>listing_table.actions.duplicate</source>\n+ <target>Duplicate</target>\n+ </trans-unit>\n+ <trans-unit id=\"hR8ri.m\" resname=\"listing_table.actions.delete\">\n+ <source>listing_table.actions.delete</source>\n+ <target>Delete</target>\n+ </trans-unit>\n+ <trans-unit id=\"5zbX1vo\" resname=\"listing_table.actions.slug\">\n+ <source>listing_table.actions.slug</source>\n+ <target>Slug</target>\n+ </trans-unit>\n+ <trans-unit id=\"wKDOBOC\" resname=\"listing_table.actions.created_on\">\n+ <source>listing_table.actions.created_on</source>\n+ <target>Created on</target>\n+ </trans-unit>\n+ <trans-unit id=\"tVX01Xl\" resname=\"listing_table.actions.published_on\">\n+ <source>listing_table.actions.published_on</source>\n+ <target>Published on</target>\n+ </trans-unit>\n+ <trans-unit id=\"kHkjS5U\" resname=\"listing_table.actions.last_modified_on\">\n+ <source>listing_table.actions.last_modified_on</source>\n+ <target>Last modified on</target>\n+ </trans-unit>\n</body>\n</file>\n</xliff>\n" } ]
PHP
MIT License
bolt/core
Listing components translations
95,179
05.08.2019 16:50:32
-7,200
cd5a23886430ee535341b7c35cb6db3541be20cd
Add listing-select-box labels
[ { "change_type": "MODIFY", "old_path": "assets/js/app/listing/Components/SelectBox.vue", "new_path": "assets/js/app/listing/Components/SelectBox.vue", "diff": "<span class=\"badge is-primary mr-1\">{{ selectedCount }}</span>\n<template v-if=\"selectedCount === 1\">{{ singular }}</template>\n<template v-else>{{ plural }}</template>\n- Selected\n+ {{ labels.card_header.selected }}\n</div>\n<div class=\"card-body\">\n- <h4>selected record ids passed</h4>\n+ <h4>{{ labels.card_body.records_passed }}</h4>\n<p>\n- <em\n- >(these can be used with something like axios to bulk\n- modify/delete)</em\n- >\n+ <em>{{ labels.card_body.remark }}</em>\n</p>\n<pre>\n<code>{{selected}}</code>\n" }, { "change_type": "MODIFY", "old_path": "templates/content/listing.html.twig", "new_path": "templates/content/listing.html.twig", "diff": "plural=\"{{ contentType.name }}\"\nsingular=\"{{ contentType.singular_name }}\"\nlabels=\"{{\n- { }|json_encode\n- }}\"\n+ { 'card_header':\n+ { 'selected': 'listing_select_box.card_header.selected'|trans },\n+ 'card_body':\n+ {\n+ 'records_passed': 'listing_select_box.card_body.records_passed'|trans,\n+ 'remark': 'listing_select_box.card_body.remark'|trans,\n+ }\n+ }|json_encode }}\"\n></listing-select-box>\n{% set filterOptions = {'id': \"Id\", 'title': 'Title', 'Author': 'Author', 'status': 'Status', 'createdAt': 'Created date', 'modifiedAt': 'Modified date', 'publishedAt': 'Published date', 'depublishedAt': 'Depublished date'} %}\n" }, { "change_type": "MODIFY", "old_path": "translations/messages.en.xlf", "new_path": "translations/messages.en.xlf", "diff": "<source>action.add_user</source>\n<target>Add User</target>\n</trans-unit>\n+ <trans-unit id=\"ruQIhH0\" resname=\"success\">\n+ <source>success</source>\n+ <target>Success!</target>\n+ </trans-unit>\n<trans-unit id=\"YDH.7uR\" resname=\"user.updated_profile\">\n<source>user.updated_profile</source>\n<target>User Profile has been updated!</target>\n<trans-unit id=\"kHkjS5U\" resname=\"listing_table.actions.last_modified_on\">\n<source>listing_table.actions.last_modified_on</source>\n<target>Last modified on</target>\n+ <trans-unit id=\"BdhsE_X\" resname=\"listing_select_box.card_header.selected\">\n+ <source>listing_select_box.card_header.selected</source>\n+ <target>Selected</target>\n+ </trans-unit>\n+ <trans-unit id=\"jBpmj90\" resname=\"listing_select_box.card_body.records_passed\">\n+ <source>listing_select_box.card_body.records_passed</source>\n+ <target>selected record ids passed</target>\n+ </trans-unit>\n+ <trans-unit id=\"D8vDkhK\" resname=\"listing_select_box.card_body.remark\">\n+ <source>listing_select_box.card_body.remark</source>\n+ <target>(these can be used with something like axios to bulk modify/delete)</target>\n</trans-unit>\n</body>\n</file>\n" } ]
PHP
MIT License
bolt/core
Add listing-select-box labels
95,179
05.08.2019 21:47:21
-7,200
bc28529926ac14c501442615bd36fa519029f1c1
editor-embed xlate added
[ { "change_type": "MODIFY", "old_path": "templates/_partials/fields/embed.html.twig", "new_path": "templates/_partials/fields/embed.html.twig", "diff": ":authorurl='{{ field.get('authorurl')|json_encode }}'\n:html='{{ field.get('html')|json_encode }}'\n:thumbnail='{{ field.get('thumbnail')|json_encode }}'\n+ :labels=\"{{ {\n+ 'content_url': 'editor_embed.content_url'|trans,\n+ 'placeholder_content_url': 'editor_embed.placeholder_content_url'|trans,\n+ 'label_height': 'editor_embed.label_height'|trans,\n+ 'label_pixel': 'editor_embed.label_pixel'|trans,\n+ 'label_matched_embed': 'editor_embed.label_matched_embed'|trans,\n+ 'label_preview': 'editor_embed.label_preview'|trans,\n+ 'label_size': 'editor_embed.label_size'|trans,\n+ }|json_encode }}\"\n></editor-embed>\n{% endblock %}\n" } ]
PHP
MIT License
bolt/core
editor-embed xlate added
95,179
05.08.2019 22:02:52
-7,200
44873eb36cbbd3030b345e8a081efc11facb6f2c
editor-image placeholder texts
[ { "change_type": "MODIFY", "old_path": "assets/js/app/editor/Components/Editor/Image/Image.vue", "new_path": "assets/js/app/editor/Components/Editor/Image/Image.vue", "diff": ":name=\"name + '[filename]'\"\ntype=\"text\"\nclass=\"form-control\"\n- placeholder=\"filename\"\n+ :placeholder=\"labels.placeholder_filename\"\n:value=\"filename\"\n/>\n</div>\n:name=\"name + '[alt]'\"\ntype=\"text\"\nclass=\"form-control\"\n- placeholder=\"alt text\"\n+ :placeholder=\"labels.placeholder_alt_text\"\n:value=\"alt\"\n/>\n</div>\n:name=\"name + '[title]'\"\ntype=\"text\"\nclass=\"form-control\"\n- placeholder=\"title\"\n+ :placeholder=\"labels.placeholder_title\"\n:value=\"title\"\n/>\n</div>\n" }, { "change_type": "MODIFY", "old_path": "templates/_partials/fields/image.html.twig", "new_path": "templates/_partials/fields/image.html.twig", "diff": "{% set labels = {\n'button_upload': 'image.button_upload'|trans,\n'button_from_library': 'image.button_from_library'|trans,\n+ 'placeholder_filename': 'image.placeholder_filename'|trans,\n+ 'placeholder_alt_text': 'image.placeholder_alt_text'|trans,\n+ 'placeholder_title': 'image.placeholder_title'|trans,\n}|json_encode %}\n<editor-image\n:name='{{ name|json_encode }}'\n" }, { "change_type": "MODIFY", "old_path": "translations/messages.en.xlf", "new_path": "translations/messages.en.xlf", "diff": "<source>editor_embed.label_size</source>\n<target>Size</target>\n</trans-unit>\n+ <trans-unit id=\"oOuVKRv\" resname=\"image.placeholder_filename\">\n+ <source>image.placeholder_filename</source>\n+ <target>Filename</target>\n+ </trans-unit>\n+ <trans-unit id=\"BWubOnS\" resname=\"image.placeholder_alt_text\">\n+ <source>image.placeholder_alt_text</source>\n+ <target>ALt text</target>\n+ </trans-unit>\n+ <trans-unit id=\"VPV0lFM\" resname=\"image.placeholder_title\">\n+ <source>image.placeholder_title</source>\n+ <target>Title</target>\n+ </trans-unit>\n</body>\n</file>\n</xliff>\n" } ]
PHP
MIT License
bolt/core
editor-image placeholder texts
95,179
05.08.2019 22:20:18
-7,200
1bdea53fb3bcf9d971baee8352f57fe510b7c6e9
admin-sidebar xlation added
[ { "change_type": "MODIFY", "old_path": "assets/js/app/sidebar/Components/_SidebarToggler.vue", "new_path": "assets/js/app/sidebar/Components/_SidebarToggler.vue", "diff": "<template>\n<button class=\"admin__sidebar--slim\" @click=\"slimSidebar(!slim)\">\n<i class=\"fas fa-exchange-alt\"></i>\n- <span class=\"sr-only\">Toggle sidebar width</span>\n+ <span class=\"sr-only\">{{ labels.toggler }}</span>\n</button>\n</template>\n<script>\nexport default {\nname: 'SidebarFooter',\n- props: ['version', 'aboutLink'],\n+ props: ['version', 'aboutLink', 'labels'],\ncomputed: {\nslim() {\nreturn this.$store.getters['general/slimSidebar'];\n" }, { "change_type": "MODIFY", "old_path": "translations/messages.en.xlf", "new_path": "translations/messages.en.xlf", "diff": "<source>image.placeholder_title</source>\n<target>Title</target>\n</trans-unit>\n+ <trans-unit id=\"Gabafxx\" resname=\"admin_sidebar.toggler\">\n+ <source>admin_sidebar.toggler</source>\n+ <target>Toggle sidebar width</target>\n+ </trans-unit>\n</body>\n</file>\n</xliff>\n" } ]
PHP
MIT License
bolt/core
admin-sidebar xlation added
95,179
05.08.2019 22:41:26
-7,200
6af3de4921718b8e48f721cd213d76f04cac94e1
Some toggler xlates
[ { "change_type": "MODIFY", "old_path": "assets/js/app/editor/Components/Editor/Date/Date.vue", "new_path": "assets/js/app/editor/Components/Editor/Date/Date.vue", "diff": "data-toggle\n>\n<i class=\"fa fa-calendar\">\n- <span aria-hidden=\"true\" class=\"sr-only\">Toggle</span>\n+ <span aria-hidden=\"true\" class=\"sr-only\">{{ labels.toggle }}</span>\n</i>\n</button>\n</div>\n@@ -68,6 +68,10 @@ export default {\ntype: String,\ndefault: 'en',\n},\n+ // eslint-disable-next-line vue/require-default-prop\n+ labels: {\n+ type: Array,\n+ },\n},\ndata: () => {\n" }, { "change_type": "MODIFY", "old_path": "templates/_base/layout.html.twig", "new_path": "templates/_base/layout.html.twig", "diff": "<header class=\"admin__header\">\n<div class=\"admin__header--topbar\">\n<h1 class=\"admin__header--title\">{{ block('title') }}</h1>\n- <button class=\"admin-sidebar-toggler btn btn-md\"><span class=\"sr-only\">Toggle </span>menu</button>\n+ <button class=\"admin-sidebar-toggler btn btn-md\"><span class=\"sr-only\">{{ 'admin_sidebar_toggler.toggle'|trans }}</span></button>\n</div>\n</header>\n<!-- End Admin Header -->\n" }, { "change_type": "MODIFY", "old_path": "templates/_partials/fields/date.html.twig", "new_path": "templates/_partials/fields/date.html.twig", "diff": "form='{{ form }}'\nmode='{{ mode }}'\nlocale='{{user.locale}}'\n+ labels=\"{{ { 'toggle': 'editor_date.toggle'|trans }|json_encode }}\"\n></editor-date>\n{% endblock %}\n" }, { "change_type": "MODIFY", "old_path": "translations/messages.en.xlf", "new_path": "translations/messages.en.xlf", "diff": "<source>admin_sidebar.toggler</source>\n<target>Toggle sidebar width</target>\n</trans-unit>\n+ <trans-unit id=\"jXAelLe\" resname=\"admin_sidebar_toggler.toggle\">\n+ <source>admin_sidebar_toggler.toggle</source>\n+ <target>Toggle menu</target>\n+ </trans-unit>\n+ <trans-unit id=\"BINgtmK\" resname=\"editor_date.toggle\">\n+ <source>editor_date.toggle</source>\n+ <target>Toggle</target>\n+ </trans-unit>\n</body>\n</file>\n</xliff>\n" } ]
PHP
MIT License
bolt/core
Some toggler xlates
95,179
05.08.2019 23:11:20
-7,200
e1fc8767f753be4ed4a227938ba00de7a08584e6
file xlations
[ { "change_type": "MODIFY", "old_path": "translations/messages.en.xlf", "new_path": "translations/messages.en.xlf", "diff": "<source>editor_date.toggle</source>\n<target>Toggle</target>\n</trans-unit>\n+ <trans-unit id=\"VQ2t655\" resname=\"file.label_filename\">\n+ <source>file.label_filename</source>\n+ <target>Filename</target>\n+ </trans-unit>\n+ <trans-unit id=\"tvpSmD7\" resname=\"file.label_title\">\n+ <source>file.label_title</source>\n+ <target>Title</target>\n+ </trans-unit>\n+ <trans-unit id=\"hXT_hI.\" resname=\"file.button_view\">\n+ <source>file.button_view</source>\n+ <target>View image</target>\n+ </trans-unit>\n+ <trans-unit id=\"QKIqqOw\" resname=\"file.button_upload\">\n+ <source>file.button_upload</source>\n+ <target>Upload an image</target>\n+ </trans-unit>\n+ <trans-unit id=\"4_JdYp1\" resname=\"file.remark\">\n+ <source>file.remark</source>\n+ <target><![CDATA[Note: This field is practically the same as the <code>image</code>-field.]]></target>\n+ </trans-unit>\n+ <trans-unit id=\"TJDc9vQ\" resname=\"file.label_alt\">\n+ <source>file.label_alt</source>\n+ <target>Alt</target>\n+ </trans-unit>\n</body>\n</file>\n</xliff>\n" } ]
PHP
MIT License
bolt/core
file xlations
95,179
05.08.2019 23:16:40
-7,200
07042fe3da7ddb1c059c7ebfb2a609aaf6a8440b
filelist translations added
[ { "change_type": "MODIFY", "old_path": "translations/messages.en.xlf", "new_path": "translations/messages.en.xlf", "diff": "<source>file.label_alt</source>\n<target>Alt</target>\n</trans-unit>\n+ <trans-unit id=\"M.3olSc\" resname=\"filelist.remark\">\n+ <source>filelist.remark</source>\n+ <target><![CDATA[Note: This field is practically the same as the <code>imagelist</code>-field.]]></target>\n+ </trans-unit>\n</body>\n</file>\n</xliff>\n" } ]
PHP
MIT License
bolt/core
filelist translations added
95,179
06.08.2019 10:16:38
-7,200
3b0322d2ea9ea2877a6bc35b3c49321415c478c3
imagelist, repeater xlation added
[ { "change_type": "MODIFY", "old_path": "templates/_partials/fields/repeater.html.twig", "new_path": "templates/_partials/fields/repeater.html.twig", "diff": "{% extends '@bolt/_partials/fields/_base.html.twig' %}\n{% block field %}\n- <mark>Note: The Repeater / Block field is basically a wrapper for other fields.</mark>\n+ <mark>{{ 'repeater.remark'|trans|raw }}</mark>\n{% endblock %}\n" }, { "change_type": "MODIFY", "old_path": "translations/messages.en.xlf", "new_path": "translations/messages.en.xlf", "diff": "<source>geolocation.label_long</source>\n<target>Longitude</target>\n</trans-unit>\n+ <trans-unit id=\"TkryUve\" resname=\"imagelist.remark\">\n+ <source>imagelist.remark</source>\n+ <target><![CDATA[Note: This field is practically the same as the <code>filelist</code>-field.]]></target>\n+ </trans-unit>\n+ <trans-unit id=\"Swom5xM\" resname=\"repeater.remark\">\n+ <source>repeater.remark</source>\n+ <target>Note: The Repeater / Block field is basically a wrapper for other fields.</target>\n+ </trans-unit>\n</body>\n</file>\n</xliff>\n" } ]
PHP
MIT License
bolt/core
imagelist, repeater xlation added
95,179
06.08.2019 10:19:17
-7,200
c4fc0f62d6492cdba87d5998c514b60742bd9270
flash-messages xlations added
[ { "change_type": "MODIFY", "old_path": "templates/_partials/_flash_messages.html.twig", "new_path": "templates/_partials/_flash_messages.html.twig", "diff": "<!-- Then put toasts within -->\n<div class=\"toast\" role=\"alert\" aria-live=\"assertive\" aria-atomic=\"true\" data-delay=\"6000\">\n<div class=\"alert-{{ type }} toast-header\">\n- <strong class=\"mr-auto\">Notification </strong>\n+ <strong class=\"mr-auto\">{{ 'flash_messages.notification'|trans }}Notification </strong>\n<small>{{ type|trans }}</small>\n<button type=\"button\" class=\"ml-2 mb-1 close\" data-dismiss=\"toast\" aria-label=\"Close\">\n<span aria-hidden=\"true\">&times;</span>\n" }, { "change_type": "MODIFY", "old_path": "translations/messages.en.xlf", "new_path": "translations/messages.en.xlf", "diff": "<source>repeater.remark</source>\n<target>Note: The Repeater / Block field is basically a wrapper for other fields.</target>\n</trans-unit>\n+ <trans-unit id=\"z2AgHGp\" resname=\"flash_messages.notification\">\n+ <source>flash_messages.notification</source>\n+ <target>__flash_messages.notification</target>\n+ </trans-unit>\n</body>\n</file>\n</xliff>\n" } ]
PHP
MIT License
bolt/core
flash-messages xlations added
95,179
06.08.2019 10:25:48
-7,200
ecbe427c674fa81b8c255752ec435233cef68ecc
flash-messages, buttons xtaions added
[ { "change_type": "MODIFY", "old_path": "templates/_partials/_flash_messages.html.twig", "new_path": "templates/_partials/_flash_messages.html.twig", "diff": "<!-- Then put toasts within -->\n<div class=\"toast\" role=\"alert\" aria-live=\"assertive\" aria-atomic=\"true\" data-delay=\"6000\">\n<div class=\"alert-{{ type }} toast-header\">\n- <strong class=\"mr-auto\">{{ 'flash_messages.notification'|trans }}Notification </strong>\n+ <strong class=\"mr-auto\">{{ 'flash_messages.notification'|trans }}</strong>\n<small>{{ type|trans }}</small>\n<button type=\"button\" class=\"ml-2 mb-1 close\" data-dismiss=\"toast\" aria-label=\"Close\">\n<span aria-hidden=\"true\">&times;</span>\n" }, { "change_type": "MODIFY", "old_path": "templates/content/_buttons.html.twig", "new_path": "templates/content/_buttons.html.twig", "diff": "{% if record.status == \"published\" %}\n<button type=\"button\" class=\"btn btn-primary dropdown-toggle dropdown-toggle-split mb-3\" data-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\">\n- <span class=\"sr-only\">Toggle Dropdown</span>\n+ <span class=\"sr-only\">{{ 'buttons.button_toggle'|trans }}</span>\n</button>\n<button type=\"submit\" class=\"btn btn-light dropdown-menu dropdown-menu-right\" form=\"editcontent\"\nformaction=\"{{ path('bolt_content_edit_viewsave', {'id': record.id }) }}\" formtarget=\"_blank\" style=\"white-space: nowrap; padding-right: 1rem;\">\n" }, { "change_type": "MODIFY", "old_path": "translations/messages.en.xlf", "new_path": "translations/messages.en.xlf", "diff": "</trans-unit>\n<trans-unit id=\"z2AgHGp\" resname=\"flash_messages.notification\">\n<source>flash_messages.notification</source>\n- <target>__flash_messages.notification</target>\n+ <target>Notification</target>\n+ </trans-unit>\n+ <trans-unit id=\"qQKx1lR\" resname=\"buttons.button_toggle\">\n+ <source>buttons.button_toggle</source>\n+ <target>Toggle Dropdown</target>\n</trans-unit>\n</body>\n</file>\n" } ]
PHP
MIT License
bolt/core
flash-messages, buttons xtaions added
95,179
06.08.2019 10:41:52
-7,200
bfcd81f72b418731805f9fe289b51556767c11b2
listing, localeswitcher xlations added
[ { "change_type": "MODIFY", "old_path": "templates/content/_localeswitcher.html.twig", "new_path": "templates/content/_localeswitcher.html.twig", "diff": "></general-language>\n<a href=\"{{ path('bolt_content_edit_locales', {'id': record.id}) }}\" class=\"btn btn-light btn-small\">\n- See Localization info\n+ {{ 'localeswitcher.button_info'|trans }}\n</a>\n</div>\n" }, { "change_type": "MODIFY", "old_path": "templates/content/listing.html.twig", "new_path": "templates/content/listing.html.twig", "diff": "<form>\n<div class=\"form-group\">\n<p>\n- <strong>Sort by</strong>:\n+ <strong>{{ 'listing.title_sortby'|trans }}</strong>:\n<select name=\"sort\" class=\"form-control\">\n<option value=\"\" disabled {% if sortBy is empty %}selected{% endif %}>\n- Select item\n+ {{ 'listing.option_select_item'|trans }}\n</option>\n{% for key, filterOption in filterOptions %}\n<option value=\"{{ key }}\" {% if sortBy == key %}selected{% endif %}>\n</select>\n</p>\n<p>\n- <strong>Title</strong>:\n- <input class=\"form-control\" type=\"text\" name=\"filter\" value=\"{{ filterValue }}\" placeholder=\"Keyword ...\"></input>\n+ <strong>{{ 'listing.title_title'|trans }}</strong>:\n+ <input class=\"form-control\" type=\"text\" name=\"filter\" value=\"{{ filterValue }}\" placeholder=\"{{ 'listing.placeholder_filter'|trans }}\"></input>\n</p>\n</div>\n<div class=\"form-group\">\n- <button class=\"btn btn-tertiary\" type=\"submit\">Filter</button>\n+ <button class=\"btn btn-tertiary\" type=\"submit\">{{ 'listing.button_filter'|trans }}</button>\n{% if sortBy is not empty or filterValue is not empty %}\n- <a class=\"btn btn-danger\" href=\"{{ path('bolt_content_overview', {'contentType': contentType.slug}) }}\"><i class=\"fa fa-close\"></i> Clear sort/filter</a>\n+ <a class=\"btn btn-danger\" href=\"{{ path('bolt_content_overview', {'contentType': contentType.slug}) }}\"><i class=\"fa fa-close\"></i>{{ 'listing.button_clear'|trans }}</a>\n{% endif %}\n</div>\n</form>\n" } ]
PHP
MIT License
bolt/core
listing, localeswitcher xlations added
95,179
06.08.2019 10:46:58
-7,200
0cc48516b7dd5fb5daab60f1cb3072c448cf2a72
view-locales xlations added
[ { "change_type": "MODIFY", "old_path": "templates/content/view_locales.html.twig", "new_path": "templates/content/view_locales.html.twig", "diff": "{% for locale in locales %}\n<td>\n{% if not field.definition.localize and not loop.first %}\n- <span class=\"badge badge-info\">Default</span>\n+ <span class=\"badge badge-info\">{{ 'view_locales.badge_default'|trans }}</span>\n{% elseif localizedValues[locale]|default and localizedValues[locale].value is not empty %}\n- <span class=\"badge badge-success\">OK</span>\n+ <span class=\"badge badge-success\">{{ 'view_locales.badge_ok'|trans }}</span>\n{% else %}\n- <span class=\"badge badge-warning\">Missing</span>\n+ <span class=\"badge badge-warning\">{{ 'view_locales.badge_missing'|trans }}</span>\n{% endif %}\n</td>\n{% endfor %}\n" }, { "change_type": "MODIFY", "old_path": "translations/messages.en.xlf", "new_path": "translations/messages.en.xlf", "diff": "<source>listing.button_clear</source>\n<target>Clear sort/filter</target>\n</trans-unit>\n+ <trans-unit id=\"37kJiIe\" resname=\"view_locales.badge_default\">\n+ <source>view_locales.badge_default</source>\n+ <target>Default</target>\n+ </trans-unit>\n+ <trans-unit id=\"JTRCo_U\" resname=\"view_locales.badge_ok\">\n+ <source>view_locales.badge_ok</source>\n+ <target>OK</target>\n+ </trans-unit>\n+ <trans-unit id=\"ufFUPp7\" resname=\"view_locales.badge_missing\">\n+ <source>view_locales.badge_missing</source>\n+ <target>Missing</target>\n+ </trans-unit>\n</body>\n</file>\n</xliff>\n" } ]
PHP
MIT License
bolt/core
view-locales xlations added
95,179
06.08.2019 11:00:26
-7,200
c05282bfb2230ff673c2b3ecea3bfb388cbe84ca
files-cards xlations added
[ { "change_type": "MODIFY", "old_path": "templates/finder/_files_cards.html.twig", "new_path": "templates/finder/_files_cards.html.twig", "diff": "aria-expanded=\"false\"\n>\n<i class=\"fas fa-question-circle\"></i>\n- <span class=\"sr-only\">Toggle Dropdown</span>\n+ <span class=\"sr-only\">{{ 'files_cards.button_toggle'|trans }}</span>\n</button>\n<div class=\"edit-actions__dropdown dropdown-menu dropdown-menu-right\" style=\"width: 320px;\">\n<a class=\"dropdown-item\" href=\"{{ link }}\" target=\"_blank\">\n<i class=\"fas fa-w fa-edit\"></i>\n{% if extension in imageformats %}\n- Edit image information\n+ {{ 'files_cards.action_edit_image_info'|trans }}\n{% else %}\n- Edit file in editor\n+ {{ 'files_cards.action_edit_file'|trans }}\n{% endif %}\n</a>\n<a class=\"dropdown-item\" href=\"{{ asset(file.filename, 'files') }}\" target=\"_blank\">\n<i class=\"fas fa-w fa-external-link-square-alt\"></i>\n- View original\n+ {{ 'files_cards.action_view_original'|trans }}\n</a>\n<a class=\"dropdown-item\" href=\"#\">\n<i class=\"far fa-w fa-copy\"></i>\n- Duplicate {{ file.getRelativePathname|excerpt(22) }}\n+ {{ 'files_cards.action_duplicate'|trans }} {{ file.getRelativePathname|excerpt(22) }}\n</a>\n<a class=\"dropdown-item\" href=\"#\" data-confirmation=\"Are you sure you wish to delete this Content?\">\n<i class=\"fas fa-w fa-trash\"></i>\n- Delete {{ file.getRelativePathname|excerpt(22) }}\n+ {{ 'files_cards.action_delete'|trans }} {{ file.getRelativePathname|excerpt(22) }}\n</a>\n<div class=\"dropdown-divider\"></div>\n<span class=\"dropdown-item-text\">\n<i class=\"fas fa-link fa-w\"></i>\n- Filename: <code :title=\"file.fieldValues.slug\">{{ file.getRelativePathname }}</code>\n+ {{ 'files_cards.label_filename'|trans }} <code :title=\"file.fieldValues.slug\">{{ file.getRelativePathname }}</code>\n</span>\n{% if title %}\n<span class=\"dropdown-item-text\">\n<i class=\"fas fa-asterisk fa-w\"></i>\n- Title: {{ title }}\n+ {{ 'files_cards.label_title'|trans }} {{ title }}\n</span>\n{% endif %}\n{% if dimensions %}\n<span class=\"dropdown-item-text\">\n<i class=\"fas fa-asterisk fa-w\"></i>\n- Dimensions: {{ dimensions }}\n+ {{ 'files_cards.label_dimensions'|trans }} {{ dimensions }}\n</span>\n{% endif %}\n<span class=\"dropdown-item-text\">\n<i class=\"fas fa-asterisk fa-w\"></i>\n- Filesize: {{ file.getSize() }}&nbsp;bytes\n+ {{ 'files_cards.label_filesize'|trans }} {{ file.getSize() }}&nbsp;bytes\n</span>\n<span class=\"dropdown-item-text\">\n<i class=\"far fa-calendar-alt fa-w\"></i>\n- Created on: <strong>{{ file.getCTime()|localizeddate('short', 'short', null, 'UTC') }}</strong>\n+ {{ 'files_cards.label_created_on'|trans }} <strong>{{ file.getCTime()|localizeddate('short', 'short', null, 'UTC') }}</strong>\n</span>\n</div>\n" }, { "change_type": "MODIFY", "old_path": "translations/messages.en.xlf", "new_path": "translations/messages.en.xlf", "diff": "<source>view_locales.badge_missing</source>\n<target>Missing</target>\n</trans-unit>\n+ <trans-unit id=\"QQvRJe.\" resname=\"files_cards.button_toggle\">\n+ <source>files_cards.button_toggle</source>\n+ <target>Toggle Dropdown</target>\n+ </trans-unit>\n+ <trans-unit id=\"gtC_ujD\" resname=\"files_cards.action_edit_image_info\">\n+ <source>files_cards.action_edit_image_info</source>\n+ <target>Edit image information</target>\n+ </trans-unit>\n+ <trans-unit id=\"5LXvJfE\" resname=\"files_cards.action_edit_file\">\n+ <source>files_cards.action_edit_file</source>\n+ <target>Edit file in editor</target>\n+ </trans-unit>\n+ <trans-unit id=\"H1pgP94\" resname=\"files_cards.action_view_original\">\n+ <source>files_cards.action_view_original</source>\n+ <target>View original</target>\n+ </trans-unit>\n+ <trans-unit id=\"ZoY6ADX\" resname=\"files_cards.action_duplicate\">\n+ <source>files_cards.action_duplicate</source>\n+ <target>Duplicate</target>\n+ </trans-unit>\n+ <trans-unit id=\"JjU6ZQP\" resname=\"files_cards.action_delete\">\n+ <source>files_cards.action_delete</source>\n+ <target>Delete</target>\n+ </trans-unit>\n+ <trans-unit id=\"3jdNwuk\" resname=\"files_cards.label_filename\">\n+ <source>files_cards.label_filename</source>\n+ <target>Filename:</target>\n+ </trans-unit>\n+ <trans-unit id=\"Y90_Pn1\" resname=\"files_cards.label_title\">\n+ <source>files_cards.label_title</source>\n+ <target>Title:</target>\n+ </trans-unit>\n+ <trans-unit id=\"EdCfIKX\" resname=\"files_cards.label_dimensions\">\n+ <source>files_cards.label_dimensions</source>\n+ <target>Dimensions:</target>\n+ </trans-unit>\n+ <trans-unit id=\"eQBhceV\" resname=\"files_cards.label_filesize\">\n+ <source>files_cards.label_filesize</source>\n+ <target>Filesize:</target>\n+ </trans-unit>\n+ <trans-unit id=\"uiCjlwk\" resname=\"files_cards.label_created_on\">\n+ <source>files_cards.label_created_on</source>\n+ <target>Created on:</target>\n+ </trans-unit>\n</body>\n</file>\n</xliff>\n" } ]
PHP
MIT License
bolt/core
files-cards xlations added
95,179
06.08.2019 11:03:46
-7,200
ba39c0d57c448ee82446c92ae55d071fb88f7099
files-list xlations added
[ { "change_type": "MODIFY", "old_path": "templates/finder/_files_list.html.twig", "new_path": "templates/finder/_files_list.html.twig", "diff": "{% else %}\n<tr>\n<td colspan=\"6\">\n- <p><strong>No files are present in this folder. Select a folder to navigate to, on the right-hand side.</strong></p>\n+ <mark><strong>{{ 'files_list.remark'|trans|raw }}</strong></mark>\n</td>\n</tr>\n{% endfor %}\n" }, { "change_type": "MODIFY", "old_path": "translations/messages.en.xlf", "new_path": "translations/messages.en.xlf", "diff": "<source>files_cards.label_created_on</source>\n<target>Created on:</target>\n</trans-unit>\n+ <trans-unit id=\".fL0AbE\" resname=\"files_list.remark\">\n+ <source>files_list.remark</source>\n+ <target>No files are present in this folder. Select a folder to navigate to, on the right-hand side.</target>\n+ </trans-unit>\n</body>\n</file>\n</xliff>\n" } ]
PHP
MIT License
bolt/core
files-list xlations added
95,179
06.08.2019 11:09:51
-7,200
f19e34aa6cb43b2631649dc5ac75e021b4643aa4
quickselect xlations added
[ { "change_type": "MODIFY", "old_path": "templates/finder/_quickselect.html.twig", "new_path": "templates/finder/_quickselect.html.twig", "diff": "<div class=\"row\">\n<div class=\"col-md-auto align-self-end\">\n- <p style=\"margin-top: 0.75rem\">Select a file:</p>\n+ <p style=\"margin-top: 0.75rem\">{{ 'quickselect.title_select'|trans }}</p>\n</div>\n<div class=\"col\">\n<div class=\"selectize-control selectize form-control single\" style=\"min-height: 3rem;\">\n" }, { "change_type": "MODIFY", "old_path": "translations/messages.en.xlf", "new_path": "translations/messages.en.xlf", "diff": "<source>files_list.remark</source>\n<target>No files are present in this folder. Select a folder to navigate to, on the right-hand side.</target>\n</trans-unit>\n+ <trans-unit id=\"v6cfPyt\" resname=\"quickselect.title_select\">\n+ <source>quickselect.title_select</source>\n+ <target>Select a file:</target>\n+ </trans-unit>\n</body>\n</file>\n</xliff>\n" } ]
PHP
MIT License
bolt/core
quickselect xlations added
95,179
06.08.2019 11:14:24
-7,200
387e4c44ea459af2ecf7a83a66445758eb845e7a
finder xlations added
[ { "change_type": "MODIFY", "old_path": "templates/finder/finder.html.twig", "new_path": "templates/finder/finder.html.twig", "diff": "View:\n<div class=\"btn-group\">\n- <a href=\"{{ path('bolt_filemanager', {'location': location, 'path': path, 'view': 'list' }) }}\" class=\"btn btn-secondary\"><i class=\"fas fa-list fa-fw\"></i> List</a>\n- <a href=\"{{ path('bolt_filemanager', {'location': location, 'path': path, 'view': 'cards' }) }}\" class=\"btn btn-secondary ml-1\"><i class=\"fas fa-th fa-fw\"></i>Cards</a>\n+ <a href=\"{{ path('bolt_filemanager', {'location': location, 'path': path, 'view': 'list' }) }}\" class=\"btn btn-secondary\"><i class=\"fas fa-list fa-fw\"></i>{{ 'finder.button_list'|trans }}</a>\n+ <a href=\"{{ path('bolt_filemanager', {'location': location, 'path': path, 'view': 'cards' }) }}\" class=\"btn btn-secondary ml-1\"><i class=\"fas fa-th fa-fw\"></i>{{ 'finder.button_cards'|trans }}</a>\n</div>\n</div>\n</div>\n" }, { "change_type": "MODIFY", "old_path": "translations/messages.en.xlf", "new_path": "translations/messages.en.xlf", "diff": "<source>quickselect.title_select</source>\n<target>Select a file:</target>\n</trans-unit>\n+ <trans-unit id=\"m3tNvJb\" resname=\"finder.button_list\">\n+ <source>finder.button_list</source>\n+ <target>List</target>\n+ </trans-unit>\n+ <trans-unit id=\"tRLgeoX\" resname=\"finder.button_cards\">\n+ <source>finder.button_cards</source>\n+ <target>Cards</target>\n+ </trans-unit>\n</body>\n</file>\n</xliff>\n" } ]
PHP
MIT License
bolt/core
finder xlations added
95,179
06.08.2019 11:37:12
-7,200
192ec6c652d2b14b66613e2ce03db598a62aab30
extensions, dashboard xlations added
[ { "change_type": "MODIFY", "old_path": "templates/pages/extensions.html.twig", "new_path": "templates/pages/extensions.html.twig", "diff": "{% if package %}\n<dl class=\"row\">\n- <dt class=\"col-sm-3\">Description:</dt>\n+ <dt class=\"col-sm-3\">{{ 'extensions.title_desc'|trans }}</dt>\n<dd class=\"col-sm-9\">{{ package.description }}</dd>\n- <dt class=\"col-sm-3\">Author:</dt>\n+ <dt class=\"col-sm-3\">{{ 'extensions.title_author'|trans }}</dt>\n<dd class=\"col-sm-9\">{% for author in package.authors %}{{ author.name }}{% if not loop.last %}, {% endif %}{% endfor %}</dd>\n- <dt class=\"col-sm-3\">Package / Class name: </dt>\n+ <dt class=\"col-sm-3\">{{ 'extensions.title_package'|trans }}</dt>\n<dd class=\"col-sm-9\"><code>{{ package.prettyName }}</code> - <code>{{ extension.class }}</code></dd>\n- <dt class=\"col-sm-3\">Version: </dt>\n+ <dt class=\"col-sm-3\">{{ 'extensions.title_version'|trans }}</dt>\n<dd class=\"col-sm-9\">{{ package.prettyVersion }}</dd>\n</dl>\n{% else %}\n<dl class=\"row\">\n- <dt class=\"col-sm-3\">Description:</dt>\n- <dd class=\"col-sm-9\">This is a local package, not installed through Composer</dd>\n- <dt class=\"col-sm-3\">Class name: </dt>\n+ <dt class=\"col-sm-3\">{{ 'extensions.title_desc'|trans }}</dt>\n+ <dd class=\"col-sm-9\">{{ 'extensions.info_not_installed'|trans }}</dd>\n+ <dt class=\"col-sm-3\">{{ 'extensions.title_class'|trans }}</dt>\n<dd class=\"col-sm-9\"><code>{{ extension.class }}</code></dd>\n</dl>\n{% if config %}\n{% set link = path('bolt_file_edit', {'location': 'config', 'file': config }) %}\n<a class=\"btn btn-secondary btn-small\" href=\"{{ link }}\">\n- <i class=\"fa fa-edit\"></i> Configuration\n+ <i class=\"fa fa-edit\"></i>{{ 'extensions.button_configuration'|trans }}\n</a>\n{% endif %}\n{% if package.sourceUrl|default() %}\n<a class=\"btn btn-tertiary btn-small\" href=\"{{ package.sourceUrl }}\" target=\"_blank\">\n- <i class=\"fa fa-external-link-square-alt\"></i> Source\n+ <i class=\"fa fa-external-link-square-alt\"></i>{{ 'extensions.button_source'|trans }}\n</a>\n{% endif %}\n{% if package|default() %}\n<a class=\"btn btn-hidden-danger btn-small ml-1 float-right\" href=\"\" data-confirmation=\"Not yet implemented. Sorry!\">\n- <i class=\"fas fa-trash-alt\"></i> Remove extension\n+ <i class=\"fas fa-trash-alt\"></i>{{ 'extensions.button_remove'|trans }}\n</a>\n{% endif %}\n<a class=\"btn btn-tertiary btn-small float-right\" href=\"\" data-confirmation=\"Not yet implemented. Sorry!\">\n- <i class=\"fas fa-ban\"></i> Disable extension\n+ <i class=\"fas fa-ban\"></i>{{ 'extensions.button_disable'|trans }}\n</a>\n</div>\n" } ]
PHP
MIT License
bolt/core
extensions, dashboard xlations added
95,179
06.08.2019 11:40:43
-7,200
56b8deb9edead54d9419d6f3b560559bf25c2c2f
login xlations added
[ { "change_type": "MODIFY", "old_path": "templates/security/login.html.twig", "new_path": "templates/security/login.html.twig", "diff": "<div class=\"card-header\">\n<i class=\"fa fa-lock\" aria-hidden=\"true\"></i>\n- Bolt &raquo; Login\n+ {{ 'login.header_login'|trans }}\n</div>\n<div class=\"card-body\">\n" }, { "change_type": "MODIFY", "old_path": "translations/messages.en.xlf", "new_path": "translations/messages.en.xlf", "diff": "<source>extensions.button_disable</source>\n<target>Disable extension</target>\n</trans-unit>\n+ <trans-unit id=\"beqzCkE\" resname=\"login.header_login\">\n+ <source>login.header_login</source>\n+ <target>Bolt &raquo; Login</target>\n+ </trans-unit>\n</body>\n</file>\n</xliff>\n" } ]
PHP
MIT License
bolt/core
login xlations added
95,179
06.08.2019 23:20:25
-7,200
7baeb2e072d226f9138ddf497cb54069bbb9940f
Styling in vue components
[ { "change_type": "MODIFY", "old_path": "assets/js/app/editor/Components/Editor/Date/Date.vue", "new_path": "assets/js/app/editor/Components/Editor/Date/Date.vue", "diff": "<div class=\"input-group\">\n<flat-pickr\nv-model=\"val\"\n- :config=\"config\"\nclass=\"form-control editor--date\"\n- placeholder=\"Select date\"\n- :name=\"name\"\n- :form=\"form\"\n+ :config=\"config\"\n:disabled=\"disabled == 1\"\n+ :form=\"form\"\n+ :name=\"name\"\n+ placeholder=\"Select date\"\n>\n</flat-pickr>\n<div class=\"input-group-append\">\ndata-toggle\n>\n<i class=\"fa fa-calendar\">\n- <span aria-hidden=\"true\" class=\"sr-only\">{{ labels.toggle }}</span>\n+ <span class=\"sr-only\" aria-hidden=\"true\">{{ labels.toggle }}</span>\n</i>\n</button>\n</div>\n" }, { "change_type": "MODIFY", "old_path": "assets/js/app/editor/Components/Editor/Email/Email.vue", "new_path": "assets/js/app/editor/Components/Editor/Email/Email.vue", "diff": "<template>\n<div>\n<input\n+ class=\"form-control\"\n:id=\"id\"\n- type=\"email\"\n:name=\"name\"\n:value=\"value\"\n- class=\"form-control\"\n+ type=\"email\"\n/>\n</div>\n</template>\n" }, { "change_type": "MODIFY", "old_path": "assets/js/app/editor/Components/Editor/Embed/Embed.vue", "new_path": "assets/js/app/editor/Components/Editor/Embed/Embed.vue", "diff": "<label>{{ labels.label_preview }}</label>\n<div class=\"editor__image--preview\">\n<a\n- :href=\"previewImage\"\nclass=\"editor__image--preview-image\"\n+ :href=\"previewImage\"\n:style=\"`background-image: url('${previewImage}')`\"\n>\n</a>\n" }, { "change_type": "MODIFY", "old_path": "assets/js/app/editor/Components/Editor/Image/Image.vue", "new_path": "assets/js/app/editor/Components/Editor/Image/Image.vue", "diff": "<div class=\"input-group mb-3\">\n<input :name=\"name + '[media]'\" type=\"hidden\" :value=\"media\" />\n<input\n+ class=\"form-control\"\n:name=\"name + '[filename]'\"\ntype=\"text\"\n- class=\"form-control\"\n:placeholder=\"labels.placeholder_filename\"\n:value=\"filename\"\n/>\n</div>\n<div class=\"input-group mb-3\">\n<input\n+ class=\"form-control\"\n:name=\"name + '[alt]'\"\ntype=\"text\"\n- class=\"form-control\"\n:placeholder=\"labels.placeholder_alt_text\"\n:value=\"alt\"\n/>\n</div>\n<div class=\"input-group mb-3\">\n<input\n+ class=\"form-control\"\n:name=\"name + '[title]'\"\ntype=\"text\"\n- class=\"form-control\"\n:placeholder=\"labels.placeholder_title\"\n:value=\"title\"\n/>\n</div>\n<div class=\"btn-toolbar\" role=\"toolbar\">\n<div class=\"btn-group mr-2\" role=\"group\">\n- <button type=\"button\" class=\"btn btn-secondary\" @click=\"selectFile\">\n+ <button class=\"btn btn-secondary\" type=\"button\" @click=\"selectFile\">\n<i class=\"fas fa-fw fa-upload\"></i>{{ labels.button_upload }}\n</button>\n</div>\n<div class=\"btn-group mr-2\" role=\"group\">\n- <button type=\"button\" class=\"btn btn-secondary\">\n+ <button class=\"btn btn-secondary\" type=\"button\">\n<i class=\"fas fa-fw fa-th\"></i> {{ labels.button_from_library }}\n</button>\n</div>\n<div class=\"col-4\">\n<div class=\"editor__image--preview\">\n<a\n- :href=\"previewImage\"\nclass=\"editor__image--preview-image\"\n- :style=\"`background-image: url('${previewImage}')`\"\n- >\n+ :href=\"previewImage\"\n+ :style=\"`background-image: url('${previewImage}')`\">\n</a>\n</div>\n</div>\n</div>\n<input\nref=\"selectFile\"\n+ class=\"editor__image--upload\"\n:name=\"fieldName\"\ntype=\"file\"\n- class=\"editor__image--upload\"\n@change=\"uploadFile($event.target.files[0])\"\n/>\n</div>\n@@ -173,8 +172,7 @@ export default {\n};\nfd.append('image', file);\nfd.append('_csrf_token', this.token);\n- Axios\n- .post(this.directory, fd, config)\n+ Axios.post(this.directory, fd, config)\n.then(res => {\nthis.filename = res.data;\nthis.previewImage = `/thumbs/${res.data}?${thumbnailParams}`;\n" }, { "change_type": "MODIFY", "old_path": "assets/js/app/editor/Components/Editor/Password/Password.vue", "new_path": "assets/js/app/editor/Components/Editor/Password/Password.vue", "diff": "<div class=\"input-group-prepend\">\n<input\n:id=\"id\"\n+ class=\"form-control\"\ntype=\"password\"\n:name=\"name\"\n:value=\"value\"\n- class=\"form-control\"\nautocomplete=\"new-password\"\n/>\n- <i class=\"input-group-text fas fa-eye\" @click=\"togglePassword\" ref=\"visibilityToggle\"></i>\n+ <i\n+ ref=\"visibilityToggle\"\n+ class=\"input-group-text fas fa-eye\"\n+ @click=\"togglePassword\"\n+ ></i>\n</div>\n</div>\n</template>\n@@ -20,6 +24,14 @@ export default {\nname: 'EditorPassword',\nprops: ['value', 'name', 'id', 'hidden'],\n+ mounted: function() {\n+ // this.val = this.$options.filters.strip(this.value);\n+ console.log('joe!', this.value, this.hidden, this.$refs);\n+ if (!this.hidden) {\n+ this.$refs.visibilityToggle.click()\n+ }\n+ },\n+\nmethods: {\ntogglePassword(event) {\nconst iconElement = event.target;\n@@ -35,13 +47,5 @@ export default {\n}\n},\n},\n-\n- mounted: function() {\n- // this.val = this.$options.filters.strip(this.value);\n- console.log('joe!', this.value, this.hidden, this.$refs);\n- if (!this.hidden) {\n- this.$refs.visibilityToggle.click()\n- }\n- },\n};\n</script>\n" }, { "change_type": "MODIFY", "old_path": "assets/js/app/listing/Components/Table/Row/_Actions.vue", "new_path": "assets/js/app/listing/Components/Table/Row/_Actions.vue", "diff": "<template>\n<div class=\"listing__row--item is-actions edit-actions\">\n<div class=\"btn-group\">\n- <a :href=\"record.extras.editLink\" class=\"btn btn-secondary btn-block btn-sm text-nowrap\">\n+ <a\n+ class=\"btn btn-secondary btn-block btn-sm text-nowrap\"\n+ :href=\"record.extras.editLink\"\n+ >\n<i class=\"far fa-edit mr-1\"></i> Edit\n</a>\n<button\n" }, { "change_type": "MODIFY", "old_path": "assets/js/app/listing/Components/Table/Row/_Checkbox.vue", "new_path": "assets/js/app/listing/Components/Table/Row/_Checkbox.vue", "diff": "<input\n:id=\"`row-${id}`\"\nv-model=\"selected\"\n- type=\"checkbox\"\nclass=\"custom-control-input\"\n+ type=\"checkbox\"\n/>\n<label\nclass=\"custom-control-label\"\n" }, { "change_type": "MODIFY", "old_path": "assets/js/app/listing/Components/Table/Row/index.vue", "new_path": "assets/js/app/listing/Components/Table/Row/index.vue", "diff": ">\n<!-- column details -->\n<div class=\"listing__row--item is-details\">\n- <a class=\"listing__row--item-title\" :href=\"record.extras.editLink\" :title=\"record.fieldValues.slug\">{{ record.extras.title | trim(62) }}</a>\n+ <a\n+ class=\"listing__row--item-title\"\n+ :href=\"record.extras.editLink\"\n+ :title=\"record.fieldValues.slug\"\n+ >\n+ {{ record.extras.title | trim(62) }}\n+ </a>\n<span class=\"listing__row--item-title-excerpt\">{{ record.extras.excerpt }}</span>\n</div>\n<!-- end column -->\n<row-sorting></row-sorting>\n<!-- end column -->\n</div>\n-\n</transition-group>\n</template>\n" }, { "change_type": "MODIFY", "old_path": "assets/js/app/sidebar/Components/Menu/index.vue", "new_path": "assets/js/app/sidebar/Components/Menu/index.vue", "diff": "</a>\n<a\nv-else\n- :href=\"item.link\"\nclass=\"admin__sidebar--link\"\n:class=\"{'has-menu': item.submenu !== null}\"\n+ :href=\"item.link\"\n>\n<i class=\"fas mr-2 link--icon\" :class=\"item.icon\"></i\n><span class=\"link--text\">{{ item.name }}</span>\n" }, { "change_type": "MODIFY", "old_path": "assets/js/app/sidebar/Components/Sidebar.vue", "new_path": "assets/js/app/sidebar/Components/Sidebar.vue", "diff": "<template>\n<nav class=\"admin__sidebar--nav\">\n<sidebar-menu :menu=\"menu\"></sidebar-menu>\n- <sidebar-toggler :version=\"version\" :about-link=\"aboutLink\"></sidebar-toggler>\n+ <sidebar-toggler\n+ :version=\"version\"\n+ :about-link=\"aboutLink\"\n+ ></sidebar-toggler>\n<footer class=\"admin__sidebar--footer\">\n- <a :href=\"aboutLink\">Bolt v<span class=\"sr-only\">ersion </span>{{ version }}</a>\n+ <a :href=\"aboutLink\"\n+ >Bolt v<span class=\"sr-only\">ersion </span>{{ version }}</a\n+ >\n</footer>\n</nav>\n</template>\n" } ]
PHP
MIT License
bolt/core
Styling in vue components
95,144
07.08.2019 14:10:57
-7,200
3ae51f25cea3a58044f3d19b0b1b216ad06feae1
Allow PNG (and WEBP and SVG) as image uploads
[ { "change_type": "MODIFY", "old_path": "public/theme/skeleton/index.twig", "new_path": "public/theme/skeleton/index.twig", "diff": "{% if record|default %}\n- <h1><a href=\"{{ record|link }}\">{{ record|title }}</a></h1>\n+ <h1><a href=\"{{ record|link }}\">{{ record|title|rot13 }}</a></h1>\n{# Remove this block if you don't need it anymore. #}\n{{ include('partials/_fresh_install.twig') }}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/Bar.php", "diff": "+<?php\n+\n+declare(strict_types=1);\n+\n+namespace Bolt;\n+\n+use Bolt\\Extension\\BaseExtension;\n+\n+class Bar extends BaseExtension\n+{\n+ public function getName(): string\n+ {\n+ return 'BarFoo';\n+ }\n+\n+ public function getClass(): string\n+ {\n+ return static::class;\n+ }\n+\n+ public function initialize(): void\n+ {\n+// dump('JOEHOE');\n+ }\n+}\n" }, { "change_type": "MODIFY", "old_path": "src/Controller/Backend/Async/UploadController.php", "new_path": "src/Controller/Backend/Async/UploadController.php", "diff": "@@ -67,15 +67,15 @@ class UploadController implements AsyncZone\n$uploadHandler->addRule(\n'extension',\n- ['allowed' => 'jpg', 'jpeg', 'png'],\n- '{label} should be a valid image (jpg, jpeg, png)',\n- 'Profile picture'\n+ ['allowed' => ['jpg', 'jpeg', 'png', 'gif', 'webp', 'svg']],\n+ '{label} should be a valid image (jpg, jpeg, png, webp or svg)',\n+ 'Image'\n);\n$uploadHandler->addRule(\n'size',\n['max' => '20M'],\n'{label} should have less than {max}',\n- 'Profile picture'\n+ 'Image'\n);\n$uploadHandler->setSanitizerCallback(function ($name) {\nreturn $this->sanitiseFilename($name);\n" }, { "change_type": "MODIFY", "old_path": "src/Controller/ImageController.php", "new_path": "src/Controller/ImageController.php", "diff": "@@ -8,6 +8,7 @@ use Bolt\\Configuration\\Config;\nuse League\\Glide\\Responses\\SymfonyResponseFactory;\nuse League\\Glide\\ServerFactory;\nuse Symfony\\Component\\HttpFoundation\\Request;\n+use Symfony\\Component\\HttpFoundation\\Response;\nuse Symfony\\Component\\HttpFoundation\\StreamedResponse;\nuse Symfony\\Component\\Routing\\Annotation\\Route;\n@@ -24,9 +25,17 @@ class ImageController\n/**\n* @Route(\"/thumbs/{filename}\", methods={\"GET\"}, name=\"thumbnail\", requirements={\"filename\"=\".+\"})\n*/\n- public function image(string $filename, Request $request): StreamedResponse\n+ public function image(string $filename, Request $request): Response\n{\n$location = $request->query->get('location', 'files');\n+\n+ // In case we're trying to \"thumbnail\" an svg, just return the whole thing.\n+ if (pathinfo($filename)['extension'] === 'svg') {\n+ $filepath = sprintf('%s%s%s', $this->config->getPath($location), DIRECTORY_SEPARATOR, $filename);\n+\n+ return new Response(file_get_contents($filepath));\n+ }\n+\n$server = ServerFactory::create([\n'response' => new SymfonyResponseFactory(),\n'source' => $this->config->getPath($location),\n" } ]
PHP
MIT License
bolt/core
Allow PNG (and WEBP and SVG) as image uploads
95,192
07.08.2019 14:34:59
-7,200
a7480476f3845ec5d889a93a333823f4bd6fcbdc
line up links in header, tweak responsive nudges to topbar and grid padding plus columns
[ { "change_type": "MODIFY", "old_path": "assets/scss/layout/_admin.scss", "new_path": "assets/scss/layout/_admin.scss", "diff": "height: $admin-toolbar-height;\nwidth: 100vw;\nz-index: 5;\n- @include media-breakpoint-up(md) {\n+ @include media-breakpoint-up(sm) {\nheight: $admin-toolbar-height-wide;\n}\n}\ngrid-column-gap: 1.5rem;\n}\n@include media-breakpoint-up(wd) {\n- grid-column-gap: 1.8125rem;\n- padding: $spacer $spacer*2 $spacer $spacer*1.5;\n+ grid-column-gap: 2rem;\n+ padding: $spacer $spacer*2 $spacer $spacer*2;\n}\n&--has-sidebar {\n// grid-template-columns: 3fr 1fr;\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/modules/admin/_header.scss", "new_path": "assets/scss/modules/admin/_header.scss", "diff": "top: $admin-toolbar-height;\nz-index: 2;\n}\n+ @include media-breakpoint-up(md) {\n+ top: $admin-toolbar-height-wide;\n+ }\n//resets sticky as we don't use it above this breakpoint for now\n@include media-breakpoint-up(lg) {\nposition: static;\ncolor: var(--admin-sidebar);\nmargin-top: $spacer;\nposition: relative;\n+ // max width set for menu button breathing room\n+ max-width: 80%;\n@include media-breakpoint-up(sm) {\n- margin-top: $spacer*1.8125;\n+ margin-top: $spacer*1.25;\n+ // max width set for menu button breathing room\n+ max-width: 85%;\n+ }\n+ @include media-breakpoint-up(md) {\n+ // max width set for menu button breathing room\n+ max-width: 88%;\n+ }\n+ @include media-breakpoint-up(lg) {\n+ max-width: none;\n}\ni {\ncolor: var(--boltblue);\npadding: $spacer*1.25 $spacer*1.25 0;\n}\n@include media-breakpoint-up(wd) {\n- padding: $spacer*1.25 $spacer * 1.8125 1rem;\n+ padding: $spacer*1.25 $spacer*2 1rem;\n}\n}\n&--togglebar {\nposition: absolute;\nz-index: 4;\nwidth: auto;\n- top: 0.625rem;\n+ top: 1.25rem;\nright: 0.625rem;\nborder: 1px solid var(--primary);\npadding: $spacer*0.4 $spacer*1.1;\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/modules/admin/_sidebar.scss", "new_path": "assets/scss/modules/admin/_sidebar.scss", "diff": "height: 100%;\npadding-top: 1.625rem;\n@include media-breakpoint-up(lg) {\n- padding-top: 2.25rem;\n+ padding-top: 1.625rem;\n}\na {\nfont-size: 0.9375rem;\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/modules/admin/_toolbar.scss", "new_path": "assets/scss/modules/admin/_toolbar.scss", "diff": "}\n&__brand {\n+ @include media-breakpoint-up(lg) {\n+ flex: 0 1 $admin-sidebar-width;\n+ }\n+ @include media-breakpoint-up(wd) {\n+ flex: 0 1 $admin-sidebar-width-wide;\n+ }\n.is-slim & {\n}\noverflow: auto;\npadding: 0 1rem;\n}\n+ @include media-breakpoint-up(lg) {\n+ text-align: left;\n+ }\n&:after {\nvertical-align: middle;\n}\n}\n+ .dropdown-menu {\n+ @include media-breakpoint-up(wd) {\n+ min-width: 251px;\n+ }\n+ }\n+\n+ &__new {\n+ .fas {\n+ position: relative;\n+ top: -1px;\n+ }\n+ }\n}\na {\nheight: 100%;\npadding: 0.625rem 1rem;\n+ font-size: 0.875rem;\n+ white-space: nowrap;\n+ @include media-breakpoint-up(sm) {\n+ padding: 0.825rem 1rem;\n+ }\n+ @include media-breakpoint-up(md) {\n+ font-size: 0.9375rem;\n+ }\n}\ni, .fas {\nmargin-right: 0.25rem;\n" }, { "change_type": "MODIFY", "old_path": "assets/scss/modules/listing/_filter.scss", "new_path": "assets/scss/modules/listing/_filter.scss", "diff": "justify-content: space-between;\nmin-height: 40px;\nbackground-color: #fff;\n- padding: 0.35rem 0.625rem 0.35rem 0.5rem;\n+ padding: 0.5rem 0.625rem 0.5rem 0.5rem;\nborder-radius: $border-radius;\noverflow: hidden;\n" } ]
PHP
MIT License
bolt/core
line up links in header, tweak responsive nudges to topbar and grid padding plus columns
95,179
07.08.2019 14:40:00
-7,200
eb7f9fb924352ac0ea2bdc4fb96ae442b2bba653
Fix Missing labels in templates
[ { "change_type": "MODIFY", "old_path": "assets/js/app/listing/Components/Table/Row/_Actions.vue", "new_path": "assets/js/app/listing/Components/Table/Row/_Actions.vue", "diff": "class=\"btn btn-secondary btn-block btn-sm text-nowrap\"\n:href=\"record.extras.editLink\"\n>\n- <i class=\"far fa-edit mr-1\"></i> Edit\n+ <i class=\"far fa-edit mr-1\"></i> {{ labels.button_edit }}\n</a>\n<button\ntype=\"button\"\n" }, { "change_type": "MODIFY", "old_path": "templates/_partials/_content_listing.html.twig", "new_path": "templates/_partials/_content_listing.html.twig", "diff": "'created_on': 'listing_table.actions.created_on'|trans,\n'published_on': 'listing_table.actions.published_on'|trans,\n'last_modified_on': 'listing_table.actions.last_modified_on'|trans,\n+ 'button_edit': 'listing_table.actions.button_edit'|trans,\n}\n}|json_encode }}\"\n></listing-table>\n" }, { "change_type": "MODIFY", "old_path": "templates/finder/finder.html.twig", "new_path": "templates/finder/finder.html.twig", "diff": "<div class=\"card-body\">\n<p class=\"path\">{{ 'caption.path'|trans }}: <code>{{ location }}{{ path }}</code></p>\n- View:\n+ {{ 'finder.label_view'|trans }}\n<div class=\"btn-group\">\n<a class=\"btn btn-secondary\"\nhref=\"{{ path('bolt_filemanager', {'location': location, 'path': path, 'view': 'list' }) }}\">\n" } ]
PHP
MIT License
bolt/core
Fix Missing labels in templates