diff --git a/src/css/default/LSaccessRightsMatrixView.css b/src/css/default/LSaccessRightsMatrixView.css index 32fa1902..d6f2bf75 100644 --- a/src/css/default/LSaccessRightsMatrixView.css +++ b/src/css/default/LSaccessRightsMatrixView.css @@ -121,6 +121,10 @@ span.LSaccessRightsMatrixView_allowed { border-color: #28a745; } +span.LSaccessRightsMatrixView_inherit { + opacity: 0.3; +} + /* * Tabs */ @@ -174,6 +178,16 @@ div.LSaccessRightsMatrixView_tab_content h2 { font-weight: normal; } +#LSaccessRightsMatrixView_legend label { + display: block; + text-decoration: underline; +} + +#LSaccessRightsMatrixView_legend p { + margin: 0; + margin-bottom: 0.3em; +} + /* * Subtitle */ diff --git a/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo b/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo index 45ee6dde..582ee711 100644 Binary files a/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo and b/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.mo differ diff --git a/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po b/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po index 65af0060..3cde6125 100644 --- a/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po +++ b/src/lang/fr_FR.UTF8/LC_MESSAGES/ldapsaisie.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: LdapSaisie\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2021-03-16 17:23+0100\n" +"PO-Revision-Date: 2021-03-16 17:50+0100\n" "Last-Translator: Benjamin Renard \n" "Language-Team: LdapSaisie \n" @@ -2492,8 +2492,8 @@ msgstr "Mme." msgid "Mr." msgstr "M." -#: templates/default/LSaccessRightsMatrixView.tpl:119 -#: templates/default/LSaccessRightsMatrixView.tpl:153 +#: templates/default/LSaccessRightsMatrixView.tpl:115 +#: templates/default/LSaccessRightsMatrixView.tpl:155 msgid "Allowed" msgstr "Autorisé" @@ -2513,16 +2513,16 @@ msgstr "Se connecter" msgid "Connected as" msgstr "Connecté en tant que" -#: templates/default/LSaccessRightsMatrixView.tpl:111 +#: templates/default/LSaccessRightsMatrixView.tpl:107 msgid "Custom actions" msgstr "Actions personnalisées" -#: templates/default/LSaccessRightsMatrixView.tpl:116 -#: templates/default/LSaccessRightsMatrixView.tpl:150 +#: templates/default/LSaccessRightsMatrixView.tpl:112 +#: templates/default/LSaccessRightsMatrixView.tpl:152 msgid "Custom actions / Profiles" msgstr "Actions personnalisées / Profils" -#: templates/default/LSaccessRightsMatrixView.tpl:145 +#: templates/default/LSaccessRightsMatrixView.tpl:147 msgid "Custom search actions" msgstr "Actions personnalisées sur les recherches" @@ -2570,9 +2570,9 @@ msgid "Language" msgstr "Langue" #: templates/default/LSaccessRightsMatrixView.tpl:20 -#: templates/default/LSaccessRightsMatrixView.tpl:80 -#: templates/default/LSaccessRightsMatrixView.tpl:118 -#: templates/default/LSaccessRightsMatrixView.tpl:152 +#: templates/default/LSaccessRightsMatrixView.tpl:65 +#: templates/default/LSaccessRightsMatrixView.tpl:114 +#: templates/default/LSaccessRightsMatrixView.tpl:154 msgid "Legend:" msgstr "Légende :" @@ -2620,29 +2620,35 @@ msgstr "Mot de passe" msgid "Please confirm new password:" msgstr "Merci de confirmer le nouveau mot de passe :" -#: templates/default/LSaccessRightsMatrixView.tpl:21 -#: templates/default/LSaccessRightsMatrixView.tpl:45 -#: templates/default/LSaccessRightsMatrixView.tpl:61 -#: templates/default/LSaccessRightsMatrixView.tpl:81 -#: templates/default/LSaccessRightsMatrixView.tpl:97 +#: templates/default/LSaccessRightsMatrixView.tpl:22 +#: templates/default/LSaccessRightsMatrixView.tpl:27 +#: templates/default/LSaccessRightsMatrixView.tpl:67 +#: templates/default/LSaccessRightsMatrixView.tpl:72 +#: templates/default/LSaccessRightsMatrixView.tpl:93 +#: templates/default/LSaccessRightsMatrixView.tpl:95 +#: templates/default/LSaccessRightsMatrixView_attr_row.tpl:10 +#: templates/default/LSaccessRightsMatrixView_attr_row.tpl:12 msgid "R" msgstr "L" -#: templates/default/LSaccessRightsMatrixView.tpl:23 -#: templates/default/LSaccessRightsMatrixView.tpl:47 -#: templates/default/LSaccessRightsMatrixView.tpl:63 -#: templates/default/LSaccessRightsMatrixView.tpl:83 -#: templates/default/LSaccessRightsMatrixView.tpl:99 +#: templates/default/LSaccessRightsMatrixView.tpl:24 +#: templates/default/LSaccessRightsMatrixView.tpl:28 +#: templates/default/LSaccessRightsMatrixView.tpl:69 +#: templates/default/LSaccessRightsMatrixView.tpl:73 +#: templates/default/LSaccessRightsMatrixView.tpl:89 +#: templates/default/LSaccessRightsMatrixView.tpl:91 +#: templates/default/LSaccessRightsMatrixView_attr_row.tpl:6 +#: templates/default/LSaccessRightsMatrixView_attr_row.tpl:8 msgid "R/W" msgstr "L/É" -#: templates/default/LSaccessRightsMatrixView.tpl:21 -#: templates/default/LSaccessRightsMatrixView.tpl:81 +#: templates/default/LSaccessRightsMatrixView.tpl:22 +#: templates/default/LSaccessRightsMatrixView.tpl:67 msgid "Readable" msgstr "Lecture" -#: templates/default/LSaccessRightsMatrixView.tpl:23 -#: templates/default/LSaccessRightsMatrixView.tpl:83 +#: templates/default/LSaccessRightsMatrixView.tpl:24 +#: templates/default/LSaccessRightsMatrixView.tpl:69 msgid "Readable / Writable" msgstr "Lecture / Écriture" @@ -2650,7 +2656,7 @@ msgstr "Lecture / Écriture" msgid "Refresh my access rights" msgstr "Rafraîchir mes droits d'accès" -#: templates/default/LSaccessRightsMatrixView.tpl:78 +#: templates/default/LSaccessRightsMatrixView.tpl:63 msgid "Relations / Profiles" msgstr "Relations / Profils" @@ -2658,6 +2664,13 @@ msgstr "Relations / Profils" msgid "Result" msgstr "Résultat" +#: templates/default/LSaccessRightsMatrixView.tpl:29 +#: templates/default/LSaccessRightsMatrixView.tpl:74 +#: templates/default/LSaccessRightsMatrixView.tpl:118 +#: templates/default/LSaccessRightsMatrixView.tpl:158 +msgid "Right inherited from all connected users profile" +msgstr "Droit hérité du profile \"Tous les utilisateurs connectés\"" + #: templates/default/base_connected.tpl:6 msgid "Show/hide menu" msgstr "Afficher/cacher le menu" @@ -2666,21 +2679,21 @@ msgstr "Afficher/cacher le menu" msgid "Subject" msgstr "Sujet" -#: templates/default/LSaccessRightsMatrixView.tpl:73 +#: templates/default/LSaccessRightsMatrixView.tpl:58 msgid "Their relations with other objects" msgstr "Leurs relations avec les autres objets" -#: templates/default/LSaccessRightsMatrixView.tpl:142 +#: templates/default/LSaccessRightsMatrixView.tpl:144 msgid "This object type has no configured custom action." msgstr "Ce type d'objet n'a aucune action personnalisée de configurée." -#: templates/default/LSaccessRightsMatrixView.tpl:176 +#: templates/default/LSaccessRightsMatrixView.tpl:184 msgid "This object type has no configured custom search action." msgstr "" "Ce type d'objet n'a aucune action personnalisée sur les recherches de " "configurée." -#: templates/default/LSaccessRightsMatrixView.tpl:108 +#: templates/default/LSaccessRightsMatrixView.tpl:104 msgid "This object type has no configured relation." msgstr "Ce type d'objet n'a aucune relation de configurée." diff --git a/src/lang/ldapsaisie.pot b/src/lang/ldapsaisie.pot index 85d23d98..4e75c2e2 100644 --- a/src/lang/ldapsaisie.pot +++ b/src/lang/ldapsaisie.pot @@ -2134,8 +2134,8 @@ msgstr "" msgid "Mr." msgstr "" -#: templates/default/LSaccessRightsMatrixView.tpl:119 -#: templates/default/LSaccessRightsMatrixView.tpl:153 +#: templates/default/LSaccessRightsMatrixView.tpl:115 +#: templates/default/LSaccessRightsMatrixView.tpl:155 msgid "Allowed" msgstr "" @@ -2155,16 +2155,16 @@ msgstr "" msgid "Connected as" msgstr "" -#: templates/default/LSaccessRightsMatrixView.tpl:111 +#: templates/default/LSaccessRightsMatrixView.tpl:107 msgid "Custom actions" msgstr "" -#: templates/default/LSaccessRightsMatrixView.tpl:116 -#: templates/default/LSaccessRightsMatrixView.tpl:150 +#: templates/default/LSaccessRightsMatrixView.tpl:112 +#: templates/default/LSaccessRightsMatrixView.tpl:152 msgid "Custom actions / Profiles" msgstr "" -#: templates/default/LSaccessRightsMatrixView.tpl:145 +#: templates/default/LSaccessRightsMatrixView.tpl:147 msgid "Custom search actions" msgstr "" @@ -2212,9 +2212,9 @@ msgid "Language" msgstr "" #: templates/default/LSaccessRightsMatrixView.tpl:20 -#: templates/default/LSaccessRightsMatrixView.tpl:80 -#: templates/default/LSaccessRightsMatrixView.tpl:118 -#: templates/default/LSaccessRightsMatrixView.tpl:152 +#: templates/default/LSaccessRightsMatrixView.tpl:65 +#: templates/default/LSaccessRightsMatrixView.tpl:114 +#: templates/default/LSaccessRightsMatrixView.tpl:154 msgid "Legend:" msgstr "" @@ -2262,29 +2262,35 @@ msgstr "" msgid "Please confirm new password:" msgstr "" -#: templates/default/LSaccessRightsMatrixView.tpl:21 -#: templates/default/LSaccessRightsMatrixView.tpl:45 -#: templates/default/LSaccessRightsMatrixView.tpl:61 -#: templates/default/LSaccessRightsMatrixView.tpl:81 -#: templates/default/LSaccessRightsMatrixView.tpl:97 +#: templates/default/LSaccessRightsMatrixView.tpl:22 +#: templates/default/LSaccessRightsMatrixView.tpl:27 +#: templates/default/LSaccessRightsMatrixView.tpl:67 +#: templates/default/LSaccessRightsMatrixView.tpl:72 +#: templates/default/LSaccessRightsMatrixView.tpl:93 +#: templates/default/LSaccessRightsMatrixView.tpl:95 +#: templates/default/LSaccessRightsMatrixView_attr_row.tpl:10 +#: templates/default/LSaccessRightsMatrixView_attr_row.tpl:12 msgid "R" msgstr "" -#: templates/default/LSaccessRightsMatrixView.tpl:23 -#: templates/default/LSaccessRightsMatrixView.tpl:47 -#: templates/default/LSaccessRightsMatrixView.tpl:63 -#: templates/default/LSaccessRightsMatrixView.tpl:83 -#: templates/default/LSaccessRightsMatrixView.tpl:99 +#: templates/default/LSaccessRightsMatrixView.tpl:24 +#: templates/default/LSaccessRightsMatrixView.tpl:28 +#: templates/default/LSaccessRightsMatrixView.tpl:69 +#: templates/default/LSaccessRightsMatrixView.tpl:73 +#: templates/default/LSaccessRightsMatrixView.tpl:89 +#: templates/default/LSaccessRightsMatrixView.tpl:91 +#: templates/default/LSaccessRightsMatrixView_attr_row.tpl:6 +#: templates/default/LSaccessRightsMatrixView_attr_row.tpl:8 msgid "R/W" msgstr "" -#: templates/default/LSaccessRightsMatrixView.tpl:21 -#: templates/default/LSaccessRightsMatrixView.tpl:81 +#: templates/default/LSaccessRightsMatrixView.tpl:22 +#: templates/default/LSaccessRightsMatrixView.tpl:67 msgid "Readable" msgstr "" -#: templates/default/LSaccessRightsMatrixView.tpl:23 -#: templates/default/LSaccessRightsMatrixView.tpl:83 +#: templates/default/LSaccessRightsMatrixView.tpl:24 +#: templates/default/LSaccessRightsMatrixView.tpl:69 msgid "Readable / Writable" msgstr "" @@ -2292,7 +2298,7 @@ msgstr "" msgid "Refresh my access rights" msgstr "" -#: templates/default/LSaccessRightsMatrixView.tpl:78 +#: templates/default/LSaccessRightsMatrixView.tpl:63 msgid "Relations / Profiles" msgstr "" @@ -2300,6 +2306,13 @@ msgstr "" msgid "Result" msgstr "" +#: templates/default/LSaccessRightsMatrixView.tpl:29 +#: templates/default/LSaccessRightsMatrixView.tpl:74 +#: templates/default/LSaccessRightsMatrixView.tpl:118 +#: templates/default/LSaccessRightsMatrixView.tpl:158 +msgid "Right inherited from all connected users profile" +msgstr "" + #: templates/default/base_connected.tpl:6 msgid "Show/hide menu" msgstr "" @@ -2308,19 +2321,19 @@ msgstr "" msgid "Subject" msgstr "" -#: templates/default/LSaccessRightsMatrixView.tpl:73 +#: templates/default/LSaccessRightsMatrixView.tpl:58 msgid "Their relations with other objects" msgstr "" -#: templates/default/LSaccessRightsMatrixView.tpl:142 +#: templates/default/LSaccessRightsMatrixView.tpl:144 msgid "This object type has no configured custom action." msgstr "" -#: templates/default/LSaccessRightsMatrixView.tpl:176 +#: templates/default/LSaccessRightsMatrixView.tpl:184 msgid "This object type has no configured custom search action." msgstr "" -#: templates/default/LSaccessRightsMatrixView.tpl:108 +#: templates/default/LSaccessRightsMatrixView.tpl:104 msgid "This object type has no configured relation." msgstr "" diff --git a/src/templates/default/LSaccessRightsMatrixView.tpl b/src/templates/default/LSaccessRightsMatrixView.tpl index 85e390f6..0e0e2cb4 100644 --- a/src/templates/default/LSaccessRightsMatrixView.tpl +++ b/src/templates/default/LSaccessRightsMatrixView.tpl @@ -17,10 +17,17 @@ {tr msg="Attributes / Profiles"}
- - {tr msg="R"} = {tr msg="Readable"} - | - {tr msg="R/W"} = {tr msg="Readable / Writable"} +

+

+ {tr msg="R"} = {tr msg="Readable"} + | + {tr msg="R/W"} = {tr msg="Readable / Writable"} +

+

+ {tr msg="R"} / + {tr msg="R/W"} + = {tr msg="Right inherited from all connected users profile"} +

{foreach $LSprofiles as $name => $label} @@ -37,34 +44,12 @@ {foreach $tab.attrs as $name} {if !isset($LSobjects[$LSobject]['attrs'][$name])}{continue}{/if} {assign var=conf value=$LSobjects[$LSobject]['attrs'][$name]} - - {$conf.label} ? - {foreach $LSprofiles as $profil => $profil_label} - - {if $conf.rights[$profil] == 'r'} - {tr msg="R"} - {elseif $conf.rights[$profil] == 'w'} - {tr msg="R/W"} - {/if} - - {/foreach} - + {include file='ls:LSaccessRightsMatrixView_attr_row.tpl'} {/foreach} {/foreach} {else} {foreach $LSobjects[$LSobject]['attrs'] as $name => $conf} - - {$conf.label} ? - {foreach $LSprofiles as $profil => $profil_label} - - {if $conf.rights[$profil] == 'r'} - {tr msg="R"} - {elseif $conf.rights[$profil] == 'w'} - {tr msg="R/W"} - {/if} - - {/foreach} - + {include file='ls:LSaccessRightsMatrixView_attr_row.tpl'} {/foreach} {/if} @@ -77,10 +62,17 @@ {tr msg="Relations / Profiles"}
- - {tr msg="R"} = {tr msg="Readable"} - | - {tr msg="R/W"} = {tr msg="Readable / Writable"} +

+

+ {tr msg="R"} = {tr msg="Readable"} + | + {tr msg="R/W"} = {tr msg="Readable / Writable"} +

+

+ {tr msg="R"} / + {tr msg="R/W"} + = {tr msg="Right inherited from all connected users profile"} +

{foreach $LSprofiles as $name => $label} @@ -93,10 +85,14 @@ {$conf.label} ? {foreach $LSprofiles as $profil => $profil_label} - {if $conf.rights[$profil] == 'r'} - {tr msg="R"} - {elseif $conf.rights[$profil] == 'w'} + {if $conf.rights[$profil] == 'w'} {tr msg="R/W"} + {elseif $profil != 'user' && $conf.rights['user'] == 'w'} + {tr msg="R/W"} + {elseif $conf.rights[$profil] == 'r'} + {tr msg="R"} + {elseif $profil != 'user' && $conf.rights['user'] == 'r'} + {tr msg="R"} {/if} {/foreach} @@ -115,8 +111,12 @@ {tr msg="Custom actions / Profiles"}
- - X = {tr msg="Allowed"} +

+

X = {tr msg="Allowed"}

+

+ X + = {tr msg="Right inherited from all connected users profile"} +

{foreach $LSprofiles as $name => $label} @@ -131,6 +131,8 @@ {if $conf.rights[$profil]} X + {elseif $profil != 'user' && $conf.rights['user']} + X {/if} {/foreach} @@ -149,8 +151,12 @@ {tr msg="Custom actions / Profiles"}
- - X = {tr msg="Allowed"} +

+

X = {tr msg="Allowed"}

+

+ X + = {tr msg="Right inherited from all connected users profile"} +

{foreach $LSprofiles as $name => $label} @@ -165,6 +171,8 @@ {if $conf.rights[$profil]} X + {elseif $profil != 'user' && $conf.rights['user']} + X {/if} {/foreach} diff --git a/src/templates/default/LSaccessRightsMatrixView_attr_row.tpl b/src/templates/default/LSaccessRightsMatrixView_attr_row.tpl new file mode 100644 index 00000000..89c2060f --- /dev/null +++ b/src/templates/default/LSaccessRightsMatrixView_attr_row.tpl @@ -0,0 +1,16 @@ + + {$conf.label} ? + {foreach $LSprofiles as $profil => $profil_label} + + {if $conf.rights[$profil] == 'w'} + {tr msg="R/W"} + {elseif $profil != 'user' && $conf.rights['user'] == 'w'} + {tr msg="R/W"} + {elseif $conf.rights[$profil] == 'r'} + {tr msg="R"} + {elseif $profil != 'user' && $conf.rights['user'] == 'r'} + {tr msg="R"} + {/if} + + {/foreach} +