diff --git a/main/css/base.css b/main/css/base.css index 3ceeb4b687..41496e9e09 100755 --- a/main/css/base.css +++ b/main/css/base.css @@ -3240,16 +3240,13 @@ form .formw .freeze { width: 100%; } .page-items-profile{ - padding-top: 2em; - padding-bottom: 2em; - padding-left: 1em; - padding-right: 1em; + padding: .5em; } .page-items-profile .title-skill{ - margin-bottom: 1em; + margin-bottom: .5em; font-size: 18px; color: #333333; - margin-top: 1em; + margin-top: .5em; } .page-items-profile .block-items{ display: block; @@ -3261,6 +3258,7 @@ form .formw .freeze { list-style: none; margin: 0; padding: 0; + font-size: 12px; } .page-items-profile .number-skill{ background-color: #FFFFFF; @@ -3268,18 +3266,52 @@ form .formw .freeze { padding-bottom: .5em; padding-left: .5em; margin-bottom: 1em; + font-size: 12px; border: 1px solid #cccccc; - -webkit-border-radius: 10px; - -moz-border-radius: 10px; - border-radius: 10px; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; } .page-items-profile .block-items .border-items{ - background-color: #EFEFEF; + background-color: #ffffff; -webkit-border-radius: 10px; -moz-border-radius: 10px; border-radius: 10px; border: 1px solid #cccccc; } +.skill-legend-add{ + background-color: #F89406; +} +.skill-legend-search{ + background-color: #B94A48; +} +.skill-legend-badges{ + background-color: #3A87AD; +} +.page-skill .panel-heading a{ + color: #ffffff; +} +.page-skill .btn-default{ + background-color: #F6F6F6; +} +.page-skill .text, .page-skill #saved_profiles h4{ + font-size: 12px; +} +.page-skill .btn-default:hover { + background-color: #E6E6E6; +} +.page-skill #skill_info{ + font-size: 12px; +} +.page-skill .items_save .holder_simple{ + padding: 0; +} +.page-skill #skill_wheel tspan{ + font-size: 12px; +} +.page-skill .holder_simple li.bit-box a{ + color: #8A6D3B; +} .page-items-profile .items-info{ padding:1em; } @@ -5520,10 +5552,7 @@ ul.holder li.bit-box{ -webkit-border-radius: 4px; -moz-border-radius: 4px; } -ul.holder li.bit-box a.closebutton{ - right: 10px; - top: 10px; -} + #file-descrtiption.form-control{ width: 80%; } @@ -5584,6 +5613,13 @@ ul.holder li.bit-box a.closebutton{ .total{ width: 100%; } +.panel-default .panel-heading .btn{ + top: -25px; +} +.panel-default .panel-heading .dropdown-menu{ + top: 30%; +} + #touch-button{ text-decoration: none; position: fixed; @@ -5597,6 +5633,9 @@ ul.holder li.bit-box a.closebutton{ opacity: 50; z-index: 2; } +.search-skill ul.holder_simple{ + padding: 0; +} .hidden-touch{ background: url("../img/icons/48/hidden-touch-left.png")center center no-repeat; } @@ -5628,6 +5667,10 @@ ul.holder li.bit-box a.closebutton{ #multiple-add-session .control-course{ text-align: center; } +.data_table tr td .form-control{ + width: 20%; + display: inline-block; +} /* CSS Responsive */ @media (min-width: 1025px) and (max-width: 1200px) { .sidebar-scorm{ diff --git a/main/img/icons/22/badges-default.png b/main/img/icons/22/badges-default.png new file mode 100644 index 0000000000..1a9889273f Binary files /dev/null and b/main/img/icons/22/badges-default.png differ diff --git a/main/img/icons/22/badges.png b/main/img/icons/22/badges.png new file mode 100644 index 0000000000..0abbb5794f Binary files /dev/null and b/main/img/icons/22/badges.png differ diff --git a/main/img/icons/32/badges-default.png b/main/img/icons/32/badges-default.png new file mode 100644 index 0000000000..7646d86e6f Binary files /dev/null and b/main/img/icons/32/badges-default.png differ diff --git a/main/img/icons/32/badges.png b/main/img/icons/32/badges.png new file mode 100644 index 0000000000..51c343fb40 Binary files /dev/null and b/main/img/icons/32/badges.png differ diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php index bf319def13..a303cc0d78 100755 --- a/main/inc/lib/course.lib.php +++ b/main/inc/lib/course.lib.php @@ -1819,15 +1819,15 @@ class CourseManager { $course_code = Database::escape_string($course_code); $teachers = array(); - $sql = "SELECT DISTINCT u.user_id, u.lastname, u.firstname, u.email, u.username, u.status + $sql = "SELECT DISTINCT u.id, u.lastname, u.firstname, u.email, u.username, u.status FROM " . Database::get_main_table(TABLE_MAIN_COURSE_USER) . " cu INNER JOIN " . Database::get_main_table(TABLE_MAIN_USER) . " u - ON (cu.user_id = u.user_id) + ON (cu.user_id = u.id) WHERE cu.course_code = '$course_code' AND cu.status = 1 "; $rs = Database::query($sql); while ($teacher = Database::fetch_array($rs)) { - $teachers[$teacher['user_id']] = $teacher; + $teachers[$teacher['id']] = $teacher; } return $teachers; } @@ -4755,7 +4755,7 @@ class CourseManager $stok = Security::get_existing_token(); foreach ($courses as $courseId) { - $course_info = api_get_course_info_by_id($courseId); + $course_info = api_get_course_info_by_id($courseId['c_id']); $courseCode = $course_info['code']; $categoryCode = !empty($course_info['categoryCode']) ? $course_info['categoryCode'] : ""; $my_course['extra_info'] = $course_info; diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php index 77032bad90..1a7a745c45 100755 --- a/main/inc/lib/display.lib.php +++ b/main/inc/lib/display.lib.php @@ -2077,12 +2077,13 @@ class Display * @param string $title * @param string $footer * @param string $style + * @param string $extra * * @return string */ - public static function panel($content, $title = '', $footer = '', $style = '') + public static function panel($content, $title = '', $footer = '', $style = '', $extra='') { - $title = !empty($title) ? '

'.$title.'

' : ''; + $title = !empty($title) ? '

'.$title.'

'.$extra.'
' : ''; $footer = !empty($footer) ? '
'.$footer.'
' : ''; return ' diff --git a/main/inc/lib/javascript/jquery.highlight.js b/main/inc/lib/javascript/jquery.highlight.js index 8b7280f122..c59a9e8396 100755 --- a/main/inc/lib/javascript/jquery.highlight.js +++ b/main/inc/lib/javascript/jquery.highlight.js @@ -19,7 +19,7 @@ jQuery.fn.highlight = function(pat,real_code) { //var pos = node.data.toUpperCase().indexOf(pat); //Highlight strict, exact words - var SearchRegExp = new RegExp("(\\b)"+pat+"(\\b)","gi"); + var SearchRegExp = new RegExp("(\\b|\\B)"+pat+"(\\b|\\B)","gi"); var pos = node.nodeValue.search(SearchRegExp); if (pos >= 0 ) { diff --git a/main/social/home.php b/main/social/home.php index 4c9a3c1fec..93c4c4d016 100755 --- a/main/social/home.php +++ b/main/social/home.php @@ -100,30 +100,30 @@ if (api_get_setting('allow_skills_tool') == 'true') { //$social_skill_block = '
'; //$social_skill_block .= '
' . get_lang('Skills'); - $content = '
- + $extra = '
+
    '; if (api_is_student() || api_is_student_boss() || api_is_drh()) { - $content .= '
  • ' . Display::url( + $extra .= '
  • ' . Display::url( get_lang('SkillsReport'), api_get_path(WEB_CODE_PATH) . 'social/my_skills_report.php' ) . '
    • '; } - $content .= '
  • ' . Display::url( + $extra.= '
  • ' . Display::url( get_lang('SkillsWheel'), api_get_path(WEB_CODE_PATH) . 'social/skills_wheel.php' ) . '
    • '; - $content .= '
  • ' . Display::url( + $extra .= '
  • ' . Display::url( sprintf(get_lang('YourSkillRankingX'), $ranking), api_get_path(WEB_CODE_PATH) . 'social/skills_ranking.php' ) . '
    • '; - $content .= '
'; + $extra .= '
'; - $social_skill_block = Display::panel($content, get_lang('Skills')); + $social_skill_block = Display::panel($content, get_lang('Skills'),null,null,$extra); $lis = ''; if (!empty($skills)) { @@ -152,7 +152,9 @@ if (api_get_setting('allow_skills_tool') == 'true') { /*$social_skill_block .= '
'; $social_skill_block .= Display::tag('ul', $lis, array('class' => 'list-badges')); $social_skill_block .= '
';*/ - $social_skill_block .= Display::panel(Display::tag('ul', $lis, array('class' => 'list-badges'))); + $content .= Display::tag('ul', $lis, array('class' => 'list-badges')); + $social_skill_block = Display::panel($content, get_lang('Skills'),null,null,$extra); + } else { $social_skill_block .= Display::panel( diff --git a/main/template/default/skill/profile.tpl b/main/template/default/skill/profile.tpl index c6f429266c..9b1b97f275 100755 --- a/main/template/default/skill/profile.tpl +++ b/main/template/default/skill/profile.tpl @@ -54,8 +54,8 @@
-

{{ user['user'].complete_name }}

-

{{ 'User' | get_lang }}: {{user['user'].username}}

+
{{ user['user'].complete_name }}
+

{{ 'User' | get_lang }}: {{user['user'].username}}

{{ "Skills"|get_lang }} {{ user.total_found_skills }} / {{ total_search_skills }}
@@ -64,9 +64,9 @@
  • {% if skill_list[skill_data.skill_id].name is not null %} {% if skill_data.found %} - {{ skill_list[skill_data.skill_id].name }}{{ skill_list[skill_data.skill_id].name }} + {{ skill_list[skill_data.skill_id].name }}{{ skill_list[skill_data.skill_id].name }} {% else %} - {{ skill_list[skill_data.skill_id].name }}{{ skill_list[skill_data.skill_id].name }} + {{ skill_list[skill_data.skill_id].name }}{{ skill_list[skill_data.skill_id].name }} {% endif %} {% else %} diff --git a/main/template/default/skill/skill_wheel.tpl b/main/template/default/skill/skill_wheel.tpl index 23302505fd..b4eab0a388 100644 --- a/main/template/default/skill/skill_wheel.tpl +++ b/main/template/default/skill/skill_wheel.tpl @@ -471,19 +471,20 @@ $(document).ready(function() { }*/ }); -
    +
    - {{ "ReturnToCourseList"|get_lang }} + {{ "ReturnToCourseList"|get_lang }}
    +
    -
    +
    {{ 'SkillsSearch' | get_lang }} @@ -493,11 +494,11 @@ $(document).ready(function() {
    -

    {{ 'EnterTheSkillNameToSearch' | get_lang }}

    +

    {{ 'EnterTheSkillNameToSearch' | get_lang }}

    -
    +
    {{ 'ProfileSearch'|get_lang }} @@ -518,14 +519,16 @@ $(document).ready(function() {
    -

    {{ 'WhatSkillsAreYouLookingFor'|get_lang }}

    +

    {{ 'WhatSkillsAreYouLookingFor'|get_lang }}

    - + + -

    {{ 'IsThisWhatYouWereLookingFor'|get_lang }}

    +

    {{ 'IsThisWhatYouWereLookingFor'|get_lang }}

    @@ -533,7 +536,7 @@ $(document).ready(function() {
    -
    +
    {{ 'DisplayOptions' | get_lang }} @@ -541,7 +544,7 @@ $(document).ready(function() {
    -
    +
    {{ "Legend"|get_lang }} @@ -560,8 +563,8 @@ $(document).ready(function() {
    -

         {{ "SkillsYouCanLearn"|get_lang }}

    -

         {{ "SkillsSearchedFor"|get_lang }}

    +

         {{ "SkillsYouCanLearn"|get_lang }}

    +

         {{ "SkillsSearchedFor"|get_lang }}

    diff --git a/main/template/default/skill/skill_wheel_student.tpl b/main/template/default/skill/skill_wheel_student.tpl index 54d9e65bcd..af4f594a4f 100755 --- a/main/template/default/skill/skill_wheel_student.tpl +++ b/main/template/default/skill/skill_wheel_student.tpl @@ -262,12 +262,12 @@ $(document).ready(function() { }); -
    +
    - {{ "ReturnToCourseList"|get_lang }} + {{ "ReturnToCourseList"|get_lang }}
    @@ -281,45 +281,21 @@ $(document).ready(function() { {% if mySkills is not empty %} {%for skill in mySkills %} {% if skill.iconThumb is empty %} - {{ skill.name }} + {{ skill.name }} {% else %} {{ skill.name }} {% endif %} {% endfor %} {% endif %} {% for i in 1..(9 - ranking) %} - + {% endfor %}