ajaxfilemanager improve styles and fix editor mode after visit admin->edit main page

skala
Juan Carlos Raña 15 years ago
parent ba81642e02
commit 1f2ec3bae1
  1. 1
      index.php
  2. 2
      main/calendar/myagenda.php
  3. 1
      main/dashboard/index.php
  4. 2
      main/document/document.inc.php
  5. 25
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajaxfilemanager.php
  6. 0
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/debug.html
  7. 42
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/theme/default/css/fckeditor.css
  8. 44
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/theme/default/css/stand_alone.css
  9. 9
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/theme/default/css/thickbox.css
  10. BIN
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/theme/default/images/button_upload.gif
  11. BIN
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/theme/default/images/close.gif
  12. BIN
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/theme/default/images/next.gif
  13. BIN
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/theme/default/images/prev.gif
  14. BIN
      main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/theme/default/images/stop.png
  15. 4
      main/inc/lib/social.lib.php
  16. 2
      main/mySpace/index.php
  17. 2
      main/social/home.php
  18. 3
      user_portal.php

@ -37,6 +37,7 @@ $setting_show_also_closed_courses = api_get_setting('show_closed_courses') == 't
// the section (for the tabs)
$this_section = SECTION_CAMPUS;
unset($_SESSION['this_section']);//for hmtl editor repository
/* Action Handling */

@ -8,6 +8,8 @@ $cidReset = true;
// setting the global file that gets the general configuration, the databases, the languages, ...
require_once '../inc/global.inc.php';
$this_section = SECTION_MYAGENDA;
unset($_SESSION['this_section']);//for hmtl editor repository
api_block_anonymous_users();
require_once api_get_path(LIBRARY_PATH).'groupmanager.lib.php';
require_once 'agenda.inc.php';

@ -25,6 +25,7 @@ api_block_anonymous_users();
// current section
$this_section = SECTION_DASHBOARD;
unset($_SESSION['this_section']);//for hmtl editor repository
// get actions
$actions = array('listing', 'store_user_block', 'disable_block');

@ -178,7 +178,7 @@ function create_document_link($www, $title, $path, $filetype, $size, $visibility
if($filetype == 'file')
{
$copy_to_myfiles='<a href="'.$copy_myfiles_link.'" style="float:right"'.$prevent_multiple_click.'>'.Display::return_icon('briefcase.png', get_lang('CopyToMyFiles'), array('height'=>'16', 'width' => '16')).'&nbsp;&nbsp;</a>';
$copy_to_myfiles='<a href="'.$copy_myfiles_link.'" style="float:right"'.$prevent_multiple_click.'>'.Display::return_icon('briefcase_small.png', get_lang('CopyToMyFiles'), array('height'=>'16', 'width' => '16')).'&nbsp;&nbsp;</a>';
}
return '<a href="'.$url.'" title="'.$tooltip_title_alt.'" target="'.$target.'"'.$visibility_class.' style="float:left">'.$title.'</a>'.$force_download_html.$copy_to_myfiles;

@ -135,9 +135,9 @@
var counts = {'new_file':1};
var thickbox = {'width':'<?php echo CONFIG_THICKBOX_MAX_WIDTH; ?>',
'height':'<?php echo CONFIG_THICKBOX_MAX_HEIGHT; ?>',
'next':'<?php echo THICKBOX_NEXT; ?>',
'previous':'<?php echo THICKBOX_PREVIOUS; ?>',
'close':'<?php echo THICKBOX_CLOSE; ?>'
'next':'<img src="theme/default/images/next.gif" title="<?php echo THICKBOX_NEXT; ?>" style="float:right;">',
'previous':'<img src="theme/default/images/prev.gif" title="<?php echo THICKBOX_PREVIOUS; ?>" style="float:left">',
'close':'<img src="theme/default/images/flagno.png"title="<?php echo THICKBOX_CLOSE; ?>"><?php echo THICKBOX_CLOSE; ?>'
};
@ -559,7 +559,12 @@ $(document).ready(
<div id="winUpload" style="display:none">
<div class="jqmContainer">
<div class="jqmHeader">
<a href="#" onclick="tb_remove();"><?php echo LBL_ACTION_CLOSE; ?></a>
<a href="#" onclick="tb_remove();"><img src="theme/default/images/flagno.png"title="<?php echo LBL_ACTION_CLOSE; ?>"><?php echo LBL_ACTION_CLOSE; ?></a><!-- Add close image for Chamilo -->
</div>
<div class="jqmBody">
<form id="formUpload" name="formUpload" method="POST" enctype="multipart/form-data" action="">
@ -586,8 +591,8 @@ $(document).ready(
<th><label><?php echo FILE_LABEL_SELECT; ?></label></th>
<td>
<input type="file" class="input" name="file" />
<input type="button" class="button" value="<?php echo FILE_LBL_UPLOAD; ?>" />
<a href="#" class="action" title="Cancel" style="display:none" >
<input type="button" class="upload_button" value="<?php echo FILE_LBL_UPLOAD; ?>" /><!-- change style of upload button by Chamilo -->
<a href="#" class="action" title="<?php echo get_lang('Cancel')?>" style="display:none" ><!-- Chamilo lang var added -->
<span class="cancel">&nbsp;</span>
</a>
<span class="uploadProcessing" style="display:none">&nbsp;</span>
@ -610,7 +615,7 @@ $(document).ready(
<div id="winNewFolder" style="display:none">
<div class="jqmContainer">
<div class="jqmHeader">
<a href="#" onclick="return tb_remove();"><?php echo LBL_ACTION_CLOSE; ?></a>
<a href="#" onclick="return tb_remove();"><img src="theme/default/images/flagno.png"title="<?php echo LBL_ACTION_CLOSE; ?>"><?php echo LBL_ACTION_CLOSE; ?></a><!-- Add close image for Chamilo -->
</div>
<div class="jqmBody">
<form id="formNewFolder" name="formNewFolder" method="POST" action="">
@ -632,7 +637,7 @@ $(document).ready(
<tfoot>
<tr>
<th>&nbsp;</th>
<td><input type="button" value="<?php echo FOLDER_LBL_CREATE; ?>" class="button" onclick="return doCreateFolder();" /></td>
<td><input type="button" value="<?php echo FOLDER_LBL_CREATE; ?>" class="create_button" onclick="return doCreateFolder();" /></td>
</tr>
</tfoot>
</table>
@ -671,14 +676,14 @@ $(document).ready(
<tbody>
<tr>
<th><label><?php echo RENAME_NEW_NAME; ?></label></th>
<td><input type="name" id="renameName" class="input" name="name" style="width:250px" />
<td><input type="name" id="renameName" class="input" name="name" /> <!-- Chamilo delete style="width:250px"-->
</td>
</tr>
</tbody>
<tfoot>
<tr>
<th>&nbsp;</th>
<td><input type="button" value="<?php echo RENAME_LBL_RENAME; ?>" class="button" onclick="return doRename();" /></td>
<td><input type="button" value="<?php echo RENAME_LBL_RENAME; ?>" class="create_button" onclick="return doRename();" /></td>
</tr>
</tfoot>
</table>

@ -474,6 +474,27 @@ a.pagination_active{font-weight: bold; color: #CC0000;}
margin: 5px;
}
.create_button{
font-family: bold arial, verdana, helvetica, sans-serif;
font-size: 100%;
line-height :130%;
text-decoration: none;
color: black;
cursor: pointer;
padding:5px 15px 5px 15px;
vertical-align:middle;
border:1px solid #4171b5;
background:#F0F0F0;
padding-left:30px;
padding-right:10px;
font-weight:bold;
color:#4171b5;
background: url(../images/button_accept.gif);
background-position:10px;
background-repeat:no-repeat;
margin:10px;
}
.select_button{
font-family: bold arial, verdana, helvetica, sans-serif;
font-size: 100%;
@ -515,6 +536,27 @@ a.pagination_active{font-weight: bold; color: #CC0000;}
}
.upload_button{
font-family: bold arial, verdana, helvetica, sans-serif;
font-size: 100%;
line-height :130%;
text-decoration: none;
color: black;
cursor: pointer;
padding:5px 15px 5px 15px;
vertical-align:middle;
border:1px solid #4171b5;
background:#F0F0F0;
padding-left:30px;
padding-right:10px;
font-weight:bold;
color:#4171b5;
background: url(../images/button_upload.gif);
background-position:10px;
background-repeat:no-repeat;
}
.search_folder{
visibility:hidden;
}

@ -280,7 +280,7 @@ background-repeat:no-repeat;
background-position:0 50%;
}
span.uploadProcessing{background-image:url(../images/uploadProcessing.gif);}
span.deleteFile,span.cancel{background-image:url(../images/flagno.png);}
span.deleteFile,span.cancel{background-image:url(../images/stop.png);}
span.addMore{background-image:url(../images/add.png);}
span.folderEmpty{background-image:url(../images/small_icon/folderEmpty.png);}
span.folder{background-image:url(../images/small_icon/folder.png);}
@ -478,6 +478,27 @@ a.pagination_active{font-weight: bold; color: #CC0000;}
visibility:hidden;
}
.create_button{
font-family: bold arial, verdana, helvetica, sans-serif;
font-size: 100%;
line-height :130%;
text-decoration: none;
color: black;
cursor: pointer;
padding:5px 15px 5px 15px;
vertical-align:middle;
border:1px solid #4171b5;
background:#F0F0F0;
padding-left:30px;
padding-right:10px;
font-weight:bold;
color:#4171b5;
background: url(../images/button_accept.gif);
background-position:10px;
background-repeat:no-repeat;
margin:10px;
}
.search_button{
font-family: bold arial, verdana, helvetica, sans-serif;
font-size: 100%;
@ -499,6 +520,27 @@ a.pagination_active{font-weight: bold; color: #CC0000;}
}
.upload_button{
font-family: bold arial, verdana, helvetica, sans-serif;
font-size: 100%;
line-height :130%;
text-decoration: none;
color: black;
cursor: pointer;
padding:5px 15px 5px 15px;
vertical-align:middle;
border:1px solid #4171b5;
background:#F0F0F0;
padding-left:30px;
padding-right:10px;
font-weight:bold;
color:#4171b5;
background: url(../images/button_upload.gif);
background-position:10px;
background-repeat:no-repeat;
}
.search_folder{
visibility:hidden;
}

@ -1,3 +1,5 @@
/*hack for Chamilo */
/* ----------------------------------------------------------------------------------------------------------------*/
/* ---------->>> global settings needed for thickbox <<<-----------------------------------------------------------*/
/* ----------------------------------------------------------------------------------------------------------------*/
@ -31,9 +33,9 @@
top: 0px;
left: 0px;
background-color:#000;
filter:alpha(opacity=75);
-moz-opacity: 0.75;
opacity: 0.75;
filter:alpha(opacity=55); /* Chamilo change 75 by 50 */
-moz-opacity: 0.55; /* Chamilo change 0.75 by .50 */
opacity: 0.55; /* Chamilo change 0.75 by .50 */
height:100%;
width:100%;
}
@ -53,6 +55,7 @@
text-align:left;
top:50%;
left:50%;
padding:20px; /* Chamilo */
}
* html #TB_window { /* ie6 hack */

Binary file not shown.

After

Width:  |  Height:  |  Size: 541 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 528 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 525 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 700 B

@ -674,7 +674,7 @@ class SocialManager extends UserManager {
echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/search.php">'.Display::return_icon('zoom.png',get_lang('Search'),array('hspace'=>'6')).'<span class="'.($show=='search'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('Search').'</span></a></li>';
//My files
echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/myfiles.php">'.Display::return_icon('briefcase.png',get_lang('MyFiles'),array('hspace'=>'6')).'<span class="'.($show=='myfiles'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MyFiles').'</span></a></li>';
echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/myfiles.php">'.Display::return_icon('briefcase_small.png',get_lang('MyFiles'),array('hspace'=>'6')).'<span class="'.($show=='myfiles'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MyFiles').'</span></a></li>';
echo'</ul>
</div>';
@ -698,7 +698,7 @@ class SocialManager extends UserManager {
echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/profile.php">'.Display::return_icon('my_shared_profile.png',get_lang('ViewMySharedProfile'),array('hspace'=>'6','style'=>'float:left')).'<span class="social-menu-text-active" >'.get_lang('ViewMySharedProfile').'</span></a></li>
<li><a href="'.api_get_path(WEB_PATH).'main/social/friends.php">'.Display::return_icon('friend.png',get_lang('Friends'),array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('Friends').'</span></a></li>
<li><a href="'.api_get_path(WEB_PATH).'main/social/groups.php">'.Display::return_icon('group.png',get_lang('Groups'),array('hspace'=>'6')).'<span class="social-menu-text4" >'.get_lang('Groups').'</span></a></li>';
echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/myfiles.php">'.Display::return_icon('briefcase.png',get_lang('MyFiles'),array('hspace'=>'6')).'<span class="'.($show=='myfiles'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MyFiles').'</span></a></li>';
echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/myfiles.php">'.Display::return_icon('briefcase_small.png',get_lang('MyFiles'),array('hspace'=>'6')).'<span class="'.($show=='myfiles'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MyFiles').'</span></a></li>';
}

@ -22,6 +22,8 @@ require_once 'myspace.lib.php';
// the section (for the tabs)
$this_section = SECTION_TRACKING;
unset($_SESSION['this_section']);//for hmtl editor repository
ob_start();
$export_csv = isset($_GET['export']) && $_GET['export'] == 'csv' ? true : false;

@ -18,7 +18,7 @@ $user_id = api_get_user_id();
$show_full_profile = true;
//social tab
$this_section = SECTION_SOCIAL;
unset($_SESSION['this_section']);//for hmtl editor repository
$interbreadcrumb[]= array ('url' => 'home.php','name' => get_lang('Social'));
api_block_anonymous_users();

@ -34,6 +34,9 @@ $language_file = array ('courses', 'index');
$cidReset = true; /* Flag forcing the 'current course' reset,
as we're not inside a course anymore */
unset($_SESSION['this_section']);//for hmtl editor repository
/*
Included libraries
*/

Loading…
Cancel
Save