support multiple help elements #2847
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -25,7 +25,13 @@ col-sm-9 | |||
| {{ form_widget(form) }} | |||
| {{ form_errors(form) }} | |||
| {% if help is defined %} | |||
| <em class="help-block small">{{ help }}</em> | |||
| {% if help is iterable %} | |||
There was a problem hiding this comment.
what if help is not defined or empty? I had already changed these locally to help|default
There was a problem hiding this comment.
{% if help is defined %} is still there above this line
|
I should have asked you to update the documentation for this also. Can you please do that? |
|
Added in 50906c0 |
Guite
added a commit
that referenced
this pull request
Apr 25, 2016
* refactored pagelock module to 2.0 style * typo * added missing service argument * several improvements * minor fixes * several amendments * rename method * typo * minor fix for composer.json * minor docblock fix * minor amendments * minor cleanup regarding Multisites * Fixed StyleCI issue * update composer.lock updates - paragonie/random_compat (v1.2.2 => v1.4.1) - ezyang/htmlpurifier dev-master (92aabf2 => 25db9e1) - abeautifulsite/jquery-minicolors dev-master (8039c59 => 543116f) * Rename setasdefault.html.twig to setAsDefault.html.twig * Rename viewmodulelist.html.twig to viewModuleList.html.twig * Rename moduleservices.html.twig to moduleServices.html.twig * Revert changes in admin api * updated clickjacking protection listener * use array shorthand syntax, added some missing docblocks * fixed regression * correct string translation. refs zikula-modules/MediaModule#64 * use non-aliased service name. refs #2808 @Guite * use array shorthand syntax, added some missing docblocks (reverted from commit 93f6a61) * corrected method call of variable api, fixed #2812 * disable dependency check for vendors in modules. * disable dependency check for vendors in modules. * Don't use PHP_VERSION constant * Removed {break} Smarty tag * Fix output of theme maincontent to NOT automatically include a unique div wrapper. Move wrapper to AbstractTheme. | Q | A | ----------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Fixed tickets | - | Refs tickets | #2819 | License | MIT | Changelog updated | no * Added issue and pull request tempaltes, closes #2778. * update composer.json to include robloach/component-install as an explicit dependency. update composer.lock * update method for php strict standards * Remove dev-master for two dependencies. * Added Vagrant support. * correct typehint in ZikulaPhpFileExtractor * | Q | A | ----------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #2823 | Refs tickets | - | License | MIT | Doc PR | - | Changelog updated | no * minor correction to Categories Form Type * correct display of developer notice in Admin panel for new admin header. fixes #2828 * grduingly provide backward compatible installer for 'transition' modules. fixes #2831 * Make Bootstrap theme site default. | Q | A | ----------------- | --- | Bug fix? | yes | New feature? | yes | BC breaks? | no | Deprecations? | no | Fixed tickets | - | Refs tickets | - | License | MIT | Changelog updated | yes ## Description Make Bootstrap theme site default (new features added, blocks and permissions adjusted specific to theme). Improved compatibility of zikula-specific bootstrap overrides with respect to navbars. Provide method for customizing Bootstrap path in Core-2.0 themes ## Todos - [x] Tests - [x] Documentation - [x] Changelog * update composer.lock * Create Theme permission at installation. Include selected theme in permission check. * update composer.lock cc/ @Guite * Updated Symfony version * update Core version to 1.4.3 * update changelog for 1.4.3 * refactor Settings module to Core-2.0 spec. | Q | A | ----------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Fixed tickets | - | Refs tickets | #2034, #1753 | License | MIT | Changelog updated | yes * additional features to bootstrap topnav login button to allow improved access to user-related functions. * minor css fix to bootstrap theme topnav login block * update composer.lock - Removing nikic/php-parser (v1.4.1) - Installing nikic/php-parser (v2.0.1) - Removing jms/translation-bundle (1.2.1) - Installing jms/translation-bundle (1.2.2) - Removing monolog/monolog (1.18.1) - Installing monolog/monolog (1.18.2) - Updating ezyang/htmlpurifier dev-master (096064d => 2e15d7a) Checking out 2e15d7a4dadb08ccdac3f060dcf81112e607b6c4 * fix error on creation of new ExtendedMenublock * fix StyleCi error * update composer.lock. force 1.4 branch of php-parser - Removing composer/installers (v1.0.23) - Installing composer/installers (v1.0.24) - Removing nikic/php-parser (v2.0.1) - Installing nikic/php-parser (v1.4.1) * Form improvements (#2846) * update form extensions to Sy2.8 and add a few features @Guite 😄 * update changelog * support multiple help elements (#2847) * support multiple help elements * Check for empty help values * Adjust form theme template to use macros to avoid duplicate code. Add alert text feature. @Guite * Added information about using help arrays * correct upgrade of 'hybrid' 1.4/2.0 modules * allow alerts on checkboxes also. * refactored pagelock module to 2.0 style * typo * added missing service argument * several improvements * minor fixes * several amendments * rename method * typo * minor fix for composer.json * minor docblock fix * minor amendments
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This change allows defining more than one help text using an array.