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

[svn r19500] changes in buttons and others see FS#3964

Browse Source
skala
Carlos Vargas 16 years ago
parent 2ba133886f
commit d5baa45b78
10 changed files with 46 additions and 37 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. 25
      main/calendar/agenda.inc.php
  2. 24
      main/exercice/admin.php
  3. 6
      main/exercice/exercice_submit.php
  4. 16
      main/exercice/hotspot_admin.inc.php
  5. 4
      main/exercice/question_admin.inc.php
  6. 2
      main/gradebook/lib/fe/userform.class.php
  7. BIN
      main/img/div_hide.gif
  8. BIN
      main/img/div_show.gif
  9. BIN
      main/img/ical_icon.gif
  10. 6
      main/work/work.php

25
main/calendar/agenda.inc.php
Unescape View File

@ -1,4 +1,4 @@
<?php //$Id: agenda.inc.php 19254 2009-03-24 22:18:53Z cvargas1 $
<?php //$Id: agenda.inc.php 19500 2009-04-02 15:15:56Z cvargas1 $
/*
==============================================================================
@ -647,20 +647,27 @@ function selectAll(cbList,bSelect,showwarning)
function plus_attachment() {
if (document.getElementById('options').style.display == 'none') {
document.getElementById('options').style.display = 'block';
document.getElementById('plus').innerHTML='&nbsp;<img src=\"../img/nolines_minus.gif\" alt=\"\" />&nbsp;".get_lang('AddAnAttachment')."';
document.getElementById('plus').innerHTML='&nbsp;<img src=\"../img/div_hide.gif\" alt=\"\" />&nbsp;".get_lang('AddAnAttachment')."';
} else {
document.getElementById('options').style.display = 'none';
document.getElementById('plus').innerHTML='&nbsp;<img src=\"../img/nolines_plus.gif\" alt=\"\" />&nbsp;".get_lang('AddAnAttachment')."';
document.getElementById('plus').innerHTML='&nbsp;<img src=\"../img/div_show.gif\" alt=\"\" />&nbsp;".get_lang('AddAnAttachment')."';
}
}
function plus_repeated_event() {
if (document.getElementById('options2').style.display == 'none') {
document.getElementById('options2').style.display = 'block';
document.getElementById('plus2').innerHTML='&nbsp;<img src=\"../img/nolines_minus.gif\" alt=\"\" />&nbsp;".get_lang('RepeatedEvent')."';
document.getElementById('plus2').innerHTML='&nbsp;<img src=\"../img/div_hide.gif\" alt=\"\" />&nbsp;".get_lang('RepeatedEvent')."';
} else {
document.getElementById('options2').style.display = 'none';
document.getElementById('plus2').innerHTML='&nbsp;<img src=\"../img/nolines_plus.gif\" alt=\"\" />&nbsp;".get_lang('RepeatedEvent')."';
document.getElementById('plus2').innerHTML='&nbsp;<img src=\"../img/div_show.gif\" alt=\"\" />&nbsp;".get_lang('RepeatedEvent')."';
}
}
function plus_ical() {
if (document.getElementById('icalform').style.display == 'none') {
document.getElementById('icalform').style.display = 'block';
document.getElementById('plusical').innerHTML='';
}
}
@ -2532,9 +2539,13 @@ function show_add_form($id = '')
<form enctype="multipart/form-data" action="<?php echo api_get_self().'?origin='.$_GET['origin'].'&amp;action='.$_GET['action']; ?>" method="post" name="frm_import_ical">
<input type="hidden" name="action" value="<?php if (isset($_GET['action'])) echo $_GET['action']; ?>" />
<div style="text-align:right;width:80%">
<a href="javascript://" onclick="return plus_ical();"><span id="plusical"><input type="image" src="../img/ical_icon.gif" alt="<?php echo get_lang('ICalFileImport');?>" title="<?php echo get_lang('ICalFileImport');?>" /></span></a>
<div id="icalform" style="display: none;">
<label for="ical_import"><?php echo get_lang('ICalFileImport');?></label>
<input type="file" name="ical_import"/><button class="save" type="submit" name="ical_submit" value="<?php echo get_lang('Import');?>"><?php echo get_lang('Import');?></button>
</div>
</div>
</form>
<form enctype="multipart/form-data" action="<?php echo api_get_self().'?origin='.$_GET['origin'].'&amp;action='.$_GET['action']; ?>" method="post" name="new_calendar_item">
@ -2857,7 +2868,7 @@ function show_add_form($id = '')
<div class="label">&nbsp;
</div>
<div class="formw">
<a href="javascript://" onclick="return plus_attachment();"><span id="plus">&nbsp;<img src="../img/nolines_plus.gif" alt="" />&nbsp;<?php echo get_lang('AddAnAttachment') ?></span></a>
<a href="javascript://" onclick="return plus_attachment();"><span id="plus">&nbsp;<img src="../img/div_show.gif" alt="" />&nbsp;<?php echo get_lang('AddAnAttachment') ?></span></a>
</div>
</div>
@ -2894,7 +2905,7 @@ function show_add_form($id = '')
<div class="label">&nbsp;
</div>
<div class="formw">
<a href="javascript://" onclick="return plus_repeated_event();"><span id="plus2">&nbsp;<img src="../img/nolines_plus.gif" alt="" />&nbsp;<?php echo get_lang('RepeatedEvent') ?></span></a>
<a href="javascript://" onclick="return plus_repeated_event();"><span id="plus2">&nbsp;<img src="../img/div_show.gif" alt="" />&nbsp;<?php echo get_lang('RepeatedEvent') ?></span></a>
</div>
</div>

24
main/exercice/admin.php
Unescape View File

@ -1,4 +1,4 @@
<?php // $Id: admin.php 19404 2009-03-28 01:24:38Z cvargas1 $
<?php // $Id: admin.php 19500 2009-04-02 15:15:56Z cvargas1 $
/*
==============================================================================
@ -67,7 +67,7 @@
*
* @package dokeos.exercise
* @author Olivier Brouckaert
* @version $Id: admin.php 19404 2009-03-28 01:24:38Z cvargas1 $
* @version $Id: admin.php 19500 2009-04-02 15:15:56Z cvargas1 $
*/
@ -304,33 +304,23 @@ if($cancelAnswers)
}
// modifies the query string that is used in the link of tool name
if($editQuestion || $modifyQuestion || $newQuestion || $modifyAnswers)
{
if($editQuestion || $modifyQuestion || $newQuestion || $modifyAnswers) {
$nameTools=get_lang('QuestionManagement');
}
else
{
$nameTools=get_lang('ExerciseManagement');
}
$interbreadcrumb[]=array("url" => "exercice.php","name" => get_lang('Exercices'));
$interbreadcrumb[]=array("url" => "admin.php?exerciseId=".$objExercise->id,"name" => $objExercise->exercise);
// shows a link to go back to the question pool
if(!$exerciseId && $nameTools != get_lang('ExerciseManagement'))
{
if(!$exerciseId && $nameTools != get_lang('ExerciseManagement')){
$interbreadcrumb[]=array("url" => "question_pool.php?fromExercise=$fromExercise","name" => get_lang('QuestionPool'));
}
// if the question is duplicated, disable the link of tool name
if($modifyIn == 'thisExercise')
{
if($buttonBack)
{
if($modifyIn == 'thisExercise') {
if($buttonBack) {
$modifyIn='allExercises';
}
else
{
} else {
$noPHP_SELF=true;
}
}

6
main/exercice/exercice_submit.php
Unescape View File

@ -1,4 +1,4 @@
<?php // $Id: exercice_submit.php 19405 2009-03-28 01:28:28Z cvargas1 $
<?php // $Id: exercice_submit.php 19500 2009-04-02 15:15:56Z cvargas1 $
/*
==============================================================================
@ -42,7 +42,7 @@
* @package dokeos.exercise
* @author Olivier Brouckaert
* @author Julio Montoya multiple fill in blank option added
* @version $Id: exercice_submit.php 19405 2009-03-28 01:28:28Z cvargas1 $
* @version $Id: exercice_submit.php 19500 2009-04-02 15:15:56Z cvargas1 $
*/
@ -1019,7 +1019,7 @@ else
}
else
{
$submit_btn.=get_lang('Next').' &gt;';
$submit_btn.=get_lang('NextQuestion').' &gt;';
}
$submit_btn.= "</button>";
}

16
main/exercice/hotspot_admin.inc.php
Unescape View File

@ -298,10 +298,18 @@ if($modifyAnswers)
<tr>
<td colspan="2" valign="bottom">
<input type="submit" name="lessAnswers" value="<?php echo get_lang('LessHotspots'); ?>" />
<input type="submit" name="moreAnswers" value="<?php echo get_lang('MoreHotspots'); ?>" />
<input type="submit" name="cancelAnswers" value="<?php echo get_lang('Cancel'); ?>" onclick="javascript:if(!confirm('<?php echo addslashes(htmlentities(get_lang('ConfirmYourChoice'))); ?>')) return false;" />
<input type="submit" name="submitAnswers" value="<?php echo get_lang('Ok'); ?>" />
<button type="submit" class="minus" name="lessAnswers" value="<?php echo get_lang('LessHotspots'); ?>" ><?php echo get_lang('LessHotspots'); ?></button>
<button type="submit" class="plus" name="moreAnswers" value="<?php echo get_lang('MoreHotspots'); ?>" /><?php echo get_lang('MoreHotspots'); ?></button>
<button type="submit" class="cancel" name="cancelAnswers" value="<?php echo get_lang('Cancel'); ?>" onclick="javascript:if(!confirm('<?php echo addslashes(htmlentities(get_lang('ConfirmYourChoice'))); ?>')) return false;" ><?php echo get_lang('Cancel'); ?></button>
<?php if(isset($_GET['hotspotadmin'])) {
$class="save";
$text=get_lang('ModifyQuestion');
} else {
$class="add";
$text=get_lang('AddQuestionToExercise');
}
?>
<button type="submit" class="<?php echo $class;?>" name="submitAnswers" value="<?php echo get_lang('Ok'); ?>" /><?php echo $text; ?></button>
</td>
</tr>
<tr>

4
main/exercice/question_admin.inc.php
Unescape View File

@ -27,7 +27,7 @@
* It is included from the script admin.php
* @package dokeos.exercise
* @author Olivier Brouckaert
* @version $Id: question_admin.inc.php 19262 2009-03-25 00:12:02Z cvargas1 $
* @version $Id: question_admin.inc.php 19500 2009-04-02 15:15:56Z cvargas1 $
*/
/*
@ -99,7 +99,7 @@ if(is_object($objQuestion))
$text=get_lang('ModifyQuestion');
} else {
$class="add";
$text=get_lang('CreateQuestion');
$text=get_lang('AddQuestionToExercise');
}
$form->addElement('style_submit_button','submitQuestion',$text, 'class="'.$class.'"');

2
main/gradebook/lib/fe/userform.class.php
Unescape View File

@ -71,7 +71,7 @@ class UserForm extends FormValidator
$renderer =& $this->defaultRenderer();
$renderer->setElementTemplate('<span>{element}</span> ');
$this->addElement('text','keyword','');
$this->addElement('submit','submit',get_lang('Search'));
$this->addElement('style_submit_button','submit',get_lang('Search'),'class="search"');
}
protected function build_user_info_form() {

BIN
main/img/div_hide.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 399 B

After

Width:  |  Height:  |  Size: 617 B

BIN
main/img/div_show.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 398 B

After

Width:  |  Height:  |  Size: 626 B

BIN
main/img/ical_icon.gif
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

6
main/work/work.php
Unescape View File

@ -1,4 +1,4 @@
<?php //$Id: work.php 19353 2009-03-26 16:53:19Z cvargas1 $
<?php //$Id: work.php 19500 2009-04-02 15:15:56Z cvargas1 $
/* For licensing terms, see /dokeos_license.txt */
/**
* @package dokeos.work
@ -6,7 +6,7 @@
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University - ability for course admins to specify wether uploaded documents are visible or invisible by default.
* @author Roan Embrechts, code refactoring and virtual course support
* @author Frederic Vauthier, directories management
* @version $Id: work.php 19353 2009-03-26 16:53:19Z cvargas1 $
* @version $Id: work.php 19500 2009-04-02 15:15:56Z cvargas1 $
*
* @todo refactor more code into functions, use quickforms, coding standards, ...
*/
@ -1229,7 +1229,7 @@ function draw_date_picker($prefix,$default='') {
$new_folder_text .= '<div id="msg_error1" style="display:none;color:red"></div>';
$new_folder_text .= get_lang('NewDir') . ' ';
$new_folder_text .= '<input type="text" name="new_dir" onfocus="document.getElementById(\'msg_error1\').style.display=\'none\';"/>';
$new_folder_text .= '<button type="button" name="create_dir" class="add" onClick="validate();" value="' . get_lang('Ok') . '"/>'.get_lang('CreateDirectory').'</button>';
//$new_folder_text .= '<button type="button" name="create_dir" class="add" onClick="validate();" value="' . get_lang('Ok') . '"/>'.get_lang('CreateDirectory').'</button>';
//new additional fields inside the "if condition" just to agroup
if(true):

Write Preview
Loading…
Cancel
Save