From bec04ba5bbfdd01ca44862fe962f8f901c3bb0f8 Mon Sep 17 00:00:00 2001 From: Imanol Losada Date: Tue, 7 Apr 2015 12:08:29 -0500 Subject: [PATCH 1/4] Replace with and <$courseId> with <$courseId['c_id']> - refs BT#7683 --- main/inc/lib/course.lib.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php index b0ea49b0ba..a6892e4b9f 100755 --- a/main/inc/lib/course.lib.php +++ b/main/inc/lib/course.lib.php @@ -1818,15 +1818,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; } @@ -4754,7 +4754,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; From 19995bb7255c570f2308bf2a8dee732ee5152bf4 Mon Sep 17 00:00:00 2001 From: Imanol Losada Date: Wed, 8 Apr 2015 10:58:50 -0500 Subject: [PATCH 2/4] Correct glossary word boundary accents issue - refs #7233 --- main/inc/lib/javascript/jquery.highlight.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ) { From 32a5c1a26feebdc172f249a2aedfb6d395d697a6 Mon Sep 17 00:00:00 2001 From: aragonc Date: Wed, 8 Apr 2015 11:11:52 -0500 Subject: [PATCH 3/4] fix skill css BT#9583 --- main/css/base.css | 71 +++++++++++++++---- main/inc/lib/display.lib.php | 5 +- main/social/home.php | 18 ++--- main/template/default/skill/profile.tpl | 8 +-- main/template/default/skill/skill_wheel.tpl | 34 ++++----- .../default/skill/skill_wheel_student.tpl | 52 ++++---------- 6 files changed, 106 insertions(+), 82 deletions(-) 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/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/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 = '