diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css index 145663af0b..52ec17b7c7 100644 --- a/app/Resources/public/css/base.css +++ b/app/Resources/public/css/base.css @@ -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) { diff --git a/main/admin/configure_homepage.php b/main/admin/configure_homepage.php index 67cbd1f8e9..65bb1aa10b 100755 --- a/main/admin/configure_homepage.php +++ b/main/admin/configure_homepage.php @@ -794,7 +794,7 @@ switch ($action) { case 'edit_notice': // Display for edit_notice case ?> -
+ - - - - - - - - - - - - - - - - - -
'.get_lang('LetThoseFieldsEmptyToHideTheNotice').''; ?>
:
:
-
 
+
+
+

+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
- - -
-
- - - - - - -
- - - - - - - '; - if ($access_url_id == 1) { - echo '
'; - echo ''.Display::display_icon('edit.gif', get_lang('Edit')).' - '.get_lang('EditCategories').''; - echo '
'; - } - echo ' - - - - - -
- -
-
'; - /* */ - echo '
- '; - if ($access_url_id == 1) { - if (sizeof($Categories)) { - foreach ($Categories as $enreg) { - echo ''; - } - unset($Categories); - } else { - echo get_lang('NoCategories'); - } - } - - echo '
'.Display::return_icon('folder_document.gif', $enreg['name']).' '.$enreg['name'].'
'; - ?> -
- '.Display::return_icon('edit.gif', get_lang('Edit')).''; - $delete_link = ' '.Display::return_icon('delete.gif', get_lang('Delete')).''; - $tab_string = str_replace(array('href="'.api_get_path(WEB_PATH).'index.php?include=', ''), - array('href="'.api_get_path(WEB_CODE_PATH).'admin/'.basename(api_get_self()).'?action=open_link&link=', $edit_link.$delete_link.''), - $enreg); - $tab_string = str_replace(array('
  • ', '
    • ','class="hide_menu"', 'hide_menu'), '', $tab_string); - - $link_list .= Display::tag('tr', Display::tag('td', $tab_string)); - $tab_counter++; - } - } - ?> -
    - -
    - '; - echo $link_list; - echo '
    '; - ?> - - - - - - - - '; - ?> - -
    - - -

    - -
    - - - - +
    +
    + + +
    +
    + +
    +
    +
    + +
    +
    +
    + +
    + +
    +
      +
      • +
      • +
    +
    +
    + + + + +
    +
    + +
    +
    + '; + echo $home_notice; + echo '
    '; + ?> +
    +
    +
    +
    + + + + + +
    +
    +
    + + + + +
    +
    + +
    + + '; + echo ''.Display::return_icon('edit.png', get_lang('Edit')).get_lang('EditCategories').''; + echo '
    '; + } + echo ''; + ?> + + + + '.Display::return_icon('edit.gif', get_lang('Edit')).''; + $delete_link = ' '.Display::return_icon('delete.gif', get_lang('Delete')).''; + $tab_string = str_replace(array('href="'.api_get_path(WEB_PATH).'index.php?include=', ''), + array('href="'.api_get_path(WEB_CODE_PATH).'admin/'.basename(api_get_self()).'?action=open_link&link=', $edit_link.$delete_link.''), + $enreg); + $tab_string = str_replace(array('
  • ', '
    • ','class="hide_menu"', 'hide_menu'), '', $tab_string); + $link_list .= Display::tag('li', $tab_string, array('class' => 'list-group-item')); + $tab_counter++; + } + } + ?> +
    + + + +
    + '; + echo $link_list; + echo ''; + ?> + + + +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(); diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php index 119ec228fb..851e2fdcde 100755 --- a/main/inc/lib/sessionmanager.lib.php +++ b/main/inc/lib/sessionmanager.lib.php @@ -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; + } } diff --git a/main/session/resume_session.php b/main/session/resume_session.php index e6b40ed455..8ccc80f01b 100644 --- a/main/session/resume_session.php +++ b/main/session/resume_session.php @@ -237,7 +237,7 @@ if ($sessionInfo['nbr_courses'] == 0) { // of the course, that appeared in the default $interbreadcrumb $courseItem .= ' - '.Display::url( + '.Display::url( $course->getTitle().' ('.$course->getVisualCode().')', $courseUrl ).' diff --git a/main/social/home.php b/main/social/home.php index baeeb7be62..0368afd30d 100755 --- a/main/social/home.php +++ b/main/social/home.php @@ -188,13 +188,29 @@ if ($list > 0) { } $social_group_block.= ""; } - +// 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); diff --git a/main/social/profile.php b/main/social/profile.php index 00624b4f32..7f3674f2d0 100755 --- a/main/social/profile.php +++ b/main/social/profile.php @@ -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 .= '
    '; - $htmlSessionList .= Display::return_icon('session.png', get_lang('Session')); - $htmlSessionList .= $session['name']; - $htmlSessionList .= '
    '; -} // 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); diff --git a/main/template/default/social/home.tpl b/main/template/default/social/home.tpl index 9e39a36dc6..445e016926 100644 --- a/main/template/default/social/home.tpl +++ b/main/template/default/social/home.tpl @@ -9,7 +9,7 @@ {{ social_menu_block }} -
    +
    {{ social_search_block }} {{ social_skill_block }} {{ social_group_block }} @@ -18,5 +18,54 @@
    {{ social_auto_extend_link }}
    +
    + +
    +
    +
    + +
    +
    + {{ social_friend_block }} +
    +
    +
    +
    +
    + + + {% if sessionList != null %} +
    +
    + +
    +
    +
      + {% for session in sessionList %} +
    • + + {{ session.name }} +
      • + {% endfor %} +
    +
    +
    +
    +
    + {% endif %} + +
    {% endblock %} diff --git a/main/template/default/social/profile.tpl b/main/template/default/social/profile.tpl index 39170d6dc7..6931deded7 100644 --- a/main/template/default/social/profile.tpl +++ b/main/template/default/social/profile.tpl @@ -35,6 +35,8 @@ {{ social_skill_block }} {{ social_group_info_block }} + + {% if social_course_block != null %}
    - + + {% endif %} + + {% if sessionList != null %} +
    +
    + +
    +
    +
      + {% for session in sessionList %} +
    • + + {{ session.name }} +
      • + {% endfor %} +
    +
    +
    +
    +
    + {% endif %} + - {{ social_session_block }} {{ social_rss_block }} {{ social_right_information }} diff --git a/main/template/default/social/skills_block.tpl b/main/template/default/social/skills_block.tpl index 4af2dd259b..3a6e812fb2 100644 --- a/main/template/default/social/skills_block.tpl +++ b/main/template/default/social/skills_block.tpl @@ -1,41 +1,49 @@ -
    -
    - {{ 'Skills'|get_lang }} -
    - - - - +
    + +
    +
    +
    + {% if skills %} +
      + {% for skill in skills %} +
    • + {{ skill.name }} +
      {{ skill.name }}
      +
      • + {% endfor %} +
    + {% else %} +

    {{ 'WithoutAchievedSkills'|get_lang }}

    +

    + {{ 'SkillsWheel'|get_lang }} +

    + {% endif %} +
    -
    - {% if skills %} - - {% else %} -

    {{ 'WithoutAchievedSkills'|get_lang }}

    -

    - {{ 'SkillsWheel'|get_lang }} -

    - {% endif %} -
    - + \ No newline at end of file