chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use returnIconPath

Browse Source
1.10.x
jmontoya 10 years ago
parent 0d2152164a
commit 84a3c19c4a
4 changed files with 77 additions and 90 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 18
      main/inc/lib/search/tool_processors/quiz_processor.class.php
  2. 130
      main/template/default/link/index.tpl
  3. 9
      plugin/search_course/lib/search_course_widget.class.php
  4. 10
      plugin/ticket/src/ticket.class.php

18
main/inc/lib/search/tool_processors/quiz_processor.class.php
Unescape View File

@ -106,34 +106,27 @@ class quiz_processor extends search_processor {
/**
* Get learning path information
*/
private function get_information($courseCode, $exercise_id) {
private function get_information($courseCode, $exercise_id)
{
$course_information = api_get_course_info($courseCode);
$course_id = $course_information['real_id'];
if (!empty($course_information)) {
$exercise_table = Database::get_course_table(TABLE_QUIZ_TEST);
$item_property_table = Database::get_course_table(TABLE_ITEM_PROPERTY);
$exercise_id = intval($exercise_id);
$sql = "SELECT * FROM $exercise_table WHERE id = $exercise_id AND c_id = $course_id LIMIT 1";
$dk_result = Database::query($sql);
//actually author isn't saved on exercise tool, but prepare for when it's ready
/*
$sql = "SELECT insert_user_id FROM $item_property_table
WHERE ref = $doc_id AND tool = '" . TOOL_DOCUMENT . "' AND c_id = $course_id
LIMIT 1";
*/
$name = '';
if ($row = Database::fetch_array($dk_result)) {
// Get the image path
$thumbnail = api_get_path(WEB_PATH) . 'main/img/quiz.gif';
$thumbnail = Display::returnIconPath('quiz.png');
$image = $thumbnail; //FIXME: use big images
$name = $row['title'];
// get author
$author = '';
$item_result = Database::query($sql);
if ($item_result !== FALSE && $row = Database::fetch_array($item_result)) {
if ($item_result !== false && $row = Database::fetch_array($item_result)) {
$user_data = api_get_user_info($row['insert_user_id']);
$author = api_get_person_name($user_data['firstName'], $user_data['lastName']);
}
@ -143,5 +136,4 @@ class quiz_processor extends search_processor {
return array();
}
}
}
}

130
main/template/default/link/index.tpl
Unescape View File

@ -2,24 +2,24 @@
{{javascript}}
<script type="text/javascript">
{% if is_allowed_to_edit %}
var sec_token = '{{sec_token}}';
{% endif %}
$(function() {
$('.collapsible .head').click(function(e) {
$(this).toggleClass('collapsed');
$(this).next().toggle();
return true;
});
{% if is_allowed_to_edit %}
$(".categories.sortable" ).sortable({
axis: 'y',
handle: '.handle',
//placeholder: 'ui-state-highlight',
update: function(event, ui) {
update: function(event, ui) {
var c_id = 0;
var ids = [];
var items;
@ -27,8 +27,8 @@ $(function() {
items.each(function(index, li){
li = $(li);
var id;
id = li.attr('data-id');
c_id = li.attr('data-c_id');
id = li.attr('data-id');
c_id = li.attr('data-c_id');
ids.push(id);
});
@ -40,7 +40,7 @@ $(function() {
$(".links.sortable" ).sortable({
axis: 'y',
placeholder: 'ui-state-highlight',
update: function(event, ui) {
update: function(event, ui) {
var c_id = 0;
var ids = [];
var items;
@ -48,8 +48,8 @@ $(function() {
items.each(function(index, li){
li = $(li);
var id;
id = li.attr('data-id');
c_id = li.attr('data-c_id');
id = li.attr('data-id');
c_id = li.attr('data-c_id');
ids.push(id);
});
@ -57,27 +57,27 @@ $(function() {
}
});
$(".links.sortable" ).disableSelection();
{% endif %}
});
function expand_all(){
$('.collapsible .head').removeClass('collapsed').next().show();
}
function collapse_all(){
function collapse_all(){
$('.collapsible .head').addClass('collapsed').next().hide();
}
function delete_category(name){
function delete_category(name){
if(!confirm("{{'ConfirmYourChoice'|get_lang}}")){
return false;
}
}
var item = $('#'+name);
var id = item.attr('data-id');
var c_id = item.attr('data-c_id');
var id = item.attr('data-id');
var c_id = item.attr('data-c_id');
var f = function(data){
if(data.success){
@ -87,12 +87,12 @@ $(function() {
};
LinkCategory.del(c_id, id, f);
}
function delete_all(){
if(!confirm("{{'ConfirmYourChoice'|get_lang}}")){
return false;
}
}
var f = function(data){
if(data.success){
var item = $('.data');
@ -101,22 +101,22 @@ $(function() {
message.update(data);
};
Link.delete_by_course({{c_id}}, {{session_id}}, f);
}
function delete_link(name, btn){
function delete_link(name, btn){
if(!confirm("{{'ConfirmYourChoice'|get_lang}}")){
return false;
}
}
var item = $('#'+name);
var id = item.attr('data-id');
var c_id = item.attr('data-c_id');
var id = item.attr('data-id');
var c_id = item.attr('data-c_id');
var f = function(data){
if(data.success){
item.remove();
}else{
}else{
$(btn).removeClass("loading");
}
message.update(data);
@ -124,12 +124,12 @@ $(function() {
$(btn).addClass("loading");
Link.del(c_id, id, f);
}
function switch_li_visibility(name, btn)
{
var li = $('#'+name);
var id = li.attr('data-id');
var c_id = li.attr('data-c_id');
var id = li.attr('data-id');
var c_id = li.attr('data-c_id');
var is_visible = !li.hasClass('invisible')
@ -161,9 +161,9 @@ function switch_li_visibility(name, btn)
function validate_link(name, btn){
var li = $('#'+name);
var id = li.attr('data-id');
var c_id = li.attr('data-c_id');
var id = li.attr('data-id');
var c_id = li.attr('data-c_id');
var f = function(data){
if(data.success){
li.addClass('valid');
@ -229,10 +229,10 @@ function validate_link(name, btn){
<li id="link_{{link.id}}" class="link {{link_class}}" data-id="{{link.id}}" data-c_id="{{link.c_id}}" data-type="link" >
<a class="icon" target="{{link.target}}" href="{{root}}&amp;action=go&amp;id={{link.id}}&amp;c_id={{link.c_id}}">
<img alt="{{'Links'|get_lang}}" src="../../main/img/link.gif" />
{{ 'link.png' |icon(22)}}
</a>
<a class="title" target="{{link.target}}" href="{{root}}&amp;action=go&amp;id={{link.id}}&amp;c_id={{link.c_id}}">
{%if link.title %}{{link.title}}{% else %}{{link.url}}{%endif%}
{%if link.title %}{{link.title}}{% else %}{{link.url}}{%endif%}
</a>
{% if link.session_id %}
{{session_image}}
@ -240,19 +240,19 @@ function validate_link(name, btn){
<div class="status" style="display:inline-block;">&nbsp;</div>
{% if is_allowed_to_edit %}
<div style="float:right;">
<a href="javascript:void(0)" onclick="validate_link('link_{{link.id}}', this);return false;"
title="{{'CheckURL'|get_lang}}"
<a href="javascript:void(0)" onclick="validate_link('link_{{link.id}}', this);return false;"
title="{{'CheckURL'|get_lang}}"
class="btn validate_link">
</a>
<a href="{{root}}&amp;action=edit_link&amp;id={{link.id}}&amp;c_id={{link.c_id}}"
title="{{'Edit'|get_lang}}"
</a>
<a href="{{root}}&amp;action=edit_link&amp;id={{link.id}}&amp;c_id={{link.c_id}}"
title="{{'Edit'|get_lang}}"
class="">
<em class="size-22 icon-edit"></em>
</a>
<a href="javascript:void(0)" onclick="switch_li_visibility('link_{{link.id}}', this);return false;"
</a>
<a href="javascript:void(0)" onclick="switch_li_visibility('link_{{link.id}}', this);return false;"
class="btn visibility {%if link.visibility == 1%}hide{%else%}show{%endif%}">
</a>
<a href="javascript:void(0)" onclick="delete_link('link_{{link.id}}', this);return false;" title="{{'Delete'|get_lang}}" class="">
<em class="size-22 icon-delete"></em>
@ -267,17 +267,17 @@ function validate_link(name, btn){
<ul id="link_categories" class="categories sortable" style="list-style: none; margin-left:0;">
{% for category in categories %}
<li id="category_{{category.id}}" class="link_category collapsible" data-id="{{category.id}}" data-c_id="{{category.c_id}}" data-type="category" >
<div class="head handle collapsed">
<div class="head handle collapsed">
{% if is_allowed_to_edit %}
<div style="float:right;">
<a href="{{root}}&amp;action=edit_category&amp;id={{category.id}}&amp;c_id={{category.c_id}}"
onclick="event.stopPropagation();"
<a href="{{root}}&amp;action=edit_category&amp;id={{category.id}}&amp;c_id={{category.c_id}}"
onclick="event.stopPropagation();"
title="{{'Edit'|get_lang}}"
class="">
<em class="size-22 icon-edit"></em>
</a>
<a href="javascript:void(0)"
onclick="delete_category('category_{{category.id}}');event.stopPropagation();return false;"
</a>
<a href="javascript:void(0)"
onclick="delete_category('category_{{category.id}}');event.stopPropagation();return false;"
title="{{'Delete'|get_lang}}"
class="">
<em class="size-22 icon-delete"></em>
@ -289,7 +289,7 @@ function validate_link(name, btn){
</h3>
{{category.description}}
</div>
<div class="body" style="display:none;">
<div class="body" style="display:none;">
<ul style="list-style: none; margin-left:0;" class="links sortable">
{% for link in category.links %}
{% set link_class %}
@ -301,10 +301,10 @@ function validate_link(name, btn){
<li id="link_{{link.id}}" class="link {{link_class}}" data-id="{{link.id}}" data-c_id="{{link.c_id}}" data-type="link" >
<a class="icon" target="{{link.target}}" href="{{root}}&amp;action=go&amp;id={{link.id}}&amp;c_id={{link.c_id}}">
<img alt="{{'Links'|get_lang}}" src="../../main/img/link.gif" />
{{ 'link.png' |icon(22) }}
</a>
<a class ="title" target="{{link.target}}" href="{{root}}&amp;action=go&amp;id={{link.id}}&amp;c_id={{link.c_id}}">
{%if link.title %}{{link.title}}{% else %}{{link.url}}{%endif%}
{%if link.title %}{{link.title}}{% else %}{{link.url}}{%endif%}
</a>
{% if link.session_id %}
{{session_image}}
@ -312,20 +312,20 @@ function validate_link(name, btn){
<div class="status" style="display:inline-block;">&nbsp;</div>
{% if is_allowed_to_edit %}
<div style="float:right;">
<a href="javascript:void(0)" onclick="validate_link('link_{{link.id}}', this);return false;"
title="{{'CheckURL'|get_lang}}"
class="btn validate_link"></a>
<a href="{{root}}&amp;action=edit_link&amp;id={{link.id}}&amp;c_id={{link.c_id}}"
onclick=""
<a href="javascript:void(0)" onclick="validate_link('link_{{link.id}}', this);return false;"
title="{{'CheckURL'|get_lang}}"
class="btn validate_link"></a>
<a href="{{root}}&amp;action=edit_link&amp;id={{link.id}}&amp;c_id={{link.c_id}}"
onclick=""
title="{{'Edit'|get_lang}}"
class="">
<em class="size-22 icon-edit"></em>
</a>
<a href="javascript:void(0)"
onclick="switch_li_visibility('link_{{link.id}}', this);return false;"
</a>
<a href="javascript:void(0)"
onclick="switch_li_visibility('link_{{link.id}}', this);return false;"
class="btn visibility {%if link.visibility == 1%}hide{%else%}show{%endif%}"></a>
<a href="javascript:void(0)"
onclick="delete_link('link_{{link.id}}', this);return false;"
<a href="javascript:void(0)"
onclick="delete_link('link_{{link.id}}', this);return false;"
title="{{'Delete'|get_lang}}"
class="">
<em class="size-22 icon-delete"></em>

9
plugin/search_course/lib/search_course_widget.class.php
Unescape View File

@ -304,13 +304,10 @@ EOT;
<input type="hidden" name="search_term" value="$search_term" />
EOT;
}
$web_path = api_get_path(WEB_PATH);
$subscribe_label = get_lang('Subscribe');
echo <<<EOT
<input type="image" name="unsub" src="$web_path/main/img/enroll.gif" alt="$subscribe_label" />$subscribe_label
echo '<input type="image" name="unsub" src="'.Display::returnIconPath('enroll.gif').'" alt="'.get_lang('Subscribe').'" />
'.get_lang('Subscribe').'
</form>
EOT;
';
return true;
}

10
plugin/ticket/src/ticket.class.php
Unescape View File

@ -766,10 +766,10 @@ class TicketManager
if ($dif > 172800 && $row['priority_id'] == 'NRM' && $row['status_id'] != 'CLS') {
$actions .= '<a href="myticket.php?ticket_id=' . $row['ticket_id'] . '&amp;action=alert">
<img src="' . $webPath . 'main/img/exclamation.png" border="0" /></a>';
<img src="' . Display::returnIconPath('exclamation.png') . '" border="0" /></a>';
}
if ($row['priority_id'] == 'HGH') {
$actions .= '<img src="' . $webCodePath . 'img/admin_star.png" border="0" />';
$actions .= '<img src="' . Display::returnIconPath('admin_star.png') . '" border="0" />';
}
$ticket = array(
$row['col0'],
@ -782,14 +782,12 @@ class TicketManager
}
if ($unread > 0) {
$ticket['0'] = $ticket['0'] . '&nbsp;&nbsp;(' . $unread . ')<a href="ticket_details.php?ticket_id=' . $row['ticket_id'] . '">
<img src="' . $webPath . 'main/img/message_new.png" border="0" title="' . $unread . ' ' . get_lang('Messages') . '"/>
<img src="' . Display::returnIconPath('message_new.png') . '" border="0" title="' . $unread . ' ' . get_lang('Messages') . '"/>
</a>';
}
if ($isAdmin) {
$ticket['0'] .= '&nbsp;&nbsp;<a href="javascript:void(0)" onclick="load_history_ticket(\'div_' . $row['ticket_id'] . '\',' . $row['ticket_id'] . ')">
<img onclick="load_course_list(\'div_' . $row['ticket_id'] . '\',' . $row['ticket_id'] . ')" onmouseover="clear_course_list (\'div_' . $row['ticket_id'] . '\')" src="' . $webPath . 'main/img/history.gif" title="' . get_lang(
'Historial'
) . '" alt="' . get_lang('Historial') . '"/>
<img onclick="load_course_list(\'div_' . $row['ticket_id'] . '\',' . $row['ticket_id'] . ')" onmouseover="clear_course_list (\'div_' . $row['ticket_id'] . '\')" src="' . Display::returnIconPath('history.gif') . '" title="' . get_lang('Historial') . '" alt="' . get_lang('Historial') . '"/>
<div class="blackboard_hide" id="div_' . $row['ticket_id'] . '">&nbsp;&nbsp;</div>
</a>&nbsp;&nbsp;';
}

Write Preview
Loading…
Cancel
Save