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

fix icons documents - refs BT#13094

Browse Source
pull/2487/head
Alex Aragon 7 years ago
parent d0196d44b8
commit 4027d0eccc
6 changed files with 162 additions and 157 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. BIN
      main/img/icons/22/folder_learningpath.png
  2. BIN
      main/img/icons/22/folder_users.png
  3. 29
      main/img/icons/svg/folder_learningpath.svg
  4. 16
      main/img/icons/svg/folder_users.svg
  5. 16
      main/inc/lib/document.lib.php
  6. 26
      main/inc/lib/fileDisplay.lib.php

BIN
main/img/icons/22/folder_learningpath.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
main/img/icons/22/folder_users.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

29
main/img/icons/svg/folder_learningpath.svg
Unescape View File

@ -473,10 +473,10 @@
inkscape:zoom="2.1098555"
inkscape:cx="3.0619698"
inkscape:cy="27.540126"
inkscape:window-width="1325"
inkscape:window-height="747"
inkscape:window-x="41"
inkscape:window-y="21"
inkscape:window-width="1319"
inkscape:window-height="744"
inkscape:window-x="47"
inkscape:window-y="24"
inkscape:window-maximized="1"
inkscape:current-layer="svg548"
units="px" /><metadata
@ -748,14 +748,19 @@ folder-1.ai</rdf:li></rdf:Alt></dc:title></rdf:Description><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata></x:xmpmeta><xpacket
id="xpacket8">
end='w'</xpacket></metadata><rect
style="opacity:0;fill:#ff9955;fill-opacity:1;stroke:none;stroke-width:0.88;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect6163"
width="102.4"
height="102.4"
end='w'</xpacket></metadata><g
id="g4720"
inkscape:export-filename="/var/www/chamilo11/main/img/icons/22/folder_learningpath.png"
inkscape:export-xdpi="15.46875"
inkscape:export-ydpi="15.46875"><rect
ry="0"
y="0"
x="0"
y="0.18958557"
ry="0" /><g
height="128"
width="128"
id="rect6163"
style="opacity:0;fill:#ff9955;fill-opacity:1;stroke:none;stroke-width:0.88;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /><g
id="g4688"><g
id="g6129"
transform="matrix(1.2991295,0,0,1.2991295,-6.7409359,-7.3648295)"><path
style="opacity:0.4"
@ -874,4 +879,4 @@ end='w'</xpacket></metadata><rect
inkscape:connector-curvature="0"
id="path3833-7"
d="m 103.1697,32.210301 -1.56547,0.855314 14.85773,78.117905 1.83788,-0.73481 z"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3903);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" /></g></g></g></svg>
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3903);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" /></g></g></g></g></g></svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 50 KiB

16
main/img/icons/svg/folder_users.svg
Unescape View File

@ -593,12 +593,12 @@
id="base"
showgrid="false"
inkscape:zoom="2.1820285"
inkscape:cx="135.11036"
inkscape:cx="23.51695"
inkscape:cy="23.683867"
inkscape:window-width="1325"
inkscape:window-height="747"
inkscape:window-x="41"
inkscape:window-y="344"
inkscape:window-width="1319"
inkscape:window-height="744"
inkscape:window-x="47"
inkscape:window-y="24"
inkscape:window-maximized="1"
inkscape:current-layer="svg548"
units="px" /><metadata
@ -872,9 +872,9 @@ folder-1.ai</rdf:li></rdf:Alt></dc:title></rdf:Description><cc:Work
id="xpacket8">
end='w'</xpacket></metadata><g
id="g5539"
inkscape:export-filename="/var/www/chamilo11/main/img/icons/128/folder_users.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"><rect
inkscape:export-filename="/var/www/chamilo11/main/img/icons/22/folder_users.png"
inkscape:export-xdpi="15.46875"
inkscape:export-ydpi="15.46875"><rect
y="0"
x="0"
height="128"

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 56 KiB

After

Width:  |  Height:  |  Size: 56 KiB

16
main/inc/lib/document.lib.php
Unescape View File

@ -5697,38 +5697,38 @@ class DocumentManager
}
$icon = 'folder_users.png';
} else {
$icon = 'folder_document.gif';
$icon = 'folder_document.png';
if ($path == '/audio') {
$icon = 'folder_audio.gif';
$icon = 'folder_audio.png';
if ($isAllowedToEdit) {
$basename = get_lang('HelpDefaultDirDocuments');
} else {
$basename = get_lang('Audio');
}
} elseif ($path == '/flash') {
$icon = 'folder_flash.gif';
$icon = 'folder_flash.png';
if ($isAllowedToEdit) {
$basename = get_lang('HelpDefaultDirDocuments');
} else {
$basename = get_lang('Flash');
}
} elseif ($path == '/images') {
$icon = 'folder_images.gif';
$icon = 'folder_images.png';
if ($isAllowedToEdit) {
$basename = get_lang('HelpDefaultDirDocuments');
} else {
$basename = get_lang('Images');
}
} elseif ($path == '/video') {
$icon = 'folder_video.gif';
$icon = 'folder_video.png';
if ($isAllowedToEdit) {
$basename = get_lang('HelpDefaultDirDocuments');
} else {
$basename = get_lang('Video');
}
} elseif ($path == '/images/gallery') {
$icon = 'folder_gallery.gif';
$icon = 'folder_gallery.png';
if ($isAllowedToEdit) {
$basename = get_lang('HelpDefaultDirDocuments');
} else {
@ -5742,7 +5742,7 @@ class DocumentManager
$basename = get_lang('ChatFiles');
}
} elseif ($path == '/learning_path') {
$icon = 'folder_learningpath.gif';
$icon = 'folder_learningpath.png';
if ($isAllowedToEdit) {
$basename = get_lang('HelpFolderLearningPaths');
} else {
@ -5756,7 +5756,7 @@ class DocumentManager
return Display::img($icon, $basename, array(), false);
}
return Display::return_icon($icon, $basename, array(), ICON_SIZE_MEDIUM);
return Display::return_icon($icon, $basename, array(), ICON_SIZE_SMALL);
}
/**

26
main/inc/lib/fileDisplay.lib.php
Unescape View File

@ -134,11 +134,11 @@ function choose_image($file_name)
$type['freemind'] = array('mm');
$image['word'] = 'word.gif';
$image['web'] = 'file_html.gif';
$image['image'] = 'file_image.gif';
$image['web'] = 'file_html.png';
$image['image'] = 'file_image.png';
$image['image_vect'] = 'file_svg.png';
$image['audio'] = 'file_sound.gif';
$image['video'] = 'film.gif';
$image['video'] = 'film.png';
$image['excel'] = 'excel.gif';
$image['compressed'] = 'file_zip.gif';
$image['code'] = 'icons/22/mime_code.png';
@ -179,31 +179,31 @@ function choose_image($file_name)
function chooseFolderIcon($folderPath)
{
if ($folderPath == '/shared_folder') {
return 'folder_users.gif';
return 'folder_users.png';
}
if (strstr($folderPath, 'shared_folder_session_')) {
return 'folder_users.gif';
return 'folder_users.png';
}
switch ($folderPath) {
case '/audio':
return 'folder_audio.gif';
return 'folder_audio.png';
case '/flash':
return 'folder_flash.gif';
return 'folder_flash.png';
case '/images':
return 'folder_images.gif';
return 'folder_images.png';
case '/video':
return 'folder_video.gif';
return 'folder_video.png';
case '/images/gallery':
return 'folder_gallery.gif';
return 'folder_gallery.png';
case '/chat_files':
return 'folder_chat.gif';
return 'folder_chat.png';
case '/learning_path':
return 'folder_learningpath.gif';
return 'folder_learningpath.png';
}
return 'folder_document.gif';
return 'folder_document.png';
}
/**

Write Preview
Loading…
Cancel
Save