Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Libriciel
web-DPO
Commits
beaf2dd2
Commit
beaf2dd2
authored
Aug 14, 2020
by
Théo GUILLON
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Modification : du type d'info bulle (popover)
parent
0cc2ac1c
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
101 additions
and
15 deletions
+101
-15
app/View/Elements/Fiches/tabs/informationComplementaire.ctp
app/View/Elements/Fiches/tabs/informationComplementaire.ctp
+4
-1
app/View/Elements/Fiches/tabs/informationGenerale.ctp
app/View/Elements/Fiches/tabs/informationGenerale.ctp
+24
-7
app/View/Elements/Formulaires/tabs/informationComplementaire.ctp
...w/Elements/Formulaires/tabs/informationComplementaire.ctp
+4
-1
app/View/Elements/Formulaires/tabs/informationGenerale.ctp
app/View/Elements/Formulaires/tabs/informationGenerale.ctp
+24
-6
app/View/Fiches/add.ctp
app/View/Fiches/add.ctp
+12
-0
app/View/Fiches/show.ctp
app/View/Fiches/show.ctp
+11
-0
app/View/Formulaires/edit.ctp
app/View/Formulaires/edit.ctp
+11
-0
app/View/Formulaires/show.ctp
app/View/Formulaires/show.ctp
+11
-0
No files found.
app/View/Elements/Fiches/tabs/informationComplementaire.ctp
View file @
beaf2dd2
...
...
@@ -95,7 +95,10 @@ if (!isset($fieldsIsRequired)){
'text'
=>
$this
->
Html
->
tag
(
'abbr'
,
__d
(
'fiche'
,
'fiche.champBaselegale'
),
[
'title'
=>
__d
(
'fiche'
,
'fiche.champBaselegaleDefinition'
)]
[
'data-content'
=>
nl2br
(
__d
(
'fiche'
,
'fiche.champBaselegaleDefinition'
)),
'class'
=>
'popoverText'
]
)
],
'multiple'
=>
'checkbox'
,
...
...
app/View/Elements/Fiches/tabs/informationGenerale.ctp
View file @
beaf2dd2
...
...
@@ -253,7 +253,6 @@ if (!isset($fieldsIsRequired)){
<!-- Colonne de gauche -->
<div
class=
"col-md-6"
>
<?php
echo
$this
->
WebcilForm
->
inputs
([
'WebdpoFiche.outilnom'
=>
[
'id'
=>
'outilnom'
,
...
...
@@ -273,7 +272,10 @@ if (!isset($fieldsIsRequired)){
'text'
=>
$this
->
Html
->
tag
(
'abbr'
,
__d
(
'fiche'
,
'fiche.champTransfertHorsUe'
),
[
'title'
=>
__d
(
'fiche'
,
'fiche.champTransfertHorsUeDefinition'
)]
[
'data-content'
=>
nl2br
(
__d
(
'fiche'
,
'fiche.champTransfertHorsUeDefinition'
)),
'class'
=>
'popoverText'
]
)
],
'class'
=>
'transformSelect form-control'
,
...
...
@@ -292,7 +294,10 @@ if (!isset($fieldsIsRequired)){
'text'
=>
$this
->
Html
->
tag
(
'abbr'
,
__d
(
'fiche'
,
'fiche.champDonneesSensibles'
),
[
'title'
=>
__d
(
'fiche'
,
'fiche.champDonneesSensiblesDefinition'
)]
[
'data-content'
=>
nl2br
(
__d
(
'fiche'
,
'fiche.champDonneesSensiblesDefinition'
)),
'class'
=>
'popoverText'
]
)
],
'class'
=>
'transformSelect form-control'
,
...
...
@@ -314,7 +319,10 @@ if (!isset($fieldsIsRequired)){
'text'
=>
$this
->
Html
->
tag
(
'abbr'
,
__d
(
'fiche'
,
'fiche.champFinaliteprincipale'
),
[
'title'
=>
__d
(
'fiche'
,
'fiche.champFinaliteprincipaleDefinition'
)]
[
'data-content'
=>
nl2br
(
__d
(
'fiche'
,
'fiche.champFinaliteprincipaleDefinition'
)),
'class'
=>
'popoverText'
]
)
],
'type'
=>
'textarea'
,
...
...
@@ -384,7 +392,10 @@ if (!isset($fieldsIsRequired)){
'text'
=>
$this
->
Html
->
tag
(
'abbr'
,
__d
(
'fiche'
,
'fiche.champRealisationPia'
),
[
'title'
=>
__d
(
'fiche'
,
'fiche.champRealisationPiaDefinition'
)]
[
'data-content'
=>
nl2br
(
__d
(
'fiche'
,
'fiche.champRealisationPiaDefinition'
)),
'class'
=>
'popoverText'
]
)
],
'class'
=>
'transformSelect form-control'
,
...
...
@@ -441,7 +452,10 @@ if (!isset($fieldsIsRequired)){
'text'
=>
$this
->
Html
->
tag
(
'abbr'
,
__d
(
'fiche'
,
'fiche.champCoresponsable'
),
[
'title'
=>
__d
(
'fiche'
,
'fiche.champCoresponsableDefinition'
)]
[
'data-content'
=>
nl2br
(
__d
(
'fiche'
,
'fiche.champCoresponsableDefinition'
)),
'class'
=>
'popoverText'
]
)
],
'class'
=>
'transformSelect form-control'
,
...
...
@@ -480,7 +494,10 @@ if (!isset($fieldsIsRequired)){
'text'
=>
$this
->
Html
->
tag
(
'abbr'
,
$libelleFieldSoustraitance
,
[
'title'
=>
__d
(
'fiche'
,
'fiche.champSoustraitanceDefinition'
)]
[
'data-content'
=>
nl2br
(
__d
(
'fiche'
,
'fiche.champSoustraitanceDefinition'
)),
'class'
=>
'popoverText'
]
)
],
'options'
=>
[
...
...
app/View/Elements/Formulaires/tabs/informationComplementaire.ctp
View file @
beaf2dd2
...
...
@@ -87,7 +87,10 @@ if ($this->request->params['action'] == 'add'){
'text'
=>
$this
->
Html
->
tag
(
'abbr'
,
__d
(
'fiche'
,
'fiche.champBaselegale'
),
[
'title'
=>
__d
(
'fiche'
,
'fiche.champBaselegaleDefinition'
)]
[
'data-content'
=>
nl2br
(
__d
(
'fiche'
,
'fiche.champBaselegaleDefinition'
)),
'class'
=>
'popoverText'
]
)
],
'multiple'
=>
'checkbox'
,
...
...
app/View/Elements/Formulaires/tabs/informationGenerale.ctp
View file @
beaf2dd2
...
...
@@ -91,7 +91,10 @@
'text' => $this->Html->tag(
'abbr',
__d('fiche', 'fiche.champTransfertHorsUe'),
['title' => __d('fiche', 'fiche.champTransfertHorsUeDefinition')]
[
'data-content' => nl2br(__d('fiche', 'fiche.champTransfertHorsUeDefinition')),
'class' => 'popoverText'
]
)
],
'class' => 'transformSelect form-control',
...
...
@@ -111,7 +114,10 @@
'text' => $this->Html->tag(
'abbr',
__d('fiche', 'fiche.champDonneesSensibles'),
['title' => __d('fiche', 'fiche.champDonneesSensiblesDefinition')]
[
'data-content' => nl2br(__d('fiche', 'fiche.champDonneesSensiblesDefinition')),
'class' => 'popoverText'
]
)
],
'class' => 'transformSelect form-control',
...
...
@@ -134,7 +140,10 @@
'text' => $this->Html->tag(
'abbr',
__d('fiche', 'fiche.champFinaliteprincipale'),
['title' => __d('fiche', 'fiche.champFinaliteprincipaleDefinition')]
[
'data-content' => nl2br(__d('fiche', 'fiche.champFinaliteprincipaleDefinition')),
'class' => 'popoverText'
]
)
],
'type' => 'textarea',
...
...
@@ -192,7 +201,10 @@
'text' => $this->Html->tag(
'abbr',
__d('fiche', 'fiche.champRealisationPia'),
['title' => __d('fiche', 'fiche.champRealisationPiaDefinition')]
[
'data-content' => nl2br(__d('fiche', 'fiche.champRealisationPiaDefinition')),
'class' => 'popoverText'
]
)
],
'class' => 'transformSelect form-control',
...
...
@@ -248,7 +260,10 @@
'text' => $this->Html->tag(
'abbr',
__d('fiche', 'fiche.champCoresponsable'),
['title' => __d('fiche', 'fiche.champCoresponsableDefinition')]
[
'data-content' => nl2br(__d('fiche', 'fiche.champCoresponsableDefinition')),
'class' => 'popoverText'
]
)
],
'default' => false,
...
...
@@ -287,7 +302,10 @@
'text' => $this->Html->tag(
'abbr',
$libelleFieldSoustraitance,
['title' => __d('fiche', 'fiche.champSoustraitanceDefinition')]
[
'data-content' => nl2br(__d('fiche', 'fiche.champSoustraitanceDefinition')),
'class' => 'popoverText'
]
)
],
'options' => [
...
...
app/View/Fiches/add.ctp
View file @
beaf2dd2
...
...
@@ -414,6 +414,18 @@ echo $this->WebcilForm->end();
displayTabSousTraitances
(
newValSousTraitance
);
});
$
(
'
.popoverText
'
).
popover
({
delay
:
{
show
:
500
,
hide
:
100
},
placement
:
'
right
'
,
trigger
:
'
hover
'
,
container
:
'
body
'
,
html
:
true
,
});
});
function
displayTabCoresponsables
(
val
){
...
...
app/View/Fiches/show.ctp
View file @
beaf2dd2
...
...
@@ -256,5 +256,16 @@ echo $this->WebcilForm->end();
$
(
'
.btn
'
).
prop
(
"
disabled
"
,
false
);
$
(
'
.close
'
).
prop
(
"
disabled
"
,
false
);
$
(
'
.popoverText
'
).
popover
({
delay
:
{
show
:
500
,
hide
:
100
},
placement
:
'
right
'
,
trigger
:
'
hover
'
,
container
:
'
body
'
,
html
:
true
,
});
});
</script>
app/View/Formulaires/edit.ctp
View file @
beaf2dd2
...
...
@@ -209,6 +209,17 @@ echo $this->WebcilForm->end();
$
(
"
a[href='#
"
+
$
(
pane
).
attr
(
'
id
'
)
+
"
']
"
).
append
(
"
<span class='fa fa-exclamation-circle fa-danger' aria-hidden='true'/>
"
);
});
$
(
'
.popoverText
'
).
popover
({
delay
:
{
show
:
500
,
hide
:
100
},
placement
:
'
right
'
,
trigger
:
'
hover
'
,
container
:
'
body
'
,
html
:
true
,
});
});
</script>
\ No newline at end of file
app/View/Formulaires/show.ctp
View file @
beaf2dd2
...
...
@@ -284,6 +284,17 @@ echo $this->WebcilForm->end();
createForm
(
'
coresponsable
'
);
createForm
(
'
soustraitant
'
);
$
(
'
.popoverText
'
).
popover
({
delay
:
{
show
:
500
,
hide
:
100
},
placement
:
'
right
'
,
trigger
:
'
hover
'
,
container
:
'
body
'
,
html
:
true
,
});
});
</script>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment