Julio Montoya 13 years ago
parent
commit
70f6889440

+ 89 - 81
main/css/base.css

@@ -4089,84 +4089,92 @@ div#no-data-view div.controls {
 
 
 
-    /*             styles for the star rater                */  
-    .star-rating{
-        list-style:none;
-        margin: 0px;
-        padding:0px;
-        width: 125px;
-        height: 25px;
-        position: relative;
-        overflow:hidden;
-        background: url(../img/alt_star.gif) top left repeat-x;        
-    }
-    .star-rating li{
-        padding:0px;
-        margin:0px;
-        width:25px;
-        height:25px;
-        /*\*/
-        float: left;
-        /* */
-    }
-    .star-rating li a{
-        display:block;
-        width:25px;
-        height: 25px;
-        line-height:25px;       
-        text-decoration: none;
-        text-indent: -9000px;
-        z-index: 20;
-        position: absolute;
-        padding: 0px;
-        overflow:hidden;
-    }
-    .star-rating li a:hover{
-        background: url(../img/alt_star.gif) left bottom;
-        z-index: 2;
-        left: 0px;
-        border:none;
-    }
-    .star-rating a.one-star{
-        left: 0px;
-    }
-    .star-rating a.one-star:hover{
-        width:25px;
-    }
-    .star-rating a.two-stars{
-        left:25px;
-    }
-    .star-rating a.two-stars:hover{
-        width: 50px;
-    }
-    .star-rating a.three-stars{
-        left: 50px;
-    }
-    .star-rating a.three-stars:hover{
-        width: 75px;
-    }
-    .star-rating a.four-stars{
-        left: 75px;
-    }   
-    .star-rating a.four-stars:hover{
-        width: 100px;
-    }
-    .star-rating a.five-stars{
-        left: 100px;
-    }
-    .star-rating a.five-stars:hover{
-        width: 125px;
-    }
-    .star-rating li.current-rating{
-        background: url(../img/alt_star.gif) left center;
-        position: absolute;
-        height: 25px;
-        display: block;
-        text-indent: -9000px;
-        z-index: 1;
-    }
-    
-    /* remove halo effect in firefox   */
-    a:active{
-        outline: none;
-    }       
+/*             styles for the star rater                */  
+.star-rating{
+  list-style:none;
+  margin: 0px;
+  padding:0px;
+  width: 125px;
+  height: 25px;
+  position: relative;
+  overflow:hidden;
+  background: url(../img/alt_star.gif) top left repeat-x;        
+}
+.star-rating li{
+  padding:0px;
+  margin:0px;
+  width:25px;
+  height:25px;
+  /*\*/
+  float: left;
+  /* */
+}
+.star-rating li a{
+  display:block;
+  width:25px;
+  height: 25px;
+  line-height:25px;       
+  text-decoration: none;
+  text-indent: -9000px;
+  z-index: 20;
+  position: absolute;
+  padding: 0px;
+  overflow:hidden;
+}
+.star-rating li a:hover{
+  background: url(../img/alt_star.gif) left bottom;
+  z-index: 2;
+  left: 0px;
+  border:none;
+}
+.star-rating a.one-star{
+  left: 0px;
+}
+.star-rating a.one-star:hover{
+  width:25px;
+}
+.star-rating a.two-stars{
+  left:25px;
+}
+.star-rating a.two-stars:hover{
+  width: 50px;
+}
+.star-rating a.three-stars{
+  left: 50px;
+}
+.star-rating a.three-stars:hover{
+  width: 75px;
+}
+.star-rating a.four-stars{
+  left: 75px;
+}   
+.star-rating a.four-stars:hover{
+  width: 100px;
+}
+.star-rating a.five-stars{
+  left: 100px;
+}
+.star-rating a.five-stars:hover{
+  width: 125px;
+}
+.star-rating li.current-rating{
+  background: url(../img/alt_star.gif) left center;
+  position: absolute;
+  height: 25px;
+  display: block;
+  text-indent: -9000px;
+  z-index: 1;
+}
+
+/* remove halo effect in firefox   */
+a:active{
+  outline: none;
+}
+
+.skills-profiles, .skills-users, .skills-skills {
+  margin-top: 10px;
+  margin-bottom: 10px;
+}
+.skills-skills ul.holder {
+  margin-bottom: 8px;
+}

+ 4 - 0
main/inc/global.inc.php

@@ -287,6 +287,10 @@ require_once $lib_path.'formvalidator/Rule/allowed_tags.inc.php';
 // Load HTMLPurifier.
 //require_once $lib_path.'htmlpurifier/library/HTMLPurifier.auto.php'; // It will be loaded later, in a lazy manner.
 
+// Before we call local.inc.php, let's define a global $this_section variable 
+// which will then be usable from the banner and header scripts
+$this_section = SECTION_GLOBAL;
+
 // include the local (contextual) parameters of this course or section
 require $includePath.'/local.inc.php';
 

+ 1 - 2
main/inc/global_error_message.inc.php

@@ -196,7 +196,6 @@ if (is_int($global_error_code) && $global_error_code > 0) {
 					</ul>
 					<div style="clear: both;" class="clear"></div>
 				</div>
-				<div id="header4">&nbsp;</div>
 			</div>
 			<div class="clear"> </div>
 
@@ -222,4 +221,4 @@ EOM;
 	}
 	header('Content-Type: text/html; charset='.$global_error_message['encoding']);
 	die($global_error_message_page);
-}
+}

+ 5 - 3
main/inc/header.inc.php

@@ -22,7 +22,7 @@ if (api_is_platform_admin()) {
 }*/
 header('Content-Type: text/html; charset='.api_get_system_encoding());
 //show the X-Powered-By header so that parsers can find it
-global $_configuration;
+global $_configuration, $this_section;
 header('X-Powered-By: '.$_configuration['software_name'].' '.substr($_configuration['system_version'],0,1));
 
 $navigator_info = api_get_navigator();
@@ -204,8 +204,10 @@ if (!api_is_platform_admin()) {
 ?>
 </head>
 <body dir="<?php echo api_get_text_direction(); ?>" <?php
-if (defined('CHAMILO_HOMEPAGE') && CHAMILO_HOMEPAGE)
- echo 'onload="javascript: if(document.formLogin) { document.formLogin.login.focus(); }"'; ?>>
+if (defined('CHAMILO_HOMEPAGE') && CHAMILO_HOMEPAGE) {
+  echo 'onload="javascript: if(document.formLogin) { document.formLogin.login.focus(); }"';
+}
+echo 'class="'.(!empty($this_section)?$this_section:'').'"';?>>
 <div class="skip">
 <ul>
 <li><a href="#menu"><?php echo get_lang('WCAGGoMenu'); ?></a></li>

+ 5 - 3
main/inc/lib/template.lib.php

@@ -283,11 +283,13 @@ class Template extends Smarty {
 		foreach($css_files  as $css_file) {
 			$css_file_to_string .= api_get_css($css_file);
 		}
-		
+	
+		global $this_section, $nameTools;	
 		$this->assign('css_file_to_string', $css_file_to_string);
 		$this->assign('js_file_to_string',  $js_file_to_string);		
-		$this->assign('text_direction',	 	api_get_text_direction());			
-		$this->assign('style_print', 		$style_print);
+		$this->assign('text_direction',	    api_get_text_direction());			
+		$this->assign('style_print',        $style_print);
+		$this->assign('section_name',       'section-'.$this_section);
 		
 		$extra_headers = '';		
 		if (isset($htmlHeadXtra) && $htmlHeadXtra) {

+ 1 - 1
main/install/index.php

@@ -448,7 +448,7 @@ if ($encryptPassForm == '1') {
 <div id="wrapper">
 
 	<div id="header">
-		<div id="header1">	
+		<div id="header1" style="margin-bottom:10px;">	
 			<div id="logo">	   
 	        	<img src="../css/chamilo/images/header-logo.png" hspace="10" vspace="10" alt="Chamilo" />        
 			</div>	

+ 2 - 2
main/template/default/layout/main.tpl

@@ -6,7 +6,7 @@
 {include file="default/layout/head.tpl"}
 </head>
 
-<body dir="{$text_direction}">
+<body dir="{$text_direction}" class="{$section_name}">
 
 <div class="skip">
 	<ul>
@@ -34,4 +34,4 @@
 </div> <!-- end of #wrapper section -->
 {block name="footer"}{/block}
 </body>
-</html>
+</html>

+ 7 - 5
main/template/default/skill/profile.tpl

@@ -94,11 +94,11 @@ function checkLength( o, n, min, max ) {
     }
 }    
 </script>
-
 <h2>{"SearchSkills"|get_lang}</h2>
 
 {$form}
 
+<div class="skills-skills">
 {if !empty($search_skill_list) }
     <h3>{"Skills"|get_lang}</h3>
      <ul class="holder">
@@ -111,8 +111,8 @@ function checkLength( o, n, min, max ) {
     </ul>
     <a id="add_profile" class="a_button gray small" href="#"> {"SaveThisSearch"|get_lang}</a>
 {/if}
-
-
+</div>
+<div class="skills-profiles">
 {if !empty($profiles) }
     <h3>{"SkillProfiles"|get_lang}</h3>
     <ul class="holder">
@@ -123,7 +123,8 @@ function checkLength( o, n, min, max ) {
         {/foreach}
     </ul>    
 {/if}
-
+</div>
+<div class="skills-users">
 {if !empty($order_user_list) }
     {foreach $order_user_list as $count => $user_list}
         <h2> {"Matches"|get_lang} {$count}/{$total_search_skills} </h2>
@@ -157,6 +158,7 @@ function checkLength( o, n, min, max ) {
 {else}
     <div class="warning-message">{"NoResults"|get_lang}</div>
 {/if}
+</div>
 <div id="dialog-form" style="display:none;">    
     <form id="save_profile_form" name="form">        
         <div class="row">
@@ -176,4 +178,4 @@ function checkLength( o, n, min, max ) {
             </div>
         </div>  
     </form>    
-</div>
+</div>

+ 6 - 3
main/template/default/skill/skill_tree.tpl

@@ -349,8 +349,11 @@ $(document).ready( function() {
 
 </script>
 <div style="z-index: 1000;position: absolute;">
-<h3>{'Skills'|get_lang}</h3>    
-<a style="z-index: 1000"class="a_button gray medium" id="add_item_link" href="#">{'AddSkill'|get_lang}</a>
+<h3>{'Skills'|get_lang}</h3>
+<ul style="list-style-type:none; margin:0;">
+<li><a style="z-index: 1000"class="a_button gray medium" id="add_item_link" href="#">{'AddSkill'|get_lang}</a></li>
+<li><a style="z-index: 1000"class="a_button gray medium" id="return_to_admin" href="/main/admin/">{'BackToAdmin'|get_lang}</a></li>
+</ul>
 </div>
 {$html}
 
@@ -396,4 +399,4 @@ $(document).ready( function() {
             </div>
         </div>  
     </form>    
-</div>
+</div>