Merge pull request #1194 from aragonc/ofaj

Ofaj  fix js ckeditor constant

main/template/rainbow/layout/header.js.tpl

@@ -1,4 +1,5 @@
 <script>
+{% if constant('CHAMILO_LOAD_WYSIWYG') %}
 // External plugins not part of the default Ckeditor package.
 var plugins = [
     'asciimath',
@@ -68,7 +69,7 @@ var showTemplates = function (ckeditorName) {
         $templatesUL.appendTo("#frmModel");
     });
 };
-
+{% endif %}
 $(document).ready(function(){
     $("#open-view-list").click(function(){
         $("#student-list-work").fadeIn(300);

main/template/rainbow/layout/menu.tpl

@@ -21,11 +21,13 @@
                         {% endif %}
                     {% endfor %}
                 {% endif %}
-                {% if _u.logged == 0 %}
+                {% if _u.logged == 1 %}    
-                    <li class="item-menu menu-1"><a href="{{ _p.web }}">{{ "CampusHomepage"|get_lang }}</a></li>
-                {% endif %}
                     <li class="item-menu menu-5"><a href="{{ _p.web }}web/app_dev.php/faq">{{ "FAQ"|get_lang }}</a></li>
+                {% endif %}
+                   
                 {% if _u.logged == 0 %}
+                    <li class="item-menu menu-1"><a href="{{ _p.web }}">{{ "CampusHomepage"|get_lang }}</a></li>
+                    <li class="item-menu menu-2"><a href="{{ _p.web }}web/app_dev.php/faq">{{ "FAQ"|get_lang }}</a></li>
                     <li class="item-menu menu-3"><a href="{{ _p.web }}main/auth/inscription.php">{{ "Subscription"|get_lang }}</a></li>
                     <li class="item-menu menu-4"><a href="#">{{ "Demo"|get_lang }}</a></li>
                     <li class="item-menu menu-5"><a href="{{ _p.web }}web/app_dev.php/contact">{{ "Contact"|get_lang }}</a></li>