Improving index/userportal page construction

main/inc/lib/page.lib.php

@@ -111,43 +111,14 @@ class PageController
      * @assert () != ''
      */
     static function return_profile_block() {
-        $user_id = api_get_user_id();
-
-        if (empty($user_id)) {
-            return;
-        }
-        $profile_content = array();
-
         //  @todo Add a platform setting to add the user image.
         if (api_get_setting('allow_message_tool') == 'true') {
-
-            // New messages.
-            $number_of_new_messages = MessageManager::get_new_messages();
-
-            // New contact invitations.
-            $number_of_new_messages_of_friend = SocialManager::get_message_number_invitation_by_user_id($user_id);
-
-            // New group invitations sent by a moderator.
-            $group_pending_invitations = GroupPortalManager::get_groups_by_user_count($user_id, GROUP_USER_PERMISSION_PENDING_INVITATION, false);
-
-            $total_invitations = $number_of_new_messages_of_friend + $group_pending_invitations;
-            $cant_msg = Display::badge($number_of_new_messages);
-
-            $link = '';
             if (api_get_setting('allow_social_tool') == 'true') {
-                $link = '?f=social';
-            }
-            $profile_content[] = array('href' => api_get_path(WEB_PATH).'main/messages/inbox.php'.$link, 'title' => get_lang('Inbox').$cant_msg);
-            $profile_content[] = array('href' => api_get_path(WEB_PATH).'main/messages/new_message.php'.$link, 'title' => get_lang('Compose'));
-
-            if (api_get_setting('allow_social_tool') == 'true') {
-                $total_invitations = Display::badge($total_invitations);
-                $profile_content[] = array('href' => api_get_path(WEB_PATH).'main/social/invitations.php', 'title' => get_lang('PendingInvitations').$total_invitations);
+                self::show_right_block(get_lang('Profile'), array(), 'profile_social_block');
             } else {
-                $profile_content[] = array('href' => api_get_path(WEB_PATH).'main/auth/profile.php', 'title' => get_lang('PendingInvitations').$total_invitations);
+                self::show_right_block(get_lang('Profile'), array(), 'profile_block');
             }
         }
-        self::show_right_block(get_lang('Profile'), $profile_content, 'profile_block');
     }
 
     /**
@@ -176,8 +147,6 @@ class PageController
         if (!isset($user_selected_language)) {
             $user_selected_language = $platformLanguage;
         }
-
-        $html = null;
         $home_menu = @(string) file_get_contents($sys_path.$home.'home_menu_'.$user_selected_language.'.html');
         if (!empty($home_menu)) {
             $home_menu_content = api_to_system_encoding($home_menu, api_detect_encoding(strip_tags($home_menu)));
@@ -213,7 +182,6 @@ class PageController
         $user_selected_language = api_get_interface_language();
         $home = api_get_home_path();
 
-        $html = '';
         // Notice
         $home_notice = @(string) file_get_contents($sys_path.$home.'home_notice_'.$user_selected_language.'.html');
         if (empty($home_notice)) {
@@ -981,17 +949,17 @@ class PageController
         $tpl->assign('welcome_to_course_block', 1);
     }
 
-    /* function run() {
-      $app = $this->app;
-      $app->get('/', function() use ($app) {
-      $data = $this->app['twig']->render($app['template_style'].'/'.$app['default_template']);
-      return new Response($data, 200, array('cache-control' => 's-maxage=3600, public'));
-      });
-      if ($app['debug'] == true) {
-      $this->app->run();
-      } else {
-      //Using http cache
-      $app['http_cache']->run();
-      }
-      } */
+    static function return_debug() {
+        global $app;
+        $mtime = microtime();
+        $mtime = explode(" ",$mtime);
+        $mtime = $mtime[1] + $mtime[0];
+
+        $message = "22---Page loaded in:".($mtime-START);
+        $app['monolog']->addInfo($message);
+        $message = "memory_get_usage: ".format_file_size(memory_get_usage(true));
+        $app['monolog']->addInfo($message);
+        $message = "memory_get_peak_usage: ".format_file_size(memory_get_peak_usage(true));
+        $app['monolog']->addInfo($message);
+    }
 }

main/template/default/index/profile_block.tpl

@@ -1 +1,9 @@
-{% include 'default/layout/block_menu.tpl' with {'block_menu': profile_block} %}
+{% set block_menu =  profile_block %}
+{% extends "default/layout/block_menu.tpl" %}
+{% block block_menu_item %}
+    <h4>{{ block_menu.title }}</h4>
+    <ul class="nav nav-list">
+        <li><a href="{{ _p.web}}main/messages/inbox.php">{{ 'Inbox' | get_lang}} {{ _u.messages_count}}</a></li>
+        <li><a href="{{ _p.web}}main/messages/new_message.php">{{ 'Compose' | get_lang}}</a></li>
+    </ul>
+{% endblock %}

main/template/default/index/profile_social_block.tpl

@@ -0,0 +1,10 @@
+{% set block_menu =  profile_social_block %}
+{% extends "default/layout/block_menu.tpl" %}
+{% block block_menu_item %}
+    <h4>{{ block_menu.title }}</h4>
+    <ul class="nav nav-list">
+        <li><a href="{{ _p.web}}main/messages/inbox.php?f=social">{{ 'Inbox' | get_lang}} {{ _u.messages_count}}</a></li>
+        <li><a href="{{ _p.web}}main/messages/new_message.php?f=social"> {{ 'Compose' | get_lang}}</a></li>
+        <li><a href="{{ _p.web}}main/social/invitations.php"> {{ 'PendingInvitations' | get_lang }} {{ _u.messages_invitations_count}}</a></li>
+    </ul>
+{% endblock %}

main/template/default/index/user_image_block.tpl

@@ -1,7 +1,7 @@
 {% set block_menu =  user_image_block %}
 {% extends "default/layout/block_menu.tpl" %}
 {% block block_menu_item %}
-<div style="text-align:center;">
-    {{ user_image_block.content }}
-</div>
+    <div style="text-align:center;">
+        {{ user_image_block.content }}
+    </div>
 {% endblock %}

main/template/default/layout/block_menu.tpl

@@ -8,7 +8,7 @@
         {% if block_menu.elements is not empty %}
         <ul class="nav nav-list">
             {% for item in block_menu.elements %}
-                  <li><a href="{{ item.href }}"> {{ item.title }}</a></li>
+                <li><a href="{{ item.href }}"> {{ item.title }}</a></li>
             {% endfor %}
         </ul>
         {% endif %}

main/template/default/layout/layout_2_col.tpl

@@ -22,6 +22,8 @@
         {#  User Profile links #}
         {% include "default/index/profile_block.tpl" %}
 
+        {% include "default/index/profile_social_block.tpl" %}
+
         {#  Course block - admin #}
         {% include "default/index/course_block.tpl" %}
 

resources/config/prod.php

@@ -71,4 +71,8 @@ if (!is_dir($app['assetic.path_to_web'].'/js')) {
  */
 if (!is_dir($app['db.orm.proxies_dir'])) {
     mkdir($app['db.orm.proxies_dir'], api_get_permissions_for_new_directories());
+}
+
+if (!is_dir($app['cache.path'].'twig')) {
+    mkdir($app['cache.path'].'twig', api_get_permissions_for_new_directories());
 }