From 30a5512996913e449debc4962f4b6a3718e8e459 Mon Sep 17 00:00:00 2001 From: jmontoyaa Date: Tue, 22 Aug 2017 14:52:37 +0200 Subject: [PATCH] Fix ofaj footer/header after merge --- main/inc/lib/userportal.lib.php | 30 +- main/template/default/layout/layout_2_col.tpl | 4 + main/template/rainbow/layout/head.tpl | 9 +- main/template/rainbow/layout/layout_1_col.tpl | 55 ++- main/template/rainbow/layout/layout_2_col.tpl | 454 +++++++++++++----- main/template/rainbow/layout/page.tpl | 8 +- main/template/rainbow/layout/page_footer.tpl | 90 ++-- main/template/rainbow/layout/page_header.tpl | 81 ++-- user_portal.php | 32 +- 9 files changed, 500 insertions(+), 263 deletions(-) diff --git a/main/inc/lib/userportal.lib.php b/main/inc/lib/userportal.lib.php index 4c46fb36ba..50e7c7c365 100755 --- a/main/inc/lib/userportal.lib.php +++ b/main/inc/lib/userportal.lib.php @@ -879,7 +879,7 @@ class IndexManager /** * @return array */ - public function return_profile_block($diagnosisComplete = null) + public function return_profile_block() { $userInfo = api_get_user_info(); $userId = api_get_user_id(); @@ -977,34 +977,6 @@ class IndexManager 'title' => get_lang('VideoConference') ]; } - // ofaj - /*$diagnosis = ''; - if (api_is_drh() || api_is_student_boss()) { - $diagnosis = Display::url(get_lang('DiagnosisManagement'), api_get_path(WEB_PATH).'load_search.php').'
'; - $diagnosis .= Display::url(get_lang('DiagnosticForm'), api_get_path(WEB_PATH).'search.php'); - } else { - if (api_is_student()) { - if ($diagnosisComplete === false || - is_array($diagnosisComplete) && empty($diagnosisComplete['value']) - ) { - $diagnosis = Display::url( - get_lang('DiagnosticForm'), - api_get_path(WEB_PATH).'search.php' - ); - } - } - } - - if (!empty($diagnosis)) { - $html .= self::show_right_block( - get_lang('Diagnostic'), - $diagnosis, - 'diagnosis_block', - null, - 'diagnosis', - 'diagnosisCollapse' - ); - }*/ return $items; } diff --git a/main/template/default/layout/layout_2_col.tpl b/main/template/default/layout/layout_2_col.tpl index 78984db470..297b50492c 100755 --- a/main/template/default/layout/layout_2_col.tpl +++ b/main/template/default/layout/layout_2_col.tpl @@ -108,6 +108,10 @@ {% endif %} + {% if diagnosis_block %} + {{ diagnosis_block }} + {% endif %} + {% if course_block %}
diff --git a/main/template/rainbow/layout/head.tpl b/main/template/rainbow/layout/head.tpl index d962af5bfc..248264244c 100755 --- a/main/template/rainbow/layout/head.tpl +++ b/main/template/rainbow/layout/head.tpl @@ -1,7 +1,7 @@ - + -
-
-
-
    -
    • -
  • -

    {{ total_users }}

    -

    {{ "RegisteredUsers"|get_lang }}

    -
    • -
+
+
+ {% if plugin_menu_top %} +
+ {{ plugin_menu_top }}
-
-
    -
    • -
  • -

    {{ total_courses }}

    -

    {{ "OpenCourses"|get_lang }}

    -
    • -
+ {% endif %} + + {% include template ~ "/layout/login_form.tpl" %} + + {% if _u.logged == 1 %} + {{ user_image_block }} + {% endif %} + + {% if profile_block %} + +
+
+ +
+
+
    + {% for item in profile_block %} +
  • + + {{ item.icon }} + + {{ item.title }} +
    • + {% endfor %} +
+
+
-
-
    -
    • -
  • -

    {{ total_exercises }}

    -

    {{ "Exercises"|get_lang }}

    -
    • -
+
+ + {% endif %} + + {% if course_block %} + +
+
+ +
+
+
    + {% for item in course_block %} +
  • + + {{ item.icon }} + + {{ item.title }} +
    • + {% endfor %} +
+
+
+
+
+ + {% endif %} + + {% if grade_book_sidebar %} +
+
+ +
+
+
    +
  • + {{ 'Progress' | get_lang }} : {{ grade_book_progress }} % +
    + {% for badge in grade_book_badge_list %} +
    + {% for skill in badge.skills %} + {% if badge.finished %} + + {% else %} + + {% endif %} +
    + {{ skill.name }} +
    + {% endfor %} +
    + {#
    #} + {#{{ badge.name }}#} + {#
    #} + {% endfor %} +
    • +
+
+
+ + {% endif %} + + {% if skills_block %} + +
+
+ +
+
+
    + {% for item in skills_block %} +
  • + + {{ item.icon }} + + {{ item.title }} +
    • + {% endfor %} +
+
+
+
+
+ + {% endif %} + + {{ teacher_block }} + {{ certificates_search_block }} + {{ notice_block }} + {{ help_block }} + + + {% if navigation_course_links %} + + {% endif %} + + + {{ search_block }} + {{ classes_block }} + + {% if plugin_menu_bottom %} +
+ {{ plugin_menu_bottom }} +
+ {% endif %}
- - - - {% include template ~ "/layout/hot_courses.tpl" %} - - - - {#{% include template ~ "/layout/cms.tpl" %}#} - -
- + +
+ +
-
-{% endif %} - -{% if section_name != 'section-mycampus' %} -
-
-
- {% if _u.logged == 1 %} - {{ user_image_block }} - {% endif %} - {{ profile_block }} - {{ course_block }} - {{ skills_block }} - {{ certificates_search_block }} -
-
- {{ sniff_notification }} - - {% block page_body %} - {% include template ~ "/layout/page_body.tpl" %} - {% endblock %} - - {% if welcome_to_course_block %} -
- {{ welcome_to_course_block }} -
- {% endif %} - - {% block content %} - {% if content is not null %} -
- {{ content }} -
- {% endif %} - {% endblock %} - - {% if course_category_block %} -
- {{ course_category_block }} -
- {% endif %} -
-
-
-{% endif %} + + {% if plugin_main_bottom %} +
+
+ {{ plugin_main_bottom }} +
+
+ {% endif %} {% endblock %} diff --git a/main/template/rainbow/layout/page.tpl b/main/template/rainbow/layout/page.tpl index 6bb2699697..1865d0eefa 100644 --- a/main/template/rainbow/layout/page.tpl +++ b/main/template/rainbow/layout/page.tpl @@ -6,7 +6,7 @@ {% block head %} - {% include template ~ "/layout/head.tpl" %} +{% include template ~ "/layout/head.tpl" %} {% endblock %} @@ -44,9 +44,11 @@
{% block breadcrumb %} - {{ breadcrumb }} +
+ {{ breadcrumb }} +
{% endblock %} - + {% block body %} {{ content }} {% endblock %} diff --git a/main/template/rainbow/layout/page_footer.tpl b/main/template/rainbow/layout/page_footer.tpl index 6dff407d10..a64953ccb2 100644 --- a/main/template/rainbow/layout/page_footer.tpl +++ b/main/template/rainbow/layout/page_footer.tpl @@ -1,67 +1,61 @@ -