Merge branch 'aragonc-1.10.x' into 1.10.x

1.10.x
Yannick Warnier 11 years ago
commit ebaaefe343
  1. 118
      app/Resources/public/css/base.css
  2. 484
      main/admin/configure_homepage.php
  3. 6
      main/admin/course_list.php
  4. 22
      main/inc/lib/sessionmanager.lib.php
  5. 2
      main/session/resume_session.php
  6. 18
      main/social/home.php
  7. 14
      main/social/profile.php
  8. 51
      main/template/default/social/home.tpl
  9. 33
      main/template/default/social/profile.tpl
  10. 84
      main/template/default/social/skills_block.tpl

@ -4063,7 +4063,6 @@ a.forum_group_link {
}
.announcement {
/* background: none repeat scroll 0 0 #F2F2F2;*/
border: 1px solid #D3D3D3;
color: #555555;
font-weight: normal;
@ -4239,67 +4238,9 @@ i.size-32.icon-new-glossary-term{
background-image: url('../../main/img/icons/32/new_glossary_term.png');
}
/*
* Notebook
*/
i.size-32.icon-new-note{
background-image: url('../../main/img/icons/32/new_note.png');
}
.notebook.entries li{
vertical-align: text-top;
}
.notebook.note{
display:inline-block;
width:49%;
margin-left:0px;
margin-right:1px;
padding:0;
}
.notebook.note{
background-color: #D2ECF5;
}
.notebook.note .title{
padding:1;
display:block;
margin-top:0;
margin-right:0;
margin-left:0;
padding-top:5px;
padding-bottom:12px;
vertical-align: baseline;
background-color: #028DC2 ;
color:#ffffff;
}
.notebook.note .footer{
text-align: right;
font-style:italic
}
#learning_path_main #control {
text-align: center;
background-image:-webkit-gradient(linear,left top,left bottom,from(#ececec),to(#fff));
background-image:-webkit-linear-gradient(top,#ececec,#fff);
background-image:-moz-linear-gradient(top,#ececec,#fff);
background-image:-ms-linear-gradient(top,#ececec,#fff);
background-image:-o-linear-gradient(top,#ececec,#fff);
background-image:linear-gradient(top,#ececec,#fff);
height:32px;
padding:8px 0px 8px 0px;
opacity:0.9;
bottom: 0px;
margin: auto;
width: 100%;
height: 34px;
position: absolute
}
/* Data table */
.dataTables_wrapper{
@ -4478,28 +4419,6 @@ i.size-32.icon-new-work{
.jqgrid_whitespace {
white-space: normal !important;
}
.text-h1 {
font-size: 24px;
}
.text-h2 {
font-size: 21px;
}
.text-h3 {
font-size: 16px;
}
.text-h4 {
font-size: 15px;
}
.text-h5 {
font-size: 12px;
font-weight: normal;
}
.chosen-container {
min-width: 100%;
}
@ -4933,8 +4852,7 @@ i.size-32.icon-new-work{
.top-mediapost .user-data .username a,
.sub-mediapost .user-data .username a{
font-size: 14px;
font-weight: bold;
color: #4D4D4D;
font-weight: normal;
}
.top-mediapost .user-data .time,
.sub-mediapost .user-data .time
@ -4947,18 +4865,19 @@ i.size-32.icon-new-work{
}
.top-mediapost .msg-content p,
.sub-mediapost .rep-post .msg-content p{
border-top:1px solid #dddddd;
padding-top: 5px;
padding-bottom: 5px;
border-top:1px solid #ECF0F1;
padding-top: 10px;
padding-bottom: 10px;
margin-top: 5px;
margin-bottom: 5px;
line-height: 18px;
line-height: 22px;
padding-left: 10px;
padding-right: 10px;
color: #666666;
}
.top-mediapost .user-data .username a:hover,
.sub-mediapost .user-data .username a:hover{
text-decoration: underline;
.mediapost-form{
margin-bottom: 10px;
padding-bottom: 5px;
}
.top-mediapost .user-image, .top-mediapost .user-data,
.sub-mediapost .rep-post .user-image, .sub-mediapost .rep-post .user-data{
@ -6352,7 +6271,9 @@ a.sessionView {
height: 32px;
margin-right: 5px;
}
#course-block .list-group .list-group-item{
#course-block .list-group .list-group-item,
#session-block .list-group .list-group-item
{
padding: 5px;
border:none;
font-size: 12px;
@ -6363,14 +6284,25 @@ a.sessionView {
float: left;
margin-right: 5px;
}
#course-block .list-group .list-group-item .img-course{
#course-block .list-group .list-group-item .img-course,
#session-block .list-group .list-group-item .img-session
{
width: 70px;
float: left;
margin-right: 5px;
}
#course-block .list-group .list-group-item .title{
#course-block .list-group .list-group-item .title,
#session-block .list-group .list-group-item .title{
display: block;
}
.data_table .title{
text-align: left;
padding-left: 10px;
}
#course-list.data_table .title{
width: 360px;
padding-left: 0;
}
/* CSS NEW TOP ******************************************************************************/
/* CSS Responsive */
@media (min-width: 1025px) and (max-width: 1200px) {

@ -794,7 +794,7 @@ switch ($action) {
case 'edit_notice':
// Display for edit_notice case
?>
<form action="<?php echo api_get_self(); ?>?action=<?php echo $action; ?>" method="post" style="margin:0px;">
<form action="<?php echo api_get_self(); ?>?action=<?php echo $action; ?>" method="post" class="form-horizontal">
<legend><?php echo $tool_name; ?></legend>
<input type="hidden" name="formSent" value="1"/>
<?php
@ -802,25 +802,41 @@ switch ($action) {
Display::display_normal_message($errorMsg);
}
?>
<table border="0" cellpadding="5" cellspacing="0">
<tr><td colspan="2"><?php echo '<span style="font-style: italic;">'.get_lang('LetThoseFieldsEmptyToHideTheNotice').'</span>'; ?></tr>
<tr>
<td nowrap="nowrap"><?php echo get_lang('NoticeTitle'); ?> :</td>
<td><input type="text" name="notice_title" size="30" maxlength="50" value="<?php echo $notice_title; ?>" style="width: 350px;"/></td>
</tr>
<tr>
<td nowrap="nowrap" valign="top"><?php echo get_lang('NoticeText'); ?> :</td>
<td><textarea name="notice_text" cols="30" rows="5" wrap="virtual" style="width: 350px;"><?php echo $notice_text; ?></textarea></td>
</tr>
<tr>
<td><label><?php echo get_lang('ApplyAllLanguages'); ?></label>
<td><input type="checkbox" name="all_langs" value="<?php echo get_lang('ApplyAllLanguages'); ?>"/></td>
</tr>
<tr>
<td>&nbsp;</td>
<td><button class="save" type="submit" value="<?php echo get_lang('Ok'); ?>"><?php echo get_lang('Ok'); ?></button></td>
</tr>
</table>
<div class="row">
<div class="col-md-12">
<p><?php echo get_lang('LetThoseFieldsEmptyToHideTheNotice'); ?></p>
<div class="form-group">
<label class="col-sm-3 control-label"> <?php echo get_lang('NoticeTitle'); ?> </label>
<div class="col-sm-6">
<input type="text" name="notice_title" size="30" maxlength="50" value="<?php echo $notice_title; ?>" class="form-control"/>
</div>
<div class="col-sm-3"></div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label"><?php echo get_lang('NoticeText'); ?></label>
<div class="col-sm-6">
<textarea name="notice_text" cols="30" rows="5" wrap="virtual" class="form-control"><?php echo $notice_text; ?></textarea>
</div>
<div class="col-sm-3"></div>
</div>
<div class="form-group">
<div class="col-sm-3"></div>
<div class="col-sm-6">
<div class="checkbox">
<label>
<input type="checkbox" name="all_langs" value="<?php echo get_lang('ApplyAllLanguages'); ?>"/> <?php echo get_lang('ApplyAllLanguages'); ?>
</label>
</div>
</div>
<div class="col-sm-3"></div>
</div>
<div class="form-group">
<div class="col-sm-offset-3 col-sm-9">
<button class="btn btn-primary" type="submit" value="<?php echo get_lang('Ok'); ?>"><?php echo get_lang('Ok'); ?></button>
</div>
</div>
</div>
</div>
</form>
<?php
break;
@ -987,214 +1003,224 @@ switch ($action) {
break;
default: // When no action applies, default page to update campus homepage
?>
<table border="0" cellpadding="5" cellspacing="0" width="100%">
<tr>
<td width="70%" valign="top">
<div class="actions">
<a href="<?php echo api_get_self(); ?>?action=edit_top&language=<?php echo $languageGet; ?>">
<?php Display::display_icon('edit.gif', get_lang('EditHomePage')); ?>
</a>
<a href="<?php echo api_get_self(); ?>?action=edit_top&language=<?php echo $languageGet; ?>">
<?php echo get_lang('EditHomePage'); ?>
</a>
</div>
<table border="0" cellpadding="5" cellspacing="0" width="100%">
<tr>
<td colspan="2">
<?php
//print home_top contents
if (file_exists($homep.$topf.'_'.$lang.$ext)) {
$home_top_temp = @(string)file_get_contents($homep.$topf.'_'.$lang.$ext);
} else {
$home_top_temp = @(string)file_get_contents($homep.$topf.$ext);
}
$open = str_replace('{rel_path}', api_get_path(REL_PATH), $home_top_temp);
$open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
echo $open;
?>
</td>
</tr>
<tr>
<?php
$access_url_id = 1;
// we only show the category options for the main chamilo installation
if (api_is_multiple_url_enabled()) {
$access_url_id = api_get_current_access_url_id();
}
echo '<td width="50%">';
if ($access_url_id == 1) {
echo '<div class="actions">';
echo '<a href="course_category.php">'.Display::display_icon('edit.gif', get_lang('Edit')).'</a>
<a href="course_category.php">'.get_lang('EditCategories').'</a>';
echo '</div>';
}
echo '</td>
<td width="50%">
<br />';
/* <!--<a href="<?php echo api_get_self(); ?>?action=edit_news"><?php Display::display_icon('edit.gif', get_lang('Edit')); ?></a> <a href="<?php echo api_get_self(); ?>?action=edit_news"><?php echo get_lang('EditNews'); ?></a>--> */
echo '</td></tr>
<tr>
<td width="50%" valign="top">
<table border="0" cellpadding="5" cellspacing="0" width="100%">';
if ($access_url_id == 1) {
if (sizeof($Categories)) {
foreach ($Categories as $enreg) {
echo '<tr><td>'.Display::return_icon('folder_document.gif', $enreg['name']).'&nbsp;'.$enreg['name'].'</td></tr>';
}
unset($Categories);
} else {
echo get_lang('NoCategories');
}
}
echo '</table>';
?>
</td>
<!--<td width="50%" valign="top">
<?php
if (file_exists($homep.$newsf.'_'.$lang.$ext)) {
$open = @(string)file_get_contents($homep.$newsf.'_'.$lang.$ext);
$open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
echo $open;
} else {
$open = @(string)file_get_contents($homep.$newsf.$ext);
$open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
echo $open;
}
?>
</td>-->
</tr>
</table>
<?php
// Add new page
$home_menu = '';
if (file_exists($homep.$mtloggedin.'_'.$lang.$ext)) {
$home_menu = @file($homep.$mtloggedin.'_'.$lang.$ext);
} else {
$home_menu = @file($homep.$mtloggedin.$ext);
}
if (empty($home_menu)) {
if (file_exists($homep.$menutabs.'_'.$lang.$ext)) {
$home_menu = @file($homep.$menutabs.'_'.$lang.$ext);
}
}
if (empty($home_menu)) {
$home_menu = array();
}
if (!empty($home_menu)) {
$home_menu = implode("\n", $home_menu);
$home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
$home_menu = explode("\n", $home_menu);
}
$link_list = '';
$tab_counter = 0;
foreach ($home_menu as $enreg) {
$enreg = trim($enreg);
if (!empty($enreg)) {
$edit_link = ' <a href="'.api_get_self().'?action=edit_tabs&amp;link_index='.$tab_counter.'" ><span>'.Display::return_icon('edit.gif', get_lang('Edit')).'</span></a>';
$delete_link = ' <a href="'.api_get_self().'?action=delete_tabs&amp;link_index='.$tab_counter.'" onclick="javascript: if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES)).'\')) return false;"><span>'.Display::return_icon('delete.gif', get_lang('Delete')).'</span></a>';
$tab_string = str_replace(array('href="'.api_get_path(WEB_PATH).'index.php?include=', '</li>'),
array('href="'.api_get_path(WEB_CODE_PATH).'admin/'.basename(api_get_self()).'?action=open_link&link=', $edit_link.$delete_link.'</li>'),
$enreg);
$tab_string = str_replace(array('<li>', '</li>','class="hide_menu"', 'hide_menu'), '', $tab_string);
$link_list .= Display::tag('tr', Display::tag('td', $tab_string));
$tab_counter++;
}
}
?>
<div class="actions">
<a href="<?php echo api_get_self(); ?>?action=insert_tabs"><?php Display::display_icon('addd.gif', get_lang('InsertLink')); echo get_lang('InsertLink'); ?></a>
</div>
<?php
echo '<table class="data_table">';
echo $link_list;
echo '</table>';
?>
</td>
<td width="10%" valign="top"></td>
<td width="20%" rowspan="3" valign="top">
<div id="login_block" class="well sidebar-nav">
<?php echo api_display_language_form(); ?>
<form id="formLogin">
<div><label><?php echo get_lang('LoginName'); ?></label></div>
<div><input type="text" id="login" size="15" value="" disabled="disabled" /></div>
<div><label><?php echo get_lang('UserPassword'); ?></label></div>
<div><input type="password" id="password" size="15" value="" disabled="disabled" /></div>
<div><button class="btn btn-default" type="button" name="submitAuth" value="<?php echo get_lang('Ok'); ?>" disabled="disabled"><?php echo get_lang('Ok'); ?></button></div>
</form>
</div>
<div id="profile_block" class="well sidebar-nav">
<h4><?php echo get_lang('MenuUser'); ?></h4>
<ul class="nav nav-list">
<li><span style="color: #9D9DA1; font-weight: bold;"><?php echo api_ucfirst(get_lang('Registration')); ?></span></li>
<li><span style="color: #9D9DA1; font-weight: bold;"><?php echo api_ucfirst(get_lang('LostPassword')); ?></span></li>
</ul>
</div>
<div id="notice_block" class="well sidebar-nav">
<h4><?php echo get_lang('Notice'); ?>
<a href="<?php echo api_get_self(); ?>?action=edit_notice"><?php Display::display_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL); ?></a>
</h4>
<?php
$home_notice = '';
if (file_exists($homep.$noticef.'_'.$lang.$ext)) {
$home_notice = @(string)file_get_contents($homep.$noticef.'_'.$lang.$ext);
} else {
$home_notice = @(string)file_get_contents($homep.$noticef.$ext);
}
$home_notice = api_to_system_encoding($home_notice, api_detect_encoding(strip_tags($home_notice)));
echo '<div class="homepage_notice">';
echo $home_notice;
echo '</div>';
?>
</div>
<div class="well sidebar-nav">
<a href="<?php echo api_get_self(); ?>?action=insert_link"><?php Display::display_icon('addd.gif', get_lang('InsertLink')); ?></a>
<a href="<?php echo api_get_self(); ?>?action=insert_link"><?php echo get_lang('InsertLink'); ?></a>
<h4><?php echo api_ucfirst(get_lang('General')); ?></h4>
<ul class="menulist">
<?php
$home_menu = '';
if (file_exists($homep.$menuf.'_'.$lang.$ext)) {
$home_menu = @file($homep.$menuf.'_'.$lang.$ext);
} else {
$home_menu = @file($homep.$menuf.$ext);
}
if (empty($home_menu)) {
$home_menu = array();
}
if (!empty($home_menu)) {
$home_menu = implode("\n", $home_menu);
$home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
$home_menu = explode("\n", $home_menu);
}
$i = 0;
foreach ($home_menu as $enreg) {
$enreg = trim($enreg);
if (!empty($enreg)) {
$edit_link = '<a href="'.api_get_self().'?action=edit_link&amp;link_index='.$i.'">'.Display::return_icon('edit.gif', get_lang('Edit')).'</a>';
$delete_link = '<a href="'.api_get_self().'?action=delete_link&amp;link_index='.$i.'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES)).'\')) return false;">'.Display::return_icon('delete.gif', get_lang('Delete')).'</a>';
echo str_replace(array('href="'.api_get_path(WEB_PATH).'index.php?include=', '</li>'), array('href="'.api_get_path(WEB_CODE_PATH).'admin/'.basename(api_get_self()).'?action=open_link&link=', '<br />'.$edit_link.' '.$delete_link.'</li>'), $enreg);
$i++;
}
}
?>
</ul>
</div>
</td>
</tr>
</table>
<?php
break;
}
<section id="page-home">
<div class="row">
<div class="col-md-3">
<!-- login block -->
<div id="login_block" class="panel panel-default">
<div class="panel-body">
<?php echo api_display_language_form(); ?>
<form id="formLogin" class="form-horizontal">
<div class="input-group">
<div class="input-group-addon"><i class="fa fa-user"></i></div>
<input class="form-control" type="text" id="login" value="" disabled="disabled" />
</div>
<div class="input-group">
<div class="input-group-addon"><i class="fa fa-lock"></i></div>
<input type="password" id="password"class="form-control" value="" disabled="disabled" />
</div>
<button class="btn btn-primary btn-block" type="button" name="submitAuth" value="<?php echo get_lang('Ok'); ?>" disabled="disabled"><?php echo get_lang('Ok'); ?></button>
</form>
<ul class="nav nav-pills nav-stacked">
<li><?php echo api_ucfirst(get_lang('Registration')); ?></li>
<li><?php echo api_ucfirst(get_lang('LostPassword')); ?></li>
</ul>
</div>
</div>
<!-- notice block -->
<div class="panel-group" id="notice-block" role="tablist" aria-multiselectable="true">
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="headingOne">
<h4 class="panel-title">
<a role="button" data-toggle="collapse" data-parent="#notice-block" href="#notice-list" aria-expanded="true" aria-controls="notice-list">
<?php echo get_lang('Notice'); ?>
<a class="pull-right" href="<?php echo api_get_self(); ?>?action=edit_notice"><?php Display::display_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL); ?></a>
</a>
</h4>
</div>
<div id="notice-list" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
<div class="panel-body">
<?php
$home_notice = '';
if (file_exists($homep.$noticef.'_'.$lang.$ext)) {
$home_notice = @(string)file_get_contents($homep.$noticef.'_'.$lang.$ext);
} else {
$home_notice = @(string)file_get_contents($homep.$noticef.$ext);
}
$home_notice = api_to_system_encoding($home_notice, api_detect_encoding(strip_tags($home_notice)));
echo '<div class="homepage_notice">';
echo $home_notice;
echo '</div>';
?>
</div>
</div>
</div>
</div>
<!-- insert link block -->
<div class="panel-group" id="links-block" role="tablist" aria-multiselectable="true">
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="headingOne">
<h4 class="panel-title">
<a role="button" data-toggle="collapse" data-parent="#links-block" href="#links-list" aria-expanded="true" aria-controls="links-list">
<?php echo api_ucfirst(get_lang('General')); ?>
</a>
</h4>
</div>
<div id="links-list" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
<div class="panel-body">
<a href="<?php echo api_get_self(); ?>?action=insert_link"><?php Display::display_icon('addd.gif', get_lang('InsertLink')); ?>
<?php echo get_lang('InsertLink'); ?>
</a>
<ul class="menulist">
<?php
$home_menu = '';
if (file_exists($homep.$menuf.'_'.$lang.$ext)) {
$home_menu = @file($homep.$menuf.'_'.$lang.$ext);
} else {
$home_menu = @file($homep.$menuf.$ext);
}
if (empty($home_menu)) {
$home_menu = array();
}
if (!empty($home_menu)) {
$home_menu = implode("\n", $home_menu);
$home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
$home_menu = explode("\n", $home_menu);
}
$i = 0;
foreach ($home_menu as $enreg) {
$enreg = trim($enreg);
if (!empty($enreg)) {
$edit_link = '<a href="'.api_get_self().'?action=edit_link&amp;link_index='.$i.'">'.Display::return_icon('edit.gif', get_lang('Edit')).'</a>';
$delete_link = '<a href="'.api_get_self().'?action=delete_link&amp;link_index='.$i.'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES)).'\')) return false;">'.Display::return_icon('delete.gif', get_lang('Delete')).'</a>';
echo str_replace(array('href="'.api_get_path(WEB_PATH).'index.php?include=', '</li>'), array('href="'.api_get_path(WEB_CODE_PATH).'admin/'.basename(api_get_self()).'?action=open_link&link=', '<br />'.$edit_link.' '.$delete_link.'</li>'), $enreg);
$i++;
}
}
?>
</ul>
</div>
</div>
</div>
</div>
</div>
<div class="col-md-9">
<div class="actions">
<a href="<?php echo api_get_self(); ?>?action=edit_top&language=<?php echo $languageGet; ?>">
<?php echo Display::return_icon('edit.png', get_lang('EditHomePage'),null,ICON_SIZE_SMALL); ?>
<?php echo get_lang('EditHomePage'); ?>
</a>
</div>
<section id="homepage-home">
<?php
//print home_top contents
if (file_exists($homep.$topf.'_'.$lang.$ext)) {
$home_top_temp = @(string)file_get_contents($homep.$topf.'_'.$lang.$ext);
} else {
$home_top_temp = @(string)file_get_contents($homep.$topf.$ext);
}
$open = str_replace('{rel_path}', api_get_path(REL_PATH), $home_top_temp);
$open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
echo $open;
?>
</section>
<?php
$access_url_id = 1;
// we only show the category options for the main chamilo installation
if (api_is_multiple_url_enabled()) {
$access_url_id = api_get_current_access_url_id();
}
if ($access_url_id == 1) {
echo '<div class="actions">';
echo '<a href="course_category.php">'.Display::return_icon('edit.png', get_lang('Edit')).get_lang('EditCategories').'</a>';
echo '</div>';
}
echo '<ul class="list-group">';
if ($access_url_id == 1) {
if (sizeof($Categories)) {
foreach ($Categories as $enreg) {
echo '<li class="list-group-item">'.Display::return_icon('folder_document.gif', $enreg['name']).'&nbsp;'.$enreg['name'].'</li>';
}
unset($Categories);
} else {
echo get_lang('NoCategories');
}
}
echo '</ul>';
?>
<?php
if (file_exists($homep.$newsf.'_'.$lang.$ext)) {
$open = @(string)file_get_contents($homep.$newsf.'_'.$lang.$ext);
$open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
echo $open;
} else {
$open = @(string)file_get_contents($homep.$newsf.$ext);
$open = api_to_system_encoding($open, api_detect_encoding(strip_tags($open)));
echo $open;
}
?>
<?php
// Add new page
$home_menu = '';
if (file_exists($homep.$mtloggedin.'_'.$lang.$ext)) {
$home_menu = @file($homep.$mtloggedin.'_'.$lang.$ext);
} else {
$home_menu = @file($homep.$mtloggedin.$ext);
}
if (empty($home_menu)) {
if (file_exists($homep.$menutabs.'_'.$lang.$ext)) {
$home_menu = @file($homep.$menutabs.'_'.$lang.$ext);
}
}
if (empty($home_menu)) {
$home_menu = array();
}
if (!empty($home_menu)) {
$home_menu = implode("\n", $home_menu);
$home_menu = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
$home_menu = explode("\n", $home_menu);
}
$link_list = '';
$tab_counter = 0;
foreach ($home_menu as $enreg) {
$enreg = trim($enreg);
if (!empty($enreg)) {
$edit_link = ' <a href="'.api_get_self().'?action=edit_tabs&amp;link_index='.$tab_counter.'" ><span>'.Display::return_icon('edit.gif', get_lang('Edit')).'</span></a>';
$delete_link = ' <a href="'.api_get_self().'?action=delete_tabs&amp;link_index='.$tab_counter.'" onclick="javascript: if(!confirm(\''.addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES)).'\')) return false;"><span>'.Display::return_icon('delete.gif', get_lang('Delete')).'</span></a>';
$tab_string = str_replace(array('href="'.api_get_path(WEB_PATH).'index.php?include=', '</li>'),
array('href="'.api_get_path(WEB_CODE_PATH).'admin/'.basename(api_get_self()).'?action=open_link&link=', $edit_link.$delete_link.'</li>'),
$enreg);
$tab_string = str_replace(array('<li>', '</li>','class="hide_menu"', 'hide_menu'), '', $tab_string);
$link_list .= Display::tag('li', $tab_string, array('class' => 'list-group-item'));
$tab_counter++;
}
}
?>
<div class="actions">
<a href="<?php echo api_get_self(); ?>?action=insert_tabs">
<?php Display::display_icon('addd.gif', get_lang('InsertLink')); echo get_lang('InsertLink'); ?>
</a>
</div>
<?php
echo '<ul id="list-hiperlink" class="list-group">';
echo $link_list;
echo '</ul>';
?>
</div>
</div>
</section>
<?php break;
}
Display::display_footer();

@ -408,7 +408,7 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
$table = new SortableTable('courses', 'get_number_of_courses', 'get_course_data_by_session', 2);
} else {
// Create a sortable table with the course data
$table = new SortableTable('courses', 'get_number_of_courses', 'get_course_data', 2);
$table = new SortableTable('courses', 'get_number_of_courses', 'get_course_data', 2, 20, 'ASC', 'course-list');
}
$parameters=array();
@ -428,7 +428,7 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
$table->set_additional_parameters($parameters);
$table->set_header(0, '', false, 'width="8px"');
$table->set_header(1, get_lang('Title'), true, 'width="360px"');
$table->set_header(1, get_lang('Title'), true, null, array('class' => 'title'));
$table->set_header(2, get_lang('Code'));
$table->set_header(3, get_lang('Language'), false, 'width="70px"');
$table->set_header(4, get_lang('Category'));
@ -436,7 +436,7 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
$table->set_header(6, get_lang('UnsubscriptionAllowed'), false, 'width="50px"');
//$table->set_header(7, get_lang('Teacher'));
$table->set_header(7, get_lang('Action'), false, 'width="160px"', array('class'=>'td_actions'));
$table->set_header(7, get_lang('Action'), false, null, array('class'=>'td_actions'));
$table->set_column_filter(7, 'modify_filter');
$table->set_form_actions(array('delete_courses' => get_lang('DeleteCourse')), 'course');
$content .= $table->return_table();

@ -3084,8 +3084,30 @@ class SessionManager
$sessions = array();
if (Database::num_rows($result) > 0) {
$sessionImage = '';
$sysUploadPath = api_get_path(SYS_UPLOAD_PATH). 'sessions/';
$webUploadPath = api_get_path(WEB_UPLOAD_PATH). 'sessions/';
$imgPath = api_get_path(WEB_IMG_PATH) . 'session_default_small.png';
$tableExtraFields = Database::get_main_table(TABLE_EXTRA_FIELD);
$sql = "SELECT id FROM " . $tableExtraFields . " WHERE extra_field_type = 3 AND variable='image'";
$resultField = Database::query($sql);
$imageFieldId = Database::fetch_assoc($resultField);
while ($row = Database::fetch_array($result)) {
$row['image'] = null;
$sessionImage = $sysUploadPath . $imageFieldId['id'] . '_' . $row['id'] . '.png';
if (is_file($sessionImage)) {
$sessionImage = $webUploadPath . $imageFieldId['id'] . '_' . $row['id'] . '.png';
$row['image'] = $sessionImage;
} else {
$row['image'] = $imgPath;
}
$sessions[$row['id']] = $row;
}
}

@ -237,7 +237,7 @@ if ($sessionInfo['nbr_courses'] == 0) {
// of the course, that appeared in the default $interbreadcrumb
$courseItem .= '
<tr>
<td>'.Display::url(
<td class="title">'.Display::url(
$course->getTitle().' ('.$course->getVisualCode().')',
$courseUrl
).'</td>

@ -188,13 +188,29 @@ if ($list > 0) {
}
$social_group_block.= "</div>";
}
// My friends
$friend_html = SocialManager::listMyFriendsBlock(
$user_id,
$link_shared,
$show_full_profile
);
//Block Social Sessions
$social_session_block = null;
$user_info = api_get_user_info($user_id);
$sessionList = SessionManager::getSessionsFollowedByUser($user_id, $user_info['status']);
if (count($sessionList) > 0) {
$social_session_block = $sessionList;
}
$social_group_block = Display::panel($social_group_block, get_lang('Group'));
$tpl = new Template(get_lang('SocialNetwork'));
SocialManager::setSocialUserBlock($tpl, api_get_user_id(), 'home');
$tpl->assign('social_menu_block', $social_menu_block);
$tpl->assign('social_friend_block', $friend_html);
$tpl->assign('sessionList', $social_session_block);
$tpl->assign('social_search_block', $social_search_block);
$tpl->assign('social_skill_block', SocialManager::getSkillBlock($user_id));
$tpl->assign('social_group_block', $social_group_block);

@ -246,13 +246,6 @@ $social_menu_block = SocialManager::show_social_menu('shared_profile', null, $us
//Setting some session info
$user_info = api_get_user_info($my_user_id);
$sessionList = SessionManager::getSessionsFollowedByUser($my_user_id, $user_info['status']);
$htmlSessionList = null;
foreach ($sessionList as $session) {
$htmlSessionList .= '<div>';
$htmlSessionList .= Display::return_icon('session.png', get_lang('Session'));
$htmlSessionList .= $session['name'];
$htmlSessionList .= '</div>';
}
// My friends
$friend_html = SocialManager::listMyFriendsBlock(
@ -492,9 +485,10 @@ if ($show_full_profile) {
//Block Social Sessions
if (count($sessionList) > 0) {
$social_session_block = Display::panel($htmlSessionList, get_lang('MySessions'));
//$social_session_block = $htmlSessionList;
$social_session_block = $sessionList;
}
// Block Social User Feeds
$user_feeds = SocialManager::get_user_feeds($user_id);
@ -627,7 +621,7 @@ $tpl->assign('social_course_block', $social_course_block);
$tpl->assign('social_group_info_block', $social_group_info_block);
$tpl->assign('social_rss_block', $social_rss_block);
$tpl->assign('social_skill_block', SocialManager::getSkillBlock($my_user_id));
$tpl->assign('social_session_block', $social_session_block);
$tpl->assign('sessionList', $social_session_block);
$tpl->assign('social_right_information', $socialRightInformation);
$tpl->assign('social_auto_extend_link', $socialAutoExtendLink);

@ -9,7 +9,7 @@
{{ social_menu_block }}
</div>
</div>
<div class="col-md-9">
<div class="col-md-6">
{{ social_search_block }}
{{ social_skill_block }}
{{ social_group_block }}
@ -18,5 +18,54 @@
<div id="display_response_id"></div>
{{ social_auto_extend_link }}
</div>
<div class="col-md-3">
<!-- Block chat list -->
<div class="chat-friends">
<div class="panel-group" id="blocklistFriends" role="tablist" aria-multiselectable="true">
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="headingOne">
<h4 class="panel-title">
<a role="button" data-toggle="collapse" data-parent="#blocklistFriends" href="#listFriends" aria-expanded="true" aria-controls="listFriends">
{{ "SocialFriend" | get_lang }}
</a>
</h4>
</div>
<div id="listFriends" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
<div class="panel-body">
{{ social_friend_block }}
</div>
</div>
</div>
</div>
</div>
<!-- Block session list -->
{% if sessionList != null %}
<div class="panel-group" id="session-block" role="tablist" aria-multiselectable="true">
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="headingOne">
<h4 class="panel-title">
<a role="button" data-toggle="collapse" data-parent="#session-block" href="#sessionList" aria-expanded="true" aria-controls="sessionList">
{{ "MySessions" | get_lang }}
</a>
</h4>
</div>
<div id="sessionList" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
<div class="panel-body">
<ul class="list-group">
{% for session in sessionList %}
<li id="session_{{ session.id }}" class="list-group-item" style="min-height:65px;">
<img class="img-session" src="{{ session.image }}"/>
<span class="title">{{ session.name }}</span>
</li>
{% endfor %}
</ul>
</div>
</div>
</div>
</div>
{% endif %}
</div>
</div>
{% endblock %}

@ -35,6 +35,8 @@
</div>
{{ social_skill_block }}
{{ social_group_info_block }}
<!-- Block course list -->
{% if social_course_block != null %}
<div class="panel-group" id="course-block" role="tablist" aria-multiselectable="true">
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="headingOne">
@ -52,9 +54,36 @@
</div>
</div>
</div>
</div>
</div>
{% endif %}
<!-- Block session list -->
{% if sessionList != null %}
<div class="panel-group" id="session-block" role="tablist" aria-multiselectable="true">
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="headingOne">
<h4 class="panel-title">
<a role="button" data-toggle="collapse" data-parent="#session-block" href="#sessionList" aria-expanded="true" aria-controls="sessionList">
{{ "MySessions" | get_lang }}
</a>
</h4>
</div>
<div id="sessionList" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
<div class="panel-body">
<ul class="list-group">
{% for session in sessionList %}
<li id="session_{{ session.id }}" class="list-group-item" style="min-height:65px;">
<img class="img-session" src="{{ session.image }}"/>
<span class="title">{{ session.name }}</span>
</li>
{% endfor %}
</ul>
</div>
</div>
</div>
</div>
{% endif %}
{{ social_session_block }}
{{ social_rss_block }}
{{ social_right_information }}
</div>

@ -1,41 +1,49 @@
<div class="panel panel-default social-skill">
<div class="panel-heading">
{{ 'Skills'|get_lang }}
<div class="btn-group pull-right">
<a class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown" href="#">
<span class="caret"></span>
</a>
<ul class="dropdown-menu">
{% if show_skills_report_link %}
<li>
<a href="{{ _p.web_main ~ 'social/my_skills_report.php' }}"> {{'SkillsReport'|get_lang }}</a>
</li>
{% endif %}
<div class="panel-group" id="skill-block" role="tablist" aria-multiselectable="true">
<div class="panel panel-default">
<div class="panel-heading" role="tab" id="headingOne">
<h4 class="panel-title">
<a role="button" data-toggle="collapse" data-parent="#skill-block" href="#skillList" aria-expanded="true" aria-controls="skillList">
{{ "Skills" | get_lang }}
</a>
<div class="btn-group pull-right">
<a class="btn btn-xs btn-default dropdown-toggle" data-toggle="dropdown" href="#">
<span class="caret"></span>
</a>
<ul class="dropdown-menu">
{% if show_skills_report_link %}
<li>
<a href="{{ _p.web_main ~ 'social/my_skills_report.php' }}"> {{'SkillsReport'|get_lang }}</a>
</li>
{% endif %}
<li>
<a href="{{ _p.web_main ~ 'social/skills_wheel.php' }}"> {{ 'SkillsWheel'|get_lang }}</a>
</li>
<li>
<a href="{{ _p.web_main ~ 'social/skills_ranking.php' }}"> {{ 'YourSkillRankingX'|get_lang|format(ranking) }}</a>
</li>
</ul>
<li>
<a href="{{ _p.web_main ~ 'social/skills_wheel.php' }}"> {{ 'SkillsWheel'|get_lang }}</a>
</li>
<li>
<a href="{{ _p.web_main ~ 'social/skills_ranking.php' }}"> {{ 'YourSkillRankingX'|get_lang|format(ranking) }}</a>
</li>
</ul>
</div>
</h4>
</div>
<div id="skillList" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
<div class="panel-body">
{% if skills %}
<ul class="list-badges">
{% for skill in skills %}
<li>
<img title="{{ skill.name }}" src="{{ skill.icon ? skill.web_icon_thumb_path : 'badges-default.png'|icon(64) }}" width="64" height="64" alt="{{ skill.name }}">
<div class="badges-name">{{ skill.name }}</div>
</li>
{% endfor %}
</ul>
{% else %}
<p>{{ 'WithoutAchievedSkills'|get_lang }}</p>
<p>
<a href="{{ _p.web_main ~ 'social/skills_wheel.php' }}">{{ 'SkillsWheel'|get_lang }}</a>
</p>
{% endif %}
</div>
</div>
</div>
<div class="panel-body">
{% if skills %}
<ul class="list-badges">
{% for skill in skills %}
<li>
<img title="{{ skill.name }}" src="{{ skill.icon ? skill.web_icon_thumb_path : 'badges-default.png'|icon(64) }}" width="64" height="64" alt="{{ skill.name }}">
<div class="badges-name">{{ skill.name }}</div>
</li>
{% endfor %}
</ul>
{% else %}
<p>{{ 'WithoutAchievedSkills'|get_lang }}</p>
<p>
<a href="{{ _p.web_main ~ 'social/skills_wheel.php' }}">{{ 'SkillsWheel'|get_lang }}</a>
</p>
{% endif %}
</div>
</div>
</div>
Loading…
Cancel
Save