Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
integration
prechecker
Commits
9d51d8e8
Commit
9d51d8e8
authored
Nov 28, 2017
by
Eloy Lafuente
Browse files
Merge branch 'MDL-60441_master' of
git://github.com/juancs/moodle
parents
2b6fa076
6e4e60ef
Changes
2
Hide whitespace changes
Inline
Side-by-side
mod/glossary/lang/en/glossary.php
View file @
9d51d8e8
...
...
@@ -151,6 +151,7 @@ $string['entrydeleted'] = 'Entry deleted';
$string
[
'entryexported'
]
=
'Entry successfully exported'
;
$string
[
'entryishidden'
]
=
'(this entry is currently hidden)'
;
$string
[
'entryleveldefaultsettings'
]
=
'Entry level default settings'
;
$string
[
'entrylink'
]
=
'Entry link: {$a}'
;
$string
[
'entrysaved'
]
=
'This entry has been saved'
;
$string
[
'entryupdated'
]
=
'This entry has been updated'
;
$string
[
'entryusedynalink'
]
=
'This entry should be automatically linked'
;
...
...
mod/glossary/lib.php
View file @
9d51d8e8
...
...
@@ -1226,11 +1226,10 @@ function glossary_print_entry_icons($course, $cm, $glossary, $entry, $mode='',$h
$context
=
context_module
::
instance
(
$cm
->
id
);
$output
=
false
;
//To decide if we must really return text in "return". Activate when needed only!
$output
=
false
;
//
To decide if we must really return text in "return". Activate when needed only!
$importedentry
=
(
$entry
->
sourceglossaryid
==
$glossary
->
id
);
$ismainglossary
=
$glossary
->
mainglossary
;
$return
=
'<span class="commands">'
;
// Differentiate links for each entry.
$altsuffix
=
strip_tags
(
format_text
(
$entry
->
concept
));
...
...
@@ -1241,6 +1240,11 @@ function glossary_print_entry_icons($course, $cm, $glossary, $entry, $mode='',$h
array
(
'class'
=>
'glossary-hidden-note'
));
}
// Entry link.
$return
.
=
'<a class="icon" title="'
.
get_string
(
'entrylink'
,
'glossary'
,
$altsuffix
)
.
'" '
.
' href="showentry.php?eid='
.
$entry
->
id
.
'">'
.
$OUTPUT
->
pix_icon
(
'e/insert_edit_link'
,
get_string
(
'entrylink'
,
'glossary'
,
$altsuffix
))
.
'</a>'
;
if
(
has_capability
(
'mod/glossary:approve'
,
$context
)
&&
!
$glossary
->
defaultapproval
&&
$entry
->
approved
)
{
$output
=
true
;
$return
.
=
'<a class="icon" title="'
.
get_string
(
'disapprove'
,
'glossary'
)
.
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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