Skip to content

Commit

Permalink
Fix icons using Display::return_icon or Display::returnIconPath
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmontoyaa
jmontoyaa committed Mar 22, 2016
1 parent 27c8bce commit 040b8da
Show file tree
Hide file tree
Showing 7 changed files with 66 additions and 53 deletions.
70 changes: 46 additions & 24 deletions main/inc/lib/blog.lib.php
View file
Expand Up @@ -997,13 +997,19 @@ public static function display_post($blog_id, $post_id)

$task_id = (isset($_GET['task_id']) && is_numeric($_GET['task_id'])) ? intval($_GET['task_id']) : 0;

if (api_is_allowed('BLOG_' . $blog_id, 'article_edit', $task_id))
$blog_post_actions .= '<a href="blog.php?action=edit_post&blog_id=' . $blog_id . '&post_id=' . $post_id . '&article_id=' . $blog_post['post_id'] . '&task_id=' . $task_id . '" title="' . get_lang('EditThisPost') . '"><img src="../img/edit.gif" /></a>';
if (api_is_allowed('BLOG_' . $blog_id, 'article_edit', $task_id)) {
$blog_post_actions .= '<a href="blog.php?action=edit_post&blog_id=' . $blog_id . '&post_id=' . $post_id . '&article_id=' . $blog_post['post_id'] . '&task_id=' . $task_id . '" title="' . get_lang('EditThisPost') . '">';
$blog_post_actions .= Display::return_icon('edit.png');
$blog_post_actions .= '</a>';
}

if (api_is_allowed('BLOG_' . $blog_id, 'article_delete', $task_id))
$blog_post_actions .= '<a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $post_id . '&do=delete_article&article_id=' . $blog_post['post_id'] . '&task_id=' . $task_id . '" title="' . get_lang('DeleteThisArticle') . '" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"><img src="../img/delete.gif" border="0" /></a>';
if (api_is_allowed('BLOG_' . $blog_id, 'article_delete', $task_id)) {
$blog_post_actions .= '<a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $post_id . '&do=delete_article&article_id=' . $blog_post['post_id'] . '&task_id=' . $task_id . '" title="' . get_lang('DeleteThisArticle') . '" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;">';
$blog_post_actions .= Display::return_icon('delete.png');
$blog_post_actions .= '</a>';
}

if(api_is_allowed('BLOG_' . $blog_id, 'article_rate'))
if (api_is_allowed('BLOG_' . $blog_id, 'article_rate'))
$rating_select = Blog::display_rating_form('post',$blog_id,$post_id);

$blog_post_text=stripslashes($blog_post_text);
Expand Down Expand Up @@ -1222,8 +1228,19 @@ public static function get_threaded_comments($current = 0, $current_level = 0, $
$comment_text = make_clickable(stripslashes($comment['comment']));
$blog_comment_date = api_convert_and_format_date($comment['date_creation'], null, date_default_timezone_get());
$blog_comment_actions = "";
if(api_is_allowed('BLOG_' . $blog_id, 'article_comments_delete', $task_id)) { $blog_comment_actions .= '<a href="blog.php?action=view_post&blog_id=' . $blog_id . '&post_id=' . $post_id . '&do=delete_comment&comment_id=' . $comment['comment_id'] . '&task_id=' . $task_id . '" title="' . get_lang('DeleteThisComment') . '" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"><img src="../img/delete.gif" border="0" /></a>'; }
if(api_is_allowed('BLOG_' . $blog_id, 'article_comments_rate')) { $rating_select = Blog::display_rating_form('comment', $blog_id, $post_id, $comment['comment_id']); }
if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_delete', $task_id)) {
$blog_comment_actions .= '<a href="blog.php?action=view_post&blog_id='.$blog_id.'&post_id='.$post_id.'&do=delete_comment&comment_id='.$comment['comment_id'].'&task_id='.$task_id.'" title="'.get_lang(
'DeleteThisComment'
).'" onclick="javascript:if(!confirm(\''.addslashes(
api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES, $charset)
).'\')) return false;">';
$blog_comment_actions .= Display::return_icon('delete.png');
$blog_comment_actions .= '</a>';
}

if (api_is_allowed('BLOG_'.$blog_id, 'article_comments_rate')) {
$rating_select = Blog::display_rating_form('comment', $blog_id, $post_id, $comment['comment_id']);
}

if (!is_null($comment['task_id'])) {
$border_color = ' border-left: 3px solid #' . $comment['color'];
Expand All @@ -1238,7 +1255,7 @@ public static function get_threaded_comments($current = 0, $current_level = 0, $
echo '<span class="blogpost_comment_date">' . $blog_comment_date . '</span>';
echo '<span class="blogpost_text">' . $comment_text . '</span>';

$file_name_array=get_blog_attachment($blog_id,$post_id, $comment['comment_id']);
$file_name_array = get_blog_attachment($blog_id,$post_id, $comment['comment_id']);
if (!empty($file_name_array)) {
echo '<br /><br />';
echo Display::return_icon('attachment.gif',get_lang('Attachment'));
Expand Down Expand Up @@ -1363,10 +1380,15 @@ public static function display_task_list($blog_id)
global $color2;

echo '<div class="actions">';
echo '<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $blog_id . '&do=add"><img src="../img/blog_newtasks.gif" border="0" align="middle" alt="'.get_lang('AddTasks').'" />' . get_lang('AddTasks') . '</a> ';
echo '<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $blog_id . '&do=assign"><img src="../img/blog_task.gif" border="0" align="middle" alt="'.get_lang('AssignTasks').'" />' . get_lang('AssignTasks') . '</a>';
echo '<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $blog_id . '&do=add">';
echo Display::return_icon('blog_newtasks.gif', get_lang('AddTasks'));
echo get_lang('AddTasks') . '</a> ';
echo '<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $blog_id . '&do=assign">';
echo Display::return_icon('blog_task.gif', get_lang('AssignTasks'));
echo get_lang('AssignTasks') . '</a>';
?>
<a href="<?php echo api_get_self(); ?>?action=manage_rights&blog_id=<?php echo $blog_id ?>" title="<?php echo get_lang('ManageRights') ?>"><?php echo Display::return_icon('blog_admin_users.png', get_lang('RightsManager'),'',ICON_SIZE_SMALL). get_lang('RightsManager') ?></a>
<a href="<?php echo api_get_self(); ?>?action=manage_rights&blog_id=<?php echo $blog_id ?>" title="<?php echo get_lang('ManageRights') ?>">
<?php echo Display::return_icon('blog_admin_users.png', get_lang('RightsManager'),'',ICON_SIZE_SMALL). get_lang('RightsManager') ?></a>
<?php
echo '</div>';

Expand Down Expand Up @@ -1403,19 +1425,19 @@ public static function display_task_list($blog_id)
$delete_confirm = ($task['system_task'] == '1') ? '' : 'onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)). '\')) return false;"';

echo '<tr class="' . $css_class . '" valign="top">',
'<td width="240">' . Security::remove_XSS($task['title']) . '</td>',
'<td>' . Security::remove_XSS($task['description']) . '</td>',
'<td><span style="background-color: #' . $task['color'] . '">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span></td>',
'<td width="50">',
'<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $task['blog_id'] . '&do=edit&task_id=' . $task['task_id'] . '">',
'<img src="../img/edit.gif" border="0" title="' . get_lang('EditTask') . '" />',
"</a>\n",
'<a href="' . $delete_link . '"',
$delete_confirm,
'><img src="../img/' . $delete_icon . '" border="0" title="' . $delete_title . '" />',
"</a>\n",
'</td>',
'</tr>';
'<td width="240">' . Security::remove_XSS($task['title']) . '</td>',
'<td>' . Security::remove_XSS($task['description']) . '</td>',
'<td><span style="background-color: #' . $task['color'] . '">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span></td>',
'<td width="50">',
'<a href="' .api_get_self(). '?action=manage_tasks&blog_id=' . $task['blog_id'] . '&do=edit&task_id=' . $task['task_id'] . '">',
'<img src="../img/edit.gif" border="0" title="' . get_lang('EditTask') . '" />',
"</a>\n",
'<a href="' . $delete_link . '"',
$delete_confirm,
'><img src="../img/' . $delete_icon . '" border="0" title="' . $delete_title . '" />',
"</a>\n",
'</td>',
'</tr>';
}
echo "</table>";
}
Expand Down
2 changes: 1 addition & 1 deletion main/inc/lib/search/tool_processors/document_processor.class.php
View file
Expand Up @@ -91,7 +91,7 @@ private function get_information($course_id, $doc_id) {
$url = sprintf($url, $course_path, $row['path']);
// Get the image path
$icon = choose_image(basename($row['path']));
$thumbnail = api_get_path(WEB_CODE_PATH) . 'img/' . $icon;
$thumbnail = Display::returnIconPath($icon);
$image = $thumbnail;
//FIXME: use big images
// get author
Expand Down
2 changes: 1 addition & 1 deletion main/inc/lib/search/tool_processors/link_processor.class.php
View file
Expand Up @@ -111,7 +111,7 @@ private function get_information($course_id, $link_id) {
$url = api_get_path(WEB_PATH) . 'main/link/link.php?cidReq=%s';
$url = sprintf($url, $course_id_alpha);
// Get the image path
$thumbnail = api_get_path(WEB_CODE_PATH) . 'img/link.gif';
$thumbnail = Display::returnIconPath('link.png');
$image = $thumbnail; //FIXME: use big images
// get author
$author = '';
Expand Down
28 changes: 8 additions & 20 deletions main/newscorm/learnpath.class.php
View file
Expand Up @@ -3178,28 +3178,17 @@ public function get_html_toc($toc_list = null)
$i = 0;

foreach ($toc_list as $item) {
// TODO: Complete this
$icon_name = array (
'not attempted' => '../img/notattempted.gif',
'incomplete' => '../img/incomplete.png',
'failed' => '../img/delete.png',
'completed' => '../img/completed.png',
'passed' => '../img/passed.png',
'succeeded' => '../img/succeeded.png',
'browsed' => '../img/completed.png',
);

// Style Status

$class_name = array (
$class_name = [
'not attempted' => 'scorm_not_attempted',
'incomplete' => 'scorm_not_attempted',
'failed' => 'scorm_failed',
'completed' => 'scorm_completed',
'passed' => 'scorm_completed',
'succeeded' => 'scorm_completed',
'browsed' => 'scorm_completed',
);
'incomplete' => 'scorm_not_attempted',
'failed' => 'scorm_failed',
'completed' => 'scorm_completed',
'passed' => 'scorm_completed',
'succeeded' => 'scorm_completed',
'browsed' => 'scorm_completed',
];

$scorm_color_background = 'row_odd';
$style_item = '';
Expand Down Expand Up @@ -5617,7 +5606,6 @@ public function return_new_tree($update_audio = 'false', $drop_element_here = fa

// The audio column.
$return_audio .= '<td align="left" style="padding-left:10px;">';

$audio = '';

if (!$update_audio || $update_audio <> 'true') {
Expand Down
9 changes: 6 additions & 3 deletions main/newscorm/lp_list_search.php
View file
Expand Up @@ -125,7 +125,7 @@
foreach ($results as $result) {
// Fill the result array.
if (empty($result['thumbnail'])) {
$result['thumbnail'] = '../img/no_document_thumb.jpg';
$result['thumbnail'] = Display::returnIconPath('no_document_thumb.jpg');
}

if (!empty($result['url'])) {
Expand Down Expand Up @@ -181,11 +181,14 @@

$search_link = '<a href="%ssearch/index.php?mode=%s&action=search&query=%s%s">';

$iconGallery = (($mode == 'gallery') ? 'ButtonGallOn' : 'ButtonGallOff').'.png';
$iconDefault = (($mode == 'default') ? 'ButtonListOn' : 'ButtonListOff').'.png';

$mode_selector = '<div id="mode-selector">';
$mode_selector .= sprintf($search_link, api_get_path(WEB_CODE_PATH), 'gallery', $_REQUEST['query'], $get_params);
$mode_selector .= '<img src="../img/'. (($mode=='gallery')?'ButtonGallOn':'ButtonGallOff') .'.png" /></a>';
$mode_selector .= Display::return_icon($iconGallery).'</a>';
$mode_selector .= sprintf($search_link, api_get_path(WEB_CODE_PATH), 'default', $_REQUEST['query'], $get_params);
$mode_selector .= '<img src="../img/'.(($mode=='default')?'ButtonListOn':'ButtonListOff').'.png" /></a>';
$mode_selector .= Display::return_icon($iconDefault).'</a>';
$mode_selector .= '</div>';

echo '<div id="search-results-container">';
Expand Down
6 changes: 3 additions & 3 deletions main/newscorm/scorm_api.php
View file
Expand Up @@ -2213,7 +2213,7 @@ function attach_glossary_into_scorm(type) {
var openerId = this.id +'_opener';

var link = '<a id="'+openerId+'" href="#" class="generated btn">'+
'<div style="text-align: center"><img src="<?php echo api_get_path(WEB_CODE_PATH).'img/play-circle-8x.png'; ?>"/><br />If video does not work, try clicking here.</div></a>';
'<div style="text-align: center"><img src="<?php echo Display::returnIconPath('play-circle-8x.png'); ?>"/><br />If video does not work, try clicking here.</div></a>';
var embed = $("iframe").contents().find("#"+this.id).find('embed').first();

var hasHttp = embed.attr('src').indexOf("http");
Expand Down Expand Up @@ -2252,7 +2252,7 @@ function attach_glossary_into_scorm(type) {
var randLetter = String.fromCharCode(65 + Math.floor(Math.random() * 26));
var uniqid = randLetter + Date.now();
var openerId = uniqid +'_opener';
var link = '<a id="'+openerId+'" class="generated" href="#">Open website <img src="<?php echo api_get_path(WEB_CODE_PATH).'img/link-external.png'; ?>"/></a>';
var link = '<a id="'+openerId+'" class="generated" href="#">Open website <img src="<?php echo Display::returnIconPath('link-external.png'); ?>"/></a>';
var embed = $(this);
var height = embed.attr('height');
var width = embed.attr('width');
Expand Down Expand Up @@ -2317,7 +2317,7 @@ function attach_glossary_into_scorm(type) {
src = url+'&type=link&src='+src;
src = src.replace('https', 'http');
$(this).attr('href', src);
var myAnchor = $('<a><img src="<?php echo api_get_path(WEB_CODE_PATH).'img/link-external.png'; ?>"/></a>').attr("href", src).attr('target', '_blank').attr('class', 'generated');
var myAnchor = $('<a><img src="<?php echo Display::returnIconPath('link-external.png'); ?>"/></a>').attr("href", src).attr('target', '_blank').attr('class', 'generated');
$(this).after(myAnchor);
$(this).after('-');
}
Expand Down
2 changes: 1 addition & 1 deletion main/upload/upload_word.php
View file
Expand Up @@ -15,7 +15,7 @@
width: 200px;
}
.convert_button{
background: url("../img/icons/22/learnpath.png") 0px 0px no-repeat;
background: url("'.Display::returnIconPath('learnpath.png').'") 0px 0px no-repeat;
padding: 2px 0px 2px 22px;
}
#dynamic_div_container{float:left;margin-right:10px;}
Expand Down

0 comments on commit 040b8da

Please sign in to comment.