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 icon zip in toolbar actions CT#7539

Browse Source
1.10.x
aragonc 10 years ago
parent 4f3e9d59a7
commit 081cd98da6
4 changed files with 33 additions and 42 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. 6
      app/Resources/public/css/base.css
  2. 63
      main/document/document.php
  3. 4
      main/inc/lib/social.lib.php
  4. 2
      main/inc/lib/usermanager.lib.php

6
app/Resources/public/css/base.css
Unescape View File

@ -1,6 +1,6 @@
/*
Theme Name: Chamilo Base
URI Project: http://www.chamilo.org
URL Project: http://www.chamilo.org
Description: Styles main base of Chamilo LMS appearance, works with Bootstrap 3.0.x
Author:
alex.aragon@beeznest.com
@ -6403,7 +6403,9 @@ a.sessionView {
padding: 6px;
font-size: 12px;
}
#listFriends .help{
font-size: 12px;
}
#listFriends a{
display: block;
text-overflow: ellipsis;

63
main/document/document.php
Unescape View File

@ -1503,22 +1503,20 @@ if (!isset($folders) || $folders === false) {
$folders = array();
}
$btngroup= array('class' => 'btn btn-default');
$actions = '<div class="actions">';
$actions .= '<div class="row">';
$actions .= '<div class="col-md-8">';
/* GO TO PARENT DIRECTORY */
if ($curdirpath != '/' && $curdirpath != $group_properties['directory'] && !$is_certificate_mode) {
$actions .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&id='.$parent_id.'">';
$actions .= Display::return_icon('folder_up.png', get_lang('Up'), '', ICON_SIZE_MEDIUM);
$actions .= '</a>';
$actionsLeft = '<a href="'.api_get_self().'?'.api_get_cidreq().'&id='.$parent_id.'">';
$actionsLeft .= Display::return_icon('folder_up.png', get_lang('Up'), '', ICON_SIZE_MEDIUM);
$actionsLeft .= '</a>';
}
if ($is_certificate_mode && $curdirpath != '/certificates') {
$actions .= Display::url(
$actionsLeft .= Display::url(
Display::return_icon('folder_up.png', get_lang('Up'), '', ICON_SIZE_MEDIUM),
api_get_self().'?'.api_get_cidreq().'&curdirpath='.$curdirpath
);
@ -1536,7 +1534,7 @@ if ($is_allowed_to_edit ||
// Create new document
if (!$is_certificate_mode) {
$actions .= Display::url(
$actionsLeft .= Display::url(
Display::return_icon('new_document.png', get_lang('CreateDoc'), '', ICON_SIZE_MEDIUM),
api_get_path(WEB_CODE_PATH).'document/create_document.php?'.api_get_cidreq().'&id='.$document_id
);
@ -1544,18 +1542,18 @@ if ($is_allowed_to_edit ||
// Create new draw
if (api_get_setting('enabled_support_svg') == 'true') {
if (api_browser_support('svg')) {
$actions .= Display::url(
$actionsLeft .= Display::url(
Display::return_icon('new_draw.png', get_lang('Draw'), '', ICON_SIZE_MEDIUM),
api_get_path(WEB_CODE_PATH).'document/create_draw.php?'.api_get_cidreq().'&id='.$document_id
);
} else {
$actions .= Display::return_icon('new_draw_na.png', get_lang('BrowserDontSupportsSVG'), '', ICON_SIZE_MEDIUM);
$actionsLeft .= Display::return_icon('new_draw_na.png', get_lang('BrowserDontSupportsSVG'), '', ICON_SIZE_MEDIUM);
}
}
// Create new paint
if (api_get_setting('enabled_support_pixlr') == 'true') {
$actions .= Display::url(
$actionsLeft .= Display::url(
Display::return_icon('new_paint.png', get_lang('PhotoRetouching'), '', ICON_SIZE_MEDIUM),
api_get_path(WEB_CODE_PATH).'document/create_paint.php?'.api_get_cidreq().'&id='.$document_id
);
@ -1563,7 +1561,7 @@ if ($is_allowed_to_edit ||
// Record an image clip from my webcam
if (api_get_setting('enable_webcam_clip') == 'true') {
$actions .= Display::url(
$actionsLeft .= Display::url(
Display::return_icon('webcam.png', get_lang('WebCamClip'), '', ICON_SIZE_MEDIUM),
api_get_path(WEB_CODE_PATH).'document/webcam_clip.php?'.api_get_cidreq().'&id='.$document_id
);
@ -1571,7 +1569,7 @@ if ($is_allowed_to_edit ||
// Record audio (nanogong)
if (api_get_setting('enable_nanogong') == 'true') {
$actions .= Display::url(
$actionsLeft .= Display::url(
Display::return_icon('new_recording.png', get_lang('RecordMyVoice'), '', ICON_SIZE_MEDIUM),
api_get_path(WEB_CODE_PATH).'document/record_audio.php?'.api_get_cidreq().'&id='.$document_id
);
@ -1579,7 +1577,7 @@ if ($is_allowed_to_edit ||
// Record audio (wami record)
if (api_get_setting('enable_wami_record') == 'true') {
$actions .= Display::url(
$actionsLeft .= Display::url(
Display::return_icon('new_recording.png', get_lang('RecordMyVoice'), '', ICON_SIZE_MEDIUM),
api_get_path(WEB_CODE_PATH).'document/record_audio_wami.php?'.api_get_cidreq().'&id='.$document_id
);
@ -1589,7 +1587,7 @@ if ($is_allowed_to_edit ||
if (api_get_setting('enabled_text2audio') == 'true') {
$dt2a = 'google';
$req_dt2a = '&amp;dt2a='.$dt2a;
$actions .= Display::url(
$actionsLeft .= Display::url(
Display::return_icon('new_sound.png', get_lang('CreateAudio'), '', ICON_SIZE_MEDIUM),
api_get_path(WEB_CODE_PATH).'document/create_audio.php?'.api_get_cidreq().'&id='.$document_id.$req_dt2a
);
@ -1598,19 +1596,19 @@ if ($is_allowed_to_edit ||
// Create new certificate
if ($is_certificate_mode) {
$actions .= Display::url(
$actionsLeft .= Display::url(
Display::return_icon('new_certificate.png', get_lang('CreateCertificate'), '', ICON_SIZE_MEDIUM),
api_get_path(WEB_CODE_PATH).'document/create_document.php?'.api_get_cidreq().'&id='.$document_id.'&certificate=true&selectcat='.$selectcat
);
}
// File upload link
if ($is_certificate_mode) {
$actions .= Display::url(
$actionsLeft .= Display::url(
Display::return_icon('upload_certificate.png', get_lang('UploadCertificate'), '', ICON_SIZE_MEDIUM),
api_get_path(WEB_CODE_PATH).'document/upload.php?'.api_get_cidreq().'&id='.$current_folder_id.'&certificate=true'
);
} else {
$actions .= Display::url(
$actionsLeft .= Display::url(
Display::return_icon('upload_file.png', get_lang('UplUploadDocument'), '', ICON_SIZE_MEDIUM),
api_get_path(WEB_CODE_PATH).'document/upload.php?'.api_get_cidreq().'&id='.$current_folder_id
);
@ -1620,8 +1618,8 @@ if ($is_allowed_to_edit ||
echo Display::display_icon('capture.png', get_lang('CatchScreenCasts'), '', ICON_SIZE_MEDIUM).'</a>';*/
if ($capturePluginInstalled) {
$actions .= '<span id="appletplace"></span>';
$actions .= Display::url(
$actionsLeft .= '<span id="appletplace"></span>';
$actionsLeft .= Display::url(
Display::return_icon('capture.png', get_lang('CatchScreenCasts'), '', ICON_SIZE_MEDIUM),
'#',
array('id' => 'jcapture')
@ -1630,7 +1628,7 @@ if ($is_allowed_to_edit ||
// Create directory
if (!$is_certificate_mode) {
$actions .= Display::url(
$actionsLeft .= Display::url(
Display::return_icon('new_folder.png', get_lang('CreateDir'), '', ICON_SIZE_MEDIUM),
api_get_path(WEB_CODE_PATH).'document/document.php?'.api_get_cidreq().'&id='.$document_id.'&createdir=1'
);
@ -1638,22 +1636,19 @@ if ($is_allowed_to_edit ||
}
require 'document_slideshow.inc.php';
if ($image_present && !isset($_GET['keyword'])) {
$actions .= Display::url(
$actionsLeft .= Display::url(
Display::return_icon('slideshow.png', get_lang('ViewSlideshow'), '', ICON_SIZE_MEDIUM),
api_get_path(WEB_CODE_PATH).'document/slideshow.php?'.api_get_cidreq().'&curdirpath='.$curdirpathurl
);
}
if (api_is_allowed_to_edit(null, true)) {
$actions .= Display::url(
$actionsLeft .= Display::url(
Display::return_icon('percentage.png', get_lang('DocumentQuota'), '', ICON_SIZE_MEDIUM),
api_get_path(WEB_CODE_PATH).'document/document_quota.php?'.api_get_cidreq()
);
}
}
$actions .= '</div>';
$actions .= '<div class="col-md-4">';
$actions .= '<div class="pull-right">';
if (!$is_certificate_mode) {
/* BUILD SEARCH FORM */
@ -1670,14 +1665,8 @@ if (!$is_certificate_mode) {
$form->addElement('hidden', 'id_session', api_get_session_id());
$form->addElement('hidden', 'gidReq', $groupId);
$form->addButtonSearch(get_lang('Search'));
$actions .= $form->returnForm();
$actionsRight = $form->returnForm();
}
$actions .= '</div>';
$actions .= '</div>';
$actions .= '</div>';
$table_footer = '';
$total_size = 0;
@ -1841,7 +1830,7 @@ if (!is_null($documentAndFolders)) {
|| api_is_allowed_to_edit()
|| api_is_platform_admin()
) {
$actions .= Display::url(
$actionsLeft .= Display::url(
Display::return_icon(
'save_pack.png',
get_lang('Save').' (ZIP)',
@ -1855,7 +1844,6 @@ if (!is_null($documentAndFolders)) {
}
$actions .= '</div>';
if (!empty($moveTo)) {
$document_id = DocumentManager::get_document_id($courseInfo, $moveTo);
@ -1978,8 +1966,9 @@ if (!empty($groupId)) {
} else {
Display::display_introduction_section(TOOL_DOCUMENT);
}
$toolbar = Display::toolbarAction('toolbar-document',array(0 => $actionsLeft, 1 => $actionsRight));
echo $actions;
echo $toolbar;
echo $templateForm;
echo $moveForm;
echo $dirForm;

4
main/inc/lib/social.lib.php
Unescape View File

@ -1688,8 +1688,8 @@ class SocialManager extends UserManager
}
$friendHtml.='</ul>';
} else {
$friendHtml.= '<div class="">'.get_lang('NoFriendsInYourContactList').'<br />'
.'<a class="btn btn-primary" href="'.api_get_path(WEB_PATH).'whoisonline.php"><i class="fa fa-search"></i> '. get_lang('TryAndFindSomeFriends').'</a></div>';
$friendHtml.= '<div class="help">'.get_lang('NoFriendsInYourContactList').' '
.'<a href="'.api_get_path(WEB_PATH).'whoisonline.php"><i class="fa fa-search"></i> '. get_lang('TryAndFindSomeFriends').'</a></div>';
}
return $friendHtml;

2
main/inc/lib/usermanager.lib.php
Unescape View File

@ -3630,7 +3630,7 @@ class UserManager
api_get_path(WEB_PATH).'main/social/search.php',
'',
array(),
FormValidator::LAYOUT_INLINE
FormValidator::LAYOUT_HORIZONTAL
);
$form->addText('q', get_lang('UsersGroups'));

Write Preview
Loading…
Cancel
Save