-
-
Notifications
You must be signed in to change notification settings - Fork 15
NovaeZEditHelpBundle Ibexa4 #137
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 7 commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
cb5134d
NovaeZEditHelpBundle Ibexa4
RemyNovactive 013881d
NovaeZEditHelpBundle Ibexa4
RemyNovactive bdbb5f5
Merge branch 'master' into EditHelpBundle-ibexa4
RemyNovactive 4b2ac8b
NovaeZEditHelpBundle Ibexa4
RemyNovactive 74597fc
NovaeZEditHelpBundle Ibexa4
RemyNovactive ef9126e
NovaeZEditHelpBundle Ibexa4
RemyNovactive bf6e1e9
NovaeZEditHelpBundle Ibexa4
RemyNovactive bbfaeaa
NovaeZEditHelpBundle Ibexa4
RemyNovactive 9d1bd5e
Merge branch 'master' into EditHelpBundle-ibexa4
RemyNovactive daf7956
#110425 - Mettre à jour et installer le bundle NovaeZEditHelpBundle
RemyNovactive 3af92df
#110425 - Mettre à jour et installer le bundle NovaeZEditHelpBundle
RemyNovactive d4f8fea
Merge branch 'master-ibexa-4.x' into EditHelpBundle-ibexa4
RemyNovactive 38dc1ef
Closing brace must be on a line by itself
RemyNovactive 53c62b2
Function closing brace must go on the next line following the body; f…
RemyNovactive File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
43 changes: 39 additions & 4 deletions
43
...nents/EditHelpBundle/bundle/Resources/views/themes/admin/content/edit/edit_help.html.twig
This file contains hidden or 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
101 changes: 56 additions & 45 deletions
101
components/EditHelpBundle/bundle/Resources/views/themes/admin/content/edit/tophelp.html.twig
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,59 +1,70 @@ | ||
| {% trans_default_domain 'ezedithelp' %} | ||
| {% if documentation is defined %} | ||
| <div class="alert alert-primary alert-dismissible fade show" role="alert"> | ||
| <p>{{ "edithelp.alert"|trans }}:</p> | ||
| <div class="row"> | ||
| <div class="col-4"> | ||
| <div class="card p-2"> | ||
| {% if not ez_field_is_empty(documentation, 'image') %} | ||
| {{ ez_render_field(documentation, 'image') }} | ||
| {% endif %} | ||
| <div class="card-body"> | ||
| {% if not ez_field_is_empty(documentation, 'title') %} | ||
| <h5>{{ ez_render_field(documentation, 'title') }}</h5> | ||
| {% endif %} | ||
| {% if not ez_field_is_empty(documentation, 'body') %} | ||
| {{ ez_render_field(documentation, 'body') }} | ||
| {% endif %} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="col-8"> | ||
| <div class="alert ibexa-alert ibexa-alert--info ibexa-alert--toast" role="alert"> | ||
| <div class="ibexa-alert__content "> | ||
| <div class="ibexa-alert__title">{{ "edithelp.alert"|trans }}:</div> | ||
| <div class="ibexa-alert__extra_content"> | ||
| <div class="row"> | ||
| <div class="col-3"> | ||
| <div class="nav flex-column nav-pills" id="v-pills-tab" role="tablist" aria-orientation="vertical"> | ||
| {% for identifier,item in documentation_items %} | ||
| <a class="nav-link {% if loop.first %} active {% endif %}" id="{{ identifier }}" data-toggle="pill" href="#v-pills-{{ identifier }}" role="tab"> | ||
| {% if not ez_field_is_empty(item, 'title') %} | ||
| {{ ez_render_field(item, 'title') }} | ||
| {% else %} | ||
| {{ identifier }} | ||
| {% endif %} | ||
| </a> | ||
| {% endfor %} | ||
| <div class="col-4"> | ||
| <div class="card p-2"> | ||
| {% if not ibexa_field_is_empty(documentation, 'image') %} | ||
| {{ ibexa_render_field(documentation, 'image', { | ||
| template: '@ibexadesign/fields/simple_ezimage_field.html.twig' | ||
| }) }} | ||
| {% endif %} | ||
| <div class="card-body"> | ||
| {% if not ibexa_field_is_empty(documentation, 'title') %} | ||
| <h5>{{ ibexa_render_field(documentation, 'title') }}</h5> | ||
| {% endif %} | ||
| {% if not ibexa_field_is_empty(documentation, 'body') %} | ||
| {{ ibexa_render_field(documentation, 'body') }} | ||
| {% endif %} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="col-9"> | ||
| <div class="tab-content" id="v-pills-tabContent"> | ||
| {% for identifier,item in documentation_items %} | ||
| <div class="tab-pane fade show {% if loop.first %} active {% endif %}" id="v-pills-{{ identifier }}" role="tabpanel"> | ||
| {% if item != 'identifier' and not ez_field_is_empty(item, identifier) %} | ||
| {% if not ez_field_is_empty(item, 'body') %} | ||
| {{ ez_render_field(item, 'body') }} | ||
| {% endif %} | ||
| {% if not ez_field_is_empty(item, 'image') %} | ||
| {{ ez_render_field(item, 'image') }} | ||
| {% endif %} | ||
| {% endif %} | ||
| <div class="col-8"> | ||
| <div class="row"> | ||
| <div class="col-3"> | ||
| <div class="nav flex-column nav-pills" id="v-pills-tab" role="tablist" aria-orientation="vertical"> | ||
| {% for identifier, item in documentation_items %} | ||
| <a class="nav-link {% if loop.first %} active {% endif %}" id="{{ identifier }}" data-bs-toggle="pill" | ||
| href="#v-pills-{{ identifier }}" | ||
| data-bs-target="#v-pills-{{ identifier }}" | ||
| role="tab"> | ||
| {% if not ibexa_field_is_empty(item, 'title') %} | ||
| {{ ibexa_render_field(item, 'title') }} | ||
| {% else %} | ||
| {{ identifier }} | ||
| {% endif %} | ||
| </a> | ||
| {% endfor %} | ||
| </div> | ||
| </div> | ||
| <div class="col-9"> | ||
| <div class="tab-content" id="v-pills-tabContent"> | ||
| {% for identifier, item in documentation_items %} | ||
| <div class="tab-pane fade show {% if loop.first %} active {% endif %}" id="v-pills-{{ identifier }}" role="tabpanel"> | ||
| {% if not ibexa_field_is_empty(item, 'body') %} | ||
| {{ ibexa_render_field(item, 'body') }} | ||
| {% endif %} | ||
| {% if not ibexa_field_is_empty(item, 'image') %} | ||
| {{ ibexa_render_field(item, 'image', { | ||
| template: '@ibexadesign/fields/simple_ezimage_field.html.twig' | ||
| }) }} | ||
| {% endif %} | ||
| </div> | ||
| {% endfor %} | ||
| </div> | ||
| {% endfor %} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <button type="button" class="close" data-dismiss="alert" aria-label="Close"> | ||
| <span aria-hidden="true">×</span> | ||
| <button class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--small ibexa-btn--no-text ibexa-alert__close-btn" data-bs-dismiss="alert"> | ||
| <svg class="ibexa-icon ibexa-icon--tiny-small"> | ||
| <use xlink:href="/bundles/ibexaicons/img/all-icons.svg#discard"></use> | ||
| </svg> | ||
| </button> | ||
| </div> | ||
| {% endif %} |
18 changes: 18 additions & 0 deletions
18
.../EditHelpBundle/bundle/Resources/views/themes/admin/fields/simple_ezimage_field.html.twig
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| {% extends '@IbexaAdminUi/themes/admin/ui/field_type/preview/content_fields.html.twig' %} | ||
|
|
||
| {% block ezimage_field %} | ||
| {% apply spaceless %} | ||
| {% if not ibexa_field_is_empty( content, field ) %} | ||
| {% set imageAlias = ibexa_image_alias( field, versionInfo, parameters.alias|default( 'original' ) ) %} | ||
| {% set src = imageAlias ? asset( imageAlias.uri ) : "//:0" %} | ||
| {% set attr = attr|merge({'class': (attr.class|default('') ~ ' ez-field-preview ez-field-preview--ezimage')|trim}) %} | ||
| <div {{ block( 'field_attributes' ) }}> | ||
| <div class="ez-field-preview__image-wrapper"> | ||
| <div class="ez-field-preview__image"> | ||
| <img src="{{ src }}"> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| {% endif %} | ||
| {% endapply %} | ||
| {% endblock %} |
This file contains hidden or 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
This file contains hidden or 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
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.
Uh oh!
There was an error while loading. Please reload this page.