-
Notifications
You must be signed in to change notification settings - Fork 11
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
#579 [Session] add: move content middle of page #581
Open
evarisk-francois
wants to merge
4
commits into
Evarisk:develop
Choose a base branch
from
evarisk-francois:make_session_content_more_visible
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
a71d27f
#579 [Session] add: move content middle of page
evarisk-francois adc43e3
#579 [Session] add: set content after commonfields view
evarisk-francois dd5740a
Merge branch 'develop' into make_session_content_more_visible
evarisk-francois 19e6641
#579 [Session] add: make content not visible + editable in current view
evarisk-francois 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
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -459,9 +459,14 @@ | |
unset($object->fields['fk_soc']); // Hide field already shown in banner. | ||
unset($object->fields['fk_contrat']); // Hide field already shown in banner. | ||
|
||
$content = $object->fields['content']; | ||
unset($object->fields['content']); | ||
|
||
// Common attributes. | ||
require_once DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_view.tpl.php'; | ||
|
||
$object->fields['content'] = $content; | ||
|
||
// Categories | ||
if ($conf->categorie->enabled) { | ||
print '<tr><td class="valignmiddle">' . $langs->trans('Categories') . '</td><td>'; | ||
|
@@ -478,6 +483,21 @@ | |
|
||
print '<div class="clearboth"></div>'; | ||
|
||
print '<table class="centpercent notopnoleftnoright table-fiche-title">'; | ||
print '<tbody>'; | ||
print '<tr class="titre">'; | ||
print '<td class="nobordernopadding valignmiddle col-title">'; | ||
print '<div class="titre inline-block">' . $langs->trans($content['label']) . '</div>'; | ||
print '</td>'; | ||
print '</tr>'; | ||
print '<tr>'; | ||
print '<td>'; | ||
print '<div class="longmessagecut">' . $object->content . '</div>'; | ||
print '</td>'; | ||
print '</tr>'; | ||
print '</tbody>'; | ||
print '</table>'; | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Pk ne pas utiliser la fonction pour print un titre/ pk ne pas s'inspirer du design de ticket / |
||
print dol_get_fiche_end(); | ||
|
||
$documentTypeArray = ['trainingsession', 'attendancesheet', 'completioncertificate']; | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Logique des Fields pas compris la sa sert a rien