From bd552e9f8bb7de6ddd34c4353bd6f8d073278b03 Mon Sep 17 00:00:00 2001 From: Alex Aragon Date: Tue, 31 May 2016 16:10:38 -0500 Subject: [PATCH 1/2] fix icons attendance in home course and css hot course --- app/Resources/public/css/base.css | 18 +- app/cache/.htaccess | 0 main/img/icons/svg/attendance.svg | 34 +- main/img/icons/svg/attendance_na.svg | 985 ++++++++++++++++++ .../default/layout/hot_course_item.tpl | 20 +- main/template/default/layout/hot_courses.tpl | 2 +- 6 files changed, 1019 insertions(+), 40 deletions(-) mode change 100644 => 100755 app/cache/.htaccess create mode 100644 main/img/icons/svg/attendance_na.svg diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css index f4ccb9a676..7ebb333e5d 100644 --- a/app/Resources/public/css/base.css +++ b/app/Resources/public/css/base.css @@ -100,8 +100,7 @@ a.thumbnail:hover{ cursor: pointer; } .invisible { - visibility: hidden; - display: none; + visibility: visible; } .logo{ margin-bottom: 20px; @@ -4728,13 +4727,10 @@ div#chat-remote-video video { box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.05); text-align: left; background-color: #fff; - min-height: 250px; + min-height: 285px; border: 1px solid #DFDFDF; border-radius: 5px; } -.hot-courses .grid-courses .items{ - min-height: 300px; -} .grid-courses .items .title{ line-height: 1.4; padding: 0px; @@ -5295,13 +5291,9 @@ div#chat-remote-video video { margin-bottom: 5px; } .hot-course-head{ - padding-top: 10px; - padding-bottom: 10px; -} -.hot-course-head .hot-course-title{ - padding-bottom: 10px; - border-bottom: 1px solid #E5E5E5; - font-size: 21px; + padding-top: 10px; + margin-bottom: 10px; + padding-bottom: 10px; } .create-groups .separate td{ padding-left: 15px; diff --git a/app/cache/.htaccess b/app/cache/.htaccess old mode 100644 new mode 100755 diff --git a/main/img/icons/svg/attendance.svg b/main/img/icons/svg/attendance.svg index fc4be4861c..4a3d2d5c17 100644 --- a/main/img/icons/svg/attendance.svg +++ b/main/img/icons/svg/attendance.svg @@ -17,14 +17,14 @@ id="svg1" xml:space="preserve" sodipodi:version="0.32" - inkscape:version="0.91 r" + inkscape:version="0.91 r13725" sodipodi:docname="attendance.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape">image/svg+xml + style="fill:none" /> \ No newline at end of file diff --git a/main/img/icons/svg/attendance_na.svg b/main/img/icons/svg/attendance_na.svg new file mode 100644 index 0000000000..988b32a37b --- /dev/null +++ b/main/img/icons/svg/attendance_na.svg @@ -0,0 +1,985 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/main/template/default/layout/hot_course_item.tpl b/main/template/default/layout/hot_course_item.tpl index 5da229ee24..7434612458 100755 --- a/main/template/default/layout/hot_course_item.tpl +++ b/main/template/default/layout/hot_course_item.tpl @@ -36,16 +36,18 @@
{{ item.rating_html }}
- {% if item.price %} - {{ item.price }} - {% else %} -
 
- {% endif %}
-
- {{ item.register_button }} - {{ item.unsubscribe_button }} - {{ item.already_register_as }} +
+ {% if item.price %} + {{ item.price }} + {% endif %} +
+
+
+ {{ item.register_button }} + {{ item.unsubscribe_button }} + {{ item.already_register_as }} +
diff --git a/main/template/default/layout/hot_courses.tpl b/main/template/default/layout/hot_courses.tpl index ec8ea50386..f7c66df3aa 100755 --- a/main/template/default/layout/hot_courses.tpl +++ b/main/template/default/layout/hot_courses.tpl @@ -27,7 +27,7 @@ $(document).ready( function() { {% if _u.is_admin %} - + {% endif %} From 3c99e4b53f5dc372a2f7a20a1422826263e9e0c3 Mon Sep 17 00:00:00 2001 From: Alex Aragon Date: Tue, 31 May 2016 17:57:31 -0500 Subject: [PATCH 2/2] fix grib hot course and courses catalog --- app/Resources/public/css/base.css | 14 ++++++-------- main/inc/lib/display.lib.php | 4 ++-- main/template/default/auth/courses_categories.php | 9 +++++++-- main/template/default/layout/hot_course_item.tpl | 2 +- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css index 7ebb333e5d..2b76ccb8bb 100644 --- a/app/Resources/public/css/base.css +++ b/app/Resources/public/css/base.css @@ -4727,9 +4727,14 @@ div#chat-remote-video video { box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.05); text-align: left; background-color: #fff; - min-height: 285px; + min-height: 250px; border: 1px solid #DFDFDF; border-radius: 5px; + margin-bottom: 20px; +} +.grid-courses .items.items-courses, +.grid-courses .items.items-hotcourse{ + min-height: 300px; } .grid-courses .items .title{ line-height: 1.4; @@ -4783,13 +4788,6 @@ div#chat-remote-video video { padding-top: 5px; text-align: center; } -.grid-courses .items .buycourses-price{ - margin-top: 5px; - text-align: left; -} -.grid-courses .items .separator{ - margin-top: 5px; -} .grid-courses .items .admin-actions, .grid-courses .items .user-actions{ position: absolute; bottom: 0px; diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php index 7db90be40a..729be5ba5f 100755 --- a/main/inc/lib/display.lib.php +++ b/main/inc/lib/display.lib.php @@ -1680,9 +1680,9 @@ class Display $labels[]= $number_of_users_who_voted == 1 ? $number_of_users_who_voted.' '.get_lang('Vote') : $number_of_users_who_voted.' '.get_lang('Votes'); $labels[]= $accesses == 1 ? $accesses.' '.get_lang('Visit') : $accesses.' '.get_lang('Visits'); - if (!empty($number_of_users_who_voted)) { + /* if (!empty($number_of_users_who_voted)) { $labels[]= get_lang('Average').' '.$point_info['point_average_star'].'/5'; - } + } */ $labels[]= $point_info['user_vote'] ? get_lang('YourVote').' ['.$point_info['user_vote'].']' : get_lang('YourVote'). ' [?] '; diff --git a/main/template/default/auth/courses_categories.php b/main/template/default/auth/courses_categories.php index fe01408db9..2ccb55417d 100755 --- a/main/template/default/auth/courses_categories.php +++ b/main/template/default/auth/courses_categories.php @@ -217,7 +217,7 @@ if ($showCourses && $action != 'display_sessions') { $html = null; // display the course bloc - $html .= '
'; + $html .= '
'; // display thumbnail $html .= returnThumbnail($course); @@ -243,10 +243,14 @@ if ($showCourses && $action != 'display_sessions') { // display course title and button bloc $html .= '
'; $html .= return_title($course); - $html .= $separator; + // display button line $html .= '
'; + $html .= '
'; + $html .= $separator; + $html .= '
'; + $html .= '
'; $html .= '
'; // if user registered as student if ($user_registerd_in_course_as_student) { @@ -280,6 +284,7 @@ if ($showCourses && $action != 'display_sessions') { $html .= '
'; $html .= '
'; $html .= '
'; + $html .= '
'; echo $html; } diff --git a/main/template/default/layout/hot_course_item.tpl b/main/template/default/layout/hot_course_item.tpl index 7434612458..751652cd3c 100755 --- a/main/template/default/layout/hot_course_item.tpl +++ b/main/template/default/layout/hot_course_item.tpl @@ -1,7 +1,7 @@ {% for item in hot_courses %} {% if item.title %}
-
+
{% if item.categoryName != '' %}