chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

merge

Browse Source
skala
cvargas 17 years ago
parent 98204ede89 348d6b3ffe
commit 063ac2600b
11 changed files with 29 additions and 29 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      main/auth/inscription.php
  2. 2
      main/exercice/exercise.class.php
  3. 4
      main/exercice/question_create.php
  4. 4
      main/forum/editpost.php
  5. 6
      main/forum/forumfunction.inc.php
  6. 4
      main/forum/index.php
  7. 4
      main/forum/newthread.php
  8. 4
      main/forum/reply.php
  9. 4
      main/forum/viewforumcategory.php
  10. 16
      main/inc/lib/javascript/jquery.customselect.js
  11. 8
      main/social/profile.php

2
main/auth/inscription.php
Unescape View File

@ -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 />

2
main/exercice/exercise.class.php
Unescape View File

@ -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>');

4
main/exercice/question_create.php
Unescape View File

@ -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',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());
});
@ -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
}
?>

4
main/forum/editpost.php
Unescape View File

@ -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>';

6
main/forum/forumfunction.inc.php
Unescape View File

@ -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">');

4
main/forum/index.php
Unescape View File

@ -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>';

4
main/forum/newthread.php
Unescape View File

@ -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>';

4
main/forum/reply.php
Unescape View File

@ -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>';

4
main/forum/viewforumcategory.php
Unescape View File

@ -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>';

16
main/inc/lib/javascript/jquery.customselect.js
Unescape View File

@ -1,5 +1,5 @@

//select表示select本身，view表示跳出的�項
//select表示select本身，view表示跳出的<EFBFBD>?<EFBFBD>項
;(function($){
$.fn.extend({
@ -20,7 +20,7 @@
$.fn.extend({
//檢查文字的Byte數，超�limit指定的個數的話，就回傳true 和 未超�之�的文字index
//檢查文字的Byte數，超<EFBFBD>?<EFBFBD>limit指定的個數的話，就回傳true 和 未超<EFBFBD>?<EFBFBD>之<EFBFBD>?的文字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裡<EFBFBD>?<EFBFBD>
//在傳itemtext時，用<span class="thistext"></span>包起<EFBFBD>?顯示的 "文字"
//例如:<span class="thistext">哇哈哈</span>，這樣select<EFBFBD>?<EFBFBD>擇後，就會顯示 "哇哈哈"
this.addItem = function(itemtext,itemvalue){
var itemhtml='<div class="selectitem"><div class="selecttext">'+itemtext

8
main/social/profile.php
Unescape View File

@ -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 />';

Write Preview
Loading…
Cancel
Save