From 931df236b9cdb687eaa0aea8ffb5a6e158081a36 Mon Sep 17 00:00:00 2001
From: Carlos Vargas <carlos.vargas@beeznest.com>
Date: Thu, 13 Aug 2009 10:49:20 -0500
Subject: [PATCH 1/7] correcting var lang TermAndConditions

---
 main/auth/inscription.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/auth/inscription.php b/main/auth/inscription.php
index b85d910cbe..eb59ee3273 100644
--- a/main/auth/inscription.php
+++ b/main/auth/inscription.php
@@ -310,7 +310,7 @@ if (get_setting('allow_terms_conditions')=='true') {
 		if (!empty($term_preview['content'])) {			
 			$preview = LegalManager::show_last_condition($term_preview);
 			$term_preview  = '<div class="row">
-					<div class="label">'.get_lang('Conditions').'</div>
+					<div class="label">'.get_lang('TermsAndConditions').'</div>
 					<div class="formw">
 					'.$preview.'
 					<br />				

From 04c8d24d27a6631100bdb1f69db943ac85fc3c99 Mon Sep 17 00:00:00 2001
From: Carlos Vargas <carlos.vargas@beeznest.com>
Date: Thu, 13 Aug 2009 11:09:26 -0500
Subject: [PATCH 2/7] correcting var lang in profile

---
 main/social/profile.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/main/social/profile.php b/main/social/profile.php
index b09b2ad743..87f2e6055a 100644
--- a/main/social/profile.php
+++ b/main/social/profile.php
@@ -641,7 +641,7 @@ echo '<div id="social-profile-wrapper">';
 			if (!empty($user_info['competences'])) {		
 				echo '<br />';
 				echo '<div class="social-background-content" style="width:100%;">';
-				echo '<div class="social-actions-message">'.get_lang('Competences').'</div>';
+				echo '<div class="social-actions-message">'.get_lang('MyCompetences').'</div>';
 				echo cut($user_info['competences'],$cut_size);
 				echo '</div>';
 				echo '<br />';
@@ -649,21 +649,21 @@ echo '<div id="social-profile-wrapper">';
 			
 			if (!empty($user_info['diplomas'])) {
 				echo '<div class="social-background-content" style="width:100%;" >';					
-				echo '<div class="social-actions-message">'.get_lang('Diplomas').'</div>';
+				echo '<div class="social-actions-message">'.get_lang('MyDiplomas').'</div>';
 				echo cut($user_info['diplomas'],$cut_size); 
 				echo '</div>';
 				echo '<br />';
 			}
 			if (!empty($user_info['openarea'])) {
 				echo '<div class="social-background-content" style="width:100%;" >';	
-				echo '<div class="social-actions-message">'.get_lang('OpenArea').'</div>';
+				echo '<div class="social-actions-message">'.get_lang('MyPersonalOpenArea').'</div>';
 				echo cut($user_info['openarea'],$cut_size); 
 				echo '</div>';
 				echo '<br />';
 			}
 			if (!empty($user_info['teach'])) {
 				echo '<div class="social-background-content" style="width:100%;" >';					
-				echo '<div class="social-actions-message">'.get_lang('Teach').'</div>';
+				echo '<div class="social-actions-message">'.get_lang('MyTeach').'</div>';
 				echo cut($user_info['teach'],$cut_size);
 				echo '</div>';
 				echo '<br />';

From 5f76ccdf5b3d8dc4332de59fad97f1b2b9e431ba Mon Sep 17 00:00:00 2001
From: Carlos Vargas <carlos.vargas@beeznest.com>
Date: Thu, 13 Aug 2009 11:42:21 -0500
Subject: [PATCH 3/7] changes styles

---
 main/inc/lib/javascript/jquery.customselect.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/main/inc/lib/javascript/jquery.customselect.js b/main/inc/lib/javascript/jquery.customselect.js
index afaa2a25b1..3f82a31dbe 100644
--- a/main/inc/lib/javascript/jquery.customselect.js
+++ b/main/inc/lib/javascript/jquery.customselect.js
@@ -1,5 +1,5 @@
 
-//select表示select本身，view表示跳出的�項
+//select表示select本身，view表示跳出的�?�項
 ;(function($){
 
   $.fn.extend({
@@ -20,7 +20,7 @@
   
   $.fn.extend({
   
-    //檢查文字的Byte數，超�limit指定的個數的話，就回傳true 和 未超�之�的文字index
+    //檢查文字的Byte數，超�?�limit指定的個數的話，就回傳true 和 未超�?�之�?的文字index
     getIndexByByte: function(strIN,limit){
         var i, cnt=0;
             
@@ -65,9 +65,9 @@
 		    jQuery.extend(settings, options);
 	    }
              
-        var tmp='<div id="'+settings.id+'-select" style="cursor:default;font-size:12px;z-index:'+settings.zIndex+';border: solid 0px #999; padding: 3px; width: 180px; position: relative;">'
-        tmp+='<div id="'+settings.id+'-Text" style="background: url('+settings.selectImage+') no-repeat 0 0; width: '+settings.selectWidth+'; height: 21px; color: Black; padding: 0  0 0 10px;">';
-        tmp+='<div class="textshow" style="padding: 4px 0 0 0;">'+settings.selectText+'</div><div class="valueshow" style="display:none;"></div></div><div id="'+settings.id+'-selectshow" style="overflow-y:auto; overflow-x:hidden; height:'+settings.viewHeight+';width:'+settings.viewWidth+'; display:none; position: absolute; left:'+settings.viewLeft+'; top:'+settings.viewTop+'; border: solid 1px #999; background: white;"></div></div>';
+        var tmp='<div id="'+settings.id+'-select" style="cursor:default;font-size:12px;z-index:'+settings.zIndex+';border: solid 0px #999; padding: 0px; width: 180px; position: relative;">'
+        tmp+='<div id="'+settings.id+'-Text" style="background: url('+settings.selectImage+') no-repeat 0 0; width: '+settings.selectWidth+'; height: 21px; color: Black; padding: 0  0 0 0;">';
+        tmp+='<div class="textshow" style="padding: 0px;">'+settings.selectText+'</div><div class="valueshow" style="display:none;"></div></div><div id="'+settings.id+'-selectshow" style="overflow-y:auto; overflow-x:hidden; height:'+settings.viewHeight+';width:'+settings.viewWidth+'; display:none; position: absolute; left:'+settings.viewLeft+'; top:'+settings.viewTop+'; border: solid 1px #999; background: white;"></div></div>';
         
 
         
@@ -166,9 +166,9 @@
         }   
        
        
-        //add item到select裡�
-        //在傳itemtext時，用<span class="thistext"></span>包起�顯示的 "文字"
-        //例如:<span class="thistext">哇哈哈</span>，這樣select�擇後，就會顯示 "哇哈哈"
+        //add item到select裡�?�
+        //在傳itemtext時，用<span class="thistext"></span>包起�?顯示的 "文字"
+        //例如:<span class="thistext">哇哈哈</span>，這樣select�?�擇後，就會顯示 "哇哈哈"
         this.addItem = function(itemtext,itemvalue){            
             
             var itemhtml='<div class="selectitem"><div class="selecttext">'+itemtext

From b3388013536f5b7f6e84857d88980e0cfd631294 Mon Sep 17 00:00:00 2001
From: Carlos Vargas <carlos.vargas@beeznest.com>
Date: Thu, 13 Aug 2009 11:42:46 -0500
Subject: [PATCH 4/7] change combobox jquery

---
 main/exercice/question_create.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/exercice/question_create.php b/main/exercice/question_create.php
index ba1934a12a..d88c033879 100644
--- a/main/exercice/question_create.php
+++ b/main/exercice/question_create.php
@@ -128,7 +128,7 @@ else
 
 
 <script>
-var ddlObj1=$("#questiontypes").finalselect({id:"test",viewWidth:'260px',viewHeight:'150px',selectText:'-<?php echo get_lang('SelectQuestionType');?>-',selectImage:'<?php echo api_get_path(WEB_IMG_PATH); ?>select.png', viewMouseoverColor: '#EFEFEF'});
+var ddlObj1=$("#questiontypes").finalselect({id:"test",viewWidth:'260px', viewHeight:'150px',selectText:'<?php echo get_lang('SelectQuestionType')."&nbsp;&nbsp;".Display::return_icon('div_hide',null,array('style'=>'vertical-align:middle'));?>',selectImage:'<?php echo api_get_path(WEB_IMG_PATH); ?>select.png', viewMouseoverColor: '#EFEFEF'});
 $("#test-select").bind('click',function(){
 	$("#question_type_hidden").val(ddlObj1.getText());
 });
@@ -147,7 +147,7 @@ $pictures_question_types[6] = 'hotspot.gif';
 foreach (Question::$questionTypes as $key=>$value)
 {
 	?>
-	ddlObj1.addItem('<table width="100%"><tr><td style="width: 37px;" valign="top"><?php Display::display_icon($pictures_question_types[$key],addslashes(get_lang($value[1])),array('height'=>'40px;', 'style' => 'vertical-align:top;')); ?></td><td><span class="thistext"><?php echo addslashes(get_lang($value[1])); ?></span><br/><sub><?php echo addslashes(get_lang($value[1].'Comment')); ?></sub></td></tr></table>','');
+	ddlObj1.addItem('<table width="100%"><tr><td style="width: 37px;" valign="top"><?php Display::display_icon($pictures_question_types[$key],addslashes(get_lang($value[1])),array('height'=>'40px;', 'style' => 'vertical-align:top;')); ?></td><td><span class="thistext"><?php echo addslashes(get_lang($value[1])); ?></span><br/><sub><?php /*echo addslashes(get_lang($value[1].'Comment'));*/ ?></sub></td></tr></table>','');
 	<?php
 }
 ?>

From fdeb80eaa0508d18a6eff1a7c7ab91b1816f3d38 Mon Sep 17 00:00:00 2001
From: Carlos Vargas <carlos.vargas@beeznest.com>
Date: Thu, 13 Aug 2009 11:44:50 -0500
Subject: [PATCH 5/7] change combobox jquery

---
 main/exercice/question_create.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/exercice/question_create.php b/main/exercice/question_create.php
index d88c033879..f135301df1 100644
--- a/main/exercice/question_create.php
+++ b/main/exercice/question_create.php
@@ -128,7 +128,7 @@ else
 
 
 <script>
-var ddlObj1=$("#questiontypes").finalselect({id:"test",viewWidth:'260px', viewHeight:'150px',selectText:'<?php echo get_lang('SelectQuestionType')."&nbsp;&nbsp;".Display::return_icon('div_hide',null,array('style'=>'vertical-align:middle'));?>',selectImage:'<?php echo api_get_path(WEB_IMG_PATH); ?>select.png', viewMouseoverColor: '#EFEFEF'});
+var ddlObj1=$("#questiontypes").finalselect({id:"test",viewWidth:'260px', viewHeight:'150px',selectText:'<?php echo get_lang('SelectQuestionType')."&nbsp;&nbsp;".Display::return_icon('div_hide',get_lang('Show'),array('style'=>'vertical-align:middle'));?>',selectImage:'<?php echo api_get_path(WEB_IMG_PATH); ?>select.png', viewMouseoverColor: '#EFEFEF'});
 $("#test-select").bind('click',function(){
 	$("#question_type_hidden").val(ddlObj1.getText());
 });

From 01982077fa5cf785b10d3d1b9bfd42276b0c3c3b Mon Sep 17 00:00:00 2001
From: Carlos Vargas <carlos.vargas@beeznest.com>
Date: Thu, 13 Aug 2009 11:45:07 -0500
Subject: [PATCH 6/7] changes styles

---
 main/exercice/exercise.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php
index 193a111a7f..6701dbaa74 100755
--- a/main/exercice/exercise.class.php
+++ b/main/exercice/exercise.class.php
@@ -878,7 +878,7 @@ class Exercise
 		$form -> addElement('html','<div class="row">
 		<div class="label"></div>
 		<div class="formw" style="height:50px">
-			<a href="javascript://" onclick=" return show_media()"> <span id="media_icon"> <img style="vertical-align: middle;" src="../img/looknfeel.png" alt="" />&nbsp;'.get_lang('ExerciseDescription').'</span></a>
+			<a href="javascript://" onclick=" return show_media()"> <span id="media_icon"> <img style="vertical-align: middle;" src="../img/looknfeelna.png" alt="" />&nbsp;'.get_lang('ExerciseDescription').'</span></a>
 		</div>
 		</div>');
 		

From 348d6b3ffe2a3cf5490f099e9e81c1279ce4ca36 Mon Sep 17 00:00:00 2001
From: Carlos Vargas <carlos.vargas@beeznest.com>
Date: Thu, 13 Aug 2009 11:57:06 -0500
Subject: [PATCH 7/7] align icon hide show parameters in forum

---
 main/forum/editpost.php          | 4 ++--
 main/forum/forumfunction.inc.php | 6 +++---
 main/forum/index.php             | 4 ++--
 main/forum/newthread.php         | 4 ++--
 main/forum/reply.php             | 4 ++--
 main/forum/viewforumcategory.php | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/main/forum/editpost.php b/main/forum/editpost.php
index 82d4c70c84..dd4fc07115 100644
--- a/main/forum/editpost.php
+++ b/main/forum/editpost.php
@@ -98,11 +98,11 @@ $htmlHeadXtra[] = '<script>
 		function advanced_parameters() {
 			if(document.getElementById(\'id_qualify\').style.display == \'none\') {
 				document.getElementById(\'id_qualify\').style.display = \'block\';
-				document.getElementById(\'img_plus_and_minus\').innerHTML=\'&nbsp;'.Display::return_icon('div_hide.gif').'&nbsp;'.get_lang('AdvancedParameters').'\';
+				document.getElementById(\'img_plus_and_minus\').innerHTML=\'&nbsp;'.Display::return_icon('div_hide.gif',get_lang('Hide'),array('style'=>'vertical-align:middle')).'&nbsp;'.get_lang('AdvancedParameters').'\';
 
 			} else {
 				document.getElementById(\'id_qualify\').style.display = \'none\';
-				document.getElementById(\'img_plus_and_minus\').innerHTML=\'&nbsp;'.Display::return_icon('div_show.gif').'&nbsp;'.get_lang('AdvancedParameters').'\';
+				document.getElementById(\'img_plus_and_minus\').innerHTML=\'&nbsp;'.Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align:middle')).'&nbsp;'.get_lang('AdvancedParameters').'\';
 			}
 		}
 </script>';	
diff --git a/main/forum/forumfunction.inc.php b/main/forum/forumfunction.inc.php
index 0dca9a920e..390b320c4f 100644
--- a/main/forum/forumfunction.inc.php
+++ b/main/forum/forumfunction.inc.php
@@ -244,7 +244,7 @@ function show_add_forum_form($inputvalues=array()) {
 				}*/
 			
 	$form->addElement('html', '<div class="row"><div class="label">');
-	$form->addElement('html', '<br /><div id="plus"><a href="javascript://" onclick="advanced_parameters()" ><span id="plus_minus">&nbsp;'.Display::return_icon('div_show.gif').'&nbsp;'.get_lang('AdvancedParameters').'</span></a></div>','');
+	$form->addElement('html', '<br /><div id="plus"><a href="javascript://" onclick="advanced_parameters()" ><span id="plus_minus">&nbsp;'.Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align:middle')).'&nbsp;'.get_lang('AdvancedParameters').'</span></a></div>','');
 	$form->addElement('html','</div><div class="formw"></div></div>');
 	$form->addElement('html','<div id="options" style="display:none">');
 	
@@ -1919,7 +1919,7 @@ function show_add_post_form($action='', $id='', $form_values='') {
 	//$form->applyFilter('post_text', 'html_filter');	
 	
 	$form->addElement('html', '<div class="row"><div class="label">');
-	$form->addElement('html','<a href="javascript://" onclick="return advanced_parameters()"><span id="img_plus_and_minus">'.Display::return_icon('div_show.gif').' '.get_lang('AdvancedParameters').'</span></a>','');
+	$form->addElement('html','<a href="javascript://" onclick="return advanced_parameters()"><span id="img_plus_and_minus">&nbsp;'.Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align:middle')).' '.get_lang('AdvancedParameters').'</span></a>','');
 	$form->addElement('html', '</div><div class="formw"></div></div>');
 	$form->addElement('html','<div id="id_qualify" style="display:none">');
 	
@@ -2352,7 +2352,7 @@ function show_edit_post_form($current_post, $current_thread, $current_forum, $fo
 	//$form->applyFilter('post_text', 'html_filter');	
 		
 	$form->addElement('html', '<div class="row"><div class="label">');
-	$form->addElement('HTML','<a href="javascript://" onclick="return advanced_parameters()"><span id="img_plus_and_minus">'.Display::return_icon('div_show.gif').''.get_lang('AdvancedParameters').'</span></a>','');
+	$form->addElement('HTML','<a href="javascript://" onclick="return advanced_parameters()"><span id="img_plus_and_minus">'.Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align:middle')).''.get_lang('AdvancedParameters').'</span></a>','');
 	$form->addElement('html','</div><div class="formw"></div></div>');
 	$form->addElement('html','<div id="id_qualify" style="display:none">');
 	
diff --git a/main/forum/index.php b/main/forum/index.php
index cf6101ba80..7918853254 100644
--- a/main/forum/index.php
+++ b/main/forum/index.php
@@ -60,10 +60,10 @@ $htmlHeadXtra[] = '<script type="text/javascript" language="javascript">
 		function advanced_parameters() {
 			if(document.getElementById(\'options\').style.display == \'none\') {
 					document.getElementById(\'options\').style.display = \'block\';
-					document.getElementById(\'plus_minus\').innerHTML=\'&nbsp;'.Display::return_icon('div_hide.gif').'&nbsp;'.get_lang('AdvancedParameters').'\';
+					document.getElementById(\'plus_minus\').innerHTML=\'&nbsp;'.Display::return_icon('div_hide.gif',get_lang('Hide'),array('style'=>'vertical-align:middle')).'&nbsp;'.get_lang('AdvancedParameters').'\';
 			} else {
 					document.getElementById(\'options\').style.display = \'none\';
-					document.getElementById(\'plus_minus\').innerHTML=\'&nbsp;'.Display::return_icon('div_show.gif').'&nbsp;'.get_lang('AdvancedParameters').'\';
+					document.getElementById(\'plus_minus\').innerHTML=\'&nbsp;'.Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align:middle')).'&nbsp;'.get_lang('AdvancedParameters').'\';
 			}		
 		}
 	</script>';	
diff --git a/main/forum/newthread.php b/main/forum/newthread.php
index 9715c00f30..aad19f4e95 100644
--- a/main/forum/newthread.php
+++ b/main/forum/newthread.php
@@ -83,11 +83,11 @@ $htmlHeadXtra[] = '<script>
 		function advanced_parameters() {
 				if(document.getElementById(\'id_qualify\').style.display == \'none\') {
 				document.getElementById(\'id_qualify\').style.display = \'block\';
-				document.getElementById(\'img_plus_and_minus\').innerHTML=\'&nbsp;'.Display::return_icon('div_hide.gif').'&nbsp;'.get_lang('AdvancedParameters').'\';
+				document.getElementById(\'img_plus_and_minus\').innerHTML=\'&nbsp;'.Display::return_icon('div_hide.gif',get_lang('Hide'),array('style'=>'vertical-align:middle')).'&nbsp;'.get_lang('AdvancedParameters').'\';
 
 			} else {
 				document.getElementById(\'id_qualify\').style.display = \'none\';
-				document.getElementById(\'img_plus_and_minus\').innerHTML=\'&nbsp;'.Display::return_icon('div_show.gif').'&nbsp;'.get_lang('AdvancedParameters').'\';
+				document.getElementById(\'img_plus_and_minus\').innerHTML=\'&nbsp;'.Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align:middle')).'&nbsp;'.get_lang('AdvancedParameters').'\';
 			}
 		}
 </script>';	
diff --git a/main/forum/reply.php b/main/forum/reply.php
index 0f037be84d..5757a4f485 100644
--- a/main/forum/reply.php
+++ b/main/forum/reply.php
@@ -81,11 +81,11 @@ $htmlHeadXtra[] = '<script>
 		function advanced_parameters() {
 			if(document.getElementById(\'id_qualify\').style.display == \'none\') {
 				document.getElementById(\'id_qualify\').style.display = \'block\';
-				document.getElementById(\'img_plus_and_minus\').innerHTML=\'&nbsp;'.Display::return_icon('div_hide.gif').'&nbsp;'.get_lang('AdvancedParameters').'\';
+				document.getElementById(\'img_plus_and_minus\').innerHTML=\'&nbsp;'.Display::return_icon('div_hide.gif',get_lang('Hide'),array('style'=>'vertical-align:middle')).'&nbsp;'.get_lang('AdvancedParameters').'\';
 
 			} else {
 				document.getElementById(\'id_qualify\').style.display = \'none\';
-				document.getElementById(\'img_plus_and_minus\').innerHTML=\'&nbsp;'.Display::return_icon('div_show.gif').'&nbsp;'.get_lang('AdvancedParameters').'\';
+				document.getElementById(\'img_plus_and_minus\').innerHTML=\'&nbsp;'.Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align:middle')).'&nbsp;'.get_lang('AdvancedParameters').'\';
 			}	
 		}
 </script>';	
diff --git a/main/forum/viewforumcategory.php b/main/forum/viewforumcategory.php
index 4187750ba1..1e0c6eaa49 100644
--- a/main/forum/viewforumcategory.php
+++ b/main/forum/viewforumcategory.php
@@ -59,10 +59,10 @@ $htmlHeadXtra[] = '<script type="text/javascript" language="javascript">
 		function advanced_parameters() {
 			if(document.getElementById(\'options\').style.display == \'none\') {
 					document.getElementById(\'options\').style.display = \'block\';
-					document.getElementById(\'plus_minus\').innerHTML=\'&nbsp;'.Display::return_icon('div_hide.gif').'&nbsp;'.get_lang('AdvancedParameters').'\';
+					document.getElementById(\'plus_minus\').innerHTML=\'&nbsp;'.Display::return_icon('div_hide.gif',get_lang('Hide'),array('style'=>'vertical-align:middle')).'&nbsp;'.get_lang('AdvancedParameters').'\';
 			} else {
 					document.getElementById(\'options\').style.display = \'none\';
-					document.getElementById(\'plus_minus\').innerHTML=\'&nbsp;'.Display::return_icon('div_show.gif').'&nbsp;'.get_lang('AdvancedParameters').'\';
+					document.getElementById(\'plus_minus\').innerHTML=\'&nbsp;'.Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align:middle')).'&nbsp;'.get_lang('AdvancedParameters').'\';
 			}		
 		}
 	</script>';