Explorar el Código

Fixing help section button see #3466

Julio Montoya hace 14 años
padre
commit
6cb7b25292
Se han modificado 4 ficheros con 32 adiciones y 56 borrados
  1. 10 39
      main/help/help.php
  2. 8 2
      main/inc/banner.inc.php
  3. 1 12
      main/inc/lib/banner.lib.php
  4. 13 3
      main/inc/reduced_header.inc.php

+ 10 - 39
main/help/help.php

@@ -4,7 +4,7 @@
 /**
  *	This script displays a help window.
  *
- *	@package dokeos.help
+ *	@package chamilo.help
  */
 
 // Language file that needs to be included
@@ -12,43 +12,14 @@ $language_file = 'help';
 require_once '../inc/global.inc.php';
 $help_name = Security::remove_XSS($_GET['open']);
 
-header('Content-Type: text/html; charset='. api_get_system_encoding());
-
-/*
- * Choose CSS style platform's, user's, course's, or Learning path CSS
- */
-
-$my_style = api_get_visual_theme();
-
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo api_get_language_isocode(); ?>" lang="<?php echo api_get_language_isocode(); ?>">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=<?php echo api_get_system_encoding(); ?>" />
-<title>
-<?php echo get_lang('H'.$help_name); ?>
-</title>
-<?php
-if (api_get_setting('stylesheets') != '') {
-?>
-	<style type="text/css" media="screen, projection">
-	/*<![CDATA[*/
-	@import "<?php echo api_get_path(WEB_CSS_PATH), $my_style;?>/default.css";
-	/*]]>*/
-	</style>
-<?php
-}
+Display::display_reduced_header();
 ?>
-</head>
-<body dir="<?php echo api_get_text_direction(); ?>">
 <div style="margin:10px;">
-<a href="<?php echo api_get_path(WEB_CODE_PATH); ?>help/faq.php"><?php echo get_lang('AccessToFaq') ?></a>
-<h4>
-<?php echo get_lang('H'.$help_name); ?>
-</h4>
-<?php echo get_lang($help_name.'Content'); ?>
-<br /><br />
-<a href="<?php echo api_get_path(WEB_CODE_PATH); ?>help/faq.php"><?php echo get_lang('AccessToFaq'); ?></a>
-</div>
-</body>
-</html>
+    <a href="<?php echo api_get_path(WEB_CODE_PATH); ?>help/faq.php"><?php echo get_lang('AccessToFaq') ?></a>
+    <h4>
+        <?php echo get_lang('H'.$help_name); ?>
+    </h4>
+    <?php echo get_lang($help_name.'Content'); ?>
+    <br /><br />
+    <a href="<?php echo api_get_path(WEB_CODE_PATH); ?>help/faq.php"><?php echo get_lang('AccessToFaq'); ?></a>
+</div>

+ 8 - 2
main/inc/banner.inc.php

@@ -14,10 +14,16 @@ require_once api_get_path(LIBRARY_PATH).'banner.lib.php';
 $session_id     = api_get_session_id();
 $session_name   = api_get_session_name($my_session_id);
 echo '<div id="wrapper">';
+
 echo '<ul id="navigation">';
 if (!empty($help)) { 
+    $help = Security::remove_XSS($help);
 ?>
-    <li class="help"><a href="<?php echo api_get_path(WEB_CODE_PATH); ?>help/help.php?open=Home&height=400&width=600" class="thickbox" title="<?php echo get_lang('Help'); ?>"><img src="<?php echo api_get_path(WEB_IMG_PATH);?>help.large.png" alt="<?php echo get_lang('Help');?>" title="<?php echo get_lang('Help');?>" /></a> </li>
+    <li class="help">                   
+        <a href="<?php echo api_get_path(WEB_CODE_PATH); ?>help/help.php?open=<?php echo $help; ?>&height=400&width=600" class="thickbox" title="<?php echo get_lang('Help'); ?>">
+        <img src="<?php echo api_get_path(WEB_IMG_PATH);?>help.large.png" alt="<?php echo get_lang('Help');?>" title="<?php echo get_lang('Help');?>" />
+        </a>
+    </li>
 <?php 
 }
 if (api_get_setting('show_link_bug_notification') == 'true') { 
@@ -32,7 +38,7 @@ echo'</ul>';
 echo '<div id="header">';
 
 show_header_1($language_file, $nameTools);
-show_header_2($help);
+show_header_2();
 show_header_3();
 show_header_4($interbreadcrumb, $language_file, $nameTools);
 

+ 1 - 12
main/inc/lib/banner.lib.php

@@ -184,7 +184,7 @@ function show_header_1($language_file, $nameTools) {
     echo '</div>';
 }
 
-function show_header_2($help) {
+function show_header_2() {
     $_course    = api_get_course_info(); 
     $course_id  = api_get_course_id();
     $user_id    = api_get_user_id();
@@ -231,17 +231,6 @@ function show_header_2($help) {
             api_display_tool_view_option();
             echo '</li>';
         }
-    }   
-    
-    if (api_is_allowed_to_edit()) {
-            if (!empty($help)) {            
-            echo '<li>';
-            // Show help
-            if (api_get_setting('show_link_bug_notification') != 'true') {
-                echo '|';   
-            }     
-            echo "</li>";       
-        }
     }
     
     if (api_get_setting('accessibility_font_resize') == 'true') {

+ 13 - 3
main/inc/reduced_header.inc.php

@@ -93,7 +93,18 @@ if ($my_style != '') {
 ?>
 <style type="text/css" media="screen, projection">
 /*<![CDATA[*/
-@import "<?php echo api_get_path(WEB_CSS_PATH), $my_style; ?>/default.css";
+<?php 
+//Default CSS
+echo '@import "'.api_get_path(WEB_CSS_PATH).$my_style.'/default.css";';
+//Global CSS
+echo '@import "'.api_get_path(WEB_CSS_PATH).'base.css";';
+//Global chamilo CSS
+if (in_array(api_get_visual_theme(), array('chamilo','chamilo_red','chamilo_blue','chamilo_orange','chamilo_green','chamilo_electric_blue'))) {
+    echo '@import "'.api_get_path(WEB_CSS_PATH).'base_chamilo.css";';
+} else {
+    echo '@import "'.api_get_path(WEB_CSS_PATH).'base_classic.css";';
+}
+?>
 /*]]>*/
 </style>
 <?php
@@ -135,7 +146,6 @@ if ( ( navigator.userAgent.toLowerCase().indexOf('msie') != -1 ) && ( navigator.
 }
 //]]>
 </script>
-
 <?php
 if (isset($htmlHeadXtra) && $htmlHeadXtra) {
     foreach ($htmlHeadXtra as & $this_html_head) {
@@ -143,4 +153,4 @@ if (isset($htmlHeadXtra) && $htmlHeadXtra) {
     }
 }
 ?>
-</head>
+</head>