moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 17:06:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-30843_b' of git://github.com/rwijaya/moodle

Browse source
This commit is contained in:
Sam Hemelryk 2012-04-10 12:34:37 +12:00
commit 5bfeb5ffd3
108 changed files with 390 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

8
mod/glossary/editcategories.html
View file

@ -7,15 +7,15 @@
<div>
<table class="generalbox" cellpadding="5">
<tr valign="top">
<td align="right"><?php echo get_string("name") ?>:</td>
<td align="right"><label for="name"><?php echo get_string("name") ?>:</label></td>
<td>
<input type="text" name="name" size="30" value="<?php p($name) ?>" />
<input type="text" name="name" id="name" size="30" value="<?php p($name) ?>" />
</td>
</tr>
<tr valign="top">
<td align="right"><?php echo get_string("linkcategory","glossary") ?>:</td>
<td align="right"><label for="usedynalink"><?php echo get_string("linkcategory","glossary") ?>:</label></td>
<td>
<select size="1" name="usedynalink">
<select size="1" id="usedynalink" name="usedynalink">
<option value="1" <?php
if ( $usedynalink ) {
echo "selected=\"selected\"";

22
mod/glossary/formats.php
View file

@ -69,7 +69,7 @@ echo '<table width="90%" align="center" class="generalbox">';
</strong></td>
</tr>
<tr valign="top">
<td align="right" width="20%"><?php print_string('popupformat','glossary'); ?></td>
<td align="right" width="20%"><?php echo html_writer::label(get_string('popupformat','glossary'), 'menupopupformatname'); ?></td>
<td>
<?php
//get and update available formats
@ -92,9 +92,9 @@ echo '<table width="90%" align="center" class="generalbox">';
</td>
</tr>
<tr valign="top">
<td align="right" width="20%"><?php print_string('defaultmode','glossary'); ?></td>
<td align="right" width="20%"><label for="defaultmode"><?php print_string('defaultmode','glossary'); ?></label></td>
<td>
<select size="1" name="defaultmode">
<select size="1" id="defaultmode" name="defaultmode">
<?php
$sletter = '';
$scat = '';
@ -129,9 +129,9 @@ echo '<table width="90%" align="center" class="generalbox">';
</td>
</tr>
<tr valign="top">
<td align="right" width="20%"><?php print_string('defaulthook','glossary'); ?></td>
<td align="right" width="20%"><label for="defaulthook"><?php print_string('defaulthook','glossary'); ?></label></td>
<td>
<select size="1" name="defaulthook">
<select size="1" id="defaulthook" name="defaulthook">
<?php
$sall = '';
$sspecial = '';
@ -166,9 +166,9 @@ echo '<table width="90%" align="center" class="generalbox">';
</td>
</tr>
<tr valign="top">
<td align="right" width="20%"><?php print_string('defaultsortkey','glossary'); ?></td>
<td align="right" width="20%"><label for="sortkey"><?php print_string('defaultsortkey','glossary'); ?></label></td>
<td>
<select size="1" name="sortkey">
<select size="1" id="sortkey" name="sortkey">
<?php
$sfname = '';
$slname = '';
@ -203,9 +203,9 @@ echo '<table width="90%" align="center" class="generalbox">';
</td>
</tr>
<tr valign="top">
<td align="right" width="20%"><?php print_string('defaultsortorder','glossary'); ?></td>
<td align="right" width="20%"><label for="sortorder"><?php print_string('defaultsortorder','glossary'); ?></label></td>
<td>
<select size="1" name="sortorder">
<select size="1" id="sortorder" name="sortorder">
<?php
$sasc = '';
$sdesc = '';
@ -228,9 +228,9 @@ echo '<table width="90%" align="center" class="generalbox">';
</td>
</tr>
<tr valign="top">
<td align="right" width="20%"><?php print_string("includegroupbreaks", "glossary"); ?>:</td>
<td align="right" width="20%"><label for="showgroup"><?php print_string("includegroupbreaks", "glossary"); ?>:</label></td>
<td>
<select size="1" name="showgroup">
<select size="1" id="showgroup" name="showgroup">
<?php
$yselected = "";
$nselected = "";

6
mod/glossary/lib.php
View file

@ -1054,7 +1054,7 @@ function glossary_print_entry_aliases($course, $cm, $glossary, $entry,$mode='',
foreach ($aliases as $alias) {
if (trim($alias->alias)) {
if ($return == '') {
$return = '<select style="font-size:8pt">';
$return = '<select id="keyword" style="font-size:8pt">';
}
$return .= "<option>$alias->alias</option>";
}
@ -1210,7 +1210,8 @@ function glossary_print_entry_lower_section($course, $cm, $glossary, $entry, $m
echo '<table>';
if ( $aliases ) {
echo '<tr valign="top"><td class="aliases">' .
get_string('aliases','glossary').': '.$aliases . '</td></tr>';
'<label for="keyword">' . get_string('aliases','glossary').': </label>' .
$aliases . '</td></tr>';
}
if ($icons) {
echo '<tr valign="top"><td class="icons">'.$icons.'</td></tr>';
@ -1772,6 +1773,7 @@ function glossary_print_categories_menu($cm, $glossary, $hook, $category) {
echo '<td align="center" style="width:20%">';
$select = new single_select(new moodle_url("/mod/glossary/view.php", array('id'=>$cm->id, 'mode'=>'cat')), 'hook', $menu, $selected, null, "catmenu");
$select->set_label(get_accesshide(get_string('categories', 'glossary')));
echo $OUTPUT->render($select);
echo '</td>';