Quellcode durchsuchen

fix design ofaj - refs BT#10945

Alex Aragon vor 8 Jahren
Ursprung
Commit
b30a0a8af5

+ 2 - 2
app/Resources/public/css/base.css

@@ -23,8 +23,8 @@ body{
     width: 100%;
     
 }
-#content-section{
-    margin-bottom: 230px;
+#content-section, #page-wrap{
+    margin-bottom: 100px;
 }
 /* End Sticky footer style */
 select {

+ 1 - 1
main/template/rainbow/layout/footer.tpl

@@ -5,7 +5,7 @@
     </div>
 {% endif %}
 
-<footer> <!-- start of #footer section -->
+<footer class="sticky-footer"> <!-- start of #footer section -->
     <div class="container">
         <div class="row">
             <div id="footer_left" class="col-md-4">

+ 31 - 17
main/template/rainbow/layout/menu.tpl

@@ -38,31 +38,45 @@
                {% if user_notifications is not null %}
                <li><a href="{{ message_url }}">{{ user_notifications }}</a></li>
                {% endif %}
+               
                {% if _u.status != 6 %}
-                <li class="dropdown">
+                <li class="dropdown avatar-user">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
                         <img class="img-circle" src="{{ _u.avatar_small }}" alt="{{ _u.complete_name }}" />  <span class="caret"></span>
                     </a>
                     <ul class="dropdown-menu" role="menu">
-                        {% if _u.is_admin == 1 %}
-                            <li class=""><a href="{{ _p.web }}main/admin">{{ "NomPageAdmin"|get_lang }}</a></li>
-                            {% endif %}
-                            <li class=""><a href="{{ _p.web }}main/calendar/agenda_js.php?type=personal">{{ "AllowPersonalAgendaTitle"|get_lang }}</a></li>
-                            <li role="separator" class="divider"></li>
-                        <li>
-                            {{ profile_link }}
-                            {{ message_link }}
-                            {{ certificate_link }}
+                        <li class="user-header">
+                            <div class="text-center">
+                            <img class="img-circle" src="{{ _u.avatar_medium }}" alt="{{ _u.complete_name }}" />
+                            <p class="name"><a href="{{ profile_url }}">{{ _u.complete_name }}</a></p>
+                            <p><i class="fa fa-envelope-o" aria-hidden="true"></i> {{ _u.email }}</p>
+                            </div>
+                        </li>
+                        <li role="separator" class="divider"></li>
+                        
+                        <li class="user-body">
+                            <a href="{{ _p.web }}main/admin">
+                                <em class="fa fa-cog" aria-hidden="true"></em>
+                                {{ "NomPageAdmin"|get_lang }}
+                            </a>
+                            <a href="{{ _p.web }}main/calendar/agenda_js.php?type=personal">
+                                <em class="fa fa-calendar" aria-hidden="true"></em>
+                                {{ "AllowPersonalAgendaTitle"|get_lang }}
+                            </a>
+                            <a title="{{ "Inbox"|get_lang }}" href="{{ message_url }}">
+                                <em class="fa fa-envelope" aria-hidden="true"></em> {{ "Inbox"|get_lang }}
+                            </a>
+                            <a title="{{ "MyCertificates"|get_lang }}" href="{{ certificate_url }}">
+                                <em class="fa fa-graduation-cap" aria-hidden="true"></em> {{ "MyCertificates"|get_lang }}
+                            </a>
+                            <a id="logout_button" title="{{ "Logout"|get_lang }}" href="{{ logout_link }}" >
+                                <em class="fa fa-sign-out"></em> {{ "Logout"|get_lang }}
+                            </a>
                         </li>
                     </ul>
                 </li>
-               {% if logout_link is not null %}
-               <li>
-                   <a id="logout_button" title="{{ "Logout"|get_lang }}" href="{{ logout_link }}" >
-                       <em class="fa fa-sign-out"></em> {{ "Logout"|get_lang }}
-                   </a>
-               </li>
-               {% endif %}
+               
+               
                {% endif %}
             </ul>
             {% endif %}

+ 11 - 6
src/Chamilo/CoreBundle/Menu/NavBuilder.php

@@ -279,7 +279,8 @@ class NavBuilder extends ContainerAware
                         'route' => 'main',
                         'routeParameters' => array(
                             'name' => 'admin/',
-                        )
+                        ),
+                        'icon' => ' fa fa-cog'
                     )
                 );
             }
@@ -291,6 +292,7 @@ class NavBuilder extends ContainerAware
                     'routeParameters' => array(
                         'name' => 'calendar/agenda_js.php',
                     ),
+                    'icon' => ' fa fa-calendar'
                 )
             );
 
@@ -307,7 +309,8 @@ class NavBuilder extends ContainerAware
                     'route' => 'main',
                     'routeParameters' => array(
                         'name' => 'social/home.php'
-                    )
+                    ),
+                    'icon' => ' fa fa-user'
                 )
             )->setAttribute('divider_append', true);
 
@@ -318,6 +321,7 @@ class NavBuilder extends ContainerAware
                     'routeParameters' => array(
                         'name' => 'messages/inbox.php',
                     ),
+                    'icon' => ' fa fa-envelope'
                 )
             )->setAttribute('divider_append', true);
 
@@ -328,11 +332,12 @@ class NavBuilder extends ContainerAware
                     'routeParameters' => array(
                         'name' => 'gradebook/my_certificates.php',
                     ),
+                    'icon' => ' fa fa-graduation-cap'
                 )
             )->setAttribute('divider_append', true);
 
             // legacy logout
-            $logoutLink = $menu->addChild(
+            $dropdown->addChild(
                 $translator->trans('Logout'),
                 array(
                     'route' => 'main',
@@ -346,16 +351,16 @@ class NavBuilder extends ContainerAware
                 )
             );
 
-            $logoutLink
+            /* $logoutLink
                 ->setLinkAttributes(array(
                     'id' => 'logout_button',
                     //'class' => 'fa fa-power-off',
                 ))
                 ->setAttributes(array(
                     /*'id' => 'signin',
-                    'class' => 'dropdown'*/
+                    'class' => 'dropdown'
                 ))
-            ;
+            ; */
         }
 
         return $menu;

+ 6 - 2
src/Chamilo/ThemeBundle/Resources/views/Layout/base-layout.html.twig

@@ -142,7 +142,11 @@
                 </div>
             {% endif %}
             <div class="row">
-                <div class="col-xs-6 col-md-4"></div>
+                <div class="col-xs-6 col-md-4">
+                    <div class="logo pull-left">
+                        <img src="{{ asset('css/themes/'~ theme ~'/images/header-logo.png') }}"/>
+                    </div>
+                </div>
                 <div class="col-xs-6 col-md-4">
                     {% if plugin_header_center is not null %}
                         <div id="plugin_header_center">
@@ -152,7 +156,7 @@
                 </div>
                 <div class="col-xs-6 col-md-4">
                     <div class="logo pull-right">
-                        <img src="{{ asset('css/themes/'~ theme ~'/images/header-logo.png') }}"/>
+                        <img src="{{ asset('css/themes/'~ theme ~'/images/logo-ofaj.png') }}"/>
                     </div>
                 </div>
             </div>