From 5d00501b7f4be0ea348b65a2bfe99f82c7508c5c Mon Sep 17 00:00:00 2001 From: Yuri Salimovskiy Date: Wed, 4 Oct 2023 17:48:25 +0300 Subject: [PATCH 1/6] Added {index} and {absolute_index} variables to {exp:channel:entries} tag --- docs/channels/entries.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/channels/entries.md b/docs/channels/entries.md index 13cade934..12aa330e0 100755 --- a/docs/channels/entries.md +++ b/docs/channels/entries.md @@ -773,6 +773,10 @@ If five entries are being displayed per page, then for the fourth entry on the s **BONUS:** Since the Search module utilizes channel variables, {absolute_count} is also available to the Search Results tag. +### `{absolute_index}` + +Similar to `absolute_count` but starts at 0 instead of 1. So the first entry will have value of "0" and the second entry will have a value of "1" etc. + ### `{absolute_results}` This variable will always display the absolute total number of results that are returned by the tag, regardless of pagination. @@ -947,6 +951,10 @@ The date the entry was submitted in GMT. This variable is **not** localized for The date on which the entry was last edited in GMT. This variable is **not** localized for each user's date settings. See [Date Variable Formatting](templates/date-variable-formatting.md) for more information. +### `{index}` + +Similar to `count` but starts at 0 instead of 1. So the first entry will have value of "0" and the second entry will have a value of "1" etc. + ### `{ip_address}` The IP address of the author when they posted the entry. From c4a481138b4d3c8d6feadeb0321fd7c17789788d Mon Sep 17 00:00:00 2001 From: Eric Swierczek <2423727+swierczek@users.noreply.github.com> Date: Thu, 27 Feb 2025 14:25:16 -0600 Subject: [PATCH 2/6] Update sidebar line height and spacing And update README with another step to view local changes --- README.md | 7 ++++++- theme/_assets/default.min.css | 2 +- theme/assets-src/styles/sidebar.less | 7 ++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index fae2b7c9d..65a71d986 100755 --- a/README.md +++ b/README.md @@ -32,7 +32,12 @@ To build the theme assets, run `npm run buildAssets`. You can also dynamically r ### Viewing local changes -Manually load `/build/index.html` in your browser to view your local build. For example, `file:///Users//Documents/ExpressionEngine-User-Guide/build/index.html`. You can use the side navigation to navigate to different local files, but the search functionality always takes you to the live version at docs.expressionengine.com. +There are 2 options for viewing your local changes. + +1. Run `npx http-server -o` which should make the site available at [http://127.0.0.1:8080/build/](http://127.0.0.1:8080/build/). +2. Manually view any HTML file in `/build/` in your browser. For example, `file:///Users//Documents/ExpressionEngine-User-Guide/build/index.html` to view the home page. + +You can use the side navigation to navigate to different local files, but the search functionality takes you to the live version at [https://docs.expressionengine.com](https://docs.expressionengine.com) unless you follow the steps at [Using DocSearch Locally](#using-docsearch-locally). ## Using DocSearch Locally diff --git a/theme/_assets/default.min.css b/theme/_assets/default.min.css index 5ab44bbcf..b71bfc451 100755 --- a/theme/_assets/default.min.css +++ b/theme/_assets/default.min.css @@ -69,7 +69,7 @@ * @link https://expressionengine.com/ * @copyright Copyright (c) 2003-2020, EllisLab, Inc. (https://packettide.com) * @license https://expressionengine.com/license Licensed under Apache License, Version 2.0 - */.sidebar-container{position:fixed;left:0;top:50px;bottom:0;background-color:#f7f7fa;width:100%;z-index:30;display:none}@media only screen and (min-width:900px){.sidebar-container{display:block;height:calc(100% - 70px);top:70px;width:280px}}@media only screen and (min-width:1200px){.sidebar-container{min-width:280px;width:280px;width:calc(((100% - 1200px)/ 2) + 280px)}}.sidebar{margin-left:0;width:100%;height:100%;position:relative;background-color:#f7f7fa;display:flex;flex-direction:column}@media only screen and (min-width:900px){.sidebar{width:280px;float:right}}.sidebar-toc{overflow-y:auto;margin:0 0 1px 0;position:relative;padding-bottom:15px}.sidebar-search{width:100%;padding:20px}.sidebar-search .algolia-autocomplete{width:100%}.search-input{width:100%;padding:6px 30px 6px 10px;border-radius:5px;border:1px solid #e6e6f0;outline:0;background:url(images/search.svg) no-repeat;background-position:right 10px center;transition:border 150ms ease,box-shadow 150ms ease;background-color:#fff}.search-input:focus{border:1px solid #4a62ff;box-shadow:0 8px 10px -10px rgba(52,22,201,.1),0 5px 10px rgba(19,114,198,.04)}.search-input::placeholder{color:#747f8f;opacity:1}.sidebar-sponsor{display:none;padding-top:20px}.sidebar-sponsor p{font-weight:700}.sidebar-sponsor img{padding-top:10px}.sidebar ul{list-style-type:none;font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Roboto,Arial,sans-serif}.sidebar-toc{font-size:.98em}.sidebar-toc>ul{padding:0 0 0 40px;margin:0}.sidebar-toc li ul{margin:8px 0 0 1em;padding-left:1em;border-left:1px solid #e2e5ee}.sidebar-toc li{margin-bottom:5px;color:#544e72;padding-right:10px}.sidebar-toc>ul>li{margin:0 0 10px 0;font-size:.95em}.sidebar-toc>ul>li>a{color:#757698;font-weight:700}.sidebar-toc>li>li{font-size:.95em}.sidebar-toc li.active>a{color:#f62958}.sidebar-toc li a{transition:all 250ms ease;display:block}.sidebar-toc li a:hover{color:#f62958;cursor:pointer}.sidebar-toc li[data-active-page=true]>a{color:#f62958}.sidebar h2{text-transform:uppercase;letter-spacing:1px;font-size:90%;color:#afb0bf;font-weight:700;margin-bottom:15px;padding-left:20px;padding-right:10px}.sidebar h2:not(:first-of-type){margin-top:30px}/*! + */.sidebar-container{position:fixed;left:0;top:50px;bottom:0;background-color:#f7f7fa;width:100%;z-index:30;display:none}@media only screen and (min-width:900px){.sidebar-container{display:block;height:calc(100% - 70px);top:70px;width:280px}}@media only screen and (min-width:1200px){.sidebar-container{min-width:280px;width:280px;width:calc(((100% - 1200px)/ 2) + 280px)}}.sidebar{margin-left:0;width:100%;height:100%;position:relative;background-color:#f7f7fa;display:flex;flex-direction:column}@media only screen and (min-width:900px){.sidebar{width:280px;float:right}}.sidebar-toc{overflow-y:auto;margin:0 0 1px 0;position:relative;padding-bottom:15px}.sidebar-search{width:100%;padding:20px}.sidebar-search .algolia-autocomplete{width:100%}.search-input{width:100%;padding:6px 30px 6px 10px;border-radius:5px;border:1px solid #e6e6f0;outline:0;background:url(images/search.svg) no-repeat;background-position:right 10px center;transition:border 150ms ease,box-shadow 150ms ease;background-color:#fff}.search-input:focus{border:1px solid #4a62ff;box-shadow:0 8px 10px -10px rgba(52,22,201,.1),0 5px 10px rgba(19,114,198,.04)}.search-input::placeholder{color:#747f8f;opacity:1}.sidebar-sponsor{display:none;padding-top:20px}.sidebar-sponsor p{font-weight:700}.sidebar-sponsor img{padding-top:10px}.sidebar ul{list-style-type:none;font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Roboto,Arial,sans-serif}.sidebar-toc{font-size:.98em}.sidebar-toc>ul{padding:0 0 0 40px;margin:0}.sidebar-toc li ul{margin:18px 0 0 1em;padding-left:1em;border-left:1px solid #e2e5ee}.sidebar-toc li{margin-bottom:13px;color:#544e72;padding-right:10px}.sidebar-toc>ul>li{margin:0 0 18px 0;font-size:.95em;line-height:1.14em}.sidebar-toc>ul>li>a{color:#757698;font-weight:700}.sidebar-toc>li>li{font-size:.95em}.sidebar-toc li.active>a{color:#f62958}.sidebar-toc li a{transition:all 250ms ease;display:block}.sidebar-toc li a:hover{color:#f62958;cursor:pointer}.sidebar-toc li[data-active-page=true]>a{color:#f62958}.sidebar h2{text-transform:uppercase;letter-spacing:1px;font-size:90%;color:#afb0bf;font-weight:700;margin-bottom:15px;padding-left:20px;padding-right:10px}.sidebar h2:not(:first-of-type){margin-top:30px}/*! * This source file is part of the open source project * ExpressionEngine User Guide (https://github.com/ExpressionEngine/ExpressionEngine-User-Guide) * diff --git a/theme/assets-src/styles/sidebar.less b/theme/assets-src/styles/sidebar.less index cf7abbcd0..0c60f8142 100755 --- a/theme/assets-src/styles/sidebar.less +++ b/theme/assets-src/styles/sidebar.less @@ -126,22 +126,23 @@ } // All nested lists .sidebar-toc li ul { - margin: 8px 0 0 1em; + margin: 18px 0 0 1em; padding-left: 1em; border-left: 1px solid rgb(226, 229, 238); } // All items .sidebar-toc li { - margin-bottom: 5px; + margin-bottom: 13px; color: @dark-grey; padding-right: @p-sm; } // First level items .sidebar-toc > ul > li { - margin: 0 0 10px 0; + margin: 0 0 18px 0; font-size: 0.95em; + line-height: 1.14em; } .sidebar-toc > ul > li > a { color: rgb(117, 118, 152); From de043a1683b9abb136245a78751ec385c02c84ec Mon Sep 17 00:00:00 2001 From: robinsowell Date: Thu, 6 Mar 2025 14:38:06 -0500 Subject: [PATCH 3/6] file cache busting and missing icons Gave an example of cache busting for images and fixed a few missing images --- docs/fieldtypes/file.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/fieldtypes/file.md b/docs/fieldtypes/file.md index 1fc2bbb2e..be32a47ca 100755 --- a/docs/fieldtypes/file.md +++ b/docs/fieldtypes/file.md @@ -25,7 +25,8 @@ A File field allows you to browse through existing files and upload new files. ![file field with file selected](_images/field_file_file.png) -Once a file has been selected in the field, that file can be replaced by clicking the edit icon icon. The field selection can be cleared by clicking remove icon icon (this will not remove the file from the system). You can also change the file metadata (such as the title or description) by clicking the settings icon icon - please note that file's metadata will be changed globally throughout the system. +Once a file has been selected in the field, that file can be replaced by clicking the edit icon icon. The field selection can be cleared by clicking remove icon icon (this will not remove the file from the system). You can also change the file metadata (such as the title or description) by clicking the settings icon icon - please note that file's metadata will be changed globally throughout the system. ## Field Settings @@ -170,6 +171,12 @@ The automatically-detected MIME type of the file. The date the file was last modified. See [Date Variable Formatting](templates/date-variable-formatting.md) for more information. +One powerful use of the modified_date is 'cache busting', forcing browers to use a new image rather than a cached one when an image is modified but not renamed: + + {image} + + {/image} + ### `{path}` The URL to the folder containing the file, including a trailing slash. From 51131cdfd3b6c491fd189a629d903e2c40367075 Mon Sep 17 00:00:00 2001 From: Jared Chesebro Date: Fri, 21 Mar 2025 08:36:52 -0700 Subject: [PATCH 4/6] Update env-support.md --- docs/advanced-usage/env-support.md | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/docs/advanced-usage/env-support.md b/docs/advanced-usage/env-support.md index 7caba389e..6a6f3668b 100644 --- a/docs/advanced-usage/env-support.md +++ b/docs/advanced-usage/env-support.md @@ -31,12 +31,11 @@ This variable can now be used in your `/system/user/config.php` as illustrated b Here is an example of what it might look like to manage all your database connection settings, and Base URL in `.env.php` ``` -// .env.php - -// URLs +# .env.php +# URLs BASE_URL=http://mysite.test/ -// DATABASE SETTINGS +# DATABASE SETTINGS DB_HOSTNAME=db DB_DATABASE=db DB_USERNAME=db @@ -44,6 +43,8 @@ DB_PASSWORD=db DB_PORT=3306 ``` +NOTE: You must use `#` for comments within `.env.php`. Using `//` will result in your `.env.php` being unable to be read. + ``` // system/user/config.php Date: Wed, 26 Mar 2025 11:08:23 -0400 Subject: [PATCH 5/6] Version 7.5.9 --- docs/installation/changelog.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/docs/installation/changelog.md b/docs/installation/changelog.md index 6f0690f7b..798aa9ece 100755 --- a/docs/installation/changelog.md +++ b/docs/installation/changelog.md @@ -8,6 +8,30 @@ --> # ExpressionEngine v7 Change Log +## Version 7.5.9 +(Release: March 26th, 2025) + +
+
+ +
+
+ +**Bug Fixes** 💃🐛 + +- Resolved [#4692](https://github.com/ExpressionEngine/ExpressionEngine/issues/4692) where Search add-on did not include enough custom fields when searching multiple channels +- Resolved [#4745](https://github.com/ExpressionEngine/ExpressionEngine/issues/4745) where using `edit_date` variable in Structure navigation was giving PHP error +- Resolved [#4725](https://github.com/ExpressionEngine/ExpressionEngine/issues/4725) where Search was showing an error if `results` parameter was too big +- Resolved [#4720](https://github.com/ExpressionEngine/ExpressionEngine/issues/4720) where file usage was not calculated correctly for textareas containing multiple images +- Resolved [#4689](https://github.com/ExpressionEngine/ExpressionEngine/issues/4689) where adding category from entry page could show wrong UI +- Resolved [#4682](https://github.com/ExpressionEngine/ExpressionEngine/issues/4682) where cloning entry with hidden RTE field was giving PHP error +- Resolved an issue where curl requests on Windows could not use the native root certificate store +- Resolved an issue where updates from the CLI would not increment the version number + ## Version 7.5.8 (Release: March 4th, 2025) From 08b8a32770e78f6a136744f523935d09818201f8 Mon Sep 17 00:00:00 2001 From: Bryan Nielsen Date: Wed, 26 Mar 2025 11:38:47 -0400 Subject: [PATCH 6/6] Update comment formatting in code block to avoid issues with markdown parser --- docs/advanced-usage/env-support.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/advanced-usage/env-support.md b/docs/advanced-usage/env-support.md index 6a6f3668b..99aa10bc2 100644 --- a/docs/advanced-usage/env-support.md +++ b/docs/advanced-usage/env-support.md @@ -8,7 +8,7 @@ --> # ENV File Support -Config files can also be configured using [PHP Environment variables ($_ENV)](https://www.php.net/manual/en/reserved.variables.environment.php). To utilize this, create a file named `.env.php` in the root of your ExpressionEngine install. +Config files can also be configured using [PHP Environment variables ($_ENV)](https://www.php.net/manual/en/reserved.variables.environment.php). To utilize this, create a file named `.env.php` in the root of your ExpressionEngine install. NOTE: The `.env.php` file must be placed in same directory as the `system` directory. If you move the `system` directory above the webroot you must also move `.env.php`. @@ -31,11 +31,11 @@ This variable can now be used in your `/system/user/config.php` as illustrated b Here is an example of what it might look like to manage all your database connection settings, and Base URL in `.env.php` ``` -# .env.php -# URLs +#.env.php +#URLs BASE_URL=http://mysite.test/ -# DATABASE SETTINGS +#DATABASE SETTINGS DB_HOSTNAME=db DB_DATABASE=db DB_USERNAME=db @@ -84,15 +84,15 @@ The site short name can be accessed in the code using `$GLOBALS['assign_to_confi The below example demonstrates this approach, assuming you have 2 MSM sites with short names of `default_site` and `second_site` ``` -# .env.php -# SITE-SPECIFIC SETTINGS +#.env.php +#SITE-SPECIFIC SETTINGS default_site.BASE_PATH=/home/sites/mysite.test/ default_site.BASE_URL=http://mysite.test/ second_site.BASE_PATH=/home/sites/anothersite.test/ second_site.BASE_URL=http://anothersite.test/ -# DATABASE SETTINGS +#DATABASE SETTINGS DB_HOSTNAME=db DB_DATABASE=db DB_USERNAME=db