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
moodle
moodle
Commits
6b608f8f
Commit
6b608f8f
authored
Jul 02, 2009
by
tjhunt
Browse files
MDL-19690 - lots more $CFG->pixpath to $OUTPUT->old_icon_url
parent
5d3b9994
Changes
28
Hide whitespace changes
Inline
Side-by-side
admin/blocks.php
View file @
6b608f8f
...
...
@@ -182,10 +182,10 @@
if
(
$blocks
[
$blockid
]
->
visible
)
{
$visible
=
'<a href="blocks.php?hide='
.
$blockid
.
'&sesskey='
.
sesskey
()
.
'" title="'
.
$strhide
.
'">'
.
'<img src="'
.
$
CFG
->
pixpath
.
'/i/hide.gif
" class="icon" alt="'
.
$strhide
.
'" /></a>'
;
'<img src="'
.
$
OUTPUT
->
old_icon_url
(
'i/hide'
)
.
'
" class="icon" alt="'
.
$strhide
.
'" /></a>'
;
}
else
{
$visible
=
'<a href="blocks.php?show='
.
$blockid
.
'&sesskey='
.
sesskey
()
.
'" title="'
.
$strshow
.
'">'
.
'<img src="'
.
$
CFG
->
pixpath
.
'/i/show.gif
" class="icon" alt="'
.
$strshow
.
'" /></a>'
;
'<img src="'
.
$
OUTPUT
->
old_icon_url
(
'i/show'
)
.
'
" class="icon" alt="'
.
$strshow
.
'" /></a>'
;
$class
=
' class="dimmed_text"'
;
// Leading space required!
}
if
(
$blockobject
->
instance_allow_multiple
())
{
...
...
admin/lang.php
View file @
6b608f8f
...
...
@@ -608,9 +608,9 @@
if
(
LANG_DISPLAY_MISSING_LINKS
)
{
$missingtarget
=
'<a name="missing'
.
$missingcounter
.
'"></a>'
;
$missingnext
=
'<a href="#missing'
.
(
$missingcounter
+
1
)
.
'">'
.
'<img src="'
.
$
CFG
->
pixpath
.
'/t/down.gif
" class="iconsmall" alt="'
.
$strnext
.
'" /></a>'
;
'<img src="'
.
$
OUTPUT
->
old_icon_url
(
't/down'
)
.
'
" class="iconsmall" alt="'
.
$strnext
.
'" /></a>'
;
$missingprev
=
'<a href="#missing'
.
(
$missingcounter
-
1
)
.
'">'
.
'<img src="'
.
$
CFG
->
pixpath
.
'/t/up.gif
" class="iconsmall" alt="'
.
$strprev
.
'" /></a>'
;
'<img src="'
.
$
OUTPUT
->
old_icon_url
(
't/up'
)
.
'
" class="iconsmall" alt="'
.
$strprev
.
'" /></a>'
;
}
}
else
{
// the string is translated in the pack being processed
...
...
@@ -621,9 +621,9 @@
if
(
LANG_DISPLAY_MISSING_LINKS
)
{
$missingtarget
=
'<a name="missing'
.
$missingcounter
.
'"></a>'
;
$missingnext
=
'<a href="#missing'
.
(
$missingcounter
+
1
)
.
'">'
.
'<img src="'
.
$
CFG
->
pixpath
.
'/t/down.gif
" class="iconsmall" alt="'
.
$strnext
.
'" /></a>'
;
'<img src="'
.
$
OUTPUT
->
old_icon_url
(
't/down'
)
.
'
" class="iconsmall" alt="'
.
$strnext
.
'" /></a>'
;
$missingprev
=
'<a href="#missing'
.
(
$missingcounter
-
1
)
.
'">'
.
'<img src="'
.
$
CFG
->
pixpath
.
'/t/up.gif
" class="iconsmall" alt="'
.
$strprev
.
'" /></a>'
;
'<img src="'
.
$
OUTPUT
->
old_icon_url
(
't/up'
)
.
'
" class="iconsmall" alt="'
.
$strprev
.
'" /></a>'
;
}
}
}
...
...
admin/roles/usersroles.php
View file @
6b608f8f
...
...
@@ -159,7 +159,7 @@ print_box_end();
print_footer
(
$course
);
function
print_report_tree
(
$contextid
,
$contexts
,
$systemcontext
,
$fullname
)
{
global
$CFG
;
global
$CFG
,
$OUTPUT
;
// Only compute lang strings, etc once.
static
$stredit
=
null
,
$strcheckpermissions
,
$globalroleassigner
,
$assignurl
,
$checkurl
;
...
...
@@ -207,9 +207,9 @@ function print_report_tree($contextid, $contexts, $systemcontext, $fullname) {
$strcheck
=
get_string
(
'checkuserspermissionshere'
,
'role'
,
$a
);
}
echo
' <a title="'
.
$strgoto
.
'" href="'
.
$raurl
.
'"><img class="iconsmall" src="'
.
$
CFG
->
pixpath
.
'/t/edit.gif
" alt="'
.
$stredit
.
'" /></a> '
;
$
OUTPUT
->
old_icon_url
(
't/edit'
)
.
'
" alt="'
.
$stredit
.
'" /></a> '
;
echo
' <a title="'
.
$strcheck
.
'" href="'
.
$churl
.
'"><img class="iconsmall" src="'
.
$
CFG
->
pixpath
.
'/
t/preview
.gif
" alt="'
.
$strcheckpermissions
.
'" /></a> '
;
$
OUTPUT
->
old_icon_url
(
'
t/preview
'
)
.
'
" alt="'
.
$strcheckpermissions
.
'" /></a> '
;
echo
"</p>
\n
"
;
}
}
...
...
blocks/admin/block_admin.php
View file @
6b608f8f
...
...
@@ -7,7 +7,7 @@ class block_admin extends block_list {
}
function
get_content
()
{
global
$CFG
,
$USER
,
$DB
;
global
$CFG
,
$USER
,
$DB
,
$OUTPUT
;
if
(
$this
->
content
!==
NULL
)
{
return
$this
->
content
;
...
...
@@ -33,7 +33,7 @@ class block_admin extends block_list {
/// Course editing on/off
if
(
$course
->
id
!==
SITEID
and
has_capability
(
'moodle/course:update'
,
$context
))
{
$this
->
content
->
icons
[]
=
'<img src="'
.
$
CFG
->
pixpath
.
'/i/edit.gif
" class="icon" alt="" />'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
OUTPUT
->
old_icon_url
(
'i/edit'
)
.
'
" class="icon" alt="" />'
;
if
(
$this
->
page
->
user_is_editing
())
{
$this
->
content
->
items
[]
=
'<a href="view.php?id='
.
$course
->
id
.
'&edit=off&sesskey='
.
sesskey
()
.
'">'
.
get_string
(
'turneditingoff'
)
.
'</a>'
;
}
else
{
...
...
@@ -41,17 +41,17 @@ class block_admin extends block_list {
}
$this
->
content
->
items
[]
=
'<a href="'
.
$CFG
->
wwwroot
.
'/course/edit.php?id='
.
$course
->
id
.
'">'
.
get_string
(
'settings'
)
.
'</a>'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
CFG
->
pixpath
.
'/
i/settings
.gif
" class="icon" alt="" />'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
OUTPUT
->
old_icon_url
(
'
i/settings
'
)
.
'
" class="icon" alt="" />'
;
}
/// Assign roles to the course
if
(
$course
->
id
!=
SITEID
)
{
if
(
has_capability
(
'moodle/role:assign'
,
$context
))
{
$this
->
content
->
items
[]
=
'<a href="'
.
$CFG
->
wwwroot
.
'/'
.
$CFG
->
admin
.
'/roles/assign.php?contextid='
.
$context
->
id
.
'">'
.
get_string
(
'assignroles'
,
'role'
)
.
'</a>'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
CFG
->
pixpath
.
'/
i/roles
.gif
" class="icon" alt="" />'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
OUTPUT
->
old_icon_url
(
'
i/roles
'
)
.
'
" class="icon" alt="" />'
;
}
else
if
(
get_overridable_roles
(
$context
,
ROLENAME_ORIGINAL
))
{
$this
->
content
->
items
[]
=
'<a href="'
.
$CFG
->
wwwroot
.
'/'
.
$CFG
->
admin
.
'/roles/override.php?contextid='
.
$context
->
id
.
'">'
.
get_string
(
'overridepermissions'
,
'role'
)
.
'</a>'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
CFG
->
pixpath
.
'/
i/roles
.gif
" class="icon" alt="" />'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
OUTPUT
->
old_icon_url
(
'
i/roles
'
)
.
'
" class="icon" alt="" />'
;
}
}
...
...
@@ -76,7 +76,7 @@ class block_admin extends block_list {
if
(
$reportavailable
)
{
$this
->
content
->
items
[]
=
'<a href="'
.
$CFG
->
wwwroot
.
'/grade/report/index.php?id='
.
$course
->
id
.
'">'
.
get_string
(
'grades'
)
.
'</a>'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
CFG
->
pixpath
.
'/
i/grades
.gif
" class="icon" alt="" />'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
OUTPUT
->
old_icon_url
(
'
i/grades
'
)
.
'
" class="icon" alt="" />'
;
}
}
...
...
@@ -84,7 +84,7 @@ class block_admin extends block_list {
if
(
!
empty
(
$CFG
->
enableoutcomes
))
{
if
(
$course
->
id
!==
SITEID
and
has_capability
(
'moodle/course:update'
,
$context
))
{
$this
->
content
->
items
[]
=
'<a href="'
.
$CFG
->
wwwroot
.
'/grade/edit/outcome/course.php?id='
.
$course
->
id
.
'">'
.
get_string
(
'outcomes'
,
'grades'
)
.
'</a>'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
CFG
->
pixpath
.
'/
i/outcomes
.gif
" class="icon" alt="" />'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
OUTPUT
->
old_icon_url
(
'
i/outcomes
'
)
.
'
" class="icon" alt="" />'
;
}
}
...
...
@@ -93,11 +93,11 @@ class block_admin extends block_list {
if
(
has_capability
(
'moodle/course:managemetacourse'
,
$context
))
{
$strchildcourses
=
get_string
(
'childcourses'
);
$this
->
content
->
items
[]
=
'<a href="importstudents.php?id='
.
$course
->
id
.
'">'
.
$strchildcourses
.
'</a>'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
CFG
->
pixpath
.
'/
i/course
.gif
" class="icon" alt="" />'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
OUTPUT
->
old_icon_url
(
'
i/course
'
)
.
'
" class="icon" alt="" />'
;
}
else
if
(
has_capability
(
'moodle/role:assign'
,
$context
))
{
$strchildcourses
=
get_string
(
'childcourses'
);
$this
->
content
->
items
[]
=
'<span class="dimmed_text">'
.
$strchildcourses
.
'</span>'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
CFG
->
pixpath
.
'/
i/course
.gif
" class="icon" alt="" />'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
OUTPUT
->
old_icon_url
(
'
i/course
'
)
.
'
" class="icon" alt="" />'
;
}
}
...
...
@@ -106,37 +106,37 @@ class block_admin extends block_list {
if
((
$course
->
id
!==
SITEID
)
&&
(
$course
->
groupmode
||
!
$course
->
groupmodeforce
)
&&
has_capability
(
'moodle/course:managegroups'
,
$context
))
{
$strgroups
=
get_string
(
'groups'
);
$this
->
content
->
items
[]
=
'<a title="'
.
$strgroups
.
'" href="'
.
$CFG
->
wwwroot
.
'/group/index.php?id='
.
$course
->
id
.
'">'
.
$strgroups
.
'</a>'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
CFG
->
pixpath
.
'/
i/group
.gif
" class="icon" alt="" />'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
OUTPUT
->
old_icon_url
(
'
i/group
'
)
.
'
" class="icon" alt="" />'
;
}
/// Backup this course
if
(
$course
->
id
!==
SITEID
and
has_capability
(
'moodle/site:backup'
,
$context
))
{
$this
->
content
->
items
[]
=
'<a href="'
.
$CFG
->
wwwroot
.
'/backup/backup.php?id='
.
$course
->
id
.
'">'
.
get_string
(
'backup'
)
.
'</a>'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
CFG
->
pixpath
.
'/
i/backup
.gif
" class="icon" alt="" />'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
OUTPUT
->
old_icon_url
(
'
i/backup
'
)
.
'
" class="icon" alt="" />'
;
}
/// Restore to this course
if
(
$course
->
id
!==
SITEID
and
has_capability
(
'moodle/site:restore'
,
$context
))
{
$this
->
content
->
items
[]
=
'<a href="'
.
$CFG
->
wwwroot
.
'/files/index.php?id='
.
$course
->
id
.
'&wdir=/backupdata">'
.
get_string
(
'restore'
)
.
'</a>'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
CFG
->
pixpath
.
'/
i/restore
.gif
" class="icon" alt="" />'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
OUTPUT
->
old_icon_url
(
'
i/restore
'
)
.
'
" class="icon" alt="" />'
;
}
/// Import data from other courses
if
(
$course
->
id
!==
SITEID
and
has_capability
(
'moodle/site:import'
,
$context
))
{
$this
->
content
->
items
[]
=
'<a href="'
.
$CFG
->
wwwroot
.
'/course/import.php?id='
.
$course
->
id
.
'">'
.
get_string
(
'import'
)
.
'</a>'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
CFG
->
pixpath
.
'/
i/restore
.gif
" class="icon" alt="" />'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
OUTPUT
->
old_icon_url
(
'
i/restore
'
)
.
'
" class="icon" alt="" />'
;
}
/// Reset this course
if
(
$course
->
id
!==
SITEID
and
has_capability
(
'moodle/course:reset'
,
$context
))
{
$this
->
content
->
items
[]
=
'<a href="'
.
$CFG
->
wwwroot
.
'/course/reset.php?id='
.
$course
->
id
.
'">'
.
get_string
(
'reset'
)
.
'</a>'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
CFG
->
pixpath
.
'/
i/return
.gif
" class="icon" alt="" />'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
OUTPUT
->
old_icon_url
(
'
i/return
'
)
.
'
" class="icon" alt="" />'
;
}
/// View course reports
if
(
$course
->
id
!==
SITEID
and
has_capability
(
'moodle/site:viewreports'
,
$context
))
{
// basic capability for listing of reports
$this
->
content
->
items
[]
=
'<a href="'
.
$CFG
->
wwwroot
.
'/course/report.php?id='
.
$course
->
id
.
'">'
.
get_string
(
'reports'
)
.
'</a>'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
CFG
->
pixpath
.
'/
i/stats
.gif
" class="icon" alt="" />'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
OUTPUT
->
old_icon_url
(
'
i/stats
'
)
.
'
" class="icon" alt="" />'
;
}
/// Manage questions
...
...
@@ -162,7 +162,7 @@ class block_admin extends block_list {
if
(
$questionlink
)
{
$this
->
content
->
items
[]
=
'<a href="'
.
$CFG
->
wwwroot
.
'/question/'
.
$questionlink
.
'?courseid='
.
$course
->
id
.
'">'
.
get_string
(
'questions'
,
'quiz'
)
.
'</a>'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
CFG
->
pixpath
.
'/
i/questions
.gif
" class="icon" alt="" />'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
OUTPUT
->
old_icon_url
(
'
i/questions
'
)
.
'
" class="icon" alt="" />'
;
}
}
...
...
@@ -171,13 +171,13 @@ class block_admin extends block_list {
$editabletypes
=
repository
::
get_editable_types
(
$context
);
if
(
$course
->
id
!==
SITEID
&&
has_capability
(
'moodle/course:update'
,
$context
)
&&
!
empty
(
$editabletypes
))
{
$this
->
content
->
items
[]
=
'<a href="'
.
$CFG
->
wwwroot
.
'/repository/manage_instances.php?contextid='
.
$context
->
id
.
'">'
.
get_string
(
'repositories'
)
.
'</a>'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
CFG
->
pixpath
.
'/
i/repository
.png
" alt=""/>'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
OUTPUT
->
old_icon_url
(
'
i/repository
'
)
.
'
" alt=""/>'
;
}
/// Manage files
if
(
$course
->
id
!==
SITEID
and
has_capability
(
'moodle/course:managefiles'
,
$context
))
{
$this
->
content
->
items
[]
=
'<a href="'
.
$CFG
->
wwwroot
.
'/files/index.php?id='
.
$course
->
id
.
'">'
.
get_string
(
'files'
)
.
'</a>'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
CFG
->
pixpath
.
'/
i/files
.gif
" class="icon" alt=""/>'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
OUTPUT
->
old_icon_url
(
'
i/files
'
)
.
'
" class="icon" alt=""/>'
;
}
/// Authorize hooks
...
...
@@ -190,24 +190,24 @@ class block_admin extends block_list {
}
}
$this
->
content
->
items
[]
=
$paymenturl
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
CFG
->
pixpath
.
'/
i/payment
.gif
" class="icon" alt="" />'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
OUTPUT
->
old_icon_url
(
'
i/payment
'
)
.
'
" class="icon" alt="" />'
;
}
/// Unenrol link
if
(
empty
(
$course
->
metacourse
)
&&
(
$course
->
id
!==
SITEID
))
{
if
(
has_capability
(
'moodle/legacy:guest'
,
$context
,
NULL
,
false
))
{
// Are a guest now
$this
->
content
->
items
[]
=
'<a href="'
.
$CFG
->
wwwroot
.
'/course/enrol.php?id='
.
$course
->
id
.
'">'
.
get_string
(
'enrolme'
,
''
,
format_string
(
$course
->
shortname
))
.
'</a>'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
CFG
->
pixpath
.
'/i/user.gif
" class="icon" alt="" />'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
OUTPUT
->
old_icon_url
(
'i/user'
)
.
'
" class="icon" alt="" />'
;
}
else
if
(
has_capability
(
'moodle/role:unassignself'
,
$context
,
NULL
,
false
)
and
get_user_roles
(
$context
,
$USER
->
id
,
false
))
{
// Have some role
$this
->
content
->
items
[]
=
'<a href="'
.
$CFG
->
wwwroot
.
'/course/unenrol.php?id='
.
$course
->
id
.
'">'
.
get_string
(
'unenrolme'
,
''
,
format_string
(
$course
->
shortname
))
.
'</a>'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
CFG
->
pixpath
.
'/i/user.gif
" class="icon" alt="" />'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
OUTPUT
->
old_icon_url
(
'i/user'
)
.
'
" class="icon" alt="" />'
;
}
}
/// Link to the user own profile (except guests)
if
(
!
isguestuser
()
and
isloggedin
())
{
$this
->
content
->
items
[]
=
'<a href="'
.
$CFG
->
wwwroot
.
'/user/view.php?id='
.
$USER
->
id
.
'&course='
.
$course
->
id
.
'">'
.
get_string
(
'profile'
)
.
'</a>'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
CFG
->
pixpath
.
'/i/user.gif
" alt="" />'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
OUTPUT
->
old_icon_url
(
'i/user'
)
.
'
" alt="" />'
;
}
return
$this
->
content
;
...
...
blocks/admin_tree/block_admin_tree.php
View file @
6b608f8f
...
...
@@ -33,11 +33,11 @@ class block_admin_tree extends block_base {
}
function
open_folder
(
$visiblename
)
{
global
$
CFG
;
global
$
OUTPUT
;
$strfolderopened
=
s
(
get_string
(
'folderopened'
));
$this
->
tempcontent
.
=
'<div class="depth'
.
$this
->
currentdepth
.
'"><a name="d'
.
$this
->
divcounter
.
'">'
;
$this
->
tempcontent
.
=
'<img id="vh_div'
.
$this
->
divcounter
.
'indicator" src="'
.
$
CFG
->
pixpath
.
'/i/open.gif
" alt="'
.
$strfolderopened
.
'" /> '
;
$this
->
tempcontent
.
=
'<img id="vh_div'
.
$this
->
divcounter
.
'indicator" src="'
.
$
OUTPUT
->
old_icon_url
(
'i/open'
)
.
'
" alt="'
.
$strfolderopened
.
'" /> '
;
$this
->
tempcontent
.
=
$visiblename
.
'</a></div><div id="vh_div'
.
$this
->
divcounter
.
'">'
.
"
\n
"
;
$this
->
currentdepth
++
;
$this
->
divcounter
++
;
...
...
@@ -55,7 +55,7 @@ class block_admin_tree extends block_base {
}
function
build_tree
(
&
$content
)
{
global
$CFG
;
global
$CFG
,
$OUTPUT
;
if
(
$content
instanceof
admin_settingpage
)
{
// show hidden pages in tree if hidden page active
if
(
$content
->
check_access
()
and
((
$content
->
name
==
$this
->
section
)
or
!
$content
->
is_hidden
()))
{
...
...
@@ -63,7 +63,7 @@ class block_admin_tree extends block_base {
if
(
$content
->
is_hidden
())
{
$class
.
=
' hidden'
;
}
$this
->
create_item
(
$content
->
visiblename
,
$CFG
->
wwwroot
.
'/'
.
$CFG
->
admin
.
'/settings.php?section='
.
$content
->
name
,
$
CFG
->
pixpath
.
'/
i/item
.gif
'
,
$class
);
$this
->
create_item
(
$content
->
visiblename
,
$CFG
->
wwwroot
.
'/'
.
$CFG
->
admin
.
'/settings.php?section='
.
$content
->
name
,
$
OUTPUT
->
old_icon_url
(
'
i/item'
)
,
$class
);
}
}
else
if
(
$content
instanceof
admin_externalpage
)
{
// show hidden pages in tree if hidden page active
...
...
@@ -77,7 +77,7 @@ class block_admin_tree extends block_base {
if
(
$content
->
is_hidden
())
{
$class
.
=
' hidden'
;
}
$this
->
create_item
(
$content
->
visiblename
,
$content
->
url
,
$
CFG
->
pixpath
.
'/
i/item
.gif
'
,
$class
);
$this
->
create_item
(
$content
->
visiblename
,
$content
->
url
,
$
OUTPUT
->
old_icon_url
(
'
i/item'
)
,
$class
);
}
}
else
if
(
$content
instanceof
admin_category
)
{
if
(
$content
->
check_access
()
and
!
$content
->
is_hidden
())
{
...
...
blocks/course_list/block_course_list.php
View file @
6b608f8f
...
...
@@ -109,14 +109,14 @@ class block_course_list extends block_list {
}
function
get_remote_courses
()
{
global
$CFG
,
$USER
;
global
$CFG
,
$USER
,
$OUTPUT
;
if
(
!
is_enabled_auth
(
'mnet'
))
{
// no need to query anything remote related
return
;
}
$icon
=
'<img src="'
.
$
CFG
->
pixpath
.
'/
i/mnethost
.gif
" class="icon" alt="'
.
get_string
(
'course'
)
.
'" />'
;
$icon
=
'<img src="'
.
$
OUTPUT
->
old_icon_url
(
'
i/mnethost
'
)
.
'
" class="icon" alt="'
.
get_string
(
'course'
)
.
'" />'
;
// only for logged in users!
if
(
!
isloggedin
()
||
isguest
())
{
...
...
blocks/loancalc/block_loancalc.php
View file @
6b608f8f
...
...
@@ -9,9 +9,9 @@ class block_loancalc extends block_base {
}
function
get_content
()
{
global
$CFG
;
global
$CFG
,
$OUTPUT
;
$calc
=
$
CFG
->
pixpath
.
'/
i/calc
.gif
'
;
$calc
=
$
OUTPUT
->
old_icon_url
(
'
i/calc'
)
;
$this
->
content
->
text
=
'
<script type="text/javascript">
...
...
blocks/messages/block_messages.php
View file @
6b608f8f
...
...
@@ -7,7 +7,7 @@ class block_messages extends block_base {
}
function
get_content
()
{
global
$USER
,
$CFG
,
$DB
;
global
$USER
,
$CFG
,
$DB
,
$OUTPUT
;
if
(
!
$CFG
->
messaging
)
{
return
''
;
...
...
@@ -43,7 +43,7 @@ class block_messages extends block_base {
$this
->
content
->
text
.
=
'<li class="listentry"><div class="user"><a href="'
.
$CFG
->
wwwroot
.
'/user/view.php?id='
.
$user
->
id
.
'&course='
.
SITEID
.
'" title="'
.
$timeago
.
'">'
;
$this
->
content
->
text
.
=
print_user_picture
(
$user
,
SITEID
,
$user
->
picture
,
0
,
true
,
false
,
''
,
false
);
$this
->
content
->
text
.
=
fullname
(
$user
)
.
'</a></div>'
;
$this
->
content
->
text
.
=
'<div class="message"><a href="'
.
$CFG
->
wwwroot
.
'/message/discussion.php?id='
.
$user
->
id
.
'" onclick="this.target=\'message_'
.
$user
->
id
.
'\'; return openpopup(\'/message/discussion.php?id='
.
$user
->
id
.
'\', \'message_'
.
$user
->
id
.
'\', \'menubar=0,location=0,scrollbars,status,resizable,width=400,height=500\', 0);"><img class="iconsmall" src="'
.
$
CFG
->
pixpath
.
'/
t/message
.gif
" alt="" /> '
.
$user
->
count
.
'</a>'
;
$this
->
content
->
text
.
=
'<div class="message"><a href="'
.
$CFG
->
wwwroot
.
'/message/discussion.php?id='
.
$user
->
id
.
'" onclick="this.target=\'message_'
.
$user
->
id
.
'\'; return openpopup(\'/message/discussion.php?id='
.
$user
->
id
.
'\', \'message_'
.
$user
->
id
.
'\', \'menubar=0,location=0,scrollbars,status,resizable,width=400,height=500\', 0);"><img class="iconsmall" src="'
.
$
OUTPUT
->
old_icon_url
(
'
t/message
'
)
.
'
" alt="" /> '
.
$user
->
count
.
'</a>'
;
$this
->
content
->
text
.
=
'</div></li>'
;
}
$this
->
content
->
text
.
=
'</ul>'
;
...
...
blocks/moodleblock.class.php
View file @
6b608f8f
...
...
@@ -367,7 +367,7 @@ class block_base {
function
_title_html
()
{
global
$
CFG
;
global
$
OUTPUT
;
//Accessibility: validation, can't have <div> inside <h2>, use <span>.
$title
=
'<div class="title">'
;
...
...
@@ -377,7 +377,7 @@ class block_base {
//Theme the buttons using, Admin - Miscellaneous - smartpix.
$strshow
=
addslashes_js
(
get_string
(
'showblocka'
,
'access'
,
strip_tags
(
$this
->
title
)));
$strhide
=
addslashes_js
(
get_string
(
'hideblocka'
,
'access'
,
strip_tags
(
$this
->
title
)));
$title
.
=
'<input type="image" src="'
.
$
CFG
->
pixpath
.
'/
t/switch_minus
.gif
" '
.
$title
.
=
'<input type="image" src="'
.
$
OUTPUT
->
old_icon_url
(
'
t/switch_minus
'
)
.
'
" '
.
'id="togglehide_inst'
.
$this
->
instance
->
id
.
'" '
.
'onclick="elementToggleHide(this, true, function(el) {'
.
'return findParentNode(el, \'DIV\', \'sideblock\'); },'
.
...
...
@@ -405,7 +405,7 @@ class block_base {
* @todo complete documenting this function. Define $options.
*/
function
_add_edit_controls
(
$options
)
{
global
$CFG
,
$USER
;
global
$CFG
,
$USER
,
$OUTPUT
;
// TODO - temporary hack to get the block context only if it already exists.
global
$DB
;
...
...
@@ -458,7 +458,7 @@ class block_base {
$script
=
$page
->
url
->
out
(
false
,
array
(
'instanceid'
=>
$this
->
instance
->
id
,
'sesskey'
=>
sesskey
()));
$movebuttons
.
=
'<a class="icon roles" title="'
.
$this
->
str
->
assignroles
.
'" href="'
.
$CFG
->
wwwroot
.
'/'
.
$CFG
->
admin
.
'/roles/assign.php?contextid='
.
$context
->
id
.
'">'
.
'<img src="'
.
$
CFG
->
pixpath
.
'/
i/roles
.gif
" alt="'
.
$this
->
str
->
assignroles
.
'" /></a>'
;
'<img src="'
.
$
OUTPUT
->
old_icon_url
(
'
i/roles
'
)
.
'
" alt="'
.
$this
->
str
->
assignroles
.
'" /></a>'
;
// TODO MDL-19010 fix and re-enable.
if
(
false
&&
$this
->
user_can_edit
())
{
...
...
@@ -468,12 +468,12 @@ class block_base {
if
(
$options
&
BLOCK_CONFIGURE
&&
$this
->
user_can_edit
())
{
$movebuttons
.
=
'<a class="icon edit" title="'
.
$this
->
str
->
configure
.
'" href="'
.
$script
.
'&blockaction=config">'
.
'<img src="'
.
$
CFG
->
pixpath
.
'/t/edit.gif
" alt="'
.
$this
->
str
->
configure
.
'" /></a>'
;
'<img src="'
.
$
OUTPUT
->
old_icon_url
(
't/edit'
)
.
'
" alt="'
.
$this
->
str
->
configure
.
'" /></a>'
;
}
if
(
$this
->
user_can_addto
(
$page
))
{
$movebuttons
.
=
'<a class="icon delete" title="'
.
$this
->
str
->
delete
.
'" href="'
.
$script
.
'&blockaction=delete">'
.
'<img src="'
.
$
CFG
->
pixpath
.
'/
t/delete
.gif
" alt="'
.
$this
->
str
->
delete
.
'" /></a>'
;
'<img src="'
.
$
OUTPUT
->
old_icon_url
(
'
t/delete
'
)
.
'
" alt="'
.
$this
->
str
->
delete
.
'" /></a>'
;
}
if
(
$options
&
BLOCK_MOVE_LEFT
)
{
...
...
@@ -482,11 +482,11 @@ class block_base {
}
if
(
$options
&
BLOCK_MOVE_UP
)
{
$movebuttons
.
=
'<a class="icon up" title="'
.
$this
->
str
->
moveup
.
'" href="'
.
$script
.
'&blockaction=moveup">'
.
'<img src="'
.
$
CFG
->
pixpath
.
'/t/up.gif
" alt="'
.
$this
->
str
->
moveup
.
'" /></a>'
;
'<img src="'
.
$
OUTPUT
->
old_icon_url
(
't/up'
)
.
'
" alt="'
.
$this
->
str
->
moveup
.
'" /></a>'
;
}
if
(
$options
&
BLOCK_MOVE_DOWN
)
{
$movebuttons
.
=
'<a class="icon down" title="'
.
$this
->
str
->
movedown
.
'" href="'
.
$script
.
'&blockaction=movedown">'
.
'<img src="'
.
$
CFG
->
pixpath
.
'/t/down.gif
" alt="'
.
$this
->
str
->
movedown
.
'" /></a>'
;
'<img src="'
.
$
OUTPUT
->
old_icon_url
(
't/down'
)
.
'
" alt="'
.
$this
->
str
->
movedown
.
'" /></a>'
;
}
if
(
$options
&
BLOCK_MOVE_RIGHT
)
{
$movebuttons
.
=
'<a class="icon right" title="'
.
$this
->
str
->
moveright
.
'" href="'
.
$script
.
'&blockaction=moveright">'
.
...
...
blocks/online_users/block_online_users.php
View file @
6b608f8f
...
...
@@ -14,7 +14,7 @@ class block_online_users extends block_base {
function
has_config
()
{
return
true
;}
function
get_content
()
{
global
$USER
,
$CFG
,
$DB
;
global
$USER
,
$CFG
,
$DB
,
$OUTPUT
;
if
(
$this
->
content
!==
NULL
)
{
return
$this
->
content
;
...
...
@@ -162,7 +162,7 @@ class block_online_users extends block_base {
}
if
(
$canshowicon
and
(
$USER
->
id
!=
$user
->
id
)
and
$user
->
username
!=
'guest'
)
{
// Only when logged in and messaging active etc
$this
->
content
->
text
.
=
'<div class="message"><a title="'
.
get_string
(
'messageselectadd'
)
.
'" href="'
.
$CFG
->
wwwroot
.
'/message/discussion.php?id='
.
$user
->
id
.
'" onclick="this.target=\'message_'
.
$user
->
id
.
'\';return openpopup(\'/message/discussion.php?id='
.
$user
->
id
.
'\', \'message_'
.
$user
->
id
.
'\', \'menubar=0,location=0,scrollbars,status,resizable,width=400,height=500\', 0);">'
.
'<img class="iconsmall" src="'
.
$
CFG
->
pixpath
.
'/
t/message
.gif
" alt="'
.
get_string
(
'messageselectadd'
)
.
'" /></a></div>'
;
.
'<img class="iconsmall" src="'
.
$
OUTPUT
->
old_icon_url
(
'
t/message
'
)
.
'
" alt="'
.
get_string
(
'messageselectadd'
)
.
'" /></a></div>'
;
}
$this
->
content
->
text
.
=
"</li>
\n
"
;
}
...
...
blocks/participants/block_participants.php
View file @
6b608f8f
...
...
@@ -8,7 +8,7 @@ class block_participants extends block_list {
function
get_content
()
{
global
$CFG
;
global
$CFG
,
$OUTPUT
;
if
(
empty
(
$this
->
instance
))
{
$this
->
content
=
''
;
...
...
@@ -37,7 +37,7 @@ class block_participants extends block_list {
$this
->
content
->
items
[]
=
'<a title="'
.
get_string
(
'listofallpeople'
)
.
'" href="'
.
$CFG
->
wwwroot
.
'/user/index.php?contextid='
.
$currentcontext
->
id
.
'">'
.
get_string
(
'participants'
)
.
'</a>'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
CFG
->
pixpath
.
'/
i/users
.gif
" class="icon" alt="" />'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
OUTPUT
->
old_icon_url
(
'
i/users
'
)
.
'
" class="icon" alt="" />'
;
return
$this
->
content
;
}
...
...
blocks/site_main_menu/block_site_main_menu.php
View file @
6b608f8f
...
...
@@ -11,7 +11,7 @@ class block_site_main_menu extends block_list {
}
function
get_content
()
{
global
$USER
,
$CFG
,
$DB
;
global
$USER
,
$CFG
,
$DB
,
$OUTPUT
;
if
(
$this
->
content
!==
NULL
)
{
return
$this
->
content
;
...
...
@@ -80,7 +80,7 @@ class block_site_main_menu extends block_list {
$editbuttons
=
''
;
if
(
$ismoving
)
{
$this
->
content
->
icons
[]
=
'<img src="'
.
$
CFG
->
pixpath
.
'/t/move.gif
" class="iconsmall" alt="" />'
;
$this
->
content
->
icons
[]
=
'<img src="'
.
$
OUTPUT
->
old_icon_url
(
't/move'
)
.
'
" class="iconsmall" alt="" />'
;
$this
->
content
->
items
[]
=
$USER
->
activitycopyname
.
' (<a href="'
.
$CFG
->
wwwroot
.
'/course/mod.php?cancelcopy=true&sesskey='
.
sesskey
()
.
'">'
.
$strcancel
.
'</a>)'
;
}
...
...
blocks/social_activities/block_social_activities.php
View file @
6b608f8f
...
...
@@ -11,7 +11,7 @@ class block_social_activities extends block_list {
}
function
get_content
()
{
global
$USER
,
$CFG
,
$DB
;
global
$USER
,
$CFG
,
$DB
,
$OUTPUT
;
if
(
$this
->
content
!==
NULL
)
{
return
$this
->
content
;
...
...
@@ -89,7 +89,7 @@ class block_social_activities extends block_list {
$editbuttons
=
''
;
if
(
$ismoving
)
{
$this
->
content
->
icons
[]
=
' <img align="bottom" src="'
.
$
CFG
->
pixpath
.
'/t/move.gif
" class="iconsmall" alt="" />'
;
$this
->
content
->
icons
[]
=
' <img align="bottom" src="'
.
$
OUTPUT
->
old_icon_url
(
't/move'
)
.
'
" class="iconsmall" alt="" />'
;
$this
->
content
->
items
[]
=
$USER
->
activitycopyname
.
' (<a href="'
.
$CFG
->
wwwroot
.
'/course/mod.php?cancelcopy=true&sesskey='
.
sesskey
()
.
'">'
.
$strcancel
.
'</a>)'
;
}
...
...
blog/rsslib.php
View file @
6b608f8f
...
...
@@ -8,7 +8,7 @@
// needs some hacking to rss/file.php
function
blog_rss_print_link
(
$filtertype
,
$filterselect
,
$tagid
=
0
,
$tooltiptext
=
''
)
{
global
$CFG
,
$USER
;
global
$CFG
,
$USER
,
$OUTPUT
;
if
(
empty
(
$USER
->
id
))
{
$userid
=
1
;
...
...
@@ -36,7 +36,7 @@
}
$path
.
=
'/rss.xml'
;
$rsspix
=
$
CFG
->
pixpath
.
'/i/rss.gif'
;
$rsspix
=
$
OUTPUT
->
old_icon_url
(
'i/rss'
)
;
require_once
(
$CFG
->
libdir
.
'/filelib.php'
);
$path
=
get_file_url
(
$path
,
null
,
'rssfile'
);
...
...
calendar/lib.php
View file @
6b608f8f
...
...
@@ -69,7 +69,7 @@ $CALENDARDAYS = array('sunday','monday','tuesday','wednesday','thursday','friday
function
calendar_get_mini
(
$courses
,
$groups
,
$users
,
$cal_month
=
false
,
$cal_year
=
false
)
{
global
$CFG
,
$USER
;
global
$CFG
,
$USER
,
$OUTPUT
;
$display
=
new
stdClass
;
$display
->
minwday
=
get_user_preferences
(
'calendar_startwday'
,
CALENDAR_STARTING_WEEKDAY
);
...
...
@@ -236,16 +236,16 @@ function calendar_get_mini($courses, $groups, $users, $cal_month = false, $cal_y
$popupalt
=
$event
->
modulename
;
}
else
if
(
$event
->
courseid
==
SITEID
)
{
// Site event
$popupicon
=
$
CFG
->
pixpath
.
'/
c/site
.gif
'
;
$popupicon
=
$
OUTPUT
->
old_icon_url
(
'
c/site'
)
;
$popupalt
=
''
;
}
else
if
(
$event
->
courseid
!=
0
&&
$event
->
courseid
!=
SITEID
&&
$event
->
groupid
==
0
)
{
// Course event
$popupicon
=
$
CFG
->
pixpath
.
'/
c/course
.gif
'
;
$popupicon
=
$
OUTPUT
->
old_icon_url
(
'
c/course'
)
;
$popupalt
=
''
;
}
else
if
(
$event
->
groupid
)
{
// Group event
$popupicon
=
$
CFG
->
pixpath
.
'/
c/group
.gif
'
;
$popupicon
=
$
OUTPUT
->
old_icon_url
(
'
c/group'
)
;
$popupalt
=
''
;
}
else
if
(
$event
->
userid
)
{
// User event
$popupicon
=
$
CFG
->
pixpath
.
'/
c/user
.gif
'
;
$popupicon
=
$
OUTPUT
->
old_icon_url
(
'
c/user'
)
;
$popupalt
=
''
;
}
$popupcontent
.
=
'<div><img class="icon" src="'
.
$popupicon
.
'" alt="'
.
$popupalt
.
'" /><a href="'
.
$dayhref
.
'#event_'
.
$event
->
id
.
'">'
.
format_string
(
$event
->
name
,
true
)
.
'</a></div>'
;
...
...
@@ -467,7 +467,7 @@ function calendar_get_upcoming($courses, $groups, $users, $daysinfuture, $maxeve
}
function
calendar_add_event_metadata
(
$event
)
{
global
$CFG
;
global
$CFG
,
$OUTPUT
;
//Support multilang in event->name
$event
->
name
=
format_string
(
$event
->
name
,
true
);
...
...
@@ -493,25 +493,25 @@ function calendar_add_event_metadata($event) {
}
else
if
(
$event
->
courseid
==
SITEID
)
{
// Site event
$event
->
icon
=
'<img height="16" width="16" src="'
.
$
CFG
->
pixpath
.
'/c/site.gif
" alt="'
.
get_string
(
'globalevent'
,
'calendar'
)
.
'" style="vertical-align: middle;" />'
;
$event
->
icon
=
'<img height="16" width="16" src="'
.
$
OUTPUT
->
old_icon_url
(
'c/site'
)
.
'
" alt="'
.
get_string
(
'globalevent'
,
'calendar'
)
.
'" style="vertical-align: middle;" />'
;
$event
->
cssclass
=
'event_global'
;
}
else
if
(
$event
->
courseid
!=
0
&&
$event
->
courseid
!=
SITEID
&&
$event
->
groupid
==
0
)
{
// Course event
calendar_get_course_cached
(
$coursecache
,
$event
->
courseid
);
$event
->
icon
=
'<img height="16" width="16" src="'
.
$
CFG
->
pixpath
.
'/
c/course
.gif
" alt="'
.
get_string
(
'courseevent'
,
'calendar'
)
.
'" style="vertical-align: middle;" />'
;
$event
->
icon
=
'<img height="16" width="16" src="'
.
$
OUTPUT
->
old_icon_url
(
'
c/course
'
)
.
'
" alt="'
.
get_string
(
'courseevent'
,
'calendar'
)
.
'" style="vertical-align: middle;" />'
;
$event
->
courselink
=
'<a href="'
.
$CFG
->
wwwroot
.
'/course/view.php?id='
.
$event
->
courseid
.
'">'
.
$coursecache
[
$event
->
courseid
]
->
fullname
.
'</a>'
;
$event
->
cssclass
=
'event_course'
;
}
else
if
(
$event
->
groupid
)
{
// Group event
$event
->
icon
=
'<img height="16" width="16" src="'
.
$
CFG
->
pixpath
.
'/
c/group
.gif
" alt="'
.
get_string
(
'groupevent'
,
'calendar'
)
.
'" style="vertical-align: middle;" />'
;
$event
->
icon
=
'<img height="16" width="16" src="'
.
$
OUTPUT
->
old_icon_url
(
'
c/group
'
)
.
'
" alt="'
.
get_string
(
'groupevent'
,
'calendar'
)
.
'" style="vertical-align: middle;" />'
;
$event
->
cssclass
=
'event_group'
;
}
else
if
(
$event
->
userid
)
{
// User event
$event
->
icon
=
'<img height="16" width="16" src="'
.
$
CFG
->
pixpath
.
'/c/user.gif
" alt="'
.
get_string
(
'userevent'
,
'calendar'
)
.
'" style="vertical-align: middle;" />'
;
$event
->
icon
=
'<img height="16" width="16" src="'
.
$
OUTPUT
->
old_icon_url
(
'c/user'
)
.
'
" alt="'
.
get_string
(
'userevent'
,
'calendar'
)
.
'" style="vertical-align: middle;" />'
;
$event
->
cssclass
=
'event_user'
;
}
return
$event
;
}
function
calendar_print_event
(
$event
)
{
global
$CFG
,
$USER
;
global
$CFG
,
$USER
,
$OUTPUT
;
static
$strftimetime
;
...
...
@@ -562,11 +562,11 @@ function calendar_print_event($event) {
$deletelink
=
''
;
// deleting activities directly from calendar is dangerous/confusing - see MDL-11843
}
echo
' <a href="'
.
$editlink
.
'"><img
src="'
.
$
CFG
->
pixpath
.
'/t/edit.gif
" alt="'
.
get_string
(
'tt_editevent'
,
'calendar'
)
.
'"
src="'
.
$
OUTPUT
->
old_icon_url
(
't/edit'
)
.
'
" alt="'
.
get_string
(
'tt_editevent'
,
'calendar'
)
.
'"
title="'
.
get_string
(
'tt_editevent'
,
'calendar'
)
.
'" /></a>'
;
if
(
$deletelink
)
{
echo
' <a href="'
.
$deletelink
.
'"><img
src="'
.
$
CFG
->
pixpath
.
'/
t/delete
.gif
" alt="'
.
get_string
(
'tt_deleteevent'
,
'calendar'
)
.
'"
src="'
.
$
OUTPUT
->
old_icon_url
(
'
t/delete
'
)
.
'
" alt="'
.
get_string
(
'tt_deleteevent'
,
'calendar'
)
.
'"
title="'
.
get_string
(
'tt_deleteevent'
,
'calendar'
)
.
'" /></a>'
;
}
echo
'</div>'
;
...
...
@@ -786,7 +786,7 @@ function calendar_top_controls($type, $data) {
}
function
calendar_filter_controls
(
$type
,
$vars
=
NULL
,
$course
=
NULL
,
$courses
=
NULL
)
{
global
$CFG
,
$SESSION
,
$USER
;
global
$CFG
,
$SESSION
,
$USER
,
$OUTPUT
;
$groupevents
=
true
;